diff --git a/.cargo/config b/.cargo/config
index 4beb99d074..55b6b89582 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -8,3 +8,9 @@ xtest = "run --package x --bin x -- test"
 xlint = "run --package x --bin x -- lint"
 xbuild = "run --package x --bin x -- build"
 nextest = "run --package x --bin x -- nextest"
+
+[target.x86_64-pc-windows-msvc]
+rustflags = ["-C", "link-arg=/STACK:8000000"]
+
+[target.x86_64-unknown-linux-gnu]
+rustflags = ["-C", "link-arg=-fuse-ld=lld"]
diff --git a/.gitattributes b/.gitattributes
index 0a529135fd..a3cd55a9d8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11,6 +11,5 @@
 *.txt text
 *.yml text
 
-# Use Rust syntax highlighter for Move and Move IR code
-*.move linguist-language=Rust
-*.mvir linguist-language=Rust
+# Use Move syntax highlighter for Move IR code
+*.mvir linguist-language=Move
diff --git a/.github/workflows/ci-post-land.yml b/.github/workflows/ci-post-land.yml
new file mode 100644
index 0000000000..e5ba437abc
--- /dev/null
+++ b/.github/workflows/ci-post-land.yml
@@ -0,0 +1,30 @@
+# CI jobs to be run upon the code lands to the main branch or GitHub Action test branches.
+
+name: ci-post-land
+
+on:
+  push:
+    branches: [main, gha-test-*]
+
+jobs:
+  generate-documentation:
+    name: Generate the Move Book using mdBook
+    runs-on: ubuntu-20.04
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup mdBook
+        uses: peaceiris/actions-mdbook@v1
+        with:
+          mdbook-version: '0.4.10'
+          # mdbook-version: 'latest'
+
+      - run: mdbook build language/documentation/book
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./language/documentation/book/book
diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-pre-land.yml
similarity index 84%
rename from .github/workflows/ci-test.yml
rename to .github/workflows/ci-pre-land.yml
index 876cea8d5f..fa6c76121a 100644
--- a/.github/workflows/ci-test.yml
+++ b/.github/workflows/ci-pre-land.yml
@@ -1,10 +1,10 @@
-name: ci-test
+# CI jobs to be run upon the code lands to the main branch or GitHub Action test branches.
+
+name: ci-pre-land
 
 on:
-  push:
-    branches: [main, gha-test-*]
   pull_request:
-    branches: [main]
+    branches: [main, gha-test-*]
 
 jobs:
   prepare:
@@ -21,7 +21,7 @@ jobs:
         name: determine changes
         uses: diem/actions/changes@faadd16607b77dfa2231a8f366883e01717b3225
         with:
-          workflow-file: ci-test.yml
+          workflow-file: ci.yml
           github-token: ${{secrets.GITHUB_TOKEN}}
       - id: any-changes-found
         name: determine if there are any files listed in the CHANGES_CHANGED_FILE_OUTPUTFILE.
@@ -205,17 +205,27 @@ jobs:
   #         path: |
   #           /tmp/benches
 
-  build-move-analyzer-vscode-extension:
-    name: Build VS Code extension for move-analyzer
-    runs-on: ubuntu-latest
+  test-move-analyzer-vscode-extension:
+    name: Test VS Code extension for move-analyzer
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04, macos-11, windows-2022]
+    runs-on: ${{ matrix.os }}
     needs:
       - prepare
     steps:
       - uses: actions/checkout@v2.4.0
+      - name: Install rust toolchain
+        uses: actions-rs/toolchain@v1
+      - name: Install lld
+        uses: knicknic/os-specific-run@v1.0.3
+        with:
+          linux: sudo apt-get -y install lld
       - name: Use Node.js 14
         uses: actions/setup-node@v2.4.0
         with:
-          node-version: '14'
+          node-version: "14"
       - name: Install NPM dependencies
         working-directory: language/move-analyzer/editors/code
         run: npm install
@@ -232,6 +242,28 @@ jobs:
         with:
           working-directory: language/move-analyzer/editors/code
           run: npm run test
+
+  release-move-analyzer-vscode-extension:
+    name: Release VS Code extension for move-analyzer
+    runs-on: ubuntu-20.04
+    needs:
+      - prepare
+    steps:
+      - uses: actions/checkout@v2.4.0
+      - name: Install rust toolchain
+        uses: actions-rs/toolchain@v1
+      - name: Install lld
+        run: sudo apt-get -y install lld
+      - name: Use Node.js 14
+        uses: actions/setup-node@v2.4.0
+        with:
+          node-version: "14"
+      - name: Install NPM dependencies
+        working-directory: language/move-analyzer/editors/code
+        run: npm install
+      - name: Build the extension
+        working-directory: language/move-analyzer/editors/code
+        run: npm run pretest
       - name: Package the extension
         working-directory: language/move-analyzer/editors/code
         run: npm run package
@@ -249,15 +281,15 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby 2.6
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6.x
+          ruby-version: "2.6"
       - name: Run Checks
         run: |
           gem install awesome_bot
           # Don't look in git or target dirs. Don't check png, bib, tex, js, or shell files
           # We allow links to be redirects, allow duplicates, and we also allow Too Many Requests (429) errors
-          find . -not \( -path "./.git*" -prune \) -not \( -path "./target" -prune \) -type f -not -name "*.png" -not -name "*.sh" -not -name "*.bib" -not -name "*.tex" -not -name "*.js" | while read arg; do awesome_bot --allow-redirect --allow-dupe --allow 429 --skip-save-results $arg; done
+          find . -not \( -path "./.git*" -prune \) -not \( -path "./target" -prune \) -type f -not -name "*.png" -not -name "*.ai" -not -name "*.jpg" -not -name "*.svg" -not -name "*.sh" -not -name "*.bib" -not -name "*.tex" -not -name "*.js" -not -name "package-lock.json" | while read arg; do awesome_bot --allow-redirect --allow-dupe --allow 429 --skip-save-results $arg; done
 
   build-move-cli-docker-image:
     name: Build Docker image for the Move CLI
@@ -271,4 +303,4 @@ jobs:
       - name: Build BasicCoin Move module
         run: |
           cd ./language/documentation/tutorial/step_1/BasicCoin
-          docker run -v `pwd`:/project move/cli package build
+          docker run -v `pwd`:/project move/cli build
diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 5901e076e9..75a84815e9 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -20,8 +20,9 @@ jobs:
         # List of ignored RUSTSEC
         # 1. RUSTSEC-2021-0073 - Not impacted.
         # 2. RUSTSEC-2021-0072 - Not impacted.
+        # 3. RUSTSEC-2020-0071 - Not impacted (chronotope/chrono#578).
         run: |
-          cargo audit --color never --ignore RUSTSEC-2021-0073 --ignore RUSTSEC-2021-0072 > $AUDIT_SUMMARY_FILE
+          cargo audit --color never --ignore RUSTSEC-2021-0073 --ignore RUSTSEC-2021-0072 --ignore RUSTSEC-2020-0071 > $AUDIT_SUMMARY_FILE
       - name: set issue body content
         if: ${{ failure() }}
         env:
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
new file mode 100644
index 0000000000..d657a63b2d
--- /dev/null
+++ b/.github/workflows/docker-image.yml
@@ -0,0 +1,18 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build the Docker image
+      run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)
diff --git a/.github/workflows/release_asset.yml b/.github/workflows/release_asset.yml
index 2c77a143f8..501f716148 100644
--- a/.github/workflows/release_asset.yml
+++ b/.github/workflows/release_asset.yml
@@ -33,7 +33,7 @@ jobs:
           args: --release
 
       - name: package move asset
-        run: ./scripts/package_asset.sh ${{ matrix.platform }}
+        run: bash ./scripts/package_asset.sh ${{ matrix.platform }}
 
       - name: upload move asset
         if: ${{ github.event_name == 'release'}}
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
new file mode 100644
index 0000000000..31000a2744
--- /dev/null
+++ b/.github/workflows/rust.yml
@@ -0,0 +1,22 @@
+name: Rust
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build
+      run: cargo build --verbose
+    - name: Run tests
+      run: cargo test --verbose
diff --git a/.gitignore b/.gitignore
index 13d3db1d03..124e0b7c75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 **/target
 **/*.rs.bk
 .idea/
+**/.vscode
 
 # Ignore wallet mnemonic files used for deterministic key derivation
 *.mnemonic
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a1d579e27f..44c9186fdd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -135,3 +135,26 @@ able to be built and passes all checks performed by CI.
 Move uses [GitHub issues](https://github.com/move-language/move/issues) to track
 bugs. Please include necessary information and instructions to reproduce your
 issue.
+
+## Major feature requests
+
+Please begin by checking the following locations for duplicate requests:
+* [Approved feature proposals awaiting implementation](https://github.com/move-language/move/issues?q=is%3Aissue+is%3Aopen+label%3A%22accepted+feature+awaiting+implementation%22)
+* [Feature proposals under discussion](https://github.com/move-language/move/issues?q=is%3Aissue+is%3Aopen+label%3A%22proposed+feature+in+discussion%22)
+* [Language feature request graveyard](GRAVEYARD.md)
+
+If your feature is not in any of these locations, please add a new feature request using the following format:
+
+```
+Sponsor: your_github_id
+
+## Status: initial proposal
+
+## Rationale
+A detailed description of the problem the proposed feature seeks to solve. This should explain why the problem is important for smart contract programmers and why it is impossible (or unacceptably unpleasant) to solve with the existing language constructs. Examples are strongly recommended.
+
+## Design
+Explain the key decisions to be made in designing the feature. This can be organized as fully fleshed out design, a list of design options with pros and cons, or a list of questions to be answered. A proposed feature should have a very strong/clear rationale, but it is ok if many key design questions are open--the Move community and core contributors can help with this.
+```
+
+A Move core contributor will either add a `proposed_feature_to_be_discussed` tag and queue the feature for discussion at a future Move community meeting (and change the "Status" to reflect the meeting date), or will request changes that must be made to the issue before it is ready for discussion.
diff --git a/Cargo.lock b/Cargo.lock
index 77837b7dd6..275245ef03 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -116,6 +116,15 @@ version = "1.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"
 
+[[package]]
+name = "arbitrary"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d86fd10d912cab78764cc44307d9cd5f164e09abbeb87fb19fb6d95937e8da5f"
+dependencies = [
+ "derive_arbitrary",
+]
+
 [[package]]
 name = "arrayref"
 version = "0.3.6"
@@ -134,17 +143,170 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
 
+[[package]]
+name = "ascii-canvas"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6"
+dependencies = [
+ "term 0.7.0",
+]
+
+[[package]]
+name = "assert-json-diff"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12"
+dependencies = [
+ "serde 1.0.145",
+ "serde_json",
+]
+
+[[package]]
+name = "async-channel"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319"
+dependencies = [
+ "concurrent-queue",
+ "event-listener",
+ "futures-core",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "once_cell",
+ "slab",
+]
+
+[[package]]
+name = "async-global-executor"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5262ed948da60dd8956c6c5aca4d4163593dddb7b32d73267c93dab7b2e98940"
+dependencies = [
+ "async-channel",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "blocking",
+ "futures-lite",
+ "num_cpus",
+ "once_cell",
+]
+
+[[package]]
+name = "async-io"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5e18f61464ae81cde0a23e713ae8fd299580c54d697a35820cfd0625b8b0e07"
+dependencies = [
+ "concurrent-queue",
+ "futures-lite",
+ "libc",
+ "log",
+ "once_cell",
+ "parking",
+ "polling",
+ "slab",
+ "socket2",
+ "waker-fn",
+ "winapi",
+]
+
+[[package]]
+name = "async-lock"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6"
+dependencies = [
+ "event-listener",
+]
+
+[[package]]
+name = "async-object-pool"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aeb901c30ebc2fc4ab46395bbfbdba9542c16559d853645d75190c3056caf3bc"
+dependencies = [
+ "async-std",
+]
+
+[[package]]
+name = "async-process"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf2c06e30a24e8c78a3987d07f0930edf76ef35e027e7bdb063fccafdad1f60c"
+dependencies = [
+ "async-io",
+ "blocking",
+ "cfg-if 1.0.0",
+ "event-listener",
+ "futures-lite",
+ "libc",
+ "once_cell",
+ "signal-hook",
+ "winapi",
+]
+
+[[package]]
+name = "async-std"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
+dependencies = [
+ "async-channel",
+ "async-global-executor",
+ "async-io",
+ "async-lock",
+ "async-process",
+ "crossbeam-utils",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-lite",
+ "gloo-timers",
+ "kv-log-macro",
+ "log",
+ "memchr",
+ "once_cell",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen-futures",
+]
+
+[[package]]
+name = "async-task"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
+
 [[package]]
 name = "async-trait"
 version = "0.1.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
 ]
 
+[[package]]
+name = "atomic-waker"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
+
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -163,9 +325,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7862e21c893d65a1650125d157eaeec691439379a1cee17ee49031b79236ada4"
 dependencies = [
  "proc-macro-error",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -180,13 +342,24 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
+[[package]]
+name = "basic-cookies"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb53b6b315f924c7f113b162e53b3901c05fc9966baf84d201dfcc7432a4bb38"
+dependencies = [
+ "lalrpop",
+ "lalrpop-util",
+ "regex",
+]
+
 [[package]]
 name = "bcs"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "510fd83e3eaf7263b06182f3550b4c0af2af42cb36ab8024969ff5ea7fcb2833"
+checksum = "8b06b4c1f053002b70e7084ac944c77d58d5d92b2110dbc5e852735e00ad3ccc"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.145",
  "thiserror",
 ]
 
@@ -205,9 +378,9 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3deeecb812ca5300b7d3f66f730cc2ebd3511c3d36c691dd79c165d5b19a26e3"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -333,6 +506,20 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
 
+[[package]]
+name = "blocking"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc"
+dependencies = [
+ "async-channel",
+ "async-task",
+ "atomic-waker",
+ "fastrand",
+ "futures-lite",
+ "once_cell",
+]
+
 [[package]]
 name = "bstr"
 version = "0.2.15"
@@ -342,7 +529,7 @@ dependencies = [
  "lazy_static 1.4.0",
  "memchr",
  "regex-automata",
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -387,10 +574,23 @@ dependencies = [
  "move-unit-test",
 ]
 
+[[package]]
+name = "bytecode-verifier-libfuzzer"
+version = "0.0.0"
+dependencies = [
+ "arbitrary",
+ "libfuzzer-sys",
+ "move-binary-format",
+ "move-bytecode-verifier",
+ "move-core-types",
+]
+
 [[package]]
 name = "bytecode-verifier-tests"
 version = "0.1.0"
 dependencies = [
+ "fail",
+ "hex",
  "invalid-mutations",
  "move-binary-format",
  "move-bytecode-verifier",
@@ -419,13 +619,19 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
 
+[[package]]
+name = "cache-padded"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
+
 [[package]]
 name = "camino"
 version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52d74260d9bf6944e2208aa46841b4b8f0d7ffc0849a06837b2f510337f86b2b"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -434,7 +640,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -446,7 +652,7 @@ dependencies = [
  "camino",
  "cargo-platform",
  "semver 1.0.4",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_json",
 ]
 
@@ -465,11 +671,20 @@ dependencies = [
  "rustc_version",
 ]
 
+[[package]]
+name = "castaway"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6"
+
 [[package]]
 name = "cc"
 version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
+dependencies = [
+ "jobserver",
+]
 
 [[package]]
 name = "cfg-expr"
@@ -508,12 +723,24 @@ dependencies = [
 
 [[package]]
 name = "chrono-tz"
-version = "0.5.3"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2554a3155fec064362507487171dcc4edc3df60cb10f3a1fb10ed8094822b120"
+checksum = "58549f1842da3080ce63002102d5bc954c7bc843d4f47818e642abdc36253552"
 dependencies = [
  "chrono",
+ "chrono-tz-build",
+ "phf",
+]
+
+[[package]]
+name = "chrono-tz-build"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db058d493fb2f65f41861bfed7e3fe6335264a9f0f92710cab5bdf01fef09069"
+dependencies = [
  "parse-zoneinfo",
+ "phf",
+ "phf_codegen",
 ]
 
 [[package]]
@@ -565,18 +792,9 @@ checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1"
 dependencies = [
  "heck 0.4.0",
  "proc-macro-error",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
-]
-
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-dependencies = [
- "bitflags",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -586,7 +804,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3362992a0d9f1dd7c3d0e89e0ab2bb540b7a95fea8cd798090e758fda2899b5e"
 dependencies = [
  "codespan-reporting",
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -595,7 +813,7 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.145",
  "termcolor",
  "unicode-width",
 ]
@@ -622,6 +840,25 @@ dependencies = [
  "itertools 0.10.1",
 ]
 
+[[package]]
+name = "combine"
+version = "4.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a604e93b79d1808327a6fca85a6f2d69de66461e7620f5a4cbf5fb4d1d7c948"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
+[[package]]
+name = "concurrent-queue"
+version = "1.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
+dependencies = [
+ "cache-padded",
+]
+
 [[package]]
 name = "config"
 version = "0.11.0"
@@ -631,7 +868,7 @@ dependencies = [
  "lazy_static 1.4.0",
  "nom",
  "rust-ini",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde-hjson",
  "serde_json",
  "toml",
@@ -666,6 +903,22 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
+[[package]]
+name = "core-foundation"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+
 [[package]]
 name = "cpuid-bool"
 version = "0.1.2"
@@ -696,7 +949,7 @@ dependencies = [
  "plotters",
  "rayon",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_cbor",
  "serde_derive",
  "serde_json",
@@ -802,7 +1055,7 @@ dependencies = [
  "bitflags",
  "crossterm_winapi 0.8.0",
  "libc",
- "mio",
+ "mio 0.7.13",
  "parking_lot 0.11.1",
  "signal-hook",
  "signal-hook-mio",
@@ -818,7 +1071,7 @@ dependencies = [
  "bitflags",
  "crossterm_winapi 0.9.0",
  "libc",
- "mio",
+ "mio 0.7.13",
  "parking_lot 0.11.1",
  "signal-hook",
  "signal-hook-mio",
@@ -879,7 +1132,7 @@ dependencies = [
  "csv-core",
  "itoa 0.4.7",
  "ryu",
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -891,6 +1144,16 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "ctor"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c"
+dependencies = [
+ "quote 1.0.9",
+ "syn 1.0.99",
+]
+
 [[package]]
 name = "ctr"
 version = "0.6.0"
@@ -910,6 +1173,37 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "curl"
+version = "0.4.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22"
+dependencies = [
+ "curl-sys",
+ "libc",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "socket2",
+ "winapi",
+]
+
+[[package]]
+name = "curl-sys"
+version = "0.4.56+curl-7.83.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6093e169dd4de29e468fa649fbae11cdcd5551c81fe5bf1b0677adad7ef3d26f"
+dependencies = [
+ "cc",
+ "libc",
+ "libnghttp2-sys",
+ "libz-sys",
+ "openssl-sys",
+ "pkg-config",
+ "vcpkg",
+ "winapi",
+]
+
 [[package]]
 name = "curve25519-dalek-fiat"
 version = "0.1.0"
@@ -953,15 +1247,37 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "223089cd5a4e4491f0a0dddd9933f9575123160cf96ca2bb56a690046ecf1745"
 
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2 1.0.43",
+ "quote 1.0.9",
+ "syn 1.0.99",
+]
+
+[[package]]
+name = "derive_arbitrary"
+version = "1.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "226ad66541d865d7a7173ad6a9e691c33fdb910ac723f4bc734b3e5294a1f931"
+dependencies = [
+ "proc-macro2 1.0.43",
+ "quote 1.0.9",
+ "syn 1.0.99",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -977,7 +1293,7 @@ dependencies = [
  "once_cell",
  "petgraph 0.6.0",
  "rayon",
- "serde 1.0.130",
+ "serde 1.0.145",
  "toml",
 ]
 
@@ -999,6 +1315,7 @@ dependencies = [
  "move-cli",
  "move-core-types",
  "move-stdlib",
+ "move-vm-test-utils",
  "move-vm-types",
 ]
 
@@ -1026,7 +1343,7 @@ dependencies = [
  "rand 0.8.4",
  "rand_core 0.6.2",
  "ripemd160",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde-name",
  "serde_bytes",
  "serde_json",
@@ -1044,9 +1361,9 @@ name = "diem-crypto-derive"
 version = "0.0.3"
 dependencies = [
  "anyhow",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -1061,6 +1378,12 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+
 [[package]]
 name = "difference"
 version = "2.0.0"
@@ -1189,13 +1512,19 @@ dependencies = [
  "shared_child",
 ]
 
+[[package]]
+name = "dunce"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "453440c271cf5577fd2a40e4942540cb7d0d2f85e27c8d07dd0023c925a67541"
+
 [[package]]
 name = "ed25519"
 version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37c66a534cbb46ab4ea03477eae19d5c22c01da8258030280b7bd9d8433fb6ef"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.145",
  "signature",
 ]
 
@@ -1208,7 +1537,7 @@ dependencies = [
  "curve25519-dalek-fiat",
  "ed25519",
  "rand 0.8.4",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_bytes",
  "sha2",
  "zeroize",
@@ -1220,12 +1549,30 @@ version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 
+[[package]]
+name = "ena"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7402b94a93c24e742487327a7cd839dc9d36fec9de9fb25b09f2dae459f36c3"
+dependencies = [
+ "log",
+]
+
 [[package]]
 name = "encode_unicode"
 version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
+[[package]]
+name = "encoding_rs"
+version = "0.8.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.8.4"
@@ -1255,7 +1602,7 @@ dependencies = [
  "hex",
  "once_cell",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_json",
  "sha3 0.10.1",
  "thiserror",
@@ -1303,7 +1650,7 @@ dependencies = [
  "rlp",
  "rlp-derive",
  "scale-info",
- "serde 1.0.130",
+ "serde 1.0.145",
  "sha3 0.9.1",
  "triehash",
 ]
@@ -1343,6 +1690,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f58da196a1fc8f14cb51f373f504efc66c434c577b777c2cd30d6fad16e4822"
 
+[[package]]
+name = "event-listener"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
 [[package]]
 name = "evm"
 version = "0.33.1"
@@ -1360,7 +1713,7 @@ dependencies = [
  "primitive-types 0.10.1",
  "rlp",
  "scale-info",
- "serde 1.0.130",
+ "serde 1.0.145",
  "sha3 0.8.2",
 ]
 
@@ -1374,7 +1727,7 @@ dependencies = [
  "parity-scale-codec 2.3.1",
  "primitive-types 0.10.1",
  "scale-info",
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -1430,7 +1783,7 @@ dependencies = [
  "move-to-yul",
  "once_cell",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_json",
 ]
 
@@ -1451,6 +1804,15 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
 
+[[package]]
+name = "fastrand"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
+dependencies = [
+ "instant",
+]
+
 [[package]]
 name = "fiat-crypto"
 version = "0.1.6"
@@ -1493,6 +1855,21 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.0.1"
@@ -1569,6 +1946,21 @@ version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582"
 
+[[package]]
+name = "futures-lite"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "memchr",
+ "parking",
+ "pin-project-lite",
+ "waker-fn",
+]
+
 [[package]]
 name = "futures-macro"
 version = "0.3.16"
@@ -1577,9 +1969,9 @@ checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
 dependencies = [
  "autocfg",
  "proc-macro-hack",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -1696,6 +2088,18 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "gloo-timers"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "guppy"
 version = "0.12.6"
@@ -1717,7 +2121,7 @@ dependencies = [
  "petgraph 0.6.0",
  "rayon",
  "semver 1.0.4",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_json",
  "smallvec",
  "target-spec",
@@ -1734,7 +2138,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "diffus",
  "semver 1.0.4",
- "serde 1.0.130",
+ "serde 1.0.145",
  "toml",
 ]
 
@@ -1744,6 +2148,25 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92620684d99f750bae383ecb3be3748142d6095760afd5cbcf2261e9a279d780"
 
+[[package]]
+name = "h2"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
 [[package]]
 name = "half"
 version = "1.7.1"
@@ -1810,6 +2233,12 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hex-literal"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+
 [[package]]
 name = "hkdf"
 version = "0.10.0"
@@ -1830,6 +2259,68 @@ dependencies = [
  "digest 0.9.0",
 ]
 
+[[package]]
+name = "http"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa 1.0.1",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+dependencies = [
+ "bytes",
+ "http",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
+
+[[package]]
+name = "httpdate"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+
+[[package]]
+name = "httpmock"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c159c4fc205e6c1a9b325cb7ec135d13b5f47188ce175dabb76ec847f331d9bd"
+dependencies = [
+ "assert-json-diff",
+ "async-object-pool",
+ "async-trait",
+ "base64",
+ "basic-cookies",
+ "crossbeam-utils",
+ "form_urlencoded",
+ "futures-util",
+ "hyper",
+ "isahc",
+ "lazy_static 1.4.0",
+ "levenshtein",
+ "log",
+ "regex",
+ "serde 1.0.145",
+ "serde_json",
+ "serde_regex",
+ "similar",
+ "tokio",
+ "url",
+]
+
 [[package]]
 name = "humansize"
 version = "1.1.0"
@@ -1843,13 +2334,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
-name = "humantime-serde"
-version = "1.0.1"
+name = "humantime-serde"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac34a56cfd4acddb469cc7fff187ed5ac36f498ba085caf8bbc725e3ff474058"
+dependencies = [
+ "humantime",
+ "serde 1.0.145",
+]
+
+[[package]]
+name = "hyper"
+version = "0.14.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa 1.0.1",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac34a56cfd4acddb469cc7fff187ed5ac36f498ba085caf8bbc725e3ff474058"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
- "humantime",
- "serde 1.0.130",
+ "bytes",
+ "hyper",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
 ]
 
 [[package]]
@@ -1928,7 +2456,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -1937,9 +2465,9 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -1996,12 +2524,45 @@ dependencies = [
  "proptest",
 ]
 
+[[package]]
+name = "ipnet"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
+
 [[package]]
 name = "is_ci"
 version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb"
 
+[[package]]
+name = "isahc"
+version = "1.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9"
+dependencies = [
+ "async-channel",
+ "castaway",
+ "crossbeam-utils",
+ "curl",
+ "curl-sys",
+ "encoding_rs",
+ "event-listener",
+ "futures-lite",
+ "http",
+ "log",
+ "mime",
+ "once_cell",
+ "polling",
+ "slab",
+ "sluice",
+ "tracing",
+ "tracing-futures",
+ "url",
+ "waker-fn",
+]
+
 [[package]]
 name = "itertools"
 version = "0.9.0"
@@ -2032,6 +2593,15 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
 
+[[package]]
+name = "jobserver"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "js-sys"
 version = "0.3.48"
@@ -2047,6 +2617,47 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
 
+[[package]]
+name = "kv-log-macro"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "lalrpop"
+version = "0.19.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b30455341b0e18f276fa64540aff54deafb54c589de6aca68659c63dd2d5d823"
+dependencies = [
+ "ascii-canvas",
+ "atty",
+ "bit-set",
+ "diff",
+ "ena",
+ "itertools 0.10.1",
+ "lalrpop-util",
+ "petgraph 0.6.0",
+ "pico-args",
+ "regex",
+ "regex-syntax",
+ "string_cache",
+ "term 0.7.0",
+ "tiny-keccak",
+ "unicode-xid 0.2.2",
+]
+
+[[package]]
+name = "lalrpop-util"
+version = "0.19.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bcf796c978e9b4d983414f4caedc9273aa33ee214c5b887bd55fde84c85d2dc4"
+dependencies = [
+ "regex",
+]
+
 [[package]]
 name = "language-benchmarks"
 version = "0.1.0"
@@ -2078,6 +2689,12 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
+[[package]]
+name = "levenshtein"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760"
+
 [[package]]
 name = "lexical-core"
 version = "0.7.6"
@@ -2093,42 +2710,67 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.112"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
+checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
 
 [[package]]
-name = "linked-hash-map"
-version = "0.5.4"
+name = "libfuzzer-sys"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
+checksum = "ae185684fe19814afd066da15a7cc41e126886c21282934225d9fc847582da58"
+dependencies = [
+ "arbitrary",
+ "cc",
+ "once_cell",
+]
 
 [[package]]
-name = "lock_api"
-version = "0.3.4"
+name = "libnghttp2-sys"
+version = "0.1.7+1.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
+checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f"
 dependencies = [
- "scopeguard",
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "libz-sys"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
 ]
 
+[[package]]
+name = "linked-hash-map"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
+
 [[package]]
 name = "lock_api"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
+checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b"
 dependencies = [
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.14"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 dependencies = [
  "cfg-if 1.0.0",
- "serde 1.0.130",
+ "serde 1.0.145",
+ "value-bag",
 ]
 
 [[package]]
@@ -2139,7 +2781,7 @@ checksum = "c351c75989da23b355226dc188dc2b52538a7f4f218d70fd7393c6b62b110444"
 dependencies = [
  "crossbeam-channel",
  "log",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_json",
 ]
 
@@ -2150,7 +2792,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f3734ab1d7d157fc0c45110e06b587c31cd82bea2ccfd6b563cbff0aaeeb1d3"
 dependencies = [
  "bitflags",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_json",
  "serde_repr",
  "url",
@@ -2192,6 +2834,22 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "memory-stats"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d3f458a3076e337e027943b8cb5f4f72a6651714f9258fc7dcd3ae3b51f0276"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+
 [[package]]
 name = "mio"
 version = "0.7.13"
@@ -2205,6 +2863,18 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "mio"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
+dependencies = [
+ "libc",
+ "log",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys",
+]
+
 [[package]]
 name = "miow"
 version = "0.3.7"
@@ -2243,24 +2913,27 @@ dependencies = [
  "datatest-stable",
  "heck 0.3.2",
  "log",
+ "move-binary-format",
  "move-bytecode-verifier",
  "move-command-line-common",
  "move-core-types",
  "move-model",
  "move-prover",
  "move-prover-test-utils",
- "serde 1.0.130",
+ "serde 1.0.145",
  "tempfile",
 ]
 
 [[package]]
 name = "move-analyzer"
-version = "0.0.0"
+version = "1.0.0"
 dependencies = [
  "anyhow",
  "clap 3.1.8",
  "codespan-reporting",
  "crossbeam",
+ "derivative",
+ "dunce",
  "im",
  "lsp-server",
  "lsp-types",
@@ -2270,6 +2943,7 @@ dependencies = [
  "move-package",
  "move-symbol-pool",
  "petgraph 0.5.1",
+ "serde 1.0.145",
  "serde_json",
  "tempfile",
  "url",
@@ -2291,6 +2965,7 @@ dependencies = [
  "move-prover-test-utils",
  "move-stdlib",
  "move-vm-runtime",
+ "move-vm-test-utils",
  "move-vm-types",
  "sha3 0.9.1",
  "smallvec",
@@ -2302,12 +2977,13 @@ name = "move-binary-format"
 version = "0.0.3"
 dependencies = [
  "anyhow",
+ "arbitrary",
  "move-core-types",
  "once_cell",
  "proptest",
  "proptest-derive",
  "ref-cast",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_json",
  "variant_count",
 ]
@@ -2327,7 +3003,7 @@ dependencies = [
  "move-core-types",
  "move-ir-types",
  "move-symbol-pool",
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -2346,6 +3022,8 @@ name = "move-bytecode-verifier"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "fail",
+ "hex-literal",
  "invalid-mutations",
  "move-binary-format",
  "move-borrow-graph",
@@ -2380,6 +3058,7 @@ dependencies = [
  "colored",
  "datatest-stable",
  "difference",
+ "httpmock",
  "itertools 0.10.1",
  "move-binary-format",
  "move-bytecode-source-map",
@@ -2391,6 +3070,7 @@ dependencies = [
  "move-core-types",
  "move-coverage",
  "move-disassembler",
+ "move-docgen",
  "move-errmapgen",
  "move-ir-types",
  "move-package",
@@ -2401,13 +3081,17 @@ dependencies = [
  "move-table-extension",
  "move-unit-test",
  "move-vm-runtime",
+ "move-vm-test-utils",
  "move-vm-types",
  "once_cell",
  "read-write-set",
  "read-write-set-dynamic",
- "serde 1.0.130",
+ "reqwest",
+ "serde 1.0.145",
+ "serde_json",
  "serde_yaml",
  "tempfile",
+ "toml_edit",
  "walkdir",
 ]
 
@@ -2417,10 +3101,12 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "difference",
+ "dirs-next",
  "hex",
  "move-core-types",
  "num-bigint 0.4.0",
- "serde 1.0.130",
+ "once_cell",
+ "serde 1.0.145",
  "sha2",
  "walkdir",
 ]
@@ -2468,17 +3154,22 @@ name = "move-core-types"
 version = "0.0.4"
 dependencies = [
  "anyhow",
+ "arbitrary",
  "bcs",
+ "ethnum",
  "hex",
+ "num 0.4.0",
  "once_cell",
+ "primitive-types 0.10.1",
  "proptest",
  "proptest-derive",
  "rand 0.8.4",
  "ref-cast",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_bytes",
  "serde_json",
+ "uint",
 ]
 
 [[package]]
@@ -2497,7 +3188,7 @@ dependencies = [
  "move-ir-types",
  "once_cell",
  "petgraph 0.5.1",
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -2534,7 +3225,7 @@ dependencies = [
  "num 0.4.0",
  "once_cell",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.145",
  "tempfile",
 ]
 
@@ -2551,7 +3242,7 @@ dependencies = [
  "move-core-types",
  "move-model",
  "move-prover",
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -2562,7 +3253,7 @@ dependencies = [
  "ethabi",
  "once_cell",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_json",
 ]
 
@@ -2642,7 +3333,7 @@ dependencies = [
  "move-core-types",
  "move-symbol-pool",
  "once_cell",
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -2669,7 +3360,7 @@ dependencies = [
  "num 0.4.0",
  "once_cell",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -2684,6 +3375,7 @@ dependencies = [
  "dirs-next",
  "evm-exec-utils",
  "hex",
+ "itertools 0.10.1",
  "move-abigen",
  "move-binary-format",
  "move-bytecode-source-map",
@@ -2700,13 +3392,15 @@ dependencies = [
  "petgraph 0.5.1",
  "ptree",
  "regex",
- "serde 1.0.130",
+ "reqwest",
+ "serde 1.0.145",
  "serde_yaml",
  "sha2",
  "tempfile",
  "termcolor",
  "toml",
  "walkdir",
+ "whoami",
 ]
 
 [[package]]
@@ -2740,7 +3434,7 @@ dependencies = [
  "once_cell",
  "pretty",
  "rand 0.8.4",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_json",
  "shell-words",
  "simplelog",
@@ -2763,6 +3457,7 @@ dependencies = [
  "log",
  "move-binary-format",
  "move-command-line-common",
+ "move-compiler",
  "move-core-types",
  "move-model",
  "move-stackless-bytecode",
@@ -2771,7 +3466,7 @@ dependencies = [
  "pretty",
  "rand 0.8.4",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_json",
  "tera",
  "tokio",
@@ -2794,7 +3489,7 @@ dependencies = [
  "anyhow",
  "move-binary-format",
  "move-core-types",
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -2808,7 +3503,7 @@ dependencies = [
  "move-bytecode-utils",
  "move-core-types",
  "once_cell",
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -2838,7 +3533,7 @@ dependencies = [
  "once_cell",
  "paste",
  "petgraph 0.5.1",
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -2857,7 +3552,7 @@ dependencies = [
  "move-prover-test-utils",
  "move-stackless-bytecode",
  "num 0.4.0",
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -2867,6 +3562,7 @@ dependencies = [
  "anyhow",
  "dir-diff",
  "file_diff",
+ "hex",
  "log",
  "move-binary-format",
  "move-cli",
@@ -2892,7 +3588,7 @@ name = "move-symbol-pool"
 version = "0.1.0"
 dependencies = [
  "once_cell",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_json",
 ]
 
@@ -2951,7 +3647,7 @@ dependencies = [
  "primitive-types 0.10.1",
  "rand 0.8.4",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_json",
  "sha3 0.9.1",
  "simplelog",
@@ -2972,6 +3668,7 @@ dependencies = [
  "move-binary-format",
  "move-bytecode-source-map",
  "move-bytecode-utils",
+ "move-bytecode-verifier",
  "move-cli",
  "move-command-line-common",
  "move-compiler",
@@ -2997,6 +3694,7 @@ name = "move-unit-test"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "better_any",
  "clap 3.1.8",
  "codespan-reporting",
  "colored",
@@ -3032,7 +3730,9 @@ name = "move-vm-integration-tests"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "memory-stats",
  "move-binary-format",
+ "move-bytecode-verifier",
  "move-compiler",
  "move-core-types",
  "move-stdlib",
@@ -3043,6 +3743,15 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "move-vm-paranoid-tests"
+version = "0.1.0"
+dependencies = [
+ "datatest-stable",
+ "fail",
+ "move-transactional-test-runner",
+]
+
 [[package]]
 name = "move-vm-runtime"
 version = "0.1.0"
@@ -3069,8 +3778,12 @@ name = "move-vm-test-utils"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "move-binary-format",
  "move-core-types",
  "move-table-extension",
+ "move-vm-types",
+ "once_cell",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -3090,30 +3803,54 @@ dependencies = [
  "move-core-types",
  "once_cell",
  "proptest",
- "serde 1.0.130",
+ "serde 1.0.145",
  "smallvec",
 ]
 
 [[package]]
 name = "named-lock"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3ab176d4bcfbcb53b8c7c5a25cb2c01674cda33db27064a85a16814c88c1f2d"
+checksum = "40a3eb6b7c682b65d1f631ec3176829d72ab450b3aacdd3f719bf220822e59ac"
 dependencies = [
  "libc",
  "once_cell",
- "parking_lot 0.10.2",
+ "parking_lot 0.12.1",
  "thiserror",
  "widestring",
  "winapi",
 ]
 
+[[package]]
+name = "native-tls"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9"
+dependencies = [
+ "lazy_static 1.4.0",
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
 [[package]]
 name = "nested"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca2b420f638f07fe83056b55ea190bb815f609ec5a35e7017884a10f78839c9e"
 
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
+
 [[package]]
 name = "nextest-config"
 version = "0.1.0"
@@ -3122,7 +3859,7 @@ dependencies = [
  "camino",
  "config",
  "humantime-serde",
- "serde 1.0.130",
+ "serde 1.0.145",
  "toml",
 ]
 
@@ -3148,7 +3885,7 @@ dependencies = [
  "owo-colors",
  "quick-junit",
  "rayon",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_json",
  "strip-ansi-escapes",
  "twox-hash",
@@ -3160,7 +3897,7 @@ version = "0.1.0"
 source = "git+https://github.com/diem/diem-devtools?rev=f99a204e3d3f8e503d51d7df42e55c8282b59154#f99a204e3d3f8e503d51d7df42e55c8282b59154"
 dependencies = [
  "camino",
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -3361,6 +4098,51 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
+[[package]]
+name = "openssl"
+version = "0.10.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0"
+dependencies = [
+ "bitflags",
+ "cfg-if 1.0.0",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+dependencies = [
+ "proc-macro2 1.0.43",
+ "quote 1.0.9",
+ "syn 1.0.99",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f"
+dependencies = [
+ "autocfg",
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "ordered-float"
 version = "2.1.1"
@@ -3407,9 +4189,9 @@ checksum = "41db02c8f8731cdd7a72b433c7900cce4bf245465b452c364bfd21f4566ab055"
 dependencies = [
  "Inflector",
  "proc-macro-error",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -3429,7 +4211,7 @@ dependencies = [
  "byte-slice-cast",
  "impl-trait-for-tuples",
  "parity-scale-codec-derive 2.3.1",
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -3443,7 +4225,7 @@ dependencies = [
  "byte-slice-cast",
  "impl-trait-for-tuples",
  "parity-scale-codec-derive 3.1.2",
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -3453,9 +4235,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27"
 dependencies = [
  "proc-macro-crate",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -3465,20 +4247,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c45ed1f39709f5a89338fab50e59816b2e8815f5bb58276e7ddf9afd495f73f8"
 dependencies = [
  "proc-macro-crate",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
 ]
 
 [[package]]
-name = "parking_lot"
-version = "0.10.2"
+name = "parking"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
-dependencies = [
- "lock_api 0.3.4",
- "parking_lot_core 0.7.2",
-]
+checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
 
 [[package]]
 name = "parking_lot"
@@ -3487,22 +4265,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
 dependencies = [
  "instant",
- "lock_api 0.4.4",
+ "lock_api",
  "parking_lot_core 0.8.3",
 ]
 
 [[package]]
-name = "parking_lot_core"
-version = "0.7.2"
+name = "parking_lot"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
- "cfg-if 0.1.10",
- "cloudabi",
- "libc",
- "redox_syscall 0.1.57",
- "smallvec",
- "winapi",
+ "lock_api",
+ "parking_lot_core 0.9.3",
 ]
 
 [[package]]
@@ -3519,6 +4293,19 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "parking_lot_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "redox_syscall 0.2.10",
+ "smallvec",
+ "windows-sys",
+]
+
 [[package]]
 name = "parse-zoneinfo"
 version = "0.3.0"
@@ -3576,9 +4363,9 @@ checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
 dependencies = [
  "pest",
  "pest_meta",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -3612,6 +4399,71 @@ dependencies = [
  "indexmap",
 ]
 
+[[package]]
+name = "phf"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
+dependencies = [
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
+dependencies = [
+ "phf_shared",
+ "rand 0.8.4",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+dependencies = [
+ "siphasher",
+ "uncased",
+]
+
+[[package]]
+name = "pico-args"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468"
+
+[[package]]
+name = "pin-project"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78203e83c48cffbe01e4a2d35d566ca4de445d79a85372fc64e378bfc812a260"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74"
+dependencies = [
+ "proc-macro2 1.0.43",
+ "quote 1.0.9",
+ "syn 1.0.99",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.7"
@@ -3624,6 +4476,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "pkg-config"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
+
 [[package]]
 name = "plotters"
 version = "0.3.0"
@@ -3652,6 +4510,19 @@ dependencies = [
  "plotters-backend",
 ]
 
+[[package]]
+name = "polling"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "log",
+ "wepoll-ffi",
+ "winapi",
+]
+
 [[package]]
 name = "polyval"
 version = "0.4.5"
@@ -3678,9 +4549,9 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "597c3287a549da151aca6ada2795ecde089c7527bd5093114e8e0e1c3f0e52b1"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -3689,6 +4560,12 @@ version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
 
+[[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
 [[package]]
 name = "pretty"
 version = "0.10.0"
@@ -3720,7 +4597,7 @@ dependencies = [
  "csv",
  "encode_unicode",
  "lazy_static 1.4.0",
- "term",
+ "term 0.5.2",
  "unicode-width",
 ]
 
@@ -3733,6 +4610,7 @@ dependencies = [
  "fixed-hash",
  "impl-codec 0.5.1",
  "impl-rlp",
+ "impl-serde",
  "scale-info",
  "uint",
 ]
@@ -3767,9 +4645,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
  "version_check",
 ]
 
@@ -3779,7 +4657,7 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
  "version_check",
 ]
@@ -3807,11 +4685,11 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.28"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
+checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
 dependencies = [
- "unicode-xid 0.2.2",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -3862,7 +4740,7 @@ dependencies = [
  "move-stackless-bytecode",
  "num 0.4.0",
  "plotters",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_json",
  "simplelog",
  "z3tracer",
@@ -3885,7 +4763,7 @@ dependencies = [
  "move-prover",
  "move-stackless-bytecode",
  "num 0.4.0",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_json",
  "simplelog",
 ]
@@ -3901,7 +4779,7 @@ dependencies = [
  "config",
  "directories",
  "petgraph 0.6.0",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde-value",
  "tint",
 ]
@@ -3952,7 +4830,7 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
 ]
 
 [[package]]
@@ -4173,9 +5051,9 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -4214,6 +5092,43 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "reqwest"
+version = "0.11.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92"
+dependencies = [
+ "base64",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-tls",
+ "ipnet",
+ "js-sys",
+ "lazy_static 1.4.0",
+ "log",
+ "mime",
+ "native-tls",
+ "percent-encoding",
+ "pin-project-lite",
+ "serde 1.0.145",
+ "serde_json",
+ "serde_urlencoded",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "winreg",
+]
+
 [[package]]
 name = "ripemd160"
 version = "0.9.1"
@@ -4241,9 +5156,9 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -4279,6 +5194,12 @@ dependencies = [
  "semver 0.9.0",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24c8ad4f0c00e1eb5bc7614d236a7f1300e3dbd76b68cac8e06fb00b015ad8d8"
+
 [[package]]
 name = "rusty-fork"
 version = "0.3.0"
@@ -4326,9 +5247,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd"
 dependencies = [
  "proc-macro-crate",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
+]
+
+[[package]]
+name = "schannel"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
+dependencies = [
+ "lazy_static 1.4.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -4337,6 +5268,29 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
+[[package]]
+name = "security-framework"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "semver"
 version = "0.9.0"
@@ -4352,7 +5306,7 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -4369,9 +5323,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
 
 [[package]]
 name = "serde"
-version = "1.0.130"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
+checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
 dependencies = [
  "serde_derive",
 ]
@@ -4394,7 +5348,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12c47087018ec281d1cdab673d36aea22d816b54d498264029c05d5fa1910da6"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.145",
  "thiserror",
 ]
 
@@ -4405,7 +5359,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "167450ba550f903a2b35a81ba3ca387585189e2430e3df6b94b95f3bec2f26bd"
 dependencies = [
  "once_cell",
- "serde 1.0.130",
+ "serde 1.0.145",
  "thiserror",
 ]
 
@@ -4416,7 +5370,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
 dependencies = [
  "ordered-float",
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -4425,7 +5379,7 @@ version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -4435,18 +5389,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
 dependencies = [
  "half",
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.130"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
+checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -4457,7 +5411,17 @@ checksum = "bcbd0344bc6533bc7ec56df11d42fb70f1b912351c0825ccb7211b59d8af7cf5"
 dependencies = [
  "itoa 1.0.1",
  "ryu",
- "serde 1.0.130",
+ "serde 1.0.145",
+]
+
+[[package]]
+name = "serde_regex"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf"
+dependencies = [
+ "regex",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -4466,9 +5430,21 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa 1.0.1",
+ "ryu",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -4479,7 +5455,7 @@ checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23"
 dependencies = [
  "dtoa",
  "linked-hash-map",
- "serde 1.0.130",
+ "serde 1.0.145",
  "yaml-rust",
 ]
 
@@ -4594,7 +5570,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29fd5867f1c4f2c5be079aee7a2adf1152ebb04a4bc4d341f504b7dece607ed4"
 dependencies = [
  "libc",
- "mio",
+ "mio 0.7.13",
  "signal-hook",
 ]
 
@@ -4613,6 +5589,12 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f0242b8e50dd9accdd56170e94ca1ebd223b098eb9c83539a6e367d0f36ae68"
 
+[[package]]
+name = "similar"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e24979f63a11545f5f2c60141afe249d4f19f84581ea2138065e400941d83d3"
+
 [[package]]
 name = "simplelog"
 version = "0.9.0"
@@ -4624,6 +5606,12 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "siphasher"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+
 [[package]]
 name = "sized-chunks"
 version = "0.6.5"
@@ -4649,6 +5637,17 @@ dependencies = [
  "deunicode",
 ]
 
+[[package]]
+name = "sluice"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5"
+dependencies = [
+ "async-channel",
+ "futures-core",
+ "futures-io",
+]
+
 [[package]]
 name = "smallvec"
 version = "1.7.0"
@@ -4667,6 +5666,16 @@ dependencies = [
  "structopt 0.3.25",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "spec-flatten"
 version = "0.1.0"
@@ -4693,6 +5702,19 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
+[[package]]
+name = "string_cache"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08"
+dependencies = [
+ "new_debug_unreachable",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "phf_shared",
+ "precomputed-hash",
+]
+
 [[package]]
 name = "strip-ansi-escapes"
 version = "0.1.1"
@@ -4755,9 +5777,9 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
 dependencies = [
  "heck 0.3.2",
  "proc-macro-error",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -4789,13 +5811,13 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.74"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"
+checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "unicode-xid 0.2.2",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -4804,9 +5826,9 @@ version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
  "unicode-xid 0.2.2",
 ]
 
@@ -4829,7 +5851,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdc03d14ed79a75163d3509ebf1970a2ec67945c5cac68d947d1dddace43cec0"
 dependencies = [
  "cfg-expr",
- "serde 1.0.130",
+ "serde 1.0.145",
  "target-lexicon",
 ]
 
@@ -4849,9 +5871,9 @@ dependencies = [
 
 [[package]]
 name = "tera"
-version = "1.7.1"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2617ab2fb1de8587a988a761692e59895438bebf404725d4f2123251f60bf23e"
+checksum = "7c9783d6ff395ae80cf17ed9a25360e7ba37742a79fa8fddabb073c5c7c8856d"
 dependencies = [
  "chrono",
  "chrono-tz",
@@ -4863,7 +5885,7 @@ dependencies = [
  "pest_derive",
  "rand 0.8.4",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_json",
  "slug",
  "unic-segment",
@@ -4880,6 +5902,17 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "term"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
+dependencies = [
+ "dirs-next",
+ "rustversion",
+ "winapi",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.1.2"
@@ -4931,29 +5964,29 @@ checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
 
 [[package]]
 name = "thiserror"
-version = "1.0.26"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.26"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
+checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
 dependencies = [
  "once_cell",
 ]
@@ -4993,7 +6026,7 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_json",
 ]
 
@@ -5014,33 +6047,57 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.9.0"
+version = "1.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b7b349f11a7047e6d1276853e612d152f5e8a352c61917887cc2169e2366b4c"
+checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
 dependencies = [
- "autocfg",
  "bytes",
  "libc",
  "memchr",
- "mio",
+ "mio 0.8.4",
  "num_cpus",
  "once_cell",
- "parking_lot 0.11.1",
+ "parking_lot 0.12.1",
  "pin-project-lite",
  "signal-hook-registry",
+ "socket2",
  "tokio-macros",
  "winapi",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "1.3.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110"
+checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
+]
+
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+ "tracing",
 ]
 
 [[package]]
@@ -5050,9 +6107,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
 dependencies = [
  "indexmap",
- "serde 1.0.130",
+ "serde 1.0.145",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5376256e44f2443f8896ac012507c19a012df0fe8758b55246ae51a2279db51f"
+dependencies = [
+ "combine",
+ "indexmap",
+ "itertools 0.10.1",
+ "serde 1.0.145",
 ]
 
+[[package]]
+name = "tower-service"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+
 [[package]]
 name = "tracing"
 version = "0.1.26"
@@ -5060,6 +6135,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
 dependencies = [
  "cfg-if 1.0.0",
+ "log",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -5071,18 +6147,29 @@ version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.21"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4"
+checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7"
 dependencies = [
- "lazy_static 1.4.0",
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-futures"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
+dependencies = [
+ "pin-project",
+ "tracing",
 ]
 
 [[package]]
@@ -5098,13 +6185,13 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.3"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245da694cc7fc4729f3f418b304cb57789f1bed2a78c575407ab8a23f53cb4d3"
+checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b"
 dependencies = [
  "ansi_term 0.12.1",
- "lazy_static 1.4.0",
  "matchers",
+ "once_cell",
  "regex",
  "sharded-slab",
  "smallvec",
@@ -5124,6 +6211,12 @@ dependencies = [
  "rlp",
 ]
 
+[[package]]
+name = "try-lock"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
+
 [[package]]
 name = "trybuild"
 version = "1.0.53"
@@ -5132,7 +6225,7 @@ checksum = "9d664de8ea7e531ad4c0f5a834f20b8cb2b8e6dfe88d05796ee7887518ed67b9"
 dependencies = [
  "glob",
  "lazy_static 1.4.0",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_json",
  "termcolor",
  "toml",
@@ -5181,9 +6274,9 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
 
 [[package]]
 name = "uint"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0"
+checksum = "a45526d29728d135c2900b0d30573fe3ee79fceb12ef534c7bb30e810a91b601"
 dependencies = [
  "byteorder",
  "crunchy",
@@ -5191,6 +6284,15 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "uncased"
+version = "0.9.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622"
+dependencies = [
+ "version_check",
+]
+
 [[package]]
 name = "unic-char-property"
 version = "0.9.0"
@@ -5250,6 +6352,12 @@ dependencies = [
  "matches",
 ]
 
+[[package]]
+name = "unicode-ident"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
+
 [[package]]
 name = "unicode-normalization"
 version = "0.1.17"
@@ -5309,7 +6417,7 @@ dependencies = [
  "idna",
  "matches",
  "percent-encoding",
- "serde 1.0.130",
+ "serde 1.0.145",
 ]
 
 [[package]]
@@ -5318,6 +6426,22 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
 
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "value-bag"
+version = "1.0.0-alpha.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55"
+dependencies = [
+ "ctor",
+ "version_check",
+]
+
 [[package]]
 name = "variant_count"
 version = "1.1.0"
@@ -5325,9 +6449,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aae2faf80ac463422992abf4de234731279c058aaf33171ca70277c98406b124"
 dependencies = [
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
 ]
 
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
 [[package]]
 name = "vec_map"
 version = "0.8.2"
@@ -5357,7 +6487,7 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
 ]
 
@@ -5370,6 +6500,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "waker-fn"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+
 [[package]]
 name = "walkdir"
 version = "2.3.2"
@@ -5381,6 +6517,16 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "want"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+dependencies = [
+ "log",
+ "try-lock",
+]
+
 [[package]]
 name = "wasi"
 version = "0.9.0+wasi-snapshot-preview1"
@@ -5393,6 +6539,12 @@ version = "0.10.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.71"
@@ -5412,12 +6564,24 @@ dependencies = [
  "bumpalo",
  "lazy_static 1.4.0",
  "log",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
  "wasm-bindgen-shared",
 ]
 
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e67a5806118af01f0d9045915676b22aaebecf4178ae7021bc171dab0b897ab"
+dependencies = [
+ "cfg-if 1.0.0",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "wasm-bindgen-macro"
 version = "0.2.71"
@@ -5434,9 +6598,9 @@ version = "0.2.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc053ec74d454df287b9374ee8abb36ffd5acb95ba87da3ba5b7d3fe20eb401e"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -5457,11 +6621,30 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "wepoll-ffi"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "whoami"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524b58fa5a20a2fb3014dd6358b70e6579692a56ef6fce928834e488f42f65e8"
+dependencies = [
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "widestring"
-version = "0.4.3"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c"
+checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
 
 [[package]]
 name = "winapi"
@@ -5494,6 +6677,58 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows-sys"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+dependencies = [
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+
+[[package]]
+name = "winreg"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "wyz"
 version = "0.2.0"
@@ -5530,7 +6765,7 @@ dependencies = [
  "nextest-runner",
  "rayon",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.145",
  "serde_json",
  "supports-color",
  "toml",
@@ -5551,7 +6786,7 @@ dependencies = [
  "log",
  "once_cell",
  "ouroboros",
- "serde 1.0.130",
+ "serde 1.0.145",
  "toml",
 ]
 
@@ -5562,7 +6797,7 @@ dependencies = [
  "camino",
  "guppy",
  "once_cell",
- "serde 1.0.130",
+ "serde 1.0.145",
  "toml",
  "x-core",
 ]
@@ -5613,8 +6848,8 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bdff2024a851a322b08f179173ae2ba620445aef1e838f0c196820eade4ae0c7"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.43",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.99",
  "synstructure",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 82231f04a4..ef9b55931e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,6 +22,7 @@ members = [
     "language/move-borrow-graph",
     "language/move-bytecode-verifier",
     "language/move-bytecode-verifier/bytecode-verifier-tests",
+    "language/move-bytecode-verifier/fuzz",
     "language/move-bytecode-verifier/invalid-mutations",
     "language/move-bytecode-verifier/transactional-tests",
     "language/move-command-line-common",
@@ -51,6 +52,7 @@ members = [
     "language/move-stdlib",
     "language/move-symbol-pool",
     "language/move-vm/integration-tests",
+    "language/move-vm/paranoid-tests",
     "language/move-vm/runtime",
     "language/move-vm/test-utils",
     "language/move-vm/transactional-tests",
@@ -72,7 +74,7 @@ members = [
     "language/tools/read-write-set/types",
 ]
 
-# NOTE: default-members is the complete list of binaries that form the "production Diem codebase". These members should
+# NOTE: default-members is the complete list of binaries that form the "production Move codebase". These members should
 # never include crates that require fuzzing features or test features. These are the crates we want built with no extra
 # test-only code included.
 #
@@ -95,8 +97,9 @@ default-members = [
     "language/tools/move-unit-test",
 ]
 
-# [profile.release]
-# debug = true
+# Dependencies that should be kept in sync through the whole workspace
+[workspace.dependencies]
+bcs = "0.1.4"
 
 [profile.bench]
 debug = true
@@ -107,7 +110,6 @@ debug = true
 # use release settings to reduce memory pressure in the linking step in CI
 [profile.ci]
 inherits = "test"
-opt-level = 3
 debug = 0 # for saving disk space during linking
 incremental = false
 codegen-units = 16
diff --git a/GRAVEYARD.md b/GRAVEYARD.md
new file mode 100644
index 0000000000..d947d6e591
--- /dev/null
+++ b/GRAVEYARD.md
@@ -0,0 +1,54 @@
+# Language feature idea graveyard
+
+Move is a smart contract language that counts minimalism as one of its guiding principles. Features are often proposed, but not always implemented. This list exists to record feature proposals that did not progress to acceptance. The goal of maintaining this list is to avoid duplicate proposals, and to explain the rationale for not moving forward with an idea that might seem promising at first blush.
+
+## Pure data structs
+
+### Decision
+We should let adapters decide how to handle this
+
+### Rationale
+Structs being passed to transactions cause safety issues because deserialization can circumvent modular encapsulation. For example, below make is the only way to create S and the program guarantees that field x is always greater zero; however, if S is obtained via deserialization, this constraint can be violated::
+```
+struct S has drop, copy { x: u64 }
+public fun make(x: u64) { assert!(x > 0); S{x} }
+
+fun(entry) foo(s: S/*no guarantee about s.x*/) { … }
+```
+
+## Native structs
+
+### Decision
+This is obsolete as regular structs can be used from native code, e.g. struct S { native_handle: u128 }
+
+### Rationale
+As Move evolves to an extensible language, native structs are an important  tool for extensibility. However, support for native structs has been removed from the VM (though still supported in compiler and file format).
+
+### Design
+Bring back support for native structs in the VM. They can use a simple uniform representation via handles which are managed by the runtime environment (like u128 or u256 for each and every native struct value), so implementation effort should be small.
+
+## Signer relaxation for `move_to`
+
+### Decision
+Tables and framework-specific workarounds like `ResourceAccount` make this unneccessary.
+
+### Rationale
+In some usage scenarios of Move, it does not make sense to only allow move_to<R>(s, x) with s a signer. For instance, when Move is running on the EVM, storage is not owned and paid for by the account owner, but by the contract caller, which manages the accounts on behalf of owners. In general, the signer requirement allows one to only create new resources at addresses for which the transaction has a signer, which disables the capability to manage resource collections on behalf of others.
+
+## Design (Option A)
+Drop the requirement of passing a signer to move-to all together. For downwards compatibility reasons, the compiler allows passing either a signer or an address. Rationale for this quite radical step is that in-real world contracts (e.g. the Diem Payment Network) more complex access control patterns than enabled by signer/move_to are needed anyway. Moreover, since only modules which declare a resource R can call move_to<R>, preventing publishing without a signer can still be modeled by modular encapsulation.
+
+### Design (Option B)
+Use an attribute on struct declarations to indicate a signer is not required for publishing this struct.
+
+### Design (Option C)
+Have another function which does not require a signer, e.g. move_to_address. This, however, raises questions of adequate naming and methodology (when to use which function, should there be constraints when which function is allowed, etc.)
+
+### Design (Option D)
+Add no new features and ask clients that want this feature (e.g., the Move -> EVM compilation effort) to implement it via design patterns and/or native functions. See SignerCapability in the Starcoin Account code for one example of a design pattern for (effectively) implementing move_to_address without changing the language.
+
+### Design (Option E)
+Support this via a new internal ability that allows framework designers to implement more powerful native functions with the same encapsulation guarantees as bytecodes. For example, the framework designer can define a function `public native fun move_to_address<T: internal>(a: address, t: T)` that can only be invoked on `T`’s declared in the calling module.
+
+### Design (Option F)
+Use tables when there is a need to index storage without signer.
diff --git a/README.md b/README.md
index 29eacaceec..69fd0f4313 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 
 [![License](https://img.shields.io/badge/license-Apache-green.svg)](LICENSE)
-[![Discord chat](https://img.shields.io/discord/903339070925721652.svg?logo=discord&style=flat-square)](https://discord.gg/M95qX3KnG8)
+[![Discord chat](https://img.shields.io/discord/964205366541963294.svg?logo=discord&style=flat-square)](https://discord.gg/zamKKnZBZp)
 
+![Move logo](assets/color/SVG/Move_Logo_Design_Digital_Final_-01.svg)
 
 # The Move Language
 
@@ -21,9 +22,11 @@ docker build -t move/cli -f docker/move-cli/Dockerfile .
 
 ```
 cd ./language/documentation/tutorial/step_1/BasicCoin
-docker run -v `pwd`:/project move/cli package build
+docker run -v `pwd`:/project move/cli build
 ```
 
+Follow the [language/documentation/tutorial](./language/documentation/tutorial/README.md) to set up move for development.
+
 ## Community
 
 * Join us on the [Move Discord](https://discord.gg/cPUmhe24Mz).
diff --git a/assets/color/AI/Move_Logo_Design_GreyScale_Digital_Final.ai b/assets/color/AI/Move_Logo_Design_GreyScale_Digital_Final.ai
new file mode 100644
index 0000000000..3919fe2b2f
--- /dev/null
+++ b/assets/color/AI/Move_Logo_Design_GreyScale_Digital_Final.ai
@@ -0,0 +1,1561 @@
+%PDF-1.6
%����
+1 0 obj
<</Metadata 2 0 R/OCProperties<</D<</ON[26 0 R]/Order 27 0 R/RBGroups[]>>/OCGs[26 0 R]>>/Pages 3 0 R/Type/Catalog>>
endobj
2 0 obj
<</Length 48267/Subtype/XML/Type/Metadata>>stream
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 6.0-c002 79.164519, 2020/08/25-17:54:00        ">
+   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <rdf:Description rdf:about=""
+            xmlns:dc="http://purl.org/dc/elements/1.1/"
+            xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+            xmlns:xmpGImg="http://ns.adobe.com/xap/1.0/g/img/"
+            xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+            xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
+            xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#"
+            xmlns:illustrator="http://ns.adobe.com/illustrator/1.0/"
+            xmlns:pdf="http://ns.adobe.com/pdf/1.3/"
+            xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/"
+            xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/"
+            xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
+            xmlns:stFnt="http://ns.adobe.com/xap/1.0/sType/Font#"
+            xmlns:xmpG="http://ns.adobe.com/xap/1.0/g/">
+         <dc:format>application/pdf</dc:format>
+         <dc:title>
+            <rdf:Alt>
+               <rdf:li xml:lang="x-default">Move_Logo Design_GreyScale_Digital_Final</rdf:li>
+            </rdf:Alt>
+         </dc:title>
+         <xmp:CreatorTool>Adobe Illustrator 25.0 (Macintosh)</xmp:CreatorTool>
+         <xmp:CreateDate>2020-12-02T14:23:27-08:00</xmp:CreateDate>
+         <xmp:ModifyDate>2020-12-02T14:23:27-08:00</xmp:ModifyDate>
+         <xmp:MetadataDate>2020-12-02T14:23:27-08:00</xmp:MetadataDate>
+         <xmp:Thumbnails>
+            <rdf:Alt>
+               <rdf:li rdf:parseType="Resource">
+                  <xmpGImg:width>220</xmpGImg:width>
+                  <xmpGImg:height>256</xmpGImg:height>
+                  <xmpGImg:format>JPEG</xmpGImg:format>
+                  <xmpGImg:image>/9j/4AAQSkZJRgABAgEBLAEsAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABABLAAAAAEA&#xA;AQEsAAAAAQAB/+IMWElDQ19QUk9GSUxFAAEBAAAMSExpbm8CEAAAbW50clJHQiBYWVogB84AAgAJ&#xA;AAYAMQAAYWNzcE1TRlQAAAAASUVDIHNSR0IAAAAAAAAAAAAAAAAAAPbWAAEAAAAA0y1IUCAgAAAA&#xA;AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARY3BydAAAAVAAAAAz&#xA;ZGVzYwAAAYQAAABsd3RwdAAAAfAAAAAUYmtwdAAAAgQAAAAUclhZWgAAAhgAAAAUZ1hZWgAAAiwA&#xA;AAAUYlhZWgAAAkAAAAAUZG1uZAAAAlQAAABwZG1kZAAAAsQAAACIdnVlZAAAA0wAAACGdmlldwAA&#xA;A9QAAAAkbHVtaQAAA/gAAAAUbWVhcwAABAwAAAAkdGVjaAAABDAAAAAMclRSQwAABDwAAAgMZ1RS&#xA;QwAABDwAAAgMYlRSQwAABDwAAAgMdGV4dAAAAABDb3B5cmlnaHQgKGMpIDE5OTggSGV3bGV0dC1Q&#xA;YWNrYXJkIENvbXBhbnkAAGRlc2MAAAAAAAAAEnNSR0IgSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAS&#xA;c1JHQiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA&#xA;AAAAAAAAAAAAAFhZWiAAAAAAAADzUQABAAAAARbMWFlaIAAAAAAAAAAAAAAAAAAAAABYWVogAAAA&#xA;AAAAb6IAADj1AAADkFhZWiAAAAAAAABimQAAt4UAABjaWFlaIAAAAAAAACSgAAAPhAAAts9kZXNj&#xA;AAAAAAAAABZJRUMgaHR0cDovL3d3dy5pZWMuY2gAAAAAAAAAAAAAABZJRUMgaHR0cDovL3d3dy5p&#xA;ZWMuY2gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAA&#xA;AAAAAAAuSUVDIDYxOTY2LTIuMSBEZWZhdWx0IFJHQiBjb2xvdXIgc3BhY2UgLSBzUkdCAAAAAAAA&#xA;AAAAAAAuSUVDIDYxOTY2LTIuMSBEZWZhdWx0IFJHQiBjb2xvdXIgc3BhY2UgLSBzUkdCAAAAAAAA&#xA;AAAAAAAAAAAAAAAAAAAAAGRlc2MAAAAAAAAALFJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBp&#xA;biBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAACxSZWZlcmVuY2UgVmlld2luZyBDb25kaXRpb24gaW4g&#xA;SUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB2aWV3AAAAAAATpP4AFF8uABDP&#xA;FAAD7cwABBMLAANcngAAAAFYWVogAAAAAABMCVYAUAAAAFcf521lYXMAAAAAAAAAAQAAAAAAAAAA&#xA;AAAAAAAAAAAAAAKPAAAAAnNpZyAAAAAAQ1JUIGN1cnYAAAAAAAAEAAAAAAUACgAPABQAGQAeACMA&#xA;KAAtADIANwA7AEAARQBKAE8AVABZAF4AYwBoAG0AcgB3AHwAgQCGAIsAkACVAJoAnwCkAKkArgCy&#xA;ALcAvADBAMYAywDQANUA2wDgAOUA6wDwAPYA+wEBAQcBDQETARkBHwElASsBMgE4AT4BRQFMAVIB&#xA;WQFgAWcBbgF1AXwBgwGLAZIBmgGhAakBsQG5AcEByQHRAdkB4QHpAfIB+gIDAgwCFAIdAiYCLwI4&#xA;AkECSwJUAl0CZwJxAnoChAKOApgCogKsArYCwQLLAtUC4ALrAvUDAAMLAxYDIQMtAzgDQwNPA1oD&#xA;ZgNyA34DigOWA6IDrgO6A8cD0wPgA+wD+QQGBBMEIAQtBDsESARVBGMEcQR+BIwEmgSoBLYExATT&#xA;BOEE8AT+BQ0FHAUrBToFSQVYBWcFdwWGBZYFpgW1BcUF1QXlBfYGBgYWBicGNwZIBlkGagZ7BowG&#xA;nQavBsAG0QbjBvUHBwcZBysHPQdPB2EHdAeGB5kHrAe/B9IH5Qf4CAsIHwgyCEYIWghuCIIIlgiq&#xA;CL4I0gjnCPsJEAklCToJTwlkCXkJjwmkCboJzwnlCfsKEQonCj0KVApqCoEKmAquCsUK3ArzCwsL&#xA;Igs5C1ELaQuAC5gLsAvIC+EL+QwSDCoMQwxcDHUMjgynDMAM2QzzDQ0NJg1ADVoNdA2ODakNww3e&#xA;DfgOEw4uDkkOZA5/DpsOtg7SDu4PCQ8lD0EPXg96D5YPsw/PD+wQCRAmEEMQYRB+EJsQuRDXEPUR&#xA;ExExEU8RbRGMEaoRyRHoEgcSJhJFEmQShBKjEsMS4xMDEyMTQxNjE4MTpBPFE+UUBhQnFEkUahSL&#xA;FK0UzhTwFRIVNBVWFXgVmxW9FeAWAxYmFkkWbBaPFrIW1hb6Fx0XQRdlF4kXrhfSF/cYGxhAGGUY&#xA;ihivGNUY+hkgGUUZaxmRGbcZ3RoEGioaURp3Gp4axRrsGxQbOxtjG4obshvaHAIcKhxSHHscoxzM&#xA;HPUdHh1HHXAdmR3DHeweFh5AHmoelB6+HukfEx8+H2kflB+/H+ogFSBBIGwgmCDEIPAhHCFIIXUh&#xA;oSHOIfsiJyJVIoIiryLdIwojOCNmI5QjwiPwJB8kTSR8JKsk2iUJJTglaCWXJccl9yYnJlcmhya3&#xA;JugnGCdJJ3onqyfcKA0oPyhxKKIo1CkGKTgpaymdKdAqAio1KmgqmyrPKwIrNitpK50r0SwFLDks&#xA;biyiLNctDC1BLXYtqy3hLhYuTC6CLrcu7i8kL1ovkS/HL/4wNTBsMKQw2zESMUoxgjG6MfIyKjJj&#xA;Mpsy1DMNM0YzfzO4M/E0KzRlNJ402DUTNU01hzXCNf02NzZyNq426TckN2A3nDfXOBQ4UDiMOMg5&#xA;BTlCOX85vDn5OjY6dDqyOu87LTtrO6o76DwnPGU8pDzjPSI9YT2hPeA+ID5gPqA+4D8hP2E/oj/i&#xA;QCNAZECmQOdBKUFqQaxB7kIwQnJCtUL3QzpDfUPARANER0SKRM5FEkVVRZpF3kYiRmdGq0bwRzVH&#xA;e0fASAVIS0iRSNdJHUljSalJ8Eo3Sn1KxEsMS1NLmkviTCpMcky6TQJNSk2TTdxOJU5uTrdPAE9J&#xA;T5NP3VAnUHFQu1EGUVBRm1HmUjFSfFLHUxNTX1OqU/ZUQlSPVNtVKFV1VcJWD1ZcVqlW91dEV5JX&#xA;4FgvWH1Yy1kaWWlZuFoHWlZaplr1W0VblVvlXDVchlzWXSddeF3JXhpebF69Xw9fYV+zYAVgV2Cq&#xA;YPxhT2GiYfViSWKcYvBjQ2OXY+tkQGSUZOllPWWSZedmPWaSZuhnPWeTZ+loP2iWaOxpQ2maafFq&#xA;SGqfavdrT2una/9sV2yvbQhtYG25bhJua27Ebx5veG/RcCtwhnDgcTpxlXHwcktypnMBc11zuHQU&#xA;dHB0zHUodYV14XY+dpt2+HdWd7N4EXhueMx5KnmJeed6RnqlewR7Y3vCfCF8gXzhfUF9oX4BfmJ+&#xA;wn8jf4R/5YBHgKiBCoFrgc2CMIKSgvSDV4O6hB2EgITjhUeFq4YOhnKG14c7h5+IBIhpiM6JM4mZ&#xA;if6KZIrKizCLlov8jGOMyo0xjZiN/45mjs6PNo+ekAaQbpDWkT+RqJIRknqS45NNk7aUIJSKlPSV&#xA;X5XJljSWn5cKl3WX4JhMmLiZJJmQmfyaaJrVm0Kbr5wcnImc951kndKeQJ6unx2fi5/6oGmg2KFH&#xA;obaiJqKWowajdqPmpFakx6U4pammGqaLpv2nbqfgqFKoxKk3qamqHKqPqwKrdavprFys0K1Erbiu&#xA;La6hrxavi7AAsHWw6rFgsdayS7LCszizrrQltJy1E7WKtgG2ebbwt2i34LhZuNG5SrnCuju6tbsu&#xA;u6e8IbybvRW9j74KvoS+/796v/XAcMDswWfB48JfwtvDWMPUxFHEzsVLxcjGRsbDx0HHv8g9yLzJ&#xA;Osm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc&#xA;1+DYZNjo2WzZ8dp22vvbgNwF3IrdEN2W3hzeot8p36/gNuC94UThzOJT4tvjY+Pr5HPk/OWE5g3m&#xA;lucf56noMui86Ubp0Opb6uXrcOv77IbtEe2c7ijutO9A78zwWPDl8XLx//KM8xnzp/Q09ML1UPXe&#xA;9m32+/eK+Bn4qPk4+cf6V/rn+3f8B/yY/Sn9uv5L/tz/bf///+4ADkFkb2JlAGTAAAAAAf/bAIQA&#xA;BgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoKDBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8f&#xA;Hx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f&#xA;Hx8fHx8fHx8fHx8fHx8f/8AAEQgBAADcAwERAAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQF&#xA;AwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAAAQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMB&#xA;AgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPBUtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdU&#xA;ZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eX&#xA;p7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZqbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUE&#xA;BQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEyobHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PS&#xA;NeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG&#xA;1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/a&#xA;AAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX&#xA;Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY&#xA;q7FXYq7FXYq7FXYq7FXYq7FXYqsmuIIFDTSJEpNAXYKCfpxVR/Sem/8ALXD/AMjE/rhpFu/Sem/8&#xA;tcP/ACMT+uNLbv0npv8Ay1w/8jE/rjS279J6b/y1w/8AIxP640tu/Sem/wDLXD/yMT+uNLbv0npv&#xA;/LXD/wAjE/rjS279J6b/AMtcP/IxP640tu/Sem/8tcP/ACMT+uNLbv0npv8Ay1w/8jE/rjS279J6&#xA;b/y1w/8AIxP640tu/Sem/wDLXD/yMT+uNLbv0npv/LXD/wAjE/rjS22uo6e7BEuomZjRVDqSSegA&#xA;rjSbRGBXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq8G/5y/8A+UI0b/tpj/qHkzJ03MtGfk+TszXE&#xA;dirsVdirsVdirsVdirsVdirsVdirJvyy/wDJk+U/+2zp/wD1FR5DJ9J9zOH1B+gmaxz3Yq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq8G/5y/8A+UI0b/tpj/qHkzJ03MtGfk+TszXEdirsVdirsVdirsVd&#xA;irsVdirsVdirJvyy/wDJk+U/+2zp/wD1FR5DJ9J9zOH1B+gmaxz3Yq7FXYq7FXYq7FXYq7FXYq7F&#xA;XYq7FXYq8G/5y/8A+UI0b/tpj/qHkzJ03MtGfk+TszXEdirsVdirsVdirsVdirsVdirsVdirJvyy&#xA;/wDJk+U/+2zp/wD1FR5DJ9J9zOH1B+gmaxz3Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq8G/5y/8A&#xA;+UI0b/tpj/qHkzJ03MtGfk+TszXEdirsVdirsVdirsVdirsVdirsVdirJvyy/wDJk+U/+2zp/wD1&#xA;FR5DJ9J9zOH1B+gmaxz3Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq8G/5y/8A+UI0b/tpj/qHkzJ0&#xA;3MtGfk+TszXEdirsVdirsVdirsVdirsVdirsVdirJvyy/wDJk+U/+2zp/wD1FR5DJ9J9zOH1B+gm&#xA;axz3Yq7FXYq7FUqu/NOh2s5gluQZFNHCKzgHwJUEZkw0mSQsB12btXT45cMpb/NMLW7truFZ7aQS&#xA;xN0Zf1HwOUTgYmjzczDmhljxQNhZZ6lp18rNZXUN0qEBzDIsgBPSvEmmAhtt1nqWnXwc2V1DdBKB&#xA;zDIsnGvSvEmmJCLRGBLsVdirsVdirwb/AJy//wCUI0b/ALaY/wCoeTMnTcy0Z+T5OzNcR2KuxVdH&#xA;HJLIscal5HIVEUEsSdgAB1xpSQBZZIPy484m39cWBIpy9P1I+dP9XlWvt1y3wJ9zgfypguuL72Pp&#xA;Z3b3P1VIJGuuRX0FVjJyHUcQK1FMqOzng3uF36Pv/rf1P6tL9crT6twb1K0rThTl03wWmllxbXFt&#xA;M0FzE8EyU5xSKUYVFRVTQ9DiqlhQ7FXYq7FWTfll/wCTJ8p/9tnT/wDqKjyGT6T7mcPqD9BM1jnu&#xA;xV2KvLvz983eaPLmgWD6FK1qt1O0d3eooZkCrVEBYELz3367ZvuwNJizZJeILobBwtbllCI4XjWh&#xA;/mj+YFzf28Nxr10YpJFVxyAqCaUqAOudPn7L00YkiEXSanWZRA1I8mbQXl1UH1CTmulAPJmRek/l&#xA;/NP9ZniNRG0Qdl7BwQB+s5ou0oigfN6X2cnLxJR/h4b+Nh8t/lt5x1TyDoeqXvxm081aZc2+nMgP&#xA;w6hbSelGff01lLf7IZRkiJH3PRQlwj3p9+WOr+avJd9qHkzSJIbTXdY1m00yXUbhBJHbGNHEpEZI&#xA;Dvyei16098jkAlueVMoEx2Zrqf5tfmT5Z81T6RrOoW19YeXNUsYdb1CG2SIT2OooHDuvxCJoaU+A&#xA;7lqGtK5WMcSLHVmckgd+iWSfnn+ZOpaulrpbypY6zd3k2kS2mnLqF0un2rPHGIoFKeoWdG9Qsdgt&#xA;R3w+DEDdHiyL2T8oPNfmjzJ5Ue58zafLYavaXUlpL60D2pmVFV1mETiq1D8SBtUHKMsQDs3Y5Ejd&#xA;m+Vs3Yq8G/5y/wD+UI0b/tpj/qHkzJ03MtGfk+TszXEdiqd6NY2c1sZJFEknIgg9vozpOyNFhyYu&#xA;KQ4pX8nFz5JA0GeeQdI0sat631dBNFEzRNTcEkKSPoOZOq0eKABjEB0vaWefBV7EvS1ij4E0oR0O&#xA;a6cRToLNsS0i2tIf+cgfLUkNBLOjSXCj+cQzKGPuVUZpdYOb1/YM5HHR6S2ehnTdI/xgPzcov1Q6&#xA;abYxVHIaoJxYjfw4n0v86Zg2a4Xe1vxMa/OLy15H0nWNX85eZtOudbfUdRtdPt7OC4NskKJYRMzl&#xA;kBYueDUU9dunXJY5EigxmANyo6l+QHlS4mj07Q1ma9sNWtP0q0sjGX9FXa+oSyfZV0qVBAGy774R&#xA;lPVTjCvJ+Uf5P24tbi5aCGx1qacWs1zqotGhhhb00a1SQN9YZtnfm3wk/Rg8SSeCL598x6XBpWv6&#xA;jptvcpe29ncSww3cZDJKiMQrgio+Ib7Zkg2GgiiluFDJvyy/8mT5T/7bOn/9RUeQyfSfczh9QfoJ&#xA;msc92KuxVZPBBPE0M8ayxPs0bgMp77g7YYyINhBFoP8AQGhf9W21/wCRMf8AzTlv5jJ/Ol8yxOOJ&#xA;6BILr8urFrgyWtx9XiJr6RQPx/1TVczYdpyqpCy8/m9nYSlcJcI7qv8ASn+j6LaaVAY4as70Mkrd&#xA;WI+XYZh588shsu10Oghpo1HmeZYtD+Sv5dRaXpemDTS1no121/YI8srFZnKs3Ji1WVigqp22yHiy&#xA;ty/DC7Ufya/L7URqhu9PZ5NXu11C6mE0qyLdJy4yRMGBjP7xtl2xGWQU4wV1n+T3kK18ual5fFi8&#xA;1lrDJJqks00klxO8bBkZ5mbn8LLUUIp9JxOWV2vhiqW6l+TnkK+0XStJaykt4dEVl0u4tppIbiEO&#xA;avSVTyPM7nlXfEZZA2pximQ+WfK+h+WNIi0jRLYWtjEzOE5M7M7nkzu7lnZie5P4ZGUiTZZCIHJN&#xA;cil2KvBv+cv/APlCNG/7aY/6h5MydNzLRn5Pk7M1xHYquV3X7LFa9aGmSjMx5GlIRmma1qWm3sV5&#xA;aTss0RqKklSO4YdwcmM8weZasuCGSJjIbFna/nPdC24/oxDc0/vDMfTr48ONfo5ZcdWSOTpv5Cjf&#xA;1be78fcxKz86eYbPzRH5nguANXicvFMyKyrVClAjArQKaDMSfq5u7wYo4oiMeQRX/KxfN36F/Qv1&#xA;3/cd9e/Sfo8E/wB6OfqVrSvHn8XHpXIcAu23iKcW/wCeH5hxX97eveQ3LahJHPPDPbxSQiaGNYkl&#xA;SMrRHCRruvWm+Dwop8QoLTvzb8/6fq+q6vb6o36Q1lVXUJnSNuQQEJxBWicAaLxpTCcYqlEyu8u/&#xA;m7568v6PHpGn3kf1S2ZnsvXghne3ZzVjC0isVqfowHGCbUTIYhcXE9zPJcXEjSzzO0ksrkszOxqz&#xA;MT1JJybFTwoZN+WX/kyfKf8A22dP/wCoqPIZPpPuZw+oP0EzWOe7FXYq7FXYq7FXYq7FXYq7FXYq&#xA;7FXYq7FXg3/OX/8AyhGjf9tMf9Q8mZOm5loz8nydma4jsVdirsVdirsVdirsVdirsVdirsVZN+WX&#xA;/kyfKf8A22dP/wCoqPIZPpPuZw+oP0EzWOe7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXg3/OX/8A&#xA;yhGjf9tMf9Q8mZOm5loz8nydma4jsVdirsVdirsVdirsVdirsVdirsVZN+WX/kyfKf8A22dP/wCo&#xA;qPIZPpPuZw+oP0EzWOe7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXg3/OX/8AyhGjf9tMf9Q8mZOm&#xA;5loz8nydma4jsVdirsVdirsVdirsVdirsVdirsVZN+WX/kyfKf8A22dP/wCoqPIZPpPuZw+oP0Ez&#xA;WOe7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXg3/OX/8AyhGjf9tMf9Q8mZOm5loz8nydma4jsVdi&#xA;rsVdirsVdirsVdirsVdirsVZN+WX/kyfKf8A22dP/wCoqPIZPpPuZw+oP0EzWOe7FXYq7FXYq7FX&#xA;Yq7FXYq7FXYq7FXYq7FXg3/OX/8AyhGjf9tMf9Q8mZOm5loz8nydma4jsVdirsVdirsVdirsVdir&#xA;sVdirsVZN+WX/kyfKf8A22dP/wCoqPIZPpPuZw+oP0EzWOe7FXYq7FXYq7FXYq7FXYq7FXYq7FXY&#xA;q7FWB/m//wAqr/Qll/ysf/jl/Wf9D/3s/wB6PTb/AJY/j+xy+1tlmLiv0teThr1PJv8ArDH/AD/T&#xA;mX/vfxTV+7/Fu/6wx/z/AE5j+9/FL+7/ABbv+sMf8/05j+9/FL+7/Fu/6wx/z/TmP738Uv7v8W7/&#xA;AKwx/wA/05j+9/FL+7/Fu/6wx/z/AE5j+9/FL+7/ABbv+sMf8/05j+9/FL+7/Fu/6wx/z/TmP738&#xA;Uv7v8W7/AKwx/wA/05j+9/FL+7/Fu/6wx/z/AE5j+9/FL+7/ABbv+sMf8/05j+9/FL+7/Fu/6wx/&#xA;z/TmP738Uv7v8Wmflj/oUr/Emk/oL/jt/XLf9F/8dn/er1V9D+9/d/3lPt/D47ZGXi1v+hMfDvb9&#xA;L6CzGch2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KvBv8AnL//AJQjRv8Atpj/AKh5MydNzLRn5Pk7&#xA;M1xHYq7FXYq7FXYq7FXYq7FXYq7FXYqyb8sv/Jk+U/8Ats6f/wBRUeQyfSfczh9QfoJmsc92KuxV&#xA;2KuxV2KuxV2KuxV2KuxV2KuxV2KvBv8AnL//AJQjRv8Atpj/AKh5MydNzLRn5Pk7M1xHYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYqyb8sv/Jk+U/8Ats6f/wBRUeQyfSfczh9QfoJmsc92KuxV2KuxV2KuxV2K&#xA;uxV2KuxV2KuxV2KvBv8AnL//AJQjRv8Atpj/AKh5MydNzLRn5Pk7M1xHYq7FXYq7FXYq7FXYq7FX&#xA;Yq7FXYqyb8sv/Jk+U/8Ats6f/wBRUeQyfSfczh9QfoJmsc92KuxV2KuxV2KuxV2KuxV2KuxV2Kux&#xA;V2KvBv8AnL//AJQjRv8Atpj/AKh5MydNzLRn5Pk7M1xHYq7FXYq7FXYq7FXYq7FXYq7FXYqyb8sv&#xA;/Jk+U/8Ats6f/wBRUeQyfSfczh9QfoJmsc92KuxV2KuxV2KuxVQvr+zsYDPdSiKIbVPUnwAG5OTx&#xA;45TNRFtOfPDFHimaDGpvzCsg5ENrJIn8zME/D4s2A7MlW5Do8ntFjB9MSR8v1ozTvOml3biOYNau&#xA;2wL0Kf8ABDp9IynLoJx3G7fpu3cOQ1L0Hz5fNkAIIqOmYTu3Yq7FXYq8G/5y/wD+UI0b/tpj/qHk&#xA;zJ03MtGfk+TszXEdirsVdirsVdiqc+X/AClrWuufqUQEKmj3Mh4xg+FaEk+wGWY8UpcnF1Otx4fq&#xA;O/d1ZfH+TV0YqtqiCX+UQkr/AMFzB/DL/wAoe91h7cF/Tt7/ANjG/MfkLX9CjNxPGtxZjrcw1ZVr&#xA;05ggMv6vfKJ4jFz9L2jizGhtLuLG8rc52KuxVk35Zf8AkyfKf/bZ0/8A6io8hk+k+5nD6g/QTNY5&#xA;7sVdirsVYV+Yn5r+X/JKxQ3SPeancLzhsYSAeFac5HOyKSKDqT4ZtOzuycmqsjaI6lx8+pjj583n&#xA;Q/5ynqaf4Y/6fv8As3zdf6Ff9s/2P/HnE/lL+j9v7FdP+cneW/8Ahun/AEe/9m+RPsvX+U/2P/Hm&#xA;s9q1/D9v7FfVvO15rc6XVxbegOACWok5iOoqRy4rU16mmODRRxCgb83lO0O0JZ8ln6RyCGj1X/ir&#xA;/hv7MsOJ15yJjazpMnJe3UHqMpnGlBtnvkrVZJonsJm5NCvKEnrwrQr9BpTNLr8IB4h1eu9n9aZg&#xA;4pfw7j3fsZPmvekdirsVeDf85f8A/KEaN/20x/1DyZk6bmWjPyfJ2ZriOxV2KplZ6JNPEJHcRK26&#xA;ilSR402zcaTsaeWPFI8IPxaJ5wDSKTyzyNPrNP8AYf8AN2ZR9n/6f+x/a1nVeSYaZ5EN7ew2/wBc&#xA;I9RgGpHvxG7H7XgDlWTsXgF8f2ftaMvaPBEmvtez6fpVrZWkVpaqIreFQsaAdB/XxOIxACg8pkzG&#xA;cjKW5KMW1NNm3+WRMGrjaeFJI3hmQPG4KyRsAVIOxBB6g5RIJEqNh4F578upoPmKa0hBFrKBPa17&#xA;RuT8P+xYEZrskeEvadn6nxsQkefIseyDmuxVk35Zf+TJ8p/9tnT/APqKjyGT6T7mcPqD9BM1jnux&#xA;V2KuxV8of85BWl9D+Zl9LcKwguYbeSzJ6GNYVjan/PRHz0H2fnE6WIHME38/1U6TWg+IXnKfaGbs&#xA;uGUxtSoZS26ggkewynJyLjzerxkEVG4PQ5oS80URHkCwKa6SG5Of2aAfTlGVlBmvkpXOr1HRYmLf&#xA;KoH681WvPo+LvvZ8E6jb+aWd5pnt3Yq7FXg3/OX/APyhGjf9tMf9Q8mZOm5loz8nydma4jsVdirM&#xA;Y2R41ZN0IBWnhnoeOQlEGPIusIoq8P2skWEmS+UmVdZg5ftBwvz4HMLWD0Ou1o/dl6EmakukKITI&#xA;FgVkpBk2+nMbJzTHk8f/ADpliOuWEY/vUtqv8mkbj+o5gajm9R2ED4cj/S/Q87yh3jsVZN+WX/ky&#xA;fKf/AG2dP/6io8hk+k+5nD6g/QTNY57sVdirsVSXzV5M8t+abNbTXLNbpIyTDJUpJGT1KOpDCtNx&#xA;0PfMrS63Lp5XjNNeTFGYqQYaP+cd/wAtwa+jdf8ASQ39M2f+iLVd8fk4/wCRxqi/kB+Xa9Ibr/ke&#xA;39Mj/og1PePkxPZ2I96B8wfl5b6MqPZLJLpyqFBZuTx0FKOadPA5kaXtE5dpfU8x2t2UcUuOIuB+&#xA;xJU0628D9+ZZyF0ZgEwtYN1ihQksaKiipJOUzl1KYwJNAbvRfK+iPp1oZJxS6noXX+VR0X+uaLV5&#xA;+OVDkHuOx+zzp4Ey+uX2eSd5iO4dirsVeDf85f8A/KEaN/20x/1DyZk6bmWjPyfJ2ZriOxV2Koq2&#xA;1K7t14Rv8H8pFRmbp+0M2EVE7dzCWKMuaIXX9QU7Mv8AwOZH8tZ/L5NZ08URbebtYtpo5o2QPGwZ&#xA;ar3BrkZdrZpCjXyYT0WOQovZvLPmyy12xWe2cLOoAuLYkc42+X8vgctx6jjFh5TV6OWGVHl0KerP&#xA;Idq0wmRcPhCC1jXNO0awe9v5RHGv2V/bduyoO5OUTkALLdg088suGIeA+YtbuNb1i41KccTM3wR9&#xA;QiKKKv0DNfOVm3tNNpxixiA6JbkW92Ksm/LL/wAmT5T/AO2zp/8A1FR5DJ9J9zOH1B+gmaxz3Yq7&#xA;FXYq7FXYq7FXEAih3B6jFUqn8raBO5d7NAx3PAsg+5CozJjq8oFCTr8nZWmmbMB9o+5FWWkaZY72&#xA;tukTdOYFW/4I1OV5M05/UW/BosWL6Igff80XlTkuxV2KuxV4N/zl/wD8oRo3/bTH/UPJmTpuZaM/&#xA;J8nZmuI7FXYq7FXYq7FVW2urm1mWe2leCZfsyRsVYfSMQSOTGcBIURYT5PzD85JF6Y1JuPiUiLf8&#xA;EU5fjlvjz73DPZmAm+H70lv9Sv8AUJvXvbiS5l6B5WLEDwFegysyJ5uXjxRgKiKCGwM3Yq7FWTfl&#xA;l/5Mnyn/ANtnT/8AqKjyGT6T7mcPqD9BM1jnuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV4N/zl//&#xA;AMoRo3/bTH/UPJmTpuZaM/J8nZmuI7FXYq7FXYq7FXYq7FXYq7FXYq7FWTfll/5Mnyn/ANtnT/8A&#xA;qKjyGT6T7mcPqD9BM1jnuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV4N/zl//AMoRo3/bTH/UPJmT&#xA;puZaM/J8nZmuI7FXYq7FXYq7FXYq7FXYq7FXYq7FWTfll/5Mnyn/ANtnT/8AqKjyGT6T7mcPqD9B&#xA;M1jnuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV4N/zl//AMoRo3/bTH/UPJmTpuZaM/J8nZmuI7FX&#xA;Yq7FXYq7FXYq7FXYq7FXYq7FWTfll/5Mnyn/ANtnT/8AqKjyGT6T7mcPqD9BM1jnuxV2KuxV2Kux&#xA;V2KuxV2KuxV2KuxV2KuxV4N/zl//AMoRo3/bTH/UPJmTpuZaM/J8nZmuI7FXYq7FXYq7FXYq7FXY&#xA;q7FXYq7FWTfll/5Mnyn/ANtnT/8AqKjyGT6T7mcPqD9BM1jnv//Z</xmpGImg:image>
+               </rdf:li>
+            </rdf:Alt>
+         </xmp:Thumbnails>
+         <xmpMM:RenditionClass>proof:pdf</xmpMM:RenditionClass>
+         <xmpMM:OriginalDocumentID>uuid:65E6390686CF11DBA6E2D887CEACB407</xmpMM:OriginalDocumentID>
+         <xmpMM:DocumentID>xmp.did:1bf257e2-7ee0-4f9f-8d89-592b6363757d</xmpMM:DocumentID>
+         <xmpMM:InstanceID>uuid:9d841657-08ba-b848-9db1-8f716b640d2e</xmpMM:InstanceID>
+         <xmpMM:DerivedFrom rdf:parseType="Resource">
+            <stRef:instanceID>xmp.iid:5f10993d-fbcb-4845-8da8-c8fd23bf9b15</stRef:instanceID>
+            <stRef:documentID>xmp.did:5f10993d-fbcb-4845-8da8-c8fd23bf9b15</stRef:documentID>
+            <stRef:originalDocumentID>uuid:65E6390686CF11DBA6E2D887CEACB407</stRef:originalDocumentID>
+            <stRef:renditionClass>default</stRef:renditionClass>
+         </xmpMM:DerivedFrom>
+         <xmpMM:History>
+            <rdf:Seq>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>saved</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:104773b8-b239-4d7c-827a-5a8a0e6556a6</stEvt:instanceID>
+                  <stEvt:when>2020-12-02T12:45:36-08:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Illustrator 25.0 (Macintosh)</stEvt:softwareAgent>
+                  <stEvt:changed>/</stEvt:changed>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>saved</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:1bf257e2-7ee0-4f9f-8d89-592b6363757d</stEvt:instanceID>
+                  <stEvt:when>2020-12-02T14:23:26-08:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Illustrator 25.0 (Macintosh)</stEvt:softwareAgent>
+                  <stEvt:changed>/</stEvt:changed>
+               </rdf:li>
+            </rdf:Seq>
+         </xmpMM:History>
+         <illustrator:StartupProfile>Web</illustrator:StartupProfile>
+         <illustrator:CreatorSubTool>AIRobin</illustrator:CreatorSubTool>
+         <illustrator:Type>Document</illustrator:Type>
+         <pdf:Producer>Adobe PDF library 15.00</pdf:Producer>
+         <pdfx:CreatorVersion>21.0.0</pdfx:CreatorVersion>
+         <xmpTPg:NPages>1</xmpTPg:NPages>
+         <xmpTPg:HasVisibleTransparency>True</xmpTPg:HasVisibleTransparency>
+         <xmpTPg:HasVisibleOverprint>False</xmpTPg:HasVisibleOverprint>
+         <xmpTPg:MaxPageSize rdf:parseType="Resource">
+            <stDim:w>500.000000</stDim:w>
+            <stDim:h>500.000000</stDim:h>
+            <stDim:unit>Pixels</stDim:unit>
+         </xmpTPg:MaxPageSize>
+         <xmpTPg:Fonts>
+            <rdf:Bag>
+               <rdf:li rdf:parseType="Resource">
+                  <stFnt:fontName>MyriadPro-Regular</stFnt:fontName>
+                  <stFnt:fontFamily>Myriad Pro</stFnt:fontFamily>
+                  <stFnt:fontFace>Regular</stFnt:fontFace>
+                  <stFnt:fontType>Open Type</stFnt:fontType>
+                  <stFnt:versionString>Version 2.106;PS 2.000;hotconv 1.0.70;makeotf.lib2.5.58329</stFnt:versionString>
+                  <stFnt:composite>False</stFnt:composite>
+                  <stFnt:fontFileName>MyriadPro-Regular.otf</stFnt:fontFileName>
+               </rdf:li>
+            </rdf:Bag>
+         </xmpTPg:Fonts>
+         <xmpTPg:PlateNames>
+            <rdf:Seq>
+               <rdf:li>Cyan</rdf:li>
+               <rdf:li>Magenta</rdf:li>
+               <rdf:li>Yellow</rdf:li>
+               <rdf:li>Black</rdf:li>
+            </rdf:Seq>
+         </xmpTPg:PlateNames>
+         <xmpTPg:SwatchGroups>
+            <rdf:Seq>
+               <rdf:li rdf:parseType="Resource">
+                  <xmpG:groupName>Default Swatch Group</xmpG:groupName>
+                  <xmpG:groupType>0</xmpG:groupType>
+                  <xmpG:Colorants>
+                     <rdf:Seq>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>White</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>255</xmpG:green>
+                           <xmpG:blue>255</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>Black</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Red</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Yellow</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>255</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Green</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>255</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Cyan</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>255</xmpG:green>
+                           <xmpG:blue>255</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Blue</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>255</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Magenta</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>255</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=193 G=39 B=45</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>193</xmpG:red>
+                           <xmpG:green>39</xmpG:green>
+                           <xmpG:blue>45</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=237 G=28 B=36</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>237</xmpG:red>
+                           <xmpG:green>28</xmpG:green>
+                           <xmpG:blue>36</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=241 G=90 B=36</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>241</xmpG:red>
+                           <xmpG:green>90</xmpG:green>
+                           <xmpG:blue>36</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=247 G=147 B=30</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>247</xmpG:red>
+                           <xmpG:green>147</xmpG:green>
+                           <xmpG:blue>30</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=251 G=176 B=59</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>251</xmpG:red>
+                           <xmpG:green>176</xmpG:green>
+                           <xmpG:blue>59</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=252 G=238 B=33</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>252</xmpG:red>
+                           <xmpG:green>238</xmpG:green>
+                           <xmpG:blue>33</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=217 G=224 B=33</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>217</xmpG:red>
+                           <xmpG:green>224</xmpG:green>
+                           <xmpG:blue>33</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=140 G=198 B=63</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>140</xmpG:red>
+                           <xmpG:green>198</xmpG:green>
+                           <xmpG:blue>63</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=57 G=181 B=74</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>57</xmpG:red>
+                           <xmpG:green>181</xmpG:green>
+                           <xmpG:blue>74</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=146 B=69</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>146</xmpG:green>
+                           <xmpG:blue>69</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=104 B=55</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>104</xmpG:green>
+                           <xmpG:blue>55</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=34 G=181 B=115</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>34</xmpG:red>
+                           <xmpG:green>181</xmpG:green>
+                           <xmpG:blue>115</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=169 B=157</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>169</xmpG:green>
+                           <xmpG:blue>157</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=41 G=171 B=226</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>41</xmpG:red>
+                           <xmpG:green>171</xmpG:green>
+                           <xmpG:blue>226</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=113 B=188</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>113</xmpG:green>
+                           <xmpG:blue>188</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=46 G=49 B=146</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>46</xmpG:red>
+                           <xmpG:green>49</xmpG:green>
+                           <xmpG:blue>146</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=27 G=20 B=100</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>27</xmpG:red>
+                           <xmpG:green>20</xmpG:green>
+                           <xmpG:blue>100</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=102 G=45 B=145</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>102</xmpG:red>
+                           <xmpG:green>45</xmpG:green>
+                           <xmpG:blue>145</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=147 G=39 B=143</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>147</xmpG:red>
+                           <xmpG:green>39</xmpG:green>
+                           <xmpG:blue>143</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=158 G=0 B=93</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>158</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>93</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=212 G=20 B=90</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>212</xmpG:red>
+                           <xmpG:green>20</xmpG:green>
+                           <xmpG:blue>90</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=237 G=30 B=121</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>237</xmpG:red>
+                           <xmpG:green>30</xmpG:green>
+                           <xmpG:blue>121</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=199 G=178 B=153</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>199</xmpG:red>
+                           <xmpG:green>178</xmpG:green>
+                           <xmpG:blue>153</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=153 G=134 B=117</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>153</xmpG:red>
+                           <xmpG:green>134</xmpG:green>
+                           <xmpG:blue>117</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=115 G=99 B=87</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>115</xmpG:red>
+                           <xmpG:green>99</xmpG:green>
+                           <xmpG:blue>87</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=83 G=71 B=65</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>83</xmpG:red>
+                           <xmpG:green>71</xmpG:green>
+                           <xmpG:blue>65</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=198 G=156 B=109</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>198</xmpG:red>
+                           <xmpG:green>156</xmpG:green>
+                           <xmpG:blue>109</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=166 G=124 B=82</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>166</xmpG:red>
+                           <xmpG:green>124</xmpG:green>
+                           <xmpG:blue>82</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=140 G=98 B=57</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>140</xmpG:red>
+                           <xmpG:green>98</xmpG:green>
+                           <xmpG:blue>57</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=117 G=76 B=36</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>117</xmpG:red>
+                           <xmpG:green>76</xmpG:green>
+                           <xmpG:blue>36</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=96 G=56 B=19</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>96</xmpG:red>
+                           <xmpG:green>56</xmpG:green>
+                           <xmpG:blue>19</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=66 G=33 B=11</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>66</xmpG:red>
+                           <xmpG:green>33</xmpG:green>
+                           <xmpG:blue>11</xmpG:blue>
+                        </rdf:li>
+                     </rdf:Seq>
+                  </xmpG:Colorants>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <xmpG:groupName>Grays</xmpG:groupName>
+                  <xmpG:groupType>1</xmpG:groupType>
+                  <xmpG:Colorants>
+                     <rdf:Seq>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=0 B=0</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=26 G=26 B=26</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>26</xmpG:red>
+                           <xmpG:green>26</xmpG:green>
+                           <xmpG:blue>26</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=51 G=51 B=51</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>51</xmpG:red>
+                           <xmpG:green>51</xmpG:green>
+                           <xmpG:blue>51</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=77 G=77 B=77</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>77</xmpG:red>
+                           <xmpG:green>77</xmpG:green>
+                           <xmpG:blue>77</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=102 G=102 B=102</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>102</xmpG:red>
+                           <xmpG:green>102</xmpG:green>
+                           <xmpG:blue>102</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=128 G=128 B=128</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>128</xmpG:red>
+                           <xmpG:green>128</xmpG:green>
+                           <xmpG:blue>128</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=153 G=153 B=153</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>153</xmpG:red>
+                           <xmpG:green>153</xmpG:green>
+                           <xmpG:blue>153</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=179 G=179 B=179</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>179</xmpG:red>
+                           <xmpG:green>179</xmpG:green>
+                           <xmpG:blue>179</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=204 G=204 B=204</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>204</xmpG:red>
+                           <xmpG:green>204</xmpG:green>
+                           <xmpG:blue>204</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=230 G=230 B=230</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>230</xmpG:red>
+                           <xmpG:green>230</xmpG:green>
+                           <xmpG:blue>230</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=242 G=242 B=242</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>242</xmpG:red>
+                           <xmpG:green>242</xmpG:green>
+                           <xmpG:blue>242</xmpG:blue>
+                        </rdf:li>
+                     </rdf:Seq>
+                  </xmpG:Colorants>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <xmpG:groupName>Web Color Group</xmpG:groupName>
+                  <xmpG:groupType>1</xmpG:groupType>
+                  <xmpG:Colorants>
+                     <rdf:Seq>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=63 G=169 B=245</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>63</xmpG:red>
+                           <xmpG:green>169</xmpG:green>
+                           <xmpG:blue>245</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=122 G=201 B=67</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>122</xmpG:red>
+                           <xmpG:green>201</xmpG:green>
+                           <xmpG:blue>67</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=255 G=147 B=30</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>147</xmpG:green>
+                           <xmpG:blue>30</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=255 G=29 B=37</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>29</xmpG:green>
+                           <xmpG:blue>37</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=255 G=123 B=172</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>123</xmpG:green>
+                           <xmpG:blue>172</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=189 G=204 B=212</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>189</xmpG:red>
+                           <xmpG:green>204</xmpG:green>
+                           <xmpG:blue>212</xmpG:blue>
+                        </rdf:li>
+                     </rdf:Seq>
+                  </xmpG:Colorants>
+               </rdf:li>
+            </rdf:Seq>
+         </xmpTPg:SwatchGroups>
+      </rdf:Description>
+   </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                           
+<?xpacket end="w"?>
endstream
endobj
3 0 obj
<</Count 4/Kids[5 0 R 24 0 R 25 0 R 28 0 R]/Type/Pages>>
endobj
5 0 obj
<</ArtBox[0.0 0.0 500.0 500.0]/BleedBox[0.0 0.0 500.0 500.0]/Contents 29 0 R/CropBox[0.0 0.0 500.0 500.0]/Group 30 0 R/LastModified(D:20201202142327-08'00')/MediaBox[0.0 0.0 500.0 500.0]/Parent 3 0 R/PieceInfo<</Illustrator 8 0 R>>/Resources<</ColorSpace<</CS0 31 0 R>>/ExtGState<</GS0 32 0 R/GS1 33 0 R/GS2 34 0 R>>/Properties<</MC0 26 0 R>>/Shading<</Sh0 35 0 R>>/XObject<</Fm0 36 0 R/Fm1 37 0 R>>>>/TrimBox[0.0 0.0 500.0 500.0]/Type/Page>>
endobj
24 0 obj
<</ArtBox[129.237 179.954 371.201 319.779]/BleedBox[0.0 0.0 500.0 500.0]/Contents 38 0 R/CropBox[0.0 0.0 500.0 500.0]/Group 39 0 R/LastModified(D:20201202142327-08'00')/MediaBox[0.0 0.0 500.0 500.0]/Parent 3 0 R/PieceInfo<</Illustrator 8 0 R>>/Resources<</ColorSpace<</CS0 31 0 R>>/ExtGState<</GS0 32 0 R/GS1 33 0 R/GS2 34 0 R>>/Properties<</MC0 26 0 R>>/Shading<</Sh0 35 0 R>>/XObject<</Fm0 40 0 R/Fm1 41 0 R>>>>/TrimBox[0.0 0.0 500.0 500.0]/Type/Page>>
endobj
25 0 obj
<</ArtBox[102.065 216.5 397.935 283.5]/BleedBox[0.0 0.0 500.0 500.0]/Contents 42 0 R/CropBox[0.0 0.0 500.0 500.0]/Group 43 0 R/LastModified(D:20201202142327-08'00')/MediaBox[0.0 0.0 500.0 500.0]/Parent 3 0 R/PieceInfo<</Illustrator 8 0 R>>/Resources<</ColorSpace<</CS0 31 0 R>>/ExtGState<</GS0 32 0 R/GS1 33 0 R/GS2 34 0 R>>/Properties<</MC0 26 0 R>>/Shading<</Sh0 35 0 R>>/XObject<</Fm0 44 0 R/Fm1 45 0 R>>>>/TrimBox[0.0 0.0 500.0 500.0]/Type/Page>>
endobj
28 0 obj
<</ArtBox[0.0 0.0 500.0 500.0]/BleedBox[0.0 0.0 500.0 500.0]/Contents 46 0 R/CropBox[0.0 0.0 500.0 500.0]/Group 47 0 R/LastModified(D:20201202142327-08'00')/MediaBox[0.0 0.0 500.0 500.0]/Parent 3 0 R/PieceInfo<</Illustrator 8 0 R>>/Resources<</ColorSpace<</CS0 31 0 R>>/ExtGState<</GS0 32 0 R/GS1 33 0 R/GS2 34 0 R>>/Properties<</MC0 26 0 R>>/Shading<</Sh0 35 0 R>>/XObject<</Fm0 48 0 R/Fm1 49 0 R>>>>/TrimBox[0.0 0.0 500.0 500.0]/Type/Page>>
endobj
46 0 obj
<</Filter/FlateDecode/Length 1481>>stream
+H�|W�n7��W���N�ղ�K�@p��>���(����^���@�LW5Y˫u~t������m�_�����C�����3Uq������+^݂��������Ă�R"?[��?H�E���=��R���>��Eżl1�.����֓��!�])� �t���M��q���(<6|��'�Ac#�+#V?�UF����W���ߔ�R�	㼂W-ԟph�3�z�~l'��D�Ow,��SH@~J/�
0�g
ֽ���
,a�dwے�I�^��ъ$W|l0�A@�9�/x�=,l������
_BZ�m�H
+9^"H5�[��Eb�~�DS�{�� Q�j���p���LP�@�*�P�)6�"���e{,�X�C�Q������3|��Q�x��L9<I�g����T��
_J�/�fc9J�JU0e~N�D�q����!?�YT����B�L�0vZ
+L'45̹p����' J��|^NҰ���a�E�J>��^�}��D
ZC�7Bڢ�>�6#�0un�&���	W��Ʈ�%-d�z��f>ׅ�=+ܬR#�bށ��y��ǩ,ĩ,C�P:�L�r Ug΁�Q��8ʤ=�yB�Nxqa�I�
+)v��)��d�iw������2��^x��؁C&���άd�;��)�rdy™�'z$2gV�����Rñ.Z�N�3�K�y53�y���h��t��@bg�
+�R�qQG�N��_W-2o�f��l�YX�L OEG��GE�e4�0���*�I�z�������O�f�b84�ڮ��iT��@NU /Ȝ�M>��TO�����h�l����%щ���H��n5qZ��-j�B�
+�
򦀴b�[DS �ʝ0u%s��Z��[h��iX"vM�0�l�H��/h٤�>v���`�D;5	I>��HS��[�
+gHס��AB��n�}\IoI�ݎ‡�<��C
f�A��:Ry���5kJC�`�9/��PXg���n Z��
�s(��v!��
�� �ZnO���Z>�C'�}
�S������j$:PX�C�9����`$�Hա%�8G��V�A�(a�5*�6���]�8}I�lݡ�����v0����x}h��Δ_�gT������y�Q���o,O4T�?�̜��pSC@�kI���Y�C��C��F��؍��	hF�j(D����뮣�T�U�u��u��0wd]g�M����ݩh��$S�s��>�O:	8�	�8���&�n��m�E��+�g��ԓ5I89r{zH�nqb"�i����6V��-���m�?8�G\'���M˲cҷ�=2@�x?9Pc<�6&��r�f�����p����<^Z"ˎI߶��|���տo��o1�G���z�"UK�!K�y��{�������=�߯	Ղm�~�����//�}�g��w��.ڻO��S�i�O�
I��`
endstream
endobj
47 0 obj
<</CS 50 0 R/I false/K false/S/Transparency>>
endobj
48 0 obj
<</BBox[149.007 265.508 198.126 233.5]/Group 51 0 R/Length 264/Matrix[1.0 0.0 0.0 1.0 0.0 0.0]/Resources<</ColorSpace<</CS0 31 0 R>>/ExtGState<</GS0 32 0 R>>>>/Subtype/Form>>stream
+/CS0 cs 0 0 0  scn
+/GS0 gs
+q 1 0 0 1 182.1221 265.5083 cm
+0 0 m
+-29.316 0 l
+-31.742 -4.637 -33.114 -9.913 -33.114 -15.508 c
+-33.114 -21.507 -31.538 -27.138 -28.776 -32.008 c
+0 -32.008 l
+8.839 -32.008 16.004 -24.843 16.004 -16.004 c
+16.004 -7.166 8.839 0 0 0 c
+f
+Q
+
endstream
endobj
49 0 obj
<</BBox[151.007 283.5 218.008 216.5]/Group 52 0 R/Length 278/Matrix[1.0 0.0 0.0 1.0 0.0 0.0]/Resources<</ColorSpace<</CS0 31 0 R>>/ExtGState<</GS0 32 0 R>>/Shading<</Sh0 53 0 R>>>>/Subtype/Form>>stream
+q
+184.508 283.5 m
+166.006 283.5 151.008 268.502 151.008 250 c
+151.008 231.498 166.006 216.5 184.508 216.5 c
+203.01 216.5 218.008 231.498 218.008 250 c
+218.008 268.502 203.01 283.5 184.508 283.5 c
+W n
+q
+0 g
+/GS0 gs
+67.0007935 0 0 -67.0007935 151.0074615 250 cm
+BX /Sh0 sh EX Q
+Q
+
endstream
endobj
52 0 obj
<</I false/K false/S/Transparency/Type/Group>>
endobj
53 0 obj
<</AntiAlias false/ColorSpace 31 0 R/Coords[0.0 0.0 1.0 0.0]/Domain[0.0 1.0]/Extend[true true]/Function 54 0 R/ShadingType 2>>
endobj
31 0 obj
[/ICCBased 55 0 R]
endobj
54 0 obj
<</Bounds[0.995643]/Domain[0.0 1.0]/Encode[0.0 1.0 0.0 1.0]/FunctionType 3/Functions[56 0 R 57 0 R]>>
endobj
56 0 obj
<</C0[0.137255 0.776471 0.960784]/C1[0.156863 0.890196 0.960784]/Domain[0.0 1.0]/FunctionType 2/N 1.33723>>
endobj
57 0 obj
<</C0[0.156863 0.890196 0.960784]/C1[0.156863 0.890196 0.960784]/Domain[0.0 1.0]/FunctionType 2/N 1.0>>
endobj
55 0 obj
<</Filter/FlateDecode/Length 2574/N 3>>stream
+H���yTSw�oɞ����c
[���5la�QI
BH�ADED���2�mtFOE�.�c��}���0��8�׎�8G�Ng�����9�w���߽����'����0�֠�J��b�	
+ 2y�.-;!���K�Z�	���^�i�"L��0���-��
@8(��r�;q��7�L��y��&�Q��q�4�j���|�9��
+�V��)g�B�0�i�W��8#�8wթ��8_�٥ʨQ����Q�j
@�&�A)/��g�>'K���t�;\��
ӥ$պF�ZUn����(4T�%)뫔�0C&�����Z��i
���8��bx��E���B�;�����P���ӓ̹�A�om?�W=
+�x������-�����[���0����}��y)7ta�����>j���T�7���@���tܛ�`q�2��ʀ��&���6�Z�L�Ą?�_��yxg)˔z���çL�U���*�u�Sk�Se�O4?׸�c�
���.����R�
߁��-��2�5������	��S�>ӣV����d�`r��n~��Y�&�
+`��;�A4�� ���A9�=�-�t��l�`;��~p����	�Gp|	��[`L��`<� "A�YA�+��Cb(��R�,�*�T�2B-�
+�ꇆ��n���Q�t�}MA�0�al������S�x	��k�&�^���>�0|>_�'��,�G!"F$H:R��!z��F�Qd?r9�\A&�G���rQ��h������E��]�a�4z�Bg�����E#H	�*B=��0H�I��p�p�0MxJ$�D
1��D, V���ĭ����KĻ�Y�dE�"E��I2���E�B�G��t�4MzN�����r!YK� ���?%_&�#���(��0J:EAi��Q�(�()ӔWT6U@���P+���!�~��m���D�e�Դ�!��h�Ӧh/��']B/����ҏӿ�?a0n�hF!��X���8����܌k�c&5S�����6�l��Ia�2c�K�M�A�!�E�#��ƒ�d�V��(�k��e���l
����}�}�C�q�9
+N'��)�].�u�J�r�
+��w�G�	xR^���[�oƜch�g�`>b���$���*~� �:����E���b��~���,m,�-��ݖ,�Y��¬�*�6X�[ݱF�=�3�뭷Y��~dó	���t���i�z�f�6�~`{�v���.�Ng����#{�}�}��������j�
�����c1X6���fm���;'_9	�r�:�8�q�:��˜�O:ϸ8������u��Jq���nv=���M����m����R 4	�
+n�3ܣ�k�Gݯz=��[=��=�<�=G</z�^�^j��^��	ޡ�Z�Q�B�0FX'�+������t���<�u�-���{���_�_�ߘ�-G�,�}���/���Hh8�m�W�2p[����AiA��N�#8$X�?�A�KHI�{!7�<q��W�y(!46�-���a�a���a�W��	��@�@�`l���YĎ��H,�$����(�(Y�h�7��ъ���b<b*b��<�����~�L&Y&9��%�u�M�s�s��NpJP%�M�IJlN<�DHJIڐtCj'�KwKg�C��%�N��d��|�ꙪO=��%�mL���u�v�x:H��oL��!Ȩ��C&13#s$�/Y����������=�Osbs�rn��sO�1��v�=ˏ��ϟ\�h٢���#��¼����oZ<]T�Ut}�`IÒsK��V-���Y,+>TB(�/�S�,]6*�-���W:#��7�*���e��^YDY�}U�j��AyT�`�#�D=���"�b{ų���+�ʯ:�!kJ4G�m��t�}uC�%���K7YV��fF���Y�.�=b��?S��ƕƩ�Ⱥ����y���
چ���k�5%4��m�7�lqlio�Z�lG+�Z�z�͹��mzy��]�����?u�u�w|�"űN���wW&���e֥ﺱ*|����j��5
k��yݭ���ǯg��^y�kEk�����l�D_p߶������7Dm����o꿻1m��
l�{��Mś�
n�L�l�<9��O�
[����$�����h�՛B��������d�Ҟ@��������i�ءG���&����v��V�ǥ8��������n��R�ĩ7�������u��\�ЭD���-�������u��`�ֲK�³8���%������
�y��h��Y�ѹJ�º;���.���!������
+�����z���p���g���_���X���Q���K���F���Aǿ�=ȼ�:ɹ�8ʷ�6˶�5̵�5͵�6ζ�7ϸ�9к�<Ѿ�?���D���I���N���U���\���d���l���v��ۀ�܊�ݖ�ޢ�)߯�6��D���S���c���s����
����2��F���[���p������(��@���X���r������4���P���m��������8���W���w����)���K���m������
endstream
endobj
32 0 obj
<</AIS false/BM/Normal/CA 1.0/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 1.0/op false>>
endobj
51 0 obj
<</I false/K false/S/Transparency/Type/Group>>
endobj
35 0 obj
<</AntiAlias false/ColorSpace 31 0 R/Coords[0.0 0.0 1.0 0.0]/Domain[0.0 1.0]/Extend[true true]/Function 58 0 R/ShadingType 2>>
endobj
58 0 obj
<</Bounds[0.238323]/Domain[0.0 1.0]/Encode[0.0 1.0 1.0 0.0]/FunctionType 3/Functions[59 0 R 60 0 R]>>
endobj
59 0 obj
<</C0[0.0666667 0.231373 0.85098]/C1[0.0666667 0.231373 0.85098]/Domain[0.0 1.0]/FunctionType 2/N 1.0>>
endobj
60 0 obj
<</C0[0.0941176 0.560784 0.945098]/C1[0.0666667 0.231373 0.85098]/Domain[0.0 1.0]/FunctionType 2/N 1.11363>>
endobj
26 0 obj
<</Intent 61 0 R/Name(Layer 1)/Type/OCG/Usage 62 0 R>>
endobj
61 0 obj
[/View/Design]
endobj
62 0 obj
<</CreatorInfo<</Creator(Adobe Illustrator 25.0)/Subtype/Artwork>>>>
endobj
33 0 obj
<</AIS false/BM/Normal/CA 0.100006/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 0.100006/op false>>
endobj
34 0 obj
<</AIS false/BM/Normal/CA 0.850006/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 0.850006/op false>>
endobj
8 0 obj
<</LastModified(D:20201202142327-08'00')/Private 18 0 R>>
endobj
18 0 obj
<</AIMetaData 19 0 R/AIPrivateData1 20 0 R/AIPrivateData2 21 0 R/AIPrivateData3 22 0 R/ContainerVersion 12/CreatorVersion 25/NumBlock 3/RoundtripStreamType 2/RoundtripVersion 24>>
endobj
19 0 obj
<</Length 1143>>stream
+%!PS-Adobe-3.0 
%%Creator: Adobe Illustrator(R) 24.0
%%AI8_CreatorVersion: 25.0.1
%%For: (Scott Proctor) ()
%%Title: (Move_Logo Design_Digital_Final.ai)
%%CreationDate: 12/2/20 2:23 PM
%%Canvassize: 16383
%%BoundingBox: 661 -1052 1689 157
%%HiResBoundingBox: 661 -1052 1688.40235130393 156.62060546875
%%DocumentProcessColors: Cyan Magenta Yellow Black
%AI5_FileFormat 14.0
%AI12_BuildNumber: 66
%AI3_ColorUsage: Color
%AI7_ImageSettings: 0
%%RGBProcessColor: 0 0 0 ([Registration])
%AI3_Cropmarks: 1175 -532 1675 -32
%AI3_TemplateBox: 1290.5 -510.5 1290.5 -510.5
%AI3_TileBox: 1137 -638 1713 96
%AI3_DocumentPreview: None
%AI5_ArtSize: 14400 14400
%AI5_RulerUnits: 6
%AI24_LargeCanvasScale: 1
%AI9_ColorModel: 1
%AI5_ArtFlags: 0 0 0 1 0 0 1 0 0
%AI5_TargetResolution: 800
%AI5_NumLayers: 1
%AI9_OpenToView: -982.13440265554 693.765973876433 0.258349573623763 1458 705 18 0 0 -24 43 0 0 0 1 1 0 0 1 0 1
%AI5_OpenViewLayers: 7
%%PageOrigin:890 -810
%AI7_GridSettings: 72 8 72 8 0 0 0.800000011920929 0.800000011920929 0.800000011920929 0.899999976158142 0.899999976158142 0.899999976158142
%AI9_Flatten: 1
%AI12_CMSettings: 00.MS
%%EndComments

endstream
endobj
20 0 obj
<</Length 65536>>stream
+%AI24_ZStandard_Data(�/�X$��$
,���
%���Y�����
�%����jKi)-�X9����<����e[��XOtQN���Zss��l�DTG"�8s�-����ѳ�b�����|�X0��G�;��\8&{�%�b�:�u�!�B��Axoܘl�Ӊ�9��8�*҇
+�7�����-��X"A�ȚƂ�H�q\�G��]xҬ��槈C���N!R����z��+C2ǒ0�J3F<�V�\���n�	i*�wW�\ϒ�5W�[{�|�U�oe�tH�_3������d6Q%Zq0���,W����$_������ݩ>_(^�]�%�R��C��8��F��_�a	'������-���1�<����̰����Uf_�F����ʐ����l�鱁<�
�Q��#�F"mW��p(���,ǁ�2]0z��d��՛�:��ٷ�4��ޣm%�����!_]{噻����U����0��\"���M)�Ŋ�m��ɹ4?�G��d�2����.�Z>���{x����Sv��
�-{�e�
,,�cq0���awƱ�;|��h�
+ŢV,�0�������c��^M#XY��2V���qV4�=��Z��b!
ɺ����H4�㉇�j	���c��8��rHH>~���:��`���yG�������k��j��E�Z B�L瘠@,���>���t���K����ʱ�8��Et4�"/�GK\KW��t���5Ϲ�c��������PcG�Tv��w���x�qx_Qx���6
+2s�‘`,���G>���8cJv���H��SXa|��8�	EcѠc�Zh,�i,4��)}(HA�`$��"��M�'�H��7�,|0�HXڂ���-��9�wzб�X��C��qװCax�f�	<ldzZ�%Fq<(�h���
+�yB���iϺ�J���u
��~�)�!e�ti���w���^��^qZ���oeH
ݓjiG'eY���l��ٱS��ޙ��+�����j�p��u��
(��1=�����`��'�h�@E2氅�GY	ł��q�f0'����`�Z$��c�HX��љ6�ƂB�8��H$�V�:��ȸ���;;3Z8����G
ł�E�@�p����y>SX��7���h8Ɗz�a��#Q�6^H�--i
�xrP`�L��+��Q4+s���i/�\CUS���X��sP��" R
/K%yU���ʐ��*g{�+q�z�����<�_eM)<*C\zM��Ybf��!��)Cz�i�����Mʖ!tX����bw�U���e�y\g��еsi^���c�B��V&��"�c
ƁZ�DQC�X(
+�"qő���F
+������Q����/�H��U�⇳
+��c�8~X�C�xZ�B�x�a�#���9���X8�#�<�w,4�"��Ɓ>�.4G�},f�0慲r++��:�(cl�j��2KK$�^]vv>q����.�Px�pZ����1�T<��_(Ld��
Ʊ� |�GMQY��
:��ѠV�������G*��=���O,��,s���Q��/`�F�Q�.j�u�0�(c��[�Zh�
j0ZZ�)%�
����Ef!�H��j5jh�p��j-�Ȩ���^�ESI?�С]�Ġ-�T����ʅud���E1�Q5V#+3;�������1�a6ף�;��_��8�5n�qM.��6:}'�E�B�C�h�N֎�g�A�\Ԏ�be��`,F�
j��`�B������b��ИŔ������1�0�c�|�`n0�)�5���D#�h(F��h,4�-P�s���Ec���X`,,���Bb���^��[�Z���h(���股 1�����Y,(
+�b�H(�H*Na�RT1��D#�H,��"�H<�	L\��hbo|q������|!���),��z|,,�\ׄ%,
�(E)ꕅ岪�CA	/��-�TTS�@� Z%(q$��B�h�=������L�a(��$F1��8767��)	�����袊��p�ic���0���"q<Ί�ARrP��A�
���8\���#�,E�WUl�eHR��2$��7ChcB5�洕+sJ/C����c�:C�Ye��xi׻M�
���B��8�FC�H<�װ�5kXQ���`,���l$#�HE&2��LL�󸴬��6�����������7���
+'��F�gs�|��k����%绳����-X��0�%얆f;3+#��-T��(E偾Ê��}�
+/�p��ax�����2p
[y���L�"��F.�/�_���������"�H4�QTA�R�����H�	E����B�P(
+���P,(f�E�8����-�p.�xB�X,�����(�Qc�9yF��P,
�c�1�i�ц���PC<w�v���4#�!��g\gg�k�[��r�c��
�c
+H]��F2_��1)!B����!9}?7�^��i2�zdyٛ�96pD(0 v܎�Z�8~��G5���4
��`(	��@2�8�1�A�2��¢�h,��b�P,���\$.���0�q�#�gE�*���bݫ�JmۅiLc���''�������8r>�{z�n���g�+�8��/|�D%*q���
AA�9("�*R
��xP:@
7
BA����P
� 
*L�D4@xp��(0D$D�ƒC"$4���
 <4HP�L�C>��	&
A�
B����ƒ�&D4<pp� �aA!"A!"�

+x��C$@@P@�&T�P��
+4P�`�	4Hx�@!�!Lp�BB�D@x��B
i�`��@�%��"(@@(��
���p�
+,��
+��D"T���(<8DD�
�
n8��
L0

�	\��`�HC���@Hh`%�@AB�A��\��_"������!B�h�,����ƒC�PxP
D�XPaBx�
�
+4�`A�f��
+
L�� �<����X"���(@<4(,�����P�CC m�`H @<xh8�*L���\��DÃ!hx��рB	T�`��P�
�  4hACD<@D<`��A�	$P��P�
+T����P��D#�����0��(D4\�0��
 @8D4\�@B H�@48 "*4"<�
4@p�	�`AC�L`�����h�hЀ@"Ѡ�
�Lp�p��	
<� ��
$8T���
!� $0<p�!�	J���� (Lh� �

*<��`
��
4xBD<4��ƒ�*H����	 Р�h�� J�D0X��!�B
+��a� 4������ �,�h���0DD`�`��
�	*t����
Dxp��@aB
+
44DDh�� �!B*Th



��xpppphhhhp4<``hP�	��ƒ�
T��
�
$8Px@�
+040H������A���D�	" $$�4��!"B�4H���0��D4x8.�@�a $@DD��!B��
�c��,�X@xh0`pL�
e�
ԇ
+$,�5�Ɵ>�v�$!����$�g" ��!H�<4\��#d�
�<+)c��VyT�T�1�R7��3�Y�P����C���`�XP�
I���	
��!��e��@!"��$4@�p��`p�T� ���"D04���`��
+D4H� ��	P�H4<@<�T@��4�T�$� X��pez W��
+.���T �.�:�ÖT0!\A
 "4H`
R�
`��R��(4L�!�
+p�
+H08H
&T�A) ��I
��� Hp��p@U@���
� 44< �AB�
 DD 08D��
��	 B��A���B���
+
@L� L�����0��
DD(<4XP�
�
��0m7r��k�W4VrB�����W�t	ݔ�6���*@(08*�%4��a��<0,08
RT
��ԀJ*h���x�p����H`xpXp ���C���"D4��

 4H��@

+@(����""��� b�
��e���
�aBD��S�@�
+*H��B*������`�� S�
��� �"
F���/&"���'��)˱a�v�zխU��s�~*}��\�="��>��i9��`o4����V��$���Kz�hv��d[�J����Ul�K�m\W;�SD��r|�Ǜw�Z��ܤJ��lDw�:t*r���г�n���#V�a����5K;ѧ� ��2��٠e}�*��c��Σb��1"l��^D?ۤ��R$O�������o�X�k��������0�'{�/GI�sJ�#�����2���?0��Wr땆̵�9˷�՚h�z����K:�3��ߟV�l_�+C��7�2��7���z�U�]�r���gW����_�d,8u_�F}��|��zʗ�R�T5�Lg�N�h�b+��^�y�eU!*%ʿ�N�)FdH�3�E��E��&ɰ�h�_%��Yt���$��mgW�#�JV҈|{`�A��(Rmg��T���\�
�je�.��[���l�:`p0��j���Q;��{���r�+�{���9�n&���\�oiTL%Us���<"��gӥV�m�<�It�VB�<�LK�����Pi��Z4ض��缥�$}�v�F��!뤯̃"�*Yf�F���v�]ii�Ћ4���_����ۓ�J6����s���{�X����6%3���d�_�#��}.]���yeE�{!ڏ0��Zn�T�g�T�h����L{���Vk��)�%���Sы�8��~����ZϘx�Δq�;�T��Ԗ[_����BVC�)�Zm6���jW��e��D����5��g��Tw^,[mݧ�rٻթ8;&�;�T�����f���_y/���4X�{Y���{%�ݻ�
+����4k�{εd��V���մ����k�����C���Mɷ�^����\~�U��A�^��j�U����c��ߤ�/�N��TJ��R��5HEr��Y	�/��䞧��r#�43�2ԣ,&9Ni��r}�Yz4Ip���l
+�d&��VW줮���RH�s��[�]�.��D<�b/��^ᔘnK*s2�0}�E:�V�Y�{���^��Ι�;���V�Z]�\v����otY�zt��Y�>xW���N9W*�h��laٽ�S�=Z9�-
�Ј����cU>��o��U+��Z�`{T�8�җ&�V�*���ܭ�O�,�m�б�ԓ^��N֕���3+˧�|���B�S!j��_�J���|Ӭ`[׺�\�<ZK��仼��e��T��h����E��mx�g�AO����W/��R-�|,{1+�T��f
+Y�W*�J��yW~�Q1��
+Z�Z�Jy�x��Ŧ���J=H�Ʋh�#��:U�%�vI#G�\X����*g�t�3,��dT�m�wI��%��X^��v�&!6���>�SrΣ��̋�'^���V��M�-�%�,��VZ/����S�5���(ﭩr�����.)_qQ
���2��;'���=-_*KШJO��꽷zu��I
%�~�X�%w�b'd/�"y�3��.3%&+M�^ExץmJ�4g8%�ebM��t;e�!��l��xs��+z��t�NcU�v��f�~�*�>�m	���^�cI_O��;S	��%�4���rз�����|̢���{�a1lo�wt�"�P��KҦ,��\�7>�oD�s��"B�̰����
+o�~�Е����%84λf)���{���r��%&��MWE>T6~��r׬e�ڲL6�z;�Q���+w��^�����$˴�"F�,v�gF_b�S��͟�ꎄW,K�7���,� �k�Sn�����\mn��Öu�ْ-A�)w��\�����/��̃���'{�z��7��ڳcۂ%R�bI�z4���k/T9W��f�����-��؄V{'}&IhGV���7Fv�|A"�{}D�K��D����Z���`����Z*TD�ʅNZ�TW|�e�DWT�&o��%���8m�vD{�ғtz�=�Sp��$-�I����1<��P�,���bC��Tz��tg�"�+��;B7ve?��"�,��g���&z0-�S�n�Y��RY,}Py�.~��2V�Rk�:�����N�,g�$W�X~1���\>���s�&��-9%EKϝ�-�e��_'�:�㖐��U��T��,�_R�OH:Xx?�X^<BӦQy�6,���.eB���TY���IU�v+����uǒv��y���3v��L���ϯ�)w

+@�
&�b�����
&( "�B��$�`�*���Q

8`px�f��FT聙m�Z47
�V��!��+n�y1$6'�O�+�2:����M�lQ�K�o�ԛ���]!���*䳪V=�j�vG�lޓS�����P�jY��
����L�R��-rA"$wX�5�:+K�ɥrT�x+���>s\�"��$��j[��bI���K�HM��I:4�&��ҧO�J"����I�3U/*�#�2�����J��n�zMV!#�,f�:��g���[T|���Ҫt9#IW8fE���E~eۊ�HY�\�����,�2F�̥D�پ~��1,��h�d��9,SRu��mW�"R/�b���'oJg�� ǾYf"˫S����啒�g�rr/կ�bۨ\I��z�Vl"4IX�d_�C�R+WIJ��HV鬎~ˏ��]�Û����q4BCWU�Q�2j�����Q�|V�D�Y�ȭCug[n�ry"���yUn�"O;[?,7�[���S7�*����D����$�<]I"9�B��,��.�r"S)#�"�ɪ�IęXniƒ^$+�D>�BGN푎�*����d��\Z�N�U2�X��G~�2��.=��]~��2z��ũ�G�sMi�
�,o���<&�9��:�K���G
8`p�
�cp� ��"<8��
�$@$@@(�:`pT@L�����h�������р4�8`pX@08$�
d8�
�2%$ %  C`LHs�����ѐ 
d08nFt�K���tU֩>ŌH�V��_~rP�0a�	$$@*�cZkƨ���#q*c!aGѱ8�J(~,���8h�������Y�=��a�L�L�45�&����s�������iM��ˑUU�'�f�8F��U�c8��C��wExx3��bD0�4R5$����uk�����Ϛ�k1$W�%1��766]�VԚ4�
�E���9p���u������#�H���W=}v��d��Xg8F����œC��z5��v�b�\V<֧T���d��ʲ ����3i[��Ƚb����b̚�T����K^�)Yҩ�4�k���mAs
�̵,陕��
+�̥�;�frZfA���?6��1�j���3��V������v��h˧l�R"��D���+Hf��M�2<��VΊDr
+����!,�"��K��U�N8f���d�N�]�H%^�JO�"��HM�"��"6XI�2E�>*W��N�URa�0g��#��VaI�
+a_���Ҏ�
��^0�]��V����l.�5ES����zi�+i$�>i�$_};��d��V�2�X%)M5�$���'!����{�3���D
+�W���bF��?��2Қ��oF���5��*ę��m���6#�i�z��t4�$�W�JN���ҧ�sN^��Ŧy.׉��Glr���f�Saߞ��l�S��7^��=�9�j6�vn�ʙؔF��^ϑ�y-������|K��m��T�.f#��=�T�B7妛���&���,d��<r��a�)/_����*y7��/��y)�2ٜW7Ū��h0�c4�[^?�2B��ҕ$��*bG3���פj�~�ɣ__�Ne_7�)u�ňX��g1���lW���ƾX�z�~�W�j�j���2krZZ�J��gUe���\-�+�<��su���V��4�R"D>�lyf�R"�+�:2����!�3���8��bH�eW�ie�׶l��K��#��]�����􎬲�G�����-����)eB�ToH�U�g��D��U^ϸ�g�8c�CBE3y��#�_]��#U�K�9�H����]Ȥe�G�k���o,6R���x��
�'�е��Q�SЈb�zG���wC�你��V�B�)����2�ү��>H�DSh�2����/<�M�h-e��q\7�d'��2y��8D�H��M"����Hr�s�N�kn1{�hǻ����9C3�w�^I��&���>E�=�h��i�����K"y�����̝(�I��lk�$�����.�r��rU���r=�ڙ�Ly4��$9���#��u�C5::��υV|rf�s����^���Ef7:,>��wT&c7�ϐ��Y��e�����V���.xb�d��;�e�tY��3*���3�&�Q���,xDGx���鲗�2����VG�+’cӝ�r�t�W�כ��,ͬ�vS�S�Kӄdxl�͵Ȋg����hl�+��M���!����B���Fh7�?3��+u�d�2ʎ�Jц��2-�^c+=�O�?��k��V��;���#��3V��zs����X���RS�KB����c�+f�o������.��lVh���д�c�^]h�[�J]9�ra=c��V�5k3�ab�9S��{��{��t/������ۂF��FΪ;��e?�X��TJ����K��d�Q~��UI�8t�a�j9?kZ��,Q邠]������+&�Cb��$�k9$ǻ������\�3�W5*9��1���&;L�c�y�2�h
�LSy��3��h��
#pX@�
D$t�����Qxhx�
80F�b	 $��ƒ��@�����"Wɢ������
&48\�p`��
"b����� (�� 8\��A
�y�u�IX��
�������v>FX>�)M$+��KW�\�U���S�s��xP��)x�b��2��)V-��/� �KVjɥ����t�)��ݥSL��
+��Kl
ʴC*�>4+f�+T�e�X>3uŨ\e��iW~�Lvaa<��'��S9:`p<(֕I,M,�S�%������\<E�f�3|�)�
ݲ�6M�M�kI�3D,gW�N~���9)���:��B*M�s����Ҽ4����xu�Kѫ�[غc�ʕ�N��o%�,�g�f��z^!�K;=��]W��z��ｻ2�B�1��f��%ޱ�Ŕu�{��܃�����u):����&��L�{y��b.H�D�"�:O�-�IKk�R��^%=U�2z��]�;��^�tO���Z��r[4�:�bE������[K��z�D�Y��_��n5S��w��t��ᕞT��Vl4��c��
+Z��-��Hs�3j1*���L��C�Ȯ$I�S���^[V�Xf�N�+���JeV�4d�V��%,SD�ש��?�L�Rј?�*tY5mK��`]�>��
ݹ�r��g�o�[��<*���UU��_�`�FiE��c��^����y.;V���g6�H�K6�t��]o7T�>�u�Y=ȫ����N��j�4�Ң�ʴ�rE���܃֍=��nO7��|���<������*��T�����Aѝ�`��\����RY�Va�
�����(ˌ�~V+e�i#3���f|u:z�����i���^ɒ�D5���--���K�8���w�VGW>������^v��h������T�5�T�IMB�:&M1$jI�Lu�R+ˌn�*2*����]��Y��{	_�Ҽ��n�+W��+5����7��M����(	kSdg6��a��3�3�v�VI#B���ֹⲚѧ~J��I�RG�sv�4���e{VQ�R)�C��gX�tv��쵩R����J����毴�Lņ^�%,�����z�Z�=�5�c���*B�Q�8x���92$���N�*/�ݹ���ݎ\�Ź��XnؘZ-Gd$C�|�$)3�H��]��h�%�jOJ+-��|
+a�~��dd��JJJS^��ۧ��fy+Fu_����4��Cf�E��{`x�*v�mK[�_�Yj��_Ė9߇S�j���K�U�1�Q���>�G}��,3�����є9�̿-�GF�4��t����z����m�Ύ�T\ʳ���~UÚ$�3���2K�~u=���q-���˨��y_'��ui�m'?5]�>Y���i�+�"��"�Q%MRoDY�l��m�C������S�#���]���{{�*Q��u"�n���&?h]E���*�Ze��Ys}�u�/�g+��y���9��q��G'?�.�nx�Lh%'�/"��U>uf���卦\�l龤߳j�CB�$����gfW�ԃ�f�-k�����lsN�Оr΋��q�.8��N�-��^�Y���(-�N�Bb�gV����=��n���o��$�\��~��o�l���;"��!گi����j��w���2�\��a�]6.>;�j�1�dɒ��0Ϧ��d]�*�-�!��k*K���-Us>ֵd_��RQg���l�$¡�򹢩�O��`�,M�F|R�d�1�Ac�/�ƾ�tD�j���?t5i%�`Ϛ��Md�E�DJC��RX��*V�mT�W'��lײ�=v�4��_7U���9f��:�a��E2m3[�����hVКy��
����WE��Q�+y'ON�#���W�U�[�ʋ�h�׺*uQ�r���EZľH��_]�%����w����-�d|�P_E��z�T���Yރ�yOkМIV2���c���hB˂Iv�7�d7IvϬBe7ITv�,�I"reXv�e�,�Dļ��*6[\r�J,1^�k�5.g�i;�ʅ:c��	��]��~��x�S�%��w�-"�F�ZѮ]r�E�!s�9����|v�]��N�S#wN���1��cS��+��vU����[M��X���"�"�U?g����U"�|^٥4i��M��2����C~��I�4���ry���,m�`�%�,1a�j�_�ݰVl0m�伏y*o?�4��ܱw�}�ΥI4+�����zT6�T��#��)~z�����255+�<ŷ��ZS�gu�e-]*�N��Ofce�)��UQMi:k���ʺ)*�~��*���D���]-6v��c'}���.OR�l�L��l���rF�չ�u^�?6k��b�O����/�W�ɊnwY:D5�U�1�¤2���-����~�*�%��ʒի�Gv)�ɭ��K&�SO�ixe��y
���+�D��M̬{s*+'I��a�ek'VVa�]�m,��d����ye����AL+e*�v.wh��Fs,�Qi����h���i�UgW]~��Wy���kѯ�.1��	�Ѫ�CU�hr�:K�>E����iʙ"Kz�X���7;Uw��"�1�˱����c�Y���t�hEC�n��H�*sb9�:���R��L�Y��U
��|�������eZ��U�R�>iT�}I<D�R���jV�
[s�YV���	R��|�X��ck�ӌ�JeO�j�\���Ix�乼��młc[��ڟ$<R���l�+����+4Iw�XY<�����3�*��f4���{��M4�͔sr�ʴ��Ӭ�Z��6vDD��Wr
�ʔ��,���AB����Aa
���
pӣ�JO�S����ВL�c����X!��ī*u�+*+"��[��e��)E��.:���<�ҏܾc�K;��m��ͣ,t�1��'m�rSj��G״�l�M��M;��ۙ��l�i��2&-;b������&�I�
+q�l�19�U��}�+w�:CO�a^����krM�I�"aޫ�^�H+�w��zyf+u�.�Ɵ++x>��G��L{c�Q�M��x��W��Y��I$�,������|8�J�"�5L³�|)z�Hb{�'���,=�
+k�H�|�j��ƪ��I6u�2_��<��ββ�T/�XpNΒ���\ܞ�ݜ{UJ��P13��Z��8���!tod"Wi�i�ͤ�J��)�X�szU"��)J��!e["ǻ�{j�+�d������ll�5�r2"+���e�W����p�D7�4b/��Ǫ��%�jpzXW���e�-��+�U�:��,[�^�w���c��ư��1Y2�k�����Xa�pqES$�/��^�Ӎ�1�Bĺe�DX��*)��c)"*-bw�:ˎn7c�H>m[�H!e�(_�g5:��`ᙕH}�Xi�>du;&]�9D��[��*��f^Z���Y����*ELuW)r�k��+�Ro۳��B,E
+���wT����~�χJ���JIJ��AJ���rJ�X;r�Ta1B���Ŋ�����N9�q��b�T_����ef)ҳæ�03��8��-i3O�M8m�u��W�����n��gj�&����r���f]U2Rc:���-�th�ґb��|D,=��’F����D#��]"���%�M♕es�.�F�E��^ɤ���(�ʍ܍]fk\t���׼�/�2�,f�2������Vb"!]օ����*hiU���m]am�#��ڬ�|�w����5��g�9BF6��	˘�ؓ��מ�J�{�,9El.3�F��Cu�)���u��~vn�M���9>�"��ҹJV�7S��*K9)��Nc,5uŲ�*���V���R�+�z2���t�w�� &,��Y�͖>��V�^	
�I�l��]�	��cO��eVJt��|h
+��>�QW�ʴЮ�/��ܶL�>DX�
+�%������-R��aO�u�SA�����
+�w�"����
+;h����O>'��nb������`]�\Y��]��io(kź�0����#��h:�Փ���+m��aґ���V͚b'U+_�/e��K�d���Gu�:�|����WQֱ����eO�¿�Ɗ\̼���-J�iY
6�Q!!����L����J�,oW
+	ˑ�L��EFF�ղ��9����z����N�U{Y���vc�&�M�������D۔�[�2��ƲODž�Y�)�_h�����U���9��%O��6?��I�,�i/�)4?�z�FC���f63U�pl�ZW�0�nŽ��}��
+�uo�_r������v�|0O��K6����u�eDu�I�]��츾�?��uhhS|&�X;�V��S��}����z�v:Ĵ�w9�R/?w�������Ţ����vi5x|�5���Rf9�N��
�����Y���eoЬ�t�c��)�߼K�Le��wh��X�K�o�VZ���ڔ]	kS6*-��o%���;m��Y�y}"�jD'k��?J��r-2�:�|�{��/+�qҷ�2Ē��-�؋��̜KV��IF��6�����K��ةV�z�2L��:k�u��x�q�!z��`9���f%�:D��ɪ�z��r�
V�d�Qa����%Ɏ
������T�HRc)��H� �� @4��a٘\~���D\49'jP!c�$P����&����{�K�j�����ˎuD���wݭy��f��w�����zr��*�ȑ����6���U2�c&�BK�*�#AT4x-{*�a�7�q2��f�S#��ie?�K���m��{�����h���w�%j�=�4�~iꢃx�_,q5��E�G��Zh{��9��`!Xa/��h��t��E����M�ڰ�J�N���	��8)۸�pB�ߛ�72J�9Mh��6�L����Ij�n��4�����E�B�T����`x�g�M7�ʜ�
+������/�\_�����XXSZÍ�GK1@�'�b��߳Z�s��%�MG�_4�mY�dzl"Mk����P'�6`�x��a����.n;^�%�t�
�֍��J��i�mtD#���)$qD86�g۟�$&1Pٸ����A�b!S\��=��<�Nѡ��v�d߲������?|z���-'<����L�eq���N��f�p ����Es;+�ED;�1G�"��,��{ѣ���r��Q_o�������:��ܡ���d�F{g	�\����+B
V����U����e
+N���*S]"A;)/��� �g
nf0���;?��a��3�M4C]H�H͇��R��)�
+��R��Z��h OI1P�-$_��V��?�"qU��$����T�
+0m�37D�B�����!����<������4֔��-
��1����恋4��HbY���3�]�6�!�B��
+����B�H�
����z�m~:�y�(�Al\` �%�h�4l�0{��_q�/�Q�!����N)L��M1Ua	K����I�c6ܫ0L�%�ma��TK�Ȁ���f�h[h�g���e)�X�"���V��+��^�2x�e�*3��-lf�u�Y���<��M0�ɣT�g�`�����-LnV�+C]�J/��C�?��٦B <�b�m<�.-k�?�uT�C�?��O�4
)�֓},[�#����כ2aN]�&©Ne�/���0a�J�&�}���D<����ڤ�T�!���	��J�N
+��A���G:(3�l�Y��D-9�ީ�Ž�T����t<��.Έ�4��o_�##�n��Ѐo?>����ln�8�t���5j���LC�
`�(�-,�Ѓi;�
9x2^�	��+�-J�]��;�n�-�E��Gabd�i���.�����&i�&�{��qd>JX�i��/=�S[`�¨���b��E�gg%��J��s�rpG5A(���#���I�P�NL�	t[�{�[
+��x&������`�z��B��ď~��>2~����Z���_���s�%Md��'��_<�߉o,Hr둄Y�\4�3t�t�ꡋ��M��R�cw�4{��M7���(p]1���~E��Цɦ�F˼����U!��2����r:��!�@Ӛ9Lp|�y_gbU&�"����5�_v	ZŎW��I�>(�G�턿���	�z�����vX���ܒDƪ�1��������0T�	�]�s��
fʎn^)���0�夡�r�����𸲣9��H�5t �F��>����b.�2�[�"hH�Y�B�"�,��۩�^�\�ZO	�R�*��c�ء-�A;d�3�e,l����k�g*M1��VL[���P���� ��*��>4vImx���\t�Q��) 9����S�s#�c�T*e����l'@�c���T�=�Zy-%p�€����%^��3�L'���w���/����	3��O�/�''c��~��.V�T尗z���E��?�3�(B�!7��Q�'��bD��Q����h�+���4:I����@PD�ҹ�$���f}����X�%d�Y�y���Q���v�pU��5��T������΅8�*)P+�w>�w�!����nj��W�507�!*T�>��3-8Z�0�/���D����x��:5N
%��|,��5��V>f�A�Jr�&W�0X;�_7
��l�|Ĥ���O�����(D�d�}�
+�]�5�A��i.ؼ�G+�0�d��
d�U�%zh�޺��
+�0Yt������,m	L��v�Q�J񫲝5@c��������b���������7��f�v�NjPj�T�*9��56#�
�Jo�6��2�n�m\b��r4��R���35��9�D梮�^k!��N�
���"�L������s��
tH8J�a��`8%eL�%6�ȘQÐ6%��e��"Qs�<(SKe��{�lO��*B�K�7cq�s��F���X��Qs;
+�z���L�`jw-�^��)���W��t��!+PI�B����m^��@��6��M_�hQ3�	7��JL�;d����\gخef�6L�{�҇'��#/�K̂!��m�W���l������u}������-�hU�\��=�}aըe�����'���ǩ�� ��*�ɣٍ��}�_B��&j!q��p|�������e��\}�Z�S�
+O��H��fԸR=�e��
�T_R�w�r��8
	NڵR�ݐ8��J�Ad���^�u��t:gӊ�Y�W�p�,�c�G�<
�e���0��"�誚U>��Q̮�D[�����؝�I���S�����XDh��҈��PE��7��G�ꇑ���a�����#��'�|Lƕ$����������/�">�[���+Veئ4z˅f&
+�3��/��WB���&2m�sț�ި~^��eV7��/��I_�q�92@�6˅�!�eGd�	+GgA]�㽑���/8�aȊ$_�N?Y�d\i��Є��+�c���c&��S.�
M��f�
l=l��e	f�p�w|c�ah���?=���/���0ߨ4�����#�'��J�*u�)�__󟴑b��mR)�L8ƴ%p�I�R�3m��F���G摔��%�2y�Ȏŝ)�9s�	Z?	t��~���O�1���q��	�'}qY��\�=�;�<;�q�fP��7ӄ��G��.0t糖E�k�z��%P�^rC�$x�X�킜fU�~SU}2X�^�!�5�<׶LOЧ�)�c�">����)/����n����@���r�W?Kd����/����*4e/�4qC=R�D�m��MҡE7���
Q6
�<��?5�D�-�-�wj��qB.��q�'���t�p)��R�4�o8n�P��m�`;2���Nz��'�בM�lq_̛+D����wm��g0@�|�w��w6���bG/*�*�QqF�|�l^��`!K��˺� o`cEX��v�#@�͖�8
RV�,B��2y�M[�M�/`Q�0�<�"��,��P�B��#���pnD<�ъg
�X�"�8}��q��
�8��rD6
wc���԰Ӎ�:ɇ�� +ৣW7-j�̫�4�l����B�Ԥ#
S�����k�,48"]�~3\�܏�\5+u���^�
k6��>n�1�W�!̽2|��Ӈ��0�!�@�M��,�
�7t�2���*��͸�7�`,6�a�F�	
 �~���|�w|�><6"%�~�1��cT;ꑂz���;��8o�pjU��*�L�>l��@Gc����)�1���h~y���}��p�盱M��	�l��-�P��~�d�P�١�>����Ĕ�g*���=�1.hem��n����}_�<�3{��F�
+�B}S�i��L�(y��ToĈ�O�Ue���ߑ��q/bd��Y���g�7�i�� �h�ل�=*A��*�����i$u����@�T�W
+$�5-=���<�Z���J��{����V��k���ݖw�:<�F@r�#��+�fX+1�$����j�(��f.:��C����>��P6*H˙@�ο���g�e
+�[���K��@���ͲOQQZ����8m��U,�q�ݱL��v:�%�s�y�7�8��#�
�;�vLJ��+r:=�W�+8l
m��95��+�R�1����-��zQ����Mqn�E�ߓ��}��n3�;�_�D�B��)My:�lu�D4>S���B����4�9q���v��j�Ѥ+qY�EwѠ�y���b��Ji��հ
·&}�0[?}Ճfz�y����Tk��Rת���A�0:1�u�r��f_������4�Ν�$����Ҏ��Z~?L�����SDL�L�JQ���:�r)x"M��k����.�@q/��.����׏9��.�>d��5��m'�]޳0�|�<Ϋ3� LQ�]�zO\`)��2.}�a����Ui3U���S��2�yA�+m�����^N���O�KQ
+�f�/��n<�:Xx�й/�)�d�Y���\�4���*��W����{��Lʽ<7�mAu��A:�
��b&�|<��)$f
+14�Տ�`#F�����)Sh�T�k��Y�ň\'�7+J=�v����������/�G�b`lԛD�3H��XȢ<a�$�}��F)�[�VM��,����S�}���,j���0�3�
��/`���WY����Z�Mjg��΀�aԯ�U fu^�G����4�M\T$L�'
3$�ɛa����8�4��9Qΰzh]��9�sp?���
�
���_��G�4����d��T�VKs���d���a����W�ͬïi�f;�d@X��)�&I�TV�����;����Y^N͌��~�xN���b��+�
Y,ڽ���+�e������et홃�$��G�o�A׫5�o,��&u�C��}G��[�/��
+0kE�)� *Pg�1���E�ӟ��Z��}[P"�a�#�b[岰���-����DB�M���+����VF���ZM�N�!o��o��|P4	z��9�C�C��꼧hr�c�z#���

+�_G�
+������)
qD+؈=K��]�� ���	��M�@�E�<��ܹV2(���}���-�7���s�^�v��L�J�fݗ�L�E�i��=�,�@��h�{!&\���|�N^
�e��d�DP�o�͆KχB�,�`�E��Q�Ѽe���I��荇	kay8�*�)Y��#�_��-
���1M-�Z��J�
+ IJ��	b�VQ�B�
+�#^��ߐ���Ge���CF��pJ{��^�
��05I�/���a��H�K��b^Ѵfj7�\���4]�T�0�����Bw�4N�nJ�������

+2Ǝ�H��4��i:��]�ƿ��x��	�#<���I�g�k�h�Q9�|]:"������+8Vj�!�;U�M�]2U�1��S'�gA�p�H$W9��;
;�̧l��W>[T�q���:֏t⍆c9�|H3	��҅�1b�$���
+� z!e��puZL�����Ҿ��!{%�Q�{�v�G)�b�Y�
�E�'(ґ'+����U:��.�y)G�QPV��nƌ\!�*�*
Y�b�%�K���Ea#���u����~nu3A���*f�[��7gZ��	�8��Z52}@��.}^&�A�t��{��T�C��V����فKARt�wxO
䳕u�/T$���-E���TyJȽ|���
l�ʛ�|ͯ�[!��8Q\�IhL.��<U�����;��3�U+(�h������(٣u[�m2qp��#i�م���bb����q�
+����>&�0d]�s��rJ�G����[�
o�MV��C�Pl5��<Y�>NʙZ?կ
J�V0��,^�_���L����G0�l�,'�TK���Q��ny□��.�u�:�g�5h�=�><7�[����v6��2����<L����f�Q���#��J�s��&�c,m�s�ÀSkx�c#L�c%�~���}����AgI��'.Ȏ��TѮI\١��}�.��	H�%�qP��~�;�F�]��?��-�N�UD��~u8�'�30*��z��B �ӊʔk���p��:���.�V��޿bwQ^0>���IK������/��SM�W
�A����JUzܬ��������aq�@�͆��b�s�
�� YzM�������+Y�n�x�'
+	��;=��@l���x6��la�(��
KK���r"z)^s����/�x��v������D��(Cr���k��ʧZ0H�zo)-+��~M�����g-U��;t �~3�@�g\��~�`o�m#��S6�i@��0��n�͙���p:�g���xy�,ȋ7�N��#A,N.�
�����d�im^=I����L���#�<���a��;F9���Qy �1�p���rlȭ��q�PMD�z$�^SHF��#>�/N7v�u��]���ð>����=�AG��RmH�dMh��W��̱R�N�Ї�=e��J�t)I�l�\���E�=̐='�?gP=^���f��M��߱�.������8;�����z<���E3@4�2���
��R�b�W>""�!���ʂ�F���p��\4d�M�av��fѶ�
��u�P�۽|b#��D����/0�Sܗh_j��3�.�!�2��A.��bK��OZ���B4d���$ĻSZ���*!��O
����j(q� b�;��g�����ڪ�B�q9�zR�b#�_K Yz�)�b���)r�L�ҳPˤ���yɻ��K�a���r�2x	�T6�P0%��5Y�44�^�e��^k7B.�l�,G�Z�w�����r��~g���qX~�o��.�PƊj;�����jO֡�>���ZB^�{c�i�O:�>��H�S?,
+)
�E�R/��͞A�:�[7/M������A�⛉�0tj�/73	���<�d
2Z�$z��ts�_<�J7E'R��#����)R�~�'6W�d�$����ON�2cyak����A�����>�j�x��u�y}�ۓ��:��6�B��k�*S"�}L6d�o��ݕ�34q_���=iP��Rp&�E/��	?
+�<(�M���Oe�lP֭\a��Rc6�g��lhQ ON��$(|�UVφf���?�Z�P�Wޚ��ԍk����2
*���%�����-������Q�� �Di��D�-��O`+�l>�+�,�/�W<�	Ny{�<M�-��@�
��]N����FE��lg�=P� O����v=W,� 7#^^1�O��?�
+Y����n�O��T���J�1�axr�!�,�!8�]R��Gk�=�09�T�ql�d��-y�HY�
�qV՝;��m
+Qm�
�+qg]��h
�)[�۰������f��&�c�7�r)C�"�)��^^�E��o���� �憫W����f��0�����0�DQT���]SL�P�o�W���E�
+ʌ�ۄ?6d�54����&	-	�j�yfȘY� �-��������B׽�lZj�h��E	}������]�Z�Hm;�B�����b���r���!B����T�/��\��ib*6����$&�9�6kK☕���n V�ӽ]Ɣkiew�ve�"���sB�Y�Ĭ���;B�f�LC�W�t�#T��a�i�ذ^�x&�f~�i�c�
�VT����f�i]�弤hx(@Q�6�~ü�lf	?d��|��	2Y�Y?G2�<�5
޾8qD0����gG=,�y����K �.�%��Z�6�Y���x�:�O3���9���1�f�P��F��c�Af2�h+GDnQ��!)��>w�u{Ó�l�0q�m!��vu�Y(ѻ�l������r�>3�K����o.$Z�Y��i,˟J�\&��j�rq:�O�g���ƺ
(Q�SHv������RG������z{�ld�5�)�k�̰�z�|�!Ym�E��(�����r�&ˠ
+9���&[%���r��M���	���f���9�� 
D�a�e�+���,�<�wS��C~Z^�oML��Х�g2��}�M}�!y\�r�=dm	>�/|��R�2�h�1W�`���L��_8P���<CJD��3oH=�*t"'�g�;	2���,Ѕ��//D��e5�9�}��o=L�D�4E.�e��|��ұ�����P�	��:�T���
+BDh:B%C����O�4�(�Z��#���S
+�ve����ԇ��V�A�gAJ���z�sW�s��6��E�����H����b�����!C`�zo������V�&T�\��
+���oP��Jڟ�}OD��E�%��|5��7��l�m�J�^�&�к�@)��Ų������(A��D(ڃݳ2e��{�:�8�ë=�I��R�W���P�<�@C;\v�t9-���*�o��%��>����ij���Ui�>E��:�
<!6�j	[���OFE>���-'�t$�����U1=�/�)�>��>��w�=�8(�<�K\o�:F��r`s%�>��"-w
�!��{Of�M��YJ<0=ij�4��}Сg���]��:=Q���Cv�]Vk�Ѧ9��o��a��2o�_��(QD]�9���5.7�wF�W���N��9L5�@K �eȧ�aHۄ7�2�&�"E|ޤ}T�U���x"�ʸ���p˄n��шE
L3�:��O�׳B��y��\�����Dd�������x|�B�f���3��r����Μ
+�̀{�)���ǔ��O|���_R�zNSl�E.D3���<�hr��0���v���?'���B��6������4�\ǭ6-�*Y���譧W�,D����З#��`4�j[�.<Dm�,
��#�g?��l�.�����60}}p7�^��>��)�L���&��T���Qak��|�c�b%x�'�
+�j2U,@�55A�B�9��"NЈ)�gA�C���?��+�~.�Ć�l������(C�o1Yt��9��l��Ӯ�_�W���;G�L���'��������kT
+�4�*�!!ٮ�ĭes�Ln��3Y�&�'0����ux�C��I}�&��C��F{��"�[nq�j;�#
+FԹ$q"��ؐqVm#��ggIv���
+�n�#+��?RK�-$]jW��G�V�&P�{���O
+��xn���S)J&��"`_N}&/>4�)��Q���1G�
+�{���
+�Ƃ��Ap��C�=�I�W���NP2t�>65�[��_P8=I�Dt&��"T�	9-��J���N�#�>���G�\��[���R���������5�b�r�s)����]��1�n��'	�l��
+,Q�8'�(����橢��R`�*I����(�]C�O4�<I0��J��X�����\���Am�V��⫨0I��I2	j�
+2��b��ƌ�ЕTo��24WL��i,Z�"��x4W>c!����E��+K��'�f!�Ϣwd�HK����Z8��]��̋;� Y��\4"[Gy}ȅ�sA5]��0��.u�w�y	��olmB>�/��(p�9ѕZ�D�K�<側T��ۊ�0K�0Ί%&!F�b��-|�bR˅nБi�cD��0 
u������`�+^j�	�#��u-�`���^ܙ����_�
+�1L�q�O���˃%ř���0ʜo��1���wD�k&]S4���O!�}4f�w�}�~&W�L�����3=c4rL�t��������
+�����=D�s���J�}j�h�Q{��5wpO
b5ašj!Af��$f�1��|͋i5da���8�{R^6#uA�6��#��ڈ|�jO��C�(2YR4��8��xI9]�aq���ǁ�iY��R8�NZ�?j�&&���r�h
~R%JZ�Q�<��dm�P�`Y��./xՒô�
�>P�Ժ4�1�iUO0���D�W�̿xC����������G��\�EH!6<Λ�jp�f,5
+R<^�;"�W��|�����+�*{����L�Tz��p;M���,��U���&��-\�ʕ�4l�Ic���"oK�
��XL�G&�CP��C����)��]~Za7
���6�ɯ�.�?��h���
Z��MBT�?yd�6�[�<I�*ݣ���
z�e��S�������<]�0�/��I�X�!ѷr����ϔ�_[_c��������4�1ԉ�Kp�(�T��J��{�4�<,;���!u�}}�������Z�mɜ���Qd~��0��*���E,�4@���S�%���q7�a��QV}�N˞�g�(
+�0�vh8ṁ�-yI*_�P?ZX�]Ew��)������e�Ob�"��NN��Ed1����@��21˸r�[0���|��_��;�@�_���6�aP"玎��?V�
�I�,���{��?�4�Vz[_�5=
G+�o����T�W�&r�r�Cfb��QPuTy��
(�@s��lm[D_,"h���j���(�t�f��Gj���D�O3|R��h�g7T'��(�O�{��.�}al�?{��o�����ą��s֤}��ME� ��"Z��C�y��r��������n��a�>͒&/�`o���ېy�?K8�SÈ�!�6V��	�&K2塋�
�I��E� л*�
#B8�������i΃�dM�赖7�S׵PK��l'�E���G�����
K}M=ljԂiRUT�ˡb�#G��\��Y��w��\��DeL<�n�!��XI��D�`�:H?�4�n<h%��m����)z8�1Խ��9i+P5�j��\�k��WŰPJ�A���t%7����P*:Z������Б���q00��Y6�x�R�[����tX6
�&���VN�W���K9]=u��j]
}3K�ђ1�Os�8�T�v�S9m�y�A�ù2G_2��WB
+�&̠�:if@�y`��i!f��Y��&eO)
��q��tI?���P�3���j?D�
��(I���ˋZ�������2�>�xE� ���.�C�dr69�!=��m

�q+a�V�fB��B��z#���ْlAq���qER��c#��yH)G�Be����� /�TZ�(�E�\\EK�	�:E�]Ez�'*.@��L���D8���O�Y��Q�V�[��Ad1Rp�CJ48z��Q
y�gH�Pq�`�[�3$�+���c�/��~��U!}.L*(
+�J�.l�pH�j�e�\����C,��1�&�B�
+�J�k�#�,[@�[�����@�@	i+
+):7�2_���`i��z���.0��h?C���G0�E>�nI��T��?S��>�e��`��	4HfI�T-�2ȁ#��U�KN4Š���Q,#��t�����uT;VH��K�Q��HL���	�j�T^3/��M�z$��Y�
+P���b�z�#HH��0ȇZ����EfU'<��
|vι�am�f!�o�}9j�g�\���(�����U�ѱBy&��+�=��H���:R���0�~Qk�H�c����.&��a�#ó�z�|>��
+�zz|��艈h��i9D���sib�Ӗ�b�T����¸��9�����+����{O�S���Y�C���z��a���t�<��-2�F��o��4>4�z� �8ȳ�����ɂ�S����d�]�EO�_�S���\U�1�l{ �Z�CT�Z=����TY>���xO˳���T�&��	Z����,���T�;�0PA�-�/�g��]j��^�t���l���wǮ��1w*[ɝM�E��I�� ����,�{�sa�_�mj��<Q�_��JL�ʡ���¤�j2�d��h:7X�q��
�	]��YIrJ`B��'�"�:;�����ܘP�3�ǖ�:��M��gXqf���Z"A����\$����v��e���m�VL��9b��.z�i������F)�g�	��۷E�&�!���tζ	@d�:���UY:D1�",�13�b̖^ !
.(
,�,��<M���X[���;�[�hg���F2Ԩ\a�@�Tif��1u�q�
�L?+I�w����)������s0��V�r�a
 _d�j�l/��_��LCq"�N`�TR̫ـD#�>���&�IG܀�Q�fy�|M�dL�������ēB��]kK�]�G��X$��&S@,�f�*��>.,6x��Z�^?w��->z��xν�c򦱏�
+A�^��´Bp��·-
+�����N�+V~«@J=4|	p!)��:���.�I"�]BN���kỬ�*�:����[D�E��i��⿩#�Ա��(��?}�[��{�P����*5�i�K֪�n��5����dU���1N�ՙ������$�Rߑ�=t�l�Wₔ���.���"!Tq��>X�?�����l��\�:�>�)Y�4��Y^�u 8_
+�� ::�����D��q���I�°��\�(F���R�C`���F�JoBc
k˲(KUL�u�f�>S�!���,|/�'4@�?�+AE��w�f�?(���Y��Auh���~�d�"i�%[���O"�,F��Nj�(�]��oߋi8��8H?�W�at�y?x���4
0>ol�i��{�HQ��3��#���f�U@�̵�>j
��
��F����$�D7���gk~F�}�H BsX�AO#M+p�7���&;X,��K��
+��ם)�bQ�)k���Y~�b�314���	-"�J�M$�q�L��wnŭ�gĸ$�x���Э8�خ�/]àR3��6��]��V�((d��:����sur��?�rX9�6k3+le�dF���p���04�p��:`_��mR�enfD�s�dj騚��`9ŚFK7�ݼ�a���,���c]�S~Й��:�j=pH��s�����s�_u}���LJ̡[X	��rX/K_��Mr!�X[9����bڈ��@⪷�z����B�֖Ȑ_)m͏����,{��������Z�3J^�nd���[�z)	")��rF���]�Ӂ��� �0�a��7l
$��]cD��@�H�uY�gF�p�|Ws�l���I���\}A��G�W����ʉ.���^M�^�lfU����H���IV�?ݩ?�4�#h~] ?�A�� �\.|�S�X
���R��S�57#ރ*��g�+����y F(�J����˭��cTP�dQn7����V��pe���+E�W����|5�R�&���{� �^ܔ�m���ŭ�O$B�zw�Ք��t�X*�F��m9X��넣����ܪ41h�
7�w�eQ��P�����۪���-���>A��`}9��w�.u
d)�F%�#��mndZ�0eB����%
��Mh��f��M�Nbdj�5d�ɐ�N�:���I18�a���!0,7�{�sb
��}ZI�|:RS�.���=���^k��ʅN
�_}�TPR_�
+�o]N��lt�M���o���
L���)p/�nq��Y#�w��~Qؔ��8�����V��%/�=Fd�zϤ�H�rKF�T�1�t��"a-����`�9�'��)3>&[=E�)z��QބF5��=��$H��a
+큝s}�h��^�L�5���5��k��5���'���Ƅ=���YX5��-��Ӧ�!
+��\�~Vf �>�� yC����8ǵ�.��5=��d��B=mJ�
+�(����\�J�ʾrO �{�t���͡���V3�&ж��o��u�s�}���́����l}]�6�U�S�k)�NS�ۨ��[l�M�f�1[��v�����e��v���"�r���	Y�����6~�-`h�,=�!�U��)D���2�(a��
+=5<=ᦽ�:��Ѯ.W��mG<V;Khs��*U��2�1����Us}��;� �"�'����v00S�� J��#�^&8������*�M���̓�I�P/|9Xژ��Z�+�G)>�]�I�KS��eҏB�F
xZ�^iQ$���U��$`5�5˲u��
KP *���O]=}��K��Y���vRZ�N�XN'�&9��7mOS[��h6�R�&�%��$H���_,�Ln�2���2 M&��e�⇐b��[RdgM�l�1
/�\�3[b�Ȋ,A�J�'�~A�`ۣv%�:���A)���R�9(���4�܌JR��8"�H@{���E������+�:zK]���g1X2G�ލ8 ��P#;,�3���

b
+r��$��&��d3JG���#f'���Q]�M�ė%��\�Q 
?b W�$E�傔�@��iB��*��g�!�Oc����|����S�z]���b��v:d1�"lw�z�H
9�ءx���?9	
+��%�%����/�9��Qa<3�
1��K����f/�s���y�W���vzkPO'$���-k{z�@ä�Y :9�"p�SS��Qh�ga`E�a�a���!��i�+Y
t2�Z&���z�#����ME�quԯ�5K0���r_�)��h���=���3�X��z�yp`����[lx
BU
i1C9y P�s�
+/��B��m�2�����N����^�w
C��7�Y�20k�C�w�]�<M?�p�
w�-nd�\�V�.��߯�\
��
,�u�'/ϕ�T��V|m�œ��������f��7�^�[1ྪ����h�q��&�n��k�-����C<�Yz�9���j)��q�Z�=�Zmo�
��P�m�>���p7�BS:��^Z���.�Րfo�V�Z*����7�Ʈ�="
+1H��Z����W�zy�ҾU�Y�o�yk�0�^�@��J�m�s�~ʏ������1+��o�y�:,�F��W`�! I��hr[�ֲ�p	��j����Q�)P��L5S�,�(�E
+`�f'��+8���N��w��M0��H|�I�=f���.�E�1����R����"�
 I{y5���@�Sx�n��T�IA�r`��e&?Dz��_�a�����o�>dw��*l����~�W[?)1kd����T6���3�V�9ȐL\��0'��
Ū�
+%�S�1Dܖ��m�r�m1���@�E���R/��{~�轓�ۑ�(l?�*)�!����'�����ݫ���<��2 ���AG/����
+�-F�7�V_S���Y��ξ�W?,�W���l>וx�}�:�k�@�
P�Y> V-�&���Ǖ���ָ��]2š3b��
=4T�َ���9��@@`l)��Wf�w��Sy#���yN4�v]J�e"�w����5��l���w�Q0���BX�P@�n��-�Uy>Gئ�{���N���O�O˾�`V��(���˳x�M���MN�Qc[o�iJ�C2p�Xr�&��I|fTt}0h3!�E��9{/�����UXͯ�/	6�	�o`H]$iYf�p`�o��u�ǡ7
+����uP��;��Kq��6��
�[�p�L�����[	Xb�`4Ÿ5�b���h��`�@4:��:z�r�]34oL�46ZN����� ��s��
g�K���Sp���k�
z��Q��<}(|ʵ���\�"��?��K ,��V<��.VZ��- Al�7��i�_gګ7|<�����BK��^a3
Nd�gPUXZFe
+��p*�F�["y���|��>t���!.G�o�X1��2�ѽwv��h��oE����O.5%bX�R@y)P��"\���E4oӲ��\�|QR�l��X괔2����j��d��S���wV9_��'L����b���1��m������Rv!^ĉ4���B�Fx�6�mH�C�2&���$�Z:���y����r�y��cS���$Y�L��������}Y�bf&L��|�f@i0�ҟ�^B�@��[b����>���$[��x��P7��n���oI6M���j?)t�G
+�_%Yĕ�j��C��$uS�g����@��x�1�},����r}Ѯ�__G�}�\WԌ/�Κ��r��`�P'C��Io�G�x|��J�b�"�|oS�`� �l�l���G����k�(����PDy�SӨ�/��R��w��/���;��PE��woF����l�������lȑaw��6W�laW�	ֱy&���ܞjY=���1��Q!�_"�~��g�:�g�~C�wC�e�[��l^)�e�Gk٢�5y��
I!�}d� �������36#vpQ��
+���^�Ҍ�S bRTL�Ƅ��40sd{y^s3����j�h��ҋ#L�_�]��������m�w��Z�z;�[�r�T{3P½�p_[�_�'���2�߱h��°\����a�Y}��
��������L��F!�h�� ��9J
+�DnX��5��7�?���[�M����Ap؊��+��O~��VoU�h����?ؘ�S�%B�}
+�G�Ш��:l�~1�C�j��;�A�k��c"�mǛyo��xe����Ŵ��,�s��[{�S7퇦����g\�씩^��3t��G�ӏn�pnҸn�C�cy�
+�\��Zl�HX孞��Ȓ������}C-�(h��p�}�3���Y�ɳ���Ͻ�V���Gϳ�'��]z0MLzYL�q$��E�B5%T�Ȋ���o1�7I��g��%	���L��g*�GH�����yBcp��Kkf�K9Iw�������+��RT�f�3{ja�9�nK�
+���F���_
+g�BU>��w\���8���CV޹)�
�){�����b�]��{�&�]�0�kět�w�+��v9#j�Z�̼��鄄JP2r-T����va�N�A��K��hEQNP5�)"M�}�FQB1���Q�_! �$�������҉|܋�2j��7�-qs�`-j^�{ࢃ�y{.�8�a�1�(LZ�@o�#U Ut�<qZ�ב�w�`�3�-�0��	�X�~flS�1+K9m�득ӥ�Ipz#�]�2��綕�z���\�K!T���!H�g,ND='�2I4D�0��&���\�`٩�R��ʢFV.��W�ݪT���v�-Yy�U�;4�l`G��Ұ��;�I;g�^>���O?XV�l)�e�3c�(c����ƞ0��8���mI	
B'��
usV @.��J	����2�)�u� �z<����S����O�Z�=,֌L�ɯ%�{N6����ب�4�C�N�<��*ZfBl�q�K�}�\�y2,;���R�v1�1����0
S&L	�M<k�ei�~�]��W�NԵ��v�T�	����{+u#�:3/#M���1�K)�~��Ϙ� �T>Uz���߃��*�/�H`��QPV����bo��q�������@)H���%	�
+a��Cm#�����+k���%����!Vv�&!gV=U�e�r�)���F-����ͬ(�(�+QK�@�J�(U����p������	�Uv�2�8�h�Ymd�aYuэ	��G�
+�'�L��6A�
+��Kg
��w���A�h��g�#P/�+�Z�ї��D�A��S�ǽ�~���ۥ��[o��e���m�3xҳAze(���4.������lJ��i���#�=m��t�~dI�[)~g��şr�>���W�8s<X��?"4+�QŃ��<;H����/�%G�p��Ȱ)�$Yy��c�
+c�J��uӱQ���u��%��_+h�S{jo.�^���t��Z*�O�`��@U`g�ج}
+7�D�B
��
+����Z��G1�K�<�+J,S���Wp������&���y6���1��`(�j(��t���q'�8�K-b�7a�^��wM)��L��sW��+5l�p���ù��%�3�P�V���\�_	�\�C)��JC3���_��#y���V����P����-��e�"�C���9�x��M�a���ܥ�K8��(/� �䇽$�g��FS���+�y+f81���(��(h�g�y�{�O/=?2���o�/����B4q��FL�8����O$_P���qd�]
Rt♘����s��"Q�y�=Y�X��
�+���-�xp%7D����%"�
~��f��4�j�ۊ����-��٫B?�L�b��- Mk�-��tv����Y�H��Ɋ."'B���?��iT��X��
+��$�v�!��)h���1:��)��kg�f~���q�L��KF�d���l?��)�}\�g^�-�H[��\�yo�1��`�im�T�W$�
+z��L*7����%v�t��*!�v3i��p�+`d���CE
b#��3��H�������uy���\<���rA�����R�F7ir1��7	ve`�d��5J
+�R�����E+�6���U�qm�� �5�U��KŀN�Q/͟�����4	�(�0�hb'4
��$���z�������h8��Y��wW,�<�9�+ȑ=�\� �>���B(�X���+������0��-g�d�vwZ���M�f������L/�����اm�q4���o�-���V�m���+ݟ�b�G��_�z��T����i��8����ˇa���+d�E���gV6(y?�~�����2�_h��*xo�G򬔒�
��zt} �z	����*܍�7yi����TD�C�n����I
+�"Oʇ��t�����z��jƨ:���a)�C�J�`�a��Ή�h}?�/�c���~d>{���@ȥ�x���ĕ�~����ԇ1{���G褃�3�s)�a�������ӺV���(���9I���R��c+o/�e~]Y������!Zl�
�ҀX�#?M���/�}����v�s�ϋ2��O
+L�8@ZV��L�sEٸ\Nȉɞ1�����nb�(©��K}$�*�̏Xv�Q��FZ,��ު���x����p4)����u'�Uڼ �#�%hMy7uz��:DiZ��!dW
+�+f���W��j��]�
P�`�
7��k�&Vv�Քk�5O�����j�`�-��B
�R'���5*�.�St�E�7Y2h^����&B��Ϲ���=��}r���!�8Y��ߘ���o)�J���b�/c��[�恦��6IQ�j�������v��·���8�d��j:��Pu*s�%��蔶��}3��gX#I�X�1*>��/Bv"�3��d�!�8��t2>oN�%����5�¢���\Ƌ�/Ɋ�����|�I'#��O��#�#���)/���?��"ib��Sz������55�9|�ek�p�ԋ$D�d��	pd����8;W8ٴIo�bs�����W�Njs�$��|�+$�B�pz�����!USGqp��֪��L� ɣ�gQ
F��v)R��!&GA�
+SD�H�W��_w#�N}���"�_�N
�����q���,���o�J�
��obf�1��Q�4�-��]��Ċ��;ة�KB8
#?���R�hFzX�4l�!���a�-���9j��L�r�ْ�{��!�~1�F�$�q��}r�nNyb.q���Ծ�{ے���Y�V�A��byV�����3#{A�º�5b�>J�b��dG]"�뭦s#mӑ���.�b���V�����HuF'Q?Xc{�f\�ru�ЈhDmz���"�Nij����h_O+��Rɶ��=x��8a�2��,<ye�<&���V��
KPtƊ�v�.���r��B���o�̪*Af\��*+>�f>�����a�jgt���G�~����&���J��<�C�p�效�m��3ܹ#5`��h@#dl�a���n���c����~�[2DՂ�(���D�*��	{/
HH���\B9X�"�ڙ�GȣP�1���i7Ђ���$8
�<�bV�s��9�Z�承>���t�����E/
Z�T����PZ�d=E�QhIv*�0$�?7��Ky��ix�B��/�G��KZ��ԝ8��)3����4�����ߴ��
�&�*h��}_��f��BAƂ5Ҡ�r'��5v�K��y�rI>
� %�����F��7�7���
�������z+�_!����!�W�M� ���QS����q
������,�C�0�pl~h�0�/��ԓ�r�
�	O~N�!ח�;RI��}������x�O���ݞ��>
)�{�(��#�싽>5Ȥ]ĵ�\�e���Z_��
+���7��F�t�R��O�O�\�G�>����5T
+
	*��$I�q���$���Y/�L�����6�MA�.��h7�Avd�C9$߶�Èc�=Fp�W����\	0�V_A�ڹ�W"cj�
�`adoh�o2�xZe"�o-t�V:¿�$��O��M}U�E��{�ӷ��F}�Rԁju9�u�n+Q*@�=�9(;��0��� �YU�Bu��n@*�́��v�#�y�sCq�sp۰6Hj�M�]�����U�W�.��$]t#�ţ~��o����߱�9Q���4�΁g��
+⼯�ԭ��Tm�پ}6b`�iQ��V��>v��$N)tQѡ@c>$���l�0�?����H.�RC������׉Q��%�֎ߎ7���67�Y���I9'�bp+�ɉ٣i�8FQ8k+ɾ�Yz�{t��^��c�#�>�5`
��܀	k^ �����5'N�dv`��_���ӧyKtG)
+3��^��<4�&�{5��}��E��ao!��p���gŽ��� � �_�5��� ��1io�Յ�u��׳@vy�A�uv���rZ�4<i��R�S��B!�a�YO���Eq��%:+_R��כâ�F�]���4���`�-
Cz��`��-}�p����p�
��^M2-��-2"]�*��׽P��*�2���Cn�=QC�jpo��k�\>�5uW���49���$e�c�y�h����͸-�f�r 8�g%�c�=h�	�JK��5$�^�P(4l���$69)D�`X~�p��/�����e�ϋ�x��1����s섙k���ա����f��r�!�=p=��
�Q �
G�S(���Ԏ(4��eA�B6��@��/�����~C)��V��l���@�
�2�
��fCo֔��!'[��A}�څuo�~K��7i����W��X��Cf�j��3UQ�*D��AG��U����Ta*��6��70�kO|U�'D�̾���yM�'�)�'�g"�"�/k��rLu���������ᛁ�׿�/[#
(l��m���x
�[x�)_�G*k��k�+��g�wcȑMy��Ͽ�qχ�C!
���,��;��i2�ǯ��s���9Ԯ�P�}�K�ei�3J�p�����,�|nA!��� �(���£�e�ms�R�V!%ٌ.�v�P�!ic�9dcυ�e3$y�^b��Y\��^�]����آvP��|,�8(z҉f��gl���?D�A��-��}�k�m�Кw풸C��	�Ra�J�O�����`i�80q��ۚƾ���*��>qHs�p^E8�R"V�A)ٷQn�i��Xqe�"�^���3F��r��܅S"����i��aҝ��|T+i�4�	����
+g��HL�Tn�?a�(Z�&-�H�).�ً��_����8 k��8����XH3����oX�{�
k�"<��|XU��W'x�����CVx�3�X�hJ .��a5�x$M��GrqGA��V����	�@e.`*<�+1��Y�=���h�
+��6~Eq)۷e�ACF��W�����Ē�^�i �^
+WYk���H���v�)�C�ta��P>�&����^��-��A#���+�iEz��yCW<A�|� H
D	���l�����>�<�$���J$�:ke$��t{�h�e�͚4�\::џ5.�F��}����$��v<
+il��y~���Q����K&	�3\:��}D�!O���H`�)�]}#Z.��y�e(�AC�ƢJ�����>d��,���'��x�tק�����Q�����a#[ל��K?צ^$�/\	o1x�}Ixx�Y�6E�=����T�!f�I�a�����
+���H6��b	�(��L��(,���ݨ���p����W��E�Z���+8M*��Q�盹CXCFG����a٭��v��Ŋ���V�
	a��0��%��h^��"�V8�/��)�����[@�소�WP$�*�$8qzM�e�2�SF�7�"}%G{�9D�Rk��R�P�[�Vi�!�9`�Z<5��:�=��M�K���ic�@N["G�=K�T`��}���
0둋�*h��yg�n��S���CJ����������D�g���‹��׆y, ^�E��!D�E`���ߠ��m���4A���_��/��=�Q]2�I���kƍ���]A�����*�N��j�� j;�e���������f�|��a�d<S�N�Ch������
��d����/;���@�N"��Tg$j.$�����t��a�2e�h�blB4ke�2M���eA>�����:	\V��
+��96�r��f3�+�D�8GMv���o�}�e_a�E���"O3@!+X[߬��(>�I�@�j�@M���M$P~���j��'����J7���z�y!���	�L�oyi�Ǻ3(�O0��J*W�[�C����F�����eH�H�Y�vl!�4���Yv�`4��jvѮ\��s�^���Ԥ8x�>����G��5�2ҿ��m����.�r���|%:�9�jc:�wlܻ1J��n���)��Λ��I�
+��_M��DIڷ�4���Ɯ��ʥHڸ���<��aga� �d���t���$��V�[�t}H�0C��CH������t��ν۷�Cն#��\'�w2���~v����͊�>^��ӖQ&���ކ̝ȶ
+{��㉄%��N�n���L�xG�q��K��,ga���
+5 ��p��7�	�Q�h���>ve���O�R���qy]~0���v?����K��H��q]
\�3-�b��^�>؅�u0aat`9�����!#�����<%���(|4j�(��!�
+�WAr�99���a'Dٝ	���蟹��HIi�t���w��%=�#)-ߡٛMzc����m�n|���x���t#8'$�-pu�N���=�n{����-9�o17J9G}�gd�����,�Bd��vSA٬V���( .~Zݟ#�o����%
+
`�"��<%^��kҌeژ�M�-Ǿ�nl1�~sBB�8��E�������ns߁m����Ĕ���غjﻡ>x�X3AZ�#5�#�\��'�ۮ�ى3'5��q�	�\�|�mO����!����1��ю'�1�-:�R�X��-�-6jR��y����eH�y�3�����fo�Rm���-RÝ*;�-��x�����Y���~���_�v>���<���IJ���_���_
+F.�ä�8�Au[?/��U���b�=u]�	&:�q̧��t�[�=!c��cw�x$I��KH'
r�c�ϛ��'_��g>i�w�|��/��s���<���n�U�^}t�b�L��@��B��4M�Cd���
�\�
+Y���h*��&)�4C�ș3��
H	���(@\ZGz=5	�qAK+�R�[�$'z=`��U����A�R�v��I������wt�
+�;���D� �{�`�9�J|-f(��E�_FQ���9��{�?�[#���AbNuf�"^�%vC_����hK]Z���1��)`Bߵ��Nt�b�.Lg�b�~o��H�խ��w��
+`��+r�
+�R���䤸g�
��4L�Z@!|Y�^9�	�++���f	)��^)Jz�
�w�+�t�v� ��~(-�Bz�F.������py.*}�<M���G��qC@�Fy�V�SW@'\��ްsW�'�W�1���=�t,���	�=���$���4I�1��	
oq�7T��qڮI~�U������9d*����b.٤�5�L����؋�e���J`�\��ɴ܎TkܧQ�����l8#��i�\%<�h�-z�j��%
+	�2j�h�yp���:�JC�$�����b�3��lm�jM�0A����!��EE��6�>q��Wpc�g���4.���Y�k���£�b�-�_~d<�����x�M�F9�-;A������"@�1��gP��������O�$ʯ4�o��h�[��~��u�~�:1-!GH�_;a}o�8p�bwi9��fTcc��*�!��&��T�}2�QI��aͶ�!X��о�А��N��Q�U �#�Bl�P
Y҅�+�t��
+C�U/�
pM��ɡ�*�"A"��;�M"�`���턉�7�6[c��=j&oT�P\=�����Y�L����	M@��ң�w�3f����I
�B}A+�c��*IrR�|���ؑw�?�n -`-D/�bɷ�������.�]�������c��686>�z!K��[*�~�a��=���
d���W`��
�3Nq���,\�J�R�2I�8<��p�
l`P����Ix��_(��q�x�� ^��:��=�����G����4|I8�X�Y���6�3B������k���U!$���e1�y��y�N�ҍp��c�C�nR����?hdsb�1���%��Gڙ/f>Uc�b��g�m�-���R��a���Tm���$!���PK���� Ւ*��P)
�E&�/T /����yhOqB�b���y��0���@�>��~|_U�}���xO�!� ���΃�y��N�N���H��U&�C���aL!ƴ\hE�($�(�RZ=�Aq:c+WI�boJ5Q��x��KQ^}Ї�5/���$��7*?�cձ�t���Mב��^4���c������%'�|�dF4��b�WH�81tt!E���!��F��%Sͻ���5�r'v��Dh"7���}����y1���$^܊��W��^ۈQ���ZY!w�LsZX��.c��S�_����yŶ��)�����Ԙ����f�%	i(��P0	-�BUe����(U1��Zh���ք�g������FF�������lDE�V�QU�x��٩�r�&By��G��+���|Ə��8qMy�"5D,J]�qʩ-�ڲ]�rWq�z3$�XV�dR���5T��χaC!
+��B$�
+����K�.�
�>�	
���p����	��|��T
+1��B(IA38�D!!H�1!d�J(Ǫ�+�J�-�!��
+*D�0��:�/�$!f��u�B�p��1X��`C%�Ж`�� R�P$.ۢP�!!"�M$����W:5a�ic���Z���m�v�	-�%�-�n>�f4�-K�-[5�~�#�r�K#��o+�\��X�`:J���E�L���8Ą'���9Լ���Q�T�E	Ԗ�FP��H�:�g%)�6���E��׋|����Q�`L�>
+�``
�N�󈒉zPt�ѾX%d�5
Ef<T��BnzÝ�Jb���ɺH)֛�]�G0PU�sf
+&�&{�a5Eaկª&�ª��q�}N�Pф�j"Ի�P�OE�ܼ��J9aZ�.H���Rx���}�� � �� �WT�L��@��:ŏ�8�W��&��ZL
+��`���l	���3�W;���撞���_C�&��h��q:O��#�D*߲IL�U�K�3��c���L�����&MQ�g�ޣb�4�#.Tr����z{���>%"����ڈ��M4��:���}���j�Q׭d-�M`�T�����h�*"�Gg+�]�!y�m�kf��|��h�~��X�xQL����`�1�$�	hQ���vl�bo�<�[��\�i,���b�Ъ�B�IfD��\�ŕUHϱL��SwA������(+{�TTXZ������r�J��
+-��'
+��F���
!6l�����C�е�H�&kS��P�h�(�̈́2��T8S�J�C�ʤό�
^*)��sI��N�,���O	I��PH��?=�TI�\��Ȝ8C���+���3
+��*��YUw��������]�N��
��������_l$a���.�Ȕ���
+"V��
y�H;��h�8��u]�Y��%s"nO�s���*Yk�O��%�ZL�]LT�<;�%�'�z��U4�+�#2��%j�׫�x�Zt��
+%Ы}�����iТuOUjnՠ�h"u���#Y�c)O�
�Q֒��:M���PkZ�#Vj�(��".N9ȌJ�z��x&�E�Y�N���0�qg��DF�EV���
+�+ɼ�afW�L�oՋ�,Dv=&&ׄ�?�5O�iYB�Њ��yz�ۮ&8���|��Եޔ�m�XQ����8Y�OhMƐ�̜�����,�Y���h�)�	A�Ae��^��]�H�(�v!q �4��_2�Z�/��!;%�6���(�XԢ��j��wo,"��a��`E5\�S8(�H��� zp��?�L�7a�%���� q�2��3�-#��D�G�H2)���ARCLeK�ل ��t�� �F���I��SC�#��Fq<E��~�J"%��n<5B�"���t��T}L�]C���HY�VRkl��h&�p��DE
+2N�p8��'.;4��t�����8�/�����=Qq�"LIIQ�D1��‹�� %EDD��hR*	U_��K�/���t��hE��
++WX��
+Զ�V�VM�BX�(,"B~#t��`F'9�L5�K���̄�A-���iZ��"�j���>|V��0t�%~���e�0���i��2�Eʄ)���pa�C$HJF�aC�f])]� �Ɛ��LJ�h���Ba��3��t>�Ct����j~\V�
O�Ąp�ay��Z�LY%D�D""�.�����>T��BS%!f/7X�P
���
+&��i��F
�]20���hD
�q"?Ծ0���zq�ζ�!tܛT���>�����#�.���߂D�?>1�3nY�	gaL�3KL#V�`��k��N���tR���R��*���F-��xw��Ej>)���M��un���9��y_�]�����A������M�TV]��{�;�������.�τ�����y<���dĵHa��\+�<N�DArY�˕��LVaW
�L��=N!U���8�ňSN�ǔ�!W�А|l��c��
+U|�<�2DL����%���h��.���1C���P]SE�TUCU�F��:'�L���Yf��c��R�ӽ�������!h��k���VQ<�ԗ�R�Q�*]/��S����{چpc"�-ϒG�	�H �
+pA�pA@
8�:D.��M��j4>�Z�i�+�EQ�L��4����Ɖ�fbt>V���(�9�FH�H*#B��V����RC���ft�$�R$��W�X���/-�B�XȘ
+�g0��hae��ł�)�h0I�6QgԾ�YLΚ�L�iN�5Ti�|�Q��g�M)Vӵ�*%�g��Fی����Dp��S2�BsG���:u�'��ne6BjU�z*Q[�Q��G�������s�3t�J���;=UD&��&�A%��73��lJ?��k9���_b����?����=6�?�Z����m���|�~U�5FB�H�r�ib��P�w4GsX5%��3Ǭ�Č�cb&s���쵰hoT?�,�ï�6٣�T�$�G��|�r�@*�kr��*���g<~���r]e>Bg*cZgC�ؘE��4,�J��G�d�L����$�D�%f"����E�R����̐�Hd��fdJ�	O�X3Utff:�udʆg��T� cՄc]Us=�3nFa���UQ�4R	�B���U�سQ��{[ъ�:Oq%�h�����sF��l�5"]1�M-�&���f�(�W3��:��l�:���6F��]����˛I�"^��n�~�3Ƿ���֨�����<CҖ|Tv�d��5%.���ퟠ�+���?�&�����x�u�4+:�u:3M}��<N�Ĝ")sg��b둞�cϴF�<+z�Lf�%O��i{�#�i��B튋Zs��yA֢F\���C?̈́��@�z��S{HK#�%ieWg:�yILj!�Q�b�bz���*&d��֣�`t�"=�}��t��P��e�'�U��X��Ȍ�u&.�����tl9>����%�G,^7�ƣ�H�'�)y���a��57���Ú���h&�{�O|QR]� j�G�Dէ��`��L	�G�l,��52��DΒ�juݕ�M�Dߟ���IH,��J�0\eo�&q'��w��*�!:χX��V��8�G��J�p.�&]WԑIi�V�i�����^:M蚌e5�ΛW���Xn�[�DŽw��j9�P]�ju$U��U��Eê�)�H�����r��
+�f^cG�o�(]��L�ٰ�����i��?NJ3#!�q��̐"�W�>2�L�4��g���b��Pl��h�I��E�J��8��+T���\R��V]� M3��9M+$�G�$8�h�m4f�A4�\��~�IO���њ����� A�kj��-C��&�]�%4�h��T��&oh�4���Ԙ�wV��r9HS
ޣ�{G�:���)3���(8��2��n���B�����h�T�Il�h��8I�2��!�Pr2%)R(�ϸ�"ct��_Q�A"��))S�P�R�{��y{ר��:S[� 1�R��e#Y��	\HK!4tF 'F|�Um��FpMQ�!3��R��U�/�4B�$$�ZU���+�NUA���@kouV��jT��	E3J��x�M i����d��&B�.���Xi�8 9tDAEUz���!�N�R�a�ɂ�%�/J����	�3��_6᷿�O0��};2�{o�T(F�=��u�wr(GQ(G��P W(�z�w����C'
���.Մ���]�j���qu&<!4UqoV�P��Tz:,��ge�:�e:�s�&s[u�!��qhh���@u��B�-M��	&��{/N
uԭ��4”A�nZS1���DZ�$Hy�r�[K���A!W��L�
+؁�44��(D�@(�|<z
rj"����0gfH�R�	�6��p��47L>�c��!U�g�BI�
+X&�q!RL()�.A�c�%4
$#����H���
+.a�+�
+r"n�
+�ȂB!����t�'0ПM�8�
'.S+d���9%�ff(E�1T*xLCa����#S�:Ł;��F
�ԑ����u?�y���8�j$B�C�ï�@J��O�MQ�Z�ס�kw]4w��/��m�o
��(��6�$SԴp*u:"b��� (D%��ü���.|��8K�梂�C25H-c��	����ش�eƽ]�K�."���¯�a/*l(P>R�����@�V�9�H��a�$��W������S�/��zqp��A�k�H�h
+3�PZ��t�SP�MA	�2�‰�^�'Q�B
Q%�Wq�h;�UqP��`C
d��=A������S�A���K�L!#����ף�2���\U�]�y�r�*F���N��TE���(T5Q�s��g�00f�H
�EǡR�,aB$dp���#d�o5	_�"䟹�*^�A2�do!��uN4ϒ��("4��	4�3R���O"�숡.d@��Sy��9X�喳d��ɒ�W��?[���W��N�q�(bmsT7�q�����
+��x�e&�C0�8@@�L_�QF�c�PF+쎇��@�6��*�ӄ�Z#+�����D�<\h��HS�R��%�'^*4#R��R�����Lq@$�#���4��@�h(M�Ԅ��Aˀ��B5%�7�(Tp҄R��]�%С�I���L�]b5X��9�T�Ԛ{}�
+Z(CbƤ��B��(T���
+��3�`�x�ba�f�jZ�N���WZ4�|��
Iq����}"�T��� ��䚇��Ԕ]������C�ɋP
+i���5��!*	Q$0P��oH�L�"o��p��E9�gO\��#xʨ�Z-����zBӐ�7����R$0�.Њ��%fxф+���ΰ,S��7�T�;�@�� �C@p;B��`�
��$�'�d4��N�p@Cb
��|�
�v4�B�BA(�U*�
���W0���L5������jS�H
�{���i�2��.9�a
+�,�;�L�d����>�x=I��
�D���WX�}��	��G)n�S7nP�����#]8P�&��BH�f����o�T1:����L%�ryB\�C�1�,�ت%|�B����[�kH����o�f!2��} ����/�����Cﳊ)�G��늖A�gy8x*�w��Y#��α��r9Hh�Y�	i�P��vȩ�x�HL�b�脜)�,K5��dHl{�X�"�DI6�W��G��xO
+K9b���p�e	�U��cu�
+���:Ja*F�v�$g�&6>�ai�kN	��0��'ROJ�db�6�^�HD����CL�T�d��wĜ.��'�z�~��I�� �1�[����P�!�����lռ[dO����T.�C^Ch�"#3�|l�ǾX���]�1p6�I������fF��[�
%��^
����C2'�lWv!mF�*����
�a[�G��$ƕ'�x�M����x"��GI�I��y�T*̮����ר�\z/Mb.����8���x�	 �S�k�n
+�Rdo��m�z����2�����?���ɠ��Ǝ�6_�a�i_ڈ�p�
Xm%Z�~�czU�αT���]����%�:H5lt?u���Uze�1�C��L�G�	�
+�	��,e��1��Fٱ?��G��|� 1t�ݓ�[`������⾂��5�Q��'$�M�}6�p
+�ٮ˂-:V��5�a��ԊO�a�$��	�)X��i��#��M�����M@�3S���ZA�
�0Ω�B�� ���Х���HӒ�y1�;������Йm�$��oﷺ}�d$)9������(q�YY�!
�t��bM�P��*:��\KZ�
+JLq�_v6��6Xw3��(z�,/�X`�EH�_�O#TU[
)ȉ��Q_'L�d]*�����T6�G�Z�^�5v���c�)jɛ5���E��G�N�3@oq����X�P
��0�����C��Bb4K}��!(3�a����C�§WL��qo+䨚=dً��fI�7�L������Xb�t���Yb<jj�I��<�	6�]njOG�Ƒ:O*�.�/ܕ>��������}/��-����a��Q�
�;�%E����0<��	���~#�)4!h>(@߸2�^d5�P-�;����KƠ7@l���H��l���e_B�ڊ
�~����fg/��������^�Ql/��J��]u���JkL�^"B��@&�z���,���W��f9�t�-s�����V߁������9m(I��}��ng�6�B7R��C�_
+�ܐQ!,�pB���~�ʮe���������R�ĥ���ȧ��Ҟ<�0�K��tbz"z�:>6Ŋ�(�Ny�YR^rc߅�X��o���T�#'%�M�b�77JK~У�%���@��Dz��w��&#��u����r�M�ݝl��m�LL:�%n�
;�bFϴUV�On��y��5�Ф۳GWN����������ـl�FQBHѽ���S�A9 ����8�`� ��9s�"Q�4��-�?���cL()����9��0H3 ����eMV)(HR@�F����w����C��.0�q�"Q�J������L��
б���sg��
+K^#Y��x:�U����6CR����D�KWd����D{��b�3ⷘͮxD���4�;=}�5)ԕ�����:��p%,�/f�߼"�f�`�9���ƪ��L@�6A�Y9�u����Z(ܢR�c
+�T`1��2mb����Lr,G!���M��%	}r3;OT��
+�m�F��ڨ�p/�N�� 
+����I�H���{��h�P
�]�R}�Wc�&��yH�|���%��H
+�!�0b�{װa�c(�G�x�A��&��s<kY
\z(�Vk�郭R^"j�Űȕ� 
-c���^᷶3�����c_A�(S2���)#���lU
.���_�Sr��
+���^O좉�P�(z^�7ňT�LS]��"PG�7�͗�>M\�
�X������Th(�番c��o���]�Xf��F֑��	����e(�hϗ��ZS�{�)���l�m�Ŀ��O=A�.p&c��%�M� e����Y�}�݌���K4��P�S0�&���B6`e/�}&��Ep9�=����|z��2)���5d�61�=�/�r��5~��V���Զ
%��<�J�m�;䨖DY{a�0�����1�@��8���p��!f@��(�/j�e�3/

��
j4�n��O��*p����
+1^�f�	\5am�?��|�6c�ZT��za � ���Q
�a���1m0CvcA
�W
�AQ�)(�u�V����\hP8���(P��7�z&�ٱ���������
�j14a�	�	^�<,NuA��b�k����~/�s���>c��_3��9<�ES��������v��7w�ڥO�*��������Q�vzT �2�����('���X�
+?
ʁ�	�F/\�g�H�
;��h�#z"�-�fPҭ.�~�""Sx��j��T4#���d�	ҟb&�K����b5�w/MV�(#�F���,���mrp1 =�A�^�a9�߉T�t�COd!%GJ|܇;'"��~Kl��Oޡ���ō|��� ܙl��ԏ
Bt�ǖ8mx�áK�	,�����Q
#�)]K뵵�o��>$t���X��}�j�<�
���x��C�
��<[�nOc&�?$j��W������ʺ���Շ�2�F����b�dh
+���[��݋��Gg��̌c�߳�z!-�s�&��p�Z��~vC��Ed��?��� -��ݲ����BT\K�y/���Peu,�W��,�m����0�������$��3Ay�⑩Mݬ�,(���c��@@
z�ʾɋ,ߢ�z�K^�\^x\�˧�A�b7[���-H.�����Ў�n�_b:R���5�ɩ@ߔ��1C_�Ε�4FGͦF���8���yV �XS��Q��|�5�烉B�
O����mMu��V���̪��^&e6lG�w���q铚���9=ۯ��K�''�d�J�J{�c�l�������m�w�V�Ly��l��Jo�h�8���ko�Y�Q��K,D,z�$*���14�>�!�|��y��m'A�q�rb�U��E8�L/i%;�?0��P�j���Z��6F�
Dd�t~��}���{(���:��S�!A�VDB���M8��<'c\��h�z3��0)�F�X��B�V\v�k����g��1�z���`m��&�tk%�3��0��
+��UW�n�rDh��C`F�V��#uh9LY����!����xU�n�0�a�W���mέ��4���<o����z��罩���N/,u�L$�Tp�����8�@�	���7*m�L����z�l.�����F�,��&b�WjF��b֜R�s.n`�����%x���O��$�
�?�~#�u�v�M�$�9�8���,`��2+O���=I�
.;���D^&;n�.�Lm�?xf7�/�a?�M��i�Ĥ�@�7,�R��,��Z=O�)F%XI�l�28�Ki����O�{�
�A�)L�Rl�F���3CfЩn��(�]d�����(zE�
�$$�D� ŝ��$�Z"C�⠎4O���[E�Th:`%mrA��ʚ}x>��.ņ�hոD�<D�g�G��O�#]�6™���g��N�7�^��o:��i(SpFs��A�{}��"nZ9��H����O2Ǐ'Ua໎�c�Z�F%��b
�3�r�ٹ7�o��2&����8Z|���q6���3�*�8�g
>EF�9�Ԃ)V�|/Й7p���r)�Ɗ��lp���P�~����3��x3�2S^G�4< cS����TF��LB��al��'���p� ��N�\⣇�VhJ����*׽�i�r�x���;��$q���>۳a��t�FĮA$<�6�9�|�uZu���3��Ѕ��y�Ӻ5��

He�A���� U�˗HkP�����.�w�$���>��#��/�7��f���"X��:�Jl���4t
+'�c�5WF�չ_\V��D�o�\76�Ŀ��S��xX�rƞ)���s��`@�Z�6�NZ=P�p��|8����ȹԦ���i��AB�g
+C���"�cZ���Ά�D���as��xp6��Ȅ�v�rZ����E��#���4Ȩ'3���.�E�q�H5�����ܢ��S�Kx��#�Pft�-�^�:�XW���B-U�Wi2�IG�_��	0�QK�6W�di��0`�BM���D
�'�X��	�-�a�hAK��T:���䔼�.`$��e�Ԏ�or��p�eᗉT�%p��{��p�61�%�C)��(��mK'��2hs�3n
����}�S���(#9������ֵ>��y��"-���	ږ�H���@`��
�����ѱ+��˔T��5wզ���e��I��a5p�r��

��k��Yg⫲Xa��VC�u�q^�y�z�+PG�ف�K���DS�(pz�$j��Ăn��˅��
=��Pob&)��N;l/W�|"9��\�YY��)/�0g��5RHA��X�a�p71��l�xt�L8I��z!)Z�&�(5�%
+��o�<�mr�
+�;
+]�T/�2a큑�.����H&�$�Y$zD-p�OӘPS���:���-:��l��-��6����?�F��z���g`m�994<��mH����~ɜ�X��(m��A���$|N'����cJ�e����3"8��s��<�E�N�����
tߊ
�B/b��}�H�ؾ^si�����ߗ�+�J7����l'�R>$�0B}$=�crtW���,��"��Z��uF�	���(��؜a
+4w�ŷ�k����Z�]����I/��Q�Vr
+^?��`PC�S���)���-S7�TxZL��IB������κm(Irv�-`�
�h3��s$�Z��ē�>��E8q5^ E����0p���\e�<x&bp��7���"#�ߜm8�ʇ��2~��C{wƩ�X�G�U*xP~u{�MeI�^�	z%��J:�DM�9��#��t=��8ͳ�T����0��;2�P�m������"?�KOݥk��h�G��*s�.y�Fu(��}!�g��g.de-���!��5Z��?���n�g8}�Cز�W��	��Wҍ��m�hj�;C�ũ-�&��3�Z��d %�u���2�d�yIKp�6��.iv40�d�O�8B�G���c7����!�߶�p�2{�ز���*��)w���Z��UB�AX�"���^�z|��ҁR�P�\�B����*��@Ydž�WJ��q�.2�^�.NB�K�ljYG�'ZZ�Ŵ7���e Y��ߕ� �#q�[M�k�&(OU~l&;��M۱�10~6��7u(5�+Ƞ��
�W]I�
˯��.x'���o
��[S�������NǺ,W^���E�'�p�Xܘ�@i�P��f�^~*w`	^�4�)��O���_�=�Ad��[�G$1^��UY.�vi�j��	��r���%��
e��9�����iX�$
+�)S@{$�X�ɛ��V�FsE �xQL�,�l�dp8�I��noa}�,Ht�2�4B���8:�ɱ*: �a;r3�u�M�.
qa��L��	��'MDFH�����ۨq���Ɛ�z+�	
+4-�U���k'(������8\;�u
�v��<3
��Y�7KɎ@g��)ےJ�BӌC���9����Z3��m-�s�_s���-
q0�:�ut�̛"�52xl
�=]D5��m�RI4
�U����D�hb�?Wn��u7�5����3�����i�lޱ|��^��%E*Z%B#a�eQ|!MN
9��G��r�ng5
:C�������υ����d�C�Z����䬠Q^����d���)��u(b\���R������#.M���P;�`��E�zo����Ιn7�ؤ6�۳���������!�i$
_Hў��b�	9ژ����*1yB{��/���G�?P��fƚo����a�/<�=�����_��
����v�a���U�V;̠��c���m�� ��7ж�
+��%��
���ħ����r�uբQ� �%E�2)fmN������n�c4�Ґ��UHg:���nD��b�!����I6��>�#�?5�'��(��H�}:r�
4����#�t)ը��q�U�B+D�Q�����H�
cL*�6B!�Z��o~�AFy�ֽ�1�
dQ��E��U��1��~2-��FbI׊�P���4�{���w�h���p�b����ڬ�z�J@x�
|����_� 9ᤰ��|�ݰy� �[v	�BM~m������τ*�q���o�O�ق&���$��3��.���F+�/!�Q�ƞ0j��N����Nx�D�����
���zdx�N�����@�J@�
BB�P�R�t���_Q
9×2ڧ�Di��a�w� >�
+
G�[��R�(�ؖ���m�s*}b��x,t��!Č.���S�	/��9'���׃f���
9BX(p�B��V=A��h��},	݌R)�G���,i�X�%c ���9�L�����Ma�@91���W��E�püϔ�Q=~��X�`�&��Q�X�����r��L@�"�4��J�
��>L3w�ƈ;3����	D�y~�0�t�W�8{Ɂ'
+a�
c_����Ϯc�(���L\��m�r�a��A�$�/.eE���̜JZ�Zc
+WT7�p.y����o­jѯ��ܒ�$IL
�Q�����
+l0����f=w6?�$�-i�m��M!�p�i��.V/
2�0�i7cƓ:�RL-�pJݙ%����c2�/8՞t]��)���j�oZ�����O�+&T.��q�n��~����؆Ե<��)�K�d$ح�Bis�����\�m1B
+�q�F�QSE�[�Z��kC��W��H��t����n�e܅b��<ۇ���ְ�
+ײ��beL�Q�?�Z����I��'�аR�K�/|���h�nq!��]��,�5)Ip�$m$�y�S	A�sp
3�Q9ނJ��[�e�<�u��
+K�����@�cje��\x��5�FΡ}��ր��5�!G���R��%h�אFD���n
+^�6��/�Q��
��o�#��>BJCm��(�Qȣ����@ˡ'Zh�*��YP�X�d��:�ڴ =JYB*��	��H�T4�5�g]�ms^�'�੷�aC�ȼg�b��l|�%Rs��xA�H5�-}H���ʿ[�iJ+P�����{Uf���d��y"rC8&SO%���&���e<���~�P؆�ڿg»@kX+ٜ*7^���u~�>I|���h/O�9!���=Y�;u#���+a�C0��X��~N��|�W�M�+9�xCpp�ӱ�Լ�U&��Ӗ$sƈ���t�7����lSW���d�
+t�l�� ��XI3ȰJ{��
��[&�uf���B
��MĊ	%�*0t:zp��a��p��a0*�֗F�_C�����|A3u�~Q���{�
���oۚh�ԛ��uL�Ĝ
+��l�!��FX�)m<̑�	G�X��K|�2I��3���d`��A���S�Ҏ
e
+)�

_m��4\c�o�$�̰�,c�02n�)�P��E�O�I�vz�Z��nG�.�V�[o�.��<	�Z��U.�.0P�l9]����O�%��S;5�K��0� �vPz�bk�)Uf�5Zq���}�f����}�֜vs����dy��l��H��MH@D�(D6��ROd[���ӡ���heez�)y�OSą�.Ɂ�Ue�N����i3�^�[�����h�U��lo�L�W�o��q�&"��u�#j�~.���3)�/��6(��y�@d)F�������
+��:&r�+.�=$nZ:�]�/+g���BtR��,���%�z4{�n�=��
��������*�|�%���*�8M������#�
+��!��G,
+��c��/鑴��<b���_Yʰ���vn�<�.���gu!�y��y�_���H�`p�`h�#؄��0ħ�>��ϋ
Qe�.��!ޙ)��2$2CT:ҡ�r��vP:R�D���u$i@��ៈX:������T�m��H��
�p6d��k��{��$�np�y����T7�������
��8�d(��7��>u#.:��#9ɕ[����B��TuH����;�:;4}F���f��H{w�N��e��x���E"��y3F��aD������� ��:>��E h�E��vrчN.R�>���C�m���0���X�
ߊ8C]E.�V*�>��"5"bR���
�� ��r���K�d�IO�q"u&4
�C�:5DQ�?�(�z"*<��=#�y#��?!v�������)�z�"���,
1b R�E��1��kF��!
k�Ȝs��8��<�Fa��o�CHU$z�!������$�!q1	$5Ġ��@Cڡy��)�CLU�Jd]�t�1� y��%JjށП�x��j!��	a!��%la��&�?��/�P☀��b�gB�}&�6�lQ�DBZl����M�A'R!	s�b�N�����>�	�� 1�	�v��'hr�z
�
Ġ���w��Z�
�m�-Qt�A�MW.7
+7X�@
+�D�IR`n�$M	�R�A~\
+� HH��D�(ȁ�x6�S;�3HpW ���+?臨�G*�"���dU�f@�Z���U�C@F2��Waz�+. 2hŋ�T�;��W���l���W<������Ku����!��2�l^�~�T�~8VU��!�����,�я�����yZ��%�;��[<��<��[|�>���1���p�i}h�ꣴ\`G�?�χ�tQ��8Zvt%ۅ����.>X�D�C�����i|�||��F�h�{<�/�r��0��=�á���`8�3 �8�0�\�d/R�x�S����xz0lb|�����
{1�AOgLϣ�c�phy���a+�Q~yL���G8�5yTq2��)ヽ2Z":\��#�("�	R<$"��df�-<���
u�l�:s��C����wt��Y�4���
+��쎻
�Gร�%
��{.
f��FEk�ԀC;<'5�̎^�ADv���C��F��1�5��i���Q��
�uȆ
.���
���uDF���� �::���u|�e7��t܃n�T:��r��&ވ��@��it��
$��F�@�����ў��o��?p��^�r�!��i��b���9�D�iŠ㝕9E��N�a��r�����
O�)Gݺr�X��!O�Q���G�<v�(����<�<��(t`g�Eǟ�KJG�>�f3�+4��>/�/u�V0[5�u�����R�P�p�G�84)_D:���+�p�Ro,��TC;N�~[��^B�F��^却[ҏ�8)�l���p�T�eyղ$`�y�pQpb��y�
+P�vG���x�~���oȵ��VǏ!/�@3�7p1�7P����FB���&�v�Q��n�u|�
r�f��N�VG��
�
+�Ze��-�m0�:�q�Z��H1m�2�
��j�s���x+�f��ުdp��k��u�����
�FtB��F<�%�x����ѭ�kL�`\CZ�Xjk��Dk�Ǝ߄(�Fձ��՘����R���g�}TC�A{ij8�vp"5���U���O��N�h�i�k�4�li��R�l$
�?`��l��~�ܢAe�G䦅��nh��HB�P�	@c��X�v�sϠo;�%�$nGo;cԴ���ZN
+L��8c��͸܎#\3�z;p��oʙQ�;�̀�a�\p[0�	N^92\�T{��Pze�Q5:Tex���0e���PF����w b2�t%�S���Ȩ�;�0Z��n��7f~�`�Jv/#aw��1�X�C��S<��G�p>��#��H��<�1Lcg~G}1)�HX�zO��
��COT�@�yd�e�T=n��N�O�@sT��//�Yc�
+���jT��#ܕ%����#\JȩtF���a���F$�Tk5���ÐUga�BP��G*����ף�`���
+�xD0����y�a�5a�G�
F����f� ����m��	��8�>,�z�T,��H_|�S�E��`�!
_<���W�h\/ֺ?�ҋ����$/` M�E@
�����݅�����
��]�ȍ��O]���,�u�u9p.BI�r�'A��ER�q
�P\T��Ԃ`x�зP�Aj�Ň:��n�A���C��B��-�τ0|
����y-�B�Y�n�T�Py!4Ԣ�bĴ��!����R2�XM�g!�
1v�?��≇�����h·0�,j	D��Oє�H�da��\�,�荅�$B�X�� ��â'��XE8�KK��*�!���"7�d���� �MaN�"Fz�.�W�F�����\�%#G�
+s���[q"�Xh+jk��6b�VljC+�2+*~#d�8
�BG�W^ܮ����V�gg=�)���*zL��U��#�TEg�V��dG�
+I<R���)s� 4���#M���BE@=R&P1�1�O��ShX���)0����=��G��)�x��K1t��Ȏ|<)���%�G #�Bk�����(x)�Q����4_TؑҊ"��DQ
+��%��R�;�R
+�B
+E�:�ha|!�kS($V�|�^P4�(��(FΑ3/�?D9?���>
b�T���9�ٞ`IO4�#��Dys<[Gp�	k�׉��a'�G~�NP�R;r�9![���N'��dp�ћ�G���,��m��|�&<�#��,�|fI e��BB�&(@$'�	���3qg$v���A&t��bB)�\;I����J� �(��:������%]��'��%� ��6ڧQKYJ���O	2�}�*���Jx,t%�S�;���N�Y◶`-q�����#�tI9N�'/1�Iı/��ID&`,	k
tQ$%��+&="�$hW{`�H(�o�D3AP$��Lp	sh�TH��4
����F� �UM��ԏ��k��G�&���6A�G$�7
�0�'5��N�ʼn�8�rB7odt��� g#L'�jD]4"�:�3#>p'fȈ8x�F��' ��􄩋(kO[��� ��f��"��gTD�?�.8��M�!(�FD`�&��D��	o$�y�¤��3�8|ۡ��!���w�y�f=ѩ���!��
р3��
�=?��<�M1�2!��.�c�b! ��r
+�ɓb����%DC������P�Q�<8����4�S�./�򤂠�[�ISN!~2�a���
�y�4����@4J��!`
+����` ,�)d z��is�cJ�H�(��N|*�!:��,MI��ֶ)���A
7��S⪄��
+�m�=$㔷�6ųW��+�� ac���n��)��q
+�@��f�?��S��������G6�e�!cS�u�g�Q�h������_d���$lo|p�	v)�=�
+�=(�[ڃd��@��`��Z
+����K!��
�l��,�z�!1�̃��.X�����
�ax�W<��R��a�x�Ɩ�FwX�AG{��"�G�R�b���Jց!.�a��tث�tP�jt�X)~B��(eϡ_M�a��� k�9��R�S�C���(��ȡ"��`��8���l��Tqp��,�4�6�MJn�y�N�Cn��p��,���Ç��\�"�drG2eJ���)����%�iJ>��r˗S�;	���~JlP	��?T����3%R) �
+}�V*Wvi*�àz*d�zT)
xMH��c�A���h�� "X�s��#�c��ܠ��ښ�U_�������/��*��
+uZŋV�2����Zp��:Pptt�_��b
�ʤXY�U�fU�c��/88�*��pU�<ߺ�P^
��"i��T�(��$Ő{�U��T8�ڪ8;zZ��G��l��`28�T8��6�O�����*y���u���*����R���
n��X��֪�u&Պ}Ƴ���[aDm�W�>Fp�x�
���Ɔ0��C� �
+��P0_����+�i
v,�`
k�w��za�@,��8�r�4xd,��̎�� ��Bun>�!�&M@�,拆�/�BL ��L4��0������ő�@����Ϛ�ViA93xZp�ŜZ��0a-�,��ɵTs��̅2�\�0��Ȗ�#C]h�#"ƶ��cH�X?:���CS�����[�dݷhvBp�Q1�7\�Ċ�Ca���a@���0��\J���:�4�x�\@�Ɯ�]�$]�M�&u�
+���.��\�]��{~��B-�Z�Q�B��
�W	y�ͼ��S�^�z��^F6/wڅ]��su��{AE�gX(sA:_� �E�2Ⱦ��-�_�-pӲ-�_��j��ւ�p�9��`����B��h`���G0n��b���r
fZb����N,4��{�q,h�0��
+,�w���� Ccq+s�*.��.Ĵd��#������_���������[�E��9z�2��2�<�
+bϘR�„���B�c�u�ةcz3�r�R�Ϗ�z�Tk+2gI���9	)X�LGaGƿ(4ULlI�֡���(�7dAA(
+�d��	���� Ie��	�[�;���N��2v�2���]�(N�x���
p�P�>3-ՄV� sd�5x��	��[�@ɚ)��ڌm.��̀�%��3�}X��d�*A��17%`�|�$�Ǔ���`3	���8h� 	��	�_�C����+Hp]�\��h4�y�h	Gi�p^O�a�����0
��WM��0`f!��ctmNC�"�*��O
'����!p�@b]j�B���e�P�TF^b�F���jn0��
+�uW�4@0�5�"�f
� �Z�� ����!��A"a�5���� ���Z��w���y�����ƣ?�����[�
C��l�e�
m��ڦ
��|�*_��
���m<q�S�
Fo���%ܐ4:�"��r�Ȣ��A���t=�n�j���v`
o
+�����\�
�d4�7��������~�8�2���r���t#r��g��q�,�$q��I8����M����@���Fn�
8�m�V�`�Z���� V�5p=��{Dl"'�N��� ��� �l���h�)p�iπ��\���mf�N��@�pH*�
+|8\�;��Q��8M�A���1��q�/��21��q���8��!��{�$h09��Ay(�/�rP�U�)����^�ژ�1̞9V��y!��9F|zN����
�0�an�@���act�@H';��q���t�0H��2�3O�����:I�A������^�U#M ��,���`��`ٟ�G� ����؎�Z�N���y�Sʝx������!���Nq�Bv�p��}��]px��t	�b��h8<Ķ�|��h- \<'��O�ù��Џ�"Y��]X��A�A�<��9���
+Z�m<lP���
+�>��\b�)���jҡ�G���}zɀhi�Ty��ڶ�l�l
+��
v�HJ+,\cw��\�KL��K]�|�\��
+�+�k1/3V��
*����1TУu�4�
+›��@4���
V�V��]
+�ꐹJ	:%0-���RP�����h�oR�O'4�꼛bR���!Eq�h�1)����u�'&�
+1kM�&H���樀�c�EglpS�p>���]1dRp�	LRe�g����y���I�%�b��6�%�2��+W�%()�8}d
��%�Q���!��e�G�ံ"E[�'�5.q�K�ٟ(�f�d`�P����l;Q�s���/�����n5h���)�V���BA��8QPڡ�2Z�C#�C+8
+�jfl?��N�u��C���Q�2#>�jQ�ˁZk(,+,�:�@7��'(/�@+���ߞԫ��-8��	'�w��d	�;
�H�wN�q� �r�L� �q�"�dl%?�Ɠ�q��Hq�� *�'�]�hJ{�X��!����{L���ՎCv�oW�~���8
�$��R�(ǩK�^
+p��& �⦱�R
�	��A����Dy��/�{�J(���\K����&\I���9i�q��,�J%8��Y��bg���r�OßOh��-+�'b�&��gB��ܟ�UC`�Bs���l�@)9$�2C.
$��G��؈��0�h4�tU��t�/'�iwJGPo�Cgd�d�F�'v`&�dwO�@[��E@X<t���fR��~'8HIx^BPڀH9�g��7)���k� �}�s!�8�3�4����T:<1T��z`&*)w�`�i�'f;U �a��ϣq�� �G�*?r�?��s�X��1��ts���I��dG��r�=��ID����M�zl��kh硪
�J��O�.4[^cjQ	:ݎ8.���/DT<�����
+-1nޮ#8)��8��R2�g�HM2��7��ޫ�A	�n����?�qx�ڀ��Tu����P�u�%f�J�k xu�0�i�:��<4uP|�՞	�4P_4�mq(ƶW4p�n��
�+��y�����l�M3d�Ε��'&��삩d�bYD~����A�|A|1��PLC�@�0�"�{�]�
�.V����=��+��������4ɭ��. u�E�O��<�!�5J��-Ψ�$�s�{��v�Y�x!=
�_��gs����.�#�,
��C;���zϦ˶�����m?T`_/MƎ�d�o��tOõ4 �K罝n`V����؛��-H�	(��CΑ�	,��v��N����S�I�6��ϰ��t����엕�I&��Bh���C�9��\f)
vjW奒���c��!��&>���-q\yA��/�(�d�L�^��"~f$z�U�+
$�C`�4��8H�;w��2d*3���xA�9
+��k5�;?�!T��H}G����r��VP�
�f����`�mj��W��:4�_&f�w����@YsȩP[�T��"�x(�X�5�".���l�����pH�U��!�����
u�f��j��
+>�1`;%ը���!+9
>_��/@�De���
ə.w���:b�@�Y�&��=ND0N�k����Y
sJ���n@����q�����&�O��E�sO�j��a�Ϛ�Yr����g���kl�	�*h¯�A�Z��$4" `̚�@H����|�(�P|q4ƠP��vq�S4;�k�L�����*��\��6�����ü�ъx�.��d`�Axg-o�/��P���{it�P{�-ܡ�VG#0f�(�H
x�*3�
+����
#�)���ƞ�,p7��K����U*��
�`����
,8@����oK-V@���<Ƅ_�_o��=��,E��U���
+��q
죎'�j�)�*V�uEQԘ����pX����2�p]K��%��/��0�9
�f��Jo�h��L�(�
+�Dlֽ.�����Yۿ�jY�Ǻ��#�I���l�_�L��Bn�E�sU�^حX
��>����aASXAk��o/���[:f�m�f7��s�D��<��x����ڋ
���������W�%d��A����G�c
+�^����ƒ���t�9}�?c�.��d�Ɗ(�!N�*��d6ӂ��s�p���\�*M�����5]�S���e���aR�/�i�VF=�g��S~JX�P�\Lh���џ�j�鯻���zt�J8J5"M�����*����ɟn���F�����O��Ț~P�L�W���J�ߟ�
+����*ֵ�������$����Y�����lLi��pL�M
+ݖ�����@��l�~�4G�Dt&��T|�g��*%=JH���?��H���+v��[���*\%�����O4*��C�_��"B
��|{1~*����7
+	Y�ǹH�
LW��h��Bϱ�g����ٛ�^ z�d�w<�����Wߡ٧Z����QIJ������&C1�-���"�O����*���$�h�%&�+%�
��A�g���8�;�N7���./�,���o��.�I�?wR�K�(�a�p�Y
��Ic	@�
;
�YCp_�r7�z��	b�-2�}�3�M�PH�h���;��@��-2�>4�����>�z�����
V������e��Q�sE�9���}�T*�\b��XA�=��W�>���
+|}��n"��.$�>�q9ǔ�W��,�}u~e	R�����������
+��pvc^���o2!O����Mm$0���@��&�O���F���*��G��
�����8�i�P�t{�������O@��"�g��_`Ƃ��g?�󒌞nF����n�.��A���#]�n�ʕ}<@k�ǤჱϾhb���ë�W��&د`���p%ű`_�DE��`�`���9��<K��;I�C���m�<�V8���5�O�q$�It�x}a.�������)�0eA�1��(���M5�7�n�&��S+ڈ�̬�
䆑Md����*����eSx������M��՜ �j^B�ԗ�欪f��������MMV���Ҥ�9��r�3���)!ǶP䒾�(nyꙔ��itK���>ʸ��+�
�?b3�R9C ��΍��AD�A���|��oɟ?H6Pq��]G����9��߼��F�3b��o������]���54!���
+P����l���a�����k`xʈϩ���w���3IK~"i,1k�AU~å�
��Ζ>���;���=��SYL~)V%Y���!1Û*�>>R�\�7���3O�JK]�FAR��=�Čt����
��,3<e�
�
�T��7��m%F��i$����}�(�b�7��^3b��%>�4������GԲZ�~o\q��Ah��q}"�������E�5$G�Q���|�{@B���"0O�R���٩������O0�lKp�>���
+�Y:����GqS�s{�ԍ27P'�����/N�AVh��%���KÁ����ű��ݗ+۳Կ��Os[��iy���
���|�Ui��Eĸ�����h���p	�N�#
+v��t�tl���:	>����%ղ=7V�5O�MמQ��-�I��UF�q��^S�z�r5|4�ՔZ�;�x	�4����R;�X��<�w�^4K�d�"f�DZ_�KU{K��^���d�(��J'���7��/C�S��Q�h�䘏����]ex}�إ!B
lL���֎�(�@o=��jK�j}���
-I8Of=�N_��J����
�����^>FSW�������C�^�h�,�ߍZ�\�C�WN#
+�	|��;$�S_-�3?R>�Z����e�]�j���07�?����bt|z��y�y�5e��-�}�m@"�����|yXaz�ᴉa�lj��6�?��3rw�X��>���FO^ƹ��싕>n�&X.-/j����k�y�C�ҫˍ�M��1O~EJ�df�~�.ߑ�Ro��!Q�a0�?�5��~`Ϩ�����@i|��I��(��N��A�mقg��I���H���ܬ��5"=۱捀H?�z���:�nj
��޷?o~k��A^�8L)�!}D�e�kH/�͂�ʁ�~�S|�����1x1J���
x��
}��Z�D�(z���Nn@ˇ^?��=�W[�|VR�}P�ʻ�it͆~��b?Ͼ��-���#Z�:�y�������]):Tg���㾲r衚��as
Z^�q���/�k4/���|󲒌y�n��Q�GMc�ǜق�o!
`��D�Z�4��\�7�/Mff4��m`��'��A8�zPi�"����|pf�G�����Ek�j[��2���b����� ��v+/e�7�O'�PD�v0���#��{R˱+@�4�1�FY��>�)P�X7�*W#���^�%y�\�)�K^����bm���҄��{w�ț-k�"��2&򘈖�
+��#i"nK���F����#/N�x��ep�J�/an������ŗqi�[t�ץ���R��UlY��z�*?.}����_
|��㟈g��c��O�8�f�/Rz��W�Vr
+�4k������:k��OLJ�3Ώ�C��-��#Ffw��@&A��H`艝��Zr%4�8<\(QhX�M����+����ᕌ[��xwwi�72�?4v��&�Sz�żO���MͬZx������8���ӽ�N̨�E��^^��He"	���z����ن���N��0���r
���
�]�R��:���/a�Wa*���@'J2��9,J�C�gjp򻝫��&k���S52H$Ӧ��ppY�|�E�,
ߵ�
+DAT��+��]k�t�ڈ��s���s�_zO�^\Y����(�7o�%rv�:-(�N)@*�8%(*r�����]�C���&��o��y�Б�ཻ��r(�_Mr�©���= ����2�O��=0	y�_w[�ǻ�O弹������������.;M����C�X��A�U�D8=�����q�*W�������/�k%��)ZI[Ɲ�[8e��{���m����A�ꖘ��kܫ��������.�#R��}0�X	bv��ݮ��c�%#i���!�?�m_z��Bh������O�vҰ�%�{���>Z/(�p�)��`{
+!���Qq��9�
A�vjޞY�Z�١K�m��>N�XN;����s9)���Qz�����E�X�I��X�
+�ż�����<{b)��?8{�h���c-��3;��(Ѽ컉KR���13武Aa�,{�4n_�;�Bv_���V����c=:��'($UAz0i�U��U�У�w6��a���)�y���n�}8w����W�Q!!)&�p~_"URO�:��:#~��_/�.�Rg�X�y���HQ^��'�u����SP�q)êa��V���
+�"ǯ�^�U�@�]�g��$CI�R��KѲ�]fn���,��Z4��3�>/��vYﷶ��ضI{�:dI�J=�wR�.*��bI�|�c�xh��>�2����E�������,{OZM�N���V7%x�a�z�g�N��Ϫ�.�.�xQ���8�G?n���y�;��T_�]�����!�x�(s��Rg��[�M�
խmX���N>�˛Q���X�I�9��k�S�F�7�͠n
+�qC�n"��%��g�XEN�������7��@pS<}l<����	w���ʵT�o�ĭbq���gM�����콙>5��I�J�����c=�t d�4YY]�:�v����������>"��!�u��}�O:W�����
+-�+ᾶŜHT���FY�Xg!�C�$ğ6h�N�=n�N���E�,�љ��F��������Y�]�=%�	ll(�}I��k�t�~�.t�C~�%t��I�4���{�΁�	z�J
�KX���_#aO�."G.#���
��M���I��l���}�[�o���r��������z�:Є���
R��X�1�@����.N%h���xΛP
+Ȍ����H�ark������$��[�g �"?C�WG@J�_jf��-PfZεE�6޹^�z9H�y:M<O�3V��1�&�AJo~�?��7ߢ�2	q��0�o!�Mp"!gBJɫ'�k�E;��������2._�_}�@Ns(�Y��e��Ѭ'����	��F:Y����.gf~M� N�'U�#� y*���2�ŚmcZ�z���S��A�9�'�d��K��<�����x7	v�������]������Ewl,m�\C9em�������_���|&g	�
lԵ�+o�f�~堈6�'r�2\�L�<�$��(�Q9�"�Ԕ�r�U����kM0�҅��	��l��O~۷��.�O��k��v�Rjv�Y.L��+��p~���I��_w#�͋�<�D��$��u��}F���Ȼ�D���0>�?�
~�^�:0�N.Qw��c��:M��s^�ϗ����˨>�����Ǚ���Y��A�r��8�q���?�8(X��H���p|�w3\��xj�9��v^��#2=�ƿ�甆"<�sG�Ɨm1��Q'�j��xw�sHnjq��;�״2�[��yq�g�'� ��eSv�H��;T��"�E!�[�ۡ��{��B�U��g�{A) ��g�2��c� E�,�
+G֑/Y����⴬�1{��p�U�7��	.��k�)��Ż"��z��!�c���*Eq�
+���jU�l?.��ҹ��v\����%�'���*~�mq�@��T��_�l�qq�9M�eq]��N�qq)��S�X�s\\2�����~��ɒk��x\��
��@Gh�œڶ�B���(��ӯ���{�B��l�W�-Xk��+?U�c�[}�����y��
��Y54"C�ퟒ�t�����P���1q@G��H�ݕIE���������s	��ĂY��g�_f��A�P�ȁe�"A|��s6�NT2Q�/���e��~��xcB���7.�"~'7p����q��#V/��<��v��v�����Z^]bx6X��n�<Uh�D�y(��Z���"Ne�T���Ĕ
+w�p�"�
+
+�ЧD
+c.�J8����0�O��_����� ܸM��Y��\]�8�}̸�<�
�ϴ��o���"�I]���\� ,'M	���8�Q���iQ�8>wN���
�
+Yf�`��D2�\~K�\�8����\w�C����qk~퐖
pȹ�n�
��x��ٗ����|{�I_�=�I_�!�o�ߥ�'�G�� ����
+%���:�
+���Z�e����.~0T���hV>0�#$�y�N�oN��y|��{{� ^շEf�\�껶����΋��mʡ"a
+}��^ܯ~������|̷s��<\ĈmJ�x��(�㻡T���ƅ�6��)|�?lC`�7W�{O`�J(�7���͉����(���Ϸ�6�.�Nio<L�/��3h�o�i��@�!J6����$y	L{c�l�	����|�� �
�[�8�M�����UJ%���.�<;ioê����7ky���{�D�#�ZP3ʽ������J�e̓���ͺ����œ{�$�v~���ro�!��C�7���X��k5�*v"ْ�
�X���@"���)�q�F�	�tf�{���6�@��&d�^���/�C'�𝐦�n�l�+=�Czo��C��"��p%}y8��>o�ֿ���Z�e�/Aܞ�[�gI��I^�pa��>�.��蘱Kߕg[.c�}[��7:Z�u�:�l��J�5��w�Akޅ�-�{$$�3�V&���Y�(-�嵚y�G��E�
endstream
endobj
21 0 obj
<</Length 65536>>stream
+����>�\u�у{�r�o�{��I�{?4�U��8�po�݈'+���a�yo����Ծ/�v�g��z My�ࠃ��ؒ����l;ԯ�rY�{#�BU>��O��q�j�M%{r�zR��{Oh�m��l+½w�/��h���("5
+��;	�j���zo���/���m|O1Z|���.����1������	�#8���d��{�>��&�	̛+��vD����'��P�A<�"\��%f^o��Bd���/�ْF%�N�ޥ�����N�)���6��[U�7h&>�@Y�
���&��Ď�Ż�6�>}�{��U1yG$xl�}���}7����p�V��w��n��t�U�_�]A
;���f�@��f�Rx�n���[۳�&V��b7{�v,�
?G��Q�+�A�nm����y���?p��莣���t��n3�M���%���cb��dZ'�5��qt�%�ʹ&��q�(�[���.��x4I�7#ͭ�U���܅���{�>�WnP�35�I�vrw��\+~]��J"���a���[�l�ː���]��xm��	�*���z���j�6���l��b��{dn�k��e��6�1���`>,�n�`��67��#MG6$oӤb]�]dO�_�B��
�mK�m��0Pd?�$���v��w�,�~U�G������T�P��mEZ�8mڗ�j��=ۦ.�d�v[.����5�k�
�8�K:�L~�R؞�=ka{�X�)���>\=wC�}\sm�$n�Vn�~��-и�e�U
e�0a�Qb�62��e||jw�kiv/���>�Z)EO;�cp$U��
+nj�{,�Q(Ѷ��k������2�
�=��
)��ђ~,������P�hB�zж�s7+���l�P����&� ��F9���e:�L|�q������%LEWg}��$�΂LP�>5�<2�-�I�aO ��x33ݖ- mߥi����U@d�����
�Ѝ��r�6�<oΈ�E�d�T��0Rv"۪V�`���@v
�#�����8V�@��
`P��(n�f���
T�vK�\l�]�ajt]b���90$c����Ao;�-��5޶�I�t�a�t��r���n�NE�3���pC�ް��m�	�����/la���z�ruI�6>0Z���^��ד��}��ZZ�<k����d/"V�w�vv�]�Z���M��lQ���u�7[uy_j�yl)���C2o2Xl�s�#�[�y_�]���K�v$�L���:�Y��sm��S��A������:#Ι�4F�\��'��QӘY�jW��!pW©s'AE[�w�]
N�A}�)ԏ�_RV�6��_3�i�s�í�00Er���:{dg� �3F��:-��G�CI<�0���*k`'��wla�K���
+�����2|lҋP"�kr�x�|BӔ{7�f�7�������`^]g*(̼�_]-�.?	���ƌ��� ��yV�,�b�[Ǵ�®z���ɇcˬZ���W��4〪���An�݇�
�R���+NpO��A��uT�c��P��:���U��5�n�=�;T���r���ƿa�������±��,��2O�ޢ���G����1R�h���{�0��iF��Tԁ'r^��lu����2T�?@Wq��Cm\z�a6覙������j��*<�h�^��U���R�O��|:ѱ��0��-��n5�W�q�d�����}���X���8�l�Kaff��Tг�X
+=��c`���Q��������w4���s�4g�I�̖m d�zO�a�,^�a�
+�	
V�K�C�Y�٩ui��Y����H@��#.ɻ�8�
+��B��;2m:��
m;w�iA*����j'�QZ�o��Ɩ�O:�O�@�V�BM�K��6i��ޕq�Ѧ�mI��
�yV`S���9'f�T�7��+bM�$�����#~m�4��?��h>=�sX0v��U�NO�
w!������C�����'qw�k`���q��������
dL8@G�1�%3h�\���r=q`#�E8�^4��Ut���N\����DѷD�61���Dk�(�J&$K�_$:E#}�!���;��+j2�E���~HB
D��1�u�*_�C��N�_�`��W��]mکD�œ��f�6b
�"���S��u Ih��p��:�.���n/%���m�QU�Q�6��)!Ag���ؐ�l�Sy:��q�%��X
+��ӣ
+���F��@�Tk��
[�34�ˇ �g�����Uk���d�S����m!W���C}�<�B�ę�2���|+�svA3r�{v��p~��|�_Ϛ=�\!j�􌐧(��y^��g9+By&�r�ϋWŽA�����f4c
+�O���Y�{���%g=�M��e���6u���'<�Vt|�z���=PV����v�:��	��HyYVS�wv��	���p/zgTz�QF�����ĝ}qI������řeG+��qg������2��A�|x{wη��hڣ>eŝC(Na���h����"�B�L��x��R�����R�w3(�蠝w�$�3�%ݎ�;����;'��d�r�u�'L#P���w�ҽ���M�s=�$b+�b4����� �i4l�8C/�s�qR_�y�wi�u�������z���wN
+�sb�А-o�4)J����r&k��W�o���l>X�
=�����n�T���
+ܮ�i:a��'������\&g"v7#���ᕤ�Bz��L��*�C���E:��]@J-��L)�/�ris�7��p�/ZΥ|���j��2��샻]<�2����5y�@�0P�l�Rv1vV�YL�)�\��=��u�۔�Fƨ�{3�@�Ͱ:��2���j7�К���͐R�t��x�KQ��7b���͢��L��)���T&QK6�?	W����/cs��!������	�J�Zl��ps�OnrRg����HSn�lX��91
+�*8��XC�̭'>D�n�x��޺��4_4�(��@Xi��ɿ:C���؂ZLgw88��?
Q]�3���g�2�#��+���ӈ��
+��:��<�%V�����\������S_�(�3��z\�spoO�gS<"|b��%���
���'dn��G��I�v�,�%���z(�?V1*%]Aq�f.��^�c��4�'����Оt	����+~�(H�v���&�N�h�ʋ]�����BI���a�^]k��}w�0>�ZT��=T`8�����F#Z4̢%{�NU�s�QQ��ʢz[9/��4͠&@J���̆�Ȍ����y�Fs-5snT��)��n-"j�D��(Ÿ,{���t�2����C."���"iu}��T6.�%�����Td9�I�\;���X�R���<�t���R�gc�;3BJiݖ���/vF�֥2��|ao�~)������W7H�L5�U���Tu�M�<����X*wu�Z����X�Ҷ�S`O�s�z���)���2�����/���~�#��.�/T8��V^��D��?��>ܖ���������~E;��SK~����ۖ�8�R���)��H^k�ĆN�ASӸi�S�Zg���H�R��Z!.8ب:�Ȗj!��ϧzt>:FU�\v8Ū��3��au�ϦdV�B��j�	�'�UM<����0ro#5�8�~F�~�
+9���יM�Q�^�`=�8��|�`e�^hs���[���U�duy�U̺����7"W�Ι��".�L��;�jM��\^k�O%����ac��T��iH�\���q-�U듫9��P��G?^���r�B�)
+.x}#9T^S�6��-�9�UX+��i��
���6��J�~�������\%������A`
~�>���]A�a�,���T���ݛ԰�!t�aӽ\�=	�F[(�OY�M��c'�Zc�:V����js��C�ʛ�
�-���F!\Q��
�l��M\��o/{c��1��-,��f73H��bv�lf�a'��Ȅ�6��g
���	�҈x��=���W�7�	�N������G���M��5�������H�iJ�
+� ]��a�۾bm����Z+d�(���d�v�����dӱ�9-�tٶh;i��k���blF�l��n+����m���{bn��6��pW~�/���d�m�'��N���*��*Vp'��p���c��.����
����l�������O��踁
5�vw_�\�8o烦rʹù]����5s�6K#EC<w���b���.��tH�;颭�<]9�I9^�dP��k�u=�Zɼ�Lv��v'�T,�vO�]-Q�X���%"��]���i� m�2x-ʈw��n��tyAĕ{bZ���׼�r���-kF��#����
�굼�p�/�T�!Y�Z(�m��
+�����;�w��-nkX�ftz�
+!��y�g��h�2_d���_>6V�X�7�0���?ǔa��WW����`�Y���ޓ�~�����v�f��
�u�����NO'`�X�(F������0�2�n�:�*	�,Z��K�\(��ݹTą��˹�����!J>pѭ��O����%��Ki�w5����4�C�4�~ ������+^z��O.WF�������@p�d��h�����B0���2����
��ز<
+g������k���QO���	d�%�
PxT��umQ�
2��{����Hq8V�\�ѲG��
Q;.�ŏI�?*Dz��5����Pn�v�z��UxK`.7
�ܐ���i�h����{�+�d�ڀ�F�m�^>����?!� �4`�v2��3�2��,?G}x���c*@�
+4.
�b��`���`б˙��|W@E��	s"��dZ
�ar�>q�ˬxg��>�„��(���`�9D��x:��zp�+��Q`[j��FSs�d�[6��'�"����K��Y�_Q1)�,5p�Y�{��x���΀1�5ɀ���Hc���J����P�e���Lv�b%]��C2�3`r��̀w��"p~�6�6��V��6g����Q���ä���S.h67F�ʤ�����v(���`���M��rJ�+
L�DW���od�`���"O���z-
��Q�Fͣ��W�ǁ��k���-+U�m�1*�b�����!��X��9Qٝ�5�>\�>�(�&�B��&(ɕꍣ	;�~0�}���z����>�T���a�?�uS��b���sP�z��ݟ���Z�C�7�����BS��M���#f���{�&��
��
�Q��ѓG1��>?vc_�����S)}�s�wi���J�7��33<�A	N�|wÑ"%8��?��h�[vw���V�(���JQ��*�-��
�(_�\�S
+����p��LjJH����4�L�j���	�X���K'X�l����E���$ :O�a�]G�2EO��qa�7S?b!�Ց��'����<� �0݀o`]��'Xxk&��'�l�p�	���iY��:΄z:�z�
��9i��
������~,8���`����+TD��YA'��=�:�c+���h�ӟ�!-y��r�iC��`�i
K,�E�eD<9
�>+�Q!��7��6�N|�M�{�z��6�_<��Q�����c��j�M/Zs%��8�.@��N���Q�G�'���KE5Xމ	�
+������[6vF��V��a����0ar?� F���P�	����,��f!xaSơDwf�
�O4��7ؐ1l�'�~$�1l2
�I(:U\l��[�1KH`���-�1�զlX�����p�pct,�5.i�֪֔��3I�SY��FӣU�u�p�܋H�f��DtR�
D�gJ����Pw���������(������39�;�͢
��/U��0�
�oؔ�
+"�K�և�R
+/�n��J��X�S7���l�x6�"�ux��I��L2�(_FˉE�A��l�.(~�X�8&��H�=�A,f�O�;�@�ˮ�*}���6���y`����3M��!�d�M�����0��
k�Ƈv~
$h�5Rz�mN�D���sU/��(c��,���XKZ;�.����؅=��}��._E�?���KWX6,M%�f�����\Q�<Udж�x��I
~dG��@���5D2N.�j���YDt�Q_�d��gr�*8:��e
��d��D�kźJ92��1�p�|
+����RiC��z�~���h%�Wy��
��D,S����6�,/�xj��uR�r�gn����ee�~�K/��*a�˂`�����Yd�^���H�`�ط̿�-�i�ސ�-3f`�IN�h�;��w�LPm��3�����lE��W�mfj����i� ���\�����=$a�L�c��ē���8�3�#A������
ze�&��&Ml���1��	�ݚY�&�0�jn[�fr:�DD�~8��*X��5Jg��Gmʚ���}���7�f�K-��&��l^�BY�'��*��1�F�A���� 5h�䖯`��t�G3�g���'��mk�?��$�:��h�<aOs�1g.������Wdz�
�1�0�h>��eL?,���6����4�+�0��/�Ɵ�y�f��-�5�c�|f�&֫��;����S�(��E5Kь�'�?=���i5�
��l�qe@m�qצ��������Y��^�<�=���Ϙ�ӔS��"�μ�3t�0���3�|�]��y�u�L��Cl�
:k2�б3�#d�P\����@@,�����3�X�'��Ni���� 
P3�YCr����c=ͥ�Z>⥸ze�!|���ywz�x���n������*����
��kM册���AJ&0���4ߦ�w�fUu�6ל'&�f{Z�����|3���¹5�Yp�q�Ü]�UE��Aa�:�Cc���)��=Kfga��1�\�ȹx^�K��g����g#�Y�Y�7+���\��Eo���@�`pAg�a1 t�R��B?(б0��Pu�C�W&�i�뭉�'uE�kHE`�G�0it�{����b������q~by��Q�ш%M1�h��Qf�Q�0��T�!Y����;��~�_ô�ȷ�R
+����f!�0Ӱ0���6#8�T7�Oi����!@O�/B���d��@=V0�i�NQ箐tG����8u�Q�m�ԭx��I��*��wA��ӶH��Q��k+�U�~*�X}�V�0[��c�����A}A՞zHٻ:X�2�n[Yh��dI�9��il-�钺��gi�V�,��V׻��"�z�wr��}��f=~&��6�{����I���	�(	�:K�0PbK� ��FkȐ7vn�IwM/C�b��~7E�U`
��k�	.b ����3ʍ
�<�lU���a�U �D�|U��76A殂�ņ��V-�O]#zm잁�qq��)j�Ɔ�0��a�E	7���n�KhB���P�&���%�;k�$��r?�h����
+B)�$�DQf��$�N�!qP.��R�o��m�QUS���(=e_Ɇp�^��m#�DC��-:�[�Y����|#y%E����)�D�7:Z��
l�왖Ԥ	B2���C��dG(���}��[�l�3����I���/$�
+Iv�!U����?�Xs�=�.�=Y
IVIv~w��!i�T.L��P6��E��̡l��reWF-��}d/?�M"s�%�J�e�>�IS�9�ᛏ�sFv�yZ��{!煁s��!54�����33���+�E��y���TBMA0�3�m�hE]�w>�v�#"9X����>����i��=�
���������Zs�I�A�V%J[�{��ke��ώG���-P��b���v���$��&䉸T�b�p�=����xžA��=���Tp�����8>ʹ�.z�ߊ�T����-4��.���6�P
l�o��=�'6l�-#Vhvp2v���N
���9S�aCdG�"��h���s�a3m��Ʋ�5l��݉�i�OÞ���:6�kح�A�{9�ы^I���|G�V&5� a�}�&��/�jQ-�Uʦ�+!�a/�з�a��D�:K�� ��.�	�_�0	ء�?���hfq�;��n�J��L&��[��Vlo�I�N�]n�m%�	��Ŗ�".Ӧ�*��gU^Cڈ�T�/��<(��c�l��9�vX� {��P���f31%{���)��[Z�_�c2f3����5{�������T��ӫC;C6oH{L_<r�]`;8tN�ʴ�j��L�Lۑ�>������V��M��.Y�oAZ�7Pŭ���b���E���E��^*���=ۅ՚����gf2�R	�x�3��C�HR1 �v�/�\�=
+g{���%��[l[ReP1(���8�o$	�=���]���mu���/��Lw����ο�s���
:=��
����ˋA��v���}P�ڮ�<OT��>�mHt�H
+m&ܣ�Hu[v�m�]�
����?жg�!���ʼ�=�3K�N|Z�6 �e�ױʁ��h����v��l��h)�����?�����a\d�~!�s�9�#���}�S�~nM�J���@��I���;�';��o���_R�=�(
հ�?�|�!#q_F	�$B����m�V.B�W^��s���^���@�q�q��m�aS�`�Z�mj~����=��m瀲ȋ��A�͢mL'qy�m[�ᐶ�쥥ɞ6�m��{�cC38��-%O��}�Vm��	�i�.�����Uo�K5�GA*�a����Z��Y��a�
+#j_ȭ��q�p�Xh�9��e%�x���G�B2I>�e�=��i�a��t�F�|/z�ͧ����α���
+7>�x����j&���kK�enn��w��w�ܤi�����ͷ��I�?�����}�i0��g�YC�]{��9U�.�e��xI�n�<�-��-����K9c��@4�L|���n�<��#����OEn�;���b��`xSϧᬆzOGk�����ލoX�ξD��o�X$��qL��z���:"�������*��q�) �I�2J}y52`��2s2.sdJ�i̤�80��y�4����凊0nw���g� c$
D~��a�is�[���qӡ|�R%�N�#k�ٚ'L��)�����-4O\:��f��K�$�c�4�"0�)k���妡�n�\��Mn�I��,k搜�|c�i���k�1��ӛ?����y�*;{N&��C���&��y��y6ŷ���ϕ����p��i��@"z*aG!��O���@�=z����~M�~��$e�',�\��+25�ʄq���5!O�(��܊:>$�b`��`��ˤ�"�;��*��)o�U��]�n�;�JF������d�#��QZ��B��^"z���zsE��V�B.���W(�^����
��㋝{v��K(R	5���g�ȎV~|�ʼn:�f��+ʯv��
�H/"������nu	blO��@`�-�����0����[�6��{���S�)���-�1E��Vw���{�����&zwɱ��ڿ�w�8�H)�H�}��y]�f�{c��[}������ߥ=
+,�G�Es�����_~�s��lI�K�vnH��H|dxO��k;|��b"~�&<M�d�T�ެ
��C��h|�3c���qK�U�z��/4y0W��yŽ;	$�ɇS޶"@,����v�I�o�_0��7�蕔ּ�͗9���P���_�����-��?߬��qѓ��[�H���k1��=@W��wC�^���z ��/����.�ňҬ'�'4R�A��x,��ה���Mxn���B_36H����-����wRB
N�[�G�R���z��ݗ������=��b��+﻾@.2����v{��]�!��}��Ժ���o0�Ȳ�Ǵd��=^�?^Ϣ��";�&^�
Y��#�x�����
��0�O�_#5�L&/|�ڧs����w56
u�}\���f�Š��g�z�y���}6&�����;X|@�e�s>\i��>j�l��hX&Š:	�3
�oU��d�PS��?�F	<!,��T����*�l��5������x\��7��Mn�ѯ_����gOL�G��ÿ��tb� ���6��G�>ڇ�I��ؗ���q�C<�F��S�O�?M���}m��}���fߏ)�
+�_>t���q
+�)A[���*菿�X6(�j
�n�o|��G�=�_��y��3RD��ߩ߽ǁY��s�.+�E��
+Yȃ�������;�<����'�-�L��u��@��G����'������G�^!�NF�_����Я��^>⿲-���d���J���"�#���H�����hz���`�$��:<�}��wHJ��V���S4��S;cn������N%�}�L鲹��~��$\h���(�obW��'��_���ʪ!���"��u�I�t�|pu�
++�Y����oF�3��"��=F��7��������ҍ˨e�B���F�jq���.<��0i��Dm��D�yF��Vr
+���9
8�判���ō�.y���!)�3҂���^&x<��2����a������r�.I�F���	�6*���k&��y�8;��[%��L�����[��0���3@�/�Bޒ-X����{���'�`�7�b��_�Lc"�b{�g� 8��K>g���Q
+��cRF�R2o�QgO1�1�Ja�ZX�0�(p�0�4a�&���D$%�ʜ�bJ���3��Z�Ҙr#]�F��Է_;0�@Ł��-�J��ۮ�DO�/��˃�"CBmy��B�5o`ӐM
v�	����.3>@��Й��[�E/i�����9˃���P�"��h� XR��ԃ�kv\z8w5І��w\
�-�ꨖ��.���5����I0�&�����:e��_�_tL����n��25y��Ϗj��T�F�\i.�F��<�"�aH��M�
+蕷'�2���#u��U�C����.\��Qv�'m����&̲�M1 �^32%�K�m��'i��싷*EB�rӺJ
+�=����X�U�v�A]	�y͔a(�ғ��n���)�qC1	����
�
�B�_�%�/w�����R�K�R���c�W�j:s�sЂ��|5�p���H�(A�\��C��O�J,��GK�[�;+{�a^N�q����Р����7R�p��Au
+3��=�����V���l,�I�_?s�<�-�UN:��n	�"?`q
�������uV~��젃?3b:�!���w�O�8aGpW
 $��!m#U#��	���*~'UF��:��5�q��O�R�~�3�]��-���#���x��<{������C��sp��4d�~�
x�ցěi�藻.��0N�A��]��-'� ���Ʋo�,��o�s���S(�:s��N�_-�6���4}r5
���QԳ�0m��o#hW�|�����”�yG��e�*���S�S��E�����:�vN!�H�`o@U�#����\�үL[M#���0
�=�y7L���wV���:ỻh��)|vt鵁
�/�m�IxI��E���.�e�+���Ɇ<�
EP�"�u�e��C��w�l�]��[�a��d��?����g�हx|�P�$_���5���,����uQ�����mH�q�v����3��m%i��*�l�S�Ju��@��R��F��x'x��V����|�z��޿)��5�p����I��:`=�׶#λy��ϡ��cb2l���3���;��r6o]���c`d|C1�
#�i�����bQ�]@Be/&�����a�h�Оr
�!
��B4~��C%RDϳ�g���0zft���ev�B�@��w����n_꺳�
������3�psNbޜ��\N���m�b�ظ;�y���`N�]-�)�,�z��\��{�9`;��s�>���`��jh�^QN�
JT=��Ɛ����H��A�G��Dd�Za�VoE�$�gYp�I��z��I�+�E�SV��+��@�|���7PqY?�!Js��x��Q����������@�|
�U@�W"=�iۼ 
T��E���N���"�B[�p����}�=��f���9��7�t�&#�w!�?I\�LE��S��q�s]F<�F����7�t
bLv+�uR�
U��E���'Q�{X�����_PB�#���}�C;��<b�/$9x�y��H�
+P@v'���+�o�u�g���H�M
+�9�:��P��!��6�u��P�w�ʲo}�#��@�{>t0�$�׍������J���D�عr�r109�NPvE���W��M~����s��}�l��>�gr��q�b!)d9�g���]w�	D�o�s5
a-��&�D�&T�̈́
+�o�utN�f�zN������R1$k(���Ǝ ��G��'�{�˒�����&���D���TL�+�]I|�y���'!��tp�T)*��e�](�u�w7�(b
+�xG�gk��~!�ʽ��U�@dT�����,�<
+I���\��i����Ĥ_*
H�/��V����7�s�Ӫ�K꽌��%��;�/���;��0����`M�I��#x�s��P������s�`��h.��e��2�Uo�`��vKG�����D����/�gٺ�w�>-�o龌�t�ץXP����_���A��Yd�
+�B������W&��N��~�E%�5��n�²6������s����^��G��	@<~)��	U���?�~�g����΢��i��:⻟��y��O���qܳy���8��g�/w_��k�c�ָ7b����1��0���cGx�#��K��re�>�~V}���)ܳi�Z��j�
�g����7�ZG|g#uzm�_��N›�1�G�w��}�¹^:�V�>i����S'*��纠q�v(�z�.
�(=U�dWZ��J??�I�����j`�ZH�W32��a����Ӹ��8��@��_*�L��O���/H��&�lA�_(�k�|���������w� @Q�V0`�;

+����s>Ъ؇>���Z66k���U�Z)l��/vg\���yG���X����
+C@�%T���[�_�l�x�.�4�
+JP�\8@i'�Eۨ��V?���f���M�>G\�a�Ҹ2�l������c�*k��
�"������<��	Ul?�6����:&/m�	��K�ᾀEd݀Fe���s���93H�N���@,�D�}�G��j��>,�	HD�'WF���@���1��]~�RD��4|�,~�=�y��D�6����]tih7�"�L���Qf����g�����������:	��?�C��u�>��W��9l�3�6nM��$�����]%(>( h��3Q�a�y��8�x~q����>�~cH��.	��V��he�8�u�
a*��������:�fsa����7��/u].�]7��u��>�|}��}
+v�@���S��x���_[-����p�S0*i$��f_}��m�r݆p��8�}
+��G�Z�ύ����{��O��'���1��/rf��\#('�V���1vi���ܧ��bM�X?8�S/&�I$�o���J�`�����RaYO���D��?'�߀��f���C�G0B:C0"J{	
�Y:4i&�ľ��G�x�f�ɾ�)U�k��NHb*S�Ȭ�B=��_WRE���l����T@vI���&�x�h#SA�ԊXO���Q!�L�=��ǮT��8�y�'ѯr�{��O$`���F@v@H�)�����
+���PT���{G��o���㞽d
+�Q?���2��ﾎ"�'��仇&	����у�q��5�t^f����<��h��6��h'��x'��x0MD���D���Nb���3�*�S/&��`�l��q�6+g��؝m�,	i
+XX�b[F�`���v��J�b�Sxg� ��#Pß�	�y�}ަ��M�Q!���6�%�N"�m�Ix'��0yg3��cםi�>Oc��1��Y�z�Bwoy$�
b\
�g&��qq�t��p��	��<�w��mz��A����e�h�4Y�O��	��7�:��u��
خ�
���,
s�w��0���}��9O��c��j���Y�o��	��_�l.�r���a^���Vs��֎�z��d_���7haɔ�F��	J<���u��6���ƒ�ٽ��zFH=$����V��q��>"5�J�`ߠ�e-a����ÓfZE�4�pt��L�IرnX�-����}�3����3�p��w��(�y�bo5��s������r+DQ�-8I��th�Xӧ�-D)h���=�~���!�|��Ȳ����.o�IA����mz�%QD;)��'�~�ǟ@��W��>�~��!ݟ�s�w�$�l�p������~�Ϟ�k�2xo����4�K��.R���T�hC�*�L���H󰇱����/vg۝Ž�
JZBS)�۳n_˻۱��.'lWav, �3����YH��|��bp�9޼�����T��̞5#�+�"*��m�����k
+�䞝#����3�m�L\��wƅ�3�e�昼��e��/y_ξ��,\/��C�e��÷GlW���0y���˸ٖ��ܲ�;[�)|�g
+���8Z��/�"�#�C�è�}�ܗ��,���uﺍW�g�:7�Vo�t�6�/k�/y�6���}�[�aCP%�R��F
+=��>�}��[G�$��E���q��4�1�*z�b�I�k'��?��2��\���H���Y��6�����/tg\A�yhS�/�"� L�_C8�e��|&��D=�&��t�;�w����' ��-4Y�˜x����X3.q���x�`M�
TTv���4��u�w6ηH���$���@���g������*
m��@h���9��1wm���[����nsHW��|O���a�}�n�?;������&m��H�����]tix��>�!��I��7�v>&�m��[�}$����ʎUC��y̫]�^���
�4�4�M��u���<p�������D��6����Q9�Q�Ƀb�i�F���E�O��g�<
!\����9�u~�ﭿܙqa��d4nYv�{��eٹO�w6߄�h�
�w�/x����,�M��ƕ
��w��øo�s�&�ȡ�0xgr�a\��X�w�:��_7
+-�TLv&��\��F�4��"�����	���7[���\�����[=3:�OM��;�]��1����ōK����w��������A��'lW����2�lrM����5�p�fP���jF�d)�$�:�����8b���0��
|�k
+�j?��e�l����Ị�4=R���Y��1|k4��N�]ݴ*�@��{�k����[-��V�|�j#$�GH�]GBe��6�t��4��L��f�T)�s�w�����D�y"�B/t�{��N8�w�@��f0�����9oH�i��|$�<&�-tYXy� �?�o�=���k�$	�����ix�D�}º^C8�w�x������$�u"N®d굃,�
������=�z��T��*v��ßD��\T�������O��5�p^LHkADe�IAsX�y��
�G����7�9�S��}$�l�]=#�Vg�����Y��V�M�Yī,���8n�����[M���q���Hg#���H�����.��šȳ�nr
�,$�'����'ү]���F>z�Q�G�`�|��Y;0k*u�~L^Z�Rg�}���/u�6K�˲q�6gk]��l\�ui���*�>�|g�i� K@���}�;��x���\�
�yp]����C��)���x~�/���s�u��
W�5��]�:�v]g1�����7Oc��u�j$Q��@�d_"E�5�r=�M��{�k
+�h�K?�u�x�(��0����ɾ�\?�`��x�E�����������4	%�M�Y�J����%݀&���d�T��}�<������=6ZF��I��<4~�U�/D)h�<��N���K�����q�w��;�u�|�#��������q��A�6�&��i��9�;��[�o麎"����;�y�<�s�x>�R�Yz�M��z��F�wj�+(��V�O�]�7g�(��N���J�f�Ģ����g�����Y�#���F���*bרs��i��?�|��"�}��5�o&�l��s��>���/���T��� ���*1��.�����vLG��c�����
+X4v"P���h��(
��uVN�
�ʺˇ'=��Y�9߼����q�w�Ɛ�]~��E����wr]�;�y��O���}�C�����<��?�}�Nb��I��3zr�K��"gF����������2
?�'��<��1zl�̟MS'� ��=�}�����D�y�ļ���W�0������<�{~hS�;�.���}(�����øZG��D�� �?�(s�C}X��bd�
+HD�%S��3��s�zO��O:���W���/��='a?�<�D�����G�x�������Q#{TG߄�E�����#y~?T�Eo`�{i~�M�O�Y�<
�R(�n:M�M�b����"�l�G?�ӈ�q��Nb���L��vS)����s�<��/�,��:���f����}��M����hH�E����c��#�
m!K@{h��&��q�w��P��,��@���3����q�w�[gi��B���h��6�4�B��_(��>�4��<�vQ��
��y��0��C:�o�����P�#O�{����ء�/l��wV߀���w�g��m���U�}�N�t��>m&үYj����¸��Fa��(�A�ƾ���8�ut��ç&���G��H��y~�;:�֭��k�꙽�^#(�k����]�铫�p����g@8O��e�:̞
c�6��yA���ֺt���d	�g��|"���3�_�l�M�
�u�H��Ӹ�k�jA��f���A��C��:�z}gQ��L���ɿ��x�e��h�@�z3�7���I������݀ewRe�P�S�/�<�8޻��ū�F�^J�d�����Dm���W���D����4��Zd�W30����	�o Uli��������0�8mŻ�#������3�"�O�����.�$�?��_G|g�4�y��?;���<���GA;��g��<�a�ͣ��i��z�][mH�}�n�Q��ў2!�����R�$O������R�%�"�A��І�hC�&v�<
?P��M��iݺ�#�O���G������$�lC94��\�#����O�߯!��k�<P�߽��4|p�&P��Q쳏8
��N�m38��l��Bg�0xg�����Y���9[�.l�6w�Gr��4�y�?6���"�>�خ�	��;�w��u�}�K?�Ӹ�q�t=��l~��嗻.�Ɛ��8��5�p�� �]��8w,��C�6�ġqe��j��6?���a�����Ͷ�ܘ<�Y毭~��\��Ё�:d�j.�͵���l����j��BC�V���y�C������}����Ů;�|뾏���9��8޻^#(�w�|Ȳ�]����G�<�o�v���\�ƣs�z���/�4�M���ĺ�
�*�'������@������#�B�+��Jx#��K�b�5���?�h������T�#�C��U|?�6~'VF�$
+��$������s�<η��x�~����wQ��=��G��]�#�Bۀ*���ã�Ԛhe�=a��Ɛ����4�r5�"_�A��6�s�k�u�����Ƴe�ڼ�[���D��7���}�4�N��ZAyG}P��<m��B;h2��@� H�[��r!i7h!�4	�P&����g���=���q����w�>��޿��m�<R�aj��#��(	�
�\�	\�e�Ժ�d`7H��
��o�lȼ;��Ͼ
�};3:�fo_�l�8����/v6�%�;撶%{���ø��P������ܗ�k��p�,�/y����0�zMa�Ͼ���/sq��\�d2��.�F,G�(��1�j��Z
�������l���L�6oe���A�����uA��:L�{��8�����0{]nV�s_����f�h-�p
��!���n��Q)a��k�0sg4�!���� �>�_\�Y��K���G�k�jº�#��I���j�W*����=OS�Vg��6woq�h�H�O�i����!�~z���k�_2��=�|'<�y��P&�
�h?�2~�Q��$
+�y��M�]}cH�6��)�A�{�2��Q�{������c�a��f��=�ø�i㺌�mS8�$�l%���h�k�(���¶����0	o$���P堍c�W����@:S�F����/o]9�nM��C�a��d��r�� o�ǿ��/��!��]�1���K��n���{�4�nE��,��4}s�毮�����^$ixc���]34m�NûFP�i�F�����\�7�w�n G��ȓ����"��#NC���{��@�?��f�n.��Y�%Pp���ЌG�����7�8[母���i�>�m��/t+3�6���d|���;lx��e�~Y֮����ʽ�#Y�e�j�4m>����^���z&��l���[1��\W���r��1�6�Xv�kc�Ҹ6�p�M"Mㅓ]Ҷd�Å/��8d��V&Pm��S���m���q��0n�u��C5�,;���{�g��&sAӒ����q�L̅�˺�dٶO�=��ٌ�q�w'ϖ�[�y�j�N�'�4�I��?���H��.�,�B����ءi_��2�
d	�,�~��^���G��&Vğ4jx�8���Ƽ�[�q�sv
�'���Xq�t?�O�v���h��S����=4Ih����>�Z�o�vI�[�3�6�f����5�r=F�m��k�c��f>���Q��P���94�wY�]��2yl}�����1xk�ۇ�K��j_v��\��y+�F�(����;��q��<��;�y����+���i��� �?����a�K��{��������oSH�k�M!��
��L�ߛ�Ĥ]Tyh��y���_�9�w�>^ڌ���.�����
+�m�J��;�l�@��8�u���}��3}p��\]�yؕ@��!I�nPd���e�f�^vƁË�͝!t��n��k1h�&|�-
�.3+��;�΄ٸ0{j�l��ic��6,&�m�&1�k��_���b�شٷ����
��^�u��`�r\�,^W�En���
�>���ų�b�ִ2�m\��6�a�,sȶuy�j�������6��E�L�M˦�Y7�,�F���m;p������7h��P�liiUa19@�C����U�Tń���V3Q1Yi1qiU1�TT]ZTRLTLTL?G�f
+�,�����]h���f�bJ��Ƕ���up7��Ł��Kk���KK*����Kk�I�K�΋�j��i��+G�i��@u5EՅ��EUUյu�������U��������e�u����eUEeUEe��e��5E�E�����uue���uE�յՕueea��+k+kkkkj+kKkk�jkj�J����j�.�
+��n�ՔזV��)�+:-+++��+�+*YAN[���,��*�,��,�����[XWS[[UUW]UUZ[SUZWTY[VU\tV����V��W�UVW�T��VW��VU��ՕԖ�W�֔��WהUהUז�V���VVו��ՖՔ�U֖�Ք�U�VU��֖��ԖV���V��֖����U����-.���-++�.�����+���*�����-*��)-,+��+��++�+�-�*+��7V7q�r2���\�ѹ�x�S���&d
���24�;��c������x�%��q8��/���n�o8��0<��p��.�����a8��1|��p�Ù��^ᾀX�`B���xh_<J�
g�B�-8�r	�#��[�� 7�����H=,
 
|�����d&��B69��b�����QCӛ���06{�b���yأg"�M�T�p������:BA%�,z��	���X%���,�T���Y��
�֍ �0�Ő�%���?
+/�gx�V���ă^�8�9|��p^�q�
��A0D�I�� 2�09q8-($�`�+���bU��xH�	�8�����P�T<h+
C�R94�ĒүI�ʿX#��K�W��
�"k�������s��&��`#<u��VA�����ى�4ӐNj�A���=t`���)���C��:��X��g�)\?&���8�� !��Y�� 
�B2��~�8
g�!�FY.���/�G���� v3d	�
�W����p#\�3�n�8�K\�gBZ��M���<thTR��	��%���K`X"����zi�39,�N�`&��������#�SQǩ�#�e�h��O�0�P1s�r��.����y�RS�����'�#�Mq���3R3/a�P�1��`Hp�֯�_.��>�E�)hI�XT�KˊW���`q�
+\��F��]x�{˰CY(Fa\@X��l5slA�qe-r�_��T1�rsPI
+�A%.,�bwx*Y�1ōo�@�v�d��p=!��-
���5`�/vKe���`X���74y����Š�,f�&��u�y�jzu����	�A��#Ef����&F'��CK@�;����m�Q�@������d�3AHi�T��ˌ�U�D�B3�#U��'���!
�uL�z�{l@�@F�iɡkˉ0��1����RfB�̏L�H?�x~~2�u}B穢Jf�-f�K�xC)R�E*�=[�̍b��>"�<%e�療J['�*j�A�t?��6
+�0ӫ�gG��!���D���J�(�\��C��A(H�wI9��}��D��(c�M��"��&��9)r&Ȥ��Vs�1
+2���q��	$ 'Y�'Q��P�7@��xK�z�̏����,a��
+��{c
�i���ƉX�3����u���+�'@����R1 R�1�@�%�bY
+����i�-�@b����yB��`�(��&erc(e�,��q���6ID��X�J(+r#|'+k�1��y���&����56o6V�-�0�����?:arK.�rW.�rk¨�F��JWӕI\�i����$x��C7�;X7�?B=�D~f1�t���{���x
-]��������`�,Qŭ�P��%����FLd~��f	�98d�%���Jp�Z	�
	��(�)����pr�a���I"��$��I�J��-���a\c��XG�-sh	)q��B,IIc�F7�r�w�v*��u2�)��[�x�v;�Q��2���)�A�iI��i$����G$�bMIX)]�"Al@%>>��6ݓ~�H��b,�Ā��
Jܦ�S��G	��0>�=dh��i�"�pH	�B"!0����
��L"��
���F"�W��r��6�
�����LQe�2	��X�:m\Y��q�T��9��%|�Kb���Ɛ�+w+��l d9'6��'h��E���B"����Q�E�a�-�q�=aasc]mXTeZ\�xKt��P�$w(9��q��$��F�ĝ�E�����^��m��d~;Fy〮g�EN� ��` ���!���)2	���<b�2�
K@%9,
�аT��2���B"&8�E*=3�v���Z�ʛg
U�w\�9�����d�1Id)�DMY�*�d�}�v���r�vl�4�5�\9�����
�hEm���H�[eJWl2�O�^����zZ�5=����iMf��O����++�$�mP�ڱ�-�
�Ț.��A��+id1�DUr��;�	�e�4�U�I���e�� ��D`+
��4��rP�KA";(���Z��Yx���7k���L�$���E?5�����x���(�'p�5�����FP|Q<�d��66�uݔ5��&5��*k�=���9���J�Eu�XF����8��
+`�{��V��c)w�&t��L�JW��z`B�8=p�e��Ā_�D����pJ`�~Er�wJf�sJ`�hZ
+������V���V�:=��q6
+��|����q3,D4�PHLC#��^"���J0;�0�Z*
k�Ȃ��	�أ�}*yD�L�tT�T�H��蒾L�-f�F�|IX)�����ˆ��=r�[^�
|hj�rP�
zdr+���fŅ?{#�
+1�s2��`��ţs� D��=)��HX��&�������iST��*����|���/X��3hI�Ϝ���Q[ 	���b������I\����U�"�(�#��'� `_
+I��DA�mԔ��(���h��HаQO� ���M���
��P�b]ZZɮ���e@�2B�"��Ŕ�NW־H��o
+��9R�9�Q�U`p��bkv.��u$�)�&�*i�I�؈J�xL"W�B]@y-@J�#'�Z��SD2�S>(�`�ᤸ����8Ӑ�*
�B\?�2�Ͱ���a�B�EI�9c�Z$�,6�,���'p�)��Q�j�;M��q�}�nz����p�\�	���Ps���ܗ7��m���Ɖ�Į��#g�QO� ���O��@�tJdܿɈ�,�C�B��h�Y��]3%)~ْ�?3�ݐ���=����h�����t�:NR�Ԑ���B�lMs3�2�kZ$n��(�����%�;iHY�!�
�4MO�*u@9{ۂ��2��l��/�@��k�Ф���v0-��(�����X��S0$�X�����ʖ�҆3NW'r��K�8A��&�Eer'*�\��+k�:��}�0�xN|�3,4h@#�_QH۱���9(�)o��Ѝ�����
+Z���ȑO(D���dF�ST�Z-+���ՠ��pN\�uHd�vJn��&3z�C�Fq��',j4"%�Ԉ��))q�	Iѽ"��d�Y����u�
f�#�s�4��Ky�
+��[e�E={����J�%�nG%[<�
Qh��p��C>3��-�
~l�8�#�T��`�K��J"X��@�t�<�nXv�e�گ��Z��>���:��ZfքE�����q�"�K"�N�R�n�2��-�a����̸�����7���q�q�9������L`��M����m*/�y
+��
+
פE����%2n
+ZP�
+�rٶ��m[j�wT|�~R�А�Pn�&VlMU�>QDq���b�e�!��s&�dENT&v��N�(a��b,ZjF,�J��T���%l�%}`{�B�)�C&�
+�Pn�*��D�ސ%�aA�/TI�3\Y�Ś��2(��ǎ��İ�8���
k�#G7��	4�IkwÖ��@�ѭ�O��\��r��n�#���2`AYc8z��h��$�}KI�- ��V�ȥ6h2�vZU�X86�-���t�f M�9�`\��0�]�QJIR�!�dn�ލ�p'�l�1}d1S�����$��boО�	���B�F91�+1f[
+�������Ę������������wUxt6ؠ�Xd�3�J�Y~"�w0���3�m	
+�~B�w��.�2�����r@^t�z�8s¢;��[��*�9q���-V�mCY�i)'��$E�p���I��a�+͵R�F�R@Md�w�
�n�}r�Q
R��c�	���)Pcf#�
��5^��[�4�
6�'7��|�‚�^�Q�Q������,/hn,d(��S"�;"�Ŧ��MH����`NT�T��U�[$�ېh�"�]�X�/֤ՃUY����]E>g����fDEw;�w�d���@��-r����
�ƌ4: *�Ό���MJ�<%3��Iz�qUl�4Ԡmb̉C�ܢ2��i�rF�DJ2J�?�D���I��	+k�=��`��a�Ԁ	0��0"7N��%�d��`�+7����d
+ઍ�@��+K(�+
׭�*��(�J���a��`�U3$}�
�A�(��C�F`��q
+�Z<v�*�]�J�c���$������PD��+)�Y�.H
]�7̾x��D��0|je/tiZOH�Y�i��vYN�]%��
�1S���Z66�+�5�
�N!�t�`������)q��xq�ǃ��X��	���!�! ���F��,��@�݀EW;�m7Y�Ә���IT��I��iST�7+4�m@��WQA�]�ѻYZ�c��; b栅�܁Jz�W���
+VX�	QP�. ��X�YCԮ�
++M!�t�`D��BBtg#�]1%�~���0��s��1LY�)@9��|p�T5*�IJe
+TRe/*�2�#�\PR�!+�^gkFT�6��7aѷTL�4��LK��̀�J�cZL��u��D�B
�)LQ�>H2:c��:�P>��'2��?
+���I�^�%D=D}��*���,��̕ÓΒ�Yk���O�a3E��"��ۀ(♁T�z
�1<!�3�ճ2&�6'�5��s���!���X�Z���H�5��U+bŒ�ȋ�\�������ۮ���F�؈�A�zQv�9,8:�!��
Mj�(U<aNh�q�m�
|p��A�
 �|+0c��k|��
+	(�
���+"�����H
k��u��LzC�O�����r���~pJ���Z;.{R��	d��Z4N@"ZOXRJO���R$~��4��lEJ��
9a6�I)�c�G�4��T:4����P����e��`�gͭB�{'(�!�v��z�l�~(����V�+��l��=/�Պ�������\�\J<e*�s�˹����-I�e'&jK�scIt3#%n�������6��]/ʎoVF�a
Wف�P��+�[9���+A�LD�`V^�
+QTg
+PN�-�3�O��QB���AQB�9B�R��S��V?��5IJ�bQ�
+QTe-�t����D�zQ��P ���
:�!i���v
+LH�
U\�/(��XT�A��tނ��%Ğr������B"JG0B:G0B:WxRZaA�ì������)�[82;�"�3W��*�p$��Pdt��aY�v�(����?a���ž��AP�~W��k���Nc�# ������J������A�����=C�ږ¢�[R��CB�v�}ao���_ZX���a��=�
+:���4f���~
��VKZ�
�+XMy��&"-�{.�d���+�r�������
+��g�b�7�"N���B���Gr�/��@|?Nx�ۄ�jJ=ϴ��B4]z��<��������!V�WxrJ��؉Fk��?�J�ee�nbE�O֏˚B�ӹ����jbL]��w6��
�F�AљLɇn��i��}�	G[����Z���5�KŐ��|d�	L<����O�A��YKG'=�����YCVZ�	��"*SḜ�pT�[;>gLH�^QNg&$�&��z�U�)�	H<��WƟ$NB�?�6v&�n��T*0;U��z�'���s���Io����d\����
LP��PoW���Q�ˊ�IKb:'� �d���hl���)5�?�.Z�Ȥ������[78k'"�F�ɃbW�O�J�ewb]��H�K�����p
�H߄��D��Z82���G;���;�"���h��^	��@i��ȓ��	�}��A[�D��zY�Y�D
}�f����@�d/�4�B����w���Нm�u6��L����t�V6,�$�o�
��2|m�L��lcX'����/vfۘ?6.��Z�WƯ����6_�.�6'����Rh�WGۀ�bG�~�˿��'�E�`�M�)h�@���Q�E�ѿ����6�H��.#��
U\i,�t���l�G�~ZhC�`�VD�"P��3�We�u�������`H�|���
+Y���G�p�L�������t�Z�R�}iU\o��-4i�/4Q��jt�K�b`u�'
����Y88g���Je�
ُ<�X54�	CL�	JJ�,�3�
+K�ĺhe�E��@�}*Ť߰D�G"J�4��7�v��d��*��'Ģ�`Q\�
+FP�%P)��
+���ra�����o%Q0�VF�jE�WP���g�y���_A�����3���쳏@q�t>s�~���&z(��T
+�_�b�V���&�$�>�}N����+��}���/H!�@�$�?-�	�0����@�f��e��A�CB-�F<�X=(=S�����Y73mԝis�r�{s�vF�mF*5����o�s^Э��[�u����_�"�j��P�`=�9Xi
+�L�]�Ȥ�nd�-�X22;�i�rqY?�2��~N��#@��;`a����O#�K������8
�p������?�}��p��i��N��U28��s��AG���)��,�J�`KFf���I?�X�@�~=��n���B4�[?Be	DP�)�uS*��K����TX�JHz?���&�$d`B�+ 	"�Fb�~b]L*=�L�b/�b�;z��6�8���E�;/����~*�X06k��]��G;I|I��B��ha�`K��ģG5�8޻>�GG�L����>��"�A�Ұ} U�f"M�L��;�����1~i��w�i&٥RD~'��ݣ�g���D<!�AO�i�D$�,�R+(;Q� ��Qԛٓ�3|n=�N���C�a��:�MC��q�s>��e4n�
UE�$�KXb*i���3n�6hS����IK���A��3�&���
+�
��H���Ȟ��j��Ó����8ߺTZ�`Hi��>�$j��H�
+LH�U/.�Sk�}$Zh#��|��PHz
+A>?�
+K6_V/񽐔�M����f_��
+����e�<(���
LکU�I�/!����|��P��J�`��xG�x�Y1:i���@k���BQ�:�v�h�+ ����O$k$Uo}�8'ۄ�f�W���
���
:7H1�F�X48�	KJ��s��]t	�0���_7�<�Z��_�Ff�����*�Z=A��fp�
+NH�TŶQ��fЭs.X���5���D���ۏ�����*������T`v(��/9h�|�Ά*�̚N��"L›��>5�^CJk
ID�Z5<�������@�A�Ȣ�B�'��a�P����E�w��he���7_S�w�x���_���O���~b]�E��;�z~G��i
+����ޤ���x�PDzq�u@��	3�#����?�'W����;��Ma�
c�F��}-��c��0>�-49��l��I�^I=#;(����!R�zJ%��$�eŃv��ێ��و��H����8�IH���חT��
+�%�a����O��4�*�K�2|k5��bY�����Zc�蔓T�5��aW�±�2:3P�9C�`��
+��#��bM���v�!���g]���;�&�K���d
+�}���@�I��s�ଵXp���P��~)4lC�2�Q��?��]A�E���H��ԛ�R�P�uJ��S�דUyV����g������,=���(�y�C���[׋4	�:��*�k�Ф3IJ����\6He�"�^̈�}��i?�����%�2�%@���`]t׈���|�x��=��=(2�����!��A�~ݧT�[
	F�HS���E�������^B@?֌K������{��D��gac���K*��h7Hy?�.�M�⮒'����v�Q"���u�
O�*Ff%��z}�`��
�]٨���~BD�#O������؝B�x��6�r��.�3�X6�kw�:G�UC�6�
��X��1|mr�.s9��`�Զ9�y�d��c�G��^HҞI����;�k��H����$� (��������j`���v��݉5|�@��|�,o��uU�:�	H0&i��5���AQJD�G"5�M��nu��@�T�P���Ĕ�k�-�v��O��6������5�p�Ɛn��Gƥg��3�""Y"�S"&���ƛGQ�F5�!,	�! )��R0�5�8Y��;c�6��S�b��dUΐ�us�����z	GHg�����Ś�U\+PY/P
ٯfd�	<<�@��v"��Aԣ���`H\k
+EPg-����R�
�zO���C��*�~X�c��r�ɕ:A�
�*�H�`o�y�i�j>�����ݲ��dt~�W�/W�ﺓ�������P�vP��
3�V�[־�u�?����@���g�#��0vfs�o�m��øg[���S"*���›f/s�m�옻5�M��!�g����0���%�G R*3�&��N�'�$�L
+��Y70�����O�'R����?�~��uѶZ1i7��o<����6���A���yB�R�iU���/˰�g���Ǿ2d�l�
x��ܛ}.��E:iհg�Ȥ
�&��ûnh�w�n��6�fЭ#uzm*�]iT�o�v�`}���.�P&��#λ�~M`O�%�3)���h�?�
�;("*{i9�����PLk#��M���?
+��U�޵��?����V?P�_6��/pg�_���s�w�wfJ�߻H���޳�"	o%Np��T�6`�h7�&�Q��w��A
�u�����}1n&�wo�@��#�u׏O+�f�eT��؁(
�Rk��*c��J�AY��JXo
BP��)�-4	ص9��<�|]�S,	k�R�ٟV�S���&�,�j�IS���K��9ء>,�Z38k����p'1�ϟ���m�!��8�vw
�ܧ铫c��b���8�Y�o���{�6�rߧ�������u>�q�4��6�a�+�~o�:��wz�bV�.f5��6�q4���sV
�z\MTe*��
UŮD��K���
+I��C�C��' ���O.:5��zlr7 B�|�Ó�����X����W�mo‚�����MJ����R^e�9
	GoU���$���I3�"�P#{&��/-�r�*�r�,"�𰕂a9���:�%���f[1�5�'|7O���	T<��\�r����m�L
����C�G���3�nrOe_�Ǜ��\3h7ey�K�aڇ��,���?���`
t98qv���R�>���	SX�_�r�xh�S.*�/2�$O����<b?
U����*�Y�4����y�o�fM�=�}>��ݺ�u-��[4Z��21�!�5��ż�~<��P,n�F�'�\,��,�\	YNe�L?��oke�S��%�v����*0a)ez���5%��1* ���n	�Oci1W@ ����VK��
񽖠�T..���BU��kM��)-A	�l��q�4��Tž
L�
,hmܭ
t��k�������B�~]!�������	8���e�Z�<7���݌��1ylܬ����V�k9l�\�] �0`�ʌP�#��+���=ƹea1yn\'�u�\���r�zhr+dy�RP�u���������n��A������B����%�(�[_���Y)1�!������JR��!*n3"#�cP\}׏R��.%��"�uNb�LC8'�x�fG�y'2�VJ����^SV�ZG:���Q�aM~�]��1^w�	<�
+y��𝜝��,�]v�('��i�o��K^W��h70�([H@U&�R��RB� eu�4�qn�HO����bl�	R@V�Ȕ����>
}"�j��]=*H�
+�R0,gx�ö��Ēr�F����!�d�P��6�꣇bm�Q!"{���ce������G�^�ʅ�-
��������h�@��ٵ�̷a8�	x��J�
ߪ�!���T��0id.k\�,�'�)\#[��u��l��)XIn�Im�
�خ=y�ˮ���x�n�B�E�`�D�q�*:%�*gH�U�2�U�"�����7�{��@�T6�����5��W�����b?�N�����NfJ
{/&���ӮU�3�&�.gZ9�6�1vj��o����
خ�y̫}0
�/vjd�L�b`����`x
��
�…܊�
o��
Iq*WM,�ϧ�v� �TA�R���>�p��HD�ZA>����^ZZ�L@�5�vܝD��
���j�tdj#lQ�v�@�A�Q�1��g*,d
+Y<h�bdr!ĚrǮ���UN�bTF�^SV�_U\�(!�0) �
+LL�@H�)&5i!NB����|t��q�yr�ᜌ��c���‚JOݘ��ZôR���ԛ�uu�=6s�6�T��F��3Oe�L󅓳o}��Q��i�r�XMxn���01��TZ�lNn�hRh��,*d��t�ul�ܤ�HG������r5\Q� !� ��^\�C����cm#��#4Y��VH�
��b

�"�~i)��!�\	:L�����$���}�n�=Wcw�xP4�0�K�h��L�v����k�E�r�VV��À��8q �\
+
+�FqN+�H��i;p
��-�
�~Y�����If�
+��l�5�������6��I9
�I�j���t�X'@!IoѤ
�@�K��t�,��l�3�D��/v���pq[@�JU���?z�
+�:�U�
�ԭ�$���(�M)A�JH�dJ^}Ջ�^�G�a��zM ܿ��}�l?;/�6g�д7�;ZrO�\
a܁���K��@
�����c�a���d�2�pZ^s������i�
w�fp�!9&6f��d��!��.XG�8$/�
��I�_����w�I��+��gy1c(��6�
+�
��~ve�|S)��R�!�eA����CW�--��*�\ M��g�o�����H��Ӈ�9k��l�I��dU~ $�v0�Ɛw�-�/@1��@������$�v�tFB��/~���10~�
�|�u�H(�C���$���q�c�ض���q,,7��(�q�B	�I!�Z# ��Pva
e_(Q�ceYV�x�:y`�*�$TD��
L�kJ+����nR�N{��W�Д�s6Yv��8S�Ҫ�ҡ)�r�j\��&$l5!*nEZ�R(��)��:�{G�w�(�ui�་Y�c��>#�}��_�n��;�u�Z>ցCp`�_x`�+�4�<<����b�t,��>�}\�52پy�e�s��1d��~X
��["�HDZ�%���@��3��s�*%���Bpr��RZ�^ZV�1iD�bXX?��i��K�B_���ȡ���Pm�K�ᎀ$��*��:i&���BۛȈ�����j-�*���A���1iE�ua���lZ�u9��\̺X������y�y��	���.���+7����qcմY<[��6�8E�X��pb�Tv`��S�kCll,��dJ]1n���k%��dT����u�h��=n�>l���xNvt��
+�B��	�n-(�A�E`�lg$�?�rC�����Hy)�Q.
+5��B	�#S��؏B���
+LyWz�D������
+�����x�����F8�G�[G|gev�C���[\�*�z��]Z\�<Y��7HT���IHv��l΢b�R@���;V��8��(8��Qv@H��x��q
+�.��iiQ��-��e
+P��)ف�\$S�l$�(�('���!QA�J�z�����
V�8�v۟N?���&��
�\�U�,�iȵ���֎b�
)����kO��H����Y�W1��)��`ڋZ��yl�ž6�
+��XY;�/D���P�(dෆ0na+�a_<�}ڗ�[��d�؄	1�j��Pv����a�m,E,mEL� GRl���*pQ);x���0�ڽ#<~�(g_[PkPH����`YX{���D�w�[�K0B:�)9�+DQ����}(e�ƽ��C��uCt;!V�� Ee�t����v�f���S)&N�]��Y�i��n�l�x\
+��3�^�ɇ�f���tU��,�
+��/n�A��+�6��t������؀㺇a'�_׻�� �_l 4��a[d�YT
�\L>�E����v��=ȃG�4� C�&.l'��O����E�=%Ƭ�G�\w֏On�.��L��t�&��#�ܠN�Ѯ�4��Pm���|d�(��;�{3�^������ؙ�3�p3�7���[����ڪ��t��^���^���d�v�^Pr���ea�bac8���uo�`�&6Β�����Z����.�M�a� Ӫ�:��ƥ6K��2- �JN�A��t
a�<D*8W	��r@�y�P��O-@p�'$���
�r�"WWm<�Z(*�$-�Yl
+�Aҙhr����K�9�k�9�[{Q�ϸW1~�@_����-X�H9
+�#GӒ�
.�t�q�.h?)@�`�%5%�\��<m����
\�䱔
u�������}T�@�ԡ�̱G�Y��|�=2E�z! D$��nd+6
��m�V�����P�����H:��Qv���&Ҫ�$�#0�X#(�HG����`?e��0͹ee|+Kߎy"L����r��_��V�E��ݽ�I��a�̶I��Y��KnNb7�����k����z�eF4 ��[
�0�������cTQ��F�+��p�� .?`�&�HF#���0�
c�P&�������a�W������,�F5�X��"/�Z^�Rp���0�'(jWX���+�3�
ѭՍ�m��("�E�r�h��ɴ5��� |�
4�@��H ��4i`��웉N�2&����aAs�I�tY��ZY&�
+�����#"�
�����E	c$�kd���0d����2
��y���w)Pe�v!_0*,�bZ[PǞZDj�|pjk-1d?$6����8���Ǎ�S���q�Rg���/�(S���Q�[Bb�b��} �P("�_����6,��B��pOt�_	�(Â�Y-�
+���ե����Ȋ15� @�
�+�P�ײ�1�1�Rɨ�x�M��@�+��e�(��0��-�\5������0�A�+��
���K�[�Ϗ�	^c!��S���$�ٶ���`b+E�R�0V9/v��B��!lTNi+�5*��KJ��*��e��C9X<�@��U7:�]�:	��e�S�[0p���~��5mq-1��=Ne
+V��K˞ɝ�i��ւ~�aC�!��ll�̏�p�c-`mc:��
��V6,��0#��c�-(P�	x�x�Ɂ
���p6�����f���/Li��N<xJ
+_w$F7q�Y��]I�����h+�&v"�CnVO��	CW�ʆ'�	5��<�i�%ːdX��Z!K���ۚw9��ü„He[���e{������
А��1�a9B��d�*��e�Ђ��d=��3a�p�c
�I'��`�˨
+'��.�n!�WDH�腇�����&��
�fP��F;�-�[?#8�~Kjt��P?PJ'�~;���e�+snY�K�����O�0�2,'�
+�YC
X�A��$��r*&6�1Fa̢CR
ǰ)X��X�X�
3��+k������M�<�|
WP���݉�.-��Wϫ��>n�!�E�Q�f��2{��l��C����؀0
+�!vdz�<�.�m����p	�n\�.P�KK�ƜŅ�2`u� �U�R�W��2?X��]퉌NK��SLx.$�u�`Wg򎻡d	�@�&ƿv�R�E��&Kz�*l���
�t�c2|zc0ovcC��cccb�W�p�K�Ԕ7�tCAD�[c��0�����N�P�D
�34����=���p�0n������0M<KȈ7���$����}�����ÎI�rGΈE�cU�
rH�[B0�[H;�>�F4�@n���_f��%cTf�R����[X�x����j�R8�i���-�؀��
+��B�XUNǒJ�ɤ�h�i��c cs�)e�c-\�q�c�11y|�w�$�m|���8dt����5�1���$�,��YN<j��p��c�r�8��ɶ����m��0�
���L�
+FW��
+�﹬��T
L��T�ˇ'=����0�u啕3�0^с1J}��6�
�p��T�h��1c ��+2l�g`��*`�S�gl���E���B>3�@<hf	|��׸������ql{�۸���0���5Rahl�@�#W
�-Ψm��RP|kH��p�>�$p��Ðu*�}�E='�`WŸ�c��jށLl��R�%{�$����x"��"�.��}�q�����l����d[��L�0����T:��P��
��/�#�al���1
�c
�
,B�P6(D���
_o˘L;.�zx`v���=��s�[�.�/�z�ZGG���7�q����oxV��@�R��Bĕ��BF+���N�����cZ@-G�H(|�T�:a\Y���,�vZ�p��B�������D*�`Ъ����

.�
+ly �/C@i;\ 
m|�C�	��1�Z�f�`�L�=.�HY�{-CT�b���X8\�)�
O�J�@P|n�?[�ĵLJ��G�7���p���H�B�x���
M�&7l�"-���
�m��,
��
R�b1�)P�߫�Ó�����,*v�CҏH
~\%,�#�޷�ڳq�4��|Y�[\@���OG	:��1�\6�X�7xi���A���x����
+Y�!^Qc�Ưt�Ln�|��▿
_�pEy��U@�ɢ��ג�@4Ĺ��x���,��������`4B<�M ��cA�D���W谁��c��C��a��^-8u�fz��o��q,�?~;N�a|$��BL&)��a|��ԸE�!b36�hxf�$q��a�eD1+F�a
ht��j|<Z��p��QQȀ_�!��s�� ���S=H�hf����"��^��	Ƞ�>��z�h�,��I�6ӐG
�_-4�:Zd�x�y��E�#,�f�<JX�w$�����(���`�«'�c�]8@�]=T*�~�h:(:@)��oxE�aLX���2L�+�7�k*�R:@�)Ƈ���!��ēb�|�����ɑ��P5��h�����R���#��V�D_c�>k�~2�8�t]B��b�Zg+�KL��X�r�+cm�-b�Q,Lg�2��‘bi��
��S\Rl��yA�O��iM|A�2B�W?G|��K��)�$a��&x�j[O��V��/ q;B\饇��ȼ�9C?;)H��@7�R��JO[Ǭa��l\�X��[N�.:�8v�&��9)��F��'f�L����d��`TTJ�l�XV�A�ʪxk�M�S���pA3��)%q	FGB�**�ZDG|���w	�	KD��R��T�705q/%&���d���3\L��M6h�q�5"��;�
+)!J�\!-42EԐ�N���4<�8Zp.�ń������m� ���P4~u���2륄��,K��,�3�!��i�{
q0�#.����TJ��R�bNF<̩�[Hj�3ĕ^���?�����k�ML�K�U)@Yf��ha ��L��9�2�H���/0�6~p~m$���)�1bS��%%j��Pn�12
+c%�GH�9����&�#��x���Fp�sUM�m���I1q�F�
+H�+�
�M8@����!�M5C\(��O��K3@��?@3ęn�8���
����$(,�0�k~��fI�I��3t	ߧ#J���_6Rk )M,��h�
+��6’�=�sP�o�,c	�.(�8q�ʪ�Q�Lm�R�_I<p��Zx�`NP��:�eK\����)�
n��!U3đ�@|��p�u�Q��7�� �5�)z0��Zd�ӛ��g��'��A�x�>�4�
���т��NJMo"��>2%s<bb�W�����q���N@%���*N:'�=
�{����V?�2�bNE���k	q��!�'����D�N���KY��ē^~�Q�����LvÂ��#.�0~��(%L�����T�#PL�\	=�}�Y[dӛ#�'�F�O��6!�t|E��66@LkܣB�8�*�]/&ְ�#XN��� �($	?@����SĻ���T�O�ħ|���"�tsċd�x��9|'�_^����>|Džg˲���m�w���02ZxD�砑,��B�x���i���'"
��7z��k$
�c���i��EK���X�2��|�9��;�
4� >�D�e(">8�_���2�۰�:.��z���x��"eSĉ�A|���g�<4A��Ձ,�\W�X
��<fl�ȱ��qd�ЇMo���7Hh"�@�T�A�)��ɩ�#T��fc��M����10cD��uP�ib��[�I�
��Ŀ��8�S�(�d������Tı��8����1�b�x穡�636|��x5P�5~bA3���� ��<ftzy����0��͑�Ӌ���� ��A>�8�|�m�]�qb�q��a�*^m�@��*���>˥�[q/��G5�HD�
+�K��p3?<
+&�/���,��:�����Ç`z8S�P��1��eGk�§����CXX��!LL�\I�ɢ
+beU���)���LR�9�p2��L�a���Ƨ�*:�K���RƢ�.���m�5+'�%dįp�x�
����S7>����
�Y>B|+h�s�q@F�J��?���>ùKV煈�`���b`/Ё3�	`f���L4{���X��`�Lđ��a�y���f"VM�عIZ�"a
�;-�|7q|n2���|āyx�Jo0��S��
�NP�5q5=���w���O1?|)����9\�e�'�q"�~�o���/��
+���1,X�*k��!���>R7'� nf1��b����t�C�'G
�����7���o��D�!�3Q�N���"�����4f��2j_q?
+	8A��!�F|���p.S�_x�ON�'T��-a��;D9�8\pzu�����iĈ��Gl)b�X��$��H:�8|�"�0�y�ĮQ�fg�<�M��U�R�bF�9�r]
+��P����7<��p��m�
��62Y��³�����?/{�%L3�O�QK�K@#I.������i$���	\��N����;>;!<~Z	s�*��tu"���d���d&x�IU��  c'��EE��r����#��Éx��7����p��2�g�L������c8�5����,ךj�l����5���o-��4�B�0��ͯVN� �������B���<*7�6ht"���	�!����w�OD.8�7^t�k��|�!JI��o�
��1��"`	��3`�?��p�]�<�_pxos�a�cC�x���YK��6�"��;�����J6�7Zhzu����@���1�SL#Ŧ��*'c���D���8X;i���<��i��C����M��U�"�����)��
+r�H��IX��h�8
��0<��p�,qq��>|�����e8�.���� &�!�R
�t�
�ez�`R�E!J���q�zd����'r��=>5�<Jd�`�	�1�H��+h��Bė�;d`������u3���{Ǧ؆��&r�L��l�#����o�E+DD�_˚�z�x��:Y��gx����3���p�,�s��/�s�9�s�ex
��5�����/|��p��}��*��qf��T4tzc;-��ذdBó����ȎI��R�C#�4b�����@���AB�D&�F���
��16m��[Le9u9t��֜W��SU��T����ZUWU[����WZ�Tڕ�TUW���Z�U�Z�V[WW���Z����T��Tڕ�T�UVVW�UՖ����.-:�*.�-�*��,&���Vll[m[U[UVUlRVTk]R]XkXR]mZhRZjlUX\mZQ2��?4-��ݜ��&,�
^lkvjpur�XkTXjlWkhii\RjkT\RmWhXRhkiYRYUXUV[hVQLshXVST6�{y^fTU���0%0�2�2�br�ta�̡C�@,'�mOM���A�C��V���4n���P�%
��dl�O!e��f?7A��9�Ik�嵋E9���U9�c�܈4	-A��@�@�u�����
VG������X]�R%"�F����}z����(
�N�]�	��=�}���((�No�F)�6�����K��ц����Z�����)����N"��,�)y"�@���pA�I��Ĥ�*���YS�Ȥ�
+Ȥ�bd�(";V
�<b��cx���w�b��ba���?�2~�K���b��(�y�r�wG��P��hS�ev���_���?�6~ �?;�������u���g:
u�} I@��Bz��&�O��D�����>�E�_0"Ҷ!��9�w]��;�.���5�u=����B8z&R����0pi4��e\6s�F��DDy��G��%TD���u�����D��L�ߛG�w�x����_ "�C�F���0�����o�t��0�pc���O������p�V*M�X6:e-���rT�ʙ)5�u~�Ѩ�qR�Ȥ�t��L�b/��&���1�B5zgQ�o���z��U*4�4����cg2M�D��~HS�U�M���R���D�y�6�E�����N����E&ͥcT�J�Y+���6	�@mR�����j����c���)�&�oB
3�*.�"�8�u�����-W�k��,U��7�����������bI�,�}
	ʮ��}"����^GLi=F�0	�i⏱YPM��&��F
o)��

+�#OC�ɾN�9�4	�2	�
+I�U�wb
�7�v~G�gZ�y�(
��!]=�Va�&�$�ӫ�
+���bd~��8�w_GO1�����;�x�H��'
��X�P��G�^�����Z�
�L\�%#�W���[82;砙v�wV����]���c��h!�A���c������k��O@���|�*�Oc�}�鵟^�^h֕�X5.k:I�{�����>��X���
�BQ�jF��eCT�������N0"����.ksY��kw�{z��Q!$k��N��)&?��iT1
+ģL ���[@6:i����
Zl�Y3>g�WF���m�Y�#�E����I� �x�s����)[�]��^l�R��Q��Y
+���=����b[�R�+�-�Gh��c��Jq�{ �K�����A�~?&/����9߼>�B҃A����J����s�&�t����:
yC����@,�L��;)���>�m+�����a�3�4�X2,=������7����P�����+�G0B�}�@4�k�j��Ao���NH�
XL���9�:f�����q�ꜰ^����Y>8�)�X��TE�*�o���喷3{p��)����Ig���L��?�F�v˷`b܌����ܛ��yܫ} �>S*��q��0sgt6����f|�*"?��Os�֫\H�O��v��eO5��@���+Ii]!H*]&��ۦc�ڝmq;V�m���;^���6W�Y�F'��T�"b�������O��5�&��Q�K@��;�.�P����*��Q��F&��uCtޚ�YK���\#�(��"���tz`5l��FT��T��D*�K��7�w�/����_-#�ƕ	l�*�~{�Q. �s�
+K��	���Y��<
�0�3|m�{-�άWrZw����$%�NPk&({�R��e�	F0����L?�f����@E�Ϣq�ft���� H�{g
+D�����G�`�Tm�NĠIAc�W����R�'�@M�R'(��5��������y���:\gU�/��Zs�xNj�m�j�ǽ��6����J�em�5�}�$R�b]��>,~�O�ۆp��x�2�4�����t��e���e���w�B��dAN�,�(�@�~�
��ͳ�g����A[����ug���"2����x�z(o�sZ7Be
+��r#�l��>
a�a����1tmt�g�=���n:w�V�
Ⱦ �$�uCt�k:
1�^��=��Q	��ۣ���q���V?�Ξ�"�~jM��L}�颧Ja�^t�]9>i��u�I��������g��b�G}p�ru�J��h?�BB�%�A�D��H��݀kbgBM�	BP�~�r)8Q��J<���v��sU
�����)��k���\����J�ٶ��c�l��
+���iE3�joP��5PA�|����z(¯T�m�ⲖQ�.
?O��]z��I߅c�S�Ьy���[-��F�|���%��T�N���u�^PB�G�x�B����۪ť�rqys�#�dzh3@!�|X�
PDڠ�fJ��w������6�(�6U�L�kG������jQIh]�@�~�G����
��;i���Ni���
�u�@���Lξu2��-ً�-� �y�ż>��i
+�j"N�GP�$({&�
���*���Zg��T�]Ҵe��$�K��53n������L����"���d�����rq��:z�Qp<d�gi�E�_��ȅÓ�p���z�ّ:
o��6.����8�v
+H4�T)$���Ɵ���Y~�PE��Vl�L�߻f0��ԩ�4|p���Y~%o�0���	�%�,��*���I�ɔ�І�$t�A��c�ܴ3�m3���;�.z
+JV�Z^�2&�?L���`��ځ�+09�!���H��]���.̜Z���g�CӋY��Xdv(m	KL�>Fg+����3���^\J(b*k���%�����z<@k����C�U
+z�L�$ΰ݄*�<t��hsq���Tl����L\
Cg6���Z4�gq��za��Btk���5�s]�	ILV�W����$m�u
+������H�.�4��\���B{��vA��8wC�b{��2��WpB�uz��59goe��"O���G���9�HR�gӺ[.����u�B6��m��Ë�L�GGC��_���\W~q;�w���%��0*��s�'�
��g��n�tN����RD�)"c�����纬��K�=���e�ڐ<��Q����wQ�T�v�G��ģO�����:[ξ���=�gwE�J��]�S���i���xG�6R`Y'�z{���]���OC?>��2ԇ��0�5��%Eu&k����]n��;���>�$4+�<����H���
+���W����}�:��C�X�	D8�,���S��h��
�:�g�$��i��������������L��w��]��Ў�C���4��R}�H���7�u?�n���[�5�r?'wv8gƃ�g�@��3�m��8pz�ş��a��h�i��YMg�z�;��q4d�l�jf�`���*W���PD�����>J��?����(�6� ��.͵b8͡G#+�Y��X:.�*�5Q'a��C����[Ӻ�u2���l~�{�C��ԡ�7�s5L�j�ǂ�I[�Ь�^s�w�\ףR$�1+��Uj���]�IxI~�,� ��jh�D�(M��N��e�e�ּ�����n&P�9�D��wQea�HS�[�Yh+y"�J�`[�����Գg��:]���[�A�}]��
3w6��u��]��A�S��a��d!��YCT_�Hi����0vj�N#��zx%C�nB����9������dFZm/"��G�����>�}��b��$U[�c �J/�&*
��FP�-�������N��v}��&�[3:��̛û^hW�(��$ϯm�y8���c��:M`���c�5�pw͠�M�v���l����K�w�ƐH
}�u��V��
�i�������n�x|�������
+L4~!JAK�;��˓��w�z0tj��������8`��è�L}�������1xk\��y�%M���ڛ���3��g�ٸ�2�?7�R��#��3q߉��6�E�Bm쇙�Q40XR3��ƻg���|�j#�C��fO:-��<�}(�]-�����}��9�u	��V��I�����=��4�p���xgCy@�bŰ�J��]B6"�?:�f����?���cd���5Xq�Ð��I�7�vv�[���uk��"M�/�"�w����HL�"�A!MAB@�����&�$�#4Y�z%(�XV�ʅf����s���Q����%�Y����Y�3����*�� ʿ,�G�^_#8�a����=�LB�ȼ��g��uk:�:�N�����/ow�]�3�^������$���(t�vRe�H�`;�{��&!�B;W�Rn&���4��q�t_fo�����l��5{�m��93�&�L[����ǐ�����@�}>�f���c��
+�Y48i)$}.��%Vq�$b1��z	�흁CM�I�ÔԣK����d�������oX�꿈�~��}�I�ü���VD�����\��t��XmNL�#�����=C��kݺ�'�_2E�K��4)�4�����g�<7KWkg��LJ��$�v����R�J�`�����}!JA;Q� ���ɔV�݂
����5�$�1~k.$�(�}�dՌl����j����������F���D���؋��v����q�ƣE7��W���;�6~ G�[��,(��̉5|]Z bZw8Rڅ�tV��<�~�'q�az��F�o�
C��e��z��/ܭ#���r5�e�sc�ظ0}j[���XS.X��z^2�k���DN�ӫ�gPB��|��=�^Cw����D�vO$�]��xw��x׊�
_8���?�	j͵#T>5�7�:z'2�N"�Q#=跏
+�
pP�S1,g[@h�`_�}1b�����)(Y��x��J<�fL�P(�*�s'��DDZ��cs��$U�@Ĵ�*�Z�I�bBL�6!��^p���<�:�e>�uȦ��0��r�h�-5�`d�fZE�2�m3���C��S\�R'(;�%a�6���un"�g���ްd��UD�VB{�4n��om�j��î��Ӫ�?��~�>|�ğ#��/vg�?�-�#�e��~@dt��
:;��o>�:�nmnB
����/qi��W�V{�����yB���aJ��r#��,�
u� ���6���хB���Vր�ϣ_����3�rU��R<�F��]E<��yhS���`DB�0��t`����û�sh�����.��N����=t�w+��D��~����]��g�3�msR)x
�
+����jF��q�XF.m�r���qYk bjO02Z}~�ǻ��סV�T)"�#O›F0�o5pȺ�ZF�
+D�
b����e��d��>�m��]Z�M�n�a��y,�h�PBz�F�l���$Ew̉�n��)}�u�6=�O$��'���
�4Y�W6%�'8���:�
�>���K���Y;0�.����Oi5##�j{	9��RT�5s��+���!I��!�����B�SzC��[�Q���Ś'�O�S��RQYG8�ʝ��F��~�·����e�������������]A@���z�1��9l�w������!�\HR�H}Pf`gr
�.#�����y�E��qܫ�o�VF��k�*X7y�U1,k'$�Q��3������*����:὚G�w���D�:'�7/PAY�
�/ I��������������g��uk�J?Of�Ֆ���Y4F�S*,���=)q�/���S��J�7���A������s�v?�m�9���Tŷ�v����@�}����8����ۘ��٧��'qz�L��.Ҧ�YL][Ͼ�m�a\����`�PY�D�Ѵ6��^�δ@���>h�+(�1,$�D��&���|�z�h�+��m�^���F�^ϥ��� $Ֆ���c�}"��d\�L�b;��m浖̅����t����fZE�6b9��M�&\�@�"x���c2�orN���7�0�q�<����O;�7o�T��Aԣ�:i���W^{X��:������8�%H�X7�*�L��=Jd߲�I[��z��V).����VE�S%(���uկ�z6V�{��/D!�Z=6k*{R�nr
w.�t#�3��̾t�@����4�%)�9 1�9Ě���z
+MD�T
�G����ha�Tꭳrp�������Nk�69Kwo�2��쥇�$t�r!ك4�z�ߚVf�M�9��m�j���+���v���Z?8B�]�J�
�*�?��f.����Gg��:k���]8@g&$=������Tl]~o'(;�3O�Iþ��Ѓ����Ya�1{m􍷮7`Q�+��!��@8���8Ç&���uB�{f��ԩ��4��\��֕�h].���w�M��(�y>�A�f�PsX����ɵ�$u>��v>�u�۰��ݽՁ���6
��'��?��v%F할���rq
+�T\vDL�#�=
+d'�<�L�����&�l�_l,�nM���D������ϲ}.��dY��G��v
+�H�\��/shd.i�1���kIu�,�-n!�
�cb�ָ7�s�`����e5�8�&Q��5��pa�g����Wƹ�	�v�W�r��Q�������	KPe1'�,J���Gi�eÓ~;:WŸ��NPz����f��H�'3�jc���Ȭ�N�Q"�$�����?��N����e߶>�~�
T�o���;�yD���3ܕJ���+��dzh�X��T��8�w�
b\�rw��Qԣ�L�2�q�KZ'��K��0��E��������1|k�E:3��Ị_��䗺���X�P����\#�㈸�~%$~�#��Q������Ľ߀&maj�����t���"o�<��H��/!�t|�K��/cW���B����I�A�I���1wi���?����JP~�����J����0��<�>�s��a��h�c�83�O�ߍ���̱�3|m���n�$��>�=G�Wg�>�n� 3�}�DT�P%u�qܫ���C�ޛL�9X�>�`�1�I����͜��aR>�K�b�'��38!�i&n$ĝ�csF
+��(��Hh����Y�y��6E��L���G?���;��q��~q2
�=��������iy�	_�A������N��u���<��[�`��/qf��3H2�3( ��W\�vMv�4&�1* j��\��o���Ig�e��BB�
ˆ��W��4����ͺ
�.u��jf�Ĕ�pD���=�`Og�U�>�i�q�v�N����ۙA7�G���\㺬�cY9O6#7���ٶ���u�7�;����*�#^��6sO&��a3�ms�)b6���&�[�ҙ��8��E��5'a�	l�]�hm��.���1�N��K�(�IU�k��ܙ�w��
��ML�1+"��tN�]�A��\8@i	IP� (i ɾ��>���6��eĔ�RZ#��
��F������_��H�ߨ�����l�
+��u$T��(��F����b�ܸD������<��D���n�9���L��@�t����ƅ�K��X�q�R8�B(�5�s��]�c�WS����HD�J��~�D"� �U�m&h����Oy'��g��j��]���n�w�h��鋛�,
�%T���?�}�&,w��X��5&��/�Vs�21�6��F����\ڸp�xO#k~����@�d^h�
+��F�����!ʭҡɝ�����
ʽ��ö.2��"*�)�q[�x�����}��MǢ�]��r��}�������^�mp7N��G@���V�ؔ�x\@"�?�:z�W�&԰���	��a��fĸ���:�����x��׶�Y��g��l������J�`�`�e�$�1}j2�ex	_\�L�	�Na
+�V�x�9�����q_�θY���V�ưN>�A�G`r�5��Xg��-���xv�N> "��PeU~��TN
+E�8޼nsH�w�zR*�~��t�a�y���
+�)���&z+�s����t��
t	�@4v
MT���Nb¶���������;⾺�p��
|�_�д�63.%����97�1�T�����)<I�����VL�@��u��޺����OVs87�$��8�u�ǒ����{(�f#ѯ,�IHQv!MB:hS�&
+%��Z��/���W���B��=Jd���Io!񔻌��^WX�`X>�]��2��_qK��2
�ֈ��CE�S�g�w�B��<�x~��
�U��;繙L��*`pY#�����uJ��5:��X;:�
SZ�
+SLiH:.��%����^
�a1�MJ|W@�X><�D���V��+Q�
e�@�����:�t!{4�!�͠��bSF����_CT�@R����
VD�?���n|�U-8i?J���n�p�n������P�4�n
�E�
+�eW���RD~ADeBB�����NM�g��)��Y
+�@�]�s�^J
w$P�7���y�:�a8
+_�g�	��W;4�OP�V7>�?���]�6�fo_��9'�WC�`��������F`r�E`"����iL
+bH�@`@��b�Ak�S�0@�Ģ��d��<@
�G�C�Ā

@��	�ӢCͻg��9�G�`D��	G����t��*:�7J�t����F4b���lO!���ߜ�����}A����/��ʹ5���̟lڱ����I���=ߑ��B�愵M�g�2�}�9�-q��E9��VNHG��I֫d����-�~�P'.���5�t	
�>����$~-�B]=~8��{B_K4��"xmg˒�Mf��ٺ�9	�/�ܬbt����[���g�Y�/�)�^���af�m�t&ǧDv�XW��$���t�k:[����c	h�����b�`)<���!d������#���7"�l�^6x���>.pT?\]��^���U��O���N��R9_C�'	�#ή;di/y�ok��
t�]���4o�/�?bؗ�g8:�Lc�}�a�tY s����r��}U���W
ti��ќ����|ʞ���	��WZ�K�^~�f�?�N�|��\�gY��F�%�ފjk��:��=v�w�g݇}���p?��(/�t���Ԝ��Y�h����a^�G�)m�9o��̚6�v����
tO������/�����7
6W�(����g@�Y�,�}����
jI��*��p���Gp��@�������
+���y����{�>��1-��Q���Q��������2�Ź��=�W�����n>����h}@L��ze>?��
@�n	�<�����ߥ�F{���?�3?�m?u��u~֬����Ga����֟�������/�Ʌ�=��{}��~���!j�*��t�[-<�����h6@���xr��
yk�o[7�@��J�꬀�^
�Y5�l��b�Z����8 �Cq��P-64ś/~v}�*�gִk����˟u{>~�]��5k�km���-m_�����FT��Y�gM����==��𝊳EݡX��j�k^�^����?�C\�
_
����t�����^"���<n{�g�׿�<���]B-��	nn�� �K���d�y���@~#��é�}F�{5���\��_��aF����-�{��K��۟�����Y��Z2��t�%	�3���ב����Z��p�	�'
>hOu8�|��2Sj�BN��^��z��r����?�|��t7�|]����	���mì�3�g�bpG�XkCJQ��="��"᷈ns:Y���e��X��ڼ�i@�;�^�z/�����u�h����Ϙ�J{���d|�ّ�6%慧c}�
�0玕'�(tu�σ��RE����yA�g�<w�/o�tb^��lמ��{F��wI�O����i?N5�J}��R��K�7aЙ#_��o�z��|�Sf%���*�kg�&� �A;���� 5҃�7uT��v�&����oз��O��=���������xgڿ���q���
��थ��^��܈l�7�0Z�|�yI�3��W���KP�E�q�w!mE}��ڞ����8���w������0;�{5�0���<�Us��r1���I�Z~.'���������e�T��G����wR��.uh�ٸ5�6�H�G�fp����C&��'W��]vcE��_	9��רϞj��I��ӥܯv{Q��,��M����yqT�~�V��p��0���z����ȅ��{z
�O��O�>1���������j~f����TR�0t�Q��
��|wj���ʵ3��=�_���
+��[
s�ɒN����ٞW�9�f_z�w�Z�6�#�Ҹ�]�$%6���cBdVӭ�h��Ol��\�<Ib;8�잰R����y�������	ۑ}��R�aD��H���_6
8�������Qf�9u!o���*=�ن��~�>�@�����Ж�	fB��N�
��E:�o�C�W����Wse�y���Z�>5�	@އKx����s~�{t�Sp�7��_���j[�8GH����
+��	���w�<�f`��,��\{�%wEQ7��vHjm���U�a#�XB9X���$��>V����l
+j^(����3�|�����F��g���է�<������"q
�&����������}��)n��b���VX�	��$���9ћ�e����{�ug5���y�����=�wj#���ډ�}��^_DD��g�c��`��F��qh�&����(�峏i�g�q�0�F�I�(U�jh�:%�?C	�E{~�ʐq�[9LB|bL�̿��|�\<���ڍv6z��9L�D�j�A��m��~ӣ���	ϼ�e���u��}�0�k�!���k��:E����;�D�5��3��؆Nb�f��gC埮�f��.���8�3c���<�����\@q��-4|Ko�@Ǖ����;�9�C�sz}�ַ5OB��
ž���9�Ȇ�t�Ֆ���ό��Z��(m��E���Q��!x��ٲ�ёvhg�>��.���
��I��wؓL���V�Y�r��|Ƞ�1s5s�SU�W侷��(�|�3�9s�Y_��.�k{;|q���gr��y��|rH�h��rt�v��K'�H-��l����z���u'��q��>�M�zh37�^�],�D���H�?�
+zi%���bt�$t`p�#��R�D���M`����~�W������,�������4EDk'��Lm�	U �r��6
@����UX�($����I�-�̽�(��}�tR����U�]�q3s�
+'��2`��W�
?L�1�����2
��Z���e�W�~H�w�v"G�,i��Pnq�#:z���T�Ɵ�D҉�̋�	��U��8��C��	���G��� V��"�DFqV*0���U�@ۤ����Efe��j�t.K>�>@G4oIJ����(>�A�&r��mRBT$��ߐ��:a��8`���+(�>]�U��Q#���c���/�j��S��y��9jRS0�3@�t��9 ��N��ua]¸�9&�0��Lj��R8�c
���u�ӷ.���c��I{����u��ŕ�m(�t�犖��ڹ})e/G���p	G�Fu�T�hZ��) .�������

��?i��YUa������;�I����l���+)+@l�U�`ܚ�h��4�u���ց�kQ��cW*,D���kB���KɑQ	�$;�k��?}+�2�t�+�j3���;�q��n����jzb���j�PJ�Ok���q�$������R�n4�I'9N��aZc������/
����\�O���9���=?��T#s�aPb	]��[T-����P\9kE
Sl����H��]���1�xG�Rf�����+�Ǜ0;=|���3�Z�����pa�m����r�}��NA.'�;��'&���y�n��󨊘��L�l%��	_�-���t6r��������!L§��F~�^y����4�6�}����K0[jƏ�쟐\�}"R��4�e���ce���V�~���}�N����
���Y}bS�����+��~>�sl�)PoI��bѭk�sKޒ�D�'���ˋ�='e���.6�X6b]x����	�͘��K�T���h���4�/��C�n�]Y["��
š���R�|�ர��d�����#F=6ЧK��?F_�H����,3E�hwrO�� �ސ��&<��mHNU(s��NVm^u���nqRc��ϲR6p�����Hz��U��WL�
�����Ɵ�K�⸚�sJP)0Ȯx��>��u9�lx�����f�Cٞ��a7q1\W�W��5#��e��:�qG��K���f�U&�w�a)��֘[Ϣ����e�#�.B���.�g�4��$t�MM�0y�iA�ދ�$<[$[��hn�g��t4<qN+���3eO<��th�B#�a�P߇y�/�Yg��~�u�@�$���X]���K���s3H��d�Gx&��*O�&=c_k2�\�\F�<�
ߓö^v��ݘ�m�*�4'��S��[�J��O?.q��8��dG:�I�[���T"Q��PJ+�8=�22��^�j@<�9~�����E
m�͇F��X%
2��	@��C�6��:��vi�a0�g].
�$wV�UvfO�|ֽ�t�1g&��*!9o�wĠ�`�S�I�b�D@�f�c&B�%ra�í�г��-x��ޛ�i�?�"YѮ��4!���#3rn1J �x�Uk߅�!TD��p�lǟ�d4"9+�$yu�ee�[����(g��Cp���I�yr���R]�4�I=�i�(��E�FW���͜;c������(��sIM�y��OE|i���Q���F1M�u���$I
T��۹'Hj��RIR��Ѵo��Z.��ŖU�0zZQ۽S0�:���0�FT��j�x6�,�
�mA��4�)��tE�j�<� ��:~^FQ_-�g�:�/X#���N�m���$n�c��w�F��H+�6D�;A��ɉXo������\�p+Br�7c:��ٺj�ޛ_��0�ҋU��8w3� ���X�$��I�U Pc�X_h'"�����V���-�XZt
+�	�976416f62-1aef-47d1-a288-c7f430b64-6700-4412-8486-7f9327eff5b580 688.25238b9870c91-374b-4d2f-9bc0-9dce5bcc061205cf2a05-4c5b-459a-af75-c8cf6b25.46612553.37133 �K)"<�
���&� ���\���y��#��N�,��T�og��l���\�
c�+{jJ+j4k7#���s�o'_PY#
+�~�L���I *��o��0�
��:6�܆�5*���^���o*e��
⁅���
�Ĉ�t�p'�	/�E����d��D�D�[Wl��](5�7i30303�޹)H�Zb��ȇjDlt��t�&��rWDʋ���OH

���NHO�B��7�u�dKI\˱���	���N�#���x�=,�+�-�t�4�%�	ܹ��CA�pP�?��f�Ҽb�8l�����
O����yO�����#Qn<�bnZ ��C��_
��n����P�ӂ�/�Ǿ��z�����{O��u�BO���'��L�"��ӝ��_3^_3��Z(��L��q�P��}-CC���7b�L�1�qX�t�7W|<�"�z��F6����P�/��d�+>Wtf\r�Ƿnj
�Q_3��l)Y�Vl?��k	FE��'�	���9�#�'��/��r��hͩ�#�j����H������BaϏ��M�x������<
+	7�F����R�R*�SJ%�1���.�4ʚ�����x�&J��$�1�w깥�����μ�&Y<tY���C��
���c<!
	~Oz���GO�HV!��\]��c^[�O�N��H�!�*r����� �p�V�$�;� ��i��m�7�ML����9"YXl<��sC�
+��Y��/2���@��p/F]�0�=��=�AWhtz�Ǥ∊C1�5�}I_ʉ�I�[�Y͗B#\
+��Eʞ[깥 #{l�5��;Ü�!��dm)���`t�\A_J���;��9MJ�4
��s�2��:SLU+�B��M�W��L-QsV �q!����Oh�a
O.�cn�'H�SCl��!�t"Qn����
-��$`�-���t�G��B9_�\#k��&rn)e�5'y0��L}횻����^��/��2�V
O� ,��	l�}p�Eqб(Ʒ��³@�g�vj���x�y{�gq��<w��7M2w��0�"�8cTt�1wʌpg�	[�b��p��
+~�gy�gy�gy�gy�gy�gy�gy�gy�gy�gy�gQ�gyF���� P ��Xk��"sš��kJC9�b��0F1NcP1���9�t%c��[�Ci�����փ�I_�/�f)���[�=�(4:��"� s���X�[
+6�s�=š�Kf)�4�yl\�=�8šf�F6.%���c�1S
+��c`@R υ���F��D��X0	�c` �H 
+�����1#����W���[�����ہr��'������fD��ϒKqͮ��DX�sɵ��"�.��@��ܕ�������[:�,��{t�#��Aa4ǭ���[��[��aGĩ�9PA]�߲���[�6b�Ix��J06�EI�b�p/~��vL��w�q�B�;�g5���Xai�ch_h���n���z
�~�I�I3�5�˂�*#��;1x���\1�Rёld�|Jβ�#���'��;r���I褍��y�g/�F�5�4�@�^;�W"J��+eL!s��	 FM�y+Ӏ	!��7kyQxu�D�aA}d�"t!d���/ʠ��[��s���~/��E��Zsވ��OWU�`"���YN9�km����{���1���j��jHt!�И�[�c�}
+�H���t�]�pt?d�܈¸�8�Tr<]'��[Jz����[�W^���Y&8
C]W��4�;J��y�7��Ù�?���"Waq{I�#����E5@�p��e�ݬ�����%�oղ/�|� �\��誖�ȕ-n����)]Y�ItIǼ����F�AY��I��FA�ϊ�8�����-B%�
��6���bo(����� s�$p(�\ԅZ��EQ���"���,Q*_j>�2���	�֫Saj����jʼn"#���'~{�禇����BE�.h�����PH��d-rЅƋY��B�����C�>
��t3�:��_�H�à�U%��{Iʒ�l�-
����?�҆ѩ�g����ch"KfE&A���vʱ
�1GJ��'�������Of|���@�	j��6kLR�+^��<�/�x��(Y�SOt2��D(�e�}p)$X�}�
+L��Ԩ@H��T.7��',��V�������%�Y�
�'h(��1���~�p�'�',f���Hz�v�(�����2
+���D��&�G�
+��_��rr1��`Cau�.�.��T���r�r�I
��� ����0����y�����>n�q4
5��j���2�
}З�*,�a�c�k� d��9i��ѯ���?��c�X+9�Q2�X��Î���"�A��F)V5��'�R'!�=���QD]�(�璟/��
k�S��77�A�-���wu�s����fȵ�ȿs�K�c�(�;���^��0��B߁�����
k���9n�J�lD�tR��_@xD�	S��q�ڻ�*	q))/�XmG\s���SM��Q��i2��_k����FD����4��K�}r�Y����#�"?g��J�A��;#���2~N��&l�͟�2�pm���$�
+ T>�%�¸����+(e��{��T"w���A���kB/z�R�aa����P����E������V§GN	؜`���\F~�*Ś��t�)�l�`z�,���d�X���B6�v{~�l�A&B~�Τ
�w��<���7�_u���Φ"���1tSw�xPx;$'�.�
+iLO�Zc�>�]x�v��n^+G�
�RH�>RH#%��Z]$#�>l����gq�Vj#I��>�/%�\���5;3�򯵿$��CPJVw��)i�̃��r��
K��a��^����A5���X�w��Wk1D��X�Rp�@�3�4��wep�^�K��X��aY�D��"Iw�Z�(���O��e�2]�ט5[�[���c�I�h�?#N:e�g}-�;c��!P7+|��Y�/Z��ä��L���R��CS!ըX&^:����,�]��'�2Ft��l	ng?���śi���_�	�PB�J�)�� Z�3Z>���^�I�-��*ZE��>ț�F*�d���@�.gV5Fm���r!+Om���7֚甔�B �޳1'ݲ�3`� HD� @-��M�+rYE]��l���roR������f
+7��ڇ�ew�
�YҮ�g��QA�:����,T���=�}��j��Ep�E}50l]�`�c�Ih׿�G�r�� &�1M`�+�nk�"-6
Dw�Q�1��K�����|�i�Y�.E*
+(�4��5�$��~Vz�mo�BQ���>�ZGM��%,KH��E�E���BƯxI�-w6�w����f���F��}�C���Dw
2��S�I�^f/B������!�B�o�0"ZO���gh��a�w+5���a
���G�#�<����5����Oy����.й�q��1M;�����X��J��IUyPd�<E���Ȋ4W[�F������
�LH�o��׈�B�t��
\�C�.E
+�l
��Q��㏓�k�9��1w�_W�XS6���8�U��@=
+�pv��
�&4����\�dϖ��6���P��͒[�4���U��V���?S���R�o��2�>�i!w�@�v���O>�]&�ym��{�X�ŭDRG�s���fv%�	XZ/7�{)sX�=��]c<�8a1J��M�D�]�-R�nA��7'�Dn��9��+��*�,�
�B�Z�g:�mHB�����sfCI�ϝR������H-֝gLj=;�K�}�B�	N�/ݕ4�t���c�2dUf��E����/O�ӽ&�O��i�>�
�um{]w�#�"+�|l�-�E)Epe�6�Re\;��)��`hq���o�)Xps`yܑ�/	  �H| \��bJ�7_*��v��K0����VÃ��e�Cu$,dꍵ5�K�GP>������D�BL[C+���Ҽ���&zqI���w�<(�I���\��9��f������vd-\q��Ǚ_[|�d���I��Bv@/���U�dE����C&_ۢ��0�EXM+o�@��	����|@�St}A:s�O��I/���H�##9-�SE
+~3�+��\�B>iX{F�=�M��DW�}1��}�D�qS�4��DWG樒���mR�*GJ�L�<�gL`x��"r(bg�itں1{r�Dι&�,U^b$�
�:y����"�6�H�-|]��s��s��)]�܇�:�3e~�?S�@$C�<��	������F����
+�2@@K3��um+�Mw}�UH[�K�u���.
��O#�Q��
ju���;#�ƚ�Q!'�G������њb���e�8TYV����l��j[ɂ�>V+��~�Y=2�iD`�>?!����l�ڹVܨ���s�g����bP��Pu��L8-[1�f9V��30�6t9��9k����jb��|�g�g��BU�Z�-��xʲ����w/҇��Q4vx��)|�>��
u�$����#�r�uNI�l��	/��<t��O�X}�w���Xzf�a����{�̃n	8)gpg4U�n�8�(�Yd��."����26��thw�f�籦EQU�#d��t�_�wPlrE�k���2je�`3͞��?`�چ�ܓ�����0���Ũ�K
+n���\&����]�7
o�,��|�n^ap;Kyo������;���/
�A�Ʉm;�Rj}�ѱi)Ǩ�>,��
�t�P�TQ�� ����XE�S���t�<��:�)Dx
�;d�b}��l�

mM4P?�{O�	��������O9�;E)C��{j�󆜳�: �Y�c��i%�R�{o]�fCM��~t�L�Dv�j",Q� 9r`P�tׇV�*MV.�]!-cl�z�;Y&
��k��3���rI�j>iK�ŋ牡�G>[�hYw��Y����6�XD����J7ﴊ� �墵T�]DKq�ecDC��tyĮ�0���3��C�5��
�(�/Z�94	��S���P��?��A�ɴ�f�Hբ�В:���-
+`��0�L�<�i�	`[b�Q&[	��v1�4+��3Ն��٫��=*��Y�z�ey�Tm���}�L�J1<��}M�B����}�[�(�a��UR��1!f*|�
/�Q���&�������z�����PD7p�r`��z�
�&V:�CWf`SkW&h�G����q�����T����b��A�w�Y��Q
�*��e�)ٵ�3�֊��:
+D��]��W>Du�m��-�!��["��+0�?�㻭l��],7�'�6�3˅�*a�`/�G��id�y�3
��/�-�9\n�)�yh9Py��W$���xk�/��^r%���y��,��gX���q<��4�_�+Sn�K5O���M7�}Q�x�d�z·�\bO�����
���R"�a�sdvv.C���{����U8D�kN���������p�32K���#�ڶ��=�7U
�"ǐ�q�
+#`V��/�D���S�@0
�nG�Uz�^�W�UzP-�w���XKŔ�9�klH�M�G3
�����LvX��Rh�E�?�
+J
+`�pt/I�
���9�_�;��o�f	�ʱ���A���b�����J��Jq(8 �h��a�B%$��K]��5����X0��E�P.p4�
+���B��7��ݴ�;A-eŰcŰs�/�k���Y(V@#���A� k,��)4?�u�Αh
+͐d�����\/8 <OV�`�[�P��S"�.
FW�3��4�MA/�I.��R��RK-�Z(�`�&)���)qK��+
P~����K���Lw�4�ji�TS�$L��]���O����mi��^z#�$�U*��>pDKpu~��T�с���3_%�Óэ��x*�U�2W���p~b�֓��^j�`�XP��(��$i�*)AT�@KP��>�2_%G1W�z�!�����6���	@5�՚��mMw���|��V�/��c���w�ܻ��f{7�W����iL�>�Ԝ@|y�5_�7�Z�ꜭ�6뜭�]�s��]����F�����ʱ�o4�zM߹�g��ݽ���g���Xk����z;��I����7�k��~�۪�n��_��k�8�^�kq��
kY�=��b��1������k\�WkL?������m_��w����\;��c�w���z���bݭ>�K�׷Z����j|����::��ƹ��]ӭ?�[��������/�a��ތuw˗^L?����.c�i�V�o՘^��ݴ�_�m�{Ӝs]�F7�8����|c�]lq��T��u���N��YW�y�����N���^�q�kks��R�7�XG���W~�۽+�Z��[w�)O�N�Ƙ޾�]��%M,i%M��~5��k{�H���v|��w���vms�"��ּ�~k��_�+�T��+��o�hk��j}����{y�֪��~_�S��#���j���벭��O�F/����F�Κ׿��7_��}��r�˕����a��~;�x��ּ�\-הg]/�z�N�ފ��Z׻Qo�ŵc�����v^?��z[s.��Oة�^7v���t������;՜�]�h$��ڍ��j�w����;�>�0o�v���{�ݵ{�r߷ױ�m��cjx���W���
���yӼ��;�}�_�����_�s���{���|SZ�c-�3�/����۸��m�������~�����ۭ�S{s��
SQ��{7�?�a����3�Q���u�>o��Z�b*j���9���U�\������;��m1�j�Qϱ���s���o�F9�<�����0������|����o~���QN9���ک�؆��r����c��o����7���Q���ߨ��9�]I]_�����������=�ű�X
+���G5��z7����|�ιn}��gOߍ�o�kQ���uo4��?���u^�u^I�J�畴��y^I+i%
�%�+i�k�OVw�����Y�~�z3�k�R?�w��MD�L�Io�v�v�[o(�7m�S�:�
��sn3��VP�=�������<�÷_������w�a]θڋy��{/���u[��+���1����<���k^3�5c�����?������6_^-��W{q{X�w�k����zm���-�}��ް��my�y럫nU��<_��=�~ú�ko��uX�/սg�oŹ�y:�N����w����o�1��VK�Ͷ~�4�PB�J�41�t<_
+�DJ�uJZI+i%��i]�0W�J�����>�z�,�
.
+M�nH2;K�(i�[G��S`j�>�����P�[�_P�J������M�ӷy���i￝��״s�e~
+t�^�K�'���4
 lo�[j3řV�~?�&J�_�)i%
+�4�u�(i
e���������9��{c}7�돱�^�n}��ۍ��=����m��l{��|1���u��s۳������|��s�����8߮��k�뾙��u�vw�m�����������9��j����j�;�<[�u���{��շ�����<��^�7��v��N��L-�e�u���⻻�;�]-�|{�s�ۋ����n��8�js�ߊ����k/����o����>oM>w�z���k?֊��~����b*�^�c��(��o�o{�߼�8�1��"襶����Ԕ>HS*(iX�U�)����R�*�(:���0�{X��y��
�x��]��v���Kj�}	0�ȱ��;������w��n��ݻ����a��ZA/�E���6믷�yｷ�:c�kY���[�7ڿ�c�ܳ���l���ڜ�����ڜ�������yo���w��jL��;���|�������oި�0�ލ��-�[��=�����v���������(�6�1�9�oX�r�{�<�7���}�<o����v�����ܽ��⬫����1�wW����߆zM���Q�m|�ۆy��ޢ�ҏ�
��x�XG1����s��n�\1��:z�(��2��ZN�����3�轞�Z|��n���N��v������	�q�b)�9w�h�}��Vşw��F1��Sq���ڋ�8���^�m�n�W�ћ��;�(����)��o��{z3֢�ތm�Ma�w�]̣}���L7��~�����{�����)��o�a��X�޻y����{MJp�Xr�����t��4b��ȝ�
h�>�fYI����jU��JK��L[M����	��$O�x�&i�Zgh2�s$K�d1\��Q�4b��7�I$�j�"�[(�,IR<M�O'�+5�$ �gE�'P4�F�1�
+A�G�N'���SY��Jp��g:o-�
a���(
+t�)pP�OD��+S 
+�3<M#ƙŚJ�&��Z��R��
�S%	�$y���֩�$y��e�ӕ"k���(�����+�<������TK��B�c%	��YI���
�:��	��x���4*XF�,&��`O3Ҫ�S/+��Za-IR��%�O�WI㩒�TI��z�R�Z���t�b5I��4?�4-(i�E�gE�9�cx~"�4�F�<A�Ԁ�鳜�p�������wz�ݛ��耭�c�KJ��x�d(�R�W� �E��7{�+\���#�۹/iX���OYrQP��T��;_��b�����%H�Np��h�B�0�+T��)Gq�Α�����k�D�Y�#Q|u@V�U�wR�B
����G����(�]Ϗl�]g"�t���i	��� M�zh��y
+7�h��ַ ~��37�<]�Ӹ9���"��Z���9�Z{z��\
+�<ݻ�a9~0Y�(5M�$�׈��0��(vD���2�:�+��B 
<}]Ұ�I��
+K��"8��g(~��r�.�� �����u]���:GҬ!����>����yh�$?�~P4Q�����5)*,Ut��,?�t}�I?Hc��~�<�x����3Dq�It�`��V@�H�g
+�Z�y�&��wl�(�k�N�xH��4�W�
+Q����o@k<��	��7�d��
�Kl��o�d�3	��k��M_X~����lEJ�/i%
刔��+U("��
+E��^r<�{O)����GἝ���.�z���O���ۻ5�o��>m����޶�m��>��ޜ{�y�����v/��R��n��z�ڷb�.���ђ�P��K�3F��h:K��Q����ߛN�L
+s��ޣ�/
+�⑒��34ǐhtA��W�	}`�!Dz�%
#�����d�)�f�q!|��{�����}��\�o��_�1��|����^{1����-�]����o�7����/�Y�o��gNM D�^�/�Z�(�/�6����wo�ǜ{˳����������<T[�����߯�W��ߺs����޻���m���{m��6�7����}�Ww�7�{|/����?���|{���m�����ｽ������_<����xo����Z�{���ݱ�}�}���Q��Q����n1���Ş������Q�
+�K%$��ԞBX��E(�V���_[-����o����5���/�޾�m����nm���x����xol�������xg{3����1��~�=��g_=���l3ϻ_�1��ߋ�r~5�{{���[�s��[�m��~�o�|��7Ǚ{��6��y���y�>W����Go�xh�����j���>�k��W�}���Ｑ����/����fo����������]-�]�{/��^<4����[���Xo�7����=�Y������w���^-�^��s��{����w�5�����o�-�6���������^���^[�����G��C��yc�����=����򫵿���v����zn��>�o��k��s}9��{ޭ�yk���pt닇b{���{��ͽ�s��n�����{���bk��z�����͵�x(��V���:߯;��^������?����^8�/������E��^8�9Ϙsݱ���η�_����~˳��ޫ��{α�_��qƼ�}ᨶ�����m9Ν�1�;����V缭�6{����������n1��j�u�p��{�о3�fo���gm/��g�u��^<�ꋽ�V���nq�[���~�����˱�v����ݽ�5g|�P��%�_5�x_���W�}�(�w{����WKŝ��1�{��ߚo�/�����Zoo��r����b߭��c�/��V�/z5�[��/���9����o��~�/���=����~�9��n�}�����WKo��W��Ɩl��p�狇�/����;��k�;���o��{~/ߟwn�������v���5�[����g�
��5��g�7�����w�@��`����c.���zwmsߛۊE��"��'r싀�`�)�a"L!�<A��\��i��S|})p3q�tS
F�CK�|1�;��Z�wךo�1�������ϯ�}�K�ֶvo5���Z/����,A�1r��H�o������Q.��Q4_��<(�V)œIɱ�l�9�~]-Ř{�s���L��\�U����Ӆ�:���o]m������_o��Zn����?�l}�fc*1M�U~$p@x~"(R�>��r�$�
E�+B(%�)P�ab�X��Tᇂ��\u����;�ܭ�>w�����֜[�m�v_l�϶˳�|�j��w_������/���7�<�����f�m�w�����o�s��f�s������]c�u��������������k~���ڿw��~m3����w��ڌ��?�����~��o�q�T�|s���j1���Rz����~s��Ү���|��D�_"wE2�r.!p[
J&H-TiO
(U��>P�x����a�s��D�Ii
+�P$S($*05�@�o:�A�2�	4��	��uu/��\PV�R�P���PK�Z�d�i�.:�ި��D�PP�a�Z�U`H��P�(��EB�1Y�&,T9abb��'��
oE  ~��'*$L�>pA�8)�T
+CFŇGp0���y
)�B��@`p)�f�@��Mb8�
#
	܃�t�<�R�ʁ!Br0�8x
+E#s %#���=<@��a�%�X<I�1rFdC��H�)�
�"���1v|�+U�5�g)��ȀB�o�C'���jL0`k�a(�(T�
�Aka��!&8\��Ru�BV�a(���A��B�)��	�ʛh #O�8\�x��xg8�J�(J Y�$��HZ!T�F�AX�/	B����4�H4 L�C�'����������%|�)%���I��heA�X�m{.��c���\�����cb@@:�I��d��s��pF
+�F�����ʀ�1���ؐ<�T�p���aM�'��0ʩ$9����JK&p�W��0Xn�A04)�F%��h‰/kX��d�P�@r�X<����efS�|��G2d*�L��m[�A�$Fú��4IX�T�6L��`�F /	����.�s�$2��B@*�@B�?�i21���X��T�W�q(0!�MA���QL(а��!$ W��'�@ ���pBP1��/�����I҃��|���	�_(���<��x��kL(�O��YC�	��a��w�)&�!�3�M�49������<�M&�O*۪�Ӗ0X��u����e�����ρI�nP$��\4�;-Z�,DC{���~EF�z(?\�._H4Ϯ�F�!/��ž:��]9#S �5a��I����5]�LJ�`?�]IF�k�,ܫa^�]֦�;7�,�FE��Љ`;��X��![M$bM�ˆ�,,�$`�X|^�e;P�b�6�AFhXD�X?	_0�H"BJ����AM^&8J�T�m%��M
��b����)1a��X�l���o��m,Wc�`�ZN�8Ur�B��0O��cr*�fPYup�s�"
��I�^
�����RF(@P�Me������)��F�)*��2Q��DEȚP|�ib
��o|4L������'3��T��c�Q'���6�^̐hX�
J��B�!DHP�������	��$D�,��A$��pˉ�D@ENE�1r9D0�B$��É��!��G"~�F�Ѱ�
넔@^B��)���e
!#!$��AP#D�	����R+Ha
7�a> �����cb�����0y<.����ŊPx$���aMx�!�GA���z�G�y��=Z���.J1PZK��"Ά�vP�H�\�U�ʣ�R��0���9����F
yQ4o!�i��U�i�s�/�5�JPH
L8���B1�!��"���M�?���22
3�Q����l`$؁�ǂ2��*��T��1��<LǪ����1��
+t�_�s4�_�H�����
!Dž�9:v�q0 ,l0D�T�����Z�Aɏ���:>|�9 L�ı��c�5�
r64�Cd��t�a�
+R�n��lTj4D
E��
���p5���V@14>^CU�:����V]#C�<h|L��EPЈ@|�c74��ps��S����6�Q�H���
�t4^(k|p��2 N��2�Y�A+��+;�q�yT* #P�HD2e��p�Q�
Y���4lu)	�8�1"k`�H�C�}ȴh��SC�P&�d���y��%d�
�Q��';�u�����J��.�L��r]��B�dL�!�L��ө ������,+��,ݞY8*<C0x�?�r6p:rv�f
���.�ʒI6S�08[F� U2��@�jA�$GI6!f"��@2
��G�����(x [�TAţ�=�,˴-˲^%1(��X?F:�,˲�HV��e�O0�2"$Y�b"idY���,�JN�i�M�a|P��u�8��JY�n�)�ԦQ7�1A��V^�'�9e��F�ѫ�4
�,+P��(t*59eZz7i[�x r
�@����q�M�!��yU����1A
+w��5%�`aa,p��NϘ�b(Z]�N�*�\������C�X�N���:��O����)p(�KؑN	�3�:��jli2X��1(P�%2*(w�)8�$b|p.,̆b���
+P@;,�A�4"
�����3���@�,+1dYV@�YY�Y$@��DȲV�dY��pdY.�&�I�(P�@

�`Z+�e,@bs���r�|( ��K01��
+���̡�hX�ȯ�����6&NE���O8NG334����I��U��t���Y�\/p�Hu��������ϲ�d`.8�CF	v�ݲ,37Q����`�'˲l��eY^`iQ#�2r�eYES!
s�H�,Ka��Ơ�eY#�e���Dp�p��)�+@�.8H�e��
+��β,[=<�
��,��,�DUE�8dY��Y�]PCy��,�
+0p��5��ɲd�e�I�(P��<���%��P(t�0�>��Y�2�
+��PH��K�}���a�l2#��8��q�,Ӱ
+Q�	�lu#��P�)��;;�P����:�
S��Q���_�q�� ����z���+A�@�&��(��A��QAߓ�V�)��JO�t�B�|�'�&�Y�(�YjZc�9?�X�47Lp��it�
+.
�
(�sג�W:����#�=����/$�L �i~(��O����&t/HC���7��&�/HS]�.��E�05R
endstream
endobj
22 0 obj
<</Length 38811>>stream
+�|Q�sm\ j~tuz���$���5���)O�A}��#���~*�+<CH]#u}"I_��i>��ل\5?
+�a��>�r�>�����T���MJ��I��	�"t"~W����H
�r�dx�/p�7�`K�%�+0*��
+��\#n�u1\%�d(v�2
+q@�/H������Q�C������E��r�L#���&2d�����x��c���4bTӈ
�>�	��m=B��*�Ct0�^�}��FY�<@���$4�D��4�����`��b
����FEf@����3��D� �|��4($�%0EV� ��d�
k�`(��B�*�8L2T���,H�B��d� a��6�eC�F�J�D���^��½�߻F��h������� �k̒CA��)E�(��r,��+��Ś&���k���v)[���IXj��j��5BP#e)""�,yl�@rA^k�
+Ά�s;Hʒ�)A��d@R�Hʂ),�t���v,3�$�H�<DLX&h%,��	�qv]��@Y��b���YR�@�
+y0�Q���"���v�H��C&#�t��!�p3��U��<�p3�U�
+�!Qh Ȁ0@'H��M$c��sT01�u�<�G�>���sa�/��
V�W�l�e�YJC.=��<��¼��y�@0�Yؤ��n#�0�/����l*�c�0��s9�W��P<����XH
+4�[0��.�ɫ4�@B�fT�l&"�NDC��\n�"8��ˢ��I>��^��a���Vq�9x�y0K��i��`�# �tQ�h�Ӑ��-р�/�߱�r�*%$�5���"p�x<P#n��(	}*!܇��R{1:
S����G�A�
([}4>
n�R�f��^��M%�D�J�aa(��U�U%s�XU2���eC�8a�,�f�8�JVjpm��ěP6%�*�
�EwD����¤�5�P�uP	#M�$�BѰ�R�;�i�n�"!!A�(D�ʭ]�4������Aʖ%
�`] ��0����w�l�P4,�,El�A�A�A�A
�05���ngi�TE�C!�((8��8�ʀ�,)�!EP$�CD�����4�F�CD�L���6�9�F�Cq�& h-�
Z�m���A+�i�<���r�F�鋏�4�R�@� i�m�<��=dr�2�2�j,'���a��%�tP29'����0��fDR��A��P2�@�D��p3
ChE4�@�0a B0�Z����p���d(�Ed@Rv$y0�ʬ�
+�La<"gE$d��} ɩ2+p7
A�rɈ*�b�`(�R�5�V��0�P�@�Ȝg7�9?�,sb(
/T�9e?�J�גH�D�0������M^%�����gap��\*��PƕEð�$�,'h4�,y0���Qj|�}�̃�8B��4�C�4>�/���K�����MY��h�,Rƒ��
�><��l"����&��W�XD*
+��J���P8������"��`(8�K��DY�j�Ǭ���e�vB1@��B��Z���
+��m"�N$C�0L܇ʭ܇���ΨP�8�2�]
�Lx>�a�؀+��
W�9
+�8�L��9�"$F�6�=��f�*}�����Ѓ�c2��1GN�5���M��©`(
+y�-d3�Ex>��ąs�
�L.���\&���@��<p8��/��e�a�BȠ}�G���
O�$q�Y��:��4L
��hq"��v.�x��#-�D���@��X
�d�aRHTHD}��5Lab;�\�J���k�D��+�b��W�HLt
�x�R!ف	I���@p�e��ih&Wb���q��Q��N9-!%�y=��;�(��
tl ,\wY��S%��!t��0qi8�K�^ݰZ������?X�a
+f�p��X���ǐ�.ۖ
�"3[%MYZZ\����H�An(]�2��EH��
€�*l
+dh�����+���4��Q��T�*$�Yۘ�Z�3�0"(����-l�,�`t4
+�+U>\X@L���1�p&�
{p�an֫TLd"�+`�S6R'�&�9X(�צP�
+��0)�
�Pp�f�� {�����?�teqq
#W��I���]�OÜl8-�t:
�2���|'�d
��@�=H@<g�5ʃˤ)K	~�,��h<����	�6'�����{���@��d²԰W灲�o���UZ.�ʃD#����d�aN$�G
+�4(����z���@P�e�D0�`�ړ�M.��eK�������)z�Uf2
�ϳ���
�ә��Rr��0�h(Y
�D<(�VC=+&��B��0�C����T��2���I2�$��c�<��#Y
�(�j�rx>B���Xа�LitV@TŖ`�#+��t%ց���D�78X���4���Lx�@��(8W��Xވ;xd���g��@Y��g&���H[�@�4KKf�a*��xF$K+0;
S�D�����((I�
�p~�~����r�*;����� P$$Z�u�̧ÑSx�DŽ�q�Eyr���!+4l{����oJB�ME9�1i&we!�	a(FЂ���z��xS��x,JBs$4~8�i��9�:6T�]��08ױ$���
$��o<l@�
�"��U���|4�R�X��υ�&�>7uoj�ÙQQ^��ܰ7����>PvB�Z��M
��Rd�-Va#�(#̂�4���eE��PL/��
+&6�#�`(/��'>�r�E
+^0G��a���@wV�ņ]��G�X��°Wm8�(��&
t��tl(�`T�ہp1XO�<2��%�2�p��N�},�!�[�����s%�l��j2�H0��|�$X�9r����c[C�N�̦�9H�#�p�M�(��F�?����dpL��0���a�����H�G�,�����: AG�
�w�҄D��O�c �Z�$]�]]3��b��A��ђp��L�*���
+�
+�i9���q���mZ*k�1����f��~T'�-L�٥,��3��s5CÅ4��t0 f�ƍ�k16��."LJ���
w:drAC&h0�X�b��\e(��ZL��_l;	��;�M�y
+7�W'׷��#?H#��z(�GO3�(�:��Y�P�
���Ђ��a�S����I�$Uԃ�9+"cc.|��!d���(�B���b�cZ���0��WƋ��\�qA~�B�`�Vkdp�´"-�$D��1?�du͆�B��Ϻ�T$F�B1��BC� ނ+� xh$:,K��"�,�U��!���d�J��
+�qV�+���`H�2>9%*�ܨ4�d��D�R�F $�@p$������eȬfP2xRD.���@ GbHqA
+dB��*�.�ɻqxj��@R�Qf�"r0B�b�%�R(x�"I["�h����x�KY;w@�
��3ٴ>�-=A�M �r8�����G�篲g$�Ay��t7*t��*�X�s���3�u#l�%{%��wk�&:M����z{��p��pY@�}�j8�s/
��6ҿ��񮮰k&p�b"0��o���]���Z���
s����O����4�&�>��
)*������㋋�"������C�	[M���!8PW0��zҹ��CE��$J� -�{�j�5Q�N�ً�W�kT�-9v7?��ve*HP4��,�.
-��/WL��捶�g!���X�Ƹ{r������m
�@�V���74���eF�E�r����m��
`c��X-��]�n�`G�Ʉ ��"'T�D��X�β	4��+�.���vt��kF`BPl��c�ę���Er�,�H{�nԧͤ�zt����3��,���G��6�+b�7��jQ���_#�ɳ��nx�����f�?�]�&��%*Z��:qذ���A�P��oŴYT
+3>9�!��7M���Ȉ�R7���{���<�oV��'��<�?�i��)N�ok�y'�
WәjB�݄ԝ&��B@��Fk"�Wd���h0�OZ���!�����+�Vո$+t��+����k�/EA$�_�%/E���o�R"j%�$Б
+%T3R�������G�	��D�5,�M���;!!x��#��"?�;i`��@"���C�I?ƞ���胦"_8Z��DE�B^�R1T�:2��Dx���|%�LXʘ��h�+ﹳ��M,!�9��>�	~kM�#`i���q�@$��K܏P�Nؓ¨��xb�~$�Џ��S�˓Ao������NA�#�ͮn��%��c���m�|2�.c.�wn�54��X��T1>�h�t�J�+��J7\��f61VCz
�>J^�(]NCLW.oc�	�(a�>PQyrQ1w_�k�Ltu=h��e�r��L+���GL
+	�G!sT���Y��,&�U����~���C���Oh40` (o��눲2�����W��C��ey:�%�]P�U�*54
���2{>F�����n����`��3�S
�LVCe��ou1Ù��f�̎S+b�,8�g�Bi��V^�@K� ����$f:qhf~�ku�s�����?%�V�Ń��H$�@��9F)3h@�A�-�v�D��I�]![��E�����ӫeI��x�1l�e���z
"|�ii>� )�@
�󕀤x�_�	��[#;�,;n��Ӄ����V,�A���D
+��s�lbX������?:4���kB�6��k�'Ϲ��}z��	�$ ��ʫ�9���0s��+\TR$jT5GMo%�����2��d\��6�U�TҡK��g|����,���&k!�I���g��	�)4-�y�%���z����&��3��~�2��r'c���g���iKC�0U��p��x�
+��Uc�K#�]K��n�^:����c���X &<3�l�L<|鐙}���J�l��N2����
+��u�n��24�e�� �izp�*�|�J�����ZC�ifwL���ힷ\����,���7e�F�t������f`��l��Y���p�S���ө�\����z�I���+kF&��Z�å�Q|m�	�\o��6������ΕeF��R�|b�fF�f�r��6$�n��0���3�}2�X�:�t7v;�N�8�m6�f�JkL���M,yK*P{�3�E�9=H������f�e�Y��Z}�-h��ZN���1η��wǗ���G�Tkb(t���A�ۅk�{���`D|�<�d�)J_
�Ӿ��"۾'d�����Ɲ0�h��Y�wN#،��W��L�j�Q8��D�/&�j΍� SR��e3��颋W_h������eH�	���4�hpyݦ8/-*������Y����B�*+�Wo�v�o��p<P�gr�͛�S�f�ʮ(��E��
+)��|��dᦈn+<Jڇ����1G�
lz� r'��M�O��,�DFJ`Lp�M���&q+Y@��$�R�Q8h���k�:��/PY����R����$�]l���à�1j۶�_�
+V���I
�c{%��K�����
���j
o�n�mp>9��}x��W��NN�+�R�
��k��l"��
G-��Iĕ,�a�2>�S�=P�����0��y�#f��J�%[��rİ�{�]�d��N����σ6b���"m��sq|K���2��
+�4>aAb�W\��׊8�%7��	!�"���C�1�,�$f�w��'s�%;f#:b���O�,oS$6
�Ɩ"�����t�ⵉ�{h3
+]��I��C�eʐ�q� R-x��-��:�鯋���Q�s;�؉k���`����<���RA��=��QF�yX�3��_N4k3�y��N\�j�^-̭!�(����j8��f5�/��1VVC�y]M
C���C��/.��z��X�=j2�`�S��f�紳NLFin�D�w�^?��f�S?$0�=r��a���U9���sКCz��p�QW(	ceB5���0,^1��k�@�a�������G�h��&�tK4��nO����lF�+YM��퍨���MA��'�"�z��mPt���+�%X�?�g?��X�Q�6>�+���EC����yu�UWmc1�ٍ�������!�h 	�
8v�	UN��3(�;��}�g�Vo�p��:|v��i���P�̴R�8?�`bJc��E!4�-��u�%�3]����ir
+���\:�;�9k�n�%X
+�����90�_ '������lUÜWfϡ~�[��x�/�cR>n�m�`͑�xk��2:��מ_�� �=&�Dpy)x�*3�<%���k�}�<Sb�]��	���N��s�_ �����B��_��*$�<*��)�9&{V��`q���
+V���qxSZ��c��S��O�C�&qg~�:�2
+����E��v~���G�BT�L�u�=���h����(�%|Q�ӴmY��gb�]F�Y�=�!���/��]�U[�a�-F�E~��|�[�e��UЋ �%�:v���L��WJD�A�J���Ƨ�V���_]2���Kl
nz&��+���ߩ��Zl=��z'���l^g��(ڞ�#WlM)�iѿTߗAHV�O��{����fa��)��t[@b��jB�3D�s
�0n��Y糿7Q�S�uu��������A�hV����J�-�*����6V#(�W�~r|􃼀�e���H}�fE�j�Y�$�v�e.7i�;Y�.�KO��B��-Lmm��;_��
+�=� 7���z�ʥ;t�?9,-}���zՑ�)��J֥o�?:LjX�Q�z�%-#~D����Gz�P�D�{J�4�<Ǝ4�a�qУ7ӑ�
+܉�`��Db}�x�G�"�%�rA�=j�;�X/��>��5�G�G{LaX��pf����A��.��'e{H�h �p�jV�ٽ���������ˌGjx
����+/d����#B;S0�Պ&���A������0��h_/��ur���%DoK4�xB�K��y^�S�*����S9�^�duEE��
3,#�QI4�Đ�@�V��_�B�g��1T8*�y���?+X�
N
��!	�/��G���[�e�j����_�8�4�i7~���
��ؔ��E ��b�����o�d�.�u�K�NN0|KF�/`�����ǒyUn�X�	��J�ǰ�t�5u������@U��y-�-B̑p11r�p��F�2��3��D�d ���Y�
+������l3Vj���x�
)K��|�V�����"2�������I58���2
�n������2߮�]�P(���m��Z�����hPu�D�3�O�5�h־����w����4�ބ8���D�8��8&n`�;��a֎�Eko�^\�wi��ɸ7O)�<��:���tӍ��v:j��_/�/�MʖM�	�c�g2�W��M���>�%���A�%YX���ʧ��}m�_�i��V|ߝo���N.�D^�3�f�H��
b�'\`f�����QSw��^[��$��M���R��%�����?}��
+�^ʛ�?J+[�T�M�->�b,��k`�B��
`�^�8u��[�`*ȯq�)��I#U�.5�Z�%��U������P��e'��tj�~�Z/�"����
�C�'7�)�v��T���2�-Rx(~%`��6�>=F���DX�~��,�1>Bd�	D�A,���lng�rlw��M��bw0����ҳ���K���uӶ���|}rl�s�5��$ŏ%�<h����|w�c<��v�4�?m���>�Tğ����6>�1~J�%Zu=��Ra�F�d|%�w�I�������|�O��j���} Lo$� aZ3��eԛ��9	�i��'I�1(0+��y+���CKl�ܖ�0!˂��1$2�&!y=x�89�2q��r�G(��*��P͔�[^�������h����3ð�����.�6��o�������
0��a�Pf,��S�!������^Tf؈?C~�[���<I(�h+֖��²�&2Š
P�I"!�
+y3���b��`S��l�̻+O��ޔ�UX=e X�Ų~��|���!?,��1���X��y�X�U ��]�w�n壅�+x0(ʬ��0�)���	�{�S�����H4:&�AW[
+����L/��P��	�F�W��IJ�q]J��}�~׶��m��)�s�`�YNVA�)�0�w
'\�f;�B�!���B_
2���͓?��?���䔙��ڒ)�/�=H��nG	8��_�]KgƆM7��9N|&z!�A���
�]�Y+�+���n����I�}6,���y���mR��0m�!��p����%
H�]Y4sB�t��!��V���N"[����Z��
�܌A��x�9�l:98��C��p�9ܢK,Mv���s\L1�|�r<yg� ��3d�s����X���	�W��P`��$�A9��Ru�Z�z-����.�l�V:~��yf���X��%��@��64�oR�&o�wFt��af��.Ү�VC�K�|>l�4yq������l�\��%n��Sii�iG���i-[�7T�0H!A
�DWc�-$Tp�9aP;~�.�SiX?�H�v�Q�c�"��.M����ڼ=����
�#���7�_�NK%g�X�͟�7tV�v�T���>Q,���p�?3��K��ng�K`g�Ϸ���
`�Ȉ������Y_�&�D$|x��;��c֡��ے� �"ܭߥ�z[�D5����>����~X�.[�[�(���/��%oi��*,(%�T��Ѣ���(�)�����ƫ�֗�h�Q�c5
+Ŋ�d�ϫr����u�a7�����2�A9,��{}P/hj�9�^�j:3CD�e��ܰ0ڝ],2;V+L���%��'U�"V
�z�/��(C��
+[��+��M{畓&�E���l��	�G.
���~���&ODLG8
�k��D9Y�4�t��\J"���N�>y����G��'��|,&I�ٖ�E�N���M�4.���0C��;�5��ɰ�@�B�j��$	�7;k����H�@,���j�`�b���q�G��	���[�
+E\"�3��y�z��E5W� ����dv�Gտ��l�
��&��O�h�'��d�����%����$s�G1��d>�㫠]q�鏅+-D}�T�������"��&.OcP7� �U^�>z�{�˞Bໟ'�I���i8��>����2�U��V�����
��V�3�1�qP#�$����N�oaZ�^
H������8Z*�R�j��'�O�q���q����-}!����T�$	�2q�dՙz�i#	ч��.8���uvY,������,�h�w6��x*�E��P6�,Ph�x��D|�#�g(�,7� t��K$��1�:��~�a�h�x�2�?�֒������� J>"Rn�6��-��PB}���R=��P;l�����Kq6��z1�-԰�؃[�+�1�*�d_&:r�H���>��$����u�VoU4��d�iz��!
+�t�&���m����@ɨ
++�V�3�y�jx����VX!i_s��N��8�r�x�`c1*�;��q�z�z�d�a��Z��Ƒ��$�j�x`^<R<,�_to��&Fd�r�1�q5����
�#4�,����?��DY;���U.9?�iF����#8�V��t��ZhU!N����D�
+�b��c
�* �������q��^�/�f�K�1�
+%����"秱�����DU���S�����Pb���0��S@���s��r'qL^w%=ʆ�
+��x�m�:�N{�/l#�U�����M@b��؟&1�T��x.�	��e��Aw�k�מΊ�P�)������H 8��*����XU�t���K~J0�+tQ&'v|���єr�6
|uN��SH&��Ф�\��=��.|�va��j&����FXUoo���7SJ�X0B�Mְ��l����mF�} 	q�p�,��QG�f����F�KX8}"�+d��?����T�|%��"�ij��F%Rdz)LT�k��q��(������b
�W�7�Pb�i�nH���"�S%Z�F@��9����ٲ�Iӳ>Ma��hs�ݶO����V�b՘�%l�EBK��L9-��\ �٬�O���S���N�v�R�sh���0��>tm�ز���}Dmqe˸?�m����ˬbّ���L	���#Hl�x“m�B�5����Ib��X}`�����ۜ�����ݵ�:7���
��<����3�'�/�9�
+��
���I�OvI*{ў�Z8������ �&�TǺo�-$�9K4S�:����C3�����,29�۰46b!j}泄z�(�l�~'��)<'
�W)(&T��B�/Ԟ!�;��~����2���4���A=I# w��=XNy��A��]��@/}p�a��=l���l��HRԬG���r��f�?nH �`�VM杞~@�8���x�cǘ��� o�;V�B4,�\�S{S�F������_�
8X�D��S)��Ef,iXu�l�ls��Si��?�����z�v#�!���
��I���݇�5w��v�<߬z�t�A�y�<s`�,�Iq ����l��N͍�
���m�p��qD`V$�jJ2?�k��_�U�{���N���
nԹ�|�Q�W���&���a1]��"abjq�$�B���(6�@�{S��+���E[�&� v%Qz[7*��BeH� \�w	!�g����w�ʱ��D]TW�4�p���N����I��Bl79}��^C���$J=�j����X$�r(|�?W�e����˸Wzd�A��A��$�FA&REH}�7m��JR=I~We��I������,j�ɠah����Xϩ��פ��h�����	{��4DxqzɁ�phD��s)U�`%�Ei����4=k� �t~����Z��~�(E2d�s�G��7�j�QbL�<Dl���XؠP{
+!<D�.#.�膃BNg��4��CI���������L:s��x������1���l�	�y���9׾�y���(.O�j��R�V��)4��Rm�9�"��KΊ�8�i�����>�8/H\�����)\-э��Y�k�l#&Hgo"p&�<ېM6�5��]�3��W�%�O}��+�����P
+K�g�pi�An]5�[Zt�p�#6�����_��}��w���Y����WK��"^�yP���╋��m~=��&س��j �-�}�[�M��<�b��5M�A,4§�����W��[�cPX-���;�ŭ�:
+�N��7�����(�L�X~�τ��f���8����|~W�ҥ>W�(�4/�y��*��e��T':o�
+��VtQ7�]�H���q�<j�/}�6���7B5p(K�hb3fo�ALg4���ΘB0&>CV��O�d<��}���f����u�aU�--�����7���?��˹��>�!y�<��C��Z}����1R�ȴ�hM+��(O@�����Y���M��9Dy7RN��艄~��p
�Ү��(�46�}}
�$X�	Ҳu�@�
Q���"67(_5Lz�^��~0�e�V��Y�~�)����p~�ds`ս���i
̩�p��s�C�BMN��V�x��\��>
��	��^[�
+�v���渋���-�a�����*�ܶ��P
��"_5~sa����"�n%��H��i�d�WeH����ک�����<������w=��B;I\D��
2�*s�}�Y���aw���4äٓm� �9�)Z��ܝCJO�/ˁ\�j�K� ��\%
O��kk�"��P�YЉ*�χ�nYk�~w�Ħ8~"J�C��~�'�jX���^��2!���#����f�!�`��)��@ֈ����Pm�����gPzu�;uD�X��	��Iǚ�r]����m<�V�盎浳��=���i+��9�.=	>S`�i�-+�ؿ�O0�Ӵ��T�r��6�r'q6��5V�Y�'���$�Y}��DA�T�]��Y`��$���Q����]��>
���O���a!�M*U$t&xL��
+�ִ��	��Ʉ�� έުG���Ow��g)+�|I`���f�N�cH�2t�ߕr���5�㗂��Ӷ��W��e�u��!
+�R�-V��א�� �{����#���ݡ�J�g|�f��}��N]<�Lq[-�},|4�h�]���MGO���rmm�?�P}I�
@�b��ohW5���T��LDؘܲ.�{�z����~�J��K�%�oe;I�	у�٤
aUc	�
+�ȳ�݄@
qg�΋������h�} �3Y�Ӆ�X7��w*�D�Ș�N�����K��D,�B���rE<�v]����
+��_r��ռg_��p��LHx�m�~���`�C�M�z�L�*ja��SF�������I��Õ.��e�g&�bY��`c{47��Pn��3�}���a7����{�k	
+�Pم�rk-r|+At
+���>e�U���Y6�/�ɘx�2�6@�I��Vi&�A>mRG�.؞ڥr	6��=�ҌT���:��扗��*�sP<�>St0���P��%w�gQ��H����H�F�Q�����7I/�9O��rh��a��yL/�R�Ɉ{VJi�h�b���
��f߲8�vyP��VW��^C�n�u�I�d&����ʩ0,��TY1〚����?w@[lP�-�]уY���?��E0;�t}}�L����-$�u>�n����o.x�Cj���	4dn"ͮ�������賗�P�xs�Z*��O	"Wz��c����`Gn�ϳݽ�P���o��ￏ�I
@�FУ��%wq?�5�^P��֪heQ�{�s���a��:6gձd����e�F�5�Q������$��H��?��늬�2�V���i2N�
X�1��.����#�qLH�f�����nN�[=!��
+�b��~�uH��L��}�"��d��B՘Z�E��t��Jd�0E�LO�:QpC�?��`�RQ��Ʒ�}*��P��yhb�X�	=���i�mc%����� u,�':�
+SJ���H4}"���Th‘�^ޤ��t[\
�$�Ɂ�(��N�tE��T*VLl��;Br��o�Ꙛ�Bq������D0�OF!򏸅n���M~;c�u#q�� I�O��L*PJz��07l>�+h�O	
+���v�Uoݕ��:����3Ǚ����
�%�E�u:��
S��a
+���5��
zY�O�3��p����t�z�J��*�N�)n� U�7�vF�ʋ3�y�-�۫��J��l�%��R��:��j���h3�Yt	$��D���/�E�����#�K҃uCKdm���.�h����b����
_
oJL\��]���o�g��Z�-�>b�v�P���b����l��u���AKW�u���W�`��ڄ�G�:-}eI^7#�B�[��\�yh�`p	c���h@NI�g}H�QlƤQ�U�ZgכZI�@�PK�+3>�T5@uCB�����Z�n��|�B���Ӕg�Y���x�
~�=dBҐ`I�q�
+���sm,o�Lyu��9O5�|��ScS܊�7n�g��#�P��Pf��������)�41`QgQe|F��e'BN�e�1��c|7�� �_
��d���`�����ˡ�I	���lA�&(l͓Ѳ��n��P�]<��"�&6I�'2�������K>��>ʛn�$qdO ��v9�z���Je
+w�T�Nʆ��ݨ����`��:��b��6��;�d���y���X���d��J�|����o5T!�(���RB�h��V�����TQ[C�[ޙ�V>��h���֖�ˬ�S���f)�
���v�0�||��*�002�J�0c�w4��ݣ���|�J�"
>�v���������������?*�/`�SoO��l���r��Wڬ]v�bXR�����OC�;�ﵗ�w,ؑ����s�YO�]k�3zL��z�5���!�f�Pz"dS�CSu�F�d#���7��kQ*���.�K��ne���N�E��Xe�/.UO���J":|���Xk��q��EAJc�n��d}�r��Tb��c�K m���rjV����ӐDA���$�	I#˭�
+��$�>�M�|e$�E�,^��z���1�]X�
��o�G[�;�&gN��Ke$iSw珺:��ށ��
+r��s
s{w�Hj�ZI�����
��z�����ܸ_3�^�����~�{��C��Y�HE�	|���`	n7��������
��&��H���L��gHo���?�Qe��u�Z=�n�Q��
0��Oz�]c2AY�޴Pl�^��ll�Acv��:ePiLy6@ӛP^'Su����V�cr3K=H݆�4:j�����^�8�Rh[7J�G��z�7ƪ,{�0��4�xHK�x�%�r����r��T�xf}A+�ύ��O�i�P_v*�a׫xV*��@�V
���J��Ն���, �q
+�Y�Դ��a�(�����z�c������
+��t
�̵^�/���F`�{7��Ȼ�㓊��ކ����$�-����7�I�-�j����Ņqt�IE.� M0r�@=K��,Ue�~��7�3|���f���y�ڇ���R2.�G����B6��n��BG5��w��@s�<ѡ�gD��+��F��d��x���gPF���`)J'�ʢ�*��[�}]0�ca���e��+=�4�H�bݷ���}���{ ���(��pq�Ư4�!�w��Z��ń���r^���εd����`�΢�ïgJ `M��t��ˠ��yxIR�Qwb��8��q���:W%w�s3�m8uKA`aF؞�T���*�3GbR��u�G�z@���eD��>��v�J$�y��uT�[�Jtw6�^$�I�g!Y�U�!Zt�yMH�4��+4w
+�',��H+���T����80B;ɣRʸ��rb�1k�.w��K_��=C�
���ZvT(�X}�
Fv�C��GŬ;�'�ޚ�b���6C�␇1�:P#�헺i�bʹB2r�.�n���B��GM*���"�@p��/�{��@Y	�7]["V�%ou��8PL"��
 ��9�K��_
+��G'��ϱ}��
+M�^������Wa'����x)o��������	�ZkL7$�_��!GĶ$�M=��oQ��Aw1\k���lj&pe��&�`�]��ސ�Uc�D����r�@�{�ؒ�h���z�
�"�V�N�g��b��8kN����Oj�j[U7����Xw���d���P��P�j_�~?o����4��^R�a�C�^��B�{}q�+I�$�Y��Ү����8A*�*$�(��;�곒̺�^`G{(��5���L�ց���\t��)~��u��'������D��W�RM*d�p�2��u��sH�V�oℷ��t���q��l�&	[h� ��Le���cfj��āX�XV?�n�*G�:"����O��F#����6q��$\	C���{W���l�d&r�<C'*~$�0��9��Bs���u��#^�x*�a�n	u�]�nXٖ�3�p�ARg
.�q���`��x��9�^ߍ�*ʀ�xa��V�O����{��#p���^ml��MC��SͳC��
+����bj}��[�V��?��h�)��O���g�N��q�V3]0�����,B$W _wu�q�) r)}��mi�uW���񥴊G�7]��2�S�J�)D����-p9&��v�KQ�>֡�H�I&Bh��J0Oy��6����Q�s&ƻ.�:��Ќ��'�h�b�zc.x�����Ģ{JQQ�+�a�%r��|�V��hĸw-�g&R�<w\)S�3���o���)`l�~U9D�^\���z����(˕�NApu�X*j��|d���E\�IX{s�_�c&�>f��1	d#r�v.�Ϡ�c��?��c
��blBD�I�@�4��с�?<`��eC8��V��@���\:��4puF�&1��)�?�z�M��C�"�^�����v�N~�Y^���i�A4�M����n�Sh�[�`���/[xS)"��[SfЍ��z3f�NW�4JS	��q�w��A��X��P�^;�3t����`����z�։��z�y�HF����d�tx'�(�w�4h�H�#�{m�֌�����<Y�z`/Q�]$��Um�j��> ������g_�>�����S�Tk��7-fO�`^��bw�,[��sA �5�[���I��@O_d���2�ȸ,_)�e� 

%�>���`5�(�Zc����O�IJ'{~O������`R	D4��
�J��D]�������C�rL����`,ge�-F��(K�Pz�	���O�k�X����<��G����>��3������0z3�m��y�Ⱦ��qTGvK��ƈ�1��0c�|�.��B2j��c<}��V�!������|��V
��>>�����j
+�y.~�N���mo��֒=��P�@-_��u�5s�������N��Zc%�o�E�
㑴����-
�e%�e�:�Fw(���$�8ڷU�K֜�Y�}#
��QUg��t9�h@"�-A<.2�
2���
]��'Jkv�QJ�����/��S��۪�r��h�˨�5���I�nv$,�j���}a���V�.#���UP��Q���:/.d��gq����x��~���9�1*�5�AT��a��
�N�wYaU4c�b#��S�D�G/����_�\�h��^L���ǝ҆�G�z��7-��l*�����m���#}��G�-��1{R[��Q�h�_?�^k�9�"i���8s	\m����Ƿ\�vW�O,�WU�U�\s�èN�R����}�:�L<�5�u��o�]@W�[lg%����'m��{Z�;7]�`6�RgjI�"&:��8�N攌/���D�/��_3g�W2o����=F<��L���k�̉Ik���}3Ie9��0�t�h��t�X�U���L����KAcH;a{���a9+j�E'�k�XuI��Y��*0��%{
�L��Ʊ7����ģtM
���x-t��#�#[$Ϝ�L2Oѩ?bB��=�+Qe�K`�NeN
W�B}�q`J�B�6
+��a�L�C�b�3��lDui̒���M ���ژ�9����h.d1/h����j)�U��7��1j)�e6j&m�ت)�K�[r�#b8˜=P�^��DZN�z�3�p�b+=m���S�È6��#�^��i��!\O@t
+-����j���ͳ���X�{ߖ�H��b�� �>D�}V�f��R�	�!$lX}5e�c�i�_��[k��m�ܳ�i$������q�
+�o��%��$�Xf^���$ �U���vp��t9�y�7�2`aR�
EI5S�pKt��RiO��}pp�*�(~.����+D�u��)q>j�7�$saS�\r%���
+���瀝�ֿ��,
D8q��H���x��վ���tL>�.$�DHJ�OZ�i�
�+��w�^e��cr���h;�"�)
���͖��Q�Rf	��:
��h�.�f�~�Xz4��b~IY���
�v�o�'#�k�"��Ȱ�2�a���o�E>ИU^he��Y��s���q+4~=Lh��C2B"�B���@	����܅�7H���*�aԹ��Rr׎6�B��S+d�_��M���8w:�ڢ�a��F^��/C$q׌��e�_�7+��^1N�2��'>���0�I�z�=� bq|�
�\]���W�j-S\��U���
+X�L���Ǒn�=5����� �[��0S*�.��+�͆8�W�W]q���aό�q�0�������[�iÏX�����e�Y�F٢�f|l�x��v�zy��縆����X��o��$*�菓�[��qb����np���l}����PR���]�2����h���q���R��aqdw���J�t[�j[R�e7bJ�Z�[�4z��=%ě#�rC���v�l?���#1�dd|�(��g��x�_��vXF�VۻH`�	���$b��;�+g�̡���e��g���1�x6��'#F,�k���O�Jo��_j�eO)oO�cʻ��g�?����n�a��L͌|O`R�
+HJr7]Z�)���%:�y.Mn$���w@�5@�YT@� ce ��H6��<K�A�?�4h�A�V���d/�U��h0'�kPS�)%'�� v��ڧh����6�Y�Іgo��%�u�����9����ȺN�b���\�(�e��w�BUd�,�H��r��w�����m%-�Uu"��ي�3��T����e��p٨<�`���4����Y��_P�ߠ�D �+����	;��V��i��lR�$1ȁt�	Z7���{HA�zE�����5o�%�-#�&�ŕ6p��~4Lg͞�G�ҹ�1@U�z�&<��q7����5���m�Jܱ�Gt|K���{���ix���އ
K`V�d�X��v�yQuϐ03B&8n4�3�H�%}�)�ә2�|�<Jկ�`���IU#=ФK�
>ʯ��}��� �n��BI'�����q�ݿE6Ī>��I�mf�-,��9�e@w���i��wb� *\�šVE'��8K���a���I������	?�(�O��n0-D�u�� �4Kc��g-\�C��4�"Iӎ�昄��S?�.�WBj��#i�[r�	\�|N��>a�y�ݬvj=�4�Qm��>%� ��ځ��8<5^/�
ߧj ��2��T8�����S�z�s���Q��dD���w�Z��Z�&~�����>�(>��$�MJG]GAy����l��GN��fJA]����4d����X.�g-,Rُ��#ԎQ�A�QQb�ۢP�=~Td��w�~6���a��D���[����ij�=�M����J��ܙ�8)���H~-���W���RI
+G�ǣY��o60�y�)�Ӆ��ny@5��2����㕺������mtkꪛ���Mh݄�u�&�2�cJ�M��w�����8�~Nh �(p�5wMpB�� m�xd������o��'q�a��(�&=uG7
����iDy=`�&.?ݜE�D�!sL��@Daw��hPNsi,��1���)��>^�m�Z++�+ ��s\ݼ�Bx�� B���'�WM@[��`�W�l(��f�o,�H��/6����C*<���o�7�Ng[΋8�aQ��I��D��(l̟�����T�d��Q֍k�I�m�LTu(@����j�rG\�
+�G�<���֫�SmQ^���Ώ�;�*lh�V��n��:���_�Ac�W�J=�����j[GZ�>Τp��[p��b�[
�]h輠��Tb�B�`&P���6���_�)�ﾳLPz��fa+�O�vy���GhX�q׌��Y-N�+xvq�H�"�!98uC�ƀR�[�b����m}ph!?��:
��5��
C�zhm�){��M�ݮ,��>�eX���#��!���0F#dnR�pv	[�q�!oZ	%n��tP�ݶ�C
ɠ��w�势ѝdso�%k8ӣ�[�ێ�
oѸ���!A��� F�݃���E�����X��rd�lp*�PD��Pq(?CZ(:n:����.�����o,�vL�p�@Z
�E-{�FɡXB�	d�ΝՈygs�����!s�����IGt����N�L����e�ƹl�����c�y��@�kξI�#��N�u�����}Q
ـN/�W�{�p
�B:��e
�)3�c1��03����BES��LfBp������u�߁w���|�����N5�+>7
M����i���������M�������0�e3��:S\�w����hcJW���	,yF�B���\�
ָI�Ձ3yԙ�w�:�����`~0�>�#������(�Nn\�(XP=>��
f���#+p�hK�Y��pԲT���n���s7��G�_
+�Ɍ�
V|J��jX[Ѵu\�7�Z��R��C��}�WH��a�� CJ
+�V��S�j-uJ'V/�5�u����̲����#~x֧�M�nF��wКDd��k�|�YM/\��:I8�ǵ� �S��qm0�ʈ�/�g��\���m}A
����L�n@L�
+�s�=���{�hbgH�!#�h���t�vೳ�xbO�
�~�Q�N��n�a�Xl�ǜ*V�To��.��:<C]@�
+����|tKMϛ&�K�����K��y�S�%���ܩ��v];�����Q�G�@g��f�8��A���k�A���heOr�)�A %m%=�eS�sC���{a���a7�G�����U�e6
��`�Um�q�wh��o���6��l{����Z	X�?��Z�x�Z?�&y6S��"x=�V�m�$���Z����P��P%<�d�4%6>b�ب�� 4RT!��B<�ҡ2+sq�	U���G�q}6\y�wzb."
l#��Ԑ�P���-s�'�]
+zЭ���^I�#P� D*e�3�:[~��Pm�t�6/J��[��N0�J��&U�ɼ�
��hn�����V�
+���4��`b‰f���8mo��f3�$���ӳ�&,���~�%ߣ��;M�<��ng�N�nBOmJ�����1x�����Z���s�b;�1eI�s�Ƕ��_���;��T��*+LU���N��WϤ�B�/�~d��Vx�Z3��+*S�l+��r���#���T0:��X�A-�r�����
���H�������+
9�
�E4rx!�n��Ȝt�Q�$G�j��じ0mo.�$j-���~� �1zJ��,(�5�8� �
֞B-G����E�@*P��F�
]:������B�`p0��E�v:��( C
	�62�A
N����V�:
i���si�vb�m���sZ�-uNX�D�A0qz��Z���)*�v�8�0:�P�iF�0� \:[*	iوȼ��+u��IA�
g���Ά��۶��(x�q Ύ2@�	���zQp���<T�2�: �%��P�Z�t��f3���ꤰﶌ���g�CQ(����j8JI�cP	���,}|n
����Q�s�@	1T}n��@U� �x0�{�		�n��1pZ6A�ں�+vM�C�t !��A��mDS����~0u�kx�	hJ!S��L�89�\D�f!���m	�}�Ph�O@uR#V�⁇�IH*(M`J><+�s��O��O��~|&.D�╈��ʄ2H�P��ͮ)`�oB����,��
��Ȝt���&�����r2H�P��A�8%y��XZ���P�R��%BR-
ol0D<Q�%!�Љ��&B#��D�	‚��QC)��<4.���k��T'� Xp�y
�H|:��)���˂i��)����
�ʁӔ��mv9���<a�6mVL�2q�e�R�g��ȓ�t�F@uR��$:��4������Z�:v���F�E@8eJ)�`�(�J��
+�R
+�uR��
+�eBR�T�&�H��Lx@T���l'�
�9y�m\d8V.�^F5F2/�D8�2
+��ン����˂"qp�8]n2"��f/.N�Ġ{��/
���Z�X::Ա|��bax�͢e
�%
�u, ��c���b9�6��X C��2�%���rH���c;
.�.m�8��k
:P����<�������8x�u�.�IH�B<�X0F����1"��
�0�y\&C$E����ES�/�K�^1ɁR" P��D�T)(ݱʰ$�@���������P��CO�Ц��
+д8$ࡱ��g��`eZ-K�0
m���B,�4h�F���A(�J[iI�ģ���8�$�N+A"�=*��1p@(q��K'qA!��¬2�5�Ă;���$Bx�N`1O�a���!��ax�4*� 6*-� ph��4TA�ACX�
+ղK�	���`(��%���>��}�͂�.0P�!�(�H����QRi��OH�
Q��@/�nyF��["L6��z0(K4��e,4&:K���D��Y���!�N#���AD:62|b`��Ept�Љ�Ym��,�4��I2*�(q:��Q�Y�ԋ#��`x��x(�x<2}hHe���C�LV
����z�d�dT��c���SG�
+�� �h4�m4[�D�D�"LY
+HuҕKW.%q0u$�I
j�V8�L|Z�Da'>�p�����P�S��@�(��)	�I�(�H��e
��!�@�A@H�)�)�i0�c�4��N�źm%8�v�������
+��	�@.�ɀCgb2��`l0|�qp��Ap�LJ6�IGRJCt�@T$�X
+8�xz)���j@B„�ð����`{�JyeP )�<���T"	�#eab)�6 �
-����a)8=Èv�ݶ)p�Ѩ�D��x
+�^��	��Ł��H��L��K��zA3*A}@p�	2
b���b[�� �����>�XC�?���%�c�`�7�P-�Rۨ��
+Xm�zh��J�i��2F�xpP0')��!�tbqba�-�D`� A�HM�& 8p#qE�L��Hm��my�|�-��ƒ�p� ���X��O�<�G����M I���z.
+�@�t'2/A`���X7��}b��=�N�O�"%T�J�L�E� �6��I���6i�c�2 �C���`#m6ӱ�8`l^
#���XV�A
�hZ��V�q
+�+a��@\�+�cɀ����F@��Y^%��E�x�,�,�e�qX���8\X6X&%��TF�Ua�aѵ,NJb�r�,&&(��es9lp8l�d8����M�2R$����Ŵl�6:.FV�06Z�QYd.^F���q���6���e�v;q���e��8ݦ�D���)�_/-#5�4�/`�zM�6'A#>���
j'�<��pm���xZeP`�r(��S2i��*�x�	P@���V���q��B-J����d���'$!����i��iYv'�8��݈�\��p�D|qg�\V���K'��|�͒�Pұt#!��ױ8t�c!�6KB�����*R�p,)%��%���Z;�0�B�x#���8h�`A �n�/8�p*h����=T��b��J̱�J:s@HЂ�U���!Ҳ傡a��F�M+����J�q�
tja#��^���@��(Cp�:�&܅��֥�W���$bP�B���C�=21��U2�(� �8.�ۀ8M�L|zc!L��8�:��aZ�L�����j�����jt��ݦ
+.��a�48#0�4:
��&:2	$�Kk���p�T�y#հ�0lb�q	�R�.�m�S��eb�f��K_�m��I��€���K��Ib�>��T��v0��P���w�Xh^
�L�E���w�6hZ�4��.}�PІfrHZ�k�p
D."���`�w���n�$$�&0���m&[�ݦ�`q�m���+Z�s%zÂS-m�h�j%��ԡ�rI�}����uq����PP:iX��",
+(��CH�6oDA�h�#��ց
_^'(趞xh=x�=§�܃w�tZ�e��G^Z�mo�`u�sZ]N� Cf���ݶA�F'��h�w��58�Nc��42
+�
Ÿ0 7
e��S������ipe�)�����T��!Sa궓���m��w��lA�a�̥�u�Ć)����9y�a�X�U,E��C����qQ��n�A�&8Z�$hFG椓�P�tj�& �I��A�X��1�04<�@��B��`r�ipg�P��@��8�0��:Ts�g{�
�=)��S4�gӲ��4��S���sZ���
O�6I�:)���@c4�-�2��$��$d�CmQ�k`%��<A5/�a�A��a����0��p���9�������4'��EkQ�.��0S`�k�pVB
n�8�*U�I%�m9+��6��Mgd�B
:9q��mL�� ,�BDpj�
�nKudN:W
�J.��ô�C���ҏ�a΁�3�
+HL�AXղ
+��(��\tx:D�m0��S�iŦ,8x��e
XH�衤c
)�:R�9�\&N0&/���&���E�O»�`�9����A� p
�4J�0�H;�"�2)eL�����8P��&I��Pl?С"�����a�n����Z��q�Z6'P��M���.Lbr��- hB� �v�1bzH�>�sk`i�H���I8�Jdj-�D�sK�J,���B��s� "0K����3Ac�2�RR���,�Ϭsj0z8(08����#E�Z&�	�Z ���+�@
x"
�x�E�"�������A��F��Zf�imG^Z�ٓm�`�F�`m�ċA-;-׽�s��R^��'-uN�rz��aZr�Ɩ�0mʴZ&78�e�
�Y��@Ӕh��
}��X�T�@�"2��c#E'Sl.��::ᬖ��`4C�j��mڈ����p�	-c��hY�M�4N
+�+5�
�K
+�J:�F����R�5H�N^�b�V��a!z�8K*���i�D��i�m���A�&0-%N��2c
+�V\z+i�^(��‘&�.c��Ti9��5�j����B����:(�:�$t�ϴ���,�(|k�R7��)e����}�?2�迼}�O�pJ�Oe��;�e�ϡwG����,�_+�9��s95Fo�o�W��Nm�
+�����<�F޷ϝJ��,{�]�<Kg�/��K��y������v�����WBu������[*��
+%�o��T�P�{�*�}�~��?��o���Q{�-ܟ/#��v����t�1Bo�>+�~?	}+r�T��7�������O��o:|�PU���>�U��Qn���m��߷����(��S6?��.����_��.��Y�Ź�rN���ˏS�Gߞ����3ʧѷ�{��(��o�(]�ٟt߬�˫��}�᳔��8����o*�oC_~?{�+���<v�e��;�W�|�����ϕ0��W��뛡�����IO��p}[�/[J)�Ku�����wJ��OJ����}�Vf�����S��˖�e�	!+�7%ϗ�+:kG�!|���|8a���|��������nmV�<#��{j�׳'�)O�,�[����Q;��RnK8�N�p���Q�{	9��2.������G�
+�N���S��n��0�ԧ�s��O��ᶳ�r\�&KW��í�w�.��]���6������^���Q�8Y��\����Ne�{�/ʏ����0�??|Q~LJ�';��_�%��⑵<�n�匿P���b��,gW"���n���%�����+N�֝>g|�-�Yg����9����2N����/�|;#��P�m��yB��?�T"�N����ۻc?��N}}��Yk������c��λ���άO��Oq�?�t�]��	7꺄O>ܬ%�e|��r�K�f�C	����(��Ն���W���T�>���}���k�v�rY_K^��R����ˆ��u>�p+r�T������_~��Nej7����$��|�T:.����rd8rO�=�����^�����o6où��Q!����q�����P�Y;6Ԇ�#���?–3jk��7���C�sua�d�Q{��E�NE�m���>�L^	g�|���=�f��3�ǝ3�Ӈ�N��~���իc��0�
+��� �@�e22�x�b%�є���D%!O��j�����\#%����:Y�D�Ay<!�U���xBV-���2�OUw�T�a���*!���W��>�]�HU4[R��Y	���J�BU��^ъoeʗK+T�QB��ͺ
h>����	-S�n��w�n�x�}(�Ҡ�w�R�D��9y�u\N���y�
����&�����5��������)A%�c�Eڂ��С��fS��9 ���U��hM��V*ID4�wk7DC$%�iBv�ũ	#̎7X�b�8� �X�)�7�j`��ʂ�ѰD�*�~>��%h�$`��BYp�	l�m-��5��f�JJ�58p�jX���e‰\�ݔ8�Ф�`MFJ��@�>�gd�00mlC胀C�4:�N�RJDyhCj�cA��p,��n02���xdN�m'�X�۴�{��4n��ьY���i���>V'0
�U\/������>V'��*fRR���X�>��k$d���tP��$::�6��;:�ّ���˵��-�g2��S�*�q>JBJB<JLF\� �RY	\�Ƙ�T�Gog�� �y*�W���$WG	��d�*�t�L�\�W��Sqmf�� ��g$���{e>|�9�C�N�K��p[�������u������>������v�3�J9߶�T��J�3����0F9�|v��2�U�o�B����B���;}Y���](+�R��������V��ﲜ3J�VU�tge)}��Dy�T����t~w�ԏދ�F���gt��p�͇��F�ޅ:���_����<�5���+Y���nT�_ko�dg�ۛ��9��no��?.;��p��w�hFU)ҩ-W6�NE���'��~G�q�J{�ϻYK�d)U*�{�r�s��%�~�����������
+��_�(�7�����ON�^��-;��_�sc���Y�Gne���r�Ʒ��oƙ����g��;=����;������2���w֍�+���);s��U~����dv����3�����??#�@8���pN��>�[�%��
+g���~k3��;�eF��QN?�v*��[�+��Ѻd������ӣ�F��򡫌�b��u7.�����Q�����}v�|٩��0�����t���P��?#����_�%Ϗ�}���Ij�?kyd����Ỿ��g(��D�K�3F��?C�\F����H�*TVVVVV������V��������P�B�
+������uuuu������*T���P�B������ʺ���:�ό����Y��d9��)'s�q~�q�\�>קO����ϟ=�J�r�g֊s}B��'��	'	��������	'ϝ;3��Sƕ�g�(~�Z��6F��+��>U�O��ιY������goT���{ٛ�~�w�gK�5�O�:F�;w��[؛�����^�����Y��ea�t��SN)�yro������]�k��g¹�����JGA���{3������2�>M�����_}��h�����I�;�m����l��;��5�9�l��3��l��W��_���_KW���u���>o���=�|<y3�
+l�s���(�7k�(s?���*��m���w�Ώ��l�.Gu_�
���}�y�1����"�)Ug������U�~�ܩH��ŗ
�}j�f�R������d9�����=�wݎ���|_��q��>'�~��	�����ɝ�Pw�η�+�ݡ����n�oo?��*{Yg|R�������Y��T}Sr��S�{d�J�8��'|m��I�r�a|���������Y�c}��T�O�Q����l�����?��,�>��ҙ��}ጾ���d�:J�}�u��0����;?YW�'��O���s\���ns�
��d2F���$�R�)"�0� P$	dr=�$��vF 462 0���"�(�aQCA�A��BV�L��h9+��
��,��ޛ��
��wE��6�[���ck]B�g�K��u=��Bj-�yR?(�$P����
r0>[Š�C�F��Qȃ���R���F�$i�{���tA��#�Z\!lh���~^�:�r*Łp��e�J��:��$��p	�3�����+Pn����c����X�~�D�Io�
�ܻ��F0��x-�$]m����Y1�=�i�Yl|�g~�1�6��
����y�u�,E�h��u���wAR9(�I�C�4���y&R�4���\`m�I�-ym擸��0t����!2[nb�̅��qxÍv;�vc�PN�2�,"�~�Q�:`����FRW�@����E��k���u���qH�53������aFL����xq��=8U\:z�0u�H'����}�n��,���H�l�ԿO�ٶ��	�z�"��fc�`���l6C�Hh�D�7'��8`�h�p*�'y_�3- �(��L��� �/�(�]�󠊦�i�I
�_"�;1`���l��G�|F�^��)y�H�F&
+I���A�u����f�ֽd�&IE��֬�P�����ͻl��i}\	��XQ�@,�'��m
Z�3��{��)�lF����,d�����L+:�Đ$�o�4Rv^!�i�d[
]�F�3�����6����p�eG������&qQdQ�����"�U�hr#н� �
+��������瑋�v���7r$�	z�$�ЭG��-%G�Q�
+�n3�+���K���L��gv�l�_Ih��{.��q}+<?CԢ�
�G�-U�4z#�4�[�C��4yU#�SH��KSi��1�e����k�9�0��Q3�f�u���m�G��d�ܥU{��Q�;*�h��_箁d0�ʠ��)ݽ�!z�P��i�� d�D\��g�dYY� �DtvW�9L���X�Xlfug�л�t��`d�g'���Ak�oa8�_k��P���X9j
v"��.1mM�M��@Ԛ�ׄ�"jM�2�kM��<7�rq��ӥ+.B���st��E"4�kjn��-��Jyz�?eHs�γ���d׀P:x
���K�0���:�^�9�G�m�-Dz
ۉ�����50Zɧ	}�5�63�����_ ���q���-��&�C6����� �0�AS�]S{�"���]����t����NlP\8�!j~���0E|���Q~���X�F�Г��c�{��&��œ7j���yW%�
+)>$���U͟j��!���"9ܴ�Ϊ\��-�$�%�Q{�I盯F�1��50�F��XV$2=-:�C./�/ܼ�흗�jMh�3m��[���;o�,|[KYd�#�#ϑ4뱶���2l��H�B�؈<����WQl��pW�F���K�����R�¡W�v�py�՞
+�H�]��?��"�Zt:@6��d����Fh���R��a��3����}QD�B��
�e�u 6�Ka<#�>̣�c 3�s�D�98�mȂؑ��?M�sė�z�W��ÊC��d5�K�@�g˗9r��h��&%�V��$���j��C(�(V����F���epN�4�j|Vڜ�AWic�!%��I�lc�^�F�Ɇ^?�_~�D�߷�I��Y��e!��&�Xē)��a,�'v�F<�\k�ޥ4#S�y�q���F�M�!DP�.|	0��qLɩ
��3�
������`N"y�0�Ն_|3�"Kk�i�AU.҇m���6�b�����'�]��3c���B�m���ج�._��]��Y�Z�5�v����~��=g'{U��$����\�	FP��$�c9��X�>�Ls����a!�e%IpA���g�Ѓ�!�/��S�W�p��&�F��D��6����m^��
��m��YV��a
�ۆY�Wj�݆�%H{�1�P/	܆�M棲�n#�m���d�D���ͭ2~���@�&�Wf�mԭ�"�f^)�:�2z��
�q��SB��p=�g�iN@0$`��{�M�[sP��F��F$�b�r�Ђ�MM��I����f�mq��L�mP����o�7�rF��Ϸ�$�2�l��ؤ���k�2�����H�ٰ@LY��2��
��B�X��}ΪcG�"����[@ɔ•u�7c�%Q�n�F�f�j�>��D���k�f舖b|�V��Air|�j��NM�d�{L�l�C*��o���+/C���8R-P�MK�+�Ef���F[!�z� xяG0aC��sm����/.�
+���٠��eM����h9y���5�C��x�u��&�2=�O���:_XX��r���:z��	��3�����@z(9#w��3� Xu�5-���O�i��@�:��b��%pX[���WlM
�v���س��g�uA��0��
+���1L���~���A��f	J�؛1�����a��ڠ�b�$����@�c�33�_
�
+[
+��%i��h�h3��F=*K~ƙȌZ!��i��Cs�nñ��Z�:�`����Q|M�ݒer����U2���?x�xȁE,���b{�;K$�r�t_1!ڝ���RTm��l���U����dI�UZ;qe�^�FJ{��}ȶ�C+*jv4�E��i
���[qa�ȉ��E��ZaM�/���;
+p>J��k4
p��wiH5`؁�d1۔�j�B�7��A�c ��G��Y+���0Hw�(�y�h�HS��R�e�&e1؂��6X�'I���C�a,��Jw�*ǟ��s5U��RC�q���)>�pF�DP�B��B�4�K]O���VG�V��;�S
+��J`�Y2��	�F�
+�4K�=�P߲��9~غ�����^�\Z_J.�k1 o�D��㉬�v�b;cA
e|\�	�r�v�(�/v�N$�M^n�eJHIC�d�:�p#�M������#�d��ʺx��%�RH���ǜ5�[��a�H�X|�[�sb)g �T���9��b1����g�!��I?!pK��W�MA
+f�e>:�4�n��}HGOh���d�,�0'u�rA�(�7y�8d�&B��s�wb�<�j
��A#kM@�0!{N�t�x�i��`�'!L�),P��U��h�'T���<j�蘚%���:�iR#�B�{
A���]���R3)���o�lR
+�Z�v�Qp>�uK1�ZF�
V��""��%��;HOM+�q���,���K6X��$�d&��·�UL�q(��A���HD��H�l�T& �o5�[I�3R>k7���5�	�:/����h��n��MQϯd
$��鲁ɝ4-\�O�&��`���ۚ�3l�)D�Ʊ��*��M0\J�\+W\�X�3N�Tb��ы��ڑ6߹���F���)�'$����o�xh��j�n%�p�f�����'�m��d����N:�3qeƊn6#z"ψ��#.��
����m�m'�r��y,�lL{�5���m?���C.ݱ�l���H���k̷�f�IKD6�����kc��D-dN�;�y���ss�T��\��s��@8��BC�P�ʬ���l�d��	E9�UK�=7j1���9ٞ�bs��F@9"
<M�'��+�ASW�q�T垱Q]m��>f��[y��a�z7gTY�ζ�X�5�.�H���p�p�w�k��51n�i�m|�?��
�O>l��ֳ��n���y-��c4��C$�b��Vkg+x��G7tQ�
+��p`�ޖ�^�~����������gf�t�чX+f�hcֳ���
+��� st�u��@����&u'����\��������v�����SA֌ަ4�o
3;�4�
҉��wA�K�.�(vS(^L�ђ�Ӯ������>���ez��:zE"Or��g�ވj�k!/�=Y���@l�٢�w2�H��8�Q��TZ�ں13�뾔E�<2����C������wh����%�MWߊ��u��?�o@;���DF�d��7m�^Q\��`{�B)p�,,�VG��.�5��-$�0,����nK"2�r�E�8)�|��2�b�|X���� ���ϗ�@��/�K83~�h���ƾ]<�х3��L2�;��Ct����e
��&DdbG�;ځya|��p�N��RQ��f$⒉Ԛ|�P$,�PF����衜�DI�Gd+/�x�	5T����I��5*(=�'ҕ�RC#z�h�$^^gb��	�[Se����D*Ye/���kc��Z]5���v�Z(���6;b�u�X�0�/ȶl��L��g�eP.�XH����tQte]r	B���u_aSC�n���d`�&�fe��LЊꜺ�;m�a���<-�P`�lU�Xع���xdX'5���A�l��yf���KP���Y
+�	Шo�B#B�8P�}��p-o���Z��<�^
+�oը��,Nm@�/�Z��Ջ�#�z�c�=�N�Z�2_T����0�b�[�?.;��I�q��cyuy#��H�P�=M�@��hJ�i�Z��V��C–�A����>�E�Q�.�	��a�J�Y���`����]�U���/SSB�X�t3�M1�V��w��^px�������m��r���)5D�G��C7��8z�a�b:����?�?0���ZxM�c��n�sN�>.i�^@��q5���8�Z�5cjjqj���w����[��=R�?H(�%�f-�~r
܉�D�'��s��^� ���	����CAv���O�����9fT-�8���	+b[I�Lҭ2�.�m"��;�[l�#����TQ��^����J}a�h6�*�
+�l�X���h����ph`����oui�C�Ƨķ���W���/���>Y'g�Ο�|Fh���G�x���x\��ߟ��[(�}:}
�C`N���Z�Cc~��H�󤛟?K�Bp���Љs	���_���B��gQ|I�2�
�u4H3��$w�J�`8�2&�L�4wKl�c��D�T�E�A8aW9�Q�� �*���V꠨�{VB�ʭ7��s��@�+c�!X���(5\!�e��.r!N���T�H��\�׬ͧK�H����o�\�G)�J]��*/do�"�g�3)N�C4��S83�M��|9թ�}ށE���wVA�ݕ���?�x1t:f����Vg�����\
+�X���#/avXSC%TL�B:�뤤<�9����v��˝�ȭ|�j�-b�t��
Axz)�ӫo��ڸ2	�@b�p	oN���>�mmi��wT1"�����*N�|}�K�20j	�G�X\\�Z��M�	RJPEx���A\�u6J\�L/d�@�5���rv'U�Q��Ҵ��'1�AP��)(�z�F�h8�A�:�w��;tg:�a����F���Lc�
n�s�f3W��K�?g��
����+�J$`��
�����9Y;�$6��b��'���#"�2���wV겇#}�N`�\S�K҉�t��m\%�ܖ��I��w��48V	%�K��2Z[ܿt̤I'#��K'��J�q[:pfg�&���@B�b�ё��L�k��K��K�Y_:z�
.K�a_:^��
&���I/����ҳ�mc����&�F`~;�㷦��c~��<���Ek����7���U��4�i�u�ʽ�����^ؖ��K�%7��a���&C.��R^�q����s��.��A3qg�\���3��6�����'~1>j_�P�OZT��n�~1�α�5��w�{L�Ɠ��w�aP���+2��0������oi���?�B����$.��z�����!Bv�6I`ɨ#ɋ �դ	F�G1�^�i
^���7VN�q���fR0������]1�j0o,��E�����������ʼn'7bf�,��S^2�+<����l���y˪
+�0ܦʝ��<4�Ț�Vv�i�?{�6/L����|�B��w\��ŝjA�X�G"�oG�����ﻻO;-�P*6�=J=�����Ms��W��)@����_���#0��)��S�!r0_UP0i\��آ�Ti���`9܁aq(G�f4B�i՘�ܳT;�����ڏm%4ڎ
+t���MFzz�]��
+k1�_|��`���j ����/<8��H����Y�
+�,V@�pkI4k
@�%��S�})����Ky$��4��Y��;�Yӏ�����}τAJ�q�P�6n�.[γA���Z�J΀4c<:-���o�A���u�~����Af���	L
�`.���
�Uwkc\�d�Ln�u�"85D@��_X�ÎthX��?s�w�m'�n+�3:V�&\s[a`�=ߢ���-�C�5��/d�e�,�α6��.9�5���SH�;E�]�y���Xi�B�2$�Tw�=4R'���h������4T��̐%�m�
;����>�ޕ�Ѡ	Sj@��@��ެu�Tknݢu�D�K�&�uT(d¹Xb�Ѽ�l�V��)1�Y���a��(�����Iy{~�M۲t��+��ه�B��醔=�*%�&x{�!�[��Ur�C�&tl��&=(��lg��"C��ɯ�3mCu�A)_7`;�/��yٱ��hN�=�T�>�a��h)˓�p`��l���D^���Ю;�CpqW��$B��sG�A���q����4����g�>e� �x>s��t�	��$�?���W��2�O�N�ɕ��uI��zi�����(ׂ�OB5
�5[C�~1 ��؏���B�'��8�U"@��Ì	MAh@��S��)�����笞�HFkt��I��iLߏ��kA}je<�D�L#����j�Nڱ�R�@��qT):<
S�\���b����)N���ME+���G��l���:f9*����Oﯛ����pF��_���ެۦ���㤉�~�܌Pj��p�;�幻��p�	�������BW
��#
0����Oqֻ�vҪ&��ɉ�u�V#y4+��&��Wn�֧����V�餕{_�C;ߓt\�φC����>��8ۛ� ����V��NN�L]vݾ<��y*�O�2��ֱ:��\���F�������{G��)�}YnE-�\U��	f�w����8wG���v�41:�4��m����L�zY��" xRW{t.���Y�g�6`8h	�|B���ӕ
�y��{v5���{z�G�S��4�8��
��n{��.�Q�&��c�zF����z2n���M>��0ףdy�>���7נ:yr\N��U�j;�h�Q��(v8(r)�sB��i;���ϗ�7;�[���F�5�ˉk?P�U~/�X%`�j��N�s�\�����Iu[��a�L	^h*����@����|���[�
�u�o/�
+��?"	������x��� ъ)1��0כ���K��pP�cd����XP�Z@�
���������_[��ޠU˧Jv��5�_`E�>xDhPץ���Y� ��k��\��LG[G�*z��yE����J���Օ/؊P�P��8E pm@�#��<�*��e�@����O\���OOy��4�l��{��3�G���`W��������f�O��XF��	��[�9Y<�Á���^�x*{��\skt�	F�=���PZ��
�
�{����!�8[e�Vkk�A����a˪���?��G���o����Ck$��o�M�d����+��Wä��P�_1��qi�Vu�q�w��`S�S����3M!L[���R�EJ��_�S����xcr���,�:��L��qXM�DŽ�r�/��[��^aգd�)	��-�h�=���.:̲y�d S��:F)�7��}�i�R���9�c!eS�<ղd���T|��XEE̺I�s�T+�[���m<		�@\�B��H>�����Ɏ\�$)�V�YI9?"��4&
Ĕ�u�ŠϪ֍�*���{1i�����e�ӵ��FL*���{�����FG�9�,�E�wK
nT+@�q�Q$���sR d1V����#?���w�"M_m�,p\Z�%��x��MkBQ�W	���	�HU������k�!һ���
3��Ir
+�?�^�G�9�j������׸�$���PB܏�a����Kj/�r)j tmf���"߆��pϓ3�#��R�3)ɚf�W`��t�$0z���D�b0V�g�ϼ��M��(�䗣���jt���
+2�>-�u��@L�e�"�8ɘ��L���;j���K���Y���"�l��q?"���ݮ�Y�;��q<�U!�ȃYtoF[�@ﾀ�.��V΃ޥ)/t�������U9ԥ�y��4e5��嘲�@F4+����v���@�Q�r�G�1�:
���^�5X��nF�c���+�O8���l�23Ӑ����y͐rD�	�a֞*_c�]Y�����X�������
+���9�"+r�j+]�c��k
��쬚<Y7���
���h)�['�Y/
l�j��'�%O��{Z�s�u�y��Ҳs��V;Ɱ8C��%�})�`r�E���Z�& ;�KT�9X]g�A���֨3��z�h3�K��bT��um��_ՠ�62e�����%�r%i6(-���هP+�\b7�'@��/A��ޤ�a���
�?N.N~vK�"&q�^B!?�gh�!���Jm����Y87���"vP�k��cMڔ�AXe�o=�g�[2z���^�}w�㳰�A5�?̙��꯮�qC��C~��W��8���!a2kw��UHVbf|��{d�����#��TA.�+���
IS�b�ǭ���4<���$�&L�v
+2l�!��.�d��}e���r�	�gjn��-/��/7���Uz�7�&�u��u�V��_��?~6���ƛ�8�2|�9c�ˡ9�b-���W�N�����a5  a;tv��>$
e��DQ���F�y�(6I2N�b2����P�GƉ������^H*��M��ܧ��w����ӿ-��EL��v51/I��	�q_~�+�R�O����8l0�ʨ
+��%��O���Y�%v�����-.�{�%��7��
+�G���r_0����N5�"�W�m�0|���F5-f�&�3��䢏!��E�)������v5x�`
+^O��~A�H`�xvPBs��(�] �������[Ԍ�#nB�bю�}zU���P�ϊ�a�f
+�ۓ��@�2�k �:>�]��U����*��I�D���K5s`ʫ���b���tԘ;ls| W[u�&~]�^��$�������U$�Z\�~[o'İV<o<{�����8/�ZZ�h-X#f9#�|�K=bɣ%P��K����x�\f���z�5l�{A�ZܚXu�;�'L���
+���q�^��9C�	�3M��0�ƌW	�ט����cj^����L�?F�n#,g);���9\@@K�`	컘�J��A�Q�QP�)=�֠�'�j����eҹ͐�B�,�A����Y�p ie.��Gߵ���5�%ـ�Eя�ˡ��zQ_Ou�C�A�iU@�?sh�*�"A�o���R�G��[s&�^e5M`��5�'�3�oK�����b��r���;�������x!k�,l	�rM^ll�ث��d
+�@;E�I:;��	�m%6����J���rU�!�������?}�_����ڛ��,�c�u�:����P�2dC6��pf=Ձ	C%w��mY�B���Ă8v���yX����{����:.ݪL|-_���fe��$��{�Zw@��
qN�#��p(>�2l����v
+�ܷ�Ј���5�q��~SQ0&�jd�/�:I�"����;-nW�r���C��M�xS��Y��#����u����$g�{�3��D�UT��~������l#Y�f�����C\�r�F%��+0��|	o���n[r�Gt����I{�ܼJ���v@����T��7�p
��R�b%]�:��1����/]�N��Y�?�
P��<��!
�����t��wX���1�z߁zo_������W�r��5qp��x��I�n��>�/>���EUr�K��1U�����g��S��)`J�I\�d��F�=�?4�P|�*�"l�ErL���L1o"K�u��"� do�ڢ�������ʧ�gO��'��@���",K��+o7��^�`�Э��u⮲�!br���_7�tcK�!�n�s_���.�M�Da'�TΧF�$|��ؒ��KWt��%ٖ��k—����C�3.�a �i
+��G��-o]��<��V�C鮀��{�frE�֗�*�P/ɓ�Qףnj�uc"9��`7�JxF+U��K�<�D|O~C�O�y�EA7�zj߳O+�����(�f���"��H��w��t�nᏞ��H��~�1�\�<E���#��/1p�	l3$��9�n3��l	��(-Fٔ���5�����9|�|���斺�;f暠�xUf�Z�#�1?��"�	��V�̴
���W��R��b�X���#D_�
�h�k���#�
�'_��!��]���~�g��z�6���a�Z<O�"l ?i�s�8���r0�m#�����j�hB��Ƅm�����x����-����'�i��5󍬼��
+��z� �����j�"ה���x.D]B�2}VQN��Ct������0���[+{��y�]A�f�7>YJ�h�۳}L'�m��67�"�:�uhh�g����6hϬy��Ii�0%WP��,g��:�S�%Xn�$���[j|#aY#����,-M��ד9��G1�,Z�x�
?@�XvL.��������
endstream
endobj
50 0 obj
[/ICCBased 55 0 R]
endobj
42 0 obj
<</Filter/FlateDecode/Length 1469>>stream
+H�|W�n7��W���}�Z�s���u9���@ޫ*v�!0<��&ky��/<�˗��>||p���kp�|��1w��:�{���.��������.�_t��s..��K��]�7�z�b�}���[O�ƅ	��B�>LJ�my�6���^�/qr��9��!h]���-��GwG�O=���0`6�u!����y�Zxo�V?m�l��O�^��������/�㎰�O
�'�9{i'a zDX������"�,x�dwݒ�i���Q�4	AH���D���P]�=>�>��%��[D���Q��NE�'�Kb�~P��۴_

%����|�����\�F'k��}Draa;.!ty���%�HH����%l�:��������l�G�j�B����T��S�����q��E���p��4g52
\7%ڠF��it�9ӧ!]�H�;5�	�u/^�\��@IE���ŢAe�)�A±Oä�2r�#%z�O�|��R簅I�����0�I�����#
u��d����0+��kP��,��f2<��		uwH�Yf�R@��2�6-;����<uh����^����'d �、ūAPY!EO��k2IO��qg��ߴ<z��"
+��UGv0��PM/w&'�)	;��)[uZ,���G8�@V��H���uTvJ�p.��e�e�a��9e9d[�t�,�P[��fcr�#}
k�Q
��Խj7>�n�.VN"��tt]:U�t�#���~bRԶ8���ND��873[c916��jB�6��sȬ
+�g��6�D�t��1�6����4��ֈ�*�(� �j�U�⚲�M�D(C�*~^��V��%ʰV�:���=�LE62͙^eD�#耒	��K_t���>�w�$l[;���O�� 1S*���u���Ĺ�e�q@�N��G����	l��Q��9XOfK�BB��2g��6Z��4�<n��CU(��LE��N�Z�(l��CH(�o���
�����m��&Z>�CS���tdO"��6
+�
(��!n?�W�
A�$"W�a�\�b<���V�R�(a��TDi��r]�,&)��'�2bu�, c�x|H�0�)��^�kI*P�L�\$^�Q�]�o�gf�UM@��Uo8���w�5mX���2W�a�,ם	�&��A�ɛ���ECϠM���G.X��&�=In`S��)+7�. �:�F$��Y�Л\H����9gy��'阼�جюJ�*-[�i)�*�Y��qaouo�I[$���8>fW����Z�
�pJT�D�H['_��^�D��+�Zۡ%gղ�0|�ޮ@�G�����2�-�^z(9��
�oVn�V����6%��e����v��^.���߷��o1�?���w�H���~|4��d|��._��{yr�������-�:��:���/��������w��]�w�����q�O�
���
endstream
endobj
43 0 obj
<</CS 63 0 R/I false/K false/S/Transparency>>
endobj
44 0 obj
<</BBox[149.007 265.508 198.126 233.5]/Group 64 0 R/Length 264/Matrix[1.0 0.0 0.0 1.0 0.0 0.0]/Resources<</ColorSpace<</CS0 31 0 R>>/ExtGState<</GS0 32 0 R>>>>/Subtype/Form>>stream
+/CS0 cs 0 0 0  scn
+/GS0 gs
+q 1 0 0 1 182.1226 265.5083 cm
+0 0 m
+-29.317 0 l
+-31.743 -4.637 -33.115 -9.913 -33.115 -15.508 c
+-33.115 -21.507 -31.539 -27.138 -28.777 -32.008 c
+0 -32.008 l
+8.838 -32.008 16.004 -24.843 16.004 -16.004 c
+16.004 -7.166 8.838 0 0 0 c
+f
+Q
+
endstream
endobj
45 0 obj
<</BBox[151.007 283.5 218.008 216.5]/Group 65 0 R/Length 278/Matrix[1.0 0.0 0.0 1.0 0.0 0.0]/Resources<</ColorSpace<</CS0 31 0 R>>/ExtGState<</GS0 32 0 R>>/Shading<</Sh0 53 0 R>>>>/Subtype/Form>>stream
+q
+184.508 283.5 m
+166.006 283.5 151.007 268.502 151.007 250 c
+151.007 231.498 166.006 216.5 184.508 216.5 c
+203.01 216.5 218.008 231.498 218.008 250 c
+218.008 268.502 203.01 283.5 184.508 283.5 c
+W n
+q
+0 g
+/GS0 gs
+67.0007935 0 0 -67.0007935 151.0074615 250 cm
+BX /Sh0 sh EX Q
+Q
+
endstream
endobj
65 0 obj
<</I false/K false/S/Transparency/Type/Group>>
endobj
64 0 obj
<</I false/K false/S/Transparency/Type/Group>>
endobj
63 0 obj
[/ICCBased 55 0 R]
endobj
38 0 obj
<</Filter/FlateDecode/Length 243>>stream
+H�\��j�0����Y���q�^�I����$�UjEq���|�hԼ��Z���E��x�d5*�X�@��R%���xT�yj��q��d\�Hb����cuG��9��aMF���.��;���]BN�p����aM�y�������Fj��{X�����o�zd<�@������,t�&D7NJj\���lO��ۀ�v���ss_�_O'�;1~�5/����|��2��!��=j5
endstream
endobj
39 0 obj
<</CS 66 0 R/I false/K false/S/Transparency>>
endobj
40 0 obj
<</BBox[227.202 282.23 329.709 215.433]/Group 67 0 R/Length 268/Matrix[1.0 0.0 0.0 1.0 0.0 0.0]/Resources<</ColorSpace<</CS0 31 0 R>>/ExtGState<</GS0 32 0 R>>>>/Subtype/Form>>stream
+/CS0 cs 0 0 0  scn
+/GS0 gs
+q 1 0 0 1 296.3101 282.2305 cm
+0 0 m
+-61.182 0 l
+-66.245 -9.677 -69.108 -20.687 -69.108 -32.364 c
+-69.108 -44.883 -65.818 -56.634 -60.055 -66.798 c
+0 -66.798 l
+18.445 -66.798 33.398 -51.845 33.398 -33.398 c
+33.398 -14.953 18.445 0 0 0 c
+f
+Q
+
endstream
endobj
41 0 obj
<</BBox[231.376 319.779 371.201 179.954]/Group 68 0 R/Length 310/Matrix[1.0 0.0 0.0 1.0 0.0 0.0]/Resources<</ColorSpace<</CS0 31 0 R>>/ExtGState<</GS0 32 0 R>>/Shading<</Sh0 53 0 R>>>>/Subtype/Form>>stream
+q
+301.288 319.778 m
+262.677 319.778 231.375 288.478 231.375 249.866 c
+231.375 211.255 262.677 179.954 301.288 179.954 c
+339.9 179.954 371.201 211.255 371.201 249.866 c
+371.201 288.478 339.899 319.778 301.288 319.778 c
+W n
+q
+0 g
+/GS0 gs
+139.8249359 0 0 -139.8249359 231.3756104 249.8662109 cm
+BX /Sh0 sh EX Q
+Q
+
endstream
endobj
68 0 obj
<</I false/K false/S/Transparency/Type/Group>>
endobj
67 0 obj
<</I false/K false/S/Transparency/Type/Group>>
endobj
66 0 obj
[/ICCBased 55 0 R]
endobj
29 0 obj
<</Filter/FlateDecode/Length 272>>stream
+H�\��j�0��z
+�@m��sm���2J�ݬ�!����0�8�	&&�	K��Y���O=���#��B�g$E���6�n|�8�;�WI�@H�i�������wM2������M�D��KM�*qxƮS�[̰%cC��ɴĒ��a��^���Q�[2��ܩ%��Ts�X����k��92l�ؐu�Jʍk��H����d�
>�.���`����XL��k�"K$��G!:g���+��@8x��Ώj�}��᳋�̋�o�e"<��3��ir��'y:g�`6w
endstream
endobj
30 0 obj
<</CS 69 0 R/I false/K false/S/Transparency>>
endobj
36 0 obj
<</BBox[226.451 282.474 328.958 215.677]/Group 70 0 R/Length 268/Matrix[1.0 0.0 0.0 1.0 0.0 0.0]/Resources<</ColorSpace<</CS0 31 0 R>>/ExtGState<</GS0 32 0 R>>>>/Subtype/Form>>stream
+/CS0 cs 0 0 0  scn
+/GS0 gs
+q 1 0 0 1 295.5586 282.4746 cm
+0 0 m
+-61.182 0 l
+-66.244 -9.677 -69.107 -20.687 -69.107 -32.364 c
+-69.107 -44.884 -65.817 -56.634 -60.054 -66.798 c
+0 -66.798 l
+18.446 -66.798 33.399 -51.845 33.399 -33.399 c
+33.399 -14.953 18.446 0 0 0 c
+f
+Q
+
endstream
endobj
37 0 obj
<</BBox[230.625 320.023 370.449 180.198]/Group 71 0 R/Length 310/Matrix[1.0 0.0 0.0 1.0 0.0 0.0]/Resources<</ColorSpace<</CS0 31 0 R>>/ExtGState<</GS0 32 0 R>>/Shading<</Sh0 53 0 R>>>>/Subtype/Form>>stream
+q
+300.537 320.022 m
+261.926 320.022 230.625 288.722 230.625 250.11 c
+230.625 211.498 261.926 180.197 300.537 180.197 c
+339.148 180.197 370.449 211.498 370.449 250.11 c
+370.449 288.722 339.148 320.022 300.537 320.022 c
+W n
+q
+0 g
+/GS0 gs
+139.8249359 0 0 -139.8249359 230.6245422 250.1100769 cm
+BX /Sh0 sh EX Q
+Q
+
endstream
endobj
71 0 obj
<</I false/K false/S/Transparency/Type/Group>>
endobj
70 0 obj
<</I false/K false/S/Transparency/Type/Group>>
endobj
69 0 obj
[/ICCBased 55 0 R]
endobj
27 0 obj
[26 0 R]
endobj
72 0 obj
<</CreationDate(D:20201202142327-08'00')/Creator(Adobe Illustrator 25.0 \(Macintosh\))/CreatorVersion(21.0.0)/ModDate(D:20201202142327-08'00')/Producer(Adobe PDF library 15.00)/Title(Move_Logo Design_GreyScale_Digital_Final)>>
endobj
xref
+0 73
+0000000004 65535 f
+0000000016 00000 n
+0000000147 00000 n
+0000048491 00000 n
+0000000000 00000 f
+0000048563 00000 n
+0000000000 00000 f
+0000000000 00000 f
+0000057378 00000 n
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000057451 00000 n
+0000057647 00000 n
+0000058841 00000 n
+0000124429 00000 n
+0000190017 00000 n
+0000000000 00000 f
+0000049021 00000 n
+0000049492 00000 n
+0000056945 00000 n
+0000234802 00000 n
+0000049959 00000 n
+0000233215 00000 n
+0000233556 00000 n
+0000053218 00000 n
+0000056263 00000 n
+0000057132 00000 n
+0000057255 00000 n
+0000056439 00000 n
+0000233618 00000 n
+0000234097 00000 n
+0000231658 00000 n
+0000231970 00000 n
+0000232032 00000 n
+0000232510 00000 n
+0000228915 00000 n
+0000230454 00000 n
+0000230516 00000 n
+0000230989 00000 n
+0000050418 00000 n
+0000051969 00000 n
+0000052031 00000 n
+0000052504 00000 n
+0000228880 00000 n
+0000056376 00000 n
+0000053012 00000 n
+0000053075 00000 n
+0000053253 00000 n
+0000053615 00000 n
+0000053371 00000 n
+0000053495 00000 n
+0000056582 00000 n
+0000056700 00000 n
+0000056820 00000 n
+0000057016 00000 n
+0000057047 00000 n
+0000231623 00000 n
+0000231560 00000 n
+0000231497 00000 n
+0000233180 00000 n
+0000233117 00000 n
+0000233054 00000 n
+0000234767 00000 n
+0000234704 00000 n
+0000234641 00000 n
+0000234827 00000 n
+trailer
<</Size 73/Root 1 0 R/Info 72 0 R/ID[<4C9886CA1C89423AA1AC0258837B9EB5><D2C57007A5D84D4A9A1CD043AE19406A>]>>
startxref
235070
%%EOF
\ No newline at end of file
diff --git a/assets/color/JPEG/Move_Logo_Design_Digital_Final_1.jpg b/assets/color/JPEG/Move_Logo_Design_Digital_Final_1.jpg
new file mode 100644
index 0000000000..ab082343e4
Binary files /dev/null and b/assets/color/JPEG/Move_Logo_Design_Digital_Final_1.jpg differ
diff --git a/assets/color/JPEG/Move_Logo_Design_Digital_Final_2.jpg b/assets/color/JPEG/Move_Logo_Design_Digital_Final_2.jpg
new file mode 100644
index 0000000000..45af675e28
Binary files /dev/null and b/assets/color/JPEG/Move_Logo_Design_Digital_Final_2.jpg differ
diff --git a/assets/color/JPEG/Move_Logo_Design_Digital_Final_3.jpg b/assets/color/JPEG/Move_Logo_Design_Digital_Final_3.jpg
new file mode 100644
index 0000000000..e589c47137
Binary files /dev/null and b/assets/color/JPEG/Move_Logo_Design_Digital_Final_3.jpg differ
diff --git a/assets/color/JPEG/Move_Logo_Design_Digital_Final_4.jpg b/assets/color/JPEG/Move_Logo_Design_Digital_Final_4.jpg
new file mode 100644
index 0000000000..a2f381ebf1
Binary files /dev/null and b/assets/color/JPEG/Move_Logo_Design_Digital_Final_4.jpg differ
diff --git a/assets/color/PNG/Move_Logo_Design_Digital_Final_-01.png b/assets/color/PNG/Move_Logo_Design_Digital_Final_-01.png
new file mode 100644
index 0000000000..9db4c577d6
Binary files /dev/null and b/assets/color/PNG/Move_Logo_Design_Digital_Final_-01.png differ
diff --git a/assets/color/PNG/Move_Logo_Design_Digital_Final_-02.png b/assets/color/PNG/Move_Logo_Design_Digital_Final_-02.png
new file mode 100644
index 0000000000..556ba15470
Binary files /dev/null and b/assets/color/PNG/Move_Logo_Design_Digital_Final_-02.png differ
diff --git a/assets/color/PNG/Move_Logo_Design_Digital_Final_-03.png b/assets/color/PNG/Move_Logo_Design_Digital_Final_-03.png
new file mode 100644
index 0000000000..b971de8d77
Binary files /dev/null and b/assets/color/PNG/Move_Logo_Design_Digital_Final_-03.png differ
diff --git a/assets/color/SVG/Move_Logo_Design_Digital_Final_-01.svg b/assets/color/SVG/Move_Logo_Design_Digital_Final_-01.svg
new file mode 100644
index 0000000000..2199e2839b
--- /dev/null
+++ b/assets/color/SVG/Move_Logo_Design_Digital_Final_-01.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 313 90" style="enable-background:new 0 0 313 90;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#092342;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{opacity:0.1;}
+	.st3{opacity:0.85;fill:url(#SVGID_2_);}
+	.st4{fill:#E9F0F5;}
+	.st5{fill:url(#SVGID_3_);}
+	.st6{opacity:0.85;fill:url(#SVGID_4_);}
+	.st7{fill:url(#SVGID_5_);}
+	.st8{opacity:0.85;fill:url(#SVGID_6_);}
+</style>
+<g>
+	<g>
+		<g>
+			<path class="st0" d="M154.45,20.2l11.79,34.67h0.14l11.16-34.67h15.61v50.42h-10.38V34.89h-0.14l-12.36,35.73h-8.54l-12.36-35.38
+				h-0.14v35.38h-10.38V20.2H154.45z"/>
+			<path class="st0" d="M197.81,44.46c0.89-2.38,2.16-4.4,3.81-6.07c1.65-1.67,3.62-2.97,5.93-3.88c2.31-0.92,4.9-1.38,7.77-1.38
+				c2.87,0,5.47,0.46,7.8,1.38c2.33,0.92,4.32,2.21,5.97,3.88c1.65,1.67,2.92,3.7,3.81,6.07c0.89,2.38,1.34,5.03,1.34,7.94
+				s-0.45,5.55-1.34,7.91c-0.89,2.35-2.17,4.37-3.81,6.04c-1.65,1.67-3.64,2.95-5.97,3.85c-2.33,0.89-4.93,1.34-7.8,1.34
+				c-2.87,0-5.46-0.45-7.77-1.34c-2.31-0.89-4.28-2.18-5.93-3.85c-1.65-1.67-2.92-3.68-3.81-6.04c-0.89-2.35-1.34-4.99-1.34-7.91
+				S196.91,46.83,197.81,44.46z M206.92,56.67c0.28,1.39,0.76,2.64,1.45,3.74c0.68,1.11,1.59,1.99,2.72,2.65
+				c1.13,0.66,2.54,0.99,4.24,0.99c1.69,0,3.12-0.33,4.27-0.99c1.15-0.66,2.07-1.54,2.75-2.65c0.68-1.11,1.17-2.35,1.45-3.74
+				c0.28-1.39,0.42-2.81,0.42-4.27c0-1.46-0.14-2.9-0.42-4.31c-0.28-1.41-0.77-2.66-1.45-3.74c-0.68-1.08-1.6-1.97-2.75-2.65
+				c-1.16-0.68-2.58-1.02-4.27-1.02c-1.69,0-3.11,0.34-4.24,1.02c-1.13,0.68-2.04,1.57-2.72,2.65c-0.68,1.08-1.17,2.33-1.45,3.74
+				c-0.28,1.41-0.42,2.85-0.42,4.31C206.49,53.86,206.64,55.28,206.92,56.67z"/>
+			<path class="st0" d="M245.54,70.62l-12.5-36.51h10.52l7.7,24.93h0.14l7.7-24.93h9.96L256.7,70.62H245.54z"/>
+			<path class="st0" d="M279.72,61.86c1.51,1.46,3.67,2.19,6.5,2.19c2.02,0,3.77-0.51,5.23-1.52c1.46-1.01,2.35-2.08,2.68-3.21h8.83
+				c-1.41,4.38-3.58,7.51-6.5,9.39c-2.92,1.88-6.45,2.82-10.59,2.82c-2.87,0-5.46-0.46-7.77-1.38c-2.31-0.92-4.26-2.22-5.86-3.92
+				c-1.6-1.69-2.84-3.72-3.71-6.07c-0.87-2.35-1.31-4.94-1.31-7.77c0-2.73,0.45-5.27,1.34-7.63c0.89-2.35,2.17-4.39,3.81-6.11
+				c1.65-1.72,3.61-3.07,5.9-4.06c2.28-0.99,4.81-1.48,7.59-1.48c3.11,0,5.81,0.6,8.12,1.8c2.31,1.2,4.2,2.81,5.68,4.84
+				c1.48,2.02,2.55,4.33,3.21,6.92c0.66,2.59,0.89,5.3,0.71,8.12h-26.34C277.39,58.05,278.21,60.4,279.72,61.86z M291.06,42.65
+				c-1.2-1.32-3.03-1.98-5.47-1.98c-1.6,0-2.93,0.27-3.99,0.81c-1.06,0.54-1.91,1.21-2.54,2.01c-0.64,0.8-1.08,1.65-1.34,2.54
+				c-0.26,0.89-0.41,1.69-0.46,2.4h16.31C293.09,45.9,292.26,43.97,291.06,42.65z"/>
+		</g>
+	</g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="7.7815" y1="46.1457" x2="103.8428" y2="46.1457">
+		<stop  offset="0.2383" style="stop-color:#113BD9"/>
+		<stop  offset="0.7404" style="stop-color:#1676EA"/>
+		<stop  offset="1" style="stop-color:#188FF1"/>
+	</linearGradient>
+	<path class="st1" d="M88.17,30.15H23.45c-8.66,0-15.67,7.02-15.67,15.67v0.66c0,8.66,7.02,15.67,15.67,15.67h64.72
+		c8.66,0,15.67-7.02,15.67-15.67v-0.66C103.84,37.16,96.83,30.15,88.17,30.15z"/>
+	<path class="st2" d="M87.84,30.14H58.52c-2.43,4.64-3.8,9.91-3.8,15.51c0,6,1.58,11.63,4.34,16.5l28.78,0c8.84,0,16-7.17,16-16v0
+		C103.84,37.3,96.68,30.14,87.84,30.14z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="56.724" y1="45.646" x2="123.7248" y2="45.646">
+		<stop  offset="0" style="stop-color:#23C6F5"/>
+		<stop  offset="0.4286" style="stop-color:#25CFF5"/>
+		<stop  offset="0.9956" style="stop-color:#28E3F5"/>
+	</linearGradient>
+	<circle class="st3" cx="90.22" cy="45.65" r="33.5"/>
+</g>
+</svg>
diff --git a/assets/color/SVG/Move_Logo_Design_Digital_Final_-02.svg b/assets/color/SVG/Move_Logo_Design_Digital_Final_-02.svg
new file mode 100644
index 0000000000..f9673d3801
--- /dev/null
+++ b/assets/color/SVG/Move_Logo_Design_Digital_Final_-02.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 313 90" style="enable-background:new 0 0 313 90;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#E9F0F5;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{opacity:0.1;}
+	.st3{opacity:0.85;fill:url(#SVGID_2_);}
+</style>
+<g>
+	<g>
+		<g>
+			<path class="st0" d="M154.45,20.2l11.79,34.67h0.14l11.16-34.67h15.61v50.42h-10.38V34.89h-0.14l-12.36,35.73h-8.54l-12.36-35.38
+				h-0.14v35.38h-10.38V20.2H154.45z"/>
+			<path class="st0" d="M197.81,44.46c0.89-2.38,2.16-4.4,3.81-6.07c1.65-1.67,3.62-2.97,5.93-3.88c2.31-0.92,4.9-1.38,7.77-1.38
+				c2.87,0,5.47,0.46,7.8,1.38c2.33,0.92,4.32,2.21,5.97,3.88c1.65,1.67,2.92,3.7,3.81,6.07c0.89,2.38,1.34,5.03,1.34,7.94
+				s-0.45,5.55-1.34,7.91c-0.89,2.35-2.17,4.37-3.81,6.04c-1.65,1.67-3.64,2.95-5.97,3.85c-2.33,0.89-4.93,1.34-7.8,1.34
+				c-2.87,0-5.46-0.45-7.77-1.34c-2.31-0.89-4.28-2.18-5.93-3.85c-1.65-1.67-2.92-3.68-3.81-6.04c-0.89-2.35-1.34-4.99-1.34-7.91
+				S196.91,46.83,197.81,44.46z M206.92,56.67c0.28,1.39,0.76,2.64,1.45,3.74c0.68,1.11,1.59,1.99,2.72,2.65
+				c1.13,0.66,2.54,0.99,4.24,0.99c1.69,0,3.12-0.33,4.27-0.99c1.15-0.66,2.07-1.54,2.75-2.65c0.68-1.11,1.17-2.35,1.45-3.74
+				c0.28-1.39,0.42-2.81,0.42-4.27c0-1.46-0.14-2.9-0.42-4.31c-0.28-1.41-0.77-2.66-1.45-3.74c-0.68-1.08-1.6-1.97-2.75-2.65
+				c-1.16-0.68-2.58-1.02-4.27-1.02c-1.69,0-3.11,0.34-4.24,1.02c-1.13,0.68-2.04,1.57-2.72,2.65c-0.68,1.08-1.17,2.33-1.45,3.74
+				c-0.28,1.41-0.42,2.85-0.42,4.31C206.49,53.86,206.64,55.28,206.92,56.67z"/>
+			<path class="st0" d="M245.54,70.62l-12.5-36.51h10.52l7.7,24.93h0.14l7.7-24.93h9.96L256.7,70.62H245.54z"/>
+			<path class="st0" d="M279.72,61.86c1.51,1.46,3.67,2.19,6.5,2.19c2.02,0,3.77-0.51,5.23-1.52c1.46-1.01,2.35-2.08,2.68-3.21h8.83
+				c-1.41,4.38-3.58,7.51-6.5,9.39c-2.92,1.88-6.45,2.82-10.59,2.82c-2.87,0-5.46-0.46-7.77-1.38c-2.31-0.92-4.26-2.22-5.86-3.92
+				c-1.6-1.69-2.84-3.72-3.71-6.07c-0.87-2.35-1.31-4.94-1.31-7.77c0-2.73,0.45-5.27,1.34-7.63c0.89-2.35,2.17-4.39,3.81-6.11
+				c1.65-1.72,3.61-3.07,5.9-4.06c2.28-0.99,4.81-1.48,7.59-1.48c3.11,0,5.81,0.6,8.12,1.8c2.31,1.2,4.2,2.81,5.68,4.84
+				c1.48,2.02,2.55,4.33,3.21,6.92c0.66,2.59,0.89,5.3,0.71,8.12h-26.34C277.39,58.05,278.21,60.4,279.72,61.86z M291.06,42.65
+				c-1.2-1.32-3.03-1.98-5.47-1.98c-1.6,0-2.93,0.27-3.99,0.81c-1.06,0.54-1.91,1.21-2.54,2.01c-0.64,0.8-1.08,1.65-1.34,2.54
+				c-0.26,0.89-0.41,1.69-0.46,2.4h16.31C293.09,45.9,292.26,43.97,291.06,42.65z"/>
+		</g>
+	</g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="7.7815" y1="46.1457" x2="103.8428" y2="46.1457">
+		<stop  offset="0.2383" style="stop-color:#113BD9"/>
+		<stop  offset="0.7404" style="stop-color:#1676EA"/>
+		<stop  offset="1" style="stop-color:#188FF1"/>
+	</linearGradient>
+	<path class="st1" d="M88.17,30.15H23.45c-8.66,0-15.67,7.02-15.67,15.67v0.66c0,8.66,7.02,15.67,15.67,15.67h64.72
+		c8.66,0,15.67-7.02,15.67-15.67v-0.66C103.84,37.16,96.83,30.15,88.17,30.15z"/>
+	<path class="st2" d="M87.84,30.14H58.52c-2.43,4.64-3.8,9.91-3.8,15.51c0,6,1.58,11.63,4.34,16.5l28.78,0c8.84,0,16-7.17,16-16v0
+		C103.84,37.3,96.68,30.14,87.84,30.14z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="56.724" y1="45.646" x2="123.7248" y2="45.646">
+		<stop  offset="0" style="stop-color:#23C6F5"/>
+		<stop  offset="0.4286" style="stop-color:#25CFF5"/>
+		<stop  offset="0.9956" style="stop-color:#28E3F5"/>
+	</linearGradient>
+	<circle class="st3" cx="90.22" cy="45.65" r="33.5"/>
+</g>
+</svg>
diff --git a/assets/color/SVG/Move_Logo_Design_Digital_Final_-03.svg b/assets/color/SVG/Move_Logo_Design_Digital_Final_-03.svg
new file mode 100644
index 0000000000..5ea4d1abd6
--- /dev/null
+++ b/assets/color/SVG/Move_Logo_Design_Digital_Final_-03.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 259 166" style="enable-background:new 0 0 259 166;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#092342;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{opacity:0.1;}
+	.st3{opacity:0.85;fill:url(#SVGID_2_);}
+	.st4{fill:#E9F0F5;}
+	.st5{fill:url(#SVGID_3_);}
+	.st6{opacity:0.85;fill:url(#SVGID_4_);}
+	.st7{fill:url(#SVGID_5_);}
+	.st8{opacity:0.85;fill:url(#SVGID_6_);}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="9.2368" y1="84.1764" x2="209.7086" y2="84.1764">
+		<stop  offset="0.2383" style="stop-color:#113BD9"/>
+		<stop  offset="0.7404" style="stop-color:#1676EA"/>
+		<stop  offset="1" style="stop-color:#188FF1"/>
+	</linearGradient>
+	<path class="st1" d="M177,50.79H41.94c-18.06,0-32.71,14.64-32.71,32.71v1.37c0,18.06,14.64,32.71,32.71,32.71H177
+		c18.06,0,32.71-14.64,32.71-32.71v-1.37C209.71,65.43,195.07,50.79,177,50.79z"/>
+	<path class="st2" d="M176.31,50.77h-61.18c-5.06,9.68-7.93,20.69-7.93,32.36c0,12.52,3.29,24.27,9.05,34.43l60.05,0
+		c18.45,0,33.4-14.95,33.4-33.4v0C209.71,65.72,194.76,50.77,176.31,50.77z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="111.3756" y1="83.1338" x2="251.2005" y2="83.1338">
+		<stop  offset="0" style="stop-color:#23C6F5"/>
+		<stop  offset="0.4286" style="stop-color:#25CFF5"/>
+		<stop  offset="0.9956" style="stop-color:#28E3F5"/>
+	</linearGradient>
+	<circle class="st3" cx="181.29" cy="83.13" r="69.91"/>
+</g>
+</svg>
diff --git a/assets/greyscale/AI/Move_Logo_Design_GreyScale_Digital_Final.ai b/assets/greyscale/AI/Move_Logo_Design_GreyScale_Digital_Final.ai
new file mode 100644
index 0000000000..a86385349d
--- /dev/null
+++ b/assets/greyscale/AI/Move_Logo_Design_GreyScale_Digital_Final.ai
@@ -0,0 +1,1392 @@
+%PDF-1.6
%����
+1 0 obj
<</Metadata 2 0 R/OCProperties<</D<</ON[26 0 R]/Order 27 0 R/RBGroups[]>>/OCGs[26 0 R]>>/Pages 3 0 R/Type/Catalog>>
endobj
2 0 obj
<</Length 46097/Subtype/XML/Type/Metadata>>stream
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 6.0-c002 79.164519, 2020/08/25-17:54:00        ">
+   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <rdf:Description rdf:about=""
+            xmlns:dc="http://purl.org/dc/elements/1.1/"
+            xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+            xmlns:xmpGImg="http://ns.adobe.com/xap/1.0/g/img/"
+            xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+            xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
+            xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#"
+            xmlns:illustrator="http://ns.adobe.com/illustrator/1.0/"
+            xmlns:pdf="http://ns.adobe.com/pdf/1.3/"
+            xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/"
+            xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/"
+            xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
+            xmlns:xmpG="http://ns.adobe.com/xap/1.0/g/">
+         <dc:format>application/pdf</dc:format>
+         <dc:title>
+            <rdf:Alt>
+               <rdf:li xml:lang="x-default">Move_Logo Design_GreyScale_Digital_Final</rdf:li>
+            </rdf:Alt>
+         </dc:title>
+         <xmp:CreatorTool>Adobe Illustrator 25.0 (Macintosh)</xmp:CreatorTool>
+         <xmp:CreateDate>2020-12-02T14:57:50-08:00</xmp:CreateDate>
+         <xmp:ModifyDate>2020-12-02T14:57:50-08:00</xmp:ModifyDate>
+         <xmp:MetadataDate>2020-12-02T14:57:50-08:00</xmp:MetadataDate>
+         <xmp:Thumbnails>
+            <rdf:Alt>
+               <rdf:li rdf:parseType="Resource">
+                  <xmpGImg:width>232</xmpGImg:width>
+                  <xmpGImg:height>256</xmpGImg:height>
+                  <xmpGImg:format>JPEG</xmpGImg:format>
+                  <xmpGImg:image>/9j/4AAQSkZJRgABAgEBLAEsAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABABLAAAAAEA&#xA;AQEsAAAAAQAB/+IMWElDQ19QUk9GSUxFAAEBAAAMSExpbm8CEAAAbW50clJHQiBYWVogB84AAgAJ&#xA;AAYAMQAAYWNzcE1TRlQAAAAASUVDIHNSR0IAAAAAAAAAAAAAAAAAAPbWAAEAAAAA0y1IUCAgAAAA&#xA;AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARY3BydAAAAVAAAAAz&#xA;ZGVzYwAAAYQAAABsd3RwdAAAAfAAAAAUYmtwdAAAAgQAAAAUclhZWgAAAhgAAAAUZ1hZWgAAAiwA&#xA;AAAUYlhZWgAAAkAAAAAUZG1uZAAAAlQAAABwZG1kZAAAAsQAAACIdnVlZAAAA0wAAACGdmlldwAA&#xA;A9QAAAAkbHVtaQAAA/gAAAAUbWVhcwAABAwAAAAkdGVjaAAABDAAAAAMclRSQwAABDwAAAgMZ1RS&#xA;QwAABDwAAAgMYlRSQwAABDwAAAgMdGV4dAAAAABDb3B5cmlnaHQgKGMpIDE5OTggSGV3bGV0dC1Q&#xA;YWNrYXJkIENvbXBhbnkAAGRlc2MAAAAAAAAAEnNSR0IgSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAS&#xA;c1JHQiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA&#xA;AAAAAAAAAAAAAFhZWiAAAAAAAADzUQABAAAAARbMWFlaIAAAAAAAAAAAAAAAAAAAAABYWVogAAAA&#xA;AAAAb6IAADj1AAADkFhZWiAAAAAAAABimQAAt4UAABjaWFlaIAAAAAAAACSgAAAPhAAAts9kZXNj&#xA;AAAAAAAAABZJRUMgaHR0cDovL3d3dy5pZWMuY2gAAAAAAAAAAAAAABZJRUMgaHR0cDovL3d3dy5p&#xA;ZWMuY2gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAA&#xA;AAAAAAAuSUVDIDYxOTY2LTIuMSBEZWZhdWx0IFJHQiBjb2xvdXIgc3BhY2UgLSBzUkdCAAAAAAAA&#xA;AAAAAAAuSUVDIDYxOTY2LTIuMSBEZWZhdWx0IFJHQiBjb2xvdXIgc3BhY2UgLSBzUkdCAAAAAAAA&#xA;AAAAAAAAAAAAAAAAAAAAAGRlc2MAAAAAAAAALFJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBp&#xA;biBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAACxSZWZlcmVuY2UgVmlld2luZyBDb25kaXRpb24gaW4g&#xA;SUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB2aWV3AAAAAAATpP4AFF8uABDP&#xA;FAAD7cwABBMLAANcngAAAAFYWVogAAAAAABMCVYAUAAAAFcf521lYXMAAAAAAAAAAQAAAAAAAAAA&#xA;AAAAAAAAAAAAAAKPAAAAAnNpZyAAAAAAQ1JUIGN1cnYAAAAAAAAEAAAAAAUACgAPABQAGQAeACMA&#xA;KAAtADIANwA7AEAARQBKAE8AVABZAF4AYwBoAG0AcgB3AHwAgQCGAIsAkACVAJoAnwCkAKkArgCy&#xA;ALcAvADBAMYAywDQANUA2wDgAOUA6wDwAPYA+wEBAQcBDQETARkBHwElASsBMgE4AT4BRQFMAVIB&#xA;WQFgAWcBbgF1AXwBgwGLAZIBmgGhAakBsQG5AcEByQHRAdkB4QHpAfIB+gIDAgwCFAIdAiYCLwI4&#xA;AkECSwJUAl0CZwJxAnoChAKOApgCogKsArYCwQLLAtUC4ALrAvUDAAMLAxYDIQMtAzgDQwNPA1oD&#xA;ZgNyA34DigOWA6IDrgO6A8cD0wPgA+wD+QQGBBMEIAQtBDsESARVBGMEcQR+BIwEmgSoBLYExATT&#xA;BOEE8AT+BQ0FHAUrBToFSQVYBWcFdwWGBZYFpgW1BcUF1QXlBfYGBgYWBicGNwZIBlkGagZ7BowG&#xA;nQavBsAG0QbjBvUHBwcZBysHPQdPB2EHdAeGB5kHrAe/B9IH5Qf4CAsIHwgyCEYIWghuCIIIlgiq&#xA;CL4I0gjnCPsJEAklCToJTwlkCXkJjwmkCboJzwnlCfsKEQonCj0KVApqCoEKmAquCsUK3ArzCwsL&#xA;Igs5C1ELaQuAC5gLsAvIC+EL+QwSDCoMQwxcDHUMjgynDMAM2QzzDQ0NJg1ADVoNdA2ODakNww3e&#xA;DfgOEw4uDkkOZA5/DpsOtg7SDu4PCQ8lD0EPXg96D5YPsw/PD+wQCRAmEEMQYRB+EJsQuRDXEPUR&#xA;ExExEU8RbRGMEaoRyRHoEgcSJhJFEmQShBKjEsMS4xMDEyMTQxNjE4MTpBPFE+UUBhQnFEkUahSL&#xA;FK0UzhTwFRIVNBVWFXgVmxW9FeAWAxYmFkkWbBaPFrIW1hb6Fx0XQRdlF4kXrhfSF/cYGxhAGGUY&#xA;ihivGNUY+hkgGUUZaxmRGbcZ3RoEGioaURp3Gp4axRrsGxQbOxtjG4obshvaHAIcKhxSHHscoxzM&#xA;HPUdHh1HHXAdmR3DHeweFh5AHmoelB6+HukfEx8+H2kflB+/H+ogFSBBIGwgmCDEIPAhHCFIIXUh&#xA;oSHOIfsiJyJVIoIiryLdIwojOCNmI5QjwiPwJB8kTSR8JKsk2iUJJTglaCWXJccl9yYnJlcmhya3&#xA;JugnGCdJJ3onqyfcKA0oPyhxKKIo1CkGKTgpaymdKdAqAio1KmgqmyrPKwIrNitpK50r0SwFLDks&#xA;biyiLNctDC1BLXYtqy3hLhYuTC6CLrcu7i8kL1ovkS/HL/4wNTBsMKQw2zESMUoxgjG6MfIyKjJj&#xA;Mpsy1DMNM0YzfzO4M/E0KzRlNJ402DUTNU01hzXCNf02NzZyNq426TckN2A3nDfXOBQ4UDiMOMg5&#xA;BTlCOX85vDn5OjY6dDqyOu87LTtrO6o76DwnPGU8pDzjPSI9YT2hPeA+ID5gPqA+4D8hP2E/oj/i&#xA;QCNAZECmQOdBKUFqQaxB7kIwQnJCtUL3QzpDfUPARANER0SKRM5FEkVVRZpF3kYiRmdGq0bwRzVH&#xA;e0fASAVIS0iRSNdJHUljSalJ8Eo3Sn1KxEsMS1NLmkviTCpMcky6TQJNSk2TTdxOJU5uTrdPAE9J&#xA;T5NP3VAnUHFQu1EGUVBRm1HmUjFSfFLHUxNTX1OqU/ZUQlSPVNtVKFV1VcJWD1ZcVqlW91dEV5JX&#xA;4FgvWH1Yy1kaWWlZuFoHWlZaplr1W0VblVvlXDVchlzWXSddeF3JXhpebF69Xw9fYV+zYAVgV2Cq&#xA;YPxhT2GiYfViSWKcYvBjQ2OXY+tkQGSUZOllPWWSZedmPWaSZuhnPWeTZ+loP2iWaOxpQ2maafFq&#xA;SGqfavdrT2una/9sV2yvbQhtYG25bhJua27Ebx5veG/RcCtwhnDgcTpxlXHwcktypnMBc11zuHQU&#xA;dHB0zHUodYV14XY+dpt2+HdWd7N4EXhueMx5KnmJeed6RnqlewR7Y3vCfCF8gXzhfUF9oX4BfmJ+&#xA;wn8jf4R/5YBHgKiBCoFrgc2CMIKSgvSDV4O6hB2EgITjhUeFq4YOhnKG14c7h5+IBIhpiM6JM4mZ&#xA;if6KZIrKizCLlov8jGOMyo0xjZiN/45mjs6PNo+ekAaQbpDWkT+RqJIRknqS45NNk7aUIJSKlPSV&#xA;X5XJljSWn5cKl3WX4JhMmLiZJJmQmfyaaJrVm0Kbr5wcnImc951kndKeQJ6unx2fi5/6oGmg2KFH&#xA;obaiJqKWowajdqPmpFakx6U4pammGqaLpv2nbqfgqFKoxKk3qamqHKqPqwKrdavprFys0K1Erbiu&#xA;La6hrxavi7AAsHWw6rFgsdayS7LCszizrrQltJy1E7WKtgG2ebbwt2i34LhZuNG5SrnCuju6tbsu&#xA;u6e8IbybvRW9j74KvoS+/796v/XAcMDswWfB48JfwtvDWMPUxFHEzsVLxcjGRsbDx0HHv8g9yLzJ&#xA;Osm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc&#xA;1+DYZNjo2WzZ8dp22vvbgNwF3IrdEN2W3hzeot8p36/gNuC94UThzOJT4tvjY+Pr5HPk/OWE5g3m&#xA;lucf56noMui86Ubp0Opb6uXrcOv77IbtEe2c7ijutO9A78zwWPDl8XLx//KM8xnzp/Q09ML1UPXe&#xA;9m32+/eK+Bn4qPk4+cf6V/rn+3f8B/yY/Sn9uv5L/tz/bf///+4ADkFkb2JlAGTAAAAAAf/bAIQA&#xA;BgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoKDBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8f&#xA;Hx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f&#xA;Hx8fHx8fHx8fHx8fHx8f/8AAEQgBAADoAwERAAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQF&#xA;AwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAAAQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMB&#xA;AgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPBUtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdU&#xA;ZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eX&#xA;p7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZqbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUE&#xA;BQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEyobHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PS&#xA;NeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG&#xA;1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/a&#xA;AAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq+CfOv/ACmWvf8AbRu/+T74qkuK&#xA;uxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxVmf5Nf8Ak0PLn/MWv/ETir7dxV2KuxV2KuxV2KuxV2Ku&#xA;xV2KuxV2KuxV8E+df+Uy17/to3f/ACffFUlxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2Ksz/ACa/&#xA;8mh5c/5i1/4icVfbuKuxV2KuxV2KuxV2KuxV2KuxV2KuxV2Kvgnzr/ymWvf9tG7/AOT74qkuKuxV&#xA;2KuxV2KuxV2KuxV2KuxV2KuxV2KuxVmf5Nf+TQ8uf8xa/wDETir7dxV2KuxV2KuxV2KuxV2KuxV2&#xA;KuxV2KuxV8E+df8AlMte/wC2jd/8n3xVJcVdirsVdirsVdirsVdirsVdirsVdirsVdirM/ya/wDJ&#xA;oeXP+Ytf+InFX27irsVdirsVdirsVdirsVdirsVdirsVdir4J86/8plr3/bRu/8Ak++KpLirsVdi&#xA;rsVdirsVdirsVdirsVdirsVdirsVZn+TX/k0PLn/ADFr/wAROKvt3FXYq7FXYq7FXYq7FXYq7FXY&#xA;q7FXYq7FXwT51/5TLXv+2jd/8n3xVJcVdirsVdirsVdirsVdirsVdirsVdirsVdirM/ya/8AJoeX&#xA;P+Ytf+InFX27irsVQbazpavwNynL2qR942xVFo6OoZGDK24YGoI+eKt4q7FXYq7FXYq7FXYq7FXY&#xA;q+CfOv8AymWvf9tG7/5PviqS4q7FXYq7FU60Xyb5o1uIzaXps1zCDT1gAsdR1Adyqk/TiqG1ny9r&#xA;eiziDVbKWzkavD1ForU68WHwt9BxVLsVdirsVdirsVdirsVdirM/ya/8mh5c/wCYtf8AiJxV7rff&#xA;nP5ie7kaygt4rXkfRSRGd+Pbk3ICvyGKpj5e8/eYdf8ArMF4YUhRVqIUKseROxJZttsVTPFU/wDK&#xA;t3IJ5LUmsbLzUeBBAP31xV88eSNf1LQvzml1SeZzpF9rV7pFzyZiqmaQ+nWuwHMq3yU4qh7nzXda&#xA;p+dtp5mkuHTQpNZ9C2kDN6ZgsPTUkKOxjKsfnir01vz48znSH82xeUmbyQk/oG+NyouSvqCP1fSp&#xA;05fDTpy25YqjrT8+bd9F8239zp6RTeXfSa0iEppdxXTcbeQckVlD1UnbYMMVSd/+ciNZuEl/Rug2&#xA;rvp1uk+rLdX8dsQ7qXaC3WUI8joNjQE8gRx+zVV6t5L82WHmzyzZa9Yq0cF4pLQvu0ciMUkQ068W&#xA;U79+uKp3irsVdir4J86/8plr3/bRu/8Ak++KpLirsVZV5X8p2epWRu7uR6FikccZA+z1JJBxVkem&#xA;flzoN1qNtbM04SWVEb4x0J3/AGcVe9Wdna2drFaWsSw20ChIokFFVRsABiqU+c/L9nr3lu+0+5QM&#xA;WiZ4HI3jmQEo4Pah6+1RiqR/84yJpX+BtXfUI4nifU0tyZFDVM8cUSLv/MzgYqjPyV/L628qa95n&#xA;m1SMGuoDR9J9VQxdAPX5Cv8APGyN9BxVh3m78rvLn6W1zzX5t139B6TfavdW2lwQQGeSQpK6sxC/&#xA;ZUMjfs9B22xVL/MH/OP50rQte1CDWRezaVbxahZxxxAJcWMtT6pbmeDL6cuwqNh47Koy1/5x0T6l&#xA;ZXl9rEsEY09NR1iKO1aaWEzD91DDGjF5WJVwdtuPQ1xVif5mflaPKVjpusafeSX+h6rySKS4ge1u&#xA;IpVqfTliko24BoaDodulVXn+KuxVmf5Nf+TQ8uf8xa/8ROKvqW+/J/yndXclwr3VsJWLGGF0Eak9&#xA;eIeNyPvxVUsPyw0rSBNLptzcvNIvHhO0bIaGv7KIa/Tiqg+m6gr8DbScvAKT+IxVkXl/SJbQPPcD&#xA;jM44qnWi9TX54q8nu/yN1+98r+brCd7ZdQ1LWP0tokgkbitHb+8PEFSY5GG1d8Vak/IbVfq3kWyQ&#xA;25tdGEzeYG5lXd7p1eX0vgPOgqqk02AxVoflN+a8flN/y9j1HS/8JPPyGokTC8WAzeuU9MDhvJvS&#xA;vtypiq/zj+QF3qPnDSbnSZYovLot7G01mGRysskdkVTZVXixMMSAdNxirvMf5J+YofNes6r5ftND&#xA;1Oy1xjMYtZiZntJ3LF2h4qVpyctv8ippUqvUfIflufy35VsdIuZYZ7qAM1xLbwx28Rkkcu3COJY1&#xA;AHKn2anqd8VT/FXYq7FXwT51/wCUy17/ALaN3/yffFUlxV2Kpto/mbUtKiaK34PEx5enKCQD4ihU&#xA;4qmtt+ZGu29xFPHDbCSJg6/DJ1U1/nxV7r5Z/M3ynrlhHMb6Gxu+I9ezuZFjdG78S5UOPAj8MVSP&#xA;8yPzU0Kw0a607SbuO91W6jaFWgYSRwhxxZ2dfh5AVoAevXFWBeUfzE0nRPys8weW2M6a1qF1Hc2E&#xA;sagxqYzCwLPyBBBiPbFWc61/zkNoep+YPJ12YrmKw0t5LvW4wi1a5a3MKCIc/iVDI+5p1xVKta/N&#xA;L8uPN9jdaN5qg1KGyttTuL/R7+wEXrGG4leRo5UkLBT+8PSvbpTdVWsvz70RfP8AHcvYzQ+S4tLO&#xA;jrYkLJK0K/EkjxluHIkcKcvs+OKqln/zkFYSebvMsmoLfReX9bWOKyubJljvbQW6FEdAW41fkWbf&#xA;Y+PTFWI/mj+YGha/pmm6Ro0+rX0Vm7TXWo6zcPJLLIQQoWFXaFAoYioUE/iVXnGKuxVmf5Nf+TQ8&#xA;uf8AMWv/ABE4q+3cVdirsVdirsVdirsVdirsVdirsVdirsVfBPnX/lMte/7aN3/yffFUlxV2KuxV&#xA;2KuxV2KuxV2KuxV2KuxV2KuxV2Ksz/Jr/wAmh5c/5i1/4icVfbuKuxV2KuxV2KuxV2KuxV2KuxV2&#xA;KuxV2Kvgnzr/AMplr3/bRu/+T74qkuKuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxVmf5Nf+TQ8uf8&#xA;xa/8ROKvt3FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXwT51/5TLXv+2jd/wDJ98VSXFXYq7FXYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYqzP8mv/JoeXP8AmLX/AIicVfbuKuxV2KuxV2KuxV2KuxV2KuxV2Kux&#xA;V2Kvgnzr/wAplr3/AG0bv/k++KpLirsVdirsVdirsVdirsVdirsVdirsVdirsVZn+TX/AJNDy5/z&#xA;Fr/xE4q+3cVdirsVdirsVdirsVdirsVdirsVdirsVfBPnX/lMte/7aN3/wAn3xVJcVdirsVdirsV&#xA;dirsVdirsVdirsVdirsVdirM/wAmv/JoeXP+Ytf+InFX27irsVdirsVdirsVdirsVdirsVdirsVd&#xA;ir4J86/8plr3/bRu/wDk++KpLirsVdirsVdirsVdirsVdirsVdirsVdirsVZn+TX/k0PLn/MWv8A&#xA;xE4q+3cVdirsVdirsVdirsVdirsVdirsVdirsVfK3mT/AJx2/MnUPMWq39vDam3u7y4nhLXCg8JJ&#xA;Wdaim2xxVLf+haPzQ/3xaf8ASSv9MVd/0LR+aH++LT/pJX+mKu/6Fo/ND/fFp/0kr/TFXf8AQtH5&#xA;of74tP8ApJX+mKu/6Fo/ND/fFp/0kr/TFXf9C0fmh/vi0/6SV/pirv8AoWj80P8AfFp/0kr/AExV&#xA;3/QtH5of74tP+klf6Yq7/oWj80P98Wn/AEkr/TFXf9C0fmh/vi0/6SV/pirv+haPzQ/3xaf9JK/0&#xA;xV3/AELR+aH++LT/AKSV/pirv+haPzQ/3xaf9JK/0xV3/QtH5of74tP+klf6YqyP8uvyF/MHQfO+&#xA;j6xqENstlZXAlnKTqzcQCNlpv1xV9MYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq+VvMn/ADkT+ZOn&#xA;+YtVsLea1FvaXlxBCGt1J4Rysi1Nd9hiqW/9DL/mh/v+0/6Rl/rirv8AoZf80P8Af9p/0jL/AFxV&#xA;3/Qy/wCaH+/7T/pGX+uKu/6GX/ND/f8Aaf8ASMv9cVd/0Mv+aH+/7T/pGX+uKu/6GX/ND/f9p/0j&#xA;L/XFXf8AQy/5of7/ALT/AKRl/rirv+hl/wA0P9/2n/SMv9cVd/0Mv+aH+/7T/pGX+uKu/wChl/zQ&#xA;/wB/2n/SMv8AXFXf9DL/AJof7/tP+kZf64q7/oZf80P9/wBp/wBIy/1xV3/Qy/5of7/tP+kZf64q&#xA;7/oZf80P9/2n/SMv9cVZH+XX59fmDr3nfR9H1Ca2ayvbgRThIFVuJBOzV26Yq+mMVdirsVdirsVd&#xA;irsVdirsVdirsVdirsVfBPnX/lMte/7aN3/yffFUlxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2Ks&#xA;z/Jr/wAmh5c/5i1/4icVfbuKuxV2KuxV2KuxV2KuxV2KuxV2KuxV2Kvgnzr/AMplr3/bRu/+T74q&#xA;kuKuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxVmf5Nf+TQ8uf8xa/8ROKvt3FXYq7FXYq7FXYq7FXY&#xA;q7FXYq7FXYq7FXwT51/5TLXv+2jd/wDJ98VSXFXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqzP8mv&#xA;/JoeXP8AmLX/AIicVfbuKuxV2KuxV2KuxV2KuxV2KuxV2KuxV2Kvgnzr/wAplr3/AG0bv/k++KpL&#xA;irsVdirsVdirsVdirsVdirsVdirsVdirsVZn+TX/AJNDy5/zFr/xE4q+3cVdirsVdirsVdirQZW+&#xA;yQflireKuxV2KuxV2KuxV8E+df8AlMte/wC2jd/8n3xVJcVdirsVdirsVdirsVdiqJXTNSeL1ktJ&#xA;mi6+oI2K/fSmKobFXYq7FXYq7FWZ/k1/5NDy5/zFr/xE4q+3cVdirsVdiqX6vq0dhEABznf+7T+J&#xA;9sVYndaheXTEzyswP7FaKPkBtiqirMrBlJVh0INDiqc6V5inidYrtjJCdvUO7L7+4xVlIIYAg1B3&#xA;BGKuxV2KuxV2Kvgnzr/ymWvf9tG7/wCT74qkuKuxV2KuxV2KuxVMNB0PUNd1a30vT053Nw1Frsqg&#xA;CrMx7Ko3OKvo3yf+WHlry5BG3oLe6kADJfTqGbl/xWpqEHhTfxOKsvxVjnmnyB5Z8yQOt7aJHdsD&#xA;wvoQEmVuxLD7Y9mqMVfOXnDynqHlfWpNNvPjAHO2uFFFliPRh4eBHY4qkeKuxV2Ksz/Jr/yaHlz/&#xA;AJi1/wCInFX2ve3cFlZz3lweMFvG0srdaKgLH8BirwnXfzN80alePJb3T2FqD+5t4DxIXtycfEx8&#xA;e3tiqWf4183f9Xe7/wCRrf1xV3+NfN3/AFd7v/ka39cVeiae949hbNeTvcXJjUySysWYkipFT4Vx&#xA;VXxV2KuxVl3lq5abT+DGphbgP9XqMVTbFXYq7FXYq+CfOv8AymWvf9tG7/5PviqS4q7FXYqzfyn5&#xA;Vs5LNL++jEzy7xRN9kL0BI7k4qyP9CaN/wAsFt/yJT+mKu/Qmjf8sFt/yJT+mKs8/LbQdNtY7rUY&#xA;LWGGZz6CvHGqNwADMKgDYkj7sVZtirsVdirzj89dEhvPKA1PiPrGmTIwfv6czCJl+lmQ/Rir56xV&#xA;2KuxVmf5Nf8Ak0PLn/MWv/ETir7M8yWE2oaBqNlB/fXFvJHED0LFTxH0nFXzTJHJHI0cilJEJV0Y&#xA;UIINCCDiq3FXYq9esJlnsbeZfsyRow+lQcVV8VdirsVZT5URhZzOejSUH0D+3FU7xV2KuxV2Kvgn&#xA;zr/ymWvf9tG7/wCT74qkuKuxV2KvT/Kl7DdaJbCM/HAoilXuCu34jfFU4xV2Ks+8gTq2lzw/txTF&#xA;iPZ1FP8AiJxVk+KuxV2KsG/Oi+jtvy/vo2ID3ckMMQ8T6qyH/hYzir5sxV2KuxVmf5Nf+TQ8uf8A&#xA;MWv/ABE4q+3cVSLWvI3lfWZzcX1irXJ+1NGzRs3+sUK8vpxVLf8AlU/kn/ljk/5HS/8ANWKu/wCV&#xA;T+Sf+WOT/kdL/wA1Yq3e+U7fS7ONdMRvqsQIaIsXKgmtQTU03xVKcVdiqvZ2U95OIYVqT1PYDxOK&#xA;s3s7WO1to4I/soKV8T3P04qrYq7FXYq7FXwT51/5TLXv+2jd/wDJ98VSXFXYq7FURZ395ZS+razN&#xA;C/QlT1HuOhxVMv8AGPmT/ls/5Jxf804q7/GPmT/ls/5Jxf8ANOKp/wCSfzQ1fRdcin1CU3Gmy/u7&#xA;yJURWCH9teKj4k6079MVfRenajY6lZxXthOlxazDlHKhqCP4HxBxVEYqsnngt4XnnkWKGJS0krkK&#xA;qqNySTsBir5y/Nfz+nmjVI7awJ/RFiWEDHb1ZDs0pHhtRa9vnirA8VdirsVZn+TX/k0PLn/MWv8A&#xA;xE4q+3cVdirsVdirsVS+70HTbli5jMbnq0Z41+jcfhiqHTytpytVmkceBYAfgBiqZ29rb20fpwRi&#xA;Ne4Hf5nviqrirsVdirsVdir4J86/8plr3/bRu/8Ak++KpLirsVdirsVdirsVdiqb6B5s8xeX5TJp&#xA;F9JbcjWSIUaNj/lRsGQn3pirL1/PjzwIuBSzZv8Afhhbl09nC/hirF/MXnnzT5i+DVL55YAarbJS&#xA;OIEdPgQAEjxNTiqQ4q7FXYq7FWZ/k1/5NDy5/wAxa/8AETir7dxV2KuxV2KuxV2KuxV2KuxV2Kux&#xA;V2KuxV8E+df+Uy17/to3f/J98VSXFXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqzP8mv/ACaHlz/m&#xA;LX/iJxV9u4q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq+CfOv8AymWvf9tG7/5PviqS4q7FXYq7FXYq&#xA;7FXYq7FXYq7FXYq7FXYq7FWZ/k1/5NDy5/zFr/xE4q+3cVdirsVdirsVdirsVdirsVdirsVdirsV&#xA;fBPnX/lMte/7aN3/AMn3xVJcVdirsVdirsVdirsVdirsVdirsVdirsVdirM/ya/8mh5c/wCYtf8A&#xA;iJxV9u4q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq+CfOv/ACmWvf8AbRu/+T74qkuKuxV2KuxV2Kux&#xA;V2KuxV2KuxV2KuxV2KuxVmf5Nf8Ak0PLn/MWv/ETir7dxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV&#xA;8E+df+Uy17/to3f/ACffFUlxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2Ksz/ACa/8mh5c/5i1/4i&#xA;cVf/2Q==</xmpGImg:image>
+               </rdf:li>
+            </rdf:Alt>
+         </xmp:Thumbnails>
+         <xmpMM:RenditionClass>proof:pdf</xmpMM:RenditionClass>
+         <xmpMM:OriginalDocumentID>uuid:65E6390686CF11DBA6E2D887CEACB407</xmpMM:OriginalDocumentID>
+         <xmpMM:DocumentID>xmp.did:7800e661-925e-4ea8-8de2-affc20ecd1b6</xmpMM:DocumentID>
+         <xmpMM:InstanceID>uuid:b70573ed-b1d5-414e-addb-e751d7d041d3</xmpMM:InstanceID>
+         <xmpMM:DerivedFrom rdf:parseType="Resource">
+            <stRef:instanceID>xmp.iid:1bf257e2-7ee0-4f9f-8d89-592b6363757d</stRef:instanceID>
+            <stRef:documentID>xmp.did:1bf257e2-7ee0-4f9f-8d89-592b6363757d</stRef:documentID>
+            <stRef:originalDocumentID>uuid:65E6390686CF11DBA6E2D887CEACB407</stRef:originalDocumentID>
+            <stRef:renditionClass>default</stRef:renditionClass>
+         </xmpMM:DerivedFrom>
+         <xmpMM:History>
+            <rdf:Seq>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>saved</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:104773b8-b239-4d7c-827a-5a8a0e6556a6</stEvt:instanceID>
+                  <stEvt:when>2020-12-02T12:45:36-08:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Illustrator 25.0 (Macintosh)</stEvt:softwareAgent>
+                  <stEvt:changed>/</stEvt:changed>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>saved</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:7800e661-925e-4ea8-8de2-affc20ecd1b6</stEvt:instanceID>
+                  <stEvt:when>2020-12-02T14:57:33-08:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Illustrator 25.0 (Macintosh)</stEvt:softwareAgent>
+                  <stEvt:changed>/</stEvt:changed>
+               </rdf:li>
+            </rdf:Seq>
+         </xmpMM:History>
+         <illustrator:StartupProfile>Web</illustrator:StartupProfile>
+         <illustrator:CreatorSubTool>AIRobin</illustrator:CreatorSubTool>
+         <illustrator:Type>Document</illustrator:Type>
+         <pdf:Producer>Adobe PDF library 15.00</pdf:Producer>
+         <pdfx:CreatorVersion>21.0.0</pdfx:CreatorVersion>
+         <xmpTPg:NPages>1</xmpTPg:NPages>
+         <xmpTPg:HasVisibleTransparency>True</xmpTPg:HasVisibleTransparency>
+         <xmpTPg:HasVisibleOverprint>False</xmpTPg:HasVisibleOverprint>
+         <xmpTPg:MaxPageSize rdf:parseType="Resource">
+            <stDim:w>500.000000</stDim:w>
+            <stDim:h>500.000000</stDim:h>
+            <stDim:unit>Pixels</stDim:unit>
+         </xmpTPg:MaxPageSize>
+         <xmpTPg:PlateNames>
+            <rdf:Seq>
+               <rdf:li>Cyan</rdf:li>
+               <rdf:li>Magenta</rdf:li>
+               <rdf:li>Yellow</rdf:li>
+               <rdf:li>Black</rdf:li>
+            </rdf:Seq>
+         </xmpTPg:PlateNames>
+         <xmpTPg:SwatchGroups>
+            <rdf:Seq>
+               <rdf:li rdf:parseType="Resource">
+                  <xmpG:groupName>Default Swatch Group</xmpG:groupName>
+                  <xmpG:groupType>0</xmpG:groupType>
+                  <xmpG:Colorants>
+                     <rdf:Seq>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>White</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>255</xmpG:green>
+                           <xmpG:blue>255</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>Black</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Red</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Yellow</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>255</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Green</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>255</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Cyan</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>255</xmpG:green>
+                           <xmpG:blue>255</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Blue</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>255</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Magenta</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>255</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=193 G=39 B=45</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>193</xmpG:red>
+                           <xmpG:green>39</xmpG:green>
+                           <xmpG:blue>45</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=237 G=28 B=36</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>237</xmpG:red>
+                           <xmpG:green>28</xmpG:green>
+                           <xmpG:blue>36</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=241 G=90 B=36</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>241</xmpG:red>
+                           <xmpG:green>90</xmpG:green>
+                           <xmpG:blue>36</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=247 G=147 B=30</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>247</xmpG:red>
+                           <xmpG:green>147</xmpG:green>
+                           <xmpG:blue>30</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=251 G=176 B=59</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>251</xmpG:red>
+                           <xmpG:green>176</xmpG:green>
+                           <xmpG:blue>59</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=252 G=238 B=33</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>252</xmpG:red>
+                           <xmpG:green>238</xmpG:green>
+                           <xmpG:blue>33</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=217 G=224 B=33</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>217</xmpG:red>
+                           <xmpG:green>224</xmpG:green>
+                           <xmpG:blue>33</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=140 G=198 B=63</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>140</xmpG:red>
+                           <xmpG:green>198</xmpG:green>
+                           <xmpG:blue>63</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=57 G=181 B=74</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>57</xmpG:red>
+                           <xmpG:green>181</xmpG:green>
+                           <xmpG:blue>74</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=146 B=69</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>146</xmpG:green>
+                           <xmpG:blue>69</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=104 B=55</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>104</xmpG:green>
+                           <xmpG:blue>55</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=34 G=181 B=115</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>34</xmpG:red>
+                           <xmpG:green>181</xmpG:green>
+                           <xmpG:blue>115</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=169 B=157</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>169</xmpG:green>
+                           <xmpG:blue>157</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=41 G=171 B=226</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>41</xmpG:red>
+                           <xmpG:green>171</xmpG:green>
+                           <xmpG:blue>226</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=113 B=188</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>113</xmpG:green>
+                           <xmpG:blue>188</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=46 G=49 B=146</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>46</xmpG:red>
+                           <xmpG:green>49</xmpG:green>
+                           <xmpG:blue>146</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=27 G=20 B=100</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>27</xmpG:red>
+                           <xmpG:green>20</xmpG:green>
+                           <xmpG:blue>100</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=102 G=45 B=145</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>102</xmpG:red>
+                           <xmpG:green>45</xmpG:green>
+                           <xmpG:blue>145</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=147 G=39 B=143</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>147</xmpG:red>
+                           <xmpG:green>39</xmpG:green>
+                           <xmpG:blue>143</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=158 G=0 B=93</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>158</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>93</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=212 G=20 B=90</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>212</xmpG:red>
+                           <xmpG:green>20</xmpG:green>
+                           <xmpG:blue>90</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=237 G=30 B=121</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>237</xmpG:red>
+                           <xmpG:green>30</xmpG:green>
+                           <xmpG:blue>121</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=199 G=178 B=153</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>199</xmpG:red>
+                           <xmpG:green>178</xmpG:green>
+                           <xmpG:blue>153</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=153 G=134 B=117</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>153</xmpG:red>
+                           <xmpG:green>134</xmpG:green>
+                           <xmpG:blue>117</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=115 G=99 B=87</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>115</xmpG:red>
+                           <xmpG:green>99</xmpG:green>
+                           <xmpG:blue>87</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=83 G=71 B=65</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>83</xmpG:red>
+                           <xmpG:green>71</xmpG:green>
+                           <xmpG:blue>65</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=198 G=156 B=109</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>198</xmpG:red>
+                           <xmpG:green>156</xmpG:green>
+                           <xmpG:blue>109</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=166 G=124 B=82</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>166</xmpG:red>
+                           <xmpG:green>124</xmpG:green>
+                           <xmpG:blue>82</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=140 G=98 B=57</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>140</xmpG:red>
+                           <xmpG:green>98</xmpG:green>
+                           <xmpG:blue>57</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=117 G=76 B=36</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>117</xmpG:red>
+                           <xmpG:green>76</xmpG:green>
+                           <xmpG:blue>36</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=96 G=56 B=19</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>96</xmpG:red>
+                           <xmpG:green>56</xmpG:green>
+                           <xmpG:blue>19</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=66 G=33 B=11</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>66</xmpG:red>
+                           <xmpG:green>33</xmpG:green>
+                           <xmpG:blue>11</xmpG:blue>
+                        </rdf:li>
+                     </rdf:Seq>
+                  </xmpG:Colorants>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <xmpG:groupName>Grays</xmpG:groupName>
+                  <xmpG:groupType>1</xmpG:groupType>
+                  <xmpG:Colorants>
+                     <rdf:Seq>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=0 B=0</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=26 G=26 B=26</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>26</xmpG:red>
+                           <xmpG:green>26</xmpG:green>
+                           <xmpG:blue>26</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=51 G=51 B=51</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>51</xmpG:red>
+                           <xmpG:green>51</xmpG:green>
+                           <xmpG:blue>51</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=77 G=77 B=77</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>77</xmpG:red>
+                           <xmpG:green>77</xmpG:green>
+                           <xmpG:blue>77</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=102 G=102 B=102</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>102</xmpG:red>
+                           <xmpG:green>102</xmpG:green>
+                           <xmpG:blue>102</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=128 G=128 B=128</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>128</xmpG:red>
+                           <xmpG:green>128</xmpG:green>
+                           <xmpG:blue>128</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=153 G=153 B=153</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>153</xmpG:red>
+                           <xmpG:green>153</xmpG:green>
+                           <xmpG:blue>153</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=179 G=179 B=179</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>179</xmpG:red>
+                           <xmpG:green>179</xmpG:green>
+                           <xmpG:blue>179</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=204 G=204 B=204</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>204</xmpG:red>
+                           <xmpG:green>204</xmpG:green>
+                           <xmpG:blue>204</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=230 G=230 B=230</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>230</xmpG:red>
+                           <xmpG:green>230</xmpG:green>
+                           <xmpG:blue>230</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=242 G=242 B=242</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>242</xmpG:red>
+                           <xmpG:green>242</xmpG:green>
+                           <xmpG:blue>242</xmpG:blue>
+                        </rdf:li>
+                     </rdf:Seq>
+                  </xmpG:Colorants>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <xmpG:groupName>Web Color Group</xmpG:groupName>
+                  <xmpG:groupType>1</xmpG:groupType>
+                  <xmpG:Colorants>
+                     <rdf:Seq>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=63 G=169 B=245</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>63</xmpG:red>
+                           <xmpG:green>169</xmpG:green>
+                           <xmpG:blue>245</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=122 G=201 B=67</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>122</xmpG:red>
+                           <xmpG:green>201</xmpG:green>
+                           <xmpG:blue>67</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=255 G=147 B=30</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>147</xmpG:green>
+                           <xmpG:blue>30</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=255 G=29 B=37</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>29</xmpG:green>
+                           <xmpG:blue>37</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=255 G=123 B=172</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>123</xmpG:green>
+                           <xmpG:blue>172</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=189 G=204 B=212</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>189</xmpG:red>
+                           <xmpG:green>204</xmpG:green>
+                           <xmpG:blue>212</xmpG:blue>
+                        </rdf:li>
+                     </rdf:Seq>
+                  </xmpG:Colorants>
+               </rdf:li>
+            </rdf:Seq>
+         </xmpTPg:SwatchGroups>
+      </rdf:Description>
+   </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                           
+<?xpacket end="w"?>
endstream
endobj
3 0 obj
<</Count 4/Kids[5 0 R 24 0 R 25 0 R 28 0 R]/Type/Pages>>
endobj
5 0 obj
<</ArtBox[0.0 0.0 500.0 500.0]/BleedBox[0.0 0.0 500.0 500.0]/Contents 29 0 R/CropBox[0.0 0.0 500.0 500.0]/Group 30 0 R/LastModified(D:20201202145750-08'00')/MediaBox[0.0 0.0 500.0 500.0]/Parent 3 0 R/PieceInfo<</Illustrator 8 0 R>>/Resources<</ColorSpace<</CS0 31 0 R>>/ExtGState<</GS0 32 0 R/GS1 33 0 R>>/Properties<</MC0 26 0 R>>/XObject<</Fm0 34 0 R>>>>/TrimBox[0.0 0.0 500.0 500.0]/Type/Page>>
endobj
24 0 obj
<</ArtBox[129.0 179.266 371.0 319.112]/BleedBox[0.0 0.0 500.0 500.0]/Contents 35 0 R/CropBox[0.0 0.0 500.0 500.0]/Group 36 0 R/LastModified(D:20201202145750-08'00')/MediaBox[0.0 0.0 500.0 500.0]/Parent 3 0 R/PieceInfo<</Illustrator 8 0 R>>/Resources<</ColorSpace<</CS0 31 0 R>>/ExtGState<</GS0 32 0 R>>/Properties<</MC0 26 0 R>>>>/TrimBox[0.0 0.0 500.0 500.0]/Type/Page>>
endobj
25 0 obj
<</ArtBox[102.065 216.5 397.935 283.5]/BleedBox[0.0 0.0 500.0 500.0]/Contents 37 0 R/CropBox[0.0 0.0 500.0 500.0]/Group 38 0 R/LastModified(D:20201202145750-08'00')/MediaBox[0.0 0.0 500.0 500.0]/Parent 3 0 R/PieceInfo<</Illustrator 8 0 R>>/Resources<</ColorSpace<</CS0 31 0 R>>/ExtGState<</GS0 32 0 R>>/Properties<</MC0 26 0 R>>>>/TrimBox[0.0 0.0 500.0 500.0]/Type/Page>>
endobj
28 0 obj
<</ArtBox[0.0 0.0 500.0 500.0]/BleedBox[0.0 0.0 500.0 500.0]/Contents 39 0 R/CropBox[0.0 0.0 500.0 500.0]/Group 40 0 R/LastModified(D:20201202145750-08'00')/MediaBox[0.0 0.0 500.0 500.0]/Parent 3 0 R/PieceInfo<</Illustrator 8 0 R>>/Resources<</ColorSpace<</CS0 31 0 R>>/ExtGState<</GS0 32 0 R>>/Properties<</MC0 26 0 R>>>>/TrimBox[0.0 0.0 500.0 500.0]/Type/Page>>
endobj
39 0 obj
<</Filter/FlateDecode/Length 1447>>stream
+H�lWˎ7��W�Z+Q/�M��9�yv
8� U��=���i�%�,�E��o����k
+?������Sx|)��	�_��_���oG
+)���<�:r�������A��QJ
2Z�uhx����#�8f
g��	o\��?-H�iR��Q4�9�ϖb͓�4�����H��x^�-j~�1���$�-&�qؘj������^��~�B��
B����
ڹ��#<VR�����9j�
C�2��a��^F����QKx��p֨-@"�	5��:d���F��=��|.c�5�GN���Aj�Ne�?�4��&�u{Զ
�����ǜ/zl�s
�"V��F�
+� hJ���cE��7���ڎ�>��M���+f�����s��K��f×��.aQT�Ð�0����	Ҝm�����/ё_�<*�J�غ�C�M�0_vz
+,',5ܹt�|r�,< Ti�z�.ѱ]��da8��%QPT�ǩx4т��Y=�l��f���M�`X�o���j�+���I]��[l��m���7��EF�Xgp��K,h�q]&	q���$���o��:w�Զ]�V&��
+��'����6�K�
Z��'�K'�)��o<��z�S*�P��G�Vw�����'��9���IY���3�/�(*2gU��H�~i��=T���}�y�2�y���h��r��B�d����qKW�.���G=2���{l�,i�
��E�ң:g( ��F�J�eTOv
+�l��[">�i3�4�[����s3�m�KQ�T���d/  jHu!�aV��!��cKa�k�@�q���*ţf䐪ZDS�����K�NK�+O�4L,��X�C�E=�%DZ�&�E�,��--�T%J%�u��(�vZN$�F������
+{Ȱ�S��`��~�
��i�n�vT����?7)L�����Ry�|ѻ���y-��_V:��Re�^TmA���h�j T�;�b:��+��湽��7�r��M� �������kɃ�j$:�����sx˚��L��j%(��#��oo͡�T����+���0�j��/e-�m��6���3����L��|F[N��6��1�0��zT�p�;�������ÆNjֺ�9�
�:7}LRy*6��N��v,sH�EV
�L<l\6lֱi�p�j��mܚh(01[o�1`�ȺA����ZL�٩Z�c'Sc���<��l��vA��]\k��k�h�2��ѝŋ����I̐�����4�V���h$ܛ�z5r$��AE41�j"7X��%q�q�� �&浀r�l
K�ɰ�N�;��ۡ��ŧ0&�:�ť�q\m����6W��8(���J�5h�ve���Κ�$?�d��Lj�[	���aK�%����W�}P��ˈ۝_>Ὼ��ἢ�
endstream
endobj
40 0 obj
<</CS 41 0 R/I false/K false/S/Transparency>>
endobj
26 0 obj
<</Intent 42 0 R/Name(Layer 1)/Type/OCG/Usage 43 0 R>>
endobj
42 0 obj
[/View/Design]
endobj
43 0 obj
<</CreatorInfo<</Creator(Adobe Illustrator 25.0)/Subtype/Artwork>>>>
endobj
32 0 obj
<</AIS false/BM/Normal/CA 1.0/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 1.0/op false>>
endobj
31 0 obj
[/ICCBased 44 0 R]
endobj
44 0 obj
<</Filter/FlateDecode/Length 2574/N 3>>stream
+H���yTSw�oɞ����c
[���5la�QI
BH�ADED���2�mtFOE�.�c��}���0��8�׎�8G�Ng�����9�w���߽����'����0�֠�J��b�	
+ 2y�.-;!���K�Z�	���^�i�"L��0���-��
@8(��r�;q��7�L��y��&�Q��q�4�j���|�9��
+�V��)g�B�0�i�W��8#�8wթ��8_�٥ʨQ����Q�j
@�&�A)/��g�>'K���t�;\��
ӥ$պF�ZUn����(4T�%)뫔�0C&�����Z��i
���8��bx��E���B�;�����P���ӓ̹�A�om?�W=
+�x������-�����[���0����}��y)7ta�����>j���T�7���@���tܛ�`q�2��ʀ��&���6�Z�L�Ą?�_��yxg)˔z���çL�U���*�u�Sk�Se�O4?׸�c�
���.����R�
߁��-��2�5������	��S�>ӣV����d�`r��n~��Y�&�
+`��;�A4�� ���A9�=�-�t��l�`;��~p����	�Gp|	��[`L��`<� "A�YA�+��Cb(��R�,�*�T�2B-�
+�ꇆ��n���Q�t�}MA�0�al������S�x	��k�&�^���>�0|>_�'��,�G!"F$H:R��!z��F�Qd?r9�\A&�G���rQ��h������E��]�a�4z�Bg�����E#H	�*B=��0H�I��p�p�0MxJ$�D
1��D, V���ĭ����KĻ�Y�dE�"E��I2���E�B�G��t�4MzN�����r!YK� ���?%_&�#���(��0J:EAi��Q�(�()ӔWT6U@���P+���!�~��m���D�e�Դ�!��h�Ӧh/��']B/����ҏӿ�?a0n�hF!��X���8����܌k�c&5S�����6�l��Ia�2c�K�M�A�!�E�#��ƒ�d�V��(�k��e���l
����}�}�C�q�9
+N'��)�].�u�J�r�
+��w�G�	xR^���[�oƜch�g�`>b���$���*~� �:����E���b��~���,m,�-��ݖ,�Y��¬�*�6X�[ݱF�=�3�뭷Y��~dó	���t���i�z�f�6�~`{�v���.�Ng����#{�}�}��������j�
�����c1X6���fm���;'_9	�r�:�8�q�:��˜�O:ϸ8������u��Jq���nv=���M����m����R 4	�
+n�3ܣ�k�Gݯz=��[=��=�<�=G</z�^�^j��^��	ޡ�Z�Q�B�0FX'�+������t���<�u�-���{���_�_�ߘ�-G�,�}���/���Hh8�m�W�2p[����AiA��N�#8$X�?�A�KHI�{!7�<q��W�y(!46�-���a�a���a�W��	��@�@�`l���YĎ��H,�$����(�(Y�h�7��ъ���b<b*b��<�����~�L&Y&9��%�u�M�s�s��NpJP%�M�IJlN<�DHJIڐtCj'�KwKg�C��%�N��d��|�ꙪO=��%�mL���u�v�x:H��oL��!Ȩ��C&13#s$�/Y����������=�Osbs�rn��sO�1��v�=ˏ��ϟ\�h٢���#��¼����oZ<]T�Ut}�`IÒsK��V-���Y,+>TB(�/�S�,]6*�-���W:#��7�*���e��^YDY�}U�j��AyT�`�#�D=���"�b{ų���+�ʯ:�!kJ4G�m��t�}uC�%���K7YV��fF���Y�.�=b��?S��ƕƩ�Ⱥ����y���
چ���k�5%4��m�7�lqlio�Z�lG+�Z�z�͹��mzy��]�����?u�u�w|�"űN���wW&���e֥ﺱ*|����j��5
k��yݭ���ǯg��^y�kEk�����l�D_p߶������7Dm����o꿻1m��
l�{��Mś�
n�L�l�<9��O�
[����$�����h�՛B��������d�Ҟ@��������i�ءG���&����v��V�ǥ8��������n��R�ĩ7�������u��\�ЭD���-�������u��`�ֲK�³8���%������
�y��h��Y�ѹJ�º;���.���!������
+�����z���p���g���_���X���Q���K���F���Aǿ�=ȼ�:ɹ�8ʷ�6˶�5̵�5͵�6ζ�7ϸ�9к�<Ѿ�?���D���I���N���U���\���d���l���v��ۀ�܊�ݖ�ޢ�)߯�6��D���S���c���s����
����2��F���[���p������(��@���X���r������4���P���m��������8���W���w����)���K���m������
endstream
endobj
8 0 obj
<</LastModified(D:20201202145750-08'00')/Private 18 0 R>>
endobj
18 0 obj
<</AIMetaData 19 0 R/AIPrivateData1 20 0 R/AIPrivateData2 21 0 R/AIPrivateData3 22 0 R/ContainerVersion 12/CreatorVersion 25/NumBlock 3/RoundtripStreamType 2/RoundtripVersion 24>>
endobj
19 0 obj
<</Length 1147>>stream
+%!PS-Adobe-3.0 
%%Creator: Adobe Illustrator(R) 24.0
%%AI8_CreatorVersion: 25.0.1
%%For: (Scott Proctor) ()
%%Title: (Move_Logo Design_GreyScale_Digital_Final.ai)
%%CreationDate: 12/2/20 2:57 PM
%%Canvassize: 16383
%%BoundingBox: 757 -1052 1675 -32
%%HiResBoundingBox: 757.064957058387 -1052 1675 -32
%%DocumentProcessColors: Cyan Magenta Yellow Black
%AI5_FileFormat 14.0
%AI12_BuildNumber: 66
%AI3_ColorUsage: Color
%AI7_ImageSettings: 0
%%RGBProcessColor: 0 0 0 ([Registration])
%AI3_Cropmarks: 1175 -1052 1675 -552
%AI3_TemplateBox: 1290.5 -510.5 1290.5 -510.5
%AI3_TileBox: 1137 -1158 1713 -424
%AI3_DocumentPreview: None
%AI5_ArtSize: 14400 14400
%AI5_RulerUnits: 6
%AI24_LargeCanvasScale: 1
%AI9_ColorModel: 1
%AI5_ArtFlags: 0 0 0 1 0 0 1 0 0
%AI5_TargetResolution: 800
%AI5_NumLayers: 1
%AI9_OpenToView: 283.553585933554 -10.889479424075 0.699154969011053 1458 705 18 0 0 -24 43 0 0 0 1 1 0 0 1 0 1
%AI5_OpenViewLayers: 7
%%PageOrigin:890 -810
%AI7_GridSettings: 72 8 72 8 0 0 0.800000011920929 0.800000011920929 0.800000011920929 0.899999976158142 0.899999976158142 0.899999976158142
%AI9_Flatten: 1
%AI12_CMSettings: 00.MS
%%EndComments

endstream
endobj
20 0 obj
<</Length 65536>>stream
+%AI24_ZStandard_Data(�/�X����)ЖFT�5�k�Bk����ڥ�]���)Ӥf����A��t�&�òJjGV�V�{���,g�Ꮼ���\	�AC���)��j]Ў��Q��&xtTS̎[�ꗭ�l��u��z�K~Du<�u۠�踵���b��Ͱİ���h�-�t�ɒt�
++W�e�~�#':��î�t��\�q�(�iƒ^$���|��#�J�䠁
��z�>�V�eI&ֻ��;[G7�����O��e�<$��S�>l���h�0��'o����ylN*c:�:v���@���A�p��8���(� �	pp
	"�����

8&T�p(�Q
(���B	 HH\�`(��
�<�
����4`�1��
�cz����c��@s�� ��F�	4`���NJ��Ἢ�S}Č��3I<�Ψ�A�`�!�
�
�h�a�R#a8��H,fF^-�0�Q��
�a$�#�
+�d}�*��"4L�}�ISsj&�f4�~?�v?3#s��!<*��dUU�ɤ<�Q�d%cp 
���〓v}� �Q�̾�vT
�����^k�e���c��|�]1<\����:��Y�@+jM��
V�!aH�����8��;�a0$�#�lFݙ�PX�'^ѤA�扪��vW���v��8��!�.��70	C1��0�T6o�c�?JB��j1�âƞ ����;�)np�1�0�NMU�'��4̉GM��Fm̐���̠&��t�����4+���)�P�db��fj33R�i�X��4s�Gi�.tuso?���i*��eזd�]�,s����|]K�oe�d�߽f�GFsdwDi�x#�0!��
>T�Ơ8�/�
"�N$���W�,A.��W��Q,4"���z*r^��?⊏�f8����� ���
+*D���C����:l��!�gڒ9�|�Wf����0(�sH'F��KT��C�U�b�h��"���#�P��;ګz^�u.s��4��m0��E��xg%�������u3�Z������!�¼C€HD!�d�8�H�'VG�J��'͏�G��c�2�g;�Zg������
{�M��6�-kB���q0F�0G$�Ƣ6��L'��p8 zD���D]qP$j�qf�¸��Q������86aX0a���Y���:Z�!Ye�LahƍD�l)^�0�"
�a�"!�qϰ�х"a��0�@�^���<V��RP�tD�B �����#�
+M�FKJ��z'�d�:�Ya�A+1�lQQ
+�����3�d8��0�lT��Â<�@�'ˤ�~�4]�s�d,:����q�X�b̨��|���L�?���?	T��PaÐ@e���!q#1%�|���2|CBa�aސP�^�Y,��aE�`x":���
?J<�Xd"/YX�3w8C�V$��0��[!n#�S��Ean,��p�2z���D�>g+�E)h�m�@�
+D�Q��`@���9h�Ge��gy\yF��d��r�#s��2>9���"��?�{��r��Es��ś�QC~R-�xIY&�e��T�~��ؑ9��W�ˬ�w�YM���Hw�18`@�Dbj��򆃑��K�C�+Z>��b1�Ɣ�|y�p@$5�y	��PF��8$�J��Za$�0,�VFG�0������0�VtC:��4>
+'�H�l�3/ja$�P?��0(�6F�
�	�A�!�p���[��v0CW
+�@�
+
�XQ�HL"M�0҆2Ta�E&�hiI��;�0*@�*p���츣3=���;�d�c4�u�����1<2�wB�FH
���"q028��G�T�JA���d���	�e�s�A��lO�J��z��i�We�򮬑B��q2�k�t;�=K��u�hpd��2�2_2�P:�cC�<�*sdz�P��ak'e:���Uhd��a7W>�\�U���p��1>�dpp�����A���)��Lw�AG��@�@à0<qQBa��8��������4��gp�P��E�#y�٫D�iTVR6���а�8�
�;��])w�F��`3��l�Y!�Pøae(���.��`x�a��ax����0�`����"q0<Qa�](�2��D��ծF������:�����8ԡ��E�jee�f0$u���|N��'��9�p8�¨����E-���L�b^#7q���DT�!A�0E�X$�yj��ǃ���P	�J5���a�q��y0 4F
*�g�
1��5J�#�h¸���B��EB����ТNS�����EU�"��b�dp� !]!���~E��Y,�BaPNq��Q,
+D� E͂��ũ�Z�Ȩ����PDS	0*����N:���M����\WXF��P�BT����Y���-�f��!,a
+[ظ&�����
>�^ؘ��������~�;����
	
����G�	T�'�����KL#�i�C"2��\伧�����
?��_|5��f��hH�
���0$
+��`̡:��>�
y��p8��AqXQ!
+a'�D�@,S	K8q	L�x8$�DB�X$FQ)Ja
++N��T\aH̢��hX�Eb�Ĕ�|D����h 2�
��1t�
[�D˜R��󆃁H(��A*�a.�0n8 ���c��"�@,��°0,��.n���E�Ba$�Aq��@*�0)�X$	D�x"���NX�X �0 �Da�2���8$����C�������!a@���`�!
h��e�a�+�������}�HE&�|b^:-)��L xLD<4$,..q�;����糣��'�0��賹\����!�`KC�������CꕅueU�@��EoZ�H+��B�@�����O$��
+q04��znYɠ�b3U$&q��a�>�����ذqMu��`8%�qttFF��E��*j$E�8�`��D�zumE�*c,F1�Q$1�A��a+�0,48�cp���p��è�
+(pP�`��
+
+�a�"H���P8W�
+
+��QA�<A(���0���pA	*pX�`
	�����L��
+<��
+&D(��d`
�2����…&���
+$X�8J ��#��B@0�.�0a��� ��`$@a*T���
+,p� X8"\��B���&@�p�ƒ	`���	<�

+*0�
+"���>!���#���@�	�Q�$@x`�G�
+.@�H� B
+$X�p
B���

+
	*XP	�`�d�(H�@A��	P�
# ����„
+&@A�
\�
* ,��h���dT
+.\x0aA�t���IɃ�	��8�i
+.�`A.x0�
4A	�ah�aD����#m=������'s�Ȏ�L��0��N�-���
+�a��B<x$�@^ ��
+D���Xx`�>���`���"XP
g�����.���
�dpA�X�0��1���*D�0�	"H(A##�Q��V'H�LM��2�F��`�0�`
���a�D`�
#�`��P� A�(���a��(�1�
2����"T �0`�d���q �2���b���qw�B`@�X0A	�0���&HX80
@x0�p��„	6p<�@!� pPx��a�,T�P
�A T�0�"`@Y�A�n$����
*��A��@�a�T8\@A�HP��QY��R !����D�&p�
@�P
���.<HP� �	d�
+&<� �		&<�P
D��.��A��Q�
+p� ��&\�`�
�
+pT`��,L�p��
+�0��
+�
�ʈ�0�
+2�
�
�
���
+�B�,\Ȁ&0�8`�…, 40��"@T��@�
+L
�Dw�٩Y�q�>��!�L'��x���C��U1�!��S�DG����5��)%����4iU�f���d'#�l*))�����>e���M�z}�s:��XJ��,�ZC0�]b�#�Mb����^�)=3�н�����#i5�_}i�J5�6u!�Gj�Sze���ohF�)�����2o:4K��!��ܭ\�!\��K�#"ɕ��+2�]5�I:{���d�R�]��*��jyO*^bU�>̟;id/��u�����m�ɚU$L���E��*i�z#�e��b�M��\��S��|W���ߺ^%�<��HWB�l6�A��xU�3�xTijɼ�e�z.�_����;�C��ܙ��c��N�L;�n�;�INN_4D��W��y��J�A��8��s	�t?�6�2��@���T���GxR��e��	!�U�ffwv9%»��yQ���p�><��z9����DY9e9�"윙�^���J���O��X>ɫ�8����M���`h8�9�Y�[�x��ף.D�c�$[I��6�s�b�N��\�wi�"�˹_������0m�&U]��ȿV�Nu��Ӑ�~���2�uX66�5K;�Gl��{�M�6hY��Jus���.Mb%{��v��}6i�c���.1����G�ҭ�Y�^t�a�aZO�/����)�MW9�?��e�}�������X]����eݭ6E�&�^x��Ge'��f8�ߧ���ke�Q+3-���=�덡X��˙�Om����
+N�/�Q�u��|VN=��T5��|X����rV�3{�½(��HJ����#2���"J�"��l�I2,4+�d�_Y����$���fsɦ{�L҈���xG�����$W�xǺ�ݰ�V�����޸�Y����:h`$�3�`o�\D�L�~�]n9=��kJ����<�UV,2���uοi�-��Gծ��9Md4�l^���V,O�$��� |�N�=�켻iHZ=^-l[���R�#σw�5�C�ɳ�"I�,�uF����V��T�fF�E�����P��ۓ�$�fs���7�įVo��D<���
�Ov��b"|Q��ybD��ˊ�~!�M�rC�j�FH����On�pӞx#5����6bY2O٧��aq�=�w����>L�}������l�T���[_��2���XS�Z��{e�Q�Od)�M�9�o�ؤ��s�l��O��Y��$��#,���ʒk�6������~O�J���ˊ�k�J�]�_bk��4{F~�+����H߻��{��{�+*�����-��[������8?��6��p�.:r���;�C��LJo��x�������J�� ��S	/_x��y^=�)7:�f�F�jJ�3�㔦.exWWzJM��M�f#�#3�T��؏^�SǷ����i2oD�DΤ&7T�K>�.�G?K�9�a��t�3)f���2!�_R�˙9�;t~Z�k-��GW�ߍ�vϻ�S�j�-�Ֆ��mA�kW>�X*�h/S��L���H�Gcoi��C<�Y�}Ǫ�ֹ{K$V�)����$y�<�K���?��U	���Jr����ERO���,�L��D��J����{-Q�z�4�Ҥߝ������7��r�7��y�:,�N����Y�}�J��5Y�QO$�^)�gh1Ն����}��za��jYuDz�Y�j��!k�ѥ�{R�Ԛ�v݋Lb�˂V��]JW�7�;�G�>KA�k�e�|&<�:%��;I;�wt�
+�d��8�ӆe�����ַ��JK"|MQ^��w�'LBl���?r�×��s�r���g�/y�r^"��Τu!T��s����c�c�~kJ|=�!S"�x=�,WT��?5�+Ӓ��Q�\~Z^*{�QI��U�?zuR�G
%�nL�|�P����CG�i�_�d�Ǒ��V�"���lJbil8�CebM����8�2C7��/��G��.z�sy%��J�=�l&�k�|K�%|�x��שrأ�M�T���%��4��+���z�9O��EU�_f�֓���e	��R�#�(��z8ϝ|?DB�����n3�UV�ǽױ�����;{��\�V�Rg��*�:���u���qt'yG�:>Tv�M�W���=K�l�{;�I:tx�bez����j����-�>�&4ta���mF��a�#���OX�#�Ų��@�ǧ ���⧮bm�T�m<x<c�:xˬd{ Ո}��K�����x�qd 4'm������&����
+�����ԣ٭̯]�r,��fv{P^:zK9w�V{'�w$��L���μ �Q�g"�-It��f�&T�恖U�WKBEG�N�G{ ��~d����?j�gvS/9$��҆Ύh*=�Nhϡw�y�l&�g����$����������Hꃞdۭ��%ό���n�IY�|��n�<O6��2od|sfm�f�ʢB�	��s���*cՒZKԱ��M�z�tIJ.��p!b݋YR��󙔒�9<»W��Q���o��{ٳE�����zs�A�f�W�IR�f�I%��xt����Q^�AӦ���3�;��<�;�d�*K�=.�d�n�xP[�{�(i8��sp�.qj�LsO����3�����@(A�
+@�A�`p`A�"� d��8h`\@����	A0;�͏�~��i��?˵̹g��>�,�2:V
+���S�-�:)w71�z�V�1�R��/��U��9�;�l�g�792�
��[թ���8h`@8�<�>0OJu���E'H���e�QY��Ğ�$�:o�y�Ϝ���J.�RV���u�<l�E��I���Z��d4�&��q�w��%�t�bw;S��R:M�,�qݎ*h�����ì�d	�A�;�N6�����x��|��Z)��ۑ��1+:z��㮻3����*��3wy=M�谝��g���n��NV'W�L��Ռ��J��Y�@���ɢ㲮�DZo�Y���uʻ��@���H{��~�Tw�rwF�y?��krGM����nDK��]�t���Ͳ�O�V�*4�s�:J�(#>mn��Y��^�#4�Q�>���*���̔�qΤګ&a�oru��>d2�q����%ǽ<ٌs��!�`��Εή��jX6,#��M����f�z7��[FC��3���9k�w�*�g���_�N���s�:?�wfp�E�b�ƙ���j�7�7�D)�|�&���s�{ݴu)�(�A��}�$ӏU1�»7Ғ�,���;i��q��
Ѥ5�4֦�%�M�ܐ��v�V��x�~i#S.�$*�1�!�Q��dͲ��D�[d�^�ϵ�$U_V�����2��]��c/ҳ3㓬��%!�ጽ�O�l�N�,��<e�w�B)z_uk�u��]�՜��ڻA���;��$�C������ם�.ǃU3Y6*,��G�I��Y_�Χc�p��w�R���X�HMt�LW�Օ���*VU�k��,IL�	Rg���榫Ŏv�s����U84gy���m${tj6�Gv��ɮ��]
]v=�Q���e������ݎ.-S��5��J���0�j٤�v%:�1�}�:�k4��;L)~��ΤʂdvS5Ѥ���o�jb+ґSh�U��LL�d��U��l/�:�����NfI���]���Ӫ?�#�F��$����L���3������*��F�&�#̙z݄9�*�����B��<�v�����肉F�Ԏ�[�Y��ϮtWS4���:�:ϨiG&}�Вhν��$�辚$e^bIR������$D�ۜ\���Qxt��D1;�y?��њ��9������ÿS�83(�V�f�H=��6-Zo�+�0�L�^�����w9�4�夫�(6M_]��.�qw�^���٩�o}Y�l�#Y��ݬ���%Z�ƗՎ�J|�����{c2��e�Cw��M�~�J���J��NO��1�Ϙ��S�B���x3�8+g�БU���&���՟��Ӟ��N?;�����٥�#VU�
�?�F�u�Y�jʕ,I8���0���>��T��~M��ʾ<��^�btX��K9:�fh�uf��-<��ꨗzo�R�1�kgˬɩ��z�얶**���Rr�H�9+v�1��V�uYJѝNgi;4)%�]�A���Ӄbx��w#��N�g���M���mݙ�N��;b��Sn&���&�,���%�u�J]��đ���S�!�ݬJ�U7Gt��余+�M�3�6T4������ӏ�C�9�HRY��O莖e���9�E��PΎ^^"��O�A�I4^ώ�������
+�Y�*��7�J��w���Ro�𨧯��t�P��h��(���Y�£yjG���i��L<��v�D��1�;�xy8DR<��DF���x���N�jW9<v�+WW%���)����R~G����h����L>����2��$O{~W8��2��mfcXS�x�M�͞�_���D��g�85�Q�i���A�3��,�
���#�����
�߫��^w��nd���,jm��{����̐U��i,떦?ܳIZ�����,�3(sI�b��lH'_>��I6�M6J
+�Ȅ�J�9뼪#�~�2�]��sG>���_��߮����̪i��O�'�#$�c{ظE&7c�aKx��1޹h�<J�f���f
+]�4g��C��3��Yzœ�e:�=D��3)���N���5gR�~��O�n��V%���Z�	�h҇U-�z�>Q���6JM�:	��cV��Y���n�,����Y=r�5<����Jg�д�1|���ޭi�U����7cvƖ�͞�ab���a�c���>w�/�ս��Ե�FRM��*�ò��(X&������n�,I�5���ȇUyq��1�`U��=kZr�,�q��\he�$���$��莓$��������y�e/���j$95�����#3��1{yJ��h�L�#y{s�|�i���
+"�@B,��P@���<���v�B"L�
3�"T���P�� �@B����EW�u���p�A	#��p����
+(Hp0�
+p�H���(���,��=�40 `
+�W�i�c��,ɧ3�D2�<V,���,�`�b>����
�����(h��KG�*WuO��x�H'Y2��Ia�}l��)Ó�)�ak��[�B�f$IL�3���]���R���)���2�ri�[��BX���R�$I<��AB�,�(Mʑ��w?��)��Nn�כ�mx�)�
�e�w4r��+is1CD�Y�Nw��n�KʒA���4m|R9r��t��E2
]��(E��%���c]��~�7�7�$͖���eM3v~=-��4�	�Կr�~���ϯm�j���HE3���},�e��'ډ!�ы��^O�Lٻjl�ΙI�:��+v��ID,B+�Ah�MZZSJue~I�T�k��E�_��D?�0��CC�5����hNe�X�a����u~�T��$�LI����jF���;*頌���xsD�;4��cΡ�|<f��8���F#qf>��Ff�#�A��޳��XfB���U&���;
�ko	e�(ѝ��j��e�����C/!gմ�*с���8�Ⱦ։���ԽI&gM���(���VU2H9�{�yg�V$�<ʼ�z�C��u��ٱ^^ե�~H�%�S�}�{󐐛g�uFLVҵՐ�S+�����+�
+�Eټ�Chy��Et{^�h��A�ͤ�l=�xK�ǹC�f�ژ�ȧ�R���҅RYs���D��S#�{�e�2���jRF�gd���m�\'��枫�R&�,�NTs���Ң*j^�(粰�LTgSZ�\g��K�tc���~'7�^�Eң�*aM!fR���I#�D�<��]��ZYft�V�Q����i��/�W�א�geq�|c+5������Sy�B0J������3׹.�N9�#�$�ʫ}����j�w�G�~�'��L�c�$͑g�=�H�T��H�ֆ��@�����6%%�ͬ伱ߚ��^:zIK4X�3��j�Z��bE���'o�"<4�-TԎ)H��v�L�w�R���b��
+g4�%e$eT)�2�υ��D��1B�]�	Kr2:^��|����%G)GX��������l���v�\�y�e�ަSO��^m�0���s,�����nƜ�&�ﲎ}Ӝ�i����͡��ev���Ҟ6#M��:�,�LRi+_H�9�n�6^&�?�3)��-4�Vw#I�v�ty+���K6��eQ����S�u��_����L<�̬l��Ϭ�y��O���ҲЈm�f͢xH��{�CB*m�T�r5K�!�vṭ:ydm�Xs�m(�S��p�x5/����еY��b���剔G3�Q}:���QF*�2���|�ԯG�m]uOU�1KF�<>�+���=ds�Ga��J:Wv\$c�����tE����u�,�fc���|�Ff��^��9���%M�o���SD��{=�3���ٝ�DV�hw����{��}$O���w���MX7����Nw�r�pR����&Lۈ�0'k�*V���7t��j*�E��J����JV���K/%u�*��vG�D8�(M
~���dyTx�O�;Yi�<x(��j�~w&�H��g��&M���yt���\��"�!�����Ψ��N�zvw��9���]Q�ܝ�4w/OU��=�ά�|fX-ze�wfgUg&c�;���5�6ugh��t��:uF����&G�ǝ�]]�+s�V5yx+�C�\�+ʡ;gJ^��E���+��U碌W�Wh��饻
a��g
�Uz���$����7����`
�e�If��<�}��#�L2Oz�d�$�3K�̓De>eQ&��a�'��R�;z�ج\�*��a��Wì9���eR�Pgq�&�[Fh��8���;�*i��ծEdw�+s���,sذ��z�!��e���W��YU����\sU?�F�9��X���nlz���|�*��ZM߭�.:�Y�o�_ƪ�2;��tU��=�麓��]�g����.w����w'��i��k��T����;�E��b�=�0[��]i7��
�]��y���<D���_��|�J�hVhe5�a�j*J*�~&��)~���j255�k��*S�S�\m�Z�Z<^I�đ�Of��J�)Ҙ��Gydk�������rJ�*��=�}?J��ؘk���諆>w�<����fj���ΪQV�-����άR.���5��~���*:�����!�1V}�N
+��Mh,<����K��vUL���,�zU�t'utt���I�a5G��OC��/�N�N�1�L��j3�7�9���G��a���%VVa�9�6��ޤXVVټ�ʈ��~}O���&u$���@���n��a����4�k<�\��sU�ORޕ���n�]eg!��\dx��Vu*��;N�K��O�a���<ʙ"Kz�(E���f�ʶ˱*��r�����Qy�1���7��zhEs�=cv����a9�2Q�o������,�U���Aˇ��p:'�!ʴQ���)�F=��9��9��\��L��v�fY��3�?�/}�DIN笕�Ie�k�W�3��I��ҍ�>�;+
+Ν���'	�T'8�YDž7=�zM�-��rS�Ν�ԆU%���N&�ު�i�왒aNY�5��fe�����LD�I}����I�T*H���B
+`@�C�(H�p�8*��V)�SSN�M�#X$w-�hp��w�=&D$��*�������W)��#E��W�+#���f�����BN;]�lF�MS
+�>�e����|L<���nr�<d�4O�5�f��ۙ"g6�4'^掖��Gߝ����M޹'}ֹ�xVyx=�i�/ˆ7E��t������z�/�H�~��B���J�v�:mgR>�$���L�g���3�͹n��z�l���z�鹪�f�>��դ#іru���"Ĵ3^%��&��*/��#����/�4��Xa��Q�OY��5VE�'ٔ�2/Dy!:�FU�,[���b��s��q:�U��ߍo��.)F�!1;2��-��p*}�Cx����JÛ�LZIj=�R���>�W%�Q����q(Kgg-G���Z��&�}�DGDfcS���l��,�Z�I^9d+%Z�؉nhi���cfǪ�|�f585�Ŋ�'�k�v�]L���Ŭ���*���}z�_��d���֙��ֆMI��~MO�1�B�^ˤD(Ec��E�Q���u�]S�=�֑ϻm%�(��3ʗ ��FǢ�<��6+�A4&Z�4h���,3F4���_,��Ƙ�:_[I��|IG�+��y���RGI���ٺ����_�K�$;��p|��I����̓�9��l�;G:�5�N��8�;n�������\ֽ�q$��:�u=g��Qˡ��3cf����+yf7�;�ik�A]���qd���yp���j��<�̳�1���^UOȎ�#[���hYh>�ю%�ʳ;"Jm&/������$�A����ZJb�g�6+��9�v����Z2�7�%��{�ș��"g�v��E�����)f��eu��r�P�	��+�87f�%hiUW��m��wW$����6��Y�3�/�Lhs��}6��AFgg��q�#���nr���	���{Oɩ��d����r�|6Ż��^]��]�k�rw`��9g�"��䫒�g��U)uI���u�C�)˲��c.
+�VuOZ���WBfUӁ�W�Os��}�Rm/�\mV�4�յ$��βe6��tw�=o�*H/�R�՘�CSX���3�U�W2-4��ū�k+S�ʘ�]��6y�8�"%:]�=�6'A���9�0o�m��v�j�{�Wh��,ׯ�➚��4X��U�M������P֊�3¬&�9�8��]OB�W��[�$��ѵTgլ�Q�:�z����NғR?Ȓ����G��sAt�*�:������I)�k�芙�!�Q�Ey|�&���d7#ٜ��f�d�[�dy���<Sf�k���j�P����;y�.���{Ib�b4�g?�c"�Ȱ0��Cvns�lz؎��2��+�+���e�HRc!��H�� 84E�A�`~���F\0���5��1@��	K��m��o��������L��q����X��U�p��C��������w򙴁ƾr��Xg�G�;���sL����4�_?D����$�OLY���Йl�Rx1%x�ůGWQ��IB�#A��5Pw���A"92����0ՠ����S�����q�.\?�h׳���~��,���oX�$𗄜�8����P��霿ѥ�ˏ�h��I�j�@�����ӌ���MI�@�Dڿ��%��h[�����/I�����W$0&��;�����V
+f,I��X�$|A�!�^��tu�C4+��Q�=�z���J�A����vl�`�~��;��V{0�o�Y�F2rQ�j#N����ou"���=�l���W��Rޮ/�'ˌ���V�,���r�^~SW](��L�Ϥ�5^�N���U������#S�0��e�3�,jST�Gϳ��0��$_WT:
38�sd0�!���q������
���;�`���F�x�v?��mTrK��wt��
��ͺ��)]h�+�s=~�n�̞���9�ñJ�Ue�������0j��h�z;�"��p���*�عF
,.�6q�,Aa2�������Z-2�=g>��uڲ�BX�?�d|���[K��i�zs��T�5
+��t�uM<�ŞH
+�
+�b��Z�̠�d=xdQ0ʸ\
I��hѷξvVv���FVݻ����r�u�c��E��B���	�u+�YL
A:�R#����yĺ��)Ì˺�:s��� �k��0�l;���U]�E�ƃ�D4|�T8�+蝻ĵ����U�&���j���A^�'5k�T���f2����7ŴpX �ܗ���f�!D��l�ٍ�j�'��k��o��6�9M.���n|�h5d!߈v��^���&[kt���>���8C���C7�P;�c�]:B��چ�f
6�7����˜)���������o��("�6G�	�7�t�!��F�w�Am	��d>���֓�/�}�����s	��Z@��Y7�V2��8��we1}ځo���4�:���*�t��_����`5��G��+���N������0{��_
&d���[�Ҕ�4�6C���;�y���v�X�eC`�C�\$�ge{3}߃���Evv�2���h����!d䲨??�%����
��p7�Zn"%k�X�dC��$����Gwi��������s�CnQ9��*��H��e��2��重����t)���ӠB��A��
m�'
+�z��Q5��k�ؿ�`�p2^i��@O�܏����ә��ZϿ8ϟ���^�/�]̈'���GMܻ��[S}ȃ�0�~g��,+$���_�n�DWOu�D������	�p��N�iL���㿍��
+'t���#`r��B�|jSIC`7ͯ��R�6�A�{�*k[t� ���P���g�7��T���@AL>���2��UR���������8_XR
��D�t[��~�պ�;o.�B:�Q��%���e�<�TC�d�␘��G�0"����SW�#qpg9 �|��/�����2�WT�=����(
��*O���|�?��,d��>@�Z{pV̋R�7�L0���@�H�M;!�V̷K�|,R�E�Zwx��S���m9�F�e�D��ګW�5N���V�ct�>���$�q���D(�Y~�WS��#G8�!�0����	*�n�u+�f)ۉ]����"�%�I��6.2�+>,����Uyey��tN���U8'���vpP^W�ة�gdnA0�ch&?��0@<�MP](�HMƚ��R���PE[Q����Z��cP��$��m-#����F�ȅ�X0Iv���F�>�m��L��H�h/���^���T�
/R��x=���)C��2��y�e����
%�@dh���`BG(VgN�eGDh�l�����6��4�c�`|ظ� ��h;��A{������_ ��>$5�n�R�x�.~�.U�K������`6��p������mb
�$@Y@hd
#tUb[l�3vwk�2��Q�K负��*�%j�	P����,{������C���:*@�
�R��b;�<�Q���E
�υ�����TTW>����x��g;�4n*��o ����}�ҵ6N_Z�x�ByOJ����@=�k�|�|˔)�ԙm�N�d�x�CB�	9W�F�n�]o��Eu��&ɦ�G��^�O8LV�t�&�حz=�k�Q�F^.l�$�%Ɂv��)�Ξu��� q1���	޺�#2��V�[�n��_u�)�����0��LYRI�J��%��`��z&�ɣ�W4Xd�'�v\d���H֮XZ�I��g5H��m�j�E�0y���
*n�R8gz�Cr|M��[ѿ�Ɍ"�jj��/V�W�-����9d����b�ҳ37�u�\��}�qyE�D�JmL�y���Rȫr����v�
���Y
+LY��Sizk����˙(~D�����[?߷�Dh��Z;ȟtI����>q��v�&2h=:�YVF.�gz[XƿZ���+5�`����l�v*�.eޒ�!�+��	��{���_O�
+�4�'���n�V?Df���O�N'�<|A�����?�bu��
V3
+���5f��K�U�*l�����4�
o���.l��<��j1u�O��Ɩ����9^-h���o"�Y�Iw�fy'�.;�;Dp1$���G�;��CG�]�Z�N��q���g�D��m0�,�~%�	��*"{�[54 ���@�h���~/$�w���K�����1�Te��2�ͦ:½�b����ߔ�6�+����4LU���L��N�	��9���	|}x'l>s�i��
+HN։�R�ש�����s��/i�K"����'u�yʂ����ׯ0`��غ����	0ϒ~����(g�K�����93\���k�S1��ݲ�͸o�'{]��U�(�x
x�r����rK�3E}�?�T�`
+fX���zFo	LPe:��Įw�4���=׮C��!w�7`�n�&�6�� � L�W\�k�!��J����M����,,\f�fC����O
�O̱�
|���	
+Q��Ө����Ȇ�پ܀տ�L��-l�$�C=N
��;��~�;�~$��ᣉ�J�@�D�0�N-�[-�F٫��$
���"&ŀU+�@�!�E�� 68�:������
⼖�YL'̲�Y̕=��7�Aà�Zti���l!K|Rw>v�|�<��ٷ�1@��t?�)`�����c��������M5�9��G���A�J���
���^��³���̩�ێm,.-�N�i�oUA{�l���j��m�Ո��jn�-��.z1f���\�+N��m�NU@NI��+CHM+
N`H3����~�Hl��	e:��DrM�m-�M�ҍy@�$!�8.6%���tXVijnUG!�J����%�a�vgJ�ủ���Ք�u�.N \�	���OV@���ז̺h+]�!����q)5�eE�bi�o��ռ5�r�6���ň��fVچ�;_�ppy�2Sb����&q� �Y��V�K.�҇Oig�ݲ�U����g2:��,z��tݢ��svK�����!�P>��,1}<�ֈ��7%��;Q;�5��>�f������dF�ma}Z��w�	�N`�ȑ��Ǹ���`
Ķ/���@9ۖ8�P�jQ�n`8_�
Z����@��L��t�y���Y�W��yV^�bGI���=ʌ��01�(�U�*�
���k
+q
}�G5���kw�&	(ڌOa-���_�h��F�nT�e�
+��7��#��\:P���;��GH)�R&ryW�bz��h'�Ǽ�7�8ʊV�'q�z��Li~[ƚ�(��I�B��r�M�v�'o�����Vs���9�s�V}�X-�
���m��������]�Cx����V��&��s_���@�u���NE~�I�sM�"0*�	�K��"�9�a��y��o�0
�a<���ŧ���Z�M>I8t���w�@p�to�4�����(:([ߠӈY�*[���A��@��)	w}�?��J�6�Q08�qK�ä5SÉ�e��&�fC�ŗ�P%��<�֎E�)�����	t_�
œϚ��If��Fh����'�����)Z�\՝B<;A���fP�7&����xB��#�I�:��K�Ԣ�ܸ�Yw�']�J,�a!������~x�K���M�l[:O��6�`�N��ql��d�
+�
�Ր����}�%�@d>���
+�|^\��
+y�l
�����5	@���"�&�E@�o-6
�^	v��Z#��4���wz��8aA�+	<Ao��O_j@���NԃN��	�3�B�M�f�

z`����^�ڤ&�$ܐF�#�ɘ��ͷ�݈���i��D��â���}a��yH�`D
}���k�}���T�yY��m��q�n˾�__��z{�J@�d�hv��{j�סik���ȉ�c )@���K�Ƞ���Ȍ�܏r��"Kh��Ӵ*
��|�n�8
nC���n9Z��cS]J�t�K�'�7D�x�aR7��D�����k09[Y��Ԅ�M:��ۈ�M��c�΁.�*@�
��b=g�^7���:��Jj#�}�wӘl�+p`��^9"�����ʖ�TFO�`#
+���n���m�l�?����
�/�>1�)�)/ř�^.��=��>$�5&��ڋzC�W��1
+�]KN�h��$�))���K���J³�=�1&b�6�^�`�Q��/��.Z������y�06��@f��������@��H:;��э�JLi�p�B1ۜ+�����}4���t����/�ώqf7�c�jQ(��o�=uL'�"������k��(Q��ۀ�ݿk�:��I���U�RF��bSj���	��qu�4�R�L�P&�F�4���%�Lx	 �ZӤ�H����+r�#���X����m@��-�k�X�m�q�d]viL$��0B�J��]0��C�5�:S-�s�5��g�y�9����d�,a��Zw�}���(?{����\bN�](�`�l�|���?�h�i]E��)a;��YH�ZZ�i;=dy��4o;�~�rhj�>Z8��W`]��ja}
+��!�J�hxR��|_*�ݙ���^�ޒ�
.�
��)NW��}y�����m�$���o�k"��6?K�GD��g����
��7�(L������g�H�η��tV�"na4�p�	Eg�:�%�S:����[�ޭ�W>�`\/���-��:�ٮS�_2�9����a��2��M���C�3����:�~?hƴ��Q��d�K�{p��
�RP�H�N�\�7kB��j.�TB:�H9<�"�@�ҩ�������LH8Yh����:Ow�{�᱅������
����~ԣ�EJ��*���;&=�tV[�T�zE>E���� ېT^i�|8�@y9f<�x��7ʭ���L�0���!�B�|)DBy$f5l���'��[E��&Ɏy�ϟ���	������9���K�ËYm���OZ�����V�.��-s*�jmd
+������K�7��8�攨���x��i#����H�ŭ�P�/yw8w6e�l�'T��pߋ<UgS��)�Ż)����=5$��p��}�O]&���|ԩ�,�s�%*�+ݢ3�y�v�ѝ"��(�W��/��Jas��tӇ�DU�M
��ڂD�&
,��S"�*�rD|�	D�NR܆�p�~�-fC�����*�����1�!����z\�� �4���!Vu^l�۴ݕl��Y�m׷�􂌼5
+X�kv�� ��|ueܤ�(8�ȉ�ܚ������$�<"5K4@��9!�¢u�]��!s�,|����\����+��}�5�F
+�����������
_�w�M�b����Xe��2E��7�X�=6�5��):���%ꜗ6s*�\�Sz���~���ݢ)�>5��������4��Z������&��'�3��9\`R�}F:�}��/G@��5�-�71��W�w�2I�#�
ƒ�
�E�K�\\[�q(�5ZЄ�5�߃���%%cT5�
p
�Eގ���a40�����T�a�N��!z�G<��e��V
����=�ϼqNV!cd��XH��C�k&����j��|(a��X�Np�B5
+o�×�2ڕ/� <��ɇs2�2!HY�E^�$Y����>~�ij��V�
F$)�e#�ó��e���8b[�~�]�Tֽ�x�Q�S���i�����S�� �:6�_��w�5�t�՚���E�3�S��
���5����YM8��v��[������RpH�.܌�#��������#0����;��5�>:6��	ƻ
+����E�ʱ�"��RFM��?F�`���1%�9����f���͙̀A�+N$�X���{��4�VW����"Hš�7��q7ڔ�=>�H$rZ
+���`J�J����
���i]��H,�&/x{3CjE��0x-�G�2�dVc��=�k�į� �R霙��Z�T�@��
+3�@
+W�U
d�K�%;�^oq��H2���L�u�]lu��*�����X#�W���y�'L+�j�c6�jd����s^�� �teWpa�h���m�k˜
+��ht�wXG
0������We�!J���)!����fͶ�f�Z���n%G`	'��(�NB�rA2�	��PV͝^�ͨj�������lDa�¼�B�ɤ����p�
�g��x�.��dm�'�����	�w���1�S	�u51?�K�@	���f�li�%��_V=�jB1f�Z�d��qR&Ӳ��M�ҷ�`�yX
+G
+-�2_"v��Ǽ��HS-�0y�@.!���Fg��\d��9�l)�A���fx�IPm)23��ل���\X"q�yb
Ӛ�D��C���'3�J���y���lF��8H���x��0-�>2Hؕ��w���Q�
Ej��T�n��!P��ID�Cv���_����	��%�q��{{B��.S<�MW�*�pA��x�s��-1���D�&�
+de�SfgP�O���H'XW��ޟ��2^�V�29Ч�I���Zlen�ˢ�T	��U�2b���;~(7�7��0���F�o&�?��fo�",
+��p+?k��ǟ�u�\[E����?�CzZ&�D��3~�&g/Ogs|Q�F�Q��q%̟K���&zMXS����/{���B�C��ȑ]\�Lr������Z�ja%y��R��l�Ԋ�P���g���*F
+�; �N32��C�"خ��)/�\6�4�\�?�aa����R��18��!�j
J���2���\�� ꓯ.b��Ϸ6�����i�b�j����%��|r
b�Qe���lgೊ�G��`P$�a{�8ݨ&�D=N�W��{1���#;E��!f��yhx��H�����ㆄL���4��ɤoFT�q
4��^C�.^��(6�ǻd��e
3��I�� ZR��3ui�_�X$H�
+����V�1���XO�gvє��vL��q��~x�U�+���0�]|����-���=:1���z[ovQ���0\r�k�� ���t�(�-����݋��J��K��[��	�0o�0��K0?�EC�3�����;�M;xA�%�\ /пG@���l�l�ӟڶ
+���^��]D�^T�����m��e�)„�WXѥ��BcJ����4s>���LLx�
+؝��.;E�a=�U(C��Aq�q������b
�~���X�5�qQ�DSp�������ONs#Tm;�-�#���-�`���rȗ1,��K��,�@NMF�N���S-a^`=�C��'��]��������x��%[���W{��6��1떿&!��
+�ZC�`��".�:u��	��ңY@�e)�G��t|�x��6�)���*�X�aRPh~�W4W�r'@$�Yn+�N�����k0�>�A���}ռ������"ĭ�������T��K��)��1?f
+�/^zz�RA&�W���d�L
���"��n%����ݙˠ�s��|�ʢ=Ϥ���
[�0�<�k������
���6��Њo���!h�e��.�"�>��DiZ�5�q����ځ��)�i����K"����=�2ȅ(-�9PdA���	2b�;n%uz���
+��{�1	���2]
+&������_u59
iB��^f@���@H�y� �I�\���$�+����a��-d�U���"����R��q�������x��|OTK9�>"�
���C�!�	$��-��L�fE6�MYu��A�SDM{�_�s8�k��р3t)�<Ay}��5jڠ����;D<$�.�|DC=����:�%���x7�X���s0;�
+�V��#x�`	BQ�e<M]�bѨ��
.��R7�EW����? Hiڹ�Mr<	*m_[(	����l_�
@-�䶎-�<�n׭$�4j����A	�����ͺ�Y�\�b;�Dx�:��b��w�����������/�O]��4m���V��Y����%1>++��FY+�U����~�'�����'C�b��~�qǠ�*s��n���&Tq���i��5�am7�zݾ��pǔ
����18.�����Ǣ[
+��
+�mV�x�Y�}'��e��g�ĀBem�d��B���]�q��
��g��~^�C$�����@��:�]�j�m_������E�Of�)gs���1�`�Z�F.��qg�2i�+�ܢ�����ꆹ��{�=�xf��������V���"E�s6)�f
+�Sa�{2��=���\H�12���0K(%��L�ҵ�;[N��*��V�-�Av�m� �/VG�E���p�8M�«�	�
׀�����i&u��K�X��?B����Y�(���4$��i�Í�D6����,���32AsR/�D��ꡥ����y��s����K$Tb-P*k�]q�3i�����j�G��+3�1MK�7�8D���a���D�G]���+dq�D��V����K��W*�r �dP��c�웃 ��@,�1�����]S���Z������&�3��K����N��]��7�5�g�=k{kQ���H��n��L��3�XAh��KG81�D���$��%T�L��]EW�'W����oTj���&�k�����r�
++X�W�]�1wی�]D� ~,,��i�C#[,
+ˀ'���)��+_f�ف�f�	�#W��}n�������j��@]���m�6R��1��D!�\eձM�S��Ѵ)Zz:�W��u��q?�@�<��!ˋ

+�=|A�����2*4�xQ�hH<
�����/LJMv]��6ş�˾q4�ۂV����s	��4���5]�Q����Kh�N�vDA�I6"���єn9��$榗���h��k3t�d)�R�^G��T��,��k�I��55?��[�+-,U*
ø�
+�Z4ƃS#�8�����z��A�uI��J�z�ד]vG�Vs�ҽ��HoT�O$��R����l�(YuQ.�(o��V	���Ο�s���Y �ÐOÐ�Aor��ۢC?o�;*��\p�LV�ֿ\����[�|���<�3<���	��]�B&���df��QT�]hdq ��n�i��%NO3�*�|�Yf�9�߁�6w���`41�/�?S~JZ@��U�gӔ��A���Uf/������F^1�����P���� �Nۮ�$��e�RcN���+)����%�*
ue-
+��"@rNMakk�+]�|
2^�M����-�`6Y��!u���$�v|�ͤ�Ŵfq��LĽ���t��*�ښ(
+`Z��������,5IK���j�.Q�P�+���٦��J�.��cW�w�CR8�������L�Bo�i(��z�O�ׄ*G\���
��e1���'`z������}�$�IF��,o�k��|.`�Gi��Lf�N�C�r��,����H�����rL�h
+��Y�ؼ]�E��6���0B�ΉPA-Ɔ�{�M?Kj��^��f�|�5����� 	�]����B0��L4��:��'X��yLQ�<������C�7l���gZ���2����PI	/�)�ט 9���u��3iȂ�KT�%��ȈM�q������̖h�!��-����b˩$R����nĔ�X�|���"e�#�*R��BP��|�PL��.%���Ӳ��X��G��Kʂ���V)�Ɖ�%�HS�i�(;�3hKu���@�(]��'���� ��c��L�G�ii�4ټ6�Q���UF<�E��񤇍��9��2��a2t��W��������,"����K�� �6M"ˢ��&Z���쌻��������z�eۨk�����"6����t�%e�\H�����"G
��0J�E���إűM��=���G"}�H�ل�S����`")<�%�Mݧ�S���X�	1ɷ�}.���A��u;���j�.046f�Չ��z
�oy���RL\�a.��U؋�٤+�8����Ԍ�@3n�DX+�8Ӣ�)����o7Ʀ��a�<�3o
+cqиZ%8���C��xD� �3��LCj�Ƃ	������fb�Cs�`"b4H�9���_i6LB�M#��aӁؕQS�詡��IXUH�Υ5��
p�ר8
��6;6���eӭ����3(1�ꩍ�/Ƞ�	az}h5�L���Aۻ2����,��pXp|iF���O�
�{�h�8�Xh�P�(�r��@Q���Ȃ�'u(i=�r�@*-�g����W�ky!���rMp�a�& ʬ�L��D���8A���ج�783�cV�N��/���Y�#b3(�b3�G!Ӏ�e� E�+؄�)�z_�~�=p�
�^F��xy^�<�����Mmx`iN���[�ǽ��j&5�1/����o��m�F��̗I[LGf�CTң�>��)�(�~�b7yA���.��^㹐�ЬQ�ҩ��2;4��}rLPH�mzo�SRR�ޒV�n=���e$G���Y�<�?�H	�~IGX�5�h�T�Sd�R���5>)��]p�G�
��Od}�P��zMf�Pi�<et
+��DB�5�և(�;ߵ4pҝ姍�d/u��a��*�&_S4Xih�����>� �C�q�7����q�������G���Q&�(٣Q5����?��OV��&���z>*����2�ON�"��N�j���)Ȱm�js���3�����`+j�BQ*|�LRZ��'�S���v�����^�Q�=�Tq�l~Y��ߛ�?�E@G��D���4ɘ� �@�IY�䗗͆���|ረ2
+S�a��li ̤�o���`CAۑ&o���{���뇶
+.l�T��B&�����`4P9EL��St��i���C��
8�� <��d*��ya&c:KG(v���F��F慧{Ƅ.;�g�m��b�'Z��A�愐��Lj~�"�6d���U���p���)��+؈�S�I^�P1�SO&�D%-Fʳ#�@i�kgo�="�d�c���7ũ�`��L/�y���2S���GJtZ�r�e�.�B��{_��T(�AZΣ���J
��~K�lcB�Fû�2t<F���yV|��%�‘Gh�.�{����?�X7	�X�=3D���G�w/��jN*%��zͫgo���������� Q�=��ǐ����[4v031x]���L��X�V
�tt�Fo�Ieg]*�P�a��R������/_��"{�:��>ǩ,�P�Ӊ�3�z���2���+Xʐ�
�̠�]*u@�<t�2:��&��۔�����ROQ���Sz�Xv��;�Q;b}y~a���M�Ea����� �8�#u�.e�y��xEO�`���A�̡�d2(9�
�l���>	��0�O�t��"JZ/���ї���d6`�%��� ��<ƌ����db��#�F^�4"r*���

+����7Wy��N(ۢh-=��>P���<�ף�Hs��	7@"a?Ax����t(,7�#��~h[S8�CI����`5�l��M�М^!.��g,\x!�?�Y�4�P�l���RQ�)\������ق�CK\��a���ڃ1�0�H!�)��
G8�BDdrl
N����-�q|�����r)\Xv�	!R�a�\���~���:L�E�L��g���)D�P��}�f��A�C��@Ⴤ��]�$GN����j�<oO����O��N~R�����]:�4�*1�AŞ贍�N�m���u�
\���(�z,`h""�8����|j=n��ei�4j}��U\�,�s���%�2��Frɜe(UF��Z~�Bd�p�Zυ^5�"��v!�s����z� ��F����^{蘦�z�ݸ3�Y
;ᗓ�
�9��xD��y���GD����*z��?��%�l�g,|�	+	�G�Z"�gآL��0�Ѳ��Y�s=��*��y�1QC��������Ǟ��E����2�Q�
��ᅾH'~�-rK��e��F�@@tE=9}�=c?8�Dme��)�%D
+~�>Oߍ���y�[�-��ѢVS���Wi>j���V>��A'wb9(�:�*�C��BE8��\����m/�)G��M�sX*�#�;�GF����uaڬE�yO	<@?X)/B{�0�e>q�Z�p�[�9Jp�;(�BhQҽ�W/3G��@���*��ZV�1+`��L�E1���_5%	��ܺ��g�P���N�p
+�n0��8�n��O H�3ǰ�ɔ&�z�0���eP��HiX�
+����w�Z���.f��{�2A(�w_��������⥗I�m���<Ǔ��jL
+=8t1�Bp`c�.(ŘN/#�SP��٫}�J,�-�v�f���5���L*��a
*:W�|U�P��žpF�[)E�a��J�C�;�{��0N�����珮}�dX�ɗ3�_���U�ˋ��P����8�
+��2&��L��6p����nވ�69��Y,�:��:�i�S��ĸח�B��h?mIxK
�{��r�
�>:��X �ƃ�J�
�;?����S<'WZlO^=�Rz�]����8��j)4����(
�^��#/�G�K��҅އdq����$�a�k��|s�_��٩\��z��I���EA=���=
��:ِ��`��V��)�#�&������¥����I�R�e*�*H�� N��B�SָRZV�tꎭ1�֚�1�q�ʦ^���Z�/����^A$(�,����|F�RKh�@y�uI��]f}�z�9�]�:w�=��U�j$	���_�H��8`h���NjZ"��Ga��De�4wY�\�	��/X���*�O�'��|Ȧ
+D���Y�+6�*\��+50)���q
+�)@gU�kK�5H*�"�YO��6���E%����ub80��fM��a��a�(���72	9��3�����0xQeT3P�vyPH���mXG��m�Uj3���j���ż	�fs�
�$6$�]e�~~��}/a��A'���q�=��� ��,�x��q������/P0Pr��`�5�
�}�ib�E1t�����$"���G$b+(�~|9����C�86�Ď��N�[T��K7"_)?���Q�Qʮ��WwI
+)�ǎ��q���v�k*�A�l��V��Mkf�\Y�f�2r*'nK��3���\,�^Ad�ƺ��"U�g2���Ʌ�Q9}�F�����{5���a�L3��F���:p�>(s�7�I�F�5r�܇��C�w�;��֡̕�ݛ,��Z#P�ˣ��*1�8慱�ġt��.��Œ�Q�_�Z��L~�z+vYOf*	D�!v�x'��\N&�k�*����1�}i)_������^I�)���`KDY���7|0���B��<)M��z�*�Zx�0��b���n+y�q���`UiV���
+�a�Do~�>�ez�+ٖUeĪ�F�4+��""+�ީ)x��G��� ʝAQ���f;|���������銻ʲ,#�Ճ1�L'��y[#�_S5T��[u�3���l���-n�4�`���ƝC���_6bT҉�eXA�ܜ&��zr�R����<ml�E\���	�����	|[D�#o�lA_���C�%�:J+*W��Mq��i�`�k��k���(�@U#$����@}r��i��*�w,�u��0Ɩ�N�W;�,���˔U�K9�{C40�r3��S8�Ő�Ѻk�Ɗ*�M����}A0??��b���:��J�g�9<c�-M�F�	�]w�=��|Jќ�
��cB��06�����@��?R΂�Dtݥ�d���=
�V?N&ȗ³��9
#�{�H~��U

"�:!U�k�%�`�o	�㖶z���G+d-c��`1�ɂO�E��lN��Y
r����*>[YM��zٽ��D����^�I�H�☀�:?g��h����L�J��S��Ti	ozvi��=��	��х�h��Z�5��J��)HW���G*jy�uAՇdS�H��dW񵍁z:§��ZZ$�I�)
O�
+i’�j��=�خm�
�5��7	"�=�)]C�[3�
���w�3+'4��b,"�u%�1*c��R|B�$�(�=Hle��%�4[!.�XjI�l�+��v����rO}F�&d��;��#�Ytƀ{�s*�� ֽ��������>xh�*�����p�M�jYMn;�[�,g�2Wy���HD��]�+͆|�VwD ��d�����pP5S���%{�P��h�ĥk+F?��if��;���&��>H�esȘJ��T!V8�R�B�&�I*�JMS-
+��E���|Z��kQWiD�Od()5
U��f����@l
+��=*��(�ߧ=,ͺ�\H�2�x���S��v��N�����#9����f�n�6	�֚v�4
F��+gj�)N�i�^	��y2=<|q?S��,�������H)���2!o�О�\dI�Vb̢x$y�e()=m0��J½Itv���%�$J�!�P�uÑ&҉��3�*���x�iB�F
++��V;YT�;jՈ�@d�"���"��F�YF��/|@�E9Yg]5TX��%J/���P����z����-�y���ק���H6����DY��P��P%
��t���Y��� ��_�������B��[o;���0�
+cM�,
+:�Ki���'gAQ>C�����#���m�T`k&	�Ozw�{�7/�{�0�����cT�<-�۰���J��uB��(jY[i��
�9]�B(\B,8}�[]B��,#��U�i�t�%�DnO��ǂM ���/;���zh��A����4Ǝ:*�Cp���?�
=��;���-�̉���4��ϒym
L��- ��1��xRo P*����^oCV�����>���r�V���J��ZC*�n�5o�3�D�v;�'��	�AL?�pv��U.n��ѼsU�����]�����JP�=��N�^6��c�� ��
+�S��MbӫЮ�Q2$j
+��+-:��u�J������E�|�%���ۛ���Wժ�LY��/���}��@�k���Q�ho��
ۉ�m���+����.������3�h&rx-IB�y\WX%�/�����
A`?�]���~�Go&
��4#~�<���4�-:�s��&��B[��E�1F��L��
+�2�$+��Ou�ۚ��`������l.Ugojm�C�Q6�@�DP����
+
+X��1��֧#	�F"am�)�Ҍ&.(\b��#�M湏��D�3sa,,T���I��$�'�)�g6L�#�f����,�G
���1,�������Ǧ{˛�JyH3Z�E*l���R��1��s��)X���g���A�dV\e����Xo����(�n�S�z��-h%SyY�b�kY�`��w�뫘������N��#SX�^0T�!��]=�W~��yI4s��IΎـD�?��~���?+�-�7U��̽��� �����|:e�����W'֜]2�#` `ay��`PE�Ug�]�Y�Z[�?w�)��c`�~��B��`]��
��-��3��6H*���mf��t�kU��Z��lI��u%l?ȸw��2���C! J(��d5�[%f��ʞϡ()��}�n������i!4�cL��^�K���`�un�hc�<�[H�nl�&8�,ɮ&0�h�*:�>wh!˾��({��*W�cVh�O�/���7
�9b{��B�I�a�
�Z^�;��ޱQ��̓5[�����O��2kp&��n����{ү�����Z^48`�#������T�j\X��3Yɹ��I�1�rc#rd6��~��4�1:Cܮܡ�G2N׺P�����x��|��ȧ^}^�J4���c�S%l�
+?K�y�3H�dA�ʉ����7��wVX>�
��_[p@�2�;��>A�s���91NL���1b�o�D���%�}�s��`A\^_�S��)�~��������D�����_,��5��2t,���)P�Ŋ	k�E���
+��
�82�T�[^�����TcJ�l���u~�G�	���T�H��I�
�?�W?�0-����2�,�~!�EE�u{r)cJ�����1�!�����:I?@�D.����̍��6��H�Q��+��l8}1���z��@T*8*�=�#�e]��0�`$����j%\c�>��(2[��p(3�>��O��}�c��1
.�(�������G\
m�f�9����5%:+��`�>��\�
+�E/��
��M@�w�8�����TF�MMI�<�{S���F���e��Hd>�-#�S���w��Z@۬�"�x;UD�L�_�_N2(Y~�΀���p��~=�w�=��i���	Vʛ���umT%���i$�gXr*;�U�˅ud����S�]�����?��@y{�G��=)y�0�秞q-.�=#
+�a���3o��ۼ���88��
��l�ZM#�����>�b�N(}Ob5�aĘʣR���jJ�w�[��W�͍���%l`�d������1����^�r�R�{��G_�����W[]��[+t�Kl*�p߼�߬��������h�߅�l��t.���L`�O��m}��K�BѶEJ�m��[����`M���o�YX[b����Q�1$V�Db���
+��̰+v��hL#�7����>D��O]��գ��Ĝ��$B��}����V�}�(����K��@^�1=^R�XiƱ"��ʦ�`�T���f�o�Vw1i�<�Y|M�g�1�#Y����(;��>\)�4�;�����q��p3��}hw��+�6��m�];
+f2�V|?;Ӡ?�J����
+�<߲JL��<���<�M�\L2Ug��s�"��$���"�bR�$miA-?"G���j�����.���V�	I@��:#X'_��{M6�
^5�6�a�u�����z6�iE�t��Q�f�����Al�f��ڎ_*`�<�|7��i��,�	'�K`"8����=����=牪��H�U{Y��im�=�])�۳���~�s���
S�V�6�`����v�o'��@�N'JM�&R���Tͨ�7>a�(�����(�u'�y�!���ى�*��o"2��8�n?���2z��� `�(_��"��0����ih��w��\_�2�Y:J��y&c	 �E��O�}Z����[=7��g����bU�V�r	?|���k�6)�X����ǖ���:2�\�f��
+���#z���~�e�R�����ȍ(�	�:|]aV�X��&K.a�
�z�������������ܷ�	D�����I�ώ'��4�8,�
+q=�z3�U�!#X���R��7c
+|��)�h��6�hpDowI�~,)�b�P0�t0H��b��SS���ߺ�&��[kN�y�Z��PjU�!iMR���J7ܸ����I
y�������ڂ�LB?1%�3�����p�b��0�2�eGSĶe�1tp����&���0.D���ͨڥuYJ�E]鴦΅�k��%WB
ᚥ4�@ꇗ�:�+���R�~����h �Jz	Yȁ�h�k���L^���[�_C|a�dT�{�i]�[��8�J�f�d�
+���xUۨ{�vI�][�Vޠ��RKK��a������ ��	�d���QƐ�b��M.yz����[*2[)�l�ؠc�3\l���&��*N�rJ��x�:���]��8���D��;�R7�Y��m��
+4������؝=�1�$����K��;_2�O�>��@U0����=�頮��M���~�כ�o=��g��ӓ.��bL��� �nb��*�\W:�^
+�G�"0Bt�� ���I�w���r�4��
+)����;L��=�!�����޻x7|s{A%�E�����k�Y�G�qWPS�;�� �a�!�3_��^H�d��u��K�VP�>��`oJ�7�}F�=ͧ��@�q��6�
+��!N<��,�8B
��[Œ�N�B����lB�J^6�@%1H��!2�t$��c~���_3SŘ2��ʘ�\
+4�ѓ��a�[��X-:JV,H��D-�W��]�H������ &�ڂ,}:$��4w����Ĝ�hSd�K<��Z�U<��
+f�~�$��́e`$-2�S+��1�5�r:6I7�n4>w�"f{�x�[���lU����#��%v1�K��,��������4�|cE���a�#�M�,y�
�ڳ0��3_��a�f���d���#�¥
CJ��^�	�v� �	�G(N[�F��
+�nG�+82�	�#:�4kR����_��M�ITz���v�#o�����`J�NT�l��
hF���PГfQ�eEn��2��/�"u~��G+��I�c;����`����J�_�۳;[���j��������+|�ᣧ]�l��b�.
+j������wd�J�_:�2�J;���D
+�5}q�Eiv:�����:�n���M�K�e�^�q�l9[jK[�7�󪬒��Њ+�ہ�2�ŵ%�����*�zQn~T��\��~G��Q�J���a��d'�*WD%#��S��}�^�Q�ު��4��.����w�<� ��So�T�&v�=��Mb�W�f]����FIA�P>e�������������1.إ�L�����G�Rq�3����ҿJ��ʼn\B��ѤZh��g���NC��������<�N����%B8��B�
+N���W��0M)1[ �+@�5��SŨ���5�eҬ7��d���x*yN#4�����n�߿3���F|5)��9�-��v�Mr�V��6��d����:�ȼ_v�я�w�J�'�M`L^͊F�h'_��q8���GlE����);�<��5���G��8fۼv_��J�s2'5��j���������Ч3p�ޗ�GN�S����6~4�?d涼��j�b/y��ZI�z���z)���t(T����k'TXIġI��Ʊ��x*z�\< ~�KF�ŀW�����)��˴˻�=��ǔ����J�W�mȡ��a����B���CD:�z�L;� X��Zד����5�i]WH���x�E�Ĝ�Q�X谁n�خ�����9-�I}�!��*�������ƣ��C)*�mz!%#{��A��ȍ�m�8�����Lp���q��#ܒ��6^>G���0��(����K
�`�̏�v\Z��F^,�"�j�<N�*xͪ�Ph�%rFTm�6/�-�g	�X�O��\�(�Fs6�쪃���.7��a_O~m��a�d��g���Ă�k�\��&];����i�V�����@0ȷ���f�Z
+J�n-
oT2���ia���S.�s�
+��K�<��7���$� �8>�1��A:
)�J�����^�p����Ÿl���(�͓�A��i��9ݓ����^M�b���N�CmMsOi~�3�b��3��i��*y�Ňjy�b����N	��$�����{��Pi{x��p�\�%{Z����-^�E��VbF��U!���4���Χd��,��Hj�4�n��ǔ*�y,F�=�{�!������*��2��BA�U7�(�)�hWR�|E/��VS����zY�`�Y1'#
+�?�nu�6��G[��d�/Ŵ���&qr�-]�K	����ꢪ
+d�$E�:�,�X!dug�A1�.����j�"�<������G,��)W��Ę_�YDG�֔�J����5D
Ͽb �R�t4Y�}Kck)O�E*4VN�srYL,��V��Qr$-#��u���h&�>��9�v�K�v8��s��bE��&ց��&�zR�'�0������X�8;O�>�l�%1y��.�m���� ζUǩ/��wn�x���q�#.�g&,��W�����	�h�:PB��D���̍���pNbK�+.*��Mu�NJ�?m;�������bhA�Ω�y����=N����X�9ِ�'F�fD)��doO�@��W+�"�a��!�̇�jo��En6��_
*�H�Z�n���u?H=]㢳��Y�G`s�34ڌ��c�����%�Ic���HLef�C��J!
�>��h1a�7�+�7eG

��~x�R�i�W�%�q]P��6�HWU�U��y�g�Zu�.0Q�\Ԧ	���X�n{��>va�gfy'D�_�V�1
Nm��<�����Jb��
jP����[=-��bvЈ��x�/#m$8o�Q	�m@\*pm��q�LrZO��,��C\�asL#���5��q��)[��+?"&(}9�V!��cd����-I�0/DZ��į�KnMY'o��ks�T���@
��G�����_ͬ0:W��Jf�Wv��W��L0��O�q�\�a7�p���:A$.R���2���TXGaQ�#h�����X=m�����ׇ�c2<?H}_�}~����/t?R�|���'�j{j�>�о6*,�d_S�_(ا��|��:��ur��\����oL&�-$�DJ
xُ�cJeADZ���3��Xr,�,�s�[
+6*C��D��� 0��}�X����
���
�l��؎|����%;q��#�zq�^�e��u�v	cnr~L���{\�K�~�Q�秴��7��!��CE-=��>2�%��j竩K�ћ�w�v:A>�7��ԃ�:���`���l��&S
�ۣ�v�Ғ*��֘h�čtl���ܐT̅�����m����]+�ץ���	����\}�������gk	��}i�}x��o+�i����	��֯ˁ�O�\}GU�.�8S��H����P�~<�h��C�"�P���A���]_�Z~�[�2�@�N.�IL_����-�Vo&�s����I�nΈ�����k��.y�P��x���\~�?�Lmd�M���"6|��i�F���@�A8k+ƾ�YZ�{t��
��s�ۙ~�ﮀ~j^�5*�7��ܺ_�~���$��qd�@ g`�,(t_�eU�2��v�ù\��7�İ�P�Fz;�p���Ӽ%{��3��:K��a:��c�x��㵱�{���C������:��x}�;���~`V4��pz}GeA�d'f��t뚦y��� ;s��\щ�]�J\�/��6���BM#��򇈒=�Il��ƫʫ��
Az�m�4���O���E�y!�|`hꮌ�A�S�
I��T_�<s�������_��a�>+��
zM#�Sm�x�恡)*Ce���#>GJ����R�����R�Ϛق����q���˵����V;�0f)ST�0(=J=�'mF����rIGH���M;�G���H�
+��bt�� Y�5�>&�,
�sMѭ�e���`e�+�
�6�&�������l�\�ܢ�2`"x�ploq�F�9H��Z@~!���4r����W��Y�Uu7U���4UR�*E���#OE�JvI�TL��R5�T{I�C������'�!*6*���]���?q����ܔ�ph�{�O`u�X��K�xI5�ȶܦ�6k�b�3�S􁨅ͨ?��Q_��Y���7F+�"�[?���Q�op�����=��5�	�_0@�Oϳ�1���^K��7sO[���g�b�:	�*"JUcY
��
4ρ^���9�V��!;y��/�X�ۧ03hc������˖'[�ͦ��v�xhW�
������"�>Q�O۟�Sh;�X@�:r���Vup؝��-v3�~s��^�t-Ѹ����Y�-�AbdU
+99^	��{��� ���������Lc��ޔ1���d�?��L>��Kn��r~(�WNGP*�����'�|�{�S�t�Ƞ ��|ទ9�w$t���}_|���h���\�J�*J�**kW�C��b�a�R%\��'�}BfE{cI:a��d�"���Py
�6���Ǎ8B�CB8x�a
�[�F�b���7�����c�4?+ƪ��Ş0��#Z#+�����\jJ��@)���G�k����k
+�0&b�I*��^ޙ��0$��J�B�Y�P�g�v�N���)M3�5,
i\�]��h_;gm��Dzƺ�r8A�.�4��uT��	D���vF)@h+��,:�����7^/�0B�G�	{��5��
o*�۽?AVU��me�5@���4�9�m.�y�37J�����)�m&ӿ����t^�	L*n��y�.5�2�Ҩ<�����0��y�@��b��nQC�s7g�����5I�t���;�)3-i�ZaN-�8�� ���)/��[��~VB���5>:�$#_Z��7�~6ʖ2�V��V�-�����\=z
��"�|�\‹�EB���������W�]��7g9R��:��>����r�M�����K���ߞ��^��n{��>^�)�]Ejoި4��x�F{g_�l*3"�M6{Bl	��IUr~T����w�nX*�[�>��ݺ�,!�w@�s��o�K"�`X�a��@DΗ��^a;�nZs�j}1T��B�q���!68?#�H�r�W��8e�1,M$0�>f+��I���Z�-�XK�2��V@-���N�,U�$��;�(���R���|��76C_�o|�3 g!��n�?!�?�pAɑ���t��ߗ݃��u�t�l��R�$�����������R�Fb`U�b5��P��A-���̉7�~9��a��Ć%(&}.��Ge�%ʊ�j��Ls"��:������)/������B���q�y������CSz�o�*CL�
�T.�??.8]�:�
*�R�->��Ks�<<%]N��|i����Ms�֐)����c�-��3M<�?� -/����lO�W��}1vN�����=���thdbn��`�1Q9(������y1��4�h�������?��hJZ�(��Ϧ�	>��辤�E�:v^����F��2�J*�%k�8�_��P���u�Ypx�"E@��c6#\#[��/22"�nPn�{�.a��4)O��pAaߤ(��ι�����E��R�|*`���Å����pZovq�XD�X��Xȍ�W��������J㮰6N8Uz���3t6"�O_���_%�L�c��)��a�I��A���;�|�Pi��0U�*��ĭ4T.s�]H����d����aZ�Ё���J��S
�;gi_Ұ�J�7w�"H�Ӈ�!p��m2�V|qVd�	(0��!����s��GrӒ��?.�K�XOx��:��XP��#*�0hk��f=��
�A�I�"�2���J�O�2�i��d�Aa���u���,=����.-j��_�\b�D1"���ǡ�v�R1A���ƒ��y9�m�|8���y�
+^��]���բ�8tuj�ʼnIu�?������\8��ف	`����r�]&_�c߾`�Z���6�bd-j5���'��G=����z�V-մ��Z��-��30��-�x�`]Ξ�a�����k�ws,A��N
+E5�H]�-�C���8W���)���$1{����+����_�B����3��9-7�3@��;�WvҪr+8Cݑ<�z�@ri�r��q��a��"�7r�JV Ax2����I�i'T�%���s��Y̅D�!���j�րb�K����G8���15�ư�]�����v8j��<��K4V�xC���$
��:<_�(y��3`��	?_��!���-]uu�i0�o	����b��cW+��-_��
p�7��^���on�H�I�$>����i@�Q*LC�{����j;��YaI�?,��1)I�8�#��q�_׻����d�Ҫ�+���{�5L���u(y(i��cq���|��}=�ۜ�KTO��B�jZ�J�5��\g�N
-�B/��论�����L5y�Kċat�88%j
�{]b��x��JCz�A���7��0QF�bP`���יl�ۜ�����.�^�Y�y����l��P����ͭ$雡װ��|�����i�+�D<�
+��y�
+�ߏ��%��
DQ{�얤e�S�w��C��lf+�,�	��Lv;��)��e��U��E�E-֤_��)Y��Ce����-��Zb�����t����J�jTP
��
Bsn0�#��K�,)SJR�D?S�Bc
2+4R���R��*���F-��xw��Ej>)���M��un���9��y_�]��0���B5E�՛ک"���-B��=wH]�#$]3���>�n�n������"�HT��V'B� 9�$W�!�+Gq��®4���{�B�3�q�����)5C���!��(���3B��y^1d����="/�K�6�Q�rz�31����!�5U4NU5TUmds"��Qam�eQa��*�1�+E�9���1���<��拽��\�i�c�@}�/������k:u�����m7&�MZ�%��
+��gdH»��B	���+�#��徎0z�?��{��a 
_N��kV3�3���P�}s���Z5�֪�K�IJ��s�M'T�F�G�1�x7)}^P��
+�91��J�я�#��3��1O1��R��˶�C�I�J�0IKh���Bx��Ov�c�%��L�UI�jI�Bi����"�J /#5M�ОK�o���ahYi��}�������^#	�DCA$%=ȝ�� ;�ȝ��)�p�sH;�8�)$˜���A�]J�=(Ngc�*�Q�M�&����c~I#�ˣ�P��E7♙d�)oT~(Ǫcc�&�b��:R�ً�}���y~���䤒O�̈F���8!N�]H#�h�<Š���Q!{�T�.��!w�G��ʼn]f"���Mk�v߸��gy�A��:��"G��U'��6bT�g��VV�+Ŝ�f���X��TlƗ��xp^�-FA�Aj�A�� � %5� �!��Y	DB� 4BB�PUy=61�@U��Zdh�5��6>��x���db�b�+�,QQ�U�ET�+^crv*�\��P^�����b���j>���.ND\Sw�H
�Re�rj˦�l����E\�ތ�>�U ��t�v
հ��aؐEDH���@��9!��,)B�R�e��oBeb*�$$�bB�?�@N*��T��$��A"����$a��2E%�cU��u��B	��`p"R�B�f�C���!bB�$��"�.Y���6K0l��,�D*�ąb[�!$D��������B�&L7mL�t:�R�]���=�����e��'Ќ&�e)�e���/tdXNxi��R�m�6�+��KLG)��Y�H�	�������{5���t�0�pQ����.R���Y�AJ�
�pxQ���"_�EeF�j�+���U��0�
+R'�yD�D=(:_�h_�2Ú�"3�XT!7���t%1���d]�����.�#�*�93�=������WaUDaU�ոB�>�S��hB}5�]D�˧"An��
2C�p^���35��z�QbBX�YRB�q���'QZ
*��Z�PAsչ8�$����PA�f.Us�VH��%(Hpvє�h�ԃh$� 2-�����3�5cCkuwA����H�[�xqMh�HKhl���MM���i�E#�1U��H��r���G���
+u4%�Sf|��;Pp��eC�:	��r�'4�sϡў������25q�
+$e��C$��$dJ�R�Pr�q9D��$,"����"D†��"��aCr?b��V��dmJ������PF��
+g�PI}�Z���Q��K!�5~.�T��)�%���I !	�1
+ɐc��*)�ː�g�u��terZ~F!8Y�w8��QWz�X8y����i���2?qr}���$�����e"�ҖQ]BA�
+��A"oig4����N�k:���dcN�M�iy.�Q%k���U��W�)����g'�D��PO���FrEpD&�#c�D-�z�oZ���]�zբ��V��3
Z��J����M�.4�|$�r,�I�a>�Z2uT�)�jM+�s�J=b�kdv�dF%t=��b<��,D'{]�Gٸ���
+"��"�p���d��0��+e�뷋�EA"�a21�&L��'O�iYB�����l�����	N�*.h*um�7�w#V�"8��9N��Z�1�"3�!9=1w֨b:Z�|
+~B��ePٱ�����DW>�'
+�]H��̈́�&�L��$j�Nɤ�h�3
+1�h飚~|�����ůi��8XQ
W��/�����A�V��3�߄e�\��C��	4Z�4��Ό�����o�#�x�x�Z?I
1�Z�mB�A�n��B�T��L�$�F��(O
�B�}4��)=��T)1�u��qd��#���c��z�<�F�B��Zck�D3���L&*R��p���=q١Ϧ3�����5��}ٜ�(Ah
(艊#�,”��J��+�x��	RRDD���&��P��������?9Nw�V�
+��r�Uш�@m�m�m��(��e�R��BC��a��0����!G���p	�0���!h�`���8�@�"PZM0�ڇ�JB�.��/t�-a&k"�i��f�2aDJb�$\X�������ÆͺR��A*�!롙���
+sM��<Og<!��|(L��`[���j~\V�
O�Ąp�ay��Z�LY%D�D""�.��P���>T��BS%!f/7X�P
���
+&��i��F
�]20���hD
�q"?Ծ0���zq�ζ�!tܛT���>�����#�.���߂D�?>1�3nY�	gaL�3KL#V�`��k��N���t
3�f������D��jZ�N���WZ4�|��
Iq����}"�T��� ��r���tjʮF�B��Cݡ���E(��	dzg��B���((x�.S��[�<�)sQA��W���2*�V�A1<D���4���/� �	(0�V��OPb�M8@P��eJ����c*���@�� �C@p;BHq0��@AB�	Đ��
@��$� @
��C��=�L��j4>�Z�i�+�EQ�L��4����Ɖ�fbt>V���(�9�FH�H*#B��V����RC����L�d7C��B� �2�JKbX^���X�S���-���X�9E
&I^�&��3��YS���8�	���#���4��Z|�єb5]K�R��g���f�}���&�W�����;�ש�s�8�v�0(��P���S�ں�j�>ʞ�����>w=C������;=UD&��&�A%��73��lJ?��k9���_b����?����=6�?�Z����m���|����Uy|��	�#ʅ���*C�.�E��aՔL{���3"����Y^86��¢�Q�`����n�d�~R��T~!�����ɉC��3(���I|܂��ua���U`��i�
�ccR�z Ұ,o(Q{W�k6�Y2	C6�v^�0uHN����
+�K9T�""2Cv#��B��)!'<ub�Tљ��ב)j�)�fP���U�uU���.̸��>^2TE��Hi$8��WMb�F)
+V�mE+Z�<ĕx�-�J����-�J�5ZԈtň6��\w��I��_ʹF넂�	�2��%3we6¿v/o&!�xE{���}��:"�Z�FB_�ZB�I[�Q�!���֔�HJs���B��.��E{L�Zi��:C����:���>�R	�DbN���3uj�5�y9�Lk$˳��dF^򄺝��<�F?*Ԯ��5���d-jĵ(�(1��L8L�
��(:���4��\�Vvu�㚗Ĥ��(w�k1��n2�MP�Qn0:q���>�N:�Q��≂2Ⓦ�*�H��L���8^g�2�Mǖ��ӑ��]�x���qch<�N�{✒�Ρ�Xs3J��:��HIH�f���w1��%�E�Q
+�V{qKQ}Z����)��G�l,��52��DΒ�juݕ�M�Dߟ����2J����U��iw�}�I����|�u�l���c|�h�4��n�uE�T�Fm�������sє���PV��y��jQ�e���1�]�E�Z3T�F�ZI��hE��l�ư�&E
+1R��c�����*�«�����['JWk4Ӽm6�d�-��o��������H�|\�D���{?����ό8�#S��@�� �8�$�B�@�ln�Ӫ
+>�Mj��,�s��`
+�i*�hlU?�cH��<���R�(�n
+�O��%��`֘�\|�O	��ߠ	?CD�5�&�'�fᕹ,��GH�0DX�~F�SR��P/�*�������Q��;t���Ab.�F�Q�d�����`)���$�Ĉo��m���)"
+>d&__jp�*����cC�2��d]�C���zx�ԩ*(UW��Vg5���F���P43�D} ���ֈ�01�L&�j�u�KVb�����U�A�4��:�zH���&��8�T(�"�#&8��ل���?�������~��S�	�4��]�ɡE�-�C�\�����A�c���4��T:*v-f��Z�m�ՙ���TŽY�C邩�tX:����tu��2t��bM��rC8�U����jK1��(�9�R[�*5JLR1T�^4��[��i�)���(��b��%≴�I��,夷�,EG�B����^�hLCc��BT��@�����ȩ���<gpÜ�!]J�$��`���kp�d�0���7�T
�	
+%�*�L��B��PRJ]����K"hHF	�Ic\�
+�QW�D�2�ȂB!����t�'0ПM�8�
'.S+d���9%�ff(E�1T*xLCa����#S�:Ł;��F
�ԑ����u?�y���8�j$B�C�ï�@J��O�MQ�Z�ס�kw]4w��/��m���/Q0�mPI��i�툈�������"t�7|�܅Ϟvg)��\TptH��e��?��7��V�̸�kt)��A��Z��5��A�
�G�{�A^H��0�	s2L��9��о|}*�Ł�@/n�aT@��}����@13
�Lg85���)S+�ȁ��~Be*�U�(q'_��SX�)6�@F�:���A�8��0���0U�X^ �T)�2�aIY�yp=�(!3Q*iP��U����*�bD�>�T�@U���(T5Q�s��g�00f�H
�EǡR�,aB$dp���#d�o5	_�"䟹�*^�A2�do!��uN4ϒ��("4��	4�3R���O"�숡.d@��Sy��9X�喳d��ɒ�W��?[���W��R��`���9��̸�b����O�ZH<�2��!B�
 �
(@���(#�1�?(�v�Ch�q�x��C���i�k��p�d~9Qu��!i�T*��D��K�fD�]
+���"��)��Sb�#��@�2�
����P"@�:��E�PM	u�
%
+%8iB�xڮ����$���*�`�X
�(n&U8��^�8��ʐ�1�>�Ъ)
+��<��B5�p!�^��4�
+�:�p@�C�
��v�
�t4�F�BA(�*��@�$�1�U���2;��)��<�B�t�	_M��r
�x�psi�}��N�.�$�d�<y�X2�Inں�*��4X|m����Or�� O:�������W�L���t#�Y�6����a�W��/A��R3���z�[D��:oB���+�I]�D�Պ�L!t� ������)d���

U?�{���_j]�B��$t�4��ݒ��@jp��)ȋ�,��v��b�(t!����<���Fy�,�xL4�z�,
]�����fKP[<�bPg�F�F
�����#���/��q�p�#��)z�����	3>�d�*-�������%GXM����*5�&�G�57��ˊ:�
+�(��'-�q/Y�S�㵚
+s$�X�;��Q�܁�}�:�x!�c9[LմWO	{�銋�1LA����c��,�Ͳ�؞Ƶ ,���O�p�YWFAd�X�%(L5��u/��%F�!�呣�W�g�Vy{��l�Z�ƟI_���4�H�W���r̆5��.��B�~7����(f��݋��=�M�^Q���׳s:2�8ˊ}夀�É�'���-3 
.��zX���!�mh���w+3ǀ!�k�����='j��$�s�I1�ޛ�k�3�5D3�
��h(�'�B�€���I�Vl�H�MYҜ.+o���hŜ���D��k����b+j��c��\�xe��1�Ȳ�e5s{?
+���o�t��>��œ�1�d�x9�!�m,�Z̶K�;f<�s	�O��J^%�$?�)���j�mD�8%G5��10}[����r�7�@x�<
Yǐ-!�y�[��d0�
��{��7it#[i�D; ���M��w��܏E��xr����dvD�T8�g��OG2j$g
%	O��Ji]Vw�M����5Pp��#�D��XR_��΅�$��a!�4�-�ft忥�hֹm�܌[�Pr.���t����}R3rw�KT�bZ
��{
Ia����s/$��
+\������7���RD����aU{ҫ����S�E�,
+��#o����|P�]��F����؂*]g>c��6�
���������vXvSʹ���H4��c���l��+�x1��MӮ�~EX��S�T�
+r
+�m-��UVZi|EnEt�����*8"��K0�2��xz�J8�cfk��v����cJt����X�OÎ�ɉP�c���c\l����ნ���TS?�E�5���I)�r/������6=J����)e!�����$��1����S�o_��'
+v����{~��9���T��S����pN�&xD��f*T0-���*��
6���%��f��
�]Y��ލb�,z�L,��1�wx�c��Ғ�B>dV$�} X���_��-�Cf���<���W���ʳ��F��w,�nFB֠����Y>y$�֬#�لJB!�h{�� �Y��PF�g&��)
+�6�6��5��~w�k���j6�M�]���\[8OH�p��ۇ��ۂ��xe���+�	��l�e-�&�"����u�P���(g��!�W	��Y���
+$s~c��_;�>br����̴�,p_�V����j�9do7���x`�]�\�DB��2|�
i��XBA��:���n�!e�Q7#ʊ`�ľ���8D�E~!��#��ǖ���]��V�8I@X����xZa���IN΋�B�?�(��8�xe���`��ʃ�u�4)?�5���A���˂�=�$a(�y�;yv�|�Mg!���;���-He�hPFj�®|�a��<B<[������� ƥ��Q�`uH�Zŏ1֫r)�I�����_0���X�A�a���x̐��{���"ίM0����>�t�Hfm�0��`q���]�ڃ.�븘�p�'oՖ�E;���_
+��h
+?���:1���8\Cѳ�+pl��<�E�Q��P#N��:I����5"Xx�i�$Σ7��M��
��* Ă)J�2,�������@�̘Х2�!�LS��4�ɿ��lL�����`O����^��d�)��~�@�Kg�	�v�<⩇ج	P�3_m����גv�#(�7�&��+`f�M�^8�W�QF)����}��0Bm��5~k��ϜH��u���O�ܒ(�f��fz�
+ݦ_�C)�`:�"����Q	�:o&4	���aa��Dm΂u��j����c~.\�$1��hT���&������g���qPp����V�Q5ڐ�
+�Κ��[N�"ҿ}g�m���~k�[b� �Ev��;%l��N�O������)�)��Z8�=O�h;��Gh皗�-dIҖ�(r6���;��ګ�-oF�x�:����4B��P`Jj�r`*���ri5c�f���v�dK"��p�z>��8۸\�ڲiH��m����������m��1�0���U\E٠QW����b�Ia"�7�~qq��>1��=x����R�����"( fi"�;�*�>ǟnӮ���	�q�
+v;մ�M�)2C$T��������W���M�J��O!mH��bz���I{� C���#�iG��u��T	���#��fQ���;�֊e�K�LzS��:�r6�v��)-ن1oR�O/��ݣ��!�ː>��p��F}F��%��jv��E
7,�
��K��7��ě=ӫ�xM6M�.,3k��IٱG̎�C��k�����
7H�F��P�{On5���@���O��A����b�V3T�}n�$7��tP�K�9��@�?@�;[A�fZ) H�~[o�ES1ջ̢z�'J�sϸ�"QB%���\|W&m���Xߕ�s�{�\^����(H��@��mn�'V�5��2�eˀB��H1t9���
��{k\jv�N����K��Ý"�����It�Gx!�3ay��:��׹d�����7�(�pcB���.L�
������S�BH��g;]b�U�8:
+�-hZȗ$����(Ti+̇L��E�W��U��,^�:�_A6Wn-�TѴ81z�G�<8B�	*u�^��՞�&o�<�
+�>�ߖ?.N���
 x�Ό�/��☿f%�?[WP���9� Km��Z},c+��	��eq�z%YH�DLmo4ʀA���u�HaI��W`�^&���a��E
BD�-/�a���㋃���UP��g�DM
+0q��Uts������2��
�h�pc�|)�ib���d%UG
��Zf=h�]�֫��QD=4��^r3��4�����k��qŜ/G?�&£�(�8Z}�(-/�M�x'M�z`��] ��=�I4�MՃ� �j=���֥]w�[sߥ�	!���э���l�u/�����
�C�ຽ�j��2���
�5�[�j!�u�/x���F"����j����鞧J!a�`r7K���S1�X�u.�=��[q���#��Yfp�PC�Y�$�H�
��40�ye����,��)1C�g��
+BW�G׋y��0�WK�q�s7�=���	��~�>�V
J��K�`��0�,z���^�oπgl���@'�:����7�E}m&�ٵ���N�����
�xa��/g��~A��gS ��DP��/�s�c��_�w]��,�@Zנ)ӟ��
 !���?M�
g��~�qslՅ
�� f�ȨpނN�.������������UOL9P= ���|;Ǿ�Cl>�����E�J����)j@dsr�f[�B�w��m��JΛx��S�|D2n����g�`���6YT8�A�d%�_�ɉ����
tQ9��F�:R��i61R�m�㾱�`�=��!��[��x.�:렸��ɴ/G�11�#q��i���e$|o��B�W
7�@J��/�ݦ$t���F��|�`��<2
+�����å
Pry.Z�.Mc�����/�W��v{�I�����J~���-p��	h*��Sbs0��Y�Ƙ�Gg�����c�-#��ft��T�$�>wC��Ə��k��x�:�(�"�\d���X!��E��'vd�-��XS��5�/l�{� L��x��a	�ǜ}^@yV�w��
+O������p �Aﮪ��x��[̯��ȫL�=�������
��p��m���������v�c|tw���#1L��ȩA�+�ќ}%�d��Ѩלz��3߀
+f�,<��b����&a��&���F-�:��<�m�����e�ʰ�>d�&I��qij2�N!9ۯ�Ɨ� '��<��J��c�m���f�ę��ټ�L�hbc��J6ېL��9�<i�W�Κ�GbLI=�$e�Y�y�њv6���|����Ħ�����E���f�='���V���-0��k�_�g�V����Λ,Q�qg{�_�S��e0� �qE�|��ޜ	@�9�P3��.zE[7�
+��֎�GA�,��r����Gk!8y������&�l�4��9Y�o\�z�!O-�jO}������Ю#\$|�،�8Z���2��1�G�!	�z�<@��o�Uª�:p���}��H�����^�=�ʫ���筭�'���Z��h��>�����8?�D��u�6�������X61+>���F�
+���
+��?ׂ�fQg��5���㑋�y���xF`���y�6Éw�d~�����h9�Ѯ�͗�;�G�!���u�J�!�sS��ō��2�hp�J�Ϥƽ�_��8�,��4���3�v���]��JA��e�M�
�a*A�ƮdѴ`{F��[�{�fd�����N�cN��Tsc�n�6�����N�e�\hA���ܨ��-E�1�@H�_���{<�&	�i��ɋR�g=ݦ�����*4��մɡ�bak㼽���nC��D��x⳰�Ԏ�^XF�6)����3�'��q�����ibp�;Z!$���1�
+0͜O�H(z���<X$��c��w�]��
����������|�)�<a$"����ۦ���Ig�G���_���&伝̡���Y#̧�Q�F��`������
��1R.r����L�
���{Mw�		ݿcn$ CtTf��������.�U<ށ��fdf
Q��$�
����p2si<zξBw�D��K���&��{8Y���a��쎋dl���v���Y�F#��q� ��̧�i�#��ΰH�.��0:ͽ��9�@yF����_I�4�ro���u�ǚ�R�����?�Y_V�<��ؙ�&o>��.׿��75��1YP@�����<�p�H���,��X�\�n�2�?���.N�c�r�F>
`�lx7�Ii[�]����:A��
�t�6��:QNp9-�;H��1t�oa��x�=��7D_�L�l.�o:M'��WrC���Wľ=Fj��E23JY`���m.k%�q���n�����0u�Żf9Gw~Q��UŚ�V�G=�<��W:��+w�@,��X*0��"�քq�F��ȉ@0L0�Շ��N�F��r���U]��9��S2�]��$/PƼɽ�z�_$�Z5+zP]7pX6V���p�Xż.?�^�u��Ŗb.7���ڱ��ܬ}�R-�}dFr���x���(��y���FJ'�.C`�%�O��#�H<{â��<�i�
޾�QY�GMI
(/3p�rm��MTv�^7��?�
Z��#lhnf[J�u�?�^zc���=���M�y��Qy��M�xЩ#��t�Y���(��)��)��i[�gՎ�=v�>)��J^m�V%�:_Sc�YY����l��u��i���ε@�41�e�8�\fX�JI���&5�5����)!��
+�x6�Ch�Ǡ�}�]"�	n�p��P^��ŋx$s��h�=�G-�S]a!yL:
+�-u���K�u�YT����,���*~ԍ����O3����D4S��/�����9�(+=�1��j��*>�fl�	�	�q���D..��8��=
+/�@�aKG�@?!��=辵A\����YݲQ큾^�uOvS�e��/ENh	+�El�v
+OP> C�>RƂ)*9�k��
�"K�r�1�{���:�������"v7��A�]r!���TYd�a�B޼4#�Ҽ2Rm%|��S��e����"��2��2�u�]`�y�8&X?���}�W���B9L�$�G��@���Z������<��A�����g��M�F�K�tꅐ%�B��`o(��k«"��M���6�M��������3+�b%F<ڭt����}��%7��	�A�Q��<5
r��#]Өt��q\�3�Tl
A]�"끧8�6H]j��t�7�����~c4GѭZ����|����̏�4�g\�Y]W�-E|B��f.����z��X�'X��k�ѯ���t�rƕ4�%:݄�I�xs�8�����4��ە������!\L��I*6
$��Ĭ)@�I��9%�9��P�=�(����$	�X�P���Dͤ�+4���K,UD��Ձ��=_��a�F�.�0���zݬ�.a�VpQ]1v����eS6X^)h:����[{)M9�]t��e}�M!k�1��ވc��
O�� G⏹p�_
�k�#('m~� ;�)��Va�F`�6��p�P�g5WPPW�
b�+�$�
ˇFFA�E>��[�P�j�Q������a�N�.炠>����+�y,|& b��w����@^/���
¯W'�:Fz����C�b�K3�l�iF����C�uq�&OL
����,W���ڄ�pU�
x)g�u����ߕ$�ɞ2t�ׂ0Ҋ�ݝ���mi�7�(�a��r�dQN$�QϞd�A����D���#_�<����[#�:��cUٌp�f��PS�Ф�	��&]�wRD'��� 2Vs�������"G�!}zK 'há�X�!�KP�E�T�'_�s,���G�<����j��YqJ�@`�#r!�Az�B��i���М��
e�w��ve�/�d�Ŗ@��Dy�ʪ]{�M׻���\ò�"]��ȭYy�Za��'����)qM��l�?���6���4ZY�
+j� :���L��E1�Ȋn	�	�N��Pi�\�?-��&v;8����N~ڇf�Q��!ַ��G�-�#׾k���\�⍢Mb���F%�����\�0�V�p��R���H %.�pAtNB-���Ζ#�TH���|�ֻ�Ǧ��8��Ҁ~�[��ƾ��"mȟ���4����%Q��hdF��uTb�	��O�B��9
J�'���gƮg��ˆ7�/��Q���.�
�K�mjD}����f�_��1�% tTb���\h[�<k�UM������)z���Sa8�Z�	�nV��t&���p[T穸�r,7ZZ��n��1B�%��B�X�>�DZ��d7�*9�F"R⁢�H�d�O"WQ���
z#.I�+����c{���X��,E��}DZpf��@�Э�ý��3����^���kĈeP�L���lֻ��(	a��k{t����A~���b�! 
3^$��B�kX%TlV@�\�����
+�!�ۈ�Mn�^��W��M�N�x��-���7��	5<�Rɭ���~���Mx��&�ř�]��F[]��Q�c�{���'_q�J��N2����Ӧ��T}<��(x'�����(�A>�

+�k,
�I��0�H�}�I��b܈�}7�)Jދp%�!�Q,3�a�Sp;��K�����]��'�%�kNL�\��xW�F9��P嶅�s�C2�$�;n��q��A�����;X��DC�%�h=,��2iBEZk�Ma�n�`dTi���EJ�a���V"�?��È�`w
+&]�	P,�?r�S�4�,@8E$��
�E<�p�N�W(����p/,�?C����Q�
+佴�?DPƱO,�!������ ���gC�?X��'� )�K��?�S2�[k�>޳���<�ʞ��U�2�C�[:%1�@v�k�1���e�����۾3ζ%��f$Ikb
��ʒ$vk�4&�Qv �1"�'��K���������n��b�	p�U{g��9�����v$6�,I �[���9�����xݥ��B�
>>
i�b��p�>��حמ�&�����������
o�%G�9Cn��$'4�eC��B��H��
d��
�K��Z��9=��fї���e�$^f3�k4�O)+UH�U�I�p(\�JJ,Ë�mdX���xX1{e��aM�|���F�|��!���/a%<��o���q�z��⯫�T�ʞ�h��
+������4r��w�m��\

�?2���q�2������!vS�FH2ڬB^�F�7��VZ�U�~g�g��;�K�����RAѝ�CG�!���o�Y��X�k`��:���K1�}y�)�E�T4�}���d�n���ug���S�#�˔H�0�s�4�"�삤{[\
C�>Ġ���<D��E�uOس����쳱�3J�At�#(�6��v�9z����=����`��不4h�ϰ�����&�[���gIFpE����$
a\����U������k�'eԚ�
+��8���9���E_]�$\q:F{&p���<�.�L���fnsb�D	��"���/��q�ɰ�k��?d�˜�q�~za5dXu�����-��,+�U�K���V��s%��=����m��8���'�ML�A�0�������L1\����ZZRj�|����FOm��:f�u�
+gY�<Č�9k�Caۀ�	$Qg�h*i�~�yL�jt 괄�Ӂ�N�x�v�bP�c�:B�`�a���`����GRvSXp�8˸���da,T9m��#və�+�I�(D���MT���5v���P���9(����
+��Kٟ�\�&:u��[�B"6��e�B,�3���E�F+޾<�o��,]�N��GH��ƖD�6�,�<�=j;)��	�
�Q���i���%��*o�=0�%o����b�q@��lfA��:8k׏��}��ٱZ�
^���&̈́<_���5Ks~?�GO�X��9��7��E���,�XJq��d�z.wG�����-�3
ٷ���ߠ�O�.�\�C����Ӡ�;v�ޓ�,F�;�J�&V���~���XV�oj'��\��A�W0Bǀ8=bUX�Ҏ����I����Z��R��"�-��#Tsm��(\(ee.|��g»���'5|
#�_8��9��;�M�
Ȑ����nGؼ�
���3�`	+0L.zˀ
����m�9B��#����@�#���Hw��ґx�Мs�S�[�4�G��⯳�L�6`G�pC7uÍ�,H��u���p�h�����#Q�8�Pԍ��j
��'W�[l$@t�d�`�f�ꀡF�^��h�����9��v����,
f��>���-ۈ<�B����G��8��.g{����a0bz|����Ed��"	�=��}�d��"Pp.-�`�iP�����w+ҫ��8D�T�a�s��E�I�
+���A�$�/�OP=DXĉ�Xh",�������j�KE�RH��ꉨ	�`{�H���Xj�EK9Dd.�1D‚��D�Fn�4�@d�����XbDm>�M3������'��Ђ]��4:<�!}Du$3C�v��H��C��*o�DIeC��$zj�I'Q
�C��e�S�s1U%��Z�J�/D
�䅃K�(y;��9��&��B(����
+�:L4�r&Z3
+��1a�'$�2a9�&����&�EBt��R#��Mt�4�8"Bp愊��:�x'�����'��A��]� ��OT��8�"7����4�J*me]x(�ޡD�)��(�z��Q�‚tRX� F���u'� �)�Y�˥0�p�<�12EAD��)�@�)��x������4D�ÌH�����x@���1rZ�	�
+7����|���cEk�C+��?\e+��qEY�ù���?��*�!�_Q��၃E5\�Xt�?�f,��9��å����,8�4���سh�~X�ES����hD~ ���G?l��ڨ-��snae�����GX…��Q6.,P���8���>e���Gl]�[>�|�l
����O|�"/<�r�‚���+�d_x�=h�������{�k����Q�ڣ�C.{�a����P�z@�a4H�G���N=t"F��C��(Tz,����p=��=�х���1j4�����aRdT�<�$���!���MH��xy0�2|v<����S������Qc��R�p4x��f�x�����;���Ck|Fa�C1�Q,ޡWhtew��htBwhs4:���4�v8�4J�b0�� �F�q��(ev@��?����0;|�5����Q
�p�5:��}�R��1l��:ď�* ���:� W$�F��Cvm���c�������(��tê�!��t�x�N|�[�Co4%%B��z��ϑ�N�9�F���
k���9��m��.��qT�9�W5���D�`�F�g�Y���xr��r��C`Dڭ;%�^�bf�3�X�C���q|�]8Z�a?�H]t��8�t4��:�a~dP���{�}�#oš��)�x[�4��
e¡Ի��q���r-��s�Dֿ�ڡ2�F;�^.N�p��/Ҏ> 3��O�'�s�d�y¡���PU$u.�]�
;�����J[G�K���i+p�:�
2���Lɺ��!�ut��Y.��|���@����:���
�
�D����vC�ݺ!0ꨉnd�:�^�0���X�&���-ÍEIo�g�юۨ-�m��62�6&ԫ��iݢ�b[�l�V���Ca����ר�B`l|&�t�� �6���d�
¿��Ʀ�����*�ӡ����;�
���ӯF���jt���=��
+i���%�����"jԣ�?
�[;����M�&Өt��p��Ҡ�AҘ.��8�-
�ө
%s߸$7-^DG��
�v�$4XJ4�M
Q�}Fj���{����r�3��v�����X
�r
��I����6��8u͐��(_��}Ό���d��سY̸�E��$y;U�2�ҳ,�+ga�T��_���)�wxe��:#�p��q�������G`��ZdvȨ�;*.�Щ�17�XY��5��
�
y�a����OL�b�Ǽ���D������ؤx�w�I&�^dK��@�7���`�`��÷� yV��
Tc�qzt��Z0��_���`2��$���m��@�P1�Ot[,10��Fq)s�b��
�z�r?`�R�a�h�W,�����6Aa�ba��>�����E�
F{x+t���`���30���)����Bh|����ô�?�+�j��� �/ȹ�F8��O�"_~�����G��s?*���Gu�����^d.�
�p��`��
+H��O@�w���%�+��J M���8uQ��Y�r��r+ƹ�����M�tL.�� e����H-\�Ђt.�1H�oA`����u/�����-�!͵�$��la$R��	�($�Z �
+���,��j1�B�P�bH�Bo�4�SkHah���Ϣ�
��YP0���ba�c��(O>�rY���^���#�I��A!�xDڍ��H�b����M,8���8��Â��UX4�"�g�HG`a�T�+lf�n|�T�"��$�E���]���+ȉ�sE��؍+nF��
+�4Ҡ�P[#5�m�ZqA�V�+̬��F.�&�
+��_.�
+r�D�
+��%0��#�U��&��b��S�#�R�qU��릂�ڥb@�I�]�wTtQT(�e�Hi�
+�z�t>E�O�eI%n��.(j
+{ăl�~=�S��#%\
+�"X
+�S�(;��@��X,)�K)T�A�(<�ӣ��G$��Q���xV�M7<R$�ޡ�j�P;R(�בR��
��8��$��������w��X@At�������	$��	s������H���J(=�L���#���g�ŝ`V_'ҋ��8�	ubAp��#�ωZNlW�8�z'���D0<ҍ���G�h�|��5a�iн@�I8H>R&ȅ�84A"1ҙ@U$��	vF�B�`A21�H�	C���$A6L|W�`��K���K��H���=��-q
���K��
,1o)!�J��2�R%Y��$+�ҕl�	K�L�&�V)������-Ѽ���K�8	XyɁ&q�}	&�"�p�$�7L�D����\1ى$��\�Z|UG�@�1f̤�"!�3i<$�C�V���i�q��N�8�	�jRHT�~�^��|D6�8�#$o�a.�I��PpB�#�U�'F�<����@ɣ�Ę��t�ш��$ό�;����	u1+O�0ӓ�.�ԞT�"f�'�,�Į��O�Q��
+@�
+���|6"
�5n��a�Oꑈ�+�f(��l��C�f��祇�y�n�J�@{Q8ĕg��q��y����1�u(ٻ#ň��WR�S�zO���(��(!jA�"Ĭ�VgV�G�� �dJ����T� �d�A�ao	�t� �d�5BV���T���&��•Lq�H�)n
+��/�\��A��&Q�F��)�)f�RF�};�������4���Mݦ�@�����).\N�,�T�?.�v)�S~�si�
+>oS�@ $�[��{oS:��#F5�!r���%N9�~���u��ٔ����M)�>��)��oД.����C���a����]'|P��{HԐ{��)EidJ��Kq[=k)fӃ�/�4�!y|)���{`2�\���C����A�x(�K��;0���-�݁-p��е�FM�7l��1^��JY���T���!C�tXH��P�R:��QJ��f���H'�!4s JJ9�W�b'�(�h�C��b�����q��m�MJUq@H�2`S1mF���H)�������vKY����B���]�dJ2�/!My�բ���)ܔ�,�XBv�L=��)�Рr�o{��D3*��H�$p`�2�0�$�R䢩\�ꩴ����p�"�*�ǧJp��R�`\1��AX���J�VW~'f:`�Y�]�8�*촊S2�b]��ނ��'R'�P�K-8��8{��\b�L�r�dU����^p��*��X��/�{����A��X��<Ůph�U1�pp�*���
ӱ�
d��0-
8(�6�<��ױUr���*M
+�������
���
a��~�Ua�6HT+%�g+0�a��B�ڀ-�t|6r�t-�+ecixŇ�!�z�p�A1_)�k��t�D,�t�5h����waih
���N�����d,����;���@�Ȣ��0CCNL��4�ZY��/�,���sh�
�,}��g��38=K!��a�҃3�-�5�L��tfP���3x8�T�2Ȁ��Y�'��̵'؂	eh�b�0ڑ-u�bЖ2"��R����2g�H�1\�;���lc)o1d�o��l��2R1xi�����KAB��ŕ�PD�b�a�S��(*��7�䎹�A��ty�I�X'ߒ��
+�[2^��L�v��'�@�"x�.�����:�e$;����zY�<��hn������{qD�°0s�u��@.0U�qg_��-����
+�-��/
ci�/VkA��Z��4#-$`l?"0e��h`��d#�$�`�'h�̚�B���N,��4t��,ğ0��
+O,w�E���P�&�p�0�m>�QZA*��
+jGL�U��%�=���ɐ�pK�*�	U���S�TȽǤ��S�=cj�
+��SP
ǔ�T�W�pf
+�yLݥ0Ώi�Vk

dFK
+m!�RQdZK�L�� �(�%�r�B�KƤP�n2�P�:����T�Op�2E|�R*S�'ne��	r�:AJ�)ږћ0�2�8��M��e:�qb�{��qTڈ�T#3��S3��%l��^ak��K(�f���7S��� g
+��4뫄6n�hJa<3%��3O�^�a�$��3
��@�@��.pk���v�^��mEs�#��h�y���ѐ%�1����?i<6BKc=#�a�b1�XM�.:�_�
�	7��sU
��i�Ԡ�|�0)��GM��R"̃jH.���A5��ާj�4�RVc
C(
Wcw5�
I��!�n�x���
�|,��A0�i3v}M�ؘ�2l�[$s5xГ��?6�
$/��~��l��Φ�}ghc}P7m<�aTA>���4�J�M����m����҃�pc�y�:n���������V*~Nꦠ;p��U;t7M�
x�aT2o����M�%Co�=
+�o��T!�v��oܕ0�#,"KkGF
��؊��v�+�0�8���
�)���͓���i�
�Ji�`��H/�
jik@t���ݝd�8lR=��M�R��AA�S�Np�x���{30�pJ3X8���TéQ�p�-o�H��Gq��&-N�[���8nK�itX��is98���DarHB9��@��)
�r^������Ɯ��@�4!l���KS�@��9VX?1`@�A����C�ѱ(B:��J��/蛦c���m�ڨs�{�w���@
��:=�\�0{�<f����0�;>�Aز�R~v���O�휿�3� �p�
�:PW�,NwL�/w��/�w���½C*/����v�	�SF�&xJ��	��� rx��bK<�����Hd�x���
+�~<Fɂ$$���jo��M,0���
+�1OcW Z���yڑ�c�@�y^��:CO�!TS�~=z~�o��AkKΕ2�6SHD�ɦ�z�	�	I�U���v�1/� j.�~�Ԫ�7ȅ:�@Zy��26c쇐
+P
��-q��)��$PA��)I���MAnl�K�
A+�K�T�
H)�YR0ʃ�]/��������M
+���'��Ļ9��>�(n�6�L
+$\�>��!�IAEf�ҴI
�4�5h�`R���(s��fR���M
+099��T��7)xs�j�-�$gI��Y-�ӶWR ፄ�?���>%�N�-`
+���:ʣ����)�F�XSyH�m�h{�l�<(�S��z�w5�V'
+F(,2��:iv��x��+Z�'
+�~�O�*�DA���d[�֔
+�9dc��h��8
+D��^�mrl�ʤ~r��6M]	ZRL�DdV��w����j��P��T,PnUɹnj�`�ȣ�0>x'@㤾�n�q&&�
�	�Ԓ�w�n ��9���A�����[y����	��5�)Oa�t�"�"v��I=dv-�Np5큀5��N�N06�ĘZ�vw�	<w|tő�u��	ԑ�Aj_�Mո��R�h�@3����@/$Z)eǵ�E
��QY�At>�(k	�
����I�����2�_��ˡQ�km��%,^�,V^f���fM�1P�e�[�D�$r&��4�9p@d\�"U0��P@��o�fH%�$�2����r��b���.3�����9������)��{k'��01c%ø{"@k�`�x��ᙔ�O E@�o󧩎$B�2�@�%W%R �SP>8�|��
�o�V�dV��r!8�3�l4.!ȝJՄJ
+cpI�@c�	;EN�@��l��G��<�^ �
����駡,�\[�[��n������@�H4^}uYb�9�ɳ��,��<pw�`��	>����yL�<������ғ���ň�@O��0�";�B@�������=�\�
ֹR��I����P���gXb�د�)�O�8�Ym`g&��Z6v-�Ө�v�ػ:"�?}��:
L>Iy�3�u�+Z�E�=�A *���<��@�n�~��Sx�dy��qf�*O�� *9��j���pY'�AWG���l.�l(~#o���H���rS0@;����.���j�������y
�2���w뛪@�y���
���'�F�����5�	
��1��E�,;���
���,<c��)����N�L�3����g��e��Eƻ���*ࢗNo��#L
_��ߓƵ:H
��9�N[��@>:|ݛ=�-��	�?g��w�	`~;v�f�N�vY���I�6
�O����S��ԗuǀL�Bh�����~6��N)
꺫�c%��f�*Bn	h�b��E�p克���ٍ���^�E?S4zCU�P�C�4�Z!�
+��`�b-�1(+3����rF@ �([�k2T~@¬Ba�pӀ�7���Z
�
�l�b7J0��!�WK_h�������9@R[�5��Baay�u��D�
��c
֐�����g�p[�p�!yR
غ��fr����K�
<���+󑢏
Q)��ܞ�
+Xy�i ������%*�B~�%��ocܑ�,��U8��TRx5PX@�
!9�d�U�
݄dd��o�v�?T�m�@FT����(�?�7v>
K�R��T�	@WA`��%`�_��
m	��������HXA���NhT����ֈ�
򴬉B�q���I
�?�&GVa�X�,Jh�ܲ�殨��;@�Y��x~�
B�o	;ļ�[���E�l"tyg����(�(�x�\�k
>��t�+���;ƬAT8)���
��6
�v:b�A0K=kϖxF��)pk�N���*2�C�j%�]xTH
�����7���R��
 }>`B���
�|iF;��4+Zaհ�� �E\v���?��'��ũ�Õ�b]�EԵ�&�C-���@+� �6\�#��	����0��Q���қ68:
� ��^�/9c��t<����9"�,��*��v��� ��g��L��B����7�D!v�^
��>j�?'ÂPXRk+o��/J=���8f7���M6�V����?h&�ӧ���/ت$^����G�Ae�q�N�8•:�"���^8�/�& �LA��u�)�
+��?Qd%!����l��l�
x��*����Qp-75eC��Ю-%��R���	͠��Q�����
+�#�P]ֿ-�%����o{�����n���X
]�.�K>���N��S�W���I�J�����\%>����S�d�_��?VЗ;S>�]EP���6<�g�[
+3�l���^a�M^E^{?�n"������9�;��?�5[��ݏ�ze�{�/n��u�ӵ�l�c"Qɤ�a����ɧ��7�D*�K�B�}���v�9)n~�[mL���Lr���,���u�߷���@�]�b��F�7C�W��hQ'��Y;��Î�s��ª?{��)`�󿍠780m��wh�o/�d~�����r���{:��~0㖟h�2Y�TN�?�����@~q� ?�ߺ(�?	��O�ܲ������`�ڢ���֜&�(�dz�q;���
Y
�Y[��

?0C0M��>Ҳ�����cYdH�����2�BH�{�:�Og������½�Y���ȍ�U�9���0��dXz��g�7ܯρ*c�|�
+����	�'���R)�:���@���k}�'�w�N����#]w�.�Tf���m����q��}ҭE��;�W�,�_�W)�
7�a8˂P�{�,+P�.2j�`�����SԾrB���dfQ���H!��W� p����`��wmO-0��K�~�cSl�e?)}�%�ÿ���ٷ��g3��x��\^������@�Ol_�5we_�H���Ϫ�_�\��C4�g��/���<���U�JkRD
+��X��%ڤ��>Q�w�!؟�}��>3ϒUX��$XW��6��m���ط���
�t�p���~�/��+y�[?���)X�K�������
+1f��F��(1e�Y_P+t�I֬�r��MD��!P�ME��ESx���\L��՜z�/���GpcPU=�u��Q���&��|���ؤ�v鯾�2`B�g%�#Qdy:?-�g��-U}�>J�JWx
+�υfN�r&���ݝ8g�����\�����>6۰�lW����CJ:�W��F&32Uu������(	�P�|b
+���/���G�S�z�Χ�L���ZF(��)/����Τ,Q�m'��YۨMU�.5��t��1?|��H����`�w��J�ŗMD���B��o+p�}}S:��aV^�Ro��ľ��5#�,�tsq�n�7CT?���g�
��s���D(tZ�ć�a�;#a�g��_
�k6���݆M'6|�<��D����[fp$|n�`w@�6���eB��"�s���QA
+�,�}/�D�@�SB��=�
���{��?{0G�P��%�zT�,��������G�F[7�$������F�aBV��}
+�ˎ����������e�V��ԟ)�矮[��#R�U?Xҽ�������n���K��+ю౥|�=H`z��4(����!�:�
�'���2.y���T]�NͶ]\���Hz���h��7^%��R{1�h�#�Ռ��K�X2�����)�f ���J�s�'�}��h�.M�r%{�3��>�/�[X���"�ǣ/[:y<
+�~x�k�Z�'R��$�#*_�>���ӊ]iD���\O7�(͋������p�Z�P-���c�����J-�W��^D5�Ѱ^��������<~������ޫӵI1b�"�V��B4Q�rӈ"� �>���������YK	K=nev��2�H�F}�e)��t{��l�`t>}��|���ZJ��»�
Ah�KUӋ,��
���!�e�ȅ�N�ROxG�����םiNzO`�%���z=y]�N��U��	�ED�����o�?_���|b�G47zh�˕y�V䜓����r��u�x<R�^��!�A���CKl��G���	��k�(5!K�����B��;X��>�Z`?"}�WP����d
w�wN�W�м��P�� [y��~ܷ3o*�z�ϼ^"p,�!���ݦ
+���^,�a��w�ҧ��y$�)r�c�bh6=
+�����j�Q��ȅ�@�zh����h�q,��#�K
z;����l���5Z�W�_�y�B�h��@T��4�@�J�'���<I��~"$Pv��K����Y�67Р�u@?�c�<��������$��ӝ~�k��IC��̙��[��߼h^N���������T�̷k�p�,�@懏��~l��|�t+{�C/8��H���7�Ɩ�*Жw�XnT�%����|+���6��.���G��`Z;J7"�'�{DZ€����^�|��3��P��n�DU#�9�ʽ�%ܾ���<���͸�q�ڌ��K	?����Ƒ�*k�6���M�9-�cI[ܶ��"�]q����D�,�+���cf']��N9>�2�!6��e�*�D�%�LQ��Dl�(?.i��PƇ�`}����ڈ�&�k�4I�2Qs��{��+~QT%��k�!v���:[��MLJ���o��u/��#F�.��`$A���pa����;�Z%��8|O��b+E��6`���VuK��G4nǞ�ݝ��Ǹ����F���e'�}�:��Ʒj�����(���kQ�A��G��ui#�<T���'��6�xAZm�������P�O�
>�B��w*�9����:�J$�ub�T�
�E@x�|�$����k����;���؄����\5{@�;�s=
+���|�adۇ���$�h�w����F��d��#0>	I��@A�pe���;��ἷ �N4�=��Մ
+_�B�Μr��t��g���}d�V
�k�B�f(gv�w�WJ�_�ܝzj[��($�~KCJ�����Ղ�g���������%�^���(�t�������D�B�A�Cҧ�^,�JR+�:��᭻tw������빽�;�vK���h�nƽ�-6a��{��a>Ф����8U'1K��<�/�f�P�o7C��	��)�����\	��pC�v��Il�J�Y#��|v�_��.m�h_A
��v �r��������jd��=���^P��JH�����B�p����õ�ϑ�o(����M�{�f�UjG�v��04����(�*����׎r�,��f]�s��U*ƺDЮ潡9ܴ�˳�����v��+�P<��ɒ���q��t�ˮƹ$�8;�g�d5m#�r������Qݑ"d�!�G��uo�8v�Eg�\�"j+��Se��=���f�vPkf=\a*�{���o3����=*%$E&���o�\�T]�^��Έu(���G����,F����Y%y�����w�K���j\:ߪy��7Ws=fQ�+����1��\nܭ�sXN)����\�u�[T1-�d-b���Ծ���Z{YO�mJ����i�=5dI�H=�UR�+*���i��D��x�_}�2<-qË��s�!h*X֞��Z}�>{H�Z]���)�D�����	q̪\R�����(w�6D�gSwƤ3'P]E�����!2�B��՗�|on�Ӥ�Ú`��u��ތzԣ���X�E=�?�E ��
jˡ�!�@!z��=�ULӧ��iC��(������#���|��N_|�����=R)Yu�˘krk�(8p�f���AD�Ln��=?ָ'���]���K��zX�)C�t_���1���Ў߷�I�Wl�ˮ�%]!f%8�0'�%
�B�(_/�C��	�n�E٣˂^B�ڣ!�n�A&rt�'E��`W0��C�uڹ����xb56/%��~��A��/4���C�A%�6�I7\�^�D��=��
�}
+����H�^�(a)^�~$G.l����i���	�J�\�"j
+п�'�������>:�A�s¦}C��
�Zύ'�z��H��Jh
g_�yMB)*'��;���ä������_N�oE ÚI��&�F�pƿ�e?�9�6��r^5��x�{I����41N�l�r�E�P��4�������|���`�a��u�Tf	u	)Z_}�V�a��6׿�*f��WsH��}s�V��/ꑓ�1��'<��B����++���s�yf�S�|џ�2�b+��\��ym��[h�|Ęw
�`9p �i�qx�̿��`8J�_~0C�������LJy����Ƣ�6���\��,�����H˅��+S�(��&g�0���%א�zc�rģ6<�yY1/�L�`zwr;��Q�M�cД�r��y��5�ڜTe������@�����j�>($���������"j��g1>��+9Z���R^������}@��(�y�/i�]9#s����'�"�'��(i��!��o,��qr��HOr	Op�2�#ǐ�`*t�y��zΏ[TS�qG����<��
T��w�tÔ��H;=š�r��!h�	�K6X[�p�΍㧶E1j�V��Z ��Ӹ�ޮ�+�3~7w�h<�-)*��P#C��8���� ~��b6�p?K�a^�,��IN���"lʝA*8��#0��T�`�E�o�E%�����yi���瀖D����Z�$Ѳ %�,΅��1
7�쐇
��A�!K{��pq�`6��'dF��c�ɒы3~�A��@\\��rW9���P���Ou2��xh���k��jX�#�N\�A
��Z����ye���x��F*�ي���8s�l���j��x�
+p��
������)q�(!s�}�;?.ޕ�i~��� �K8��
+-.Ŷ�K0����e��~š*���}�o�kM�+n�S�|�w���&�~e�>��0����v(.A	SV'�ݞ��T*�?&nI��e�d7̤�4rm|čM���"sF��ш��O1�A�'rԇ��� ���
endstream
endobj
21 0 obj
<</Length 65536>>stream
+����x������xtħ;�ps0!�}%���"~an���ߑ��V�&�yp�6ه���c�3<Pye��`Ej�My��.<k-��JJ*���t�Y R�4#OC*|½�A5(�Ș�fjV¯�L�E~Œ�01$&��p�	l0������j���Œw�G���l�-���/�,R8��p4��g��ؔLW��e� ]��/��c��ɑ�<pT@{D�����;�e���ޒ��! ������&�r/��n�����X^yRL~�wr���w��3�� �����s$�����׳��>������%��}�i��r�1:�1�E|���/~w�C�ЬL`�Mx߲��uL�"���ٷ�¡�o��ڹ��o�b��>/�+*zS��T'�=⽘{��+�����0�1�Z���p�Il3��ː�r�oN�2aj(.�Y��8�M�a��}��Cδ�{���W�xڜ�x�{�'�ʥ�I���k�/��7-��~��7���6��L�s$D��B�$"*Nio�-���io.L?�O{��8����4�M|���s)e���b�y F�b�ڼ�A�[n�}�ʽe)��,��r�n~�-�{�@��Iro�n����t�Bɽ$�~�r�x���������'�`po�kD�"Y�������Ei���q�r+�i����|���ޛ�U.zo���)wB�޻�g# �P����oY�7i,ygz����� yC��^�{���Ӱ�ϸ��ޱ<K�|7y�…,A&���Cc��u�]?�B3�۲��Б�k~�Y����P�� J�L
�����]���� h9�PMo��@��V����>x��������M���7.�ռ7����yo��2B�E�#
ܛ�q�"�/�;I"%�����
+�����j3]0
+I!��t`�[�����%ے�Ź,=��?L�
+�{�&�n���{7ɞ�LQ��x�{#�z���poxE�o2��ýk�T��h��~NBZ?Z$�����������I���Y|G�x�
+�k(�~��1Y�7�"��yzo[�QF�[��{�hsʕ�{3|C����qӀ�,@<� \�1K&����B���o�l����q�B���Z���>�D�y�߾�ڷY��4�d�II*
T��NLHs	�7	�j����w!P14b�U��]�yw���nJz��3ZU@�=6�9X��Mw�~��7l��0�R��}Ȕ�{�C`99���U4�B��ݺ�4dQ=4|�
eeC�uCh�%���GZ��񋆺�{^�������V��[�����~Ą�эao� ��nM;�KJȹ'L&g�l1�	@�s�K�
j����4�����[6��i�����W�k���d�"��ɝ>�u�t�u��Dn<���rɗx��O�z�*`w}3��L۞�������vU+�!�a����VÝ�أ��]���p���v�EN�
+�ߎ�����aiou X�z�t����J*䡫م������-�n5��$�I�9�]�P�����ۼ���B��綃��H�(���k�����}ᨖ١�:϶�K5�8c�Ͳm���e��|=�BC���<������yϡ��),ę�~��Zd��\;:�G�^�\rjmh<CqhU
�OZam��/V7��e�?��wd��6�'����}hړ�����c�,U)ׁQ����X}�`^�k�_iW�ٝ:�{��:@苧%�KF�
+���������}{ln�����H{K�"n�$���+v6*�=�����k��F̏�]��8���29d�l/d�V���2,���& ��8x"E��r��Ylٹ�e�)��준(�o��R�]�^���u�d�y�;��$��Ɛ�P��X�&'�s]
�7�L�^ݾ���ʆe
+NJ�եȍ
1�t��26Mi�b��i���H%3_:����k\��f1��i���Z�)=�=ud��
[�@������{Tb�H�X�aH����M��9�~�Vp�-���s1Z�XD!��&�ր�k��=Iu�z_�z�حg�����%m/��:����=��}�H��l����5�7ey/���-�&��$o�Zl8��[�~_�]󡵗`
�H���!���Y����—
+G��\��H�''�ŵ�(���}�'�� 5�ZGMK��5���ɯB�	��;i	mͽ�7̜������~��x
��Z�����Mkq�yL�X��0���D䳳.����ag$��#Z\̬a>@R�ʺ�3���la�ǨC���D�Xs2|�T�P�Uk<�|��K7'(�!����a��1j^�Dj&+�d�_]���x�p��[�&u�ixV���b5N���]5
g�W��Y���{V��4c��z���.
UG�Rv�¤8ٝN�d���Q���_��h�l>�n6�?#sN�+��>��9�U�B)�d�ԇ���E�R�fiE�0u��M�Q]�-#u���C�X,d�G��`l�fԖ����0�V]_��
;Dž*��s
	Qn0ԜK�\�}�tP�wW������
��j�f���T���8h>
��z�"L>�z˱�[��(��'ȭ
+��uz�w�!��wN#)��8�6r$̬\�)���BI�����
��e�4���'c�7����͂��W31�Z$~�M dGO��`O�0M�	�+��K�h%�����Q�Y���fH��]���8BCbi�E'le����",	$�4R?����G�ѾA�"Z
+|���R�Z�D5i.��ۤI�jȮL�W��AK�o ̳<�
 IZʩ�#ǧⵑ.&P�Y�hr_i���!��������f�'�b�l�h��A�(;Z�-d��8z��$ROl4�",�>���C�M
C�`h�6���{��l�)��Ѣ��_Л\�*���,����Բ�T�h�D�Û�if��
+�9~$�(�@$�Y#��Ն�od�Wfj����pH��&Gc�k�*u�VÜ\��ַ[�)��q;�ehS�]�d�.y��!�U4�Q�B��+Я;��g[
+�P ���u{��dG���u�Y�.�[�K<	Z^-�w}�'�7ǕP	4�RH��~��F7`��a�tR�6��^B�2�~�|?���j�ƛ��G��b��8F�Zȡ�@�g�N����v�
+��]���ь�=�y#��%���v>��gV�@bWH;R���x Wu�#,q�����<��r���+AG �G��l3�P��g�Y�Yr�]��og��
:�e��{>lX��
+Jxf�T{���R KY蝏��z� �}3��QCV����Ҹ띣�{'�q��{B��w��$
�KG&���,+�2)9�l(�O�Z����
�鸭Rqg|KF{\P���^�����j�YJ*������>��C;����Щ�R�v�S-�������;�($��-*q�Z�%�;7'��ws����s[�#�9/��o+t�h�Ƅ-���&G1Y�������]�l��2�y��;��%\�`ܙ''V�
��vơZ�og�/���2�v^�̒����R�������G�9}Rv=��B��ۙ��,
+?�������&�f��^($^���Y��2�H糺G�������C�'�6���`�]3R��`U���Nr��������y�@)Pd��8SO)����pf���%WP�-���ޔ0�ƸŽ�@&
+�͖�LsI�d�m7�Ghֻ���R�y�Hx�y.-��2V�uI�!�I�OPm�~&��l�f������jB_�&�v�/3k��&��H�MLᦴ��%qt�n�\#���xu������ر�o8G���i���q�^x�>9��r�,Y0'
+aE�:g���N��r-�0�Q���U�c�$Du?����/C������;��B>O����H��Q�6�T8��
+�s�n4��^=Xy;O���gv���\�p��x<!�f+N>%�
+KK�޿}]%�3���e�=���X
+bU������ϒ6�r:i=�����VF�j��@�nt|PW���B���Ӡ��T���U��/���B�U]'a(��i���쬉y}���=T�pF!A���F4kؐ%Z��*'s�O���x�E׶b�(�k�5M@z]����,�є5�̓[�Xj�����ȥ���DT�r����ш~2|�Fӭ���e!5�iD��5�P}�W�1.,K�?fU�����F�v�1�X�IU��Hi��G��gc;ٳ
�)Jiܖ8��쌭ԥ@h�}o<���'P��7�L?�Twf�ݥM;�����XGw��Z󊋌�u�c��/�s�evژir+\m6�P1Ħ�ԔDǴ�T�@5Z�T2�W�m]�X~�J�n|���eGTF�x�t;��SK~�_�;�
�R
�ST�H��V�C'���.q��Sm�΀�"%�j1\��Q�2�Q,�'���jt>IBU7rY*Ū���f۰
+��1�o�ȹju��Ky��NB�F�5`���_j�8���g��:����_g����a=%#��/8�`E�^vF���Xo���ɪ�6K1k���p�\��'�)�E��7�ַ;�X՚3�Q�V8>��5��6n=�r3ܳ�;�5X �
+�FM��s�G�B@Qw�k�kE�v]��(f�++��Ry��m���ױ*�W��Z�+^٬4+��վf��t���JĴ��龎
�u�	�T�
+(B���y����$��;KwC���!��zQ��#v��X���7��)�:�@^{��u�q�k���ν>Y$�6$<l˙�������ctW�o���m -����zY9�.^c��N�3��6˙Ag�I��]y�y6C&\����x����(U
���s�h�N�~����좀AIZ�Q�iZ�Jڴ��&�Z��g�Ԟ�t�Q�Z2�j�wk ֞^|Ѽ���KH�v�H���N�/��5��9��iqH.[�m�֙����Ʀ�m-v��.nF��/E?s�n!=���M���]��[|�w���Y�Y܁
+�A���F:��Pa�ƶA9�'ۓ}-���f�4�\��gq>��\�����*��f.���>���s17�����s���_I��t�+*N�+ǿ-~��j�o݀��8����}�]�B���q�(��e�56���{�-x
�t �4^�Ϗ����81?���ּb9���z3�H��"�����Ѓz�\q^�/#�����0(���ۊ����W9�Ðխ�ur�m{�
+ ��y�g�h�3_x����8>�]����aJ���ǔ��W��
��`��_p����ރ_���3��������������rO�\�o���DG���{�{�jǷ
�@	����a/��������N�S$�u^Z���͐�|z���,Ѣ��ačK)�ۆ��G����X�?�2�ӥ��o0^b��'}�x�[����V҇@p�d��hʾ<����A����e��`���Ҳx��������$@����X�r�
���KǢ�5.fɨ�{�| ��qh�\����Lu�\�0�I�?:���yv�P�\`�2����+���i��z� �YO��5�pg��ARt�،(5�
�x�h���Ҁ��	L�р��0'3H��8��#0�9��s����9&,4�T2k�'����-�Ȝ�������bxl�L��E&Q�'`�Ll���LP��)P�
>�e�q=��{�8"����*���؀p�h��,�-�s�'@�� "�b��t{�9�VL�����8��=
�
#F��2`�p�Y3�QLK�GYpml�{�R�(�Yl7���\��J,hUF���BA��>2�%7B2��Y�#�Z��5NA�ӗ=�-������X=�ډ������C���G)�:T,9>�aecD����ڂ����,�ҹ9�E3X�1[Q.C��^�j���Q&���؛��,́�&����ݮ�-��/ȭ����t������m�(�N_�?
+r�>�1>�/�`�M��?i6��i�o�7�}�|�"�:��=��W��CQ
+k�B$��b�㠾��Gy��9US���_}��M� jR!�����:�4�ȶ/�?nd3'<;��<y��l���#�6��ڄ^��;��~g�PG�$�@�$X�1ә`0Jp����l�(�r���������b!��k�ZJp6Y��lZ{����9�;�"R0�1�2�D1%H4��l17jo_-?��u�s%�,�P�	�?�I�'��YB�I�'X<	(�\�u'4YY�	~q\���ڏ+�	n5dm�	�,��+�	M��z�L�ؖ��|ߚ���	��s�%a�[Ƥ�3�O��Q�.�
����p��"�c���~H
챢�Pj�)
+͚?�D�ؗ��|���T���k�=�: �N����.��X�b�A�� ����`��Ѐ��0�v��1�I��`E�4��O�a0KK�����"X�q�Q��TDA���Sz�� 8�v
;5�Q���*u5{kPް80����yV�Z�%,ʲ���f�8[�#��OR��'C��n�*\��VB��_�Ҩ���8`�3���8��Y�û����'S���؛��s�a-�E��@b��
m��3�Z�
�
̴1��~��1�Β�V�I�#�u+b�V
@�a�{��~���^ Dj��pYD=���@��L�$u��+qq7�9��3<�<D|�F��	�)�2���3�8�0�Ͱ�Pm��<�p�
/��BD��G���0lJ�(ܒz�j�F{���qYln�#/�#QPjO_��f�I``b��9�f޼϶�j+��浕�/M9�j���t������U�oq�y�‹��:�z<�%�X�N��Ӧ����1H��4�|���`ܔxg�ROoc�ԋm�%o�z�Fle0^��T��I�x����cr���>�XŴ��c�W-�?�31���7�I-@%df�${��:+D���:�A���?�#�m@����Dr���o���,	�Ǘlf����*H'߲�<�p"9��J��r�DL�[)+��)��j�n�[���ۡ��_�;�O̕�a���̐�ɲ�⭩�~��㖅��p�/Wd^�/�����n�.Q�w}/�c��f�#���Z�m̧A2�J�ٖ���>LC�
�h�&Jr��-�+t{�l3��r���%X����Ï�|�˸�虦���E:Ws^U��j���
����`��H<g����ic�����X�AOp�lC��H���
+3�#��;kޤ�X��ckFN�SxH��
�0���鬄��	��_�r�O�=���U�?_��5�k�P�!Hk���Hk^k�
D�L!��>��

1�Gs�'�ќV�)�Q��W>���dW�=4���O�������G�i�W1{���9� ��Lz�L?{p��ͥDAY�*m4�/�g�f��fm���#�s���՚�;Ѣ�SQHb�2$E3�'����
�h�G����J"��<ɨ��gE�["���w�Wyf�}����3o��Mt�H�Y5gH�0fmYgN>����g�י�L	���=�t����qgFD�ȊE(���1��ɘ���'�3�2O��
�#O�� !A�Os�r$��Tc�4s��h�Ks��fC�n42f~�%�4��o��{�ÍE ���4C�SM�{�f����[�iF0������%p�,e�XQ���f�#�fHy��
+���|�8�-6s�W���ze���csNA|���3;���+xg�Ez�3^]b�>���|=_#C��X���T��"��n�i}
C�]0���-��6
+]C���tC���f����\]�&�]���.���Ez'K����Y��{��'N�Ka��|-i�A��
+���Ҵ��4}���N .1��[��+H-��E�-7PB=43�m��&3�p��i��1Q�4zJ;eN;�><m�)����V!Sw�״f��y��a�������2�訵G1sdR�K �R0�U�[]��A�s�T'��\���?�s��'[���XWwN��Ww ���p�$-*�j���Ȭ��(Bk@�7��������AӭO;{��:p���k7]]ýl޻�)/�n�3�'|���L��jS��{{��������gd^%�d�P�׸�lyc��3!�����.�
�9wSZ�7 {C�1��Od�z(}t��!��6[-�C���D���~V����H��T��3�ڵŖ�5N��a��]�3�VMh����~l�=�=�L����#}�MH�;v�$�~�����mM 	���ƏͰ{�>V�@v�P*�dW��8��.ɾRj��J6/�0K.zQ����<_��x�f�9m#n�e_0�[>x���xVy%F٠���)�Eه���ކ�Q�D˙�Ir5���C��d����$�@�'��3@i\I67	YHH�I6 պ���X�$��;M{_
�+I��!`���������*A��r��@��Ɠ��.�}�����.~UH�r٘*�.�����{do>����ѝ�:|Z���m��ͺ��*J�c`6��&],Z
�ZR?�ɧ.
+R���ƣ0$ѫ����fU������[���Z��0+�#�'���l�}��,T��*9��*xGl|-1{��X!q�Q
+5�-v٠p��)j��B��gB1�K�-��w\Qjxlw�Th>ch��c���TɈh�]��S�[�L������ؐ)n����K�-��X��n��90�چݽe���Fc�.}�˿����;gh؍�l�H	�4l>��i�5��bY��M�FFwbv��ҰsST���on
[�kH���a��E?9�������eǓ����B	�ԋ�}G����b-†�J�G��/E�{/�%�F�DB6�r$�0����H	v�q��x(l7��ڃ��6��anۇ$�P���֙=��	��d�N�>^m؈{7���b�~�i�Z���zU>]�h�$��UBTi�A�������."Ⱦ\#�ىM�UH�>-l�Jƒ/-;^����bj�-OÖ��`�곍�)�C,���ݸ/�J�]=;8�Peڋw5X(SG�L;an_��qW�@Vm�۔Z{X�J\���6&,@��"���mkn`g�&��z���T�l/T�:��_<�0��BK�1��F�m�<���?�1��H��Iw��BF��R�m[�!��T�
�
+�l��$�)fgW��`n��:��b�f:*�mz��Sg,l��l���7@�P�����,xm�H�t�mƛwFe�3��٦��o�J��L	w
F���"����Q�3I����>QsY�?��9C�U���h�ɼ ��XVж#����`<W�
mkM!ݏ:�?@ېo�b��/d{�i��Pxl��)���҇���ƶ�[�6���ފSD�]��i��l�[Լ�:�w���l��ݗ=��	B)Y�̃m�W.���+��m
sf���`�
a��h�`��@��(��`;h��G����
�Wt�F�'�n�*��>G۱N"�*��U��Ym{4�˖&5dk���O��fP:m{s����f���*�m+'�θ-���n�_o'�j\��T9���q���!���#¸�GT!7^�#*w�vA�e�;�%����޷3�A`�,��m�F�%��өR�NP/<��Os�������+o�����;�L8�����zo?7��b&軷`�����)�l��-
+e�Ϳ�����}��i8��e��q��D{�\�
\�f�o*�5��<p�?��<q�+��h��lp�o���8����c�.Fn����c���(S�K�A�.�
+����y7N��=}-��e�!�F\`�S��
+(n>u��đG_�S|��s��@(�r�R�(����d�㋗ƻ?���Ηd��i�ӎ��C¸bd���kffi|`��y���_�צ|�����ST���~2�l����w��DI�|�Ќ��#+?^�2�<Q�5���4]�V]��� ��y?�6
�'�O3?9��?��+���X��鷸޼n�j/�Y���ۨ�\ ���^�CR�{)�;v>G7.��6=�(3V�BD�ѭv�̊�dy��2��[
+u�te�'���
sb逇�rD���6�l��ѥ��t��np��?#A�)�_M��+�p�`�^�y殺Z��d��*��[=���'��Ri
+eH�l��p��[=���,�׮��	��?���_�%� �9�a��H]��OW#;��xYvN���N�{���P
��~�lr���gb�v��Kc{蛗,��,ݞ_ޙ�=F���Z�ឭ#v��������¨)��zu'��ݕ���s�һ;���^�ň�ˁp���c��G����P��'{ҩ�>�ǝ�
������^�Y4�rO2;�.;.����� |Q�8j�y
+�����O���[�)$�ք�ălS1���0PXF�K���[�X���S{Y�F�w\A����;�H`2�'O�����bye�w��Q>��.��f~�F/���o����c����:&ϯ~�m�<������Ï��G�E�6�>��%�@ґN�
���Vi�
Z�O+���-f�C>�e�,բR����c��'�4�p��y�5�@zi������K����zvt�Q/���Nj�}���+����/�R�[����9�	�a�Co�͇��g4�zw=�뎽�Y���2����ׇ��)���7[k������G���a�
��g#@<�b_"{d��R���jJ�X{U�mo����MBr_����~2�^����ޯ:̧��#J���7��j���~���SZI��2g����0,�ϊ�e��	����?a�P�F�Y?��.;�i*'b�i�vlI���1�]��h��|���x">��
������<1װ�?�������GYIg�������w�݅�]��8������Y!##8ܷ�s��/@	�������=�4�C��N�`#HA2.�0$}��5v)�6��
�n4�ShW!�濒A��6��y��}��m���:��3:ƭl��C�m��<���JԳ�&��6�l��^!8��FP�K�8�L��[F�l��Œ�4�XMs0`|C�1q�|�C\��rB�!J��`�dm�԰3}zS'�M���g�w)UD����F
?T)"MZ}e��@�ĸG�gǼ��0fuVf�lr��P,�D�~}��-#gky-‹���{M��i�m_,�W�0��6�mt�Vk#�&���0fu�����`a`W�Y��;�9^8/���3(�%|}O�^M�6�ԙ�6zo�M��1���(m�?���7W�x�����ӹ�0�U������P:�P��F�j��<�sP&�J�_o�԰#���R
�&P/�]Zm���(��?�v���,cGV���<`���Q���K�4ٵ���oލTx9��ú��M�u��Ê2
iJF��$������h�{�l�/]��C�e��d�F>ڀj�_���%ќ�F~ Ƽ�ӥ{
�W7.�,��Aù�/��t�>�"�w��
+T,���
E��P���T�����&ΰ� 5�N���
���d�����.����7~m�F���	�9��<�;�����}��B��`_4|i4�h�;u��C6ga��`]a��/��
+J���|�XG�ZE8��R�N�铻=���`��l�S&�'������4yg������H��['N­�b�=�wF_۶���L��F�ԕe�ll
`ۼSh7_߼��\]0jY��4mϢ]M$��I����=Hr������8��󝳏.
���;

+D�J��ު":�xR�%�؜s��L_����\,z)��ʴ�6��B�|�����԰����x���l�YI2e0;S(����H�����ɚ�NZLZ���?E"�@�F��F�.$����VD~�O�m��i��h�Ȼ��f׆-�I
+�<\���i�����:���s��o�D�|!���K��ȐoF���x�>�u��_[��C�s�ql<v3����Rþ���G���Sx���
-�-X���p�J�\�?��Ý�`����D��I����VЂ�C�0�J��?��ӕ�>�y=�Q�������7�o5N \�
��8�o�%ve�Y�p\���K��!G��ԈE��E�g��O�.���C�hg����}�Ƽ��}�����}n�ZԳ���G<H1�*�#�$���K�1s�yƯL����6�n4
���ןFö����
���69{e�b:�s�S��S�p��J$v(;��	E��4�hs�js`�B���g�z��#Ĩ�L��$M�d��`���qY?p��$������<	�R%�=�;ˈ��
U-.�r�$��Ԉ�/$��[8�	C6g
IBkK>g+}(�1�}�=�����!���L
��O����7�r�=�Z�l���L�]��/mz�������H��'1����ԕ�\���bL�ݾ��l�NY)���(�
�[��m�.���)h��}���Yh��Sŀ�1���\��}���c����D��?)��#��:�6�)�o0#���qI;�!Y(%�����5��R����+]~�%?UG�4�����ƽ���u�q��p��$�y�0�����>�v?���)��>�w���������/���3|hڜp[�2�Hk��Ԃ�rZˬ(|���u$�G�"z Ž��~Ju����6}mP�����j�m��|[Y����0��
R�Xf���h�λs�oߦ�&�q�'Ӱ_���+�}�kaʴb=�s�*�d��ēnP�cg2�� �=_T��p�!蠤�p�#ਤ��q��O"�O������	�k;}���~��E/��g����������w�r[ ƻ�����ShW�J)V�
�ZTF���
T�^��� E���aYc�Ȥ#ؠ��8�8_73G���#�{�x>
�ÿ���׀d�n��=�9���������@$-��&
uzh#av=���w*��N#��i���後���0M�q���P��V9e,���O±��>c�6?���(��_��V�ؙ�>`<�)��h�䈬��h��h�\4�'�¯�#��A�yhq�+m~)�v��=*�/mz�P#��Q��;E���	��~
+�@�~��'irS��V��1��G���S(��Jx#U
+�@�z��j���(�"�?;	3�z��@�w�q��ܝii��h�Z��io�h�No��u�>i�CP)A?�!��*�hq��p�|!���������3��&�
T�.�jhU��:\9;'��f��no���LZ}U��2pd�
���|�|��V+3g����D�z6�c^/��I�[�M�7���8ݷ^çV]�y.}��4��>H�W��h��[�	��>�z��g����[�k���D=����&
�&�r�~���66�������2xc�̜�3��m��:�P��Km��A
G�Mo���L�_�@��o�B�n�B�Er�N!]���u$KA;���[X�9WX�Io��W?Ĵ�ha�Ạm�n3У^�Djر�lj18	�Ĩ��8
��$_g*%�% ��3T
��`�@�y]��L���H��	��n�O�Hl
+�+;���p��O�^-��w�$���ƾ.�WO�`��|�
ZDz���D�o�"�0�=a���@�xvS��5�N z)TD!F����<�u���OH2�.z�w�w��
H1����y���O����n$KA�@)���D❀D�} �PI콍&
�B���xg@5��x�D���Pm�����3G���3p9�~}A1wPB��)3y��� ��C���6����
�y�8?��gO�H�
+P(�F��=�u6Re�]xw�ؑ�2qc���v�D�>�v�f��_��lLܝ�q��8�n�Lݘ,�g�����A8z\W�4�yʼNd��,
}��]��;�e��d�3��/��|�蜯��A��9߹ڦ������}�A7�Õ�8�p�fϭ�ԡ�2pd3MZm��V���Z�
!�k�D��}y���گ., �u�}����@��)�#mr�X�h��(m�M/׶�Qٷ�t�
K>}�&�]k��V#�S�N��L�_�@�d}
J�E$�v2%�6�m��]�l�حxH�� ����������5ms����y�a
Gd�Ds޺b��P�t� �t��!��*�'MÛ�϶�s���!��#��Q�#IA�H��6�����l#���dٵ�:	�%N�_���)�?�	���ٵ�����_��V��	9��<`����	��o�]s��i��zW�%��M�ݭ���JhK��N��;I��A��3whs�Y���f���$TV�������m,�n��
��F��ݪ�"'�l��)$�6.靮�R��P����Fe��Qٙ>	�8�6����i�7�n���	��m�?��F����C��#��ԍ�4~j�����/_�n쵭�����4�i�
���	��6�l���-Üy1>�
�V,�Ζm���4��ύ&���M��>i��{�l_ö�i��:�"]����Z�^���5����]�6������i�l=˽:���c��J��!�>Ԩ�q�rtO!^}4�}�|Ob����7@��J��������}�:�d^�i���c�y�j$̮
 G���{��,�|�'����7�p�f�
�q��!��m��j���cH��2}��~C�YLʈ��Jim�cRg��������B��Ed�BM�B�|�'Lg�x�����!J�/����l��=�(��j����n�S�i�غ͟[��un\���?�|?��Bܻq��l�@�{ro�d��*ar�$1�>���s_g������9?c�6�ء�@�yŽ�n�CL�,��0v��K�U�!a�'��Z��g�K#�]\P�
+I@e#�A[�KWቧl�I'5��)|+]z��ݷ�c�5}j�&���t��C9_���c�ƴ2xer�V�F���}�+���#�s�r�Mw��ɻ嘺���}�5���K�����=�w�
׭��C��Щ�2oe�L�|�u�w�|Ϣ]���H�����Ǯ`����g���D��	��0�;���f�W7[�ֱW�;+s7F���3|d3L�C6���iÀ�~O�]����>�w}H���������/M�|�u�t�F�������]
����$�|�#_�����1Y'Wm����4}l�[M��6���ee�д;�v��X�+qr?�ᜟ�C�e��x��'Ӱ���:]���k��j�<�Z�[W#@�8S`��b�)(5���N���Z�,���?�㥳s�r�Q��=Ѥ��I��<`��m���@7����o��<�_���sr��F��6Ѥ`}�	� �t�rv
���{s�E��������q��M \�A��9��9]9�Sx׍.;Sh����9_�N��6�4�y�а?�jؕ8����̈�)�v��t�Q��7~m[���#�������}��<!�>�g���|�z��E�} �;['<W����׶m��6�y�un���c�w�� ɽ�v��p=�V���iw��O���[#urk!ʾzh�.���2�Tp_ñ�*q� ������Ị{���
+D?a'}��V���p��ؙ�1rc�9[#wc�q]��Vc�n6F����X�Z���
���{���8�I���=5m�Y���F�x��Η��|�:Pc^/���J�]���5|n4��ͣH����)�~h��I��<�vG���y���΃hW+u~/{�'�	|�3uj2
�|#GM����݀j�ǰ��|�<Oخ�8��J��:
+b� �b?��v F�؃
;��7��>�H,�@	�(��Π$� %���c�꽁���w������4��N�9��F$~(S�O�g-��%̯=Ub�S�hj�u�t|=��y���b��	�����Q��C�|��8�%��/��ӕ�9�q�ǰ�E���B����;�:?��$
����W���&O��4
+�
+T,z(S���g����>�w6��pC\#(qh�(��=5�FV��l&Ϯ
eJ�E���~c�
t�w�t��M ���#�k��j#M��T�M�a����w�B�S�x�D�~?��k���׭�HvM6k1���_�A��B�}_������%��Fd�5$�n ��I��;^��Sh�u�t=g0�M~(�C��J=�=�v�������}�����m�� G=���������7:ƭl�y�w�s���R��G��_I��}�ꙻ���t�w��D=�����<O�]�Qܫ��Η���jD<_d��R�
U�^T�w�v�
׭�1��A�y��6��R$m6*i){S��z��;�t����/�z{�*�2��D���2�'ir��e`?��S+k2$k,�
+�>eB�?��������J��/e��0��F��od���Ă)s�3q~�'���4��0�^���Z��=�u^�p���}"I@��Ih?��@�}���� ��#KA{	�k#Y
+�A�{h��N���P���
Ұ}Dx)��>�;(��&�쳋m#J�[�K�o�z�a�-���0��!H>[�K�u�r6�x�&���H��6R��'���D�|v�堭�ٵ�"o�F��cxGD��g�p�l>8{ȑ�E��2�<5/3WFǤ��LY��u�9^8M��W5+���0���W���N�ޱ�Q�G��7�n}����S+?�����u���4y&�L��k�?�{��X�e~C:����
|�o��<�~���o�z������6[��ݳM_���S�4~f]o���+�qݼ�_[
SFca�u�������5yj~���=�ō�1l�,CW&�|�:Pc��I��7�p5��\}(G���"qO�]�9��A�|>葯��y��5���.���O����g��jx;�
١J��Q��z�*�_�K�u�u����S�x��T
�R'�v&M�m49��D����J:ʮ E�g��� 
�F��?�����<���%��cH�{�x���#e~'O�;J��K�"�G�����y�t�O"�'�䳇$�����Z��w�v����p�lûo��g��j�8��w3yv���v����
+F;��^���K�����n�<���6m����i�6)s�E��6|n�p�)���L�����I�]�g����G�/�jh'@�h=����M�[}�����ݷ�k�8~o�����t9h/a~m@�M�ژ8[��#�q�k6��ܿ��2��
��`@�x�'�����8^7Ԩ�u�s����a��:�s���M���D<���3|ds��-��m�9�q�G����4i���Z0��82�L\��V���C�m�|
�Z��;��k���vkg��f>�:f�k�6�>qu��2se4dž��`��j����8�L�Z]���u�q�P$����2pdu��v���} Ž�å�:]�~���{�y�HR�M�%N�W���9߹g��
��;�t}H��U��Q��:=�F
���:�J�]�í�8r?iS�>p��*m�J�\�I4����
T�w��S$?Ti��$��Q��;�4�C�"z�ί=����~����CX�u�r�k��� F�{���)��?�y�h2�'m
+�J	�#�(�Bۨ���
��9�q~����{�}��a����:�9�cX�{�l�o�Ms��i��j�.�7���J
���v�7��	Û)��F����~c�b컙2	�����H��*��J�_��F���@�x�#��Sh�}�~���3�0�R���	EO�q�:��L�w։��C�|�Mߛ�g1��C�|v����̍��5;Cgks�nߦפֿ���0fZ0�lX��-���8ܷo#��s�o�O���u�������ٛ�Z���7�n��ֳ0i^f��A��d�Z���cG����5�h������vg�j˷r�ٜ��K�o������L+�k�/�D\�<Vo+��m��7����X�;{U�����+C�k��!��I��}N�����:ܸ;h��1�}�=��s�כ<�7P������8�r�'��2��������?�x�F�����������@�y�H<��`�+�jz	<,�����ڵ����}��>[*�Ў*E�L�]���k� �y��:g0�Y��
V8�&�"I���P��)��<�{�.���[�}�"���s�4wl4� �r䳙>�w�e��1��7�j���Q�J��ۢH@[gЮ����8?#wFǴ��1l[y�M��+�e��d��R컉
o�E�;����	��M��9m~�M���Sgx{ ��~�$����6zp��O��ԭ��=�~�8x[͐�Z8Ķ��}�����\i�Ϧ�k�o��z��-��w'e�D�~�P�ޝt9h;�z�NA[(��_ݶ��ڭ���u"I�ߴ��"I���}nܝ�u�i��h�����^ۼ��4�j3���6��^�����]�j�N8�����=�r�����1Ê�`4p/�+��L��񮾺�Y��꺾m�1n[-/�Qӂ]�<v��L�s�&���6�6�,�Cp��=,ĕ�gi��晼3mL��^�z�~��v��C��9�îp]����2w���0/�2l���ž`�j���vU�aW�>Ǽ��:^9[�K�{
+�l�<��g�F��z#���½����\�S�������̕ac�n1��-$�׃$���#^�c�G#m��S¿�9x�(���D�[�+�u�p�M �7����Nu�q&i��l���&��`��]�h�������F��1�Y2m��6��	��7�o}�.m��S�g��f�������@���2�w{E��4vi�&���ԭ�3uhtM^ڗy3��g_���Z�9K�F���A:�'�-��=�v7OXnKs��m���!H>�(���(�&P�]4�s��������7pG0��|�l�O��`ţ}ɵm��< �?��=�w_��l����F��v�&�v��n�,m&Mｄ���l���Cxg�x�|�^[]��VYr;�fw[���j��u�r6M������B�����5�k�u��ql�.�����b]cb^2|d�p�V�,{u�`�L�z������iq�qr]���]��v����u��Ŷ8���M�u��~���_�w�?T������uv،�&PMK#���T�i�iY6-��.��Ё{�0j`"`�ľ`�d���q]�îktZV�E��"6pq��NV��ӄ2�2NV������$��N� `9I��r�<��z@������������
igmzi�x����L�إ�ݕa'�5��
+��@�U--	XT;qN$`e9aI���r��+sB��ڑw�vB<�����U�Ճ�*��YXWXWXWUVWWVVVW `E�²‚P�B�VZ�$4x`��
++++BVY"�]iei]Eؐ%A�U�U|��p.�i��s����p�9�s�a���7<��p>�k������u��H|�h���Y�c���eŔܓ�C��5G&f���

�� ���s6"I�\�a��B��B�����CF������
K�+,�<L-{�^"�д<�i��S��Cl�X������_0N���8S���`���p.�gx��4������o���2\�_9��1���p.�e���6���p�����6.�Sp�j!�k]��b����
�`�lA:���>8���Ej��K>��$ I�e��ںix�򒰈(�����:�]��BjX
+1��C�"㲰ǩe�샄8�c����c���U��d�
��~�(�˖i�˘�8X�qaƬ��pn���!f���r�����P��E|�����o���;|HƈC9�F�'(ކ� �$�k�F�\�x���.� �^D+�"|J���J~h���O��@�C��܋�$��uI�$���.4_��b[�0�Pf�1!��@�i��3	�g#DM�ULLB#���AhL���r�G����Tq+dt��h�s�
�h�8�
+c��$j�taWC��J�o�ĥl����G��p��~ă�O�J?R��0!�p��h��_���#�(�D܉q$ĕ8o�D2�����6�����!"�I
:e��}RRL�A�!��ǥ�����%��z��Yh��Kd�%�RM��������N�4ULa�<�eLQ���
+e.���!f#Iq���������a&.q�VN�r�T�;��tHpT���\0�2���g�����-,\��0��wi�����+�:6=��_�x�	�KV��K�-h�H��E�������O\�
�̐�c��}bzy��Z�x
1�8
+��
�f26	K�1
��j���H?$D,�����Bx��Ahh2Y��rF	�˘�+i�� ����/���_.*��{}��|T�TA��kJ_�ңN; G���I{�RW���VY�Wٸj(&bBB*&2��x�I��W�[c! �F@ziJ������k��l����9
,�b�
�����&��LM�V���)q�/��Q�2f%��b�>�2�:u
+�'���bF��V�LX�0{d9�4�e�Y5�M'}��1.�=Ltj"��L��,}b�d��E��RiҽP��F$YnQM(��EN=�X�Z*�\�M1���V!6Z
~��-��Z���QDpH@.L�@/L�@�@�n�����K�s��]�챖c�+"�����vI�dSERS�����-�'��*V�/��A0�O����_W
+�~y�s��h2�Z�������*�ڗV��11q.g�(��=&Q�f�R�	@��H��YC���-f�*��u��Ή���Y������3Zb�E)��#�*w$-��F�3HZ���V7�P'v��N�0-�Z���Z��pf&"iԬL29�Y����ظpkk	�f	���"����ɾ'@*����!�Tb�	ɾ'=$���8�d�+b��y�1]\Q+=!�nģ��I"ES@�s\���[�U+b�L�����/3�
++n��G$??Y�<-�^���b��T,�yb
+��
+6;�!��r��d4Ҙ�)�ī)i��hd�qH���㪕m�#vߓ!��	;n
+�D�֐��o�b��A��2��)�Qq�RC�+�8����U��HTP
+&1A)�Ą��dS��I�ӑ̩�J۷��9��
����$S�ˤ�����E�H'�+�p!�ܱ����R�BA��Ba�ˌ�C��,'�ٮ
��ߤ��b R�D�J���G�,���Q�U�a�A�q�M�akYS�
\J�
^R�uP~�J!T��<!!Bf���>���6����^X���j6
��0?^��q�6���%���o��/Q�.��IjH�1�!��d�d��}PrH�=�1���X0Ɋ˰����(~�'��m��–Y@�4E [��������&:i�\B(�х,2I�q�n	�/W�!gP@V�J�Z�d�$�.�E*xB-^hI#ؒL���*W�a�+��u˭ge��
+���+�6B�0T����o�QgHQg�bƎgd��D��rƸ�ˏ��e,s�	�����w��rp�e "�~H�L�%Y��S�$�o	�I�#=&���܃�*��dG� �b���JC$���N-�j������y���f9�
+�f�)m�:���	�KZ�UF�a��v[k
��
+�Z:PK���F�K!Z����0
��2
+�a|CD�����mX��@���zQ���Dkܧj+�i���8�+�~�/�E(|���n]�۞԰�������Ը˼P�u!B��h�0��af:�L<�h�8��r��%�Hg%��	��%��n�SL�'���NC%�|�A���MiB#
+�r�:21��&
�td�tdR��	E�r�˘�*�q�ʖ�,k�5���W�����!b,�Hف�J�
�j˴���#�7�ꑱ8)8l��XA0�G:{��[��tL�B��RJ�;
+�ov���ʒZg�f��D�0�/�5�6X%�
H�V%YJ\�.GHq��rg	#Z�~�����#	ܙ-��y���yB.
w&.i���$4"�y%΍�X��/`��5,��R0p!���_θ��yc��	��M�%�<)Gj8)A�9K
m
dd�衍�"�nLr���,����IO�d��*l�XQ[L"e[+P��A�Jl�!�2��mVf�xKh�}H�����)`��zX u1~�����q����
��˝ybJ��,i��^n��V�K�R�.��^"���E(7�M�0��E�8����e�rE�����9LF"���C:3�f�N�#�B��=�q�((�0V��H���&dzCtlǞ��bPT�܊��5���8����J�'�)q�9���5qa?����M�.4�hXf��-���dM�1sXAìa%���2�)g�?���}�Qc�T�Wk�4�����.��ˋ*��J��t��A�wv������`�6��K����e��7MP(v��L�6=��m���u���ycZ�,d^%��NʐN�%ݷd��b+*��3qpI�lq�͓��8OU�*�`)KDº�*a���դ���ʋ��,b
��M�[��
{�	��G�Xj��*3�=%F]�D��Y�۱'*�#.�tEnl���S{R��R��2�Č��rv�#�~�cR�R��f�A�U9B?�`g���&��[��h@�-�#Z���@$[v"Y�*R�F(Y��V.>
+����6�����)��YlL˕�XK4�Q-�����E��������ܸݜܰͮ�լ��vPv�tL~|:&8��!��G��$Dn?$@�;)B~\�غj?
+�B�e�mc�Q�_Z�kZrx�(2��"=��ܸ3x�5,��M����}�Q�aR�YaB3�R��h��C��i���������|y�
+[�a�MG#����s�T)n��^�0/5"��'xE,
�U��D�؎C��l��"���6kɦv�4��2"�At!�\\FiYHg[L�(�^�J���(n�%6l@";��>��}����
�uK��L�����OP�3��%S�%��,�e�\#�C�
+��'�b@��p�{7d���q�V\�
 ��R2�z���L
�U�9+���#=d�Ga�5&i��Ӷ���8��x2���`�ƭ��'_l�!]�Y���(Nj4V�oe�\b��*,���l[�Q�X^Զ��$5^�#��!���"�.K�����ˍy�C�Rq1�SNt���`b.�R×Aia�SRxVH�bXP�u����흐dkGbl����
VNe/)�u¢����m*0:m�Eݧ��(�-L
�A|I��ZT�eU
+�� ��C�܉�Sn:,E�z�>
�1t�i�1�!��2���B�^��N;`G�6�G?�R��\b��-5j7,;|�~ۅ�M ��*�qOn�nLn|2V66J
+ڃ�ҺKJi�2Jw�bJo��KC��L��tƚ������,��NZK��,o9�ٖ��f����xj�@��JX�uBb����aW�Eْ�;��o���ω�-�o�m���I����6q�+d�N�l�d��M�ؙ&���YhA����*�����K�u�K`��x��wd���3��ۘ+�}�a(@*ւ�X�.�ڭR���� ���.*��J�dO��W�p�W;({�#�4�1�`Eb'����X�]YN�W���:�i'��,%��TN��-.�X���H
�><ƸP��4��2ygb1qf�
S>;�f�p�]D��Ņ�
�1?��vX�nL�V;({V���ZD�j�E��B�L/H�@$�v��U�
`C&C��
;:���.�"�"��	-��
+ڎ���°�N^�y���fW^|6-9�m���gyA�m�ѷ]d�`��Epb�%�,�	U�×Y
ZNeUFe�"�2���C���!�)��Ut��GLl�%�ۯ'��J�q��R�;\1�3P���\�tD�������[XH�
+LB����dH`�;!7�Ж���V�G�ѳXV�4]̋�Y��T�`^V���u=eE�R)�3\)�Rp�9w��:�TH|�)7�ZߌJ��}��.��D
F�D�!J)=a��|a��,�G&}uò��A�N�c@�wdG����NB2��߀��0���ML��ZM�R>k4"g4&i
+G6k����&�7W���t{�d�X[8'6l�K
�{�A�m����	W�l��p\z�:-G���ԈU�����gc#Y�Ѫ)��.��VǬ-@
-טEXU��0/
+�&UBz	�K}��R,�!�4�,�?���V�H&M5C�K rI��c
��K����/��F3����Ig�

+(ݠ��?��?�Iw@)��D�cZAi �<z'�n~�C����B=��$��	H4km��Ki�9鴵�\�M�_;�s�K�@����jAh9��%#�
+
+�������ݯ��1 ����$S~Dr�""9�WZt2(.�,eE�YS|-k�>�D�ퟴ���Ң^k�a�Y����cYj�H�'H��^�2��������z��ҢJk�R:g�":gќ%ɤ' �+(�'(�+(��-8
�5���!��z0��������::k�R*c
��И��J�*�H�@������W��a�h���Y�ȒJsQ9�1���d@v-#�s�j�|�UT�e����:Z�H'ma��la��a
+h��e��ҒZ���ڹ��f����|��l�l@�L8�
+J<�*�u��V2�N��~@4?vU�L62j�����MT����5=��A
+F�	���&�O���
��F}�Q��=d)�m+1j9(:�&9�5Vv����t�p��u�*ݻ����1�)�c�*�-Hd����?@B��*��F|i�O��g2O&����RNࢱ6`ܝJ>����x�O��
b8z"�>��H���ޯ��8`���;��)�C�}����-�QH�9�`-����Hv#O�ZȒ���c��Z�X?�������d�!�����l��pF�m��#�u�r��i"=�H���D� E�
�ɾ������N���Z��l8�VC*�+{��D+H�L�����n����C�S�+ʩ�J�)?�19W�����h�Z?�[UDg+����R�+�	R,�(UĿ�	NP��G�&v+$�؜���\T�Y=2i��s�tV�9ɺ‘���
+�����I��<�sW62�EB�$�B;�dHF�6���C3*i
+C<�-&�t�˚
��?�юa��C��pC�C��L�ަOŸ��]Т�?���(��e V��N�bўRU�P�N �/g�V�<
+K��y�vߨ�>�9g�
h4a
+���AdYu#�3x�؏4;d�'���1qd٫������0
�"�4���R���|�j�<5��oM���i��昹��_�Vf��mLK��V�4�uo[��C��z�M�3���m�԰+mz��$ߤ`T�O��6�����~�g��J���|��vn;���O-�,��UKz����u6��^O���L z0��f`�yī�*�:Ȯ�s��T�`㒞2�XE#�O�P�N��*�^�H��eds����H���4\g���7DA�9D)��t`�M�a���'@���x�W=.g+���d�B�ؓ2�V:�5$�2�'��U���
IuzhU��G�@!I���ţ
��[8�I%��9�s5��Rq�1���]URk
KF�M�����䷚!�t	���o��/TD�
�H�@�"#��!_O��N��=a<?�g��g'm
+�|��%`5��8-�R%
+m*���ţ��ĢmD����P��*�g����Ұ_���	D Ƽ��)��A��C�~v�\ܽC8�4*��X���@z'T��s��kc�k���#�����智�l�۬:h�G�x���Z=s�6�(���N�_Т1��"L���&�=�E�QI_��Y=�V7*�Shᯚ1YG�"���x�#hQ�Ep9����Q(�ɾ��齓.�P�)���`�A�z�F��I��P��U7.�+�s��	E?EB��.��L�_��Fe��#��2q؅*�����<d�GG�H���p����
VL�O�_Q�O�"�n�B�^���#���2���8��
+G� E�T�BA�C;��p	���JÞ��c�p�3��q�n^,��J�v���w%!�^PZհ�%��
+H,�K��=��wM��I��G��U1$��^is��t�z
^���L(�'�.
�@��
RC���;�z�!ʽ_�V���9^8$L���S�h�P����P����;�uD��ވr�G�(�WA2�`@v�J���cxW���k����-#W6�ĕu��2�&�����u��0eZ1���
+�%T���82�L^Zv��`������(g!˾y��[(��<�
	���0$�b��:^��*��p,� H=��9��(�
+V8�U4&{j���)h#0���p�Z8�F4��0i^����o5
��P� �^�������b�#|*�2�4��gBJs@��; �1鬥N�<�>*��*��l`�T("�
Tp��ߠE�g��K�� Ecg���G�(��J�u�!�����T�>�ȦVB��ف�G����q9c�Jg�М�J0����>_D����:�����*?�ʎ�	(ͥ���2JG�qI+`�X(
�H�]��ε]"f��dm���diD`l9���P��~�D����K�&~"F@��[GV�7�$��Q�>�uvR��BZpҹ�ґI/��D=����\4Y
+�>�y߈RЖRE�fD~(��Pe޿d�7�n�\g=�m��#����$�)��=�y�H�ׇ*��S��^�b�/h���H���	A�y%J�o��o��~M�[M��V���9�r��\
c���ւ��8XW����E����S^���8�!@�ؕ6�~|W}��
n@�j<�[ZF`ђĸ�r�(������z)�E��6}n=�w����zH����F4�Hÿɓ&��4����\WFk+ ��Ri�V
+�
+f(�ZK6g/(g����$kL:�-�P�%�}	h��㲮�!�J�&P�w
+��@�y��
U��%𸬱b\�)�R����lK�"�S��A�~]��C���ZH�G�@��K�M��z�$=�H�vk��<?)awh�WA2e1(i"�?���<�u�W�t���8��7�~=1�����Dt���S�Rb꿖����������0ƒW���mu�-�
/b	�:����c�ׇ�n ƽ��:?���"5��@���wOς��ϕd��:���pLz ľ�B���������.���d��T	Dہ��;j��~�o�2	m����Ϟ:�hWɨ��xd�lT�S'{g�����o]��~C�_�H'��9��L�
Z(�I��6��Ð�b|���yl��]�*��t�k$��^=��&_�l1�ZL��,�ShG�0��@�ytQ����#�[M�eJV�^SR�K@��^��O��/r�����3|hZ��?�J:��^a5�C��� ƽ/]���-Eb���!Y'`�Ƞ�#-��~�cr��S�:Q��>�S*�C�AIWH*cPJg(JoX
��x�
+@:��C[�;�i������3�ŢmUc�30�8	�$	�'�(������V��+@�+4
��\ �7`7���M[3�6�|�<�a��T��%u�������L>g6*k����i�V�^���G�QI'�h9��;�u~���FP��w5I�3(��n\vG@=�H�auS&�����^����D�`F���d7�ih+i~=���m��j����)Ի��A�n`~)U��V�|�:Ti��"���F��P�-gV�[�ưm���.����6�wR�����2sc��g�j]���gC�1�����8o<���n��鋳g������9�q������T�n!	��4Zؓ0��H(���鵯xP�VCm
+���O�]��c���~��

ƣ�
+�i��jn��+����z�"�3%���iػu0.�
��a��qy���؜/\��7M��9�q���`�RI0-�9\���7�{�n>5�p�+av�/&;�g��|��>7:�+GM�}��>�'lw���?7�B�OD�VP�NA�០�S��":we1����P�E�S&�T��6(��NaU��25�B�{W�?Ǵ��4yj�&o��
Ӎ1iz�#G���.j��.�[(Q��@h���YxO�&�	R(zD�K���:���ؗ��ޝE���L8k-"���
�kǦ,UB�A��&T0-
	���J)
F���>9�?�P��6�c�6>�x�{��C.�=tـ��@ij�)�Z<4�A�rL���fgc��y\WK�@���p����Zh�"X�8]�i�2��#�A�K-�N�"���#���*�zi��p� $���4ۣĠo)2jm�)�݃U9sN�B�C�AIo�BJ[
���P	k)��Bk�����!˩�ˉ�Fd�jH�I�ܞC('��m�|,��&����5}��=�W��m�4�lY���n��A��5�jsM����7c1<7���C�~G�ܺ�LA��C�G��:(��.���&
g������I��I�ގ��i��U�U��`Fd�F弔�9�t�'��-������T*(k��=o�6���ѧ��Q�_ӶY����v6SFc�-��CX���d񯭭�L>����#O��bQk�r���T{���T�'�P�e!,�Ć0�
+��E�/'�
+VH�F���*b��IjK����Ɨ����\d�0��ڒ�Ų���KJ�-(�������!J)�%�ΰ$���dT6��8e�O�a� %Mau�60������W��o���l��l"ʽ-�}��F�`c��g�Юo[����n�����4�����9�ű!@�8p-�W
2}dbH��9�I(6ª���Z1��5-ԉ�ZC�Y
^P�UB�Z
]T�@�*�j}(�E���-���Q�A�M��P�&�
�M����djŴ��ٚ��sGnl�'.<��X[0*�^���*��֓N��z��n�	��q�q3�b���hG3�~kTF�+�Z,&���:	t�����0i5�Ex���e�2�z�N��y�5��Q|�e�ȰW6,�n��Q���@�7$P*�eQAiQ!_�b��B�8?�0�Р�ذ��`��Q)+p�H#i5��:๺h�.����jH�!{}11S`��.y��"� �
+�R���T颗:M�S&�e��`b|���ԡ�I�]�j��}�H����"�h1��W��̳^"x��+
+\��
ϪҢ	t��D��2|fa0hڮk��Dk*a���ET,k�h�UG�G��
�ȢM��Ŷ����tf�2�G�_�Bq�R�9s%�*{H U�2U�r�����w�_ˤ���TF�����u�U�����XI�P��t��Nv"���љ�h�ҁyM�e2�|=�뙹�~��y�v?�;W�,��@�}ژ��0����u���.�ź��.\��+΁�
�*���D�e_�4��(6!�(�A�6���,��Q�2�����T��E���������ZC�0���Q���4��R]G�H
�
+��Xb����R٨�V`
Ղm)Qg����������j����`UL�^VJ�ZCi
+E>�.�~4�e��BqN��:a;��'#P�X{yQ�����
x<�L�`�	�K�P��W�Z�����>�x3���i7�x��+[�`:p�����v��.���	��Y��9M
+���J:�公�‚�r��ZŔ�J����T�-�5�&�2�&�r�s��`ݳhG��fQL���*�VH6�J�^���#M�H��P:˞DI�}
+�r�o_�m[s���̑�#�, ��T0�Я�`E���]˶Z�ue�+�0�A;P\�����1��i��0hX�Ä-�
��`%�k�6�h�e�hC:�b�,
���fH@��ţ� �#����$zX'h�Hg-�P�&UB�CSo�%�$m_@�Ԃ̸74!��"�O#���c�
�)=�	iȱoV�4�Ů���')�'����d�ً�2sg�Ư����@�z6�ޜ��C��je؜.�È's�/>
���u�si� ������2ugb4nY��6,�Ct�JEx��UĀ�e=@�p���vH���{�
zpu����Ș[7R�%T/SGS�E���P��И;6�兼FeG'ۂc��@o��ú��f�BBL���l/�٪�Z!�����7E��J�^:�D�|�#s�Њ*oA1�)�' Ѭ;t)��YUtTBk�MnG��Z9�	N6g�Q/������dX/�?�l&`m ��\��7�0��R/g�οy&/-������nsX��v�30�d"�5��1{!�bX!�b\
x
&�����,��:(�o^%�젔���j�0��(*l�)/~��|��îp_���9CTl��L�	�m�cR�FIa�yq�P�ڙ8���`�����=a���Pnk���a��<��}���\�v�0dZ����r0/�„
��
�	�
��C<���°�#y���� �����`1������ʷt�� �$XS
+Ű�OA��fW���p�EdQ!{@����Ѭ�"���b*'��H3(����r�	w1�<�Rǩ�DNІ��.'��@ibo
+w)�&�pm�ɥ�R�
YFd�$(����(���$�����#�>B�G[�Qo+CgV_��,Y-3ֿ�.���T�Ϣ�̵&`�h�	[W�9L��L;x����_R4��.�|>���uto��P�+�
��/�q�/��o�+�ƕ��$��V�
:ˉ'V��+���<�xZ
���I������T�@�nP��yn��Of����	��r)�|�9Hq�I��}�ү'qzi*�2.�t�	O���I���� ���ؠ��P(� Ž�'LgUvn���l�������ZX`�|؏�v��O�A�����Ŭ�@iX�e�ȴ�
Z��D�>�1�1��c_ZP���R
+�`uSH�m(��0�&�aT(j�B�3R'�l�D��D���:��-*j��w�ju�A�{r��6�
�Z&��L�9�݀�j֮��!QQb�j_��J��w���X�p�(!�]Y����,˿�@p
�����9�9X���d� 2x��/�!��^\>�z�����a83�g!��@��0F
B��IW��ʗ٘ʗ<F"B6@�
+��.�A�U0#R�0e�a(�xL���Tȸ����|j-L᤻��v�&.�ʋ�V��
eD���s�z"zk�R*+p�HA��<�xs�FيGgk������I�/@	�m!&�@41��x�;�s[�g,��_|�
���i3���aOF��)$�@:-����c�����4p����"T���	�Q��ol�j��N*^�{pR�~fv�0�
"�^��	|���aS4j�(�h%i���l�K
+0H�-c&e�F��hQf�P-
+g�H����Z�����38#7�+"�ڣK/}�٥�L
iQ@e
+LB�C�}��\]�8xK�*�F$��R�9)�PN�{�f<3l̜����k��f��]M��6�/�.����7)��@t�̙��Н}�t�D8р�5�
��Bļ�8���AB�;�1�����k��Ä1�Vc!�P"�V
F|q��0~��e,��I�ՑOl/#�^J���f�*
�@9���o�:��
��s�
��S2�(�����`VN�F0�K���XR�!c���ɜ��d�.l
+>>g�G��O��,�����C�9�����/A�� J��]S3����A`������
+̠���Y���p��a�=p3�>#�@H�!����/�7�o\������2E!�c�r�U�lR(�v
&���n�h�i*#�
�jА�+,�5X��h��&��d`�����$�g]���
+���Ez�ţ|��)+q�i��YWx�Q��H%|�=���ų�:p�"b��N�-c7�]
+
�
+hLjw
+��3zlbB�ܰ�q	�z��@��Ѐ�z���Ø�˧Gw��=��O9D��&�;�q��óG7;���r���*�(�4��<%;�"c�:��}����)�q{�:/�~�'�DO���OiQo�r*_���F��9[���B࡙�ꑙM�$��e[���y��"���B.bÇF9Z� �Db�6���A�z��(����cv�U0+&�`P(*ÖDŞT#ňL�_8�x�N�;Hi�0n���x��c��*:-�܂�4��e[8�H|�����][�o�.�_X_F��d4b���^l�{Mv���A�%uƮM;�w��<����R8�\H!v��Fg[�b%�,u*)1
+j�Z4j�`"��Ylbd��ۦ���X!fUòF:D�Sé�3�>hyR���g�P�gsO�B
TŸ�-�$$@�Kf�q��"wN*�zB.
z�BS
 �CЌ/W�5#޶fR�*Ȥ�I�!]�"��ak|���
+��'tڗsVd�rL�p*۱�yX�ԝՄ�
�(
��d�
K���T z��3�f�-�=�xs�l�B�vk��[�Дy��)A�U�'AM�HOY�
+Fc�@�K�~�t�̮dr�dX1������13�b�
P� /	�c,!��K��
lc���,8Ԝ�����
+�x">�ovd���:�x^L0f��h����X)#�MŅ�cbc[d�̏��-�u�ªf�]��@��&W{�$S�岂��%U��#S�4Z�y���p�yH��0�UN,�d���l͵&��^[^D����Eﶮ�`(Ll�/@j{9�4~�{\���(]z�,j�7��-:@O1�X���X]�N60��B�r�
�q+�k��FJ<)Ƈ�����'n'����]��>��9-�/�ٽ%=�{Ptl� QSx�I/�z�OX/n+s��W��X6(sO1�Z1.,�J��C
b�IѠ�`E��k�,�8��%�^
8���#`_/̗/���j����F����?li!6�G�ū����~T�@�q��/
+̄
+$0�����c�c�.!���m�xe#��scpf�kq��H�_@�z�!�؆�Y;f�*3<�
��+�2�$��������Z���)7zk�_Y�%4��gʹ<�tZ !_8�0�>�/�� �T�	F���`�]c !���S��ɻ�a�+�\�����E�⥆��e�Y���ֺ�8G���8�q�l~�0��
lܤ���&���c1K�\��{)x�WDH���/��p���qf
+U�x̱H��kY���v�ñ�:BYs���ˮ���<��)r�A^|�%+h��2�r��l������|Ť��B1�#B���`��d�Z��i8���"
+��"F5E�al㫏������
��h��N�D�����E��1������
_t��ō3C��Ը��)���cV�_A�!��ux���I�a�8�y�f�N�i��c^^x/��^t�Ϥ��T
+��rP�����d�5|k�su��"l]�ƾ2�a�@��@T��h/ں1l٘�ø��1Yc�8K��dB_~�����fe��q%?�1
Dp��pEٚ0f�`��J �X!�1$��h(�Nࡲ(a&G\G�:�Y*)�U��}8���@�x�u�:`4��B������lL�3oh5�噂��(<�V�6KLy�v�B��ad�Ht�$`�ڸH�k�#ͣ����8/%���XD��P��
�/��#�
l�@�1
��X
��SB� xD���
���8;.@c~�Pj�x�Q����Y<�.!�c%%q�� �d#đj����W,'O_>7`>	G���LK���
+�D{��`��0���/q`9���Jd��yy�-��c"`a�UV�^��v1�>��X�}
+(�=���4AE��@r�x��q��
�$ `T�?�x`e,��SS��
>[-�m�x!���u��pY8ق'�ub�����
�G��i�3���|
�����nS"c{oq��������0�o�T�e3�|�,D|�
V�S@"æX-C,i���Y��@�z_
+�%��ø
+��J��
+��x�g�ka�D���֊3~1�mX?M)���5F��j�dkj|��X�ϒǬo��w�e�Pn��4 �aSE����g0*�������+����̞ǀ�"�M���YK�F���5���h��I$]K��Tq���K����J���_�~�⏧�Ў�xy3�`<bQ�c�c*��h��аs$<�fG�M��+'�W:��W8E�fn:������G8�͐E4?�d^2��j��<��<Pq�x�%�TSāx�̍�LPА�A��M�%��#^,��RY�R����q���J��\10W!ŜP� cp)3���f7>@lk̄C��#�ld�i��j�`���E<����e`p0�55���iL��I26�"�=������N3@�h��q%�!�4#�yrr���M]��y��eX���.�E��V2�Z
+�R֩�*����S1��f*���W�0Q��M�h]+䢥�������|iWـa�eiC��I15ج�&݀;~5�v[R�?x�4�'���K@R���x�$N��-qM86A?ˊ�}p��(�A)�3�!�L1?)��&���)
+���˜H���1B)T��=��b]���X�^ꘁ��
��p���
HJJ��0��
�"�c�a�CR
F+0�eL�i���)B����
�6�_�)���,q0J<C�����+)q��#�e�ij������d�74�PG���br�	t�8�5���^#���8
+1�����#VB�H�|6AT�ɖO�%W:��bv����ȑ��!��'%#�DU(jp@X�����Gc�	;O"�bT�A��b	x܄&N���wx*�[HE�*�)H��&~C`�_PH��oX*r�Sęb���A\����ox�̵�S�e)�X%�ȧ���"���]8
� 闤J� ��D.�;�\~s�m��t�!	9�d���;n�%,���cr�f]Q�Q�Ʈ'^�Ż�8\�Wk��˨�x�
$A��+��O:B�)'��1�O7E��*ăx���M5B܀L?`Sĝr���L������)2�0���FN+�8�\���	%OS�����ƥw��BM@H���d��#��;�,�m�,�xF�)�Z�ұ�;�
�������Ľ���� ��"ಁ&~�(�[q9E\���)�JW!ޣ�w8�<�ğh�xQ�
�"�Q���T�����CS���A#X2W�\
+Y����q�ò�#�eȐJG���>‘�=���l��ƫ�Y�J㬊�	8gO������'N����  �/�#��tı��8��"�@g��	�F�nt��MW �#ėb�x�5�#��+��Ă(c&&� jrW�:��M2et�	�P�-���)���J,�>�d~y(��(���ME�&kkc���B4L�]d����͊+v%�qp��'�R�$�+�
+@G\k��S��;C�
PW�sģr��
��@|��\yL���>�����Ձ{\�.�0�N.�%��L�h.�)x�K&�H� ��9rt��	��d3\K����F�W@9Ks��0�µÄ[�cb|@B�\EC�Ɉ�RF|6�Ŀ�$�fe��Y�r�*�_0J�~���7��~����	\!ߴ��
+�s����a����rp�qׇ
KB)ĄBF1
|��B2/
p��=dX&���T�i�h��k���`�#�N�A
+\ҋ���8��!ΕT�à�x��;�Ĺ����#nE�ĭ��x�$n`���p��S��k�͖[�)ąC.5�D�\r�����a�
�B��Çf�GM.#�_F4�=�h~w�<���r�&WG6N@�O�F
+WQ�!�n��O=qJF����	�j����o���IW�y���=|���p�����g�ML�؈ͮ�����NA$���%[H�H��~�h1
�"�
B���G+)؇�K����6V\*�Д4M��Z��
+��x��Ա,�
�o!�:D�
+G�?�
�
r���!�`G�_
�".!�OB�x�x�M�ߙ�5��\yb���EA��h���".+[�*����cm
+�a	�ajrjY؃TZ��Aò�ǩ���񆗱�UlLI#^K����=4ŋ=(�<�tc[3:�&p/��gp����p(�5ě�><�� �É`z�R�7���9<��p�eb  X�5^�D�MF�)&Bj�x�в�Ƞe��Aqa�PKo���|v����(����C�P�
��(.m|"�x��6F@��������eH�����G�=�dž�p��g�v������4�y��1�����G��"K:�CXA	}�vz�8��i���1��p�K�'s�?Ę�H�$YDI�g�R�Mt�A�6��i)�|�nb����;\�����q�ǡ��~��-�H�m��.^b\�4�L<%�&��8��Kb��;d����xĔ6L�%��D-
�hb2YԔ4�}Bw�*���4
+�墐��/��1��
^A@�0v��:Z���(LqEIj���s�
���21<���p�+���5<��p�o�
��=W#�����OmK�!�8G��1�������	���#���F1W!3%�|ŊA"-�;r`�����q���fȌL�3.�<h`�u��\��	�I$��
�1��$���C�e���!���\�������5��x��Y�1��>�Bm��Q�
v�`+�\!O,�<d��?hXv��w{��pa�az��CӲ��ea�SL�92/��ij.�����(g�H�l
�X�lc/_
+�&���,f�pp)�!n�q���0��c``v8��B����p�9��9|Hlj��AI�%����*����yU�lBB�.B@o�o�:�ͲP���DE%�G���M�"��3��i>	O�A)8�%a�TK��S�.�����$��5�r���L���yo�K�ĐG�j���!��y�4������YNb;r;�[��+�,��UTaI��:�ҪR����B�J�� �L��,+�*5	UT�δ \���e�iiUE��
�*-BV�YZ+���XTj������Tea9YAhP'
����✪$`e9U=кr�ڡ!--K-�*�
+BU�hZTZVhVTZjXeTXgiUV԰��2�2{e�26:�����8NV@l��͝����X�=�:K��Vff&���*�eVTehfWTWUVU�� L9��YAh���nk�A��)'
+N	Ƭ��M9Mp�B!�v�c��wW��P��q@�㊊;x� ��`�W7,�(�4{h3�����������ڿ���^���j�3tkF��
HFi�M�P%_�F�`�|�T�hb7��L=��F&��M�g'mr�6	�d��I��:`��'Ro�*���$���5�Hu��Z�?�y	F,�R#?��w�)0	ՊhR�#ظ��>�?�|L����c���[`��3X��
+ؤ%�ЬȨ��
+��#ب�[4v�(}�{_g��G1/
˺*�$������&f�*F���1����%mJ�"�"�?OT�ם@���Ee��� �lN.�b޷у�:�9�$
+&���B�}D��>i����Q��F�����JF�_����	��;�t���C����7~r}�{'����L(z�ϰ���2mf4��b�6C�F'm
+�N4e��/�W����QBԸ�y��?�����N���'�w�t�~��_p��K�6�&P�R��/��s�qg��H�Zݨ�Q����/�&�f-�V;0e��� ���ى��'az�g�]
+>�QIg�ؔ�JÞ��M�q�`4�gt��]��!��|�U/�I���؝B���/���H�����n
���;Oӧ&���ڙ�3
+��?�QIK��)?pQY3m��,�tI��6�����
�x�0�Sk!���8�?���@
�B	���~h�_MP6I��Et�R
��F�T0�
+E<g
+I:�����ʾ dg�$�@�yZ8�-&��!�F���I��۰���B�|L��7U
+IϠ�cR� У^7��G�����N���_@�N�w����	�!q
+zD<Ⱦ�3W����C�}=��C;A
+E�j��L$~,����� ��1��!��5zmu�a�O��	J0�1� ��$̮���y�g,�%B�M���Q٫d@�����p���#�u�s�N��I��3si4�$�b��3wg=&�lB�K���'H��s�p��(Q�N���Q��h���@+�5�Ą�eR�kxZ ]�E�>Bq]�H'
�,aG������@�N������0h��5�c{�x�p�S&k��P��.?�����p��"�_}��Y��4z������dX�W84g)UD'O��d)���G��6U�G��cN�����)o`5�#а�
���$L�'���S&{�J�6��TD���na�g��E�׍��̉��NP�_SJM��;�����x�z���kɨ�P�f�$�G����$�� �5�[
+��#(qh;�z�%N�"��8�H����	s�[ݐ�V5;�	��8�6��Q��

+�o���g��h��[�l��,
=�e�/`�X;�����g���<5��/��!��w�w���_
���h4pZ���F���0����k��B	��L��Few�?5�o�Y����cZ�����x��"^
ĸ��H�6�bޗ�#��n�,�ߟ�C�;x���N~�Z���hG�"�^@�, ��砽�ɽ�d@�-'��#��ؑӭ�gt3^��
�Q�Ur��t��`�%ٜ�t`�V?e�*'�9ɉ�!��u�X���]����ЖJ5��J=�Ȟ@�1�	E-�s͚j�dG��8�ge~&��`�FfM�"�?�~���po�$��6������6�j�?4-������۵�xj+�`Hz%�o���8)s��[����je�ƺ$������v��� e�f���0�z�Q�ߝb	��)�����\�����c�g���O��C�}w�a�T�B��Ǥ�R��
��J��C���e��1YC�*��˯70Z��X@�	A0k*Pd޷	L�4|h��W����_���K��|�N�����>�xT	m��5�����B�9ؗ>�>��Ж"q��4o�@��ӕ3����zL��ߴ��b���]��,cw�D�aFD�6
�B�{7Nߛ�sxg�|��H@������mg^��J��'����lz-s�pX<8�����%�ʈ>+)a�9��x�3qj�Q���Ƣ�$��>��=��}��GZ����j�̅$�o�~�)UE�M���o��gG�&~	90�ՌJ;
+��n
+�O����IoE���IK�qY'8���ɽy��H�th�W1,�	E�TE��	�P��vT(##_4O#��$��R��haO`��@$T�AJ��~2���*ڱ�d�UP�E��Gp��
|�s�pu��o
_�j����鋳5��v���kɨ
�	i��e�S�9g(��?��
�ɚ
+E�7��>`=4��T)�VK�����)��4uk5
����D�}�(�C�"z)�C{�
+G?Ub�A�u�o2&�Ռ�.�#S(�f���# q��h�7
ǘ2	�M�ĸ��,������ �r�L���H��a���?�zt&`m@5ܝ>y�tL���Η�����2yc򕭇��e�b�ny�������3o#�V]�`2j/H
ُ(o)UDo	x�ԡ�<�q7��Y
c��u/!G�
+���i�iu��v5�/(	�e'(<)�tՌ�~@T�;y~�_8!I<�H�wIz�T����t&�u
ͮ�9x���2mf�M^���S�"�~��юM�K�ݭ���w�4�*����{��u�3�&����}#���@��mU�_P"�;m~�F��vR�צ:�hG�"n
+��p�6�m���fPm���u��C�ቩ����,֪�����K�+ �]C�(]AHfW����me���½��b���Ԏ��3h�h_�*S�9C�Aك��(����%�2V��BO����d���!��F��P�7��[��O�a1w�M#K@B�1����5zm�L���6caʴY�C<ۊ��o`b{�Ǘ���
+V8�h5�[��2����>o���P ~,=�&�hrОJ]��&횽��l�Z^\��+��J��_
�~�)�e��䫛���S��2�Oc=c�6��j!�?5�f����k�h���?�1ge�M^�M �����1p[9f�L�I����j����#𰜏2�M�[]�זӍ�:=�\��/p�8�gV_پm�c����5O����ٵ�*�[�ý�R�>P��J,�)�Rg��/����򕭖c�������1�f�$�B��B�'��{*5�A
���i�_��/�����@D��)K�hB�YH6�\VJ�(��/!��A��P�������>���ۭ$�jX
����v�����ו:�]�ġOpB�_帤����<�x\�W4.��"�=,	��U$�Wɀ�N��-Q%�w%�-���pv#{��G�E��F0z������3sh5
���{�;�6��>�1B=;�1��S��� F����-#wF�Nka�j�:�k.��o����f�pPvZJ�[��r�ɾ�Ec�2q���S'���� �?�dI�xǬmi��
+��"xY���᜷�1YW퐬�0�^�����F���qM�`��"�LF�l�!��e�L�U
M
q�����9_�>���iA����R(�.�#����1�+ q8�A�筥CԘg��v�����C�D�{c<��3/��wI��G���#����R�f�$��8�6�$�
�xg��u��mM�����<�[�l���z�B��>(2����D���%�^CНo���C�e����<zi�ᆸ~
���.���m�X4��%��V��c��o��h�G�.��g�B*�A�;$1��6�`�T( ���`���$ٵ�.�[��<��v��e������>�{})�k#Urk�����Y��S�5yi�����
\�m��7U�2�r}�������0v�~�
+��^`?�z�B���lV�yC�R��QZ���O�'�w/ev}
+�~O�N&����Y�?�Y��}�<R(��B��%��H��L��l�1���p66<7=���?7�ՍL��oM�D��J��v
�ۗ��!�����JbN2�����k�sL�4��9��9޹I̵!Р�K��ޞE�/5�p�uC�n
+��9඿c(ו6o�ή�$��@�z^hiж�k�8_7�E:[j��ʆ�g�������8�r�+�k��jn����^��%��j�Z/Q���3ql]���������ā�
+Fc��IS�x�G��D�	G6�|NX�6��-D1��'-<��S�q�@u�K�Q�Tm$����p��s87&�gE��C�|W7.�0����˸��=�xH��@�vw��͖���2qe�L�Y�1�c�����g�� �L��)��}'�
U��0�����=22qv	>@�"ZO�����#����}<4����i�����Uͦc��h�62�jbk2zg�JQ����V&/
[��W_帤�p�ԛ�N�5ԉ�'k�&�vG���Vw�+�I�rd�
�'��U�� e���R깒|~+�}�G�]�JU�T0a��������Q��v)��Ò�ۀ���	L�7ܵ����B	(�=�y$1�>pZ�u����k�q5�Pm��
+�98�g���!ʽ�D�e���8}s~���� ��B9���mc2��
���h�I3����p������ӱ0(#���ҾA�(����Ұ��ٵ�2y���92--�E�!�l-���)��ԩ�M�B�}7W�l�Qo�|MnHZ�`��P�sf���>�{ݧ�Q
+z(�D��-W�i��~��o�����o�6�kg�Ҵ2zgY0��PmW�z���c��~ID�*��g����x�왻�~ؖDI��:��Ocݜ�CHG��x�~q\x E>�A�h-
���9�s�rtO������P(z�Mo����ؐ�7|)�e[�q�ٰq��:����TN�b��R�X3��HK�0��~L��x�Q'
+}ҧ���9RYC�КK	iݕ��	���q�Ƴg���k���,&�jVgw�u��E�J�X�%���)�
T�e��d H<�b��b
ٍ&g��h��Y&�kw�<��6(�[.%�6�����i�r=�C�VUr���P��?	���8|"��O#�N8��̑ig�β:�q�ԊD�B�YB��j4|���3th��(��/��q3�y�w6���S�p�!�XCeWP)�E,1�bFN���s�/޵bNȍmۑ?�ɉ�@5��n�⼐#ޘT������d	��1��J�\;ê��J�9�aI��������p�w�G1�M��K��ۤ���h��f���0�|�f��	�����V�Ξk��%�/Zv�t�r���u��̛YQ$�m�c���$�ưij>��>�t��1�K�n�h��2o�?����Vcy�j��J�}�8����0l��Z��83��ܬ�H'�H��F��t���v�[0)#�)��
��i�ۣR�SDe�J�*���
+�O���a��%½
�N�b�_
����l�\H>?�u,,	��uD��ri������<sw֋���t�
��5�*�4'���VO���ڧ1���zY[`B��P�V��~A��&��#U��p�ZEk
SD�L<o-#��jaݳhG�p���<�*b=
	�vCҤO@?T�םR�]k�e��Etn@���(��W�K�E���F��*�5�>���J�]��G�i��s�s5��	��<`���p��
��^@�aLJtMH�	?4�.$��&�J�a��5��1o�Z(rχ-A�e()�U�l����Pž�IX��F�Н�M�޻��NA�RE�;�?S�6�p�j�������T�@�y��k��^0csv�lJ��K�ݭ�gw�d986#�֯l>{�u�}�:���"k��<��^�>X�V(�ހ	켥
�%S'����}o^_�w&���7�n��%���C!�/
���f�Ƽ����g؞�K�y�
�I�3<�3@
��L	=N���Y��88
+8[0e5����H'Q��9�rZ�\�B�N9�b���5��;�w�&�����E�{uA�-<���&�<��\����!�zاN0����UO�AHh
���G���L����
+�O�g핤�c����)����zU>=��Z��žD꥟R�]LZÒ���Feow!Ǿ�
+����!���!XCoSB}�(��A
�I���S�V��W>.iUNk
Q@k��5M��|���B�{=ku�Wx�9S�p�Cb�>����
\�q�o5�a[
E°kٜ�XI����][Pk
+L>�T!��N�;h�����iy�hWPg��T[����`��g���V0��?����I�̀d�0$t��#��q�/X��1����`�F�����ӕ�bDz
9<�
+=8;��������7|t]'p��c�2rg���g�-�Űm�k�V+3W���B�{=�u��}���<�p�
pTj7D!��4���b"x���Jwgy�h#��>a
+���A�m�Q�'-��"�ZA�/&��$����>U��Ur��g��BM��#�����C�񼑤�
����i_�mlصm��qԣ�L$�@�{s\Y�������XTZ�J*�o���;��=4m�!�Lӧ&_�؍�M�)|�y��;p��	�I�\���8k�~fA|I�; �*k=��*`�؅(�>Ҧ`�eT������������vd�V=�*�5HO��C�!�;(
�aKN�GF�����(x�ġ����B�|>����I��}�:M[�q�60j��4���Έr�+i�;��P%��B�v��O��cHG���1tdX�;�)4L��&Ø�09�,b]}�)�(����<����1���(��B;:&nL����;�r�i��%ٜ�&(�[���$ŷ���N����8�S��Ġ�7 �'�D?Q���hg�p��ܿ������Y7��?�\[m��6U��T(m.�N���Й�@�x����R
����̈��6��Ѯ�	�y���y3��ς]�ƴA�|9]�.�6��y��<$X'iz�Nخ���0��p
K��S搅t�Qī96,��l�	XmF�@�;�S��ИǤ��^VH�M�aۧ0�3`���V�gb�b9+qv��	Ǝ�#-���g����ڜ��;���l'N�m��#��aʴam_�oźx؇
�Cwgg�а\..
�Q!̙6���M&��y��G;Z	�[Q��1ncژ22Z�ѯ3(���[f�sQ�x��<���M���G�QI{`=��GL��հ����3�v���A�N��
+e�`$������b�VEg(S�^D9�u�s]f�L{}���5��1��
D� �`�7V��6���W����m�9^:�h��"=b]=Sg6s��k^5�j�(�ՍL���C�ƍ��(��G����e`��S�a�h앭��}0!̽Z‘N�Si����y829��L�󵛣��`ZN�pT�;�t}���K�I_p2�-
I9����F���
ӭ%���A	E?W� ���F����{�z�$�W��N�h�ZA:�
[Ne-&��T�D�4�w-׊1���5���J��hq����9�s�
W.��'����;Y��L+#g�����N�P��0�o�p2L�-$�W?�AIO�h��L����BzB�a�V�X/*�94�����{�Ș�oCZ�m����<�t���,$�W7�~}ѥ����9�7;6Ǻth�9}~������}�30/<����
��
���B�Xs2,.aA�����
���F�-�٬!�ڪbm�b-�M-�/#���VN��	�[rǔ2D"Sn:'=l��E�Z�Ȁ� ����!+��l�Pk���LfR��`��ꆥ� ���>�T�K�">���^<�J��/cW6���P,�K��������=���!]��F_�ll�W�f��z0$k�N���;���=\��ga_V �WN�L#��
�MK�禍�#�^�:��د�A9�	�n�UTk�T����Y~gC\�l1�n�|�Da�!��L�ɧ��I�u�v��{��鷦E4�����3�Y����z9�s��	���*�84��J$�QJ�,�v�¶���!����h�=a��F���c�c�ʰW�1�d��
+�9;���J�Ȑ�3L!�����`<�B�}�U��¤y1�vÅ�w
+�fB9�#�GE��?�z3R�W&��� �:�8�����8i&TB:	�K���7�p4%`�:��!蠤��d�ZK6�-��..$f�UN�ǐ�Ǭ��G��?��_�b��5�z��[-��ϧ����I��x�<��8��0ha!�0��P.�H�^�
+��
+j��J(�����.��ב�`֫&�;��bK	�jH���r�>��X�'/zߍer�u��-��([@%I����
+����T�I)��i�2Q����z
+����u��KzPm(��=6�\<J�0�M�^�����ġ
��dW����\4�	F:�	G8�I�:F�+�7����
+I��B�|���n"w���7@�����cdIX
+��ee8��H�
c�@(#��Df[�
���B��� ����Z��<
Ίw�4i� �M�4��qMg3���pj k*L��T��p���n������t��	x? �v��Q�M�5�����t�����<��t���������;8}4A�]8L�(�K�tQN�G+��ަrZ��S��%��?c)g��it<L]���'�-���-�B:�#M�&�=���.�����tYr�ɓ�#r��"�$1�����)�O@~�!�_A�3��,;�7��K/�.S�����6��Uj}���Z�|M��vź 8�(�UJ�wD�KJ�QAz)"g:C?�@�9*��G>O����ٔ^vr����-����9��m�
�JX�D��k�[)s���������H��߷u���a<i�Q�t�����i���}:|��g�:�,�װ�a�^�'��ky��W���[����;�Cs�s�1�|�=�v{��E���f)��������(��&��<�{��0ϒ�o���pQGno����YG����v[�g���L�k5�f�\�c������a.����6j�[-�Ł9�f������L�7�x*�c�m0� x��\e��=��?�4qg�,��h���=<)\R��*FՕ�
+��k�	?y��h>�'�w��8����}b�c���q��4&��g��c�aԛ�����w��̂�d7'�t\g��?�
������@Ժ�Y�Bj_rs�~��t����ɏ��Ϫ��:���?+�i���(\�?wj�Y�`��uX��y����|}������
~{x������v��
Pt?k#OF����X~��zw��Gu�?0�?k֜mGo1�bͪ8�
�b���ﴔcaC�(�w��Ug)+�R킫`���Y��Q/ص�Mk�Dì2p�[b_�_�+G^�v`�?k��?7���g����-��C@;r�@{^s!�g��p��?��\��ް�Dɿ����N�Gb5��^����/W�W֓vB�g=��0����B��K2�������7�*N���y�UK��\6�/��@����q��¾}x�p7��g���9�?+:�]���6��fKR�3�p����*QZ�	8��I�-������L=�u|���Y�/��-��?_����h�۔������{�	U���aV���9S����Q�64]���.�,݋un�7ʞ�,�>n��%����Oӷ��|E�/E��A?v�p����y>�R�{����?;���
3/<�����K��'I]�� �Z�V>~�o�޻Z��8��-H�_^�������=�\�<���wY�O�N���~!��z��v��劋��0��=��<7�)g��ͬ$ck<];�r�L�?��I*YdkS^�eǨm���~�޶T�x�{_��'C>�H�3�w����~KCP�g3U�dIk�t��d��7��j�zВ�t�:���]� K��b!�D���/�D�5�k<��8��y�
bש�h�x5�z��c��9�>����'��|��qX���>����Q��ӽ�%��"�Y�8Wu�
��"ʸ0�HV��W���^��1������ݿY��6,�O	�B�E׮'�4�y�$�?�f���EL��ҷ�_�Q���~m�f�֟�Z�@La;O���v����\#��:�Z���}"O�Uz��\UZ&sR1��'m�x苢��l��"8�<y�k�f��{���Ï;��9�w��w��gb�7Gb>��sPL�O������]�>����}?J�4�@��$d��*5'����]Y�l}{p�,ia����g��X����S�H}�Mz�0��K�"�pc]�˦���L~y��gS��Jo����On�����aǥd���S�X����ŔO~��樃�Ϸ�f���^�WN����@~}��	>�{�ye�1�~�/�~�8�#������Eζ\�GH�UZ�B|pg����g�8"��gXٵ�����l(�=���p���v��K�k�}�-���_�ŧ�n_(���������[j�oc�I<����G>�J�0|v�n���
B(�����:�����F��W�s��S\-�l1~:~�|Ӥ;�#����}�.�����[���ހ�ռ�NJ���NE6�P���8X�����[�E��t`l?/7f/���aM@�����5���3��$F�(l:�J��@���)��1�E�y�k���6�I蟘3wn����օ�s�yud]S�ɫ�?H}N�A�7�G��<��u�!P������"��B}��Q�)�a��f�wNI�59���:���f����٘��_����v�7|pJ�a��<���خ�8{Iނ�V�q�th������͆��s`��ط�*�S��:w�ג��J#k~Sí-���όţ\�?�mWU��%׏v�^�٣t#�q���g��%�Z���%���'���l�%y��Hn4�C��%���S��W���+����3>�En�;��E��N�6��b���g��%ϟOI���!G_�KE�^�q�����d����㻳�w�/��\z�Ce�Q7@��EY�����_�&�i��-K��S���#!!� ������^�Q��7@���
���Q����ͦ��ɴED�"�f@;�5��7�P
=���`@
X�u��誄���Ȍ���!@@����_ZX~��A�Ĩ��"(��dD(���k׊�+��Ӏ�Y
�LHeebn���>_J���|�V���v�F+r��T�τ�͆κOx;uFFoퟓܩ�eޣ�(��-FpW�(�������p]Q���[�
�x� ����zu�D����n��YQ�s$��.6Kzf�P�8JF�5����7�O�@H���㛔*A�	x�!��3�$�)Pzpő���U���G�o��ج�/v�	�)Q5sd1g�U�Iu�N	A0���hϕЅES�˗c6��|�8�6>`�z\k1��K߿���/ʹ��pc�Y:ê3v'�1W�k^"M�m��U��[V)e�I�"�%��=ʍ�)�E�c������ꨃ�����:I�TgUi6��X1�8Ýt����ͮ+�҈��I[�"���q��������|�[�au�h-�#R+�]�� a�]�&^��7���₊"��,�L��z/oEY�>�u£�37���Ʊ6�	ɥG��w�uX��AzJ�!5�
�qe~	�hxV���#��b2�\$N@��tH�(����~�И�X���G;�09�sn�#O�a�A5�>�%���[��gQ�{-Wv��L�E�eE	Zބw�8`���x�(wt
+�	976416f62-1aef-47d1-a288-c7f430b64-6700-4412-8486-7f9327eff5b580 688.25238b9870c91-374b-4d2f-9bc0-9dce5bcc061205cf2a05-4c5b-459a-af75-c8cf6b25.46612553.37133 �K)"<�
���&� ���\���y��#��N�,��T�og��l���\�
c�+{jJ+j4k7#���s�o'_PY#
+�~�L���I *��o��0�
��:6�܆�5*���^���o*e��
⁅���
�Ĉ�t�p'�	/�E����d��D�Cޭ+��~x4�710�0��%K��o[�m+�w��׈�hh[u#�W�())Izw&v�$�Q#�
h
E
թN}�9Ѩx�0�|���t:��epO�7��xL�6�)���BE�:wB݇��N�����*��{@�Q�LD�v&����������\IE
���乍	
��I�Q&@׹T9N%�Hx	N)G�؛�B�		뀦C�Uq���A���RT�&�8�a<�N&������Ό� �T�
�u�1�����b�=Be��>�NH&�P)D���n4�*���\I�6*DŌ(�偸Ϥ:v��l4��
+�T
+�
+5��|DeR!^Ԉ�P͏�
+5����J��PeA�LZ �DNq&Ed>�����}�HD!������
�HP�����݉,�^�5�|��r֔��WU�F�ϱǣ��(Uǎ�UHSNN���G��t��ջ�%���r��V+�L�՜�vn�R$����ݟ/&;�(!l�Z���R#]���M������T�XX���2!��^Ω�
+��B"���}(
��1#�P �gB��>��8I�6��ʄڱƄ@%�tJ./��<�{ȽN�m���J�u��^��9��5�v�n�M�oEuj�D��i�	�ES�ET�k)W�6�]T��X<�B��qj��	��~�_8nW�N�V���}�����_8����[G2Q���
+=R��*0D�J*�
+ T`^s�Pe�a`8�6�+J)�N)��:�4��ܬ�u�3i�Bj� �c!�}(
+�s��Q��	�hR��B�m�y���g��-b�h>THe����$��%T).��(�09H<�:�Yҷ_.��t%�e�c��R��O
��,��2�our8�ܓC��"�d|��gl�����t0����{��}���,��,��,��,��,��,��,��,��,��,��,̒"��,/5�܉A��[��r�[�Y�թ���\s�?٫�{�\���h����L%Gj<SΔ{�Z��
+��rA�M��+�؂�:_��=֖'�L-�����سf����S�$d�\M�fK~r�{�al�G�Q*~��՞c�9R�s�=�/.����j���ռ���.9����]EW,]�ܿZR��D]S�^9g�.���+n/�b�u�1�J��r��=?� C�����8*n�9S�Tr�+n��c�5�"�-�n5�0�sŮ�=��?�إn�A�*E��09�)~O���1������`�׍�?���:�~�?w�5N�
5�?oGj�S�)�Tr8?��s�����^j�??~&c�U���7�lpd�
+5G�~���k�+v��)�ܮT�/9R����rq5KO$�;A>e0t�^�G"����ž:I0�����`$���V�]���bg�|����K�C��lo��Y�0dg����6�??c��,�W3Gj�;ǎ�K�3�2�+��S��U����J�S���P8 &�ds��������Y0cP @ 
0A��Ga�,��}p�=e��2m��߈�LJ�S��b���|W3;�H5�m��0D86XƁ��`z��:U��e8�D���>�X
�͎T�3	�5b��A�}P~��e�i�j/Z
��]�ч�[^>���c�Ӭ@���pO��&n�gІ�&R�@9�D�b�%�J�C(�H�sw�ق�Ʀ7���OV��R�͋=)�Q�|0�ݕ���,�\g�����j;�3;����!��b#�3�zJ� �oO�-�2�)+�bd�97�k)A{������9���2)O@)��}w|��Z��[3'��;��I
d��p	a�v�ؾ}����PH����MZ��`?�� �Aixm+��)��R���Or(���5>�N5ս�Y|���Q/QAh\������=T��H�d�!���3��n��e�:�
��Uڤ
���$SCᇟ�����6ᕧ�EL�+�=��O�
m*��k���J�r(�7x�����
+��ˈe�<���(�-/˧�E��XW8<Iwq���k�p�� 63:����b6���j�Y�
�穸���o�_J�<jvs��G��8i6����?���,�}�
|�^�	)iӯ����
'���j�
	|���X@�/��鉝�FP�ʴ�Ncȩ�~r�swV��y�O�x�݌b�ˠ�A�ӣ���oFF
+���p��M�3"l.��lF|{�%z�5��缰~'����P�<� �{nA�ߵG_�:��{�Bg��ϖ'�9҈��Y�"�œ>Sf�w�H��ӿ��U��vzQ>j�9f�^�-+%���_Ʀ�)�Wl�IĤ�&�	NA�}-��22�
1V	Vf��viQ��$ZE�����_�T"eE�6M�Zs��˂h'���;�;��M��S�Ȝ�
+9#���
Ώ��{���֕6�c��YY#��XQ��\��̥��cF��2�T��7#%Z�B+�Ҁ�8���dyGu)�,.�S���NA�����P3���7�� ��|�������+����g�W>ٶ"�������^�6Š&?��.��R�9��l�(&шd}rcN+���>puK��B����}m`�B�q�vS٘����Xz��
�[�G,�Cl߮Q0d�"�4��vMR���^>al	���vN,EPk7�q�۔�KN3C�)ֈ)��Y�W�"‘ׇ��^V��#�?���1?Bsѓ��m�++��J#S��%
R�f�6�`��b�:;$�����(���,q�Ƒ
+l[���Cg��&�8r���U{$�I�P)@id��،GQ_فP��e��KU���Y��$�u�N���������D��������v�˸
م����I���H�ٳI}�q3F[h�hVZ��!�yc���n�恜 ��D).4�*ڙ�[�&)K��8�e@��ne�
����u<�1T7!3�̈́!f�68#CSj��5u�iX����9�6X{�����Uk��>��$k:�#�
+��r���x��(Ye��82�&D(ږ�r����}�1!����I���ZiO�-�������_"���|x0� �1�^��� ��89U��l�}pt�30�y���M��@�^�T	0����&�+�
��q9�d�\��0FD\��{Y�㆙2���d4�x�Ƀ�l�c������s�c�9�Px�ħ&����I��c��c�����9�#�Yl�7�(���B2�@�5|N6�Q2ʪod��
+_%�"n]�R ���ÈJDdo�p����I�T�p�{l�5����2=兯�X������p4��P?�m��\W7w�[ERCt'C�|���F?���BS���飴��p�rƴ���_ĎQЮV��
eeL!%�@��K���Hyْ�*�]�"]�x�T3�Tr�B�-2�sZ��
�	w���EsҠ39L_,��g1�V�/��XZU}3�ڽ�����5�	����O���6��.I�
+ �ϲ�K����kF���%�7�г Շ��(��D���9pM�EWVv~XXE+7�p"-G�"\�I�̭��G��y'`��..�r��"kn��â�K�����B`�H���ů�S�Xi7#D��,}З��Π�i���O�O
�����������hB����H<�1�!	��1f�(��^}pG�6�MJ �Ǧi�k`�׮Y���v5�XZ]<F�ۮ���ġ�c��R��(���h`q*!R_�@����%˨`�D@�3�]���A��� ��L+�a0���X+'��]b�}�*ڬ�8$K��I�r���*�J�\���^C	�W�%�r��Ű,�D��"I�I�(�f�8b�UeJv�a�m�Z���%
���q6(�����辰�E����YS�]I�x�r�
+9L�V̄�]J��Ū�P+3/��F�i�,\�\��x��H��vf?WCc-�>b��"*�`@��zJ�)�;MZ�.��I�{
��N*��҉H��=@��)s�H�nA��Ej����E�Q�}�)�B^Om\ͧL�5{J�
Zlc�%�S+�ǐ� +@5����F]��n���1��-�Xlc%B
+/��څ;�x)Z����K��e�
+��`�6m�����P/�x�W�q��f\��$C�� w�5>Z���;0Q�(&(�L�)Bzk�"Zl��n.�M/]v�F$���q4bjݿ�U�9it�k���]ifm��
+E��9`��qA�DX_²ԙ,Z�Q�ߢ<�9~�ü�
+��6���U�����e�F����`�Cd~�Dm�)d�M��Г�%C^�*XzR���b�P���z��8:�,W�Z�rh���sP��H�*\�_�8���5->j�S��O���^(������ң�Y����
R
+�Ǐ�K'�ayƆ3E�݇(�4簷N3rE�j
��8dW�C�@��R
+L �.���3�:'�H靗�8��emi���̡�@ǵ딚m�q��h,ܔD��t���/�zT<!�"+бv$]���?{��c�����/[,�-*|ʥJ�Mp �/��\�/�`�T�;���c�<"w>
�i''#ql�`�|�?39���y���wX�J!:�@'l�-X\� ���}s]�2ɋ*Bq�5 �����Z���ќƎ��3����c"��x���o�*��
�2�����T�Q�6�Swl��iJ<�)���3H��1)����l4b���xM8��^��h��K7%MG^�[ֿ�2�� �E5�"��r�:�������&�x�{x�j������-YI�k[U��^d]nFl����h�*:���rͰ�|:7�!��=��2�ї�# ��	�.���fJ5%_J�Pק�˕���HĬX
@K^U���!aɦ�-Ǻ<A
Y���= ?0��,�t�h���^pi�q8�x|R��pV��z(�N���\��){B�aUw^K���(/�`/k��8^{6P��Ƶ1H/��\�WM�6+;�������IS�Z�P���f	�ў�[XŠ���.�	� ����>E���p}�đ0-P�o�ŒLu��*�\����S{ƫ���2�)B��`l#�(�Q�CT���\���~l����mD���2e�r���%2�,n9D	�3�iX�H2�q�D�|UT�֗Փ��ߣ�8ߑ�̶H��L�/|E��@�Xq���
+��}�AXg~��K��,̀y��	�Y��~
+βخq5�&+:0@����
l�Vx�����pӤ�a� ���,�?I�2�:
�!���]���7Z5�4�4i4R����f���Ð/��?�Ŋ�@�R6DlEɳL��#��~��Tzg ާQ)���<Rvr�A)�tYqD�sz��T�2�e9V�n(WΪ��S�+����W�69ik�N�pM���|AB�"��?C-�Pl�dn<�Y^�H��-Շ�ã���VO�q�S����d	)�A޹{$�%�ޅ0|�a�{���
+_����j9��3���K%,��	�B����3�*0h�8��O�ȬX�>�gl��t�`Ա�bM먪�T�2�&.ӹ.�b�򐫆^S[ ʐѣ⬛�L�����GΩd��]+�����9�����` �
+�n���7��7�i����0D��71c�c�`H���X�I�;�+I}��،ϲ2�!�V��*�:�
+��e-��Q�)TE�h�X�y���
+
������t�Z�f
��hj�����L�-���o<7���f������w�ݙ�,Z����z0L�[��TM�El���Q?��.���no�%&�6
BG���Z`��ACHc���;%���s	G_'���r�^rr�f,^Tœ
z)r�E�~q��f+O�g5�6EL��6���ְR𑈴h-#�c@��X�Y��2]@�W6�� ��G"�0*/�E�Er��C�2N����A�"�Ǝ_'q(���t"u5
+� S'�5��]:%7�:t�!
,
��H=fe+ѹ��ؘ��L���f0��*��X���ՠ<�F�N���۾)�j��j�}<Wv�#��}�sC��kd�L�\�0�x,T0q,1��3.d1��d�V�5����˦+IEw����Y�@0G�//�9p��܋cB���t,>*�k8N$n(Sy��m�!q |a����`pa�,���֓�vA�̊1�j���YQ7tc0��C���-�ݲ�!x����Wpea�'��n"��&V"�󌰍�p�Lÿ������7�i�d:�K�_��gŸF#�=ʆ�x��#��
8�e����נ�F�נg���A.Vݨ�q�p�}H4�seZ2§6�O�M�+Z>6erPP��&�K������o`C�K��n�H������:c+z��8D��z�s����#�*�ΒE�f�y��P���끼����d��w��z�[��h���@0
�G�Uz�^�W�UzP-�ww�.�������1=|3��v19������!hş���	+
+
;W�i��b�Q�ίD}�[W�-��v����ۮ�������:���`�;[�Јi���C)���A�K�I&K�`]2��B[��BEU�5�\a����|ql��޾���j�s��^�/��k͹��fn����l��<��w�6��_�m��⾹�}sϳ��f�m�w�����o�s��f�s�<ߟ�׼k����v�7�]_�����w�k~���ڿw���|u��s~���f��ߍ/������x㎫�����vW����Ы��������v����端f(87W$c��2^��
�!*s����;�z���#�v�(2���9C�
+��+���Pp@�Q
+�O�FH��F�l��
+$�h�K���b�d�h.h!i��wwT{�y���ZJ��S��s�3�l��W�Pm�B�F-��$b6��i�����
+�U���BY�Y�+ME�P0�!Th�JY�L�QvP��o3�|SЃh�K-��R���J��!Z�ER�'~R��}�(?U��i��&%��Lw�4�ji�TS�"-��}���O����mi��^z!Z�U��>�DK�u~��\�Q����3g�%�+X��qU~/��|�f����ZO�n{i�u4Ra�f��֓��Vh�Y%����}#�2g�j$Y蚉%�����:���	@5�՚^�mMw���|��V��/��c���ww���7ۻq��Z�d�Vc+����$�˻��z�q�V�lu�Y�lu����[�뾽�����޸�Uk^��]9�8�f\��;��ۨ>lw�{���cm�۽j��ގ��ҽ����������ƪ��G5�W��;��W��bܫ��b�j�w��*s�y������{���Ϲ���s�s�y]��_����v�8׎)����w���l���V����[��~�K5���[~:��ƹ��]ӭ?�D�\�-�p��V�q���j̻�ћ5��������~��1�4g�sշjL/��v����׶��iι���w\��ƹ|c�]lq��T��u���N��YW�9��[7��򟫽��/���\��zo�5��_�Ϳvl��\���oݽ/�<�;�cz{�w�ק81ť81[\�՜�����k"������2��Ӟ;ڵͽ�X�[sw������S�;����i���j�����z���vZ��K���V�����׫i��f��m��~�;z5�׿;�wּ�W��j;�ŕk^��ׯ�4O�������;�m�]��rMy��Ҭ;mu����u��v[\;����\m��S���5�(��p����uk���WW������S���U�N��ݚH��x�K{�����N�:o��9�׋�]��/�}{{�f��֡v����a���U�i���_o�4�z߾g���U��qܯ�9FyG��_�y�-�E���y�/���v�q���bk����}G1��S{�[�����ϝ梶��v���8��۫ϚG��+׽��u8c͋m������X�zW}s�]L����G�ռ�}G=�W�+Ν{ۿ��X�<�;���w~o���ޟ9��绎rʩ���N��:�r4O�PN?��r�C?���������u�k1�;�9	4G��A�W�u�y����e�a�uO�ql���<��Q�5ƶގf���_�s�[_/��ӷ�9�[1�bT�s��6�Ɛ�<'�q<���R���</ť8��R\�Kq��Mq���$~eu��Zu����+�;����[g��Y�AK��t�oWu��u�R}U�Zu�[���=�6ӏi���8���8��x��i|��|��_����W{5��{��_�4��|��sǶv��z�5O�\�5���5�V�q��?���k]m��Z������4�_����^��z]�������8]o˫�[�\u�����;��������oiG��Ku��[q��v�Ζ�}��Z���������kl���f[��<H��
%h�H!ϙ��4���|R\�Kq).�i��4�&ť8i��>Lz�,�
2U�vH29vҐ⸷,�����V�}���Aݱ<��V���-�^m{��wǝ󬯻�޿[���jg��Ft�f�S\�!ť8
 lo�[j3řF�~?�R�_	Jq).��٥!�i
+3�Q�����9���
��n�)�c����������{|/���m���N;��b����;�-�g�o��������ީ�]�{q�]�-�8�}3������6�ܻ�k������}��s���~coռw�y�X댹�����������y\�o�E�$&��ꉙZ��Z�ꍿ�ww�w��Z���~��9�sϽ��~�q����1�����^����_�����<&��զg����k�����k�����y������mo����
Śj���6����Ԥ�H�Hq%V�-��c��,�U�+�t�ʯ�Ѽ�i�};ͳ�w����וw^lWNﾤ�ڙ#��N��󍶽�ܹ��v4ߎ޻{�ڈڛ$�ޫM
�j_��no��z[���{k���Ѽ���[������{���=ۜ���Zm����lm����̭�f�)hΨ��:25?�Z�L�
+E���9�D����'e�����
ʑRB*?�K�!����>���q�4h�tJ���ŰEeu��
�Ie�Kj�d�y�&���`�Q�_
+�	C�/��u~�_�
E2<���,s�f�%�#1|1���ĭ�
+'�5Q�H�"g���J���+�hhx�4�T�P~�,�t��?�d"�h�}��a�(~�8��j�A��eU�U5R���j�)�j�Aq�;�9�\���e%	��j��W)�*I,A��2m5��['hV�<e㪚��������Α,E�j���BdU�H
��+��I� k��H�$I�4As\�d������U�@Q�)Ɩ,])[���*WeY�*I@��꼵$�e���,P��d@%?�U��Pl�,\��T�gk�5���UX�E�7W�$P��OYXc�Z��媙YOY����;�����n@&"�Wu�ce�+2[�U�j)�f,r�$
r4+I`�ɾ
b�[�@QW���QeY!��h	V�4!�[����/֒$�7�Y���}�$0�*I`l��Ȫ����%I�V�+V��TN��n��Ё'�H�$~�Q�#9��g2O��9AS5;]�MS���r�����x"G����ww⧢����,)
P$c㊒��j�^~�,�HA�ٻd��e���}��(�	�}bɒc���o�}�9#��~��fz� 9;�S'"6Y��
B_&8�_�)Gq�#y�-������E�s��<���#�����B6+�,Q_(~4<e?�"����������'e�x�FZ�-j�H�b#�\�PT}
+`�C���Q	�2�j�_HO:�U1O���_�=���M�@���a9�0Y�H��&X���D�iH�8�(���,�V��,��HW�G�8�r���=:���,��d�<�O��/Ҹ�9a�QW�s$�����#y.oޛ�&-A�#�E�O͐Z����EX���#M�W��4*��G���3C�w�,=	�
+,K�^�(�,@�<[��sT �����
X�ٸY���e��(^�,d�Bx*�
��4g+<`�߀�)s@XL�#�_��gZ��k��	U_X~�����AR�Oq)�ŀ���/WhB����9�����šw���O�����]��k�����w��_���-��Z���v�m
���9o�=�m7�d}���������V^����޲������Mq4ōJP��rƬ�Ug��<�t����-��ca�;�{V���e�X��dcx��X2�
+"h���4�,5�Xr,���>��@���M	��o��om�~߫3׸�[��Wo�;�4_6��k������߮{�~g����m��׬���^�3�*�
B�Ɨ
�Z�	�/jm��W����n�9��g{����;�_{�
Qm���_��v_m���������{��w޷��_�ݟۼ��x����_�u�X{�� ۫���ڞ�����f߻�����߽_6�����}���3�_�w��Z�;��o�/z���l(�x�}�k����b����r|�P�*�K#$��ԮJZ,6;A(�^�����Z칷��������9�6w}
Q�q޾�m����nm���x����xol�������xg{3����1��~�=��g_=���l3ϻ_�1����r~5�{{���[�s��[�m��~�o�|�߷��������{��g�{��Z�7ǘ_6���f����5�zc���\������w���ny��
����fo����������]-�]�{/��h��m=�~띱�voܵ��{���������c�5�?W������y�Xc�1�8�/��g���<ﾽ��|���r���������_6�^@��7��꛻��z����^�/�Z�{����o�7_���������|���c�/��{ϻ�9o����
�����j���cls�������u��^6��o��_{k��z�����͵��(��V���:߯;��^������?����^64_��eCo���{���yƜ뎭���η�_����~˳��ޫ��{α�_��qƼ�}�Pm��VWK;��r�;�\c�w����y[�m�g�?כ�}���b�����~����D�θ㚽�������ߟ9ם�{
Q�/��Z�w�����řo�/����w�vk�o�[o7��������[s��_��Us����|�ߗ
��noq�4�j鯸��9�|o���[�m�eC����_�����1���j��wki�狭����^���w�����~ο����-���j)ϗ
���=����~�9��n�}�����WKo��W��Ɩl��l����^Lm=�wn��_���xw�{������|޹��W˯Ɨ���L�ܬy����y��w�������>۾��8�ﭿ[�%���s�7ֻk����Vh��	[}��}
�[�4�@���'(~%�̓�"
q���vN�n*�(�h	�3RƝo~�ǻk�7��ks�����������Wk[���Z�u��Zp@h`� ����7�%�H�o����ˏ�Y2Q�x�h�V��*P�/�R�+��c��o6��j)��c��՜fk�8��ZP�5o��1Tl̄��4�m2��S�d�,&	0��ȐC�Y;e���Jq��C2����N1L�a��A�	�#)LX�tP0������ER�&'
+Ѫ�)8��!���BB8��aY��*V)�d	���&̕r�H.Q�ٕZ�֬���ZU�r�4����K	��@��T�U�U��E�Ot0��yZq�D�+�JR�J(JU*�T	%��;�
+|����5��� 1
�2��L�#�W�*�/D��,,�Ԃ��-
I��?-�E�1�;%,D�,��[�TA@9Ķ�D 0*	փ�+<H��}�"����BQ��^
���x��Z��8����a5�� RED�7x0��a�y
-�����ia��8Z��5B݋�F�ʅ�������f��ZIT�ӥ@�XJ
+�0�Xl
+d�$qR�*�ӂ��b�LţL�"gL�T��"|�J�4�I	���f��-�8S�DFTb|/\z�<$�l�@�V�C��*�AC@`l�� �\}��
l(F8\Pq6!f��ndD�zy���q��.�C�!�6^�M(	
��9����A�K�d0a�<���O!�D��F�9P��\�$�x^
!XY�8߆�Ȥ4Zq N� DD 	�m�%b�@�IR}` ��*����q�IB�f�X�D$~�	1���4� ;�CD�V�A�D �k���@���<O��5�,A�N��Jr�m$6�%6�Y��P�����д\�ˣ	���EHlcl�T��]SP
�*�#�L���2%�$e"JL�麌�I����F$9@�D�:Ly�`�6 /
T�z}�K��p2�eB@�� �?��U")8�
��;�
/��0`>:����F�1�i��Bh!_���YX���bIp%
+�'D��/O�'Q��/����S�a#��
�����g �:�Q��.KV�a�7H�:�}X�߹��t�ï�"DT��ɤ�O�͇�&�癍D»�R���[����9����S�l��Mm6@}6$
z1q0ЎNp��YќfI�]E.h��l�饼0�9y"�y��:��`x��@UIv��`�3b��q�XVpU
+��ȹ����pG��W�t��½��AD܅u#��9Ae:.�e�N��v���h ��(UT��ѪH,���B�H�f��f�|Ee2u�l���2���� �P�
�:����WAU^G�I�\��e��n�1�e���Ɩx�1T h:Mg���uLA��`�œ'V�\�p�0��~L�a�(��l)�ӺiqN�QL8s�Mʆ�D�P&-;љ���Ij�x�D&��<D�0	�'�$�� �FG�l��CIE'�K�*�Tt8��bE��2
+�0r���AC����٩E�)��`<�GJN%�7���`sB�݈�4`AV�q�)@0���0��@NOq�X�理ߪ��y@8-S;)�{Lx�1z�$$$dxd0��D=�x�y@$<jJ?*`��Lǃ!����#s<l��С�*P�Dž�Pp�`
#�
���ф��[�8];Ș�:X��C��[�H�4���xH��*`��p.���O\�r0�^	/wj�
�q p��9هp9��l�y
��.������l��	X�u0j5��QBU  Keh\L���&�F�ɡ��v8��<�4*R�[�v��`�6^ �I�š<�i�pi&��1��Fq�)��d�_�c,��xD��B���	%���1>�b�:
�Fk`��a~1Ϙd�fx�|!~��0�xe���(O_x�N��� �E��B�����"�c�Ej;�Q����B
u.,d	�i�G,҂���(B�������,*ʂ���, d������������7��	��6Ù,^����q,F���}�m”s�`XUl�J�
+KlYl;��yVkk�
��dB�6�V�� ���/4@l����l�ذ-(f�m��.lz$:m�F������E&�-�}ަ�u�$�6�m���(�-�x�l�e�M��`s]P��d��l��q�8�\�6�m�����oyT�2u�&���̀��7�0�[�d�
���J1�]BWe�t��Qx �
%��l�E�d��m<y"ۃ��l kyl��IǶ�:��&��!t(���Xl�m�6�۶��wÊ��1�֏�c۶-�Xl��[$[EBd[DH"�m۶� �m�ҳm���m!�b��*����V�f4�t2D��,j�5��`ҕWja�f��f'��QN��Ŷ(�a�+Z���2+���-n�X n8�!b�:	��L(*4-�ÁfF�*)d�F�!���uP�Q X
+6��OϘ`�b b��N�+��
+('��@��3�`�V�F��3�LE��F��%t	9��
�$ч�3s�1M���4R�6�CE
�e�m&8�$i�әHT�*��
+Ќ�g�ȰL��
�V��3��M7�ۖ"m�6`Y��m�$�V4����&۶��m�eCL�Z�l[�
+�	&��l�̓8t
+�p^P6HG�������F����_C3�,�g.�hu,
�'B�`�����
+M��l�$�媙u>���H.��D�8���
+�����m���Lx����|<�۶��L��ˊ�r<۶m�m�2��۶��m�(��q��%�m[���5�m��m�Ȝ�5+�J�B
)3��f�@���<۶E*"P{۶����_lۖ�m�&�"�Fa۶�ll�vE	e
޶m+@�x�s���m��d�:�m+P����́�@�>�?H�SH;6�Pn�@���is)��3�C�J'c0[jcP�3϶m�F� k\���E"�IS��)AJ-期N	BpH~�
[�)Y���_	R�� ��L����+A�<�)<M�sY���0�Ƒ�'�+A����JP딉Bќ�+��*�a�(�Yjbc�9?�X�47<���j��#�cC��7ג�W*�K��'�=�����$�T �i~h2��oK�ԧS�W�!�re��ԧS�W��2
FL6�
.�Ȝ�3亡P(��}�ħ�[|�6b�G����� <7{$(B{-k;���ɀFr!���Q�<HJ�Frc�K���BZ�k���]���CDY�X���i*T�Y��&%��FX&	��,"6��`佁$RY�`�NⳀ�h�����696�R�l�l�`&;uPb�(�(H6V���$P���ԡlw�@��:�m3�N/��&�vz/׊����]a`4��ƌct�G�3�i2��r��R@����pl2%��XS�p���i�]9-[9-Ns�TN�����K�X�TCCC�Y�%2A^[�O�s9��%H�
�@�x�$�VO`&X�H4�ˁ�yD�Fh�A3A����H@��ÁP,�M*6GR�#���s:5pک�N�,g��T�d�������
 7c`��ji����d�X�/Ed�`Ɉ(D����$cZL�9�L�ie'fⴐ+�
+MH�	|%��ְ���
u
����0��\zb���y�py`��*�j���"�0������t(	��4
+�s7��’�:��㑈h$w@Q]:�YJ�y�0��8�t �D����k�<��L"��������i��BQ�1��Y0ˇ�Yԍ��!�5A
i�p��1S����X|���kT`�	|1�i��M��^����O�����)�A?��#f�����:߂��Y:�˕�ԡlS��}`���i��E�(^���t��l�o�mY�m	eK%Ⱥ�e�)L:�$�(
���$
��b𨫋 YdM�ԂT
endstream
endobj
22 0 obj
<</Length 34460>>stream
+�i�\&���j�`N�Ty73qhphph�PF�
�VN�T��2�T��e��54`��p�uy`��9���L8��L5t��P
Q
Q
Q
��P-�۰�.����
+�
+f�BA@x.'�G��Ѳ��0�L�
	$NQ#jD�������ܙ��`�Q �Dv���� h5���� �X	+�N
�e"d9���'B��i����IWl��pn!��`�Lȃ�-d�|@Z2��	���dL29�������f@,-k��a&��7�<3��	�� ��Ȝ�4 �F6�If�od����L8��P�h��LD/3�P�,�p@�HFD�0#���("�ˌ���˖H�D�3	�6�Ӵ�i��
�Rh��l�42gȵeN�$a�j�`��`ِ���(��7��a�I��2�M��$�h&qy���0�C��\���L�W���(�U����V�@��ǴH-��1}�
��Xae�U������������PH��ⶬG��
_��h]�s�LR:
���(�����f�=�����YJ�a���QK��4TR<��rZ��P��:2#<wd�����@
+�j������`���F�N�w��d&��]�\�]�\���#
+��`B��w9����	��*\|U6渙����r�Bb8n؂�(a$�T�r���--�>fa&s�D�Fr8��C�P0��Q>���s@�����9G˄�4Ʉ��<++ɬ��.����u��M�,9��$.�0@�7@���DAs^"8���09-"�Ň$�ڹt�Áw�7N:�� WU�� �
�����„p���z��9m$�{-�������e9k�T�C�G���i!oV�#30%��J�^���7=��FT���x0&B���<0����<�JA	4�tf���
+�I�s2�ʆsa�KS#� !��� �i<��^��
+b��Q��`L�@�X��!��4���=�)M�,E#�1d���J������,+�MI�����HBANH]�2��AP�n!�x�"l$-�B���7|���H=H"J�΃�n��!���c
Oʤx��H�\(>���(�MX6$�
+B��<|������֣D<d �+�O:T��Z�1� ��lO&^�=X��a :8E3��@*��.s�y�P����2�i�+�0'���\�
+-LI���6��0%��wN D�`�fނ��o27Y��4e��%�
�G��������2���mB�&X2�LX��6�8X�����.L�ʊ�%40Y�h����fcpN�x �?B��Y�`�g@l��,:���,k�y��up�kK>�a�L�˦b3����'��aVf6N��ϳ[����15e��� �HHYN�48&�XB=#$�
+	aarZD�a5éI�$��f�A�i�LA&Q�@U@��P��<K�:��ox�,gc�@ഁL�tR@�
Dw`����<h8)X
���d��nV��d{<[ @`�+�P0���98l�g��`��V�3�O��+�Q"Ͳ�p��>f�	U�q�gar�)�%��`p���'a(�D.���B��ā�CD�2�	}6$��F3^��x��(W�
��
Bd�u����H	Չ(<*��*�2?%̄�,�Ǩ����7JȲ��Ac����i�U�cKY����I⛏�9m#@1��a�	����4�Ĭ$���t,ʒ�`���e�&�>Wq@�䴅�"��(a9aw�B�:XVb�-`�&�q��+vԉD�
�@Y�^����"hc&�	����M��@���{���|q�e��q3�4lI ��P�aG���M*���(lEV
+&���
+^��
M����ɂ�Ǒ7<�'��˄OlL_�b&H3 	"$&�/���L@	�&�lA㏠����z�q3�0&B6f�1�n5�t(���~����$��,;�	폀N�G%nN�T
+�0� P<� �HS�� ��)H�
+H��P@�
+^��IO�c4��9-!�ٶ�k$��L<x:�(�sr�"��of�����Q)�B�2+&p�เ&~h��
+�l�$c0��2�!�i`O�{rZ�ʂ����]N��lJGu0
�Tc�M����|#�Vgs*d�@B�$h<�Tl>_�Ie4�؊
+��􉍙h'
P�~��8Wa�<��k%���}�iDQ�B�%��i���D�z�"L�ۡ��4:��4L~����.I�
����STEPJ���	�0p$����$fh�bJ.xTD0�GñH GbH�A2!�Bjl���p#E���ҁ���`Ǻ+�[�0+�/q�DR���&4�1�>z_�ߜ��>���������\g�&�ϓ���Bp0
�ny�N�o���X����)�6�$����윬���~�)a�]Pw�u{K�|F?c�M�5ٹs��Ŭ1p/�=����7D��tw�o
���4ޥ�<���0?Q��b@���+�-��i�`-�^m.�KV/m�c�]��|\�]8-@y�"<����2��e3����y�.�ml��>F� 
�S	8-�A��4�|�
���!u�qTT��-&��:�x*WXqI��	7�������e��^3���L녍Cx��2cV�w�}��~vO]��Ԛ�PN�˂3��L=&j�Ä��GAk��Wc�����6l��~Ͳ5��~�7c�Ƅ�9m�fڇ�g��BC�Ӥd@{
�n��l27��nSNcū���.��cd�Z��<�ˍ���S\�������*��'�)ۍbh�h�р�@�
��	�l,d\�sH���������70)�o��@� �P3�~K/m��"i r(��G�3�g@
+���������`�x
b��q���h�Vo#2J������-�;�d���.��3�^7��S�ƕ��������x�W,�� �~v;�]y�����۞VX\����;jw�[U-��wfu`jY?��p�m�-�jM{g[~�G���V$`7v?�j�G�Qڄ�0��RcW���h�B��5�_~��RՂ8
��&
��18b�=i^wW�"@$J��Y{l=i�p@g`�bͫ|�5j�%��[-��C��OI����=�C%�
�P��5���P�h3{Vo-ebC�2�>ĥ�R��*)�5�|�%�z���+��hq����[���W-y��T��E��C{t���D�{l�A'�DRpt��EO9�3q�BaH�Q#���d�96��Qt9����yt
W�<3����:�a��`����i�.
�[ ����=&�2I=��_gǾxCm,x)�=���F�?�]�'Ɲ�LJ��<AX��I��A�(}���bJ�83����?�uT��2oF��N�Ry4/�/\�'0QLS�:�VĜ��E�K���¼(3��p:���Z�����+���#"��A�]�FL����f\aȍ)����U=E��@�����(�})��^���y)ATM�	���~�uG��P}��w<>�(z���0��D#5,�6��#9YD�i�#�"�ŰU��oH��q�I������fL$N��h8ի�w����P��,�[G���a*>_y�',aHv�o�I{��rI^%�c�<�&i�ǜ���	��g0k�|y��]�G�VG>i7*�<��f��#H̫���h���lҁز�'�H�,2]���6�_b����#Sg'C�s��G���tg)�;�aA[�+/5���*]��=�<
E<�>	�U9|)ݧ���b���~�n�TD�|}���t!��8��UP����r��&�9x>&$=
+8Se`׏GL�C��2X<�w�����2?!/?
�NyUΗOgeܡ>�>�'��*�u��t�ve0X��rTj�����TG��{�q���>{g���IVOe���������\U.��$LV]��cqPY�(^9֒5�2U1�� '��i�
�[]�\��~40zϓzO
f�Nq�P�x��8P1���S�́P5�1ђf��n�����u^�$�б&f-��(��9�o�8��_���GAK6∐�0+j�K�3�'h�xᗜ�54�c��qs��DS��zF�O|����'c���>���󟉳}`���2+$4����V?��*�\�;��I`��x�./��n��y���hZ�S� oq����H��&�,�����eu���Ei����:}
�SPn�	�P|ҥo{+��J��]������৷W�NN���ic����~`|q09��+l	���XW�_w'��2�^J��Z����[�`�-�cJS�X@\x�F�j2���H�g�����N���w�S�u�npY���{b|C�LiΟ�/3q��*c��Rr�1�4����C�oi��U� ^�TL�*��(TWp��hi6[hZ��5rǭx[f�0E�uuI����U]�we�k֒�w����c�]%~$�"�Z��΄�zY�|S�+#fj&�6|5fVCz;̆�R/��A�}+����8^�:ű��$p�+}T�S�߷������-�j�E�:�,�!���>*��gqr���D�-�\�F[���l��l["�w~З�}I:Σ����8��v�)z�����m��‚�oW����+��m*��(������)���#���0��i��8;�/��XYy�`�!�q^��(����x�YͶ��Oh+)��>������˵�3Ce�1aAGrU�0����y��ʝZPzW�K�
+�6�+�-Ѽez�Յ7�`��>�Ŕ�ON�7��Z�X㚨�G�,!�(�Y!U-�Q�
+����ޟ"Zp�ۀ
g�x���>��wڔ�82]�c��o�@�0�Ls�T8�ܛ�M5�)����m��^#�1{�P�N�EdZ"H���	�w����(�|'wԆi��W�J�5<ԩ{e��W��ۆrn潑7xS<~����`�=��=�f�
��Nn��+��#
�����K*6i��˝"b&�����<܍�_Ѿ?�Lw{}=��H��∕��{�m�.B;bC3��=qL��Q��%�aK΃3b���U��I8�<�=����q�E_ߋX��9�a�1�GL�����*2�bIJru��sfA�Tb�q�q�6��+�6��[V?����M	w�[ED1kaXr�,%k����,��8��8�à������o\�Z���Y	��
+�����<�S�^;�w�aj�b$5�`Z���a!Ʃ���w�(X��<��|+G�3emF��
+�����Vpkع��f�.�QMf�ZZMe
+�j�A����T30��)_H`�-�*01=f��0M��̔����(ˁ�)������N����M�	v"@�cB��I2������
���iV�ws�a��J+w�q�
���S�����n��y�$�s6bjw+�D]-9f��pf<)�г���Q��zڋQ�W��O�
+T�⌽L�Y��4��F�<���&��A?���T>��0�w|��;B���_^���T{�V����y���?�?O8��%^֕Sc�3�q���u=�o�j�\���3s�
��
��c�:ӡg�Ű9�œa�Q��@�pUXa&_&�������P�8����4�� �۵L��h'���hZ�_�d����~X���jF���93�{V�o�C/;F�K�å����/v�5�Y��%��3 
�c���E�9#��'XuS�[{\%/_�e���0����a�[n����ٌx��"��/W�d�,�E��8�ub�ʊe8_?�R(�*�M/GG��e�n���d4�R�?��9!�Z��d�}`#^�{��O4
+;E�_�M{�6�����/
/ϭ�<���e��v��ae��_����
+�C�D\p��U�.2o��.jZPs$7
��-%���2�� 3<�U
+;qNHS)�Z۝�b����A��p�l2g��-�7�Ld���#A�_��u[�03�����3^sb��(���j-�y�(���k�a1+?@��7�0���5���<��=�mm�B���uO����VRZG��6�#��W�Yͭs
���A�a�	��'�V�eHz�:Y�_��
65Ԩʥ�x8����y�h��`����X����������6q�8���^)5��ĦmR�����3
�JB�
+{s�P���A���<th�8`���
f��O�_�9���DŽqD�bQA�ht��آBd����
�D>���^j���j���߰�e���[k�pI��f[~#������P=sUG�=\�;7�Y���q 	q�k��G~��x��Z\-��<@_�]"�W�{v-P8̔iz��R�,7�1��n/���aۃ�e9v^>�� 9��v8<���,�cMJ��Y��\��>A-�=�3L\��k[
+�%2Y�s�-~�*x��
�0�J-��Ґ��FTB�>2r���)���b��A�%��������a�yo���u�DŽ��&�0(e�f74������t��Lm���^���牷S��$
+LJ��J!3v1�_^���>�C�7о+�v����?��X�Z{��is^�X{qrf������aM�������S5t�_�Zg�p�����>��� �S��h"�����E��z ��gB8
j`��D�TP��ͤj�xtҺ����qS5�<���.1Y� Cd>����̬W��a�[�>~xBNWƊ���K�'@ (��Мv0:�x8�@��]SZ>�z��$ԤI��5�T����)�M�'�Wf��q2��
+����x�Pd�ᝋ��zP�lb�;��_����~�IɄKc�H\�& }����%Zq�kJ�Zߝ|H�K����U��UԂ����W����:9�����&f�zq�̃D�A�����؛��;��C���N;�R���cl=��#�^+<{)���[�oLn�x�iZV~
�Rz_+�J�Q[h���C����R�ۈ�j�RC�������H7[�ߑ\�R\1Ԯ�4�j�����1�U�r�����1,X�m|��
+���(ze�mS�U���>o6��E�¬�MpX��X�K����Sd�A�N�;�ہH9���m#����[������Ҭ}j���]x�B/_[9f����ں�FJ��`޸-�LE`w�cc���4�?T��pS�]��1�jͨm��
��*�����H ��#�yy%ץ�)�^�|<����d`^a��uf�؍	�k�rpN=�=�-'po�F~DO�+�¦b��[���z;<a�gl�B-�xP5##7	�������T�C3��=ڃ/Q�hC!���z8�,{H
��AV����ZϤ��?E����D�o�\Q26x��`�F�Є�HΆ�S���7K�=�f���I�jn���	�P����eν�I�KG���ت%�KX�ͬ5#=��y*����֢�t��<�J�(�n$L���>�s��Y�R�C�X؋�<�r���Tμ]+����,�.7��Ǒ�v^���R���A��f� ��p�Z���7(�E��E
�:fB�ٜ(L�o���r\ �����+�a�(�ۃo�xy��j���jK��ٳ��1T7��႖���'V��A���)0H�
+�3$��o����������U�w�%ϔ/�{H+bvێ�q��s��ҭ]
.hz��j|z�l�F�w�L�IW�
���?��|ԗ,��1~���4�5r����-v8�CR�d�D��9Vv�|E�,����EL	�J��𐾬�Z
��@�,�s|�t-ҍ$Zo�çL
9ڦ�-�[����s\�7��wX`g䡈�;���Y��]���ga�i�^�\�4�X@��h������m��|R㎁2�晰<]�ZK H�6��7�� ;F(��p�E�i����e��CN͓|�u��<#����v�s\�t��6��/ٖ���Z1�Ɲ��)7�B�R�!e�]3zB"Րǜ��>?5D)c=��J��L��!�v�Ce�]�K���{�=c��q(�G�2�~�mկ�S^��(V�F�r�������,�OX���7�ʍtS�6R����%:\�^���8ig����:��$v�q��xE�`c���Jky������s{_[�Tu�Δ��P����yL�[OV5����G>�J���(�P�sPE*��T|LG�x����[��5�����h�Q�e�b�}:��R��q냵q@t��('��CuT�P���̎,l���$(/�UU�@� s�|b1Y�u���A�]����+����#N���� #�O�i:6�H���q��i�4�y��.29p�/_qA��G� �'�D@D�?��
�C�@2��,��b�.�-�gz.��4.`�y�nÏ�d���ߢc�D��`2ME�>O�9���iMNp�d)G��}�O+a�[E�Z���U��v��U���߯�]yg��w,&��C��	c|�^R�I~h.�C"I2��R&-�^޾�xm'dl�Lu��?c�j`�� �����@��\��q��W
Qś��Ls��h)G��[����2�sM���������D�3�yƨ�b�B�ޒ�J����k&k/����Lf�8D�ƫ@�g����A�lWB6�3�0E[� �I<���JC�O�YT����V��!��T��1|y�{�_h�q
i,��p�:��@�L�"5aa�AG�<S�_�W�������c�n���u"����e*Pv�`D���Jn�2g�1MV>Z;fPMv�9�B}$�u��>�}I�59���������ր��������g-�N�A�fc
+�C��r������!"m�h����=���ϸ��ph�)�d��ވR
+0�D;q����տ���bb��HQ��˜�"F�Dij�a�-?,�U�ć���ۉ?A8]9QO���A�on�PRRu�
+qV��N5t��|$�&@$��y�M�L~"�йA�x���X|�X��=����Ig��H0�D
�;�$��;�l0V}�_{3#4F��{ژ�8,&��t�>�j%���=%�s�����/i����b�N�^>
0���L����k7�1i�σk���s��V֊
[+�V���2t��yĕ�fXXD,\��t�Z�V�`�v��9��.:+��T�劌��Q/��V8ԠCѾ�)�8�yVNM7�N(�Yw;h(��D�!7�A.����t�y�U��]������p��<�ղ�b2~��M@W�K���QE�ZV��t�͗�a�hU\�t����Q�a�:�r��1M�.:���`oN��M%��0�j3jL�b���>���
���MLUCH��r5���	%)��nR�-�*GCt�m��0������$;	��������:�S�"\vZ�`�Is$CYJЙ���Ď�O*_48���N�C�`��CJ/�?e%���F��E(�R?'&- �Y��%�1u�X<Ѕ��H�5gt�`����`���m�V&=�0�)/2����u�Y�x
Z�m,_���ļ��Hr�΅�C/1�{mjq��`�QĜ5������W�n,�Qjζޜ����J���"�Q���H�
�:i�K)���P�M�'h�
����[R��Kp�D����\��j	P��
+5᳽�@�X�d�{��v��ʺ���\U"���Šo.�K:�]%�a��s���L��m�`��_7�:�K���e!4�u�� ��KQ�A�H�����]ت�M���~��@cHD�Y�?��!�U���J��E~�N@�Q��;�(Wa:���]�WI�ظ�;�	:���?���_{qǾ�^0&����¸���V�����(��L�v����?.y ��Z���N��'I�x����odz���=-D�)\㰅+D�悷���h4�A����#����':5��Y<{��
+jҰz��^;s�������Y[j9���&s�'p{�!#E��Ɖ�Ց�!�6w�l;H�oa��B=h�{�|���k=K��%����,7A��
+#
+��tu��F~<�|)CF�v����ᱵ(B��
+/��ٯ��ECu~����i���� r�I��\P�•{X��`�&fdֹn	�#��΂M(X.qj�Se���Vlj4���h����a��
R��L�(G(!4�B�����.T~�E}Q�xVB��l�ڔ��f�Q,���*�#�^���\�,)��jB=]�"�l�8�1�Wc��QS�eD��(-�V�?������H���GjV�$(P[�YI��ɾC�%b�,ըY�5o!��dĝN��]=̮֠YS�@҅=���
+�O%�����=�I�FdL�g$�*�V}O5X�!�Ϥ��	?���k�e��3P�!�P
y��ܙ�M��3�^�6V=�M��u1���Fo��ŃBb���^q���aj����=��RsIgm������E�������4�4Eol��Xn���<�t�͵/�d��g���i	�*��)C�
+`��ТY��uOz�%g8��4H����N�x?/Hn|�jSxʥ���-�ѐ#��)�"�@ y��5<kB�;��i
+a�`�����W�ɇ�-y֫r�.NW���Mm�
�'O����R���%	�O
��S�]��т�C����Eo�4�#j������5h�˗�}5Y3^M����r���y�>O�P�����'%p+��/�U{�hѩS��UD���_=���G�8	0�.���6�\4
˫2�b��n�g�ߞ��-�-��K�iA�[8'b�f�Dg��`\��DgAqS��@'|��-V
��X�z2��8ʒ;\��6��������L��A�ϐ���O80ƺ��o��5��t]�F�n�������
���c�qr��\7}` {y��/O,�X�h�8۲c��Q�ٔ����'N��H%豢�������؆���6�0\CiHW��a7�����^j�$X���n��ކ��_�����,�N���}z��c�vUzX��������0~2c�~`�\x�of�nH���C�T�s盻�AY��O��}���7�.�)��(Ef��x���B'�Mq��slEI��/���u�Վ����Hx*%��7�'�ҙs����Ǎ-	�>ZN��J��8��[�-,�i70��P��\�$
+⛥=�-"@��f@��?�}�;�|�����礽�p�ٓ���T�����[O��C
��H���I~�wՉ��

�V�p�D`�!�i�$1��YR{Qk4Sw3���D�:C ������9(Y�6-Bi�eG
+����	!ClQ#�>P҃>,$�xW��z�g�:����#ڰ�#w�b��)v����Eh��nmM�z?ft45�Un�ar��
+��e�����ز�f��)!�j߉�%�,�ʝt�����BM�1�y���',�����w
�g
芒,]��<�a)�49e���RmP� @V�u
+� �6Ⴠ��%�٭e�-$��$	u��$�z8��O��(��괔�|�3Q���f=#
�M�>t�?+�$8G5����/�~8j�@~�J���+bEX�5\D������ks`�ӄW�fo�ґ>_�l�6W�
+�Z6�L�ރ�XX�4Jh&D��f��ZO�L�����ߐ`*�����N�ߠU5E��S�a���"1�pS�+k��.~��
� v�/"Y�U7�����I[������ٳ�~B��ug�֋L?3���w4�8�L���X7{+�W�kdL��S�P����Rr9j5W��$�\�%�2h���R�L�KF�jRX�
,�P�3)�����8mԞ��xJ��d�	�9�.��WU��'�mz��Q���_73-3M|��&��!qC��Gs�P�j�%�zw��N#�ޓC�(�e|��p������)���9�-���Fo�q����'��"��6x����(�L�h�� 
)�lB�.x~ڥ�!	V4�{�ӌ�*9�:�_󍖠Ā�������0�PL�K>8���) ��u�dF����,�&��u�^f�9Ob��rh�/���lL.�-�d�
(J��`�b�fGJ���zYLoJ�?�?+v����yĐpn�i�XR(����3�TX�2"�V����M��z ��ٟ۪-6��ۮ�Y��ѿ���0;�3Q���7B��-Z$�r>Ȼ��kĊqx=3	�9��t�2��	QJ�r����
+ �u�&��0�a-@R��:����
%����g�@6�g�+݇-����G����MCz�h�]�5s͚J�en����w�{9'�ۓY��k�%-��䡻����'�wx�'qaA"���5?F�6�]Z!�ġ�Z�8�6Y�r���(����32
+��!&�k�>wez�'zV{�6��CV�t��yS����lS�Nz^�myL-5z�M���DN� ��cB7��&�n��#b�(=�����Ap�ڶOE�1T�b���
e�Ni�x���K{8-e��	��J�xyߑ4�J�0�]�
��Du�!�[�΅&���;�?�m���H��ꕏ���IcOW4i�Q�Z��6�Hʅ�)���t�%��S�E��厈�0�ڨ��>&�Q�nAu#j�3��1}��X����t(q��K%��L���M���^��
+��Sb��8t'�y�[w-���ɘ)���$&�d#O5�D��a�����+���v�[�{�ćp/|��y�.<`rE�D����<<�3��/Cag��yqv?O�~��^�).FIe�v\�O,��W��	�����}pD�
07��#[ �踁0q=}���?FO��X��aZ��2I=]��(��+2�Z����Y
O��	��u�io�ǥ%����D$��]��vD
*�o�q�5�-��h�"p�W�J��zDuZՂ�	�-�K�#��4����mF�%���4#�!� P�{�ACi��Ǹ���QW�Q-�
+ag���$BGS�+C&�P5,�H�ꆉ]�	�����nc�|`�{zv��g<Y}06@���C>�i���ZD����A����e(�^��`�f$����˭���x��^H��,�S�0��|E���,��%���Y�|F�L�!gq�s��A`��Pn�txÅ���V�ƫ%)@���E����*[�x
J�[Fe�f�[H\��H ��0y��Z��D�Df�r��A��}'�bz�����҂Čng���8���?^��I&�[>┵�������N�YF����� 5���4��c�Gvܥ)�"���
o���Y
Ί��ub�z�f1��);e�-�� �q�!|�^+kf	�l�c�F��$�(�2��M~|��{`)���e�Q��1��4��ϛ���'-���vP�,�b.����ń)�ME
��x��O��s?��}y
+ٸ�̿�m�_,Y����+7z��%_��3��~�N��|�Y��}�(����BU�T�����y�%��+\����ADȞ�EB-4>�lX$�Z[{㿸d l�\�?͐�8�� G�Is���7��q��h���/�M�2����C��1qR��e��4CRԝ�)��
+[f�gfu�|�H6
("_Zn��`��M���Z�|`Q8�\mXQ�+M��`��֣ԁ��?ڒ6�a:��Ei��)5\7pb�\f$fk��q���|OX���Rʎx�n����Q��J*I�.㷿n�+�8r�T�����eL������A�#~�V�D*O������vc3���黕9D���(~b�N�57f��2f6��5��j�Rv�[��9�8jQ�
��ɉ:`�&���G#���O�-��3P�����R��K����љ~;
[�����e�_��Rq�n�.��hɭ��C/ΐ4�X����]<������F(��
��0��y�����;y\1d@ӱW�xN��V b�
�Ozj�S���ð��v�����>�F�4��T��M�h�J�=�[���5���e��t�Ba�]����ӻ��t�<�kzp0��}����
����V���6R���6ڀ�/�!2��#�<닜t����(ѓT�0�w�Td�H%Yz�2<a�]`�9�	l�
��o�f}��=|���04�6V��lSJ���.�� q+�kpy�QMp@����S]�jfOtp���-���06\�M��z����DU��,4�Y���@�u|��s�&�X�D���-[%�"�r�u����������2N��g0��A��������l�]Ld�s(�����{ӯ��)FB���x��4օ����c)� u�#'J(��
r���M��^k�
o5vɭ�s3�4��� ��%l�{���d�c�V�KA��I��p��ʼQ�u�v�[$1���\"[��u���."���9��q	h�Ű��yz��4u{W�u
+T��5yA�����蘛
�r`DD��Ul�B��XY���.
+A.n3D�WգBg�꡵AWK�s��>�Ї�S��k1@���j}�0�y�C֫5��o�R�~�/�EL���e|k�8�B9j��
+�/b� �僳�b���Np���K�I(����r+���b��
�����:#z��R.�x���K������h5�..a;�A�/`������/��+�B�Zc@���H\���l���K�l����ҥ]�� h7Y&���^���Q�
|��l���hM�M`.���@�-I��N�?�@�@jةPY�
�Q���4'L�?�Z�\���m���Y�?]`59vl�c(W�t���� ���M�ʗ��r��@I��F!��O��Jj�d�����U�R�'Tb�^@��cw
+Ґ�:��9G�&��Xxq���֧��9��8u�G�k����w�n��P(IUPDg�䎶.�T���Y�yD���Fs��iU-'�
�sfӗ��v@�(�v�͚��cZ�3�:{&UȢ���#�8��(�1��L<���c����
�-��J���#h 7����_ʠ�М�2��3�K�#Ifb��>/�
}#,F?��QoR���kՈ'���]e�Z��Ɇ�U�~l$hX�K1fWs�<�K�ߍE��Iw#�2�n�-[�ۘ�Rs��nL�=lmIsUN9V-�7zS�B�o���٬���o����0��W~�T�{ki��\�N/φ���q~F�O@����+.rA�6
j�"�v�D�� �:�Z��.��H\�|�|�jYn…���C
L���}�6�e�RX��a?�
� ���3<��O��y ���4H&W�=�L< ]|����2��h?��,��p��~�&�S�*!�B0l,����nQ`PS-��,d"3+E��.+e��q.M�|D:L��ɯh��q�L
�T�^�Y�~}��W����Z~��+��3{�
+��U�`����n�Nj(������5"7�'@�.��
+���=��-<nFD�+
+`��q	�_��18���
�z�^�$�����D��+m����X�D(������m�+�Ƭ�c�o���ۖL�0?�UU��FiXT�
����[.�vj���m���m����޷��[�.�x534)�(��t�%~��e��.F��&��&UC�3[a�l�󽯪�(�%zh�|�2�DX��e�	�IW3Q��@��,�tJA�Nܭ���!��N�u���pA%xEBHN��.��֥����4�E���`ꘇ�t�-ՠZ�@4v�՝����۵�: �$�a�
Vj�Ȥ.E �-�ObhY�pb���)Z��p�DA����d}���Z���7���1�CzE�v~	t
+]A��a\�D4:q��z2s넺�����Ȗ�rLAP-l��`,;g�3�
+.��A��z�T�ҿ�%˚sG��@��W�y���N�pP�����	 ���B��%�	x@Q��õ'0
+E�(��LN��Sy�(WݐQ��'�ӝ>�J��[�')�'��s��a�+냠g�;}�a���2Ќ,
+�������F5�������^3�N�܉�/�SQ2�IJּ=nU*7��7_�țJ���e�_�W���?O�z�6ŕ���qx�h��Fx߈�pIT�-_�+ ��-)���O��E߀�Ssm�.�b��A�U>W�a)'���Qv�ի�;�Nav��4kC�6;�:$�
���l�����'Y&^I�U9kM�

</v���tdq�������>��Cct���Tw����F��*�>��ªXɠlF81S�6��B�7�W��R�h@���A�*rm�;%�Ջ����mZЭb��Wѥq��)�)�V��-��x娭}�f��9���X�G��H�� |�A�u��lyF-S��j�'L��SA�7W�~��.^ C\��lS�T�NЇ1��ѿ�L��H�]�����e��[�?��m�\�a�E|M�K��Uyp-�)27�G@xN�2'�RYU]@:����us�b1�?��A�a�q�C��W�X��`qL�s���&��Qʆ�!"�M-�D��٧��a!�xn���EvY��P\a8����L�b�ӊQ9�)�����0l�؇��%�n����cA�ҵLEa�Z���##!TsZ8&Ey$&b��76w��H@`�0PeqN�Vf���xP
)X���}~��"�n1낺Ȍ�
��������u�6H����A�>� D�G�4����f�B_z���Z'_w�KI��i�>��qi�:��^��@����u�N���W��:�v1�#&�ӚO<<e�F�S�8�]�n���k��
~)����L)�<]�=e��E��~��z���G��)p�����B'Pr!�C��c�8��p5��ND���:�݌8��K�� zz�i��DF<��MQ�XxM�
��$��������
��^%�O?
+0�$�tJx��‘�£B���������*����|���_�u�!98UG6�S$siR�re��K����s�JXc�G��o��/8-=�4�d{gZj_��2er��Y�wRE��`07��E�>=�{�������f��l�S�-A������5�=*&
7�s��N�)��ė}U-���XL]�����g���%o4V[�c-໼�) ���VJy,V|H
��o���
F.��L�B����ҽ�0��s�MvQ<0J�O���``2?
��֡lP�
̏�]����9D�ZMSxΌ־�@i��a��q�0MJo�Oj]�g�(��^��T�bz%>�&�IsȊ�~z��$N|G���g�j�/��b��hDmm"C7Mr�㊯����zQ�����:x�E*%G�{���JO��r��q�T�]��gv�
4-�.�]�z�����Y��-I�`nz̒�!+�Q�B��G
����t
�z
�4������jza�U�W'�RݗX��5�
��U���˃�[���r���G�n7!��Y��:U��5P"���\a����tO@oLb�-�8A&%�/�mdIh��9U?��cZ0%�D�d�r�e�0|��-g<����T�3��]�OЊ�C"$�����x,��qޑ�+��<&{k'���
+c z-=�T�U�l
�~�΁���n�o\x��Y٦-�'�=akb��e]g/�;54J���;$�)%�=�^{������~�v"7`��Ƨj��I1�Ia^�)�d�L}�[���WT��
�I�'���3πX��@�$Pp$���@{�6#�?r"iP�����ɡ�*q�� �`kZ����Ҡm�g%���mG�a��]�.��_�!s��\��ǖ��
+��(�5��pߛr��}"�(!�fB–�x���ς
+ʵ�б�3;������1�56�o��ci�H���e�(
�YǬ
:ɹQ����f�ɰ
c<X�yh1|;�k�Ԓ�fͥ���� n��DLJ�Ζ���r%M�`Hx'q4�=9,�_o�[�x��Z��q��"���
F��Zǟ�n>ؘ���E�*îz-�Յ��W�Q�D��;���ɴ
�%N���4:$�@������ҥW�_�`�����u�䯱%�^�V�P��H́8�u��}V���h�__A�Tz2���NO5g"؀s�#�$H��%)!�{�t{�~_(�n�7m�H��PJ�����|�$��1�����9ۥ�`�րuƏ5"�KU�_��H��;�1c��{a���ืp!ao��
+f�S>�	����ϟb�
+a����T�
uƳ�&h���JU7��C�P=xn֒��{v��H��#��)E���L�-'ؘ��',������I�C뜱�����9��(nt�T)��0%krx��za�]��O�����a]��	��".I�X�1x��F-���VMXn\q�j��k���eR�Z�<�Ȯ�I�J<j�(�;�=�G�L�H��
��I�0�I�9\D���i�,���.tG-,�XG�J
��C΃�
"��m!~/~TxCÅ��H ��a�@$0�j�[�Ǔ�4�<�b��`���������
̧�萊"Fk�S/e4
+'��G ��i`jr�)��+0]`}zE7P=R��@�eaW����[��ѭ�nB�k7��&$��.��k8Έ�	����E�$�	��pB�K8��Jp�\XA�jJd���	�M����s�9��(�&U�����χIЈr�����MR~�/�Dc�L2e�w�Fɀr����R�#��j�R�������@Y


��<���[��ǚ�$B�^r��KF��
+&� kg<�ƌTK=����d�Ͷy$�A��:�f����q�&��|����d�y�?�q��?
��i>}�|���ںE@қ%߃8�""vv���������%��Sf�
���Ӕ$	*�[���
+w�?� ��N~�~�׳�����ѥ�y;k�D���[�
�J�-��K 	
n����Nhq�<4I�A#ϋ�pcPV�jdlhЯ�
�w�a��Z���4�`K��r&����GVXMq~�^��=+N�+x�8�S�"ϭ��d�C�cPg��R�p	p(������ǫ{�@�!g�@��L�2:�t{���,.t��c�0Hǰ"��l��j�Deh0�F��d��r�5i�:M��"3��w[�)S2p�n��
+����3���ʀ� �.�%��Fm��7tJ�F�����,��u%�W����#E^7�GW����?ةҩ��*@�b,(��A!y>��&+��˱u!\�2	/�ƅ.���0f�
���eU�6
+M�Xhn!:�V���S!V�>�Y�ZN
+F�<^@�	�
+�4QS��Y.�
�MQm��eL~������3����Z�\�<n�8a;�u̐
�|�r.*��X�<�����h��dyFW��u�mi/��l��d&0ba���#�n�;�n��o�e�8ir.x��ޮIgw5?����A� �R�cӒ^�B����)H-���L�F-��n�d�,f�rp䤅��= ����R� ���*\�DH�tbx�U'c��N��x��ZD��S#��c��_xJ�����-�k�e������V	�f�r�H~&Eh��>I�QG/�j�����+��J[ɵ���I����+SfK�\w�����P�
!k��G�O�Վ��~ޗ�H�ٮ~��ϵ�$�m'`��H�>��
�UW+� ���`������э���y{���޴SJ���:�49$x<H+�
�*�|�N��'"�
�y���!�_;L��@�>������ ����1��@�
+�� ^��<�y�!uCȧ��(���:8��!�����]��<1�!�<�8����u�O{F�C�1�x<�
��&j�`H���U�elZ��FB~%�Pw�D��$>��G
�Ҳx(B�	� m�z0̣I�!���N����U�., �%>�q(��b��
E�3
��
.o=��Ŷ2%�YDD$xH)�P��ץY��O�R�bD���
I� �

��)@�Ey
*oi��,���‚
P���.������H�t�㩓��ڪ�E[5�m��[Z��Ұt�6Dsp�6�w�S��Hۨ�׽û0���[nӈ6�����b��K�i/�����ۂ�s�`T�Ł2|p@��B��A�I��m�&.�ԁ���������ك��۪���mP���X6鿮�U0.��:,���[Zvk��p��-�� �뾌�SS�D3Ii�SQ!��h�A��4<�����Z��d	)e�H.ܣ�p�
E�_���&���i$��%#�
Eb��u����D��D���	��tBؐ�,����X#/���₋R�%�Mg���Aa*����_w
�,�� �H,"H&D�0
�|�������yp���
!���	N�,N�P|6��
+�F�494�L�F��u,Bd
~Ѣ� �:�!��S+J
ƒ:�SCP��L.��`��c��L�D`��҈�-�⃣ӕ&-n0m,p�jc&��&4QG��T�x	#`�*'�C�y!<L�����m
+�D�,F�$ N�J�2���L���N��l(����&j��ف�m&Wڬ�Q��.,��0�Tl
+�V����Z'b�����Xb/\
P��T8�W�0�}IL�v�3K��-i�m'TE� 
+��h$��ά��>�����i	��F"�MEg��p�E�B}��ODȣb#×р��::5��\�,
R�a�*.���<m�c/&ڪ��Ţ!+Dނb	��v*��U��XA�A�
�F�ò�X��Ԗ�l0��v�2MZ�I��e2��Ԅ1�	��@T �����(B�P ���C�a�0r�B:�m��[����X�"��xȥ���Fq<
�a�	��*�C���ѲJ�� T��	��6�¨~
4h�����pBN���袭�Z�H�վ�2_G�hR��ͦE���vu`�����!p�&0�SLL`d��C��,H�"���Kq`#!�lT�DG
+���]h�J�	mB��A�"df��4R��mh��Y0|����CB�a4�M���a����B��_�%x�? �I�tf!	��H�@59"n�3�d�:7]:4<�RF�������`�SS��c�;Ħ�i��b���OO����\���r�:P6i�1v�ƐQ�@nkY##�`�� R��
ED�u�u47=@pP)T
+Ր���	���29�]°�K6��
'
$!�aÑp(��N��*%�<*���J#xL&�#x��R��"eD&���qMV��j��A�t\::$
!����qp�48(���k���q�\���å!��$@\.
�����

�I�If���K]j4
�k�6�K���. ��EMCb��P� $)�,���P�T&�z�&��׵��C�P0�F��X'E����V
)��j',Y�`]H�..�M`�M�ZYH@��,5oe���σE�;R��4E�[!�u��C$	�BB�Eh�TS��42��!�f
+��~�^k8��K�ī����J��F4����B�:�IƎZ����P��4+��v����Tt���j8}p�q�Y�Gz!(��0��[IS��������N
����W'�`�i$_��E��4��{4�
��� LZ�$aJ��V�ԗ`+8|�B��s0
;:�Z�N�@+v4"J&O�J��D ��[�aq��*��#����H<h��m:��[��
+���m
�MGF���G�e�Q�d�.���5���G�L](�3�`�-$N`["Y�8�b�5Id&�!3��LQ
���!Q�؅�O�S��\�	�5l&�����L�۾
�0����"Aq��
#oa����
�k�oA��
+\����a
"A̯��de8\�U[4�oU�]&���	@��ŻMf���6�a�Jҩ4�}�.���}����j�u�R��O�����4��Ƣ*��lߣF!L!��B;�
+�B�W�u1�$�ͫ�:K���v�_�
_��a��@�@�u�����K)�])�
8(.�j���$^�u�c ��#��>"8��r}�F��_�:�59��Y*o;��U[��ݞ.$B�O�X�`�S���SPb �.��@�������d��O�@�si���&j.M�U�6� �����u��b���y�u\�y�ǔ�L�+��_���HC��PHb�H��)��ad�s$�.a�W�Tz��|+����V���c+mղ��JW6��G�"ĕ��V*�9>
+�j�V�����\�*Z��,#�����F��TE�1�/��Z��-14A
i`r@!V�'��t�ĥK��OD*�p6r j6�r�τ�˃b�,�^��$_�m�@��Iy1��9�.��m��"@�Z$��ͺ�Cb.IҊ4$�C!q܀�X3F�YP#��F�dd&+��J��֢Q��R������3b��&0
�CMh|@�@^H�)wL�A��@�6L�f�۠0��7�
+0�+R�壀�H	LТDҳY�@�abN�E	
�	��f]j
�8i1ń�3y����-�Mj�!�4����1.�J*D�Jj�!A
���b�L�m2�o���B�oó�
+x���xq�
�ù�Z�d��f��A��X)�&�,5I}	hh=��J�g�ZC��Y!�gT����)�0�u��!��4��ԧ/#oA&-��Fޖ$�����nBc�pR����EA〢aQl����J�}��
��W��aMW���Z�$��y��(:,��
+�`�`3���I��^\�����,���W�x0l��,HK����$��f.V�!LZ|�y_) �@
ѩ���]�F���pkk��{?v�q�w��ҡW�]�]_�����k�u	���>c�[�G^_�u�I!��%W�=�R�^kCI�ƍpk��qֺ�{��(.��Z�.�2��߿ܒ#�=�t�4r���������g��Z�C:#K괙�	em%��4Nn)���D*���I�솱v��iS�4NZ�{�S�6�`l���,Y�Y%�qV�RƧ=�Gd��id�Z�����S�����r�Z%����[��S^Xk|)��s�:�a���X!���Y�B�5~��)|ښ�l��ϵ����t�N��҅��ۋ���K�ͼO��w/��I�CY�����U��5��I#o��tJ��q��a��~��}B�-�GJ%���*e�t��S�s��t
+����Z�+����^�y2���F����qN�K�o�;#Gf���)?:���&R�=����C.���H������e������J��O*����z����O�Ɔ<��K�_�y+��u�q=–���Ne�Y��J*%|��9R��r���=���u�(�5��'��4���T;��fn�.Z!���F�`#����j��`�:w7�2b�MG�K��`�i����4`�(m6�V�k�l6Z�
+n�J�y�j{�_=��2F%{|���S	#?o/��,��\(?n���'�I#�p�\9���������#מ5��1)��S��r�Z�\(gdP$�Jeu��z�*����R�s��vI�e��ϴ�Y�(]N�rg��ȑ�ۓ�S9�������K+�t�3�:5�'˝r�K��VfX�/�#���q�|�]�|��'���@�
T�8��>���tV�Vy+���J�T�ƍ+!w��C�@���Rg^*�R��e/�H�&�y��%�켕�۝�k�?�GX��D"G��>�	yF�\�Dv��"�l�Rd#���<G���*m�P��
ಐ!e�o�H�����
�?�#��I@ֈ��R�C��[�ԧ)2���/�ė�H8M6h��#����/��I���!�U��3Y�L
��.D�c���[5o-�j�TMzp2�E�����,���Hqx�i���ry���k��[�py{9(�xS.o7�Zp�bK�Tt\��S*o/`��hD+�6�K�&-�%�����������	�:yK��>�����¤ŴԴH]�Fb����G�؊KHڪ/�Oc2F�h�*�x��1�|+
���K��2e$%YF����H"f�"�_
��h!�q��2Z 
�РE`��
6ˈ�2Z �Z����"0�h�ֱњ=h4�ػ�6�����OMDί�
��JY�h:�.�
�K�N�s+5ӝS�-���zo�y8-=�t+���J>���N�����������������������7nܸq}}{{{{yyyy{{{{}}�ƍ��7nܸ�����������2��G����׬�n�Yg�u��*������ׯ��W���i���J'O���*�����~��_�k��ѱRZi��^���\���ɴ~�-c���h��i�]��٩ܮ/�.��y{Q��#^}���__W6����elgɕY�B�ΛG?Ӯ�\�@;��t�J Z��\���6�ћ'æ��'�J~���?���H��R���Oصy�D_Yk�R����.�߿��C�ϑJ��7�qzi����i�0�v�0J�uƏu>��ֹ[�kC������ik"s�e��N�Կ�{��Ki�H�i�p�����;���/��_X'}~�TVH����SYi���X�'��#��+Ӹ��[!�������/)������Χ�ӹ�J8gӥ�:��/����5����e]ﮑ����?�;J(��8֮NimJ�{R�K)mM��:Y��g߮�-#������n��{J�=��w���X��t�t��ϭg3C�[!�Q�:��5���p�gZ#�U��ߒ6����2�e�,뜒������2��U>�f�_�֟�ίp���]B�����ɻ�L{�C���N^�����S����v�w���7NH��9v�,�!��D�g��U2�����
+���[�m��!�J���}����<���
+�?W�>�ʍ3>��H�I㤐~ܹ�z3�+)�.�g�^��u~ȑi�S6��.�2C��_?R)�{��io3S�3>G&ǹsc�\Z�{���?i}���6�iܝΔ���7�v9�)C_�������_�^��]�7����ҥt���ؒ��PV�<k�]���n?e���+�s%��V9��g��V*�G)�)�o?����������G�sJ�/e�f��u��=>7��9�6e鲹�C�)��ǦT������W�Q�>���[i[�N*}���N�����9�?�\�\�OJ)�9��ّ�s����i��t�:��O��N�5�^�=v��%�H���k�a�O�SIc
���4r�����RH�!� @�H0P �ID��f|nH$880,&����,�(�0��0�H��j��M�'@�ǣ����G���IV�!#�wf`����j/s@Q����D�ʠw@I�^�GI��e�FI�I�"p�%�+�	%yZQ�Vv
)�[!�.J�����a�I��c�P��x���@�$�;����IR��GS�?�(��w�]z�%����4���'$$5�
+�%j�^���~�?�J��)�6�J�o!B���l4�UnA\��$Q�P3؁Jm���W�+!�N��Ӯ���*v~��G��"��F�įb�>�����ov8t��P�ZԛzK3A������@�
-���b0] 5��;����E~r���u:��/�zڈ˃i�Ķ�gU،6_#�v|���x5!Ψ�E4ħL�>�hGc3 v]���HA�%8x���bA��Φ�8�����-�$���v��-�.��,g�V�ܼ�iQ�
xt}���)�#E�Jm];�%�{[!��܊p�=���mQ��jh��h��L�}gVY��X��Fn�xo�(B���(NO^�A��$���lG]<�ڡt	i�Q*^<��	Z�}>E؄7<�x��dT�w�
��֨�Q p���"�<��;v*��{=#(
+E��f \ \�I��(�@��Z��@C���;�	�Ւ��c���;�1�"UTry����D:������ނ���U����z��CeX��ٵy� L�`,�lÙ8��?�d��
+ǘ���Dq�O-����B6��?����+fi̍�`F��KA@��!(!�WAⴄ�
RM���w7A���[��;���^A
���
�*¡�����j�ـoA:�F'Ш�B`��\2d���S8��V��ʼn@1.�`��8c!�PY��!�p�Ozǩ���_��ʉʨ�ģ �Tt�@Z�ƨ�����բU����7�ʢB�Q��1@��(���@�_c/]���x��Y<�W��qD�!.�.���F�n$�!�f��,@Dx!��/=����F%ѣ��t
�B���\������a=.nD��`��k��K��;�?|Z����1F�m�Dį��lf�Dl?�Z&��7���;�oF�ׁ����[�ڸ���h�"@#K�qR0��D��M�#�����B'�{��]~��BKP"Θg�:aDKq"Q�ʐq"~
+��š'�������.��.Wb�8o��0"��ih?=/�!ʦ~�F~kK�u�A�4d�)+#_b�����u���!ʂ�&qz��,��b��%�DROS�!( ��nK2F'��q��V��*��°�
�[H�d��/��-��P�Q;<��	pM�S�$�H�4��9W��y���Rx8�lhP��H���\HZ�S�d���H�̾Df��;�JD*iD�X��iv��q�jtǯ�
�1���I�=$[�j�a#�0��!O���i��� ��RG��Hp�2��eÞ����-���[+���_p�|�aԺ����<T����w��%�D3`�v^NU�dz���^X�E�
+P�G��Ӂ��VC�wUn �{�
����1H�"ɹ���"�0U%�%E�:5���,�a�Eq��L$���������RG�h�U��
>u�9%(A
��B�x��Pˁ0���U
+���j�o�h*��6��q��n1D�Y���7��P��]��
k�4\��:����W�ˆ��J������FG��Ifk$j�5�1?ҴM�E<hH��_f�vdP�+�c���5�8����;�i+ ��m��[B&��3r��J��V̨d2����`�k�A��kJ'�`B����̃
+��Θu�a!�S*LfL�����2�#)�"���ٗ������?�dY���Ӏ
��
�e.~>��\����~�ٍ��3��8c�c�8��=�!^$�( ���_?u+��\|����\4$[7R��&oh�S�l�F��N��!i�7mt��
t�R����9~�B�<��A3�3��/z���%Y����B��>�73>�pp&RP�&I�ˠx��gK/Mƀ�����:3b���j�EhC�TUpʭT�
+f7��5ӆDU�lۚ~1�rD�a��Ւٖwd��z��6R<䋬�O�ԑ�Y"�p�p5$q������@�M����g�V�L2�M�R�ZĜ��}¥ &$H���߲y�ʗ�-�=3v
G�izUo�%?�	��9�����ce�f�ß#���Dd�Ѿ��3��q�r9?��F:��+HK��xܤvъK�Dk>�W7�AV*��	�<���O(��7���&.�Xo�u���H��AG����yT�3A�QfA`/��	�n��.&��~pS'{]TPgz�!�;�����#���Z:5h6��T���x3��<�#�ӖQR�Az����&��l(�%��ktb��Lɮ>��UcN�0$9;�
�����$#�c��z�d@��(Ķ_�ߋgDa¡džaMlUNc�Xi
+-���B��3V�ǶUz����=���;��A������)�Ei2k���`v(S��72��(c�mFi�9��;���5�S�NC$~�8��
N�D{&M"	�Je�N$���G+�8��.���[��ocw>C����,�+���,'���P����9'[�-�V)�e�|`��@?�(a�����Ȃ���U�-� ���
�c�Л�T��N�RrAԃ%:�q}�” \�5M@j�o%�b�Q3"�&^��śfX�M�������`�z\���'��Np���g��WguwC�n��qV+��A-��/�8�Q����e�WLv��̍��&�;PE�K�M��+��=#�C�-�F���vbC��#�g�N�[��SlF���դ�F��Y�,†��2�p�U����)���Ʉ%�xH
+�rpH�L��PW���;c1���$���S�d�A���X��WL2��گYH�@�M�~�2Rʋu�^��Ї�s���Ι���$��3���B�ES�l����m_<����XZdS�X�ۉc[Έ�`+���싙�w�E�w�(�����)�"�$g�S�o�6!�7w�qE�����0��$��I
+d��)�1��X�B��W^9�<�mʓAK�kRd����=qA��i�^��>6Ô݆56�5d3BDe�b�t�YH��H�bQ`%�t%#P/�4��B�1ɮ	����'������Bc�S�l�cHO����} ��`bd��`���kp����Ƙ��3�l�[�c|�N�a�M�1�pL�%D0Nݑ3����$�����J;����7�A��U���)�l9��
+�n+ԙ���M�Z5�@~�qM9f
,��b
[١l>y���w�$R�9�	R��_8, �r��2��{#T�	j
+�%�]�������,e� ���1qtoBnD�Ab�u`��
+���8�A�/�GYD��%�l��!�蕲*Y�Dž�F�������x�l��"6�琐؅�W�E��z�7ġEqF�y	��)���7d���'wJ�f����ǹ.�# ]���p��q&���J7
ά�$'�V�ٱq/�-,a�Zc����#�z�~�y�r��y���K�y����^����@N<30�M�6���1�Y�L)�����y83��S-�����w��x�]���=��c�X#2��D�_
���Ҩ�2�� ���@"��N����@sB��|"
�/���~��w�Q��=�JZݟ����o���4E�s�/Y������zY+ڀzJA�h�j����%�9����d���j�3ȣ�x^zeki���?�4�H̀���h�n�8�Z��1q1�U�k�� ��]TH;G)�Y�em�<�\�	�'�ۭ�j.��8 V�����ۋ��
ݿ�a�������T����[�^����H�]����%g��W�ڇ	�$�8[��3j�wdw��O��?1RE�ά����g��J_���a�1���I3��1…k
��h8)��/��	;���;s9�?ؓ��'�KfE�;{d�(4�k�vc��D����9����2:�Qu����B�gԏ|��ko"iq��KS�-ez�#��$�x~��B�0ǜ��h��h�~54c�x��L�+�����&k�:���Y��ʇ�Y�b	(%����
+����{�mMZ�3���J���w�45�	J�.�
���l��f}�U�DT�
�3ΗeO�T\c7��� ������d����"FFx�cc�7W_B��b�;T/5�j���Kp��B�+�X�3�����գ��;R��SE�5��s�NJ78�S��R�:ٿ
�x����2��Nz!<��(�d� wl-:@W}�<���|`�Zr���1�4a �Յ��>e\<h�\��'�SͲ\���rx�@����x�j,��Jx��l�g�č륈){�\��n���t���;��$�rC ,��^�%����#� wh=�X��n6�e~��j_D�mn
]r��kz��@�!�`��3K�R��Ⱥ3PS��w���N"N���7�aG���$�/���5�=���w44P�1�A�#0�Q/��P$l{c��(I=�p$AZ�n�^cz��5[G{q�Khݺ���[/.~<�D�����F�j�uǕ֗`�i�H��
+�uu[�ޘ�/��s��h�>��#� a��[w\��i[��
+�O�:���l�n��Nr��o�(߱�,��_�3E�W��s<ˌ3�{+_��E�$}ʱ0�I�9#'C<�.b��P�p�������:l�!�k�$沤��@]���gM��,�)�_GZp�f�d�W���z�^	o��C�@R����7�^���]��>�:2�n �ͯЬs`Y������C�C�~D�^)�����@�-*�
� �9l�TV�	N����ϲ�]%�F(�.�I�x��"y����$@E���ڦߎ�D/��c�1G?XJmp�ɺ�({�Eu������r�,��p�Ṁ��B�nuy8^b<Z��Q���]E��\����d~����#�6?3�_A+��MW�����
��W�]�)A[f|4�bp�����G�TDRJ����M��(π��O��
+޶���ikk%��Ɋ��Yx�Pв6�|�cA
��,:���	�a�E%~�q���ށ_�a�������T�K�������"h�@l��M�<y#��t�|U��@��#����,p1���t�A��7�3$�`��
�Z�Q���p�U�Y.����p�c�?3jJoiކ8�.��Ђ夶(	�T�cr�
+��a
���]0їڗa�b���2=���n�de)W���cVկ(���N�+�x���l��%�T���dg���dW��
bVV���lg$F�A�v�N,�u���9�<_�_��.ZJ�~�	�W��v��߂L�O���]v����u�h�$	�ҵ�>�����XƤC���ŸM�-��R�l
}�q�s"y�G2�n�һ]��r��$؃W	"���ս<
+�5Ja��NT�?��0�b�^����Oh�G9'@Hj��^2�Nk:����*3���W��X��f�|����܄0}y�������ԓ`��E���u�1f��(����,��B��g�R��2\';a��R,�O�vO7C���d�!1�S�����mj��I��b�dm�B
U2��jE�8dBBͷre����!p7���@����a�
&��:����Dˠ�<��ZT*�e�����g�'��<A;@n9���T��2�g#���_��$��N����I?�=D���Ҿ�QEW i������'�7���;��u����ܞ����t��	
��� LS{�g��̙[�މ6p$Rޒy|2���P�
�zd,8�TX��L�G�^������܀�+��z�e���s3�
�R#E�T�pU���7�-D����=K�9�5�8�.�m�����c�Q��w���r�R'�� ����gY�ӯ�	��h�ʗ��v�%�;_i��˻7��MVy^��gny�3�bqvk�e�l�W�e�T�����|�@�%��E�*���A�u�G��
+B�?R>_; �z�
$�^����Aԛ���h9��x�	�,��#Wq���xপ�O�~�u��ڲ�x�vM��*ٯ�[���V�0�e�z+���k��]�4rŐe"���8.�㣏�
�6���@��P��Pض��Q^�n@D =�5*�e�\�)��
�O���/'¾O�X8�a��i+8�(3rBDA�S���cM�'���c�,�	��],�U<AXykd�O�w@4;��)��3�5��i!3�؀Q
+Q+p��;4w��ߤ=����+y�t�:���[���/F���M�AA�9��;������{-��"3=��J��0kj�?V��ց�U��c�S5$n�˥t�h�&����Ĩ#��k�����Y�1���Wy�����܋HY�	J��}�_BH
+�?��3�RI��:l��6�����Mw��0K굨��yL�_uD`5�\@��zOu�b���☐M3�Tˠ�_�ge$%�/�fň�#1�)ْ����l
�K' �&Nq݋��F�7���k����m���
$�O'�A��1��h�����;�j�Y!����*=���g��ѥk]%s()�P˫����wbW���'�.΁���R�?��1�P3��� O_)�b�'��j~<A��BE��_nрr\��%�\��6��	-u������#�h򂾧�cc!��HNˆ�%�Y����O7+�#N��ř�������w�}(X�I<���l�nY��	�,��F:�H�a�-���|��s)�
�Y#IBGૼ�RJ���
+�E�B~{�������7�������ف��n����J��
�ʲ�Z�� ��f�	�Q���G}J�G7r)1g)J���A�!����W;�6r>��fk��7*�>�f�"O����_C�sf�]�����~�)�����.q�	��1�e(-)�Y/Y)�pg@�����A�F!R�le�X}4��Im]@� �7�l��G�y�/Z
���r)e�"�C�ϤC$,C�8lCE�&45��~eF�=C�d7b}�y#ĔJJ��n�ܐ+íx1��-qv֌�rų�j`
+��
;����@�b2�S�,�?�*�)O$$O0�� �s�΂5j�@�)��ĺ229+�l���ԂYK�L�cu�@vbn���`�̀�4;E������(�3��9|�+��G�k���~�5��8�֎a��ݗ�Z��0LcPzz��K4�s��l���T�E��IR�ʆA����8A>y�-Ym�\�)8�U~m
+�jڂ���ڊ]�I��n�+��O��R�y�W��b��X�;ó�-��D��VG|�ߢ�_x��`C��5LBON/�k8�%�䞟?F��}��~v'5���:�|i���Y#Fd�G>B�s�3�����P��t�
+� ��nĿ��_��W�ޚ���	]N(����	쁉Z�_
r�ę�E['a	��#*���+���Z�K�J�yc�Ŀ����~�y�ka�
++?�b#�{sSq'UՀ�O�ؕ�>�_�X,p~3�M����@��G];$����Iw�$p���.*`��d��u���$�`q�.nE�BW�?�<����������4.A��G�7
��/

���������_PJ%�K�(���z��	�V����|:�
6{���4z	E/c���H����
���]�3�D�(�z/>N��,��ay��,VJ^q�̴��`[
+��3��QM��3��{��ײzr�T����U�2�'�u��TͿ`6J`0ώ�����>@`��*���-,c�aO�%��㬜�^�1S�8of
+�T
+�ЂMRg�Eo�E0T�8Vi�6s)�;<2w}uJ��k|� ����_����@I	��:J��k\
���4�5�����	����@)��W��ʫz�N�aF7���#T�Φ�$<҈)�w#�,ޛ|�/u����r���^�1���7X|���e��K�#�iW�섀S&���J��.Y
+��ort����&m�^'ƫ>�k��L�w�D�H�q�',��2�:#�s�R'��9,A엄�xB�ƸT���)V���i=�]��'�����Թ	��m��-J���v�}��l.T9�����
R4���L(�"�GYȡ݇zq���C���mvR��l9��"4�GA�Ο��p垭�\�P��2MD��i�7�Q�"ר���J����1�{����=�O���B�#�}��F��<�`@��������:E���w6�b�a�m-l�$�y䊎�=�v�P7^_#byY���"�ײ:j��}ư�8z����9b�b� ����3t�J;��V���D�iay��rp��:�d��M�-�Gܿ�*K�tܨN�%|��)�J"يO�u'/�1RLg-@�Eܒ�C1�Q�3��C+����}+�1��ي�=EO][N1�-nʮ
+F�}W}a�S�-bӱ�
+���������A��I������
+"1
�a��5g��&i����I���T�y�����m6%����!]��;j�I��4܊���<����5;�!{��ܶQ�^ԕyN����)��z�d��3(Uo��z\�+�D�X
+U���? ���x*�^n
+��'��}��r}	0�Ⱥ$4rP��^$�VUo�P���JұZ������z
C�W/�gf�T�[֍
+���S�k�JNt�)>�U/��r���T�q�V���F�2�ܵ�퇺�щ���V*�H;�Gxh��|I_�|۾T�hZA��{��e�˿�P���1^O��/|6#�asP��oY�3辒av�j(3d��ٚv��EWR���5�i�|��1��$@L؍Fn����wo��m��(���4ճ�����+ۿ���fAzE�4��jI�X��%>���i�%��	,�@��eF��}z�Ȅ<�Q��贂0}�+�&��u�aV,f

endstream
endobj
41 0 obj
[/ICCBased 44 0 R]
endobj
37 0 obj
<</Filter/FlateDecode/Length 1441>>stream
+H�lWI�$7��+�Tkuu��i`|�
+^=����#H*�z<hTU�R����/����O�)���k8^^O��R,�'�?�/�����Ƿ�C�_�I���Pf��M	�/_}9r�s�p��,�����RcZ��vT�c��dz����6�5�h!C��-�ٟr����Ȍe�'|���acj�J?X����H?Z�����o��'������������r,	�عf7a�Y24�u��9�^��ΐ�,x����8J�e��E�
V�'��b2���8c�aę��u� ������	n�^�K������떘k^mׁm�o���V�V2��s�,�3�6�d
�f�+��m`'��n��b	yq�C�s��%۵�hŵjp`Qᵦ!l�EE�����T3
�Ed���UR�n�_@ku'���0����y�i���̥[u�����a1b�����
h�U��Yth�!�>�;�sZ��䁈<E��zo�E�F�[f�0����p�

b�x�ҽC遼/0rZ�.d�'��*�J{VΙ��8�A����$B��(��J���V�7m=�����<3h���c/ck�m
���
�8�`��TvH�S����L�SU��x2@�nj�-7U�1��!'��M���'���	'��zvzl���G( OzG�$~c��>j�%�;���뭗G¥�lj�1�{�]t�L��6[��Wgr�+|��Qs���}X5��n�.fN!��骺4��**G����yc$R��(Y����.�fFkn7���?t�['�VAdu���|�	7[�Cģ
�N ��b�E���"ԟN6� ȣ;qq��j~�:���S�)
+�C	�rX�
��I���jݨj�kWd!���][Dr(��v�^憠��W���#�`���Tx!ԅ�,k@Ȍ�R7�C�}ej'�rA�J��g�U��,�5�|.�A�I�a��$L��}Vec+N�ֵ��&�h0�J��Vyj>����
+z�(	M�vzҙ0���E���p�~��F7ܴ: z������HH�����~x_�
�2ID��&aa_Ȫ<����ݨ
��p�+��B���K��Ģ���yå-���"�ŀ�E���L�M�E�֠�}i��M�Uq=R{��sfE]��L��m���۱6�`Mp��y�����;�-���t7	5� ��"�A5����G,D��B����BW������D��bn�nd�_�Mr��N�d��y�^�br �ռ��ҝZ��f�8�rPW�7:�B��O&+��#���[��Je�R��@�H��J
LPY�����INI���y!�@V��fʢC�/ W;�:���T����b�Ym��:���~�B������f��cC������X�P�~�s�Ƴ�v���`H�9 )ꬶ%�3�.v֟l��_�p�����gs~���>�	0���
endstream
endobj
38 0 obj
<</CS 45 0 R/I false/K false/S/Transparency>>
endobj
45 0 obj
[/ICCBased 44 0 R]
endobj
35 0 obj
<</Filter/FlateDecode/Length 263>>stream
+H�dRIn�0����iR��k� ��z���'@����v]�8CsH
ܿ��_FƗ��
����[��O��;��;c��ɳ�s�5}���d]�&�x4Q�;��K��XO�'ޒ����0h���Qp~GXC�`��Ĵ��)B�b���kD�AZ<�D��W�٪�UT�eh�\S�uު�ee��+0El��dY�-��H�؝C6R�a�$$J�꬐��z�%���3�Z}u�X����H���گsm/<]���¯Dhp�
endstream
endobj
36 0 obj
<</CS 46 0 R/I false/K false/S/Transparency>>
endobj
46 0 obj
[/ICCBased 44 0 R]
endobj
29 0 obj
<</Filter/FlateDecode/Length 312>>stream
+H��T]N�0~�)|��vҤ��:��	M q������_�ɒvq
���ؖ?�_?�}�ݍ���pF��ݤ��
^���1^�ɱ�v�%j�A���Q�u	��S?4������	��8h:Nj8K��j4����HG�s7k��p��B2@u9�@g�Ƨ�z�����@�w��Z���T�P�|M�,�$�+�
���c"G9�/����q��1��ug�,qߧn�D��a����
j��e���V��G8�7����t<^�:�*�J���*?��Lϔ4r�y¤�"�"��"�!����b����g_�
+�
endstream
endobj
30 0 obj
<</CS 47 0 R/I false/K false/S/Transparency>>
endobj
34 0 obj
<</BBox[226.98 282.558 329.502 215.751]/Group 48 0 R/Length 267/Matrix[1.0 0.0 0.0 1.0 0.0 0.0]/Resources<</ColorSpace<</CS0 31 0 R>>/ExtGState<</GS0 32 0 R>>>>/Subtype/Form>>stream
+/CS0 cs 0 0 0  scn
+/GS0 gs
+q 1 0 0 1 296.0986 282.5586 cm
+0 0 m
+-61.191 0 l
+-66.255 -9.679 -69.119 -20.689 -69.119 -32.369 c
+-69.119 -44.89 -65.828 -56.642 -60.063 -66.808 c
+0 -66.808 l
+18.448 -66.808 33.403 -51.853 33.403 -33.404 c
+33.403 -14.955 18.448 0 0 0 c
+f
+Q
+
endstream
endobj
48 0 obj
<</I false/K false/S/Transparency/Type/Group>>
endobj
33 0 obj
<</AIS false/BM/Normal/CA 0.100006/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 0.100006/op false>>
endobj
47 0 obj
[/ICCBased 44 0 R]
endobj
27 0 obj
[26 0 R]
endobj
49 0 obj
<</CreationDate(D:20201202145750-08'00')/Creator(Adobe Illustrator 25.0 \(Macintosh\))/CreatorVersion(21.0.0)/ModDate(D:20201202145750-08'00')/Producer(Adobe PDF library 15.00)/Title(Move_Logo Design_GreyScale_Digital_Final)>>
endobj
xref
+0 50
+0000000004 65535 f
+0000000016 00000 n
+0000000147 00000 n
+0000046321 00000 n
+0000000000 00000 f
+0000046393 00000 n
+0000000000 00000 f
+0000000000 00000 f
+0000052524 00000 n
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000052597 00000 n
+0000052793 00000 n
+0000053991 00000 n
+0000119579 00000 n
+0000185167 00000 n
+0000000000 00000 f
+0000046806 00000 n
+0000047194 00000 n
+0000049541 00000 n
+0000222892 00000 n
+0000047582 00000 n
+0000221751 00000 n
+0000222132 00000 n
+0000049841 00000 n
+0000049728 00000 n
+0000222734 00000 n
+0000222194 00000 n
+0000221322 00000 n
+0000221654 00000 n
+0000219714 00000 n
+0000221225 00000 n
+0000047962 00000 n
+0000049479 00000 n
+0000219679 00000 n
+0000049612 00000 n
+0000049643 00000 n
+0000049876 00000 n
+0000221287 00000 n
+0000221716 00000 n
+0000222857 00000 n
+0000222671 00000 n
+0000222917 00000 n
+trailer
<</Size 50/Root 1 0 R/Info 49 0 R/ID[<B2C155B431B84BE98C020E51F500DF03><AECE74512BE649E68CDB5AD81FCDFBC2>]>>
startxref
223160
%%EOF
\ No newline at end of file
diff --git a/assets/greyscale/JPEG/Move_Logo_Design_GreyScale_Digital_Final_1.jpg b/assets/greyscale/JPEG/Move_Logo_Design_GreyScale_Digital_Final_1.jpg
new file mode 100644
index 0000000000..db9b1bbf76
Binary files /dev/null and b/assets/greyscale/JPEG/Move_Logo_Design_GreyScale_Digital_Final_1.jpg differ
diff --git a/assets/greyscale/JPEG/Move_Logo_Design_GreyScale_Digital_Final_2.jpg b/assets/greyscale/JPEG/Move_Logo_Design_GreyScale_Digital_Final_2.jpg
new file mode 100644
index 0000000000..86ee9fc512
Binary files /dev/null and b/assets/greyscale/JPEG/Move_Logo_Design_GreyScale_Digital_Final_2.jpg differ
diff --git a/assets/greyscale/JPEG/Move_Logo_Design_GreyScale_Digital_Final_3.jpg b/assets/greyscale/JPEG/Move_Logo_Design_GreyScale_Digital_Final_3.jpg
new file mode 100644
index 0000000000..fdf0e8e404
Binary files /dev/null and b/assets/greyscale/JPEG/Move_Logo_Design_GreyScale_Digital_Final_3.jpg differ
diff --git a/assets/greyscale/JPEG/Move_Logo_Design_GreyScale_Digital_Final_4.jpg b/assets/greyscale/JPEG/Move_Logo_Design_GreyScale_Digital_Final_4.jpg
new file mode 100644
index 0000000000..64c6541164
Binary files /dev/null and b/assets/greyscale/JPEG/Move_Logo_Design_GreyScale_Digital_Final_4.jpg differ
diff --git a/assets/greyscale/PNG/Move_Logo_Design_GreyScale_Digital_Final_1.png b/assets/greyscale/PNG/Move_Logo_Design_GreyScale_Digital_Final_1.png
new file mode 100644
index 0000000000..2bcba7a740
Binary files /dev/null and b/assets/greyscale/PNG/Move_Logo_Design_GreyScale_Digital_Final_1.png differ
diff --git a/assets/greyscale/PNG/Move_Logo_Design_GreyScale_Digital_Final_2.png b/assets/greyscale/PNG/Move_Logo_Design_GreyScale_Digital_Final_2.png
new file mode 100644
index 0000000000..0d8f2b88e9
Binary files /dev/null and b/assets/greyscale/PNG/Move_Logo_Design_GreyScale_Digital_Final_2.png differ
diff --git a/assets/greyscale/PNG/Move_Logo_Design_GreyScale_Digital_Final_3.png b/assets/greyscale/PNG/Move_Logo_Design_GreyScale_Digital_Final_3.png
new file mode 100644
index 0000000000..7e5079895e
Binary files /dev/null and b/assets/greyscale/PNG/Move_Logo_Design_GreyScale_Digital_Final_3.png differ
diff --git a/assets/greyscale/SVG/Move_Logo_Design_GreyScale_Digital_Final_1.svg b/assets/greyscale/SVG/Move_Logo_Design_GreyScale_Digital_Final_1.svg
new file mode 100644
index 0000000000..4a4d4202bb
--- /dev/null
+++ b/assets/greyscale/SVG/Move_Logo_Design_GreyScale_Digital_Final_1.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 321 127" style="enable-background:new 0 0 321 127;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#333333;}
+	.st1{fill:#808080;}
+	.st2{fill:#CCCCCC;}
+</style>
+<g>
+	<g>
+		<g>
+			<path class="st0" d="M158.73,41.55l11.79,34.67h0.14l11.16-34.67h15.61v50.42h-10.38V56.24h-0.14l-12.36,35.73h-8.54
+				l-12.36-35.38h-0.14v35.38h-10.38V41.55H158.73z"/>
+			<path class="st0" d="M202.09,65.81c0.89-2.38,2.16-4.4,3.81-6.07c1.65-1.67,3.62-2.97,5.93-3.88c2.31-0.92,4.9-1.38,7.77-1.38
+				c2.87,0,5.47,0.46,7.8,1.38c2.33,0.92,4.32,2.21,5.97,3.88c1.65,1.67,2.92,3.7,3.81,6.07c0.89,2.38,1.34,5.03,1.34,7.94
+				s-0.45,5.55-1.34,7.91c-0.89,2.36-2.17,4.37-3.81,6.04c-1.65,1.67-3.64,2.95-5.97,3.85c-2.33,0.89-4.93,1.34-7.8,1.34
+				c-2.87,0-5.46-0.45-7.77-1.34c-2.31-0.89-4.28-2.18-5.93-3.85c-1.65-1.67-2.92-3.68-3.81-6.04c-0.89-2.35-1.34-4.99-1.34-7.91
+				S201.2,68.19,202.09,65.81z M211.2,78.03c0.28,1.39,0.76,2.64,1.45,3.74c0.68,1.11,1.59,1.99,2.72,2.65
+				c1.13,0.66,2.54,0.99,4.24,0.99s3.12-0.33,4.27-0.99c1.15-0.66,2.07-1.54,2.75-2.65c0.68-1.11,1.17-2.35,1.45-3.74
+				c0.28-1.39,0.42-2.81,0.42-4.27c0-1.46-0.14-2.9-0.42-4.31c-0.28-1.41-0.77-2.66-1.45-3.74c-0.68-1.08-1.6-1.97-2.75-2.65
+				c-1.16-0.68-2.58-1.02-4.27-1.02s-3.11,0.34-4.24,1.02c-1.13,0.68-2.04,1.57-2.72,2.65c-0.68,1.08-1.17,2.33-1.45,3.74
+				c-0.28,1.41-0.42,2.85-0.42,4.31C210.78,75.21,210.92,76.64,211.2,78.03z"/>
+			<path class="st0" d="M249.83,91.97l-12.5-36.51h10.52l7.7,24.93h0.14l7.7-24.93h9.96l-12.36,36.51H249.83z"/>
+			<path class="st0" d="M284.01,83.22c1.51,1.46,3.67,2.19,6.5,2.19c2.02,0,3.77-0.51,5.23-1.52c1.46-1.01,2.35-2.08,2.68-3.21h8.83
+				c-1.41,4.38-3.58,7.51-6.5,9.39c-2.92,1.88-6.45,2.82-10.59,2.82c-2.87,0-5.46-0.46-7.77-1.38c-2.31-0.92-4.26-2.22-5.86-3.92
+				c-1.6-1.69-2.84-3.72-3.71-6.07c-0.87-2.35-1.31-4.94-1.31-7.77c0-2.73,0.45-5.27,1.34-7.63c0.89-2.35,2.17-4.39,3.81-6.11
+				c1.65-1.72,3.61-3.07,5.9-4.06c2.28-0.99,4.81-1.48,7.59-1.48c3.11,0,5.81,0.6,8.12,1.8c2.3,1.2,4.2,2.81,5.68,4.84
+				c1.48,2.02,2.55,4.33,3.21,6.92c0.66,2.59,0.89,5.3,0.71,8.12h-26.34C281.67,79.4,282.5,81.76,284.01,83.22z M295.34,64.01
+				c-1.2-1.32-3.03-1.98-5.47-1.98c-1.6,0-2.93,0.27-3.99,0.81c-1.06,0.54-1.91,1.21-2.54,2.01c-0.64,0.8-1.08,1.65-1.34,2.54
+				c-0.26,0.89-0.41,1.69-0.46,2.4h16.31C297.37,67.26,296.54,65.33,295.34,64.01z"/>
+		</g>
+	</g>
+	<g>
+		<path class="st1" d="M92.45,51.5H27.74c-8.66,0-15.67,7.02-15.67,15.67v0.66c0,8.66,7.02,15.67,15.67,15.67h64.72
+			c8.66,0,15.67-7.02,15.67-15.67v-0.66C108.13,58.52,101.11,51.5,92.45,51.5z"/>
+		<ellipse transform="matrix(0.7071 -0.7071 0.7071 0.7071 -19.6954 86.451)" class="st2" cx="94.51" cy="67" rx="33.5" ry="33.5"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path class="st0" d="M-480.34-151.58c1.93,0,1.93-3,0-3C-482.28-154.58-482.28-151.58-480.34-151.58L-480.34-151.58z"/>
+	</g>
+</g>
+</svg>
diff --git a/assets/greyscale/SVG/Move_Logo_Design_GreyScale_Digital_Final_2.svg b/assets/greyscale/SVG/Move_Logo_Design_GreyScale_Digital_Final_2.svg
new file mode 100644
index 0000000000..fcebdb262d
--- /dev/null
+++ b/assets/greyscale/SVG/Move_Logo_Design_GreyScale_Digital_Final_2.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 321 127" style="enable-background:new 0 0 321 127;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#808080;}
+	.st2{fill:#CCCCCC;}
+	.st3{fill:#333333;}
+</style>
+<g>
+	<g>
+		<g>
+			<path class="st0" d="M158.73,41.55l11.79,34.67h0.14l11.16-34.67h15.61v50.42h-10.38V56.24h-0.14l-12.36,35.73h-8.54
+				l-12.36-35.38h-0.14v35.38h-10.38V41.55H158.73z"/>
+			<path class="st0" d="M202.09,65.81c0.89-2.38,2.16-4.4,3.81-6.07c1.65-1.67,3.62-2.97,5.93-3.88c2.31-0.92,4.9-1.38,7.77-1.38
+				c2.87,0,5.47,0.46,7.8,1.38c2.33,0.92,4.32,2.21,5.97,3.88c1.65,1.67,2.92,3.7,3.81,6.07c0.89,2.38,1.34,5.03,1.34,7.94
+				s-0.45,5.55-1.34,7.91c-0.89,2.36-2.17,4.37-3.81,6.04c-1.65,1.67-3.64,2.95-5.97,3.85c-2.33,0.89-4.93,1.34-7.8,1.34
+				c-2.87,0-5.46-0.45-7.77-1.34c-2.31-0.89-4.28-2.18-5.93-3.85c-1.65-1.67-2.92-3.68-3.81-6.04c-0.89-2.35-1.34-4.99-1.34-7.91
+				S201.2,68.19,202.09,65.81z M211.2,78.03c0.28,1.39,0.76,2.64,1.45,3.74c0.68,1.11,1.59,1.99,2.72,2.65
+				c1.13,0.66,2.54,0.99,4.24,0.99s3.12-0.33,4.27-0.99c1.15-0.66,2.07-1.54,2.75-2.65c0.68-1.11,1.17-2.35,1.45-3.74
+				c0.28-1.39,0.42-2.81,0.42-4.27c0-1.46-0.14-2.9-0.42-4.31c-0.28-1.41-0.77-2.66-1.45-3.74c-0.68-1.08-1.6-1.97-2.75-2.65
+				c-1.16-0.68-2.58-1.02-4.27-1.02s-3.11,0.34-4.24,1.02c-1.13,0.68-2.04,1.57-2.72,2.65c-0.68,1.08-1.17,2.33-1.45,3.74
+				c-0.28,1.41-0.42,2.85-0.42,4.31C210.78,75.21,210.92,76.64,211.2,78.03z"/>
+			<path class="st0" d="M249.83,91.97l-12.5-36.51h10.52l7.7,24.93h0.14l7.7-24.93h9.96l-12.36,36.51H249.83z"/>
+			<path class="st0" d="M284.01,83.22c1.51,1.46,3.67,2.19,6.5,2.19c2.02,0,3.77-0.51,5.23-1.52c1.46-1.01,2.35-2.08,2.68-3.21h8.83
+				c-1.41,4.38-3.58,7.51-6.5,9.39c-2.92,1.88-6.45,2.82-10.59,2.82c-2.87,0-5.46-0.46-7.77-1.38c-2.31-0.92-4.26-2.22-5.86-3.92
+				c-1.6-1.69-2.84-3.72-3.71-6.07c-0.87-2.35-1.31-4.94-1.31-7.77c0-2.73,0.45-5.27,1.34-7.63c0.89-2.35,2.17-4.39,3.81-6.11
+				c1.65-1.72,3.61-3.07,5.9-4.06c2.28-0.99,4.81-1.48,7.59-1.48c3.11,0,5.81,0.6,8.12,1.8c2.3,1.2,4.2,2.81,5.68,4.84
+				c1.48,2.02,2.55,4.33,3.21,6.92c0.66,2.59,0.89,5.3,0.71,8.12h-26.34C281.67,79.4,282.5,81.76,284.01,83.22z M295.34,64.01
+				c-1.2-1.32-3.03-1.98-5.47-1.98c-1.6,0-2.93,0.27-3.99,0.81c-1.06,0.54-1.91,1.21-2.54,2.01c-0.64,0.8-1.08,1.65-1.34,2.54
+				c-0.26,0.89-0.41,1.69-0.46,2.4h16.31C297.37,67.26,296.54,65.33,295.34,64.01z"/>
+		</g>
+	</g>
+	<g>
+		<path class="st1" d="M92.45,51.5H27.74c-8.66,0-15.67,7.02-15.67,15.67v0.66c0,8.66,7.02,15.67,15.67,15.67h64.72
+			c8.66,0,15.67-7.02,15.67-15.67v-0.66C108.13,58.52,101.11,51.5,92.45,51.5z"/>
+		<ellipse transform="matrix(0.7071 -0.7071 0.7071 0.7071 -19.6954 86.451)" class="st2" cx="94.51" cy="67" rx="33.5" ry="33.5"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path class="st3" d="M-480.34-151.58c1.93,0,1.93-3,0-3C-482.28-154.58-482.28-151.58-480.34-151.58L-480.34-151.58z"/>
+	</g>
+</g>
+</svg>
diff --git a/assets/greyscale/SVG/Move_Logo_Design_GreyScale_Digital_Final_3.svg b/assets/greyscale/SVG/Move_Logo_Design_GreyScale_Digital_Final_3.svg
new file mode 100644
index 0000000000..deedae788b
--- /dev/null
+++ b/assets/greyscale/SVG/Move_Logo_Design_GreyScale_Digital_Final_3.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 146 86" style="enable-background:new 0 0 146 86;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#808080;}
+	.st1{fill:#CCCCCC;}
+	.st2{fill:#333333;}
+</style>
+<g>
+	<g>
+		<path class="st0" d="M92.45,27.5H27.74c-8.66,0-15.67,7.02-15.67,15.67v0.66c0,8.66,7.02,15.67,15.67,15.67h64.72
+			c8.66,0,15.67-7.02,15.67-15.67v-0.66C108.13,34.52,101.11,27.5,92.45,27.5z"/>
+		<ellipse transform="matrix(0.7071 -0.7071 0.7071 0.7071 -2.7249 79.4216)" class="st1" cx="94.51" cy="43" rx="33.5" ry="33.5"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path class="st2" d="M-480.34-175.58c1.93,0,1.93-3,0-3C-482.28-178.58-482.28-175.58-480.34-175.58L-480.34-175.58z"/>
+	</g>
+</g>
+</svg>
diff --git a/devtools/x-core/Cargo.toml b/devtools/x-core/Cargo.toml
index cad7367c3a..b02bb7fe89 100644
--- a/devtools/x-core/Cargo.toml
+++ b/devtools/x-core/Cargo.toml
@@ -3,7 +3,7 @@ name = "x-core"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Core data structures used by x"
-edition = "2018"
+edition = "2021"
 publish = false
 license = "Apache-2.0"
 
@@ -14,7 +14,7 @@ determinator = "0.7.0"
 guppy = "0.12.3"
 indoc = "1.0.3"
 hex = "0.4.3"
-log = "0.4.14"
+log = "0.4.17"
 toml = "0.5.8"
 once_cell = "1.7.2"
 ouroboros = "0.9.2"
diff --git a/devtools/x-core/src/errors.rs b/devtools/x-core/src/errors.rs
index a354faf80a..ed333ff5bd 100644
--- a/devtools/x-core/src/errors.rs
+++ b/devtools/x-core/src/errors.rs
@@ -8,7 +8,7 @@ use serde::{de, ser};
 use std::{borrow::Cow, error, fmt, io, process::ExitStatus, result, str::Utf8Error};
 
 /// Type alias for the return type for `run` methods.
-pub type Result<T, E = SystemError> = result::Result<T, E>;
+pub type Result<T, E = Box<SystemError>> = result::Result<T, E>;
 
 /// A system error that happened while running a lint.
 #[derive(Debug)]
@@ -46,49 +46,49 @@ pub enum SystemError {
 }
 
 impl SystemError {
-    pub fn io(context: impl Into<Cow<'static, str>>, err: io::Error) -> Self {
-        SystemError::Io {
+    pub fn io(context: impl Into<Cow<'static, str>>, err: io::Error) -> Box<Self> {
+        Box::new(SystemError::Io {
             context: context.into(),
             err,
-        }
+        })
     }
 
-    pub fn guppy(context: impl Into<Cow<'static, str>>, err: guppy::Error) -> Self {
-        SystemError::Guppy {
+    pub fn guppy(context: impl Into<Cow<'static, str>>, err: guppy::Error) -> Box<Self> {
+        Box::new(SystemError::Guppy {
             context: context.into(),
             err,
-        }
+        })
     }
 
-    pub fn git_root(msg: impl Into<Cow<'static, str>>) -> Self {
-        SystemError::GitRoot(msg.into())
+    pub fn git_root(msg: impl Into<Cow<'static, str>>) -> Box<Self> {
+        Box::new(SystemError::GitRoot(msg.into()))
     }
 
-    pub fn from_hex(context: impl Into<Cow<'static, str>>, err: FromHexError) -> Self {
-        SystemError::FromHex {
+    pub fn from_hex(context: impl Into<Cow<'static, str>>, err: FromHexError) -> Box<Self> {
+        Box::new(SystemError::FromHex {
             context: context.into(),
             err,
-        }
+        })
     }
 
     pub fn de(
         context: impl Into<Cow<'static, str>>,
         err: impl de::Error + Send + Sync + 'static,
-    ) -> Self {
-        SystemError::Serde {
+    ) -> Box<Self> {
+        Box::new(SystemError::Serde {
             context: context.into(),
             err: Box::new(err),
-        }
+        })
     }
 
     pub fn ser(
         context: impl Into<Cow<'static, str>>,
         err: impl ser::Error + Send + Sync + 'static,
-    ) -> Self {
-        SystemError::Serde {
+    ) -> Box<Self> {
+        Box::new(SystemError::Serde {
             context: context.into(),
             err: Box::new(err),
-        }
+        })
     }
 }
 
diff --git a/devtools/x-core/src/git.rs b/devtools/x-core/src/git.rs
index 3fc03e4f33..72e791c82a 100644
--- a/devtools/x-core/src/git.rs
+++ b/devtools/x-core/src/git.rs
@@ -48,18 +48,18 @@ impl GitCli {
             let output = self
                 .git_command()
                 // The -z causes files to not be quoted, and to be separated by \0.
-                .args(&["ls-files", "-z"])
+                .args(["ls-files", "-z"])
                 .output()
                 .map_err(|err| SystemError::io("running git ls-files", err))?;
             if !output.status.success() {
-                return Err(SystemError::Exec {
+                return Err(Box::new(SystemError::Exec {
                     cmd: "git ls-files",
                     status: output.status,
-                });
+                }));
             }
 
             Utf8Paths0::from_bytes(output.stdout)
-                .map_err(|(path, err)| SystemError::NonUtf8Path { path, err })
+                .map_err(|(path, err)| Box::new(SystemError::NonUtf8Path { path, err }))
         })
     }
 
@@ -67,16 +67,16 @@ impl GitCli {
     pub fn merge_base(&self, commit_ref: &str) -> Result<GitHash> {
         let output = self
             .git_command()
-            .args(&["merge-base", "HEAD", commit_ref])
+            .args(["merge-base", "HEAD", commit_ref])
             .output()
             .map_err(|err| {
                 SystemError::io(format!("running git merge-base HEAD {}", commit_ref), err)
             })?;
         if !output.status.success() {
-            return Err(SystemError::Exec {
+            return Err(Box::new(SystemError::Exec {
                 cmd: "git merge-base",
                 status: output.status,
-            });
+            }));
         }
 
         // The output is a hex-encoded hash followed by a newline.
@@ -96,7 +96,7 @@ impl GitCli {
         diff_filter: Option<&str>,
     ) -> Result<Utf8Paths0> {
         let mut command = self.git_command();
-        command.args(&["diff", "-z", "--name-only"]);
+        command.args(["diff", "-z", "--name-only"]);
         if let Some(diff_filter) = diff_filter {
             command.arg(format!("--diff-filter={}", diff_filter));
         }
@@ -109,14 +109,14 @@ impl GitCli {
             .output()
             .map_err(|err| SystemError::io("running git diff", err))?;
         if !output.status.success() {
-            return Err(SystemError::Exec {
+            return Err(Box::new(SystemError::Exec {
                 cmd: "git diff",
                 status: output.status,
-            });
+            }));
         }
 
         Utf8Paths0::from_bytes(output.stdout)
-            .map_err(|(path, err)| SystemError::NonUtf8Path { path, err })
+            .map_err(|(path, err)| Box::new(SystemError::NonUtf8Path { path, err }))
     }
 
     /// Returns a package graph for the given commit, using a scratch repo if necessary.
@@ -139,7 +139,7 @@ impl GitCli {
         // Check that the project root and the Git root match.
         let output = self
             .git_command()
-            .args(&["rev-parse", "--show-toplevel"])
+            .args(["rev-parse", "--show-toplevel"])
             .stderr(Stdio::inherit())
             .output()
             .map_err(|err| SystemError::io("running git rev-parse --show-toplevel", err))?;
@@ -189,7 +189,7 @@ impl GitCli {
     /// performance reasons.
     fn get_or_init_scratch(&self, hash: &GitHash) -> Result<Utf8PathBuf> {
         let mut scratch_dir = self.root.join("target");
-        scratch_dir.extend(&["x-scratch", "tree"]);
+        scratch_dir.extend(["x-scratch", "tree"]);
 
         if scratch_dir.is_dir() && self.is_git_repo(&scratch_dir)? {
             debug!("Using existing scratch worktree at {}", scratch_dir,);
@@ -199,14 +199,14 @@ impl GitCli {
                 .git_command()
                 .current_dir(&scratch_dir)
                 // TODO: also git clean?
-                .args(&["reset", &format!("{:x}", hash), "--hard"])
+                .args(["reset", &format!("{:x}", hash), "--hard"])
                 .output()
                 .map_err(|err| SystemError::io("running git checkout in scratch tree", err))?;
             if !output.status.success() {
-                return Err(SystemError::Exec {
+                return Err(Box::new(SystemError::Exec {
                     cmd: "git checkout",
                     status: output.status,
-                });
+                }));
             }
         } else {
             if scratch_dir.is_dir() {
@@ -218,16 +218,16 @@ impl GitCli {
             info!("Setting up scratch worktree in {}", scratch_dir);
             let output = self
                 .git_command()
-                .args(&["worktree", "add"])
+                .args(["worktree", "add"])
                 .arg(&scratch_dir)
-                .args(&[&format!("{:x}", hash), "--detach"])
+                .args([&format!("{:x}", hash), "--detach"])
                 .output()
                 .map_err(|err| SystemError::io("running git worktree add", err))?;
             if !output.status.success() {
-                return Err(SystemError::Exec {
+                return Err(Box::new(SystemError::Exec {
                     cmd: "git worktree add",
                     status: output.status,
-                });
+                }));
             }
         }
 
@@ -240,7 +240,7 @@ impl GitCli {
         let output = self
             .git_command()
             .current_dir(dir)
-            .args(&["rev-parse", "--git-dir"])
+            .args(["rev-parse", "--git-dir"])
             .output()
             .map_err(|err| SystemError::io("checking if a directory is a git repo", err))?;
 
@@ -270,6 +270,6 @@ impl<'a, 'b> From<&'a GitHash> for Cow<'b, OsStr> {
 
 impl fmt::LowerHex for GitHash {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", hex::encode(&self.0))
+        write!(f, "{}", hex::encode(self.0))
     }
 }
diff --git a/devtools/x-core/src/lib.rs b/devtools/x-core/src/lib.rs
index 90b2b4b391..008cd63f34 100644
--- a/devtools/x-core/src/lib.rs
+++ b/devtools/x-core/src/lib.rs
@@ -39,10 +39,10 @@ impl XCoreContext {
         let current_rel_dir = match current_dir.strip_prefix(project_root) {
             Ok(rel_dir) => rel_dir.to_path_buf(),
             Err(_) => {
-                return Err(SystemError::CwdNotInProjectRoot {
+                return Err(Box::new(SystemError::CwdNotInProjectRoot {
                     current_dir,
                     project_root,
-                })
+                }))
             }
         };
         // TODO: The project root should be managed by this struct, not by the global project_root
diff --git a/devtools/x-core/src/workspace_subset.rs b/devtools/x-core/src/workspace_subset.rs
index e8b969f7fa..34dd2199df 100644
--- a/devtools/x-core/src/workspace_subset.rs
+++ b/devtools/x-core/src/workspace_subset.rs
@@ -63,7 +63,7 @@ impl<'g> WorkspaceSubsets<'g> {
                     WorkspaceSubset::new(&initial_packages, StandardFeatures::Default, &cargo_opts);
                 Ok((name.clone(), subset))
             })
-            .collect::<Result<_, _>>()?;
+            .collect::<Result<_>>()?;
 
         Ok(Self {
             default_members,
diff --git a/devtools/x-lint/Cargo.toml b/devtools/x-lint/Cargo.toml
index 4174311b85..69ddfb7c08 100644
--- a/devtools/x-lint/Cargo.toml
+++ b/devtools/x-lint/Cargo.toml
@@ -3,7 +3,7 @@ name = "x-lint"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Lint engine for x"
-edition = "2018"
+edition = "2021"
 publish = false
 license = "Apache-2.0"
 
diff --git a/devtools/x-lint/src/lib.rs b/devtools/x-lint/src/lib.rs
index 3aeea9dfeb..6c337c0c7c 100644
--- a/devtools/x-lint/src/lib.rs
+++ b/devtools/x-lint/src/lib.rs
@@ -5,7 +5,7 @@
 //! Lint engine.
 //!
 //! The overall design is generally inspired by
-//! [Arcanist](https://secure.phabricator.com/book/phabricator/article/arcanist_lint)'s lint engine.
+//! Arcanist](https://www.phacility.com/phabricator/arcanist)'s lint engine.
 
 pub mod content;
 pub mod file_path;
diff --git a/devtools/x-lint/src/runner.rs b/devtools/x-lint/src/runner.rs
index 1382f59cf0..034f9541d9 100644
--- a/devtools/x-lint/src/runner.rs
+++ b/devtools/x-lint/src/runner.rs
@@ -245,7 +245,7 @@ impl<'cfg> LintEngine<'cfg> {
         // TODO: make global exclusions configurable
         Ok(tracked_files
             .iter()
-            .filter(|f| !f.starts_with("testsuite/diem-fuzzer/artifacts/")))
+            .filter(|f| !f.starts_with("testsuite/diem-bytecode-verifier-fuzzer/artifacts/")))
     }
 }
 
diff --git a/devtools/x/Cargo.toml b/devtools/x/Cargo.toml
index 2d9c9498ea..f4a0ab058f 100644
--- a/devtools/x/Cargo.toml
+++ b/devtools/x/Cargo.toml
@@ -3,7 +3,7 @@ name = "x"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem extended cargo tasks"
-edition = "2018"
+edition = "2021"
 publish = false
 license = "Apache-2.0"
 
@@ -23,7 +23,7 @@ env_logger = "0.8.3"
 log = "0.4.14"
 chrono = "0.4.19"
 globset = "0.4.6"
-regex = "1.4.3"
+regex = "1.5.5"
 rayon = "1.5.0"
 nextest-config = { git = "https://github.com/diem/diem-devtools", rev = "f99a204e3d3f8e503d51d7df42e55c8282b59154" }
 nextest-runner = { git = "https://github.com/diem/diem-devtools", rev = "f99a204e3d3f8e503d51d7df42e55c8282b59154" }
diff --git a/devtools/x/src/cargo.rs b/devtools/x/src/cargo.rs
index c88a026dc3..e84800b9a1 100644
--- a/devtools/x/src/cargo.rs
+++ b/devtools/x/src/cargo.rs
@@ -104,13 +104,13 @@ impl Cargo {
             SelectedInclude::Workspace => {
                 self.inner.arg("--workspace");
                 for &e in &packages.excludes {
-                    self.inner.args(&["--exclude", e]);
+                    self.inner.args(["--exclude", e]);
                 }
             }
             SelectedInclude::Includes(includes) => {
                 for &p in includes {
                     if !packages.excludes.contains(p) {
-                        self.inner.args(&["--package", p]);
+                        self.inner.args(["--package", p]);
                     }
                 }
             }
@@ -326,7 +326,7 @@ impl<'a> CargoCommand<'a> {
             Ok(vec![])
         } else {
             let mut cargo = self.prepare_cargo(packages);
-            cargo.args(&["--message-format", "json-render-diagnostics"]);
+            cargo.args(["--message-format", "json-render-diagnostics"]);
             Ok(cargo.run_with_output()?)
         }
     }
diff --git a/devtools/x/src/config.rs b/devtools/x/src/config.rs
index b3b5ac8023..6f28f18bf9 100644
--- a/devtools/x/src/config.rs
+++ b/devtools/x/src/config.rs
@@ -8,7 +8,7 @@ use determinator::rules::DeterminatorRules;
 use guppy::graph::summaries::CargoOptionsSummary;
 use serde::{Deserialize, Serialize};
 use std::{
-    collections::{HashMap, HashSet},
+    collections::HashMap,
     fs,
     path::{Path, PathBuf},
 };
@@ -130,8 +130,6 @@ pub struct WorkspaceConfig {
     pub test_only: TestOnlyConfig,
     /// Exceptions to whitespace linters
     pub whitespace_exceptions: Vec<String>,
-    /// Move to Diem dependencies
-    pub move_to_diem_deps: MoveToDiemDepsConfig,
 }
 
 #[derive(Clone, Serialize, Deserialize, Debug, PartialEq, Eq)]
@@ -158,12 +156,6 @@ pub struct DirectDepDupsConfig {
     pub allow: Vec<String>,
 }
 
-#[derive(Clone, Serialize, Deserialize, Debug, PartialEq, Eq)]
-pub struct MoveToDiemDepsConfig {
-    pub diem_crates_in_language: HashSet<String>,
-    pub exclude: HashSet<String>,
-}
-
 #[derive(Clone, Serialize, Deserialize, Debug, PartialEq, Eq)]
 #[serde(rename_all = "kebab-case")]
 pub struct OverlayConfig {
diff --git a/devtools/x/src/installer.rs b/devtools/x/src/installer.rs
index ec8d5884b9..1ff62c0690 100644
--- a/devtools/x/src/installer.rs
+++ b/devtools/x/src/installer.rs
@@ -90,7 +90,7 @@ impl Installer {
 
 pub fn install_rustup_component_if_needed(name: &str) -> bool {
     let mut cmd = Command::new("rustup");
-    cmd.args(&["component", "list", "--installed"]);
+    cmd.args(["component", "list", "--installed"]);
     let result = cmd.output();
 
     let installed = if let Ok(output) = result {
@@ -103,7 +103,7 @@ pub fn install_rustup_component_if_needed(name: &str) -> bool {
     if !installed {
         info!("installing rustup component: {}", name);
         let mut cmd = Command::new("rustup");
-        cmd.args(&["component", "add", name]);
+        cmd.args(["component", "add", name]);
         if cmd.output().is_ok() {
             info!("rustup component {} has been installed", name);
         } else {
diff --git a/devtools/x/src/lint/guppy.rs b/devtools/x/src/lint/guppy.rs
index cc7e1534c3..6c8bd7f090 100644
--- a/devtools/x/src/lint/guppy.rs
+++ b/devtools/x/src/lint/guppy.rs
@@ -5,8 +5,7 @@
 //! Project and package linters that run queries on guppy.
 
 use crate::config::{
-    BannedDepsConfig, DirectDepDupsConfig, EnforcedAttributesConfig, MoveToDiemDepsConfig,
-    OverlayConfig,
+    BannedDepsConfig, DirectDepDupsConfig, EnforcedAttributesConfig, OverlayConfig,
 };
 use guppy::{
     graph::{feature::FeatureFilterFn, PackagePublish},
@@ -14,6 +13,7 @@ use guppy::{
 };
 use std::{
     collections::{BTreeMap, HashMap},
+    fmt::Write as FmtWrite,
     iter,
 };
 use x_core::{WorkspaceStatus, XCoreContext};
@@ -270,9 +270,7 @@ impl<'cfg> ProjectLinter for DirectDepDups<'cfg> {
             if versions.len() > 1 {
                 let mut msg = format!("duplicate direct dependency '{}':\n", direct_dep);
                 for (version, packages) in versions {
-                    msg.push_str(&format!("  * {} (", version));
-                    msg.push_str(&packages.join(", "));
-                    msg.push_str(")\n");
+                    writeln!(&mut msg, "  * {} ({})", version, &packages.join(", ")).unwrap();
                 }
                 out.write(LintLevel::Error, msg);
             }
@@ -361,12 +359,14 @@ impl<'cfg> PackageLinter for OverlayFeatures<'cfg> {
         if !overlays.is_empty() {
             let mut msg = "overlay features enabled by default:\n".to_string();
             for (from_feature, to_package, to_feature) in overlays {
-                msg.push_str(&format!(
-                    "  * {} -> {}/{}\n",
+                writeln!(
+                    &mut msg,
+                    "  * {} -> {}/{}",
                     feature_str(from_feature),
                     to_package,
                     feature_str(to_feature)
-                ));
+                )
+                .unwrap();
             }
             msg.push_str("Use a line in the [features] section instead.\n");
             out.write(LintLevel::Error, msg);
@@ -510,75 +510,3 @@ impl PackageLinter for CratesInCratesDirectory {
         Ok(RunStatus::Executed)
     }
 }
-
-// Ensure that Move crates do not depend on Diem crates.
-#[derive(Debug)]
-pub struct MoveCratesDontDependOnDiemCrates<'cfg> {
-    config: &'cfg MoveToDiemDepsConfig,
-}
-
-impl<'cfg> MoveCratesDontDependOnDiemCrates<'cfg> {
-    pub fn new(config: &'cfg MoveToDiemDepsConfig) -> Self {
-        Self { config }
-    }
-}
-
-impl<'cfg> Linter for MoveCratesDontDependOnDiemCrates<'cfg> {
-    fn name(&self) -> &'static str {
-        "move-crates-dont-depend-on-diem-crates"
-    }
-}
-
-impl<'cfg> PackageLinter for MoveCratesDontDependOnDiemCrates<'cfg> {
-    fn run<'l>(
-        &self,
-        ctx: &PackageContext<'l>,
-        out: &mut LintFormatter<'l, '_>,
-    ) -> Result<RunStatus<'l>> {
-        let metadata = ctx.metadata();
-
-        let crate_name = metadata.name();
-        let crate_path = metadata.source().to_string();
-
-        // Determine if a crate is considered a Move crate or Diem crate.
-        //
-        // Current criteria:
-        //   1. All crates outside language are considered Diem crates.
-        //   2. All crates inside language are considered Move crates, unless marked otherwise.
-        let is_move_crate = |crate_path: &str, crate_name: &str| {
-            if crate_path.starts_with("language/") {
-                if self.config.diem_crates_in_language.contains(crate_name) {
-                    return false;
-                }
-                return true;
-            }
-            false
-        };
-
-        if is_move_crate(&crate_path, crate_name) {
-            for direct_dep in metadata.direct_links() {
-                let dep = direct_dep.to();
-                let dep_name = dep.name();
-
-                if dep.in_workspace()
-                    && !self.config.exclude.contains(dep_name)
-                    && !is_move_crate(&dep.source().to_string(), dep_name)
-                {
-                    println!("(\"{}\", \"{}\"),", crate_name, dep_name);
-                    out.write(
-                        LintLevel::Error,
-                        format!(
-                            "depending on non-move crate `{}`\n\
-                                Note: all crates in language/ are considered Move crates by default. \
-                                If you are creating a new Diem crate in language, you need to add its name to the \
-                                diem_crates_in_language list in x.toml to make the linter recognize it.",
-                            dep_name
-                        ),
-                    );
-                }
-            }
-        }
-
-        Ok(RunStatus::Executed)
-    }
-}
diff --git a/devtools/x/src/lint/mod.rs b/devtools/x/src/lint/mod.rs
index f26f445b5c..d0fac9e655 100644
--- a/devtools/x/src/lint/mod.rs
+++ b/devtools/x/src/lint/mod.rs
@@ -37,7 +37,6 @@ pub fn run(args: Args, xctx: XContext) -> crate::Result<()> {
         &guppy::PublishedPackagesDontDependOnUnpublishedPackages::new(xctx.core()),
         &guppy::OnlyPublishToCratesIo,
         &guppy::CratesInCratesDirectory,
-        &guppy::MoveCratesDontDependOnDiemCrates::new(&workspace_config.move_to_diem_deps),
         &workspace_classify::DefaultOrTestOnly::new(
             xctx.core().package_graph()?,
             &workspace_config.test_only,
diff --git a/devtools/x/src/test.rs b/devtools/x/src/test.rs
index 1ee8d11194..ccc39df9c9 100644
--- a/devtools/x/src/test.rs
+++ b/devtools/x/src/test.rs
@@ -146,13 +146,13 @@ pub fn run(mut args: Args, xctx: XContext) -> Result<()> {
     }
 
     if let Some(html_cov_dir) = &args.html_cov_dir {
-        create_dir_all(&html_cov_dir)?;
+        create_dir_all(html_cov_dir)?;
         let html_cov_path = &html_cov_dir.canonicalize()?;
         info!("created {}", &html_cov_path.to_string_lossy());
         exec_grcov(html_cov_path, llvm_profile_path)?;
     }
     if let Some(html_lcov_dir) = &args.html_lcov_dir {
-        create_dir_all(&html_lcov_dir)?;
+        create_dir_all(html_lcov_dir)?;
         let html_lcov_path = &html_lcov_dir.canonicalize()?;
         info!("created {}", &html_lcov_path.to_string_lossy());
         exec_lcov(html_lcov_path, llvm_profile_path)?;
diff --git a/docker/move-cli/Dockerfile b/docker/move-cli/Dockerfile
index dcdb026b87..a3543ff5e6 100644
--- a/docker/move-cli/Dockerfile
+++ b/docker/move-cli/Dockerfile
@@ -20,6 +20,7 @@ ENV PATH "/opt/cargo/bin:/usr/lib/golang/bin:/opt/bin:${DOTNET_ROOT}:${DOTNET_RO
 RUN mkdir -p /github/home && \
     mkdir -p /opt/cargo/ && \
     mkdir -p /opt/git/ && \
+	sed -i -e 's/\r$//' /move/scripts/*.sh && \
     /move/scripts/dev_setup.sh -t -b -p -y -d -g -n && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
diff --git a/language/benchmarks/Cargo.toml b/language/benchmarks/Cargo.toml
index 8398914568..c2becf96cb 100644
--- a/language/benchmarks/Cargo.toml
+++ b/language/benchmarks/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
diff --git a/language/benchmarks/src/move_vm.rs b/language/benchmarks/src/move_vm.rs
index 72b4c337e0..46ac387218 100644
--- a/language/benchmarks/src/move_vm.rs
+++ b/language/benchmarks/src/move_vm.rs
@@ -12,7 +12,7 @@ use move_core_types::{
 };
 use move_vm_runtime::move_vm::MoveVM;
 use move_vm_test_utils::BlankStorage;
-use move_vm_types::gas_schedule::GasStatus;
+use move_vm_types::gas::UnmeteredGasMeter;
 use once_cell::sync::Lazy;
 use std::path::PathBuf;
 
@@ -27,6 +27,7 @@ pub fn bench<M: Measurement + 'static>(c: &mut Criterion<M>, fun: &str) {
     let modules = compile_modules();
     let move_vm = MoveVM::new(move_stdlib::natives::all_natives(
         AccountAddress::from_hex_literal("0x1").unwrap(),
+        move_stdlib::natives::GasParameters::zeros(),
     ))
     .unwrap();
     execute(c, &move_vm, modules, fun);
@@ -65,7 +66,8 @@ fn execute<M: Measurement + 'static>(
     let storage = BlankStorage::new();
     let sender = CORE_CODE_ADDRESS;
     let mut session = move_vm.new_session(&storage);
-    let mut gas_status = GasStatus::new_unmetered();
+
+    // TODO: we may want to use a real gas meter to make benchmarks more realistic.
 
     for module in modules {
         let mut mod_blob = vec![];
@@ -73,7 +75,7 @@ fn execute<M: Measurement + 'static>(
             .serialize(&mut mod_blob)
             .expect("Module serialization error");
         session
-            .publish_module(mod_blob, sender, &mut gas_status)
+            .publish_module(mod_blob, sender, &mut UnmeteredGasMeter)
             .expect("Module must load");
     }
 
@@ -90,7 +92,7 @@ fn execute<M: Measurement + 'static>(
                     fun_name,
                     vec![],
                     Vec::<Vec<u8>>::new(),
-                    &mut gas_status,
+                    &mut UnmeteredGasMeter,
                 )
                 .unwrap_or_else(|err| {
                     panic!(
diff --git a/language/changes/4-unit-testing.md b/language/changes/4-unit-testing.md
index ef622fd8c5..464d1ce30c 100644
--- a/language/changes/4-unit-testing.md
+++ b/language/changes/4-unit-testing.md
@@ -112,7 +112,7 @@ $ cargo run --bin move-unit-test <move_file_or_dir_containing_move_modules_1> ..
 
 When running tests, every test will either `PASS`, `FAIL`, or `TIMEOUT`. If a test case fails, the location of the failure along with the function name that caused the failure will be reported if possible. You can see an example of this below.
 
-A test will be marked as timing out if it exceeds the maximum number of instructions that can be executed for any single test. This bound can be changed using the options below, and its default value is set to 5000 instructions. Additionally, while the result of a test is always deterministic, tests are run in parallel by default, so the ordering of test results in a test run is non-deterministic unless running with only one thread (see `OPTIONS` below).
+A test will be marked as timing out if it exceeds the maximum gas that can be executed for any single test. When a gas table is not provided, each bytecode instruction is assigned a gas cost of 1 unit. This bound can be changed using the options below, and its default value is set to 5000 gas units. Additionally, while the result of a test is always deterministic, tests are run in parallel by default, so the ordering of test results in a test run is non-deterministic unless running with only one thread (see `OPTIONS` below).
 
 There are also a number of options that can be passed to the unit testing binary to fine-tune testing, and to help debug failing tests. These are:
 
@@ -129,7 +129,7 @@ FLAGS:
 
 OPTIONS:
     -f, --filter <filter>                A filter string to determine which unit tests to run
-    -i, --instructions <instructions>    Bound the number of Move bytecode instructions that can be executed by any one test [default: 5000]
+    -i, --gas_limit <gas_limit>          Bound the amount of gas used by any one test. [default: 1_000_000]
     -t, --threads <num_threads>          Number of threads to use for running tests [default: 8]
 
 ARGS:
@@ -215,8 +215,8 @@ Running Move unit tests
 Test result: OK. Total tests: 2; passed: 2; failed: 0
 ```
 
-#### `-i <bound>` or `--instructions <bound>`
-This bounds the number of instructions that can be executed for any one test to `<bound>`:
+#### `-i <bound>` or `--gas_limit <bound>`
+This bounds the amount of gas that can be consumed for any one test to `<bound>`:
 
 ```
 cargo run --bin move-unit-test <dir> -i 0 MyModule.move
@@ -247,7 +247,7 @@ Test result: FAILED. Total tests: 3; passed: 0; failed: 3
 ```
 
 #### `-s` or `--statistics`
-With these flags you can gather statistics about the tests run and report the runtime and instructions executed for each test. For example, if we wanted to see the statistics for the tests in the `MyModule` example above:
+With these flags you can gather statistics about the tests run and report the runtime and gas used for each test. For example, if we wanted to see the statistics for the tests in the `MyModule` example above:
 
 ```
 $ cargo run --bin move-unit-test MyModule.move -s
@@ -259,7 +259,7 @@ Running tests
 Test Statistics:
 
 ┌───────────────────────────────────────────────┬────────────┬───────────────────────────┐
-│                   Test Name                   │    Time    │   Instructions Executed   │
+│                   Test Name                   │    Time    │   Gas Used   │
 ├───────────────────────────────────────────────┼────────────┼───────────────────────────┤
 │ 0x1::MyModule::make_sure_non_zero_coin_passes │   0.005    │             1             │
 ├───────────────────────────────────────────────┼────────────┼───────────────────────────┤
diff --git a/language/changes/7-packages.md b/language/changes/7-packages.md
index 9ddf636428..dae0e71799 100644
--- a/language/changes/7-packages.md
+++ b/language/changes/7-packages.md
@@ -267,10 +267,10 @@ NamedAddr = "0xC0FFEE"
 ## Usage, Artifacts, and Data Structures
 
 The Move package system comes with a command line option as part of the Move
-CLI `move package <package_flags> <command> <command_flags>`. Unless a
+CLI `move <flags> <command> <command_flags>`. Unless a
 particular path is provided, all package commands will run in the current working
-directory. The full list of commands and flags for the Move Package CLI can be found by
-running `move package --help`.
+directory. The full list of commands and flags for the Move CLI can be found by
+running `move --help`.
 
 ### Usage
 
diff --git a/language/documentation/book/book.toml b/language/documentation/book/book.toml
new file mode 100644
index 0000000000..8ead41f879
--- /dev/null
+++ b/language/documentation/book/book.toml
@@ -0,0 +1,12 @@
+[book]
+title = "The Move Book"
+description = "Move book maintained by the Move core team."
+authors = ["The Move Contributors"]
+language = "en"
+multilingual = false
+src = "src"
+
+[output.html]
+git-repository-url = "https://github.com/move-language/move"
+git-repository-icon = "fa-github"
+edit-url-template = "https://github.com/move-language/move/edit/main/language/documentation/book/{path}"
diff --git a/language/documentation/book/src/abilities.md b/language/documentation/book/src/abilities.md
index 8d3c2f9b5a..827147b4e8 100644
--- a/language/documentation/book/src/abilities.md
+++ b/language/documentation/book/src/abilities.md
@@ -49,9 +49,9 @@ If a value has `key`, all values contained inside of that value have `store`. Th
 
 ## Builtin Types
 
-Most primitive, builtin types have `copy`, `drop`, and `store` with the exception of `signer`, which just has `store`
+Most primitive, builtin types have `copy`, `drop`, and `store` with the exception of `signer`, which just has `drop`
 
-* `bool`, `u8`, `u64`, `u128`, and `address` all have `copy`, `drop`, and `store`.
+* `bool`, `u8`, `u16`, `u32`, `u64`, `u128`, `u256`, and `address` all have `copy`, `drop`, and `store`.
 * `signer` has `drop`
     * Cannot be copied and cannot be put into global storage
 * `vector<T>` may have `copy`, `drop`, and `store` depending on the abilities of `T`.
@@ -135,7 +135,7 @@ Here are examples for this conditional system for each ability:
 
 ### Example: conditional `copy`
 
-```
+```move
 struct NoAbilities {}
 struct S has copy, drop { f: bool }
 struct Cup<T> has copy, drop, store { item: T }
@@ -160,7 +160,7 @@ fun invalid(c_account: Cup<signer>, c_n: Cup<NoAbilities>) {
 
 ### Example: conditional `drop`
 
-```
+```move
 struct NoAbilities {}
 struct S has copy, drop { f: bool }
 struct Cup<T> has copy, drop, store { item: T }
@@ -187,7 +187,7 @@ fun invalid_unused() {
 
 fun invalid_left_in_local(): u64 {
     let n = Cup<NoAbilities> { item: NoAbilities {}};
-    // Invalid return: 'c_n' has a value
+    // Invalid return: 'n' has a value
     // and 'Cup<NoAbilities>' does not have 'drop'
     0
 }
@@ -195,7 +195,7 @@ fun invalid_left_in_local(): u64 {
 
 ### Example: conditional `store`
 
-```
+```move
 struct Cup<T> has copy, drop, store { item: T }
 
 // 'MyInnerResource' is declared with 'store' so all fields need 'store'
@@ -214,7 +214,7 @@ struct MyResource has key {
 
 ### Example: conditional `key`
 
-```
+```move
 struct NoAbilities {}
 struct MyResource<T> has key { f: T }
 
diff --git a/language/documentation/book/src/abort-and-assert.md b/language/documentation/book/src/abort-and-assert.md
index 87ed86bafb..ce3e87478e 100644
--- a/language/documentation/book/src/abort-and-assert.md
+++ b/language/documentation/book/src/abort-and-assert.md
@@ -205,4 +205,3 @@ let b =
     else abort 42;
 //       ^^^^^^^^ `abort 42` has type `bool`
 ```
-````
diff --git a/language/documentation/book/src/address.md b/language/documentation/book/src/address.md
index 73753bcd1a..88d8b3f5e8 100644
--- a/language/documentation/book/src/address.md
+++ b/language/documentation/book/src/address.md
@@ -16,7 +16,7 @@ literals.
 
 To distinguish when an address is being used in an expression context or not, the
 syntax when using an address differs depending on the context where it's used:
-* When an address is used as an expression the address must be prefixed by the `@` character, i.e., `@`[`<numerical_value>`](./integers.md)` or `@<named_address_identifier>`.
+* When an address is used as an expression the address must be prefixed by the `@` character, i.e., [`@<numerical_value>`](./integers.md) or `@<named_address_identifier>`.
 * Outside of expression contexts, the address may be written without the leading `@` character, i.e., [`<numerical_value>`](./integers.md) or `<named_address_identifier>`.
 
 In general, you can think of `@` as an operator that takes an address from being a namespace item to being an expression item.
diff --git a/language/documentation/book/src/coding-conventions.md b/language/documentation/book/src/coding-conventions.md
index dc305bd5ac..caea845e41 100644
--- a/language/documentation/book/src/coding-conventions.md
+++ b/language/documentation/book/src/coding-conventions.md
@@ -4,14 +4,15 @@ This section lays out some basic coding conventions for Move that the Move team
 
 ## Naming
 
-- **Module names**: should be lower snake case, e.g., `fixed_point32`, `vector`
-- **Type names**: should be camel case if they are not a native type, e.g., `Coin`, `RoleId`
-- **Function names**: should be lower snake case, e.g., `destroy_empty`
-- **Constant names**: should be upper snake case, e.g., `REQUIRES_CAPABILITY`
-- Generic types should be descriptive, or anti-descriptive where appropriate, e.g., `T` or `Element` for the Vector generic type parameter. Most of the time the "main" type in a module should be the same name as the module e.g., `option::Option`, `fixed_point32::FixedPoint32`.
-- **Module file names**: should be the same as the module name e.g., `Option.move`
+- **Module names**: should be lower snake case, e.g., `fixed_point32`, `vector`.
+- **Type names**: should be camel case if they are not a native type, e.g., `Coin`, `RoleId`.
+- **Function names**: should be lower snake case, e.g., `destroy_empty`.
+- **Constant names**: should be upper camel case and begin with an `E` if they represent error codes (e.g., `EIndexOutOfBounds`) and upper snake case if they represent a non-error value (e.g., `MIN_STAKE`).
+-
+- **Generic type names**: should be descriptive, or anti-descriptive where appropriate, e.g., `T` or `Element` for the Vector generic type parameter. Most of the time the "main" type in a module should be the same name as the module e.g., `option::Option`, `fixed_point32::FixedPoint32`.
+- **Module file names**: should be the same as the module name e.g., `Option.move`.
 - **Script file names**: should be lower snake case and should match the name of the “main” function in the script.
-- **Mixed file names**: If the file contains multiple modules and/or scripts, the file name should be lower_snake_case, where the name does not match any particular module/script inside.
+- **Mixed file names**: If the file contains multiple modules and/or scripts, the file name should be lower snake case, where the name does not match any particular module/script inside.
 
 ## Imports
 
@@ -19,9 +20,9 @@ This section lays out some basic coding conventions for Move that the Move team
 - Functions should be imported and used fully qualified from the module in which they are declared, and not imported at the top level.
 - Types should be imported at the top-level. Where there are name clashes, `as` should be used to rename the type locally as appropriate.
 
-For example, if there is a module
+For example, if there is a module:
 
-```move=
+```move
 module 0x1::foo {
     struct Foo { }
     const CONST_FOO: u64 = 0;
@@ -32,7 +33,7 @@ module 0x1::foo {
 
 this would be imported and used as:
 
-```move=
+```move
 module 0x1::bar {
     use 0x1::foo::{Self, Foo};
 
@@ -49,7 +50,7 @@ module 0x1::bar {
 
 And, if there is a local name-clash when importing two modules:
 
-```move=
+```move
 module other_foo {
     struct Foo {}
     ...
@@ -58,19 +59,19 @@ module other_foo {
 module 0x1::importer {
     use 0x1::other_foo::Foo as OtherFoo;
     use 0x1::foo::Foo;
-....
+    ...
 }
 ```
 
 ## Comments
 
-- Each module, struct, and public function declaration should be commented
-- Move has doc comments `///`, regular single-line comments `//`, block comments `/* */`, and block doc comments `/** */`
+- Each module, struct, and public function declaration should be commented.
+- Move has doc comments `///`, regular single-line comments `//`, block comments `/* */`, and block doc comments `/** */`.
 
 ## Formatting
 
 The Move team plans to write an autoformatter to enforce formatting conventions. However, in the meantime:
 
-- Four space indentation should be used except for `script` and `address` blocks whose contents should not be indented
-- Lines should be broken if they are longer than 100 characters
-- Structs and constants should be declared before all functions in a module
+- Four space indentation should be used except for `script` and `address` blocks whose contents should not be indented.
+- Lines should be broken if they are longer than 100 characters.
+- Structs and constants should be declared before all functions in a module.
diff --git a/language/documentation/book/src/constants.md b/language/documentation/book/src/constants.md
index 050fc5a147..c59f0107c5 100644
--- a/language/documentation/book/src/constants.md
+++ b/language/documentation/book/src/constants.md
@@ -65,7 +65,7 @@ module.
 
 ## Valid Expressions
 
-Currently, constants are limited to the primitive types `bool`, `u8`, `u64`, `u128`, `address`, and
+Currently, constants are limited to the primitive types `bool`, `u8`, `u16`, `u32`, `u64`, `u128`, `u256`, `address`, and
 `vector<u8>`. Future support for other `vector` values (besides the "string"-style literals) will
 come later.
 
@@ -95,6 +95,7 @@ const SHIFTY: u8 = {
   (1 << 1) * (1 << 2) * (1 << 3) * (1 << 4)
 };
 const HALF_MAX: u128 = 340282366920938463463374607431768211455 / 2;
+const REM: u256 = 57896044618658097711785492504343953926634992332820282019728792003956564819968 % 654321;
 const EQUAL: bool = 1 == 1;
 ```
 
diff --git a/language/documentation/book/src/functions.md b/language/documentation/book/src/functions.md
index 5ced412477..9515b2d87f 100644
--- a/language/documentation/book/src/functions.md
+++ b/language/documentation/book/src/functions.md
@@ -187,6 +187,7 @@ Function names can start with letters `a` to `z` or letters `A` to `Z`. After th
 fun FOO() {}
 fun bar_42() {}
 fun _bAZ19() {}
+    ^^^^^^ Invalid function name '_bAZ19'. Function names cannot start with '_'
 ```
 
 ### Type Parameters
@@ -322,13 +323,13 @@ fun zero(): u64 { 0 }
 
 Here `: u64` indicates that the function's return type is `u64`.
 
-Using tuples, a function can return multiple values
+Using tuples, a function can return multiple values:
 
 ```move
 fun one_two_three(): (u64, u64, u64) { (0, 1, 2) }
 ```
 
-If no return type is specified, the function has an implicit return type of unit `()`. These functions are equivalent
+If no return type is specified, the function has an implicit return type of unit `()`. These functions are equivalent:
 
 ```move
 fun just_unit(): () { () }
@@ -336,9 +337,9 @@ fun just_unit() { () }
 fun just_unit() { }
 ```
 
-`script` functions must have a return type of unit `()`
+`script` functions must have a return type of unit `()`:
 
-```move=
+```move
 script {
     fun do_nothing() {
     }
diff --git a/language/documentation/book/src/generics.md b/language/documentation/book/src/generics.md
index d74ffd9401..9377c498f0 100644
--- a/language/documentation/book/src/generics.md
+++ b/language/documentation/book/src/generics.md
@@ -34,7 +34,7 @@ struct Bar<T1, T2> has copy, drop {
 }
 ```
 
-[Note that type parameters do not have to be used](#unused-type-parameters)
+Note that [type parameters do not have to be used](#unused-type-parameters)
 
 ## Type Arguments
 
@@ -42,7 +42,7 @@ struct Bar<T1, T2> has copy, drop {
 
 When calling a generic function, one can specify the type arguments for the function's type parameters in a list enclosed by a pair of angle brackets.
 
-```move=
+```move
 fun foo() {
     let x = id<bool>(true);
 }
@@ -54,7 +54,7 @@ If you do not specify the type arguments, Move's [type inference](#type-inferenc
 
 Similarly, one can attach a list of type arguments for the struct's type parameters when constructing or destructing values of generic types.
 
-```move=
+```move
 fun foo() {
     let foo = Foo<bool> { x: true };
     let Foo<bool> { x } = foo;
@@ -65,17 +65,17 @@ If you do not specify the type arguments, Move's [type inference](#type-inferenc
 
 ### Type Argument Mismatch
 
-If you specify the type arguments and they conflict with the actual values supplied, an error will be given
+If you specify the type arguments and they conflict with the actual values supplied, an error will be given:
 
-```move=
+```move
 fun foo() {
     let x = id<u64>(true); // error! true is not a u64
 }
 ```
 
-and similarly
+and similarly:
 
-```move=
+```move
 fun foo() {
     let foo = Foo<bool> { x: 0 }; // error! 0 is not a bool
     let Foo<address> { x } = foo; // error! bool is incompatible with address
@@ -84,9 +84,9 @@ fun foo() {
 
 ## Type Inference
 
-In most cases, the Move compiler will be able to infer the type arguments so you don't have to write them down explicitly. Here's what the examples above would look like if we omit the type arguments.
+In most cases, the Move compiler will be able to infer the type arguments so you don't have to write them down explicitly. Here's what the examples above would look like if we omit the type arguments:
 
-```move=
+```move
 fun foo() {
     let x = id(true);
     //        ^ <bool> is inferred
@@ -101,7 +101,7 @@ fun foo() {
 
 Note: when the compiler is unable to infer the types, you'll need annotate them manually. A common scenario is to call a function with type parameters appearing only at return positions.
 
-```move=
+```move
 address 0x2 {
 module m {
     using std::vector;
@@ -117,9 +117,9 @@ module m {
 }
 ```
 
-However, the compiler will be able to infer the type if that return value is used later in that function
+However, the compiler will be able to infer the type if that return value is used later in that function:
 
-```move=
+```move
 address 0x2 {
 module m {
     using std::vector;
@@ -141,7 +141,7 @@ does not appear in any field defined in the struct,
 but is checked statically at compile time.
 Move allows unused type parameters so the following struct definition is valid:
 
-```move=
+```move
 struct Foo<T> {
     foo: u64
 }
@@ -149,7 +149,7 @@ struct Foo<T> {
 
 This can be convenient when modeling certain concepts. Here is an example:
 
-```move=
+```move
 address 0x2 {
 module m {
     // Currency Specifiers
@@ -214,9 +214,9 @@ In this way,
 arguments to phantom type parameters are not considered when deriving the abilities for generic types,
 thus avoiding the need for spurious ability annotations.
 For this relaxed rule to be sound,
-Move's type system guarantees that a parameter declared as phantom is either
+Move's type system guarantees that a parameter declared as `phantom` is either
 not used at all in the struct definition, or
-it is only used as an argument to type parameters also declared as phantom.
+it is only used as an argument to type parameters also declared as `phantom`.
 
 #### Declaration
 
@@ -239,7 +239,7 @@ In the first one,
 the parameter `T1` is not used at all inside the struct definition.
 In the second one, the parameter `T1` is only used as an argument to a phantom type parameter.
 
-```move=
+```move
 struct S1<phantom T1, T2> { f: u64 }
                   ^^
                   Ok: T1 does not appear inside the struct definition
@@ -252,7 +252,7 @@ struct S2<phantom T1, T2> { f: S1<T1, T2> }
 
 The following code shows examples of violations of the rule:
 
-```move=
+```move
 struct S1<phantom T> { f: T }
                           ^
                           Error: Not a phantom position
@@ -264,22 +264,21 @@ struct S3<phantom T> { f: S2<T> }
                              Error: Not a phantom position
 ```
 
-
 #### Instantiation
 
 When instantiating a struct,
 the arguments to phantom parameters are excluded when deriving the struct abilities.
 For example, consider the following code:
 
-```move=
+```move
 struct S<T1, phantom T2> has copy { f: T1 }
 struct NoCopy {}
 struct HasCopy has copy {}
 ```
 
 Consider now the type `S<HasCopy, NoCopy>`.
-Since `S` is defined with `copy` and all non-phantom arguments have copy
-then `S<HasCopy, NoCopy>` also has copy.
+Since `S` is defined with `copy` and all non-phantom arguments have `copy`
+then `S<HasCopy, NoCopy>` also has `copy`.
 
 #### Phantom Type Parameters with Ability Constraints
 
@@ -290,7 +289,7 @@ the type argument has to satisfy that constraint,
 even though the parameter is phantom.
 For example, the following definition is perfectly valid:
 
-```move=
+```move
 struct S<phantom T: copy> {}
 ```
 
@@ -306,12 +305,12 @@ This is where constraints come into play: they offer a way to specify what prope
 
 Constraints can be imposed on type parameters using the following syntax.
 
-```move=
+```move
 // T is the name of the type parameter
 T: <ability> (+ <ability>)*
 ```
 
-The `<ability>` can be any of the four [abilities](./abilities.md), and a type parameter can be constrained with multiple [abilities](./abilities.md) at once. So all of the following would be valid type parameter declarations
+The `<ability>` can be any of the four [abilities](./abilities.md), and a type parameter can be constrained with multiple abilities at once. So all of the following would be valid type parameter declarations:
 
 ```move
 T: copy
@@ -323,7 +322,7 @@ T: copy + drop + store + key
 
 Constraints are checked at call sites so the following code won't compile.
 
-```move=
+```move
 struct Foo<T: key> { x: T }
 
 struct Bar { x: Foo<u8> }
@@ -333,7 +332,7 @@ struct Baz<T> { x: Foo<T> }
 //                     ^ error! T does not have 'key'
 ```
 
-```move=
+```move
 struct R {}
 
 fun unsafe_consume<T>(x: T) {
@@ -352,7 +351,7 @@ fun foo() {
 }
 ```
 
-```move=
+```move
 struct R {}
 
 fun unsafe_double<T>(x: T) {
@@ -367,11 +366,11 @@ fun double<T: copy>(x: T) {
 fun foo(): (R, R) {
     let r = R {};
     double<R>(r)
-    //     ^ error! R does not have copy
+    //     ^ error! R does not have 'copy'
 }
 ```
 
-For more information, see the abilities section on [conditional abilities and generic types](./abilities.html#conditional-abilities-and-generic-types)
+For more information, see the abilities section on [conditional abilities and generic types](./abilities.html#conditional-abilities-and-generic-types).
 
 ## Limitations on Recursions
 
@@ -379,7 +378,7 @@ For more information, see the abilities section on [conditional abilities and ge
 
 Generic structs can not contain fields of the same type, either directly or indirectly, even with different type arguments. All of the following struct definitions are invalid:
 
-```move=
+```move
 struct Foo<T> {
     x: Foo<u64> // error! 'Foo' containing 'Foo'
 }
@@ -405,7 +404,7 @@ Move allows generic functions to be called recursively. However, when used in co
 
 Allowed:
 
-```move=
+```move
 address 0x2 {
 module m {
     struct A<T> {}
@@ -427,7 +426,7 @@ module m {
 
 Not allowed:
 
-```move=
+```move
 address 0x2 {
 module m {
     struct A<T> {}
@@ -442,7 +441,7 @@ module m {
 }
 ```
 
-```move=
+```move
 address 0x2 {
 module n {
     struct A<T> {}
@@ -466,7 +465,7 @@ module n {
 
 Note, the check for type level recursions is based on a conservative analysis on the call sites and does NOT take control flow or runtime values into account.
 
-```move=
+```move
 address 0x2 {
 module m {
     struct A<T> {}
diff --git a/language/documentation/book/src/global-storage-structure.md b/language/documentation/book/src/global-storage-structure.md
index 83cf8a2ea0..dc624e60c9 100644
--- a/language/documentation/book/src/global-storage-structure.md
+++ b/language/documentation/book/src/global-storage-structure.md
@@ -2,7 +2,7 @@
 
 The purpose of Move programs is to [read from and write to](./global-storage-operators.md) tree-shaped persistent global storage. Programs cannot access the filesystem, network, or any other data outside of this tree.
 
-In pseudocode, the global storage looks something like
+In pseudocode, the global storage looks something like:
 
 ```move
 struct GlobalStorage {
diff --git a/language/documentation/book/src/integers.md b/language/documentation/book/src/integers.md
index a78f1a8668..4864d2effc 100644
--- a/language/documentation/book/src/integers.md
+++ b/language/documentation/book/src/integers.md
@@ -1,17 +1,22 @@
 # Integers
 
-Move supports three unsigned integer types: `u8`, `u64`, and `u128`. Values of these types range from 0 to a maximum that depends on the size of the type.
+Move supports six unsigned integer types: `u8`, `u16`, `u32`, `u64`, `u128`, and `u256`. Values of these types range from 0 to a maximum that depends on the size of the type.
 
 | Type                             | Value Range              |
 | -------------------------------- | ------------------------ |
 | Unsigned 8-bit integer, `u8`     | 0 to 2<sup>8</sup> - 1   |
+| Unsigned 16-bit integer, `u16`   | 0 to 2<sup>16</sup> - 1  |
+| Unsigned 32-bit integer, `u32`   | 0 to 2<sup>32</sup> - 1  |
 | Unsigned 64-bit integer, `u64`   | 0 to 2<sup>64</sup> - 1  |
 | Unsigned 128-bit integer, `u128` | 0 to 2<sup>128</sup> - 1 |
+| Unsigned 256-bit integer, `u256` | 0 to 2<sup>256</sup> - 1 |
 
 ## Literals
 
 Literal values for these types are specified either as a sequence of digits (e.g.,`112`) or as hex literals, e.g., `0xFF`. The type of the literal can optionally be added as a suffix, e.g., `112u8`. If the type is not specified, the compiler will try to infer the type from the context where the literal is used. If the type cannot be inferred, it is assumed to be `u64`.
 
+Number literals can be separated by underscores for grouping and readability. (e.g.,`1_234_5678`, `1_000u128`, `0xAB_CD_12_35`).
+
 If a literal is too large for its specified (or inferred) size range, an error is reported.
 
 ### Examples
@@ -19,32 +24,42 @@ If a literal is too large for its specified (or inferred) size range, an error i
 ```move
 // literals with explicit annotations;
 let explicit_u8 = 1u8;
+let explicit_u16 = 1u16;
+let explicit_u32 = 1u32;
 let explicit_u64 = 2u64;
 let explicit_u128 = 3u128;
+let explicit_u256 = 1u256;
+let explicit_u64_underscored = 154_322_973u64;
 
 // literals with simple inference
 let simple_u8: u8 = 1;
+let simple_u16: u16 = 1;
+let simple_u32: u32 = 1;
 let simple_u64: u64 = 2;
 let simple_u128: u128 = 3;
+let simple_u256: u256 = 1;
 
 // literals with more complex inference
 let complex_u8 = 1; // inferred: u8
 // right hand argument to shift must be u8
 let _unused = 10 << complex_u8;
 
-let x: u8 = 0;
+let x: u8 = 38;
 let complex_u8 = 2; // inferred: u8
 // arguments to `+` must have the same type
 let _unused = x + complex_u8;
 
-let complex_u128 = 3; // inferred: u128
+let complex_u128 = 133_876; // inferred: u128
 // inferred from function argument type
 function_that_takes_u128(complex_u128);
 
 // literals can be written in hex
 let hex_u8: u8 = 0x1;
+let hex_u16: u16 = 0x1BAE;
+let hex_u32: u32 = 0xDEAD80;
 let hex_u64: u64 = 0xCAFE;
 let hex_u128: u128 = 0xDEADBEEF;
+let hex_u256: u256 = 0x1123_456A_BCDE_F;
 ```
 
 ## Operations
@@ -63,24 +78,23 @@ All arithmetic operations abort instead of behaving in a way that mathematical i
 | `%` | modular division | The divisor is `0`
 | `/` | truncating division | The divisor is `0`
 
-
 ### Bitwise
 
 The integer types support the following bitwise operations that treat each number as a series of individual bits, either 0 or 1, instead of as numerical integer values.
 
 Bitwise operations do not abort.
 
-| Syntax | Operation  | Description
-|--------|------------|------------
-| `&`    | bitwise and| Performs a boolean and for each bit pairwise
-| `|`   | bitwise or | Performs a boolean or for each bit pairwise
-| `^`    | bitwise xor| Performs a boolean exclusive or for each bit pairwise
+| Syntax              | Operation   | Description                                           |
+|---------------------|-------------|-------------------------------------------------------|
+| `&`                 | bitwise and | Performs a boolean and for each bit pairwise          |
+| <code>&#124;</code> | bitwise or  | Performs a boolean or for each bit pairwise           |
+| `^`                 | bitwise xor | Performs a boolean exclusive or for each bit pairwise |
 
 ### Bit Shifts
 
 Similar to the bitwise operations, each integer type supports bit shifts. But unlike the other operations, the righthand side operand (how many bits to shift by) must *always* be a `u8` and need not match the left side operand (the number you are shifting).
 
-Bit shifts can abort if the number of bits to shift by is greater than or equal to `8`, `64`, or `128` for `u8`, `u64`, and `u128` respectively.
+Bit shifts can abort if the number of bits to shift by is greater than or equal to `8`, `16`, `32`, `64`, `128` or `256` for `u8`, `u16`, `u32`, `u64`, `u128` and `u256` respectively.
 
 | Syntax | Operation  | Aborts if
 |--------|------------|----------
@@ -123,13 +137,16 @@ Casts *do not* truncate. Casting will abort if the result is too large for the s
 |------------|---------------------------------------------------------------------------------|---------------------------------------
 | `(e as T)`| Cast integer expression `e` into an integer type `T` | `e` is too large to represent as a `T`
 
-Here, the type of `e` must be `u8`, `u64`, or `u128` and `T` must be `u8`, `u64`, or `u128`.
+Here, the type of `e` must be `8`, `16`, `32`, `64`, `128` or `256` and `T` must be `u8`, `u16`, `u32`, `u64`, `u128` oe `u256`.
 
 For example:
 
 - `(x as u8)`
+- `(y as u16)`
+- `(873u16 as u32)`
 - `(2u8 as u64)`
 - `(1 + 3 as u128)`
+- `(4/2 + 12345 as u256)`
 
 ## Ownership
 
diff --git a/language/documentation/book/src/introduction.md b/language/documentation/book/src/introduction.md
index 997ea0ab05..c2417c517b 100644
--- a/language/documentation/book/src/introduction.md
+++ b/language/documentation/book/src/introduction.md
@@ -8,8 +8,6 @@ Move takes its cue from [Rust](https://www.rust-lang.org/) by using resource typ
 
 Move was designed and created as a secure, verified, yet flexible programming language. The first use of Move is for the implementation of the Diem blockchain. That said, the language is still evolving. Move has the potential to be a language for other blockchains, and even non-blockchain use cases as well.
 
-Given custom Move modules will not be supported at the [launch](https://diem.com/white-paper/#whats-next) of the Diem Payment Network (DPN), we are targeting an early Move Developer persona.
-
 The early Move Developer is one with some programming experience, who wants to begin understanding the core programming language and see examples of its usage.
 
 ### Hobbyists
diff --git a/language/documentation/book/src/modules-and-scripts.md b/language/documentation/book/src/modules-and-scripts.md
index 8705991591..f3580e4ded 100644
--- a/language/documentation/book/src/modules-and-scripts.md
+++ b/language/documentation/book/src/modules-and-scripts.md
@@ -18,14 +18,14 @@ script {
 }
 ```
 
-A `script` block must start with all of its [use](./uses.md) declarations, followed by any [constants](./constants.md) and (finally) the main
+A `script` block must start with all of its [`use`](./uses.md) declarations, followed by any [constants](./constants.md) and (finally) the main
 [function](./functions.md) declaration.
 The main function can have any name (i.e., it need not be called `main`), is the only function in a script block, can have any number of
 arguments, and must not return a value. Here is an example with each of these components:
 
 ```move
 script {
-    // Import the Debug module published at the named account address std.
+    // Import the debug module published at the named account address std.
     use std::debug;
 
     const ONE: u64 = 1;
@@ -41,7 +41,7 @@ Scripts have very limited power—they cannot declare friends, struct types or a
 
 ### Modules
 
-A Module has the following syntax:
+A module has the following syntax:
 
 ```text
 module <address>::<identifier> {
@@ -54,11 +54,11 @@ where `<address>` is a valid [named or literal address](./address.md).
 For example:
 
 ```move
-module 0x42::Test {
+module 0x42::test {
     struct Example has copy, drop { i: u64 }
 
     use std::debug;
-    friend 0x42::AnotherTest;
+    friend 0x42::another_test;
 
     const ONE: u64 = 1;
 
@@ -70,19 +70,19 @@ module 0x42::Test {
 }
 ```
 
-The `module 0x42::Test` part specifies that the module `Test` will be published under the [account address](./address.md) `0x42` in [global storage](./global-storage-structure.md).
+The `module 0x42::test` part specifies that the module `test` will be published under the [account address](./address.md) `0x42` in [global storage](./global-storage-structure.md).
 
 Modules can also be declared using [named addresses](./address.md). For example:
 
 ```move
 module test_addr::test {
-    struct Example has copy, drop { a: address}
+    struct Example has copy, drop { a: address }
 
     use std::debug;
     friend test_addr::another_test;
 
     public fun print() {
-        let example = Example { a: @test_addr};
+        let example = Example { a: @test_addr };
         debug::print(&example)
     }
 }
@@ -92,7 +92,7 @@ Because named addresses only exist at the source language level and during compi
 named addresses will be fully substituted for their value at the bytecode
 level. For example if we had the following code:
 
-```move=
+```move
 script {
     fun example() {
         my_addr::m::foo(@my_addr);
@@ -103,7 +103,7 @@ script {
 and we compiled it with `my_addr` set to `0xC0FFEE`, then it would be equivalent
 to the following operationally:
 
-```move=
+```move
 script {
     fun example() {
         0xC0FFEE::m::foo(@0xC0FFEE);
@@ -112,7 +112,7 @@ script {
 ```
 
 However at the source level, these _are not equivalent_—the function
-`M::foo` _must_ be accessed through the `MyAddr` named address, and not through
+`m::foo` _must_ be accessed through the `my_addr` named address, and not through
 the numerical value assigned to that address.
 
 Module names can start with letters `a` to `z` or letters `A` to `Z`. After the first character, module names can contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, or digits `0` to `9`.
@@ -122,10 +122,10 @@ module my_module {}
 module foo_bar_42 {}
 ```
 
-Typically, module names start with an uppercase letter. A module named `my_module` should be stored in a source file named `my_module.move`.
+Typically, module names start with an lowercase letter. A module named `my_module` should be stored in a source file named `my_module.move`.
 
 All elements inside a `module` block can appear in any order.
 Fundamentally, a module is a collection of [`types`](./structs-and-resources.md) and [`functions`](./functions.md).
-[Uses](./uses.md) import types from other modules.
-[Friends](./friends.md) specify a list of trusted modules.
-[Constants](./constants.md) define private constants that can be used in the functions of a module.
+The [`use`](./uses.md) keyword is used to import types from other modules.
+The [`friend`](./friends.md) keyword specifies a list of trusted modules.
+The [`const`](./constants.md) keyword defines private constants that can be used in the functions of a module.
diff --git a/language/documentation/book/src/packages.md b/language/documentation/book/src/packages.md
index 82f95666b4..c4abace5ca 100644
--- a/language/documentation/book/src/packages.md
+++ b/language/documentation/book/src/packages.md
@@ -122,6 +122,7 @@ individually:
 ### Declaration
 
 Let's say we have a Move module in `example_pkg/sources/A.move` as follows:
+
 ```move
 module named_addr::A {
     public fun x(): address { @named_addr }
@@ -248,10 +249,10 @@ named_addr = "0xC0FFEE"
 ## Usage, Artifacts, and Data Structures
 
 The Move package system comes with a command line option as part of the Move
-CLI `move package <package_flags> <command> <command_flags>`. Unless a
+CLI `move <flags> <command> <command_flags>`. Unless a
 particular path is provided, all package commands will run in the current working
-directory. The full list of commands and flags for the Move Package CLI can be found by
-running `move package --help`.
+directory. The full list of commands and flags for the Move CLI can be found by
+running `move --help`.
 
 ### Usage
 
diff --git a/language/documentation/book/src/references.md b/language/documentation/book/src/references.md
index eb57079a50..57a5b99e1f 100644
--- a/language/documentation/book/src/references.md
+++ b/language/documentation/book/src/references.md
@@ -94,7 +94,7 @@ A mutable reference can be used in a context where an immutable reference is exp
 
 ```move
 let x = 7;
-let y: &mut u64 = &mut x;
+let y: &u64 = &mut x;
 ```
 
 This works because the under the hood, the compiler inserts `freeze` instructions where they are
diff --git a/language/documentation/book/src/signer.md b/language/documentation/book/src/signer.md
index 0707ff957a..820963c8b2 100644
--- a/language/documentation/book/src/signer.md
+++ b/language/documentation/book/src/signer.md
@@ -26,7 +26,7 @@ However, `signer` values are special because they cannot be created via literals
 instructions--only by the Move VM. Before the VM runs a script with parameters of type `signer`, it
 will automatically create `signer` values and pass them into the script:
 
-```move=
+```move
 script {
     use std::signer;
     fun main(s: signer) {
@@ -37,10 +37,10 @@ script {
 
 This script will abort with code `0` if the script is sent from any address other than `0x42`.
 
-A transaction script can have an arbitrary number of `signer`s as long as the signers are a prefix
-to any other arguments. In other words, all of the signer arguments must come first:
+A transaction script can have an arbitrary number of `signer`s as long as the `signer`s are a prefix
+to any other arguments. In other words, all of the `signer` arguments must come first:
 
-```move=
+```move
 script {
     use std::signer;
     fun main(s1: signer, s2: signer, x: u64, y: u8) {
@@ -57,10 +57,10 @@ swap between `s1` and `s2`.
 
 The `std::signer` standard library module provides two utility functions over `signer` values:
 
-| Function                                    | Description                                                   |
-| ------------------------------------------- | ------------------------------------------------------------- |
-| `signer::address_of(&signer): address`      | Return the `address` wrapped by this `&signer`.               |
-| `signer::borrow_address(&signer): &address` | Return a reference to the `address` wrapped by this `&signer` |
+| Function                                    | Description                                                    |
+| ------------------------------------------- | -------------------------------------------------------------  |
+| `signer::address_of(&signer): address`      | Return the `address` wrapped by this `&signer`.                |
+| `signer::borrow_address(&signer): &address` | Return a reference to the `address` wrapped by this `&signer`. |
 
 In addition, the `move_to<T>(&signer, T)` [global storage operator](./global-storage-operators.md)
 requires a `&signer` argument to publish a resource `T` under `signer.address`'s account. This
@@ -70,4 +70,4 @@ ensures that only an authenticated user can elect to publish a resource under th
 
 Unlike simple scalar values, `signer` values are not copyable, meaning they cannot be copied (from
 any operation whether it be through an explicit [`copy`](./variables.md#move-and-copy) instruction
-or through a [dereference `*`](./references.md#reference-operators)).
+or through a [dereference `*`](./references.md#reading-and-writing-through-references).
diff --git a/language/documentation/book/src/standard-library.md b/language/documentation/book/src/standard-library.md
index 8f17814977..7dcd8f2251 100644
--- a/language/documentation/book/src/standard-library.md
+++ b/language/documentation/book/src/standard-library.md
@@ -486,12 +486,10 @@ Used for extension points, should be not used under most circumstances. Construc
 
 ## fixed_point32
 
-
 The `fixed_point32` module defines a fixed-point numeric type with 32 integer bits and 32 fractional bits. Internally, this is represented as a `u64` integer wrapped in a struct to make a unique `fixed_point32` type. Since the numeric representation is a binary one, some decimal values may not be exactly representable, but it provides more than 9 decimal digits of precision both before and after the decimal point (18 digits total). For comparison, double precision floating-point has less than 16 decimal digits of precision, so you should be careful about using floating-point to convert these values to decimal.
 
 ### Types
 
-
 Represents a fixed-point numeric number with 32 fractional bits.
 
 ```move
diff --git a/language/documentation/book/src/structs-and-resources.md b/language/documentation/book/src/structs-and-resources.md
index ba73d2f1d6..a073a44cd4 100644
--- a/language/documentation/book/src/structs-and-resources.md
+++ b/language/documentation/book/src/structs-and-resources.md
@@ -32,7 +32,7 @@ module m {
 
 Structs cannot be recursive, so the following definition is invalid:
 
-```move=
+```move
 struct Foo { x: Foo }
 //              ^ error! Foo cannot contain Foo
 ```
@@ -42,7 +42,7 @@ to be used with certain operations (that copy it, drop it, store it in global st
 a storage schema), structs can be granted [abilities](./abilities.md) by annotating them with
 `has <ability>`:
 
-```move=
+```move
 address 0x2 {
 module m {
     struct Foo has copy, drop { x: u64, y: bool }
@@ -54,7 +54,7 @@ For more details, see the [annotating structs](./abilities.md#annotating-structs
 
 ### Naming
 
-Structs must start with a capital letter `A` to `Z`. After the first letter, constant names can
+Structs must start with a capital letter `A` to `Z`. After the first letter, struct names can
 contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, or digits `0` to `9`.
 
 ```move
@@ -73,7 +73,7 @@ features. It may or may not be removed later.
 Values of a struct type can be created (or "packed") by indicating the struct name, followed by
 value for each field:
 
-```move=
+```move
 address 0x2 {
 module m {
     struct Foo has drop { x: u64, y: bool }
@@ -102,7 +102,7 @@ This is called sometimes called "field name punning".
 
 Struct values can be destroyed by binding or assigning them patterns.
 
-```move=
+```move
 address 0x2 {
 module m {
     struct Foo { x: u64, y: bool }
@@ -122,6 +122,7 @@ module m {
     fun example_destroy_foo_wildcard() {
         let foo = Foo { x: 3, y: false };
         let Foo { x, y: _ } = foo;
+
         // only one new binding since y was bound to a wildcard
         //   x: u64 = 3
     }
@@ -130,6 +131,7 @@ module m {
         let x: u64;
         let y: bool;
         Foo { x, y } = Foo { x: 3, y: false };
+
         // mutating existing variables x & y
         //   x = 3, y = false
     }
@@ -137,6 +139,7 @@ module m {
     fun example_foo_ref() {
         let foo = Foo { x: 3, y: false };
         let Foo { x, y } = &foo;
+
         // two new bindings
         //   x: &u64
         //   y: &bool
@@ -145,6 +148,7 @@ module m {
     fun example_foo_ref_mut() {
         let foo = Foo { x: 3, y: false };
         let Foo { x, y } = &mut foo;
+
         // two new bindings
         //   x: &mut u64
         //   y: &mut bool
@@ -154,9 +158,10 @@ module m {
         let bar = Bar { foo: Foo { x: 3, y: false } };
         let Bar { foo: Foo { x, y } } = bar;
         //             ^ nested pattern
+
         // two new bindings
         //   x: u64 = 3
-        //   foo_y: bool = false
+        //   y: bool = false
     }
 
     fun example_destroy_baz() {
@@ -172,7 +177,7 @@ module m {
 The `&` and `&mut` operator can be used to create references to structs or fields. These examples
 include some optional type annotations (e.g., `: &Foo`) to demonstrate the type of operations.
 
-```move=
+```move
 let foo = Foo { x: 3, y: true };
 let foo_ref: &Foo = &foo;
 let y: bool = foo_ref.y;          // reading a field via a reference to the struct
@@ -182,18 +187,18 @@ let x_ref_mut: &mut u64 = &mut foo.x;
 *x_ref_mut = 42;            // modifying a field via a mutable reference
 ```
 
-It is possible to borrow inner fields of nested structs.
+It is possible to borrow inner fields of nested structs:
 
-```move=
+```move
 let foo = Foo { x: 3, y: true };
 let bar = Bar { foo };
 
 let x_ref = &bar.foo.x;
 ```
 
-You can also borrow a field via a reference to a struct.
+You can also borrow a field via a reference to a struct:
 
-```move=
+```move
 let foo = Foo { x: 3, y: true };
 let foo_ref = &foo;
 let x_ref = &foo_ref.x;
@@ -202,9 +207,9 @@ let x_ref = &foo_ref.x;
 
 ### Reading and Writing Fields
 
-If you need to read and copy a field's value, you can then dereference the borrowed field
+If you need to read and copy a field's value, you can then dereference the borrowed field:
 
-```move=
+```move
 let foo = Foo { x: 3, y: true };
 let bar = Bar { foo: copy foo };
 let x: u64 = *&foo.x;
@@ -215,37 +220,37 @@ let foo2: Foo = *&bar.foo;
 If the field is implicitly copyable, the dot operator can be used to read fields of a struct without
 any borrowing. (Only scalar values with the `copy` ability are implicitly copyable.)
 
-```move=
+```move
 let foo = Foo { x: 3, y: true };
 let x = foo.x;  // x == 3
 let y = foo.y;  // y == true
 ```
 
-Dot operators can be chained to access nested fields.
+Dot operators can be chained to access nested fields:
 
-```move=
+```move
 let baz = Baz { foo: Foo { x: 3, y: true } };
 let x = baz.foo.x; // x = 3;
 ```
 
 However, this is not permitted for fields that contain non-primitive types, such a vector or another
-struct
+struct:
 
-```move=
+```move
 let foo = Foo { x: 3, y: true };
 let bar = Bar { foo };
 let foo2: Foo = *&bar.foo;
-let foo3: Foo = bar.foo; // error! add an explicit copy with *&
+let foo3: Foo = bar.foo; // error! must add an explicit copy with *&
 ```
 
 The reason behind this design decision is that copying a vector or another struct might be an
 expensive operation. It is important for a programmer to be aware of this copy and make others aware
-with the explicit syntax `*&`
+with the explicit syntax `*&`.
 
 In addition reading from fields, the dot syntax can be used to modify fields, regardless of the
-field being a primitive type or some other struct
+field being a primitive type or some other struct.
 
-```move=
+```move
 let foo = Foo { x: 3, y: true };
 foo.x = 42;     // foo = Foo { x: 42, y: true }
 foo.y = !foo.y; // foo = Foo { x: 42, y: false }
@@ -254,9 +259,9 @@ bar.foo.x = 52;                   // bar = Bar { foo: Foo { x: 52, y: false } }
 bar.foo = Foo { x: 62, y: true }; // bar = Bar { foo: Foo { x: 62, y: true } }
 ```
 
-The dot syntax also works via a reference to a struct
+The dot syntax also works via a reference to a struct:
 
-```move=
+```move
 let foo = Foo { x: 3, y: true };
 let foo_ref = &mut foo;
 foo_ref.x = foo_ref.x + 1;
@@ -272,11 +277,11 @@ Most struct operations on a struct type `T` can only be performed inside the mod
 - The fields of a struct are only accessible inside the module that defines the struct.
 
 Following these rules, if you want to modify your struct outside the module, you will need to
-provide publis APIs for them. The end of the chapter contains some examples of this.
+provide public APIs for them. The end of the chapter contains some examples of this.
 
 However, struct _types_ are always visible to another module or script:
 
-```move=
+```move
 // m.move
 address 0x2 {
 module m {
@@ -289,7 +294,7 @@ module m {
 }
 ```
 
-```move=
+```move
 // n.move
 address 0x2 {
 module n {
@@ -320,7 +325,7 @@ ephemeral. This means they cannot be copied or dropped. This property can be ver
 modeling real world resources like money, as you do not want money to be duplicated or get lost in
 circulation.
 
-```move=
+```move
 address 0x2 {
 module m {
     struct Foo { x: u64 }
@@ -347,10 +352,10 @@ module m {
 }
 ```
 
-To fix the second example (`fun dropping_resource`), you would need to manually "unpack" the
+To fix the second example (`fun destroying_resource1`), you would need to manually "unpack" the
 resource:
 
-```move=
+```move
 address 0x2 {
 module m {
     struct Foo { x: u64 }
@@ -370,7 +375,7 @@ If on the other hand, your struct does not represent something valuable, you can
 `copy` and `drop` to get a struct value that might feel more familiar from other programming
 languages:
 
-```move=
+```move
 address 0x2 {
 module m {
     struct Foo has copy, drop { x: u64 }
@@ -394,19 +399,19 @@ module m {
 
 Only structs with the `key` ability can be saved directly in
 [persistent global storage](./global-storage-operators.md). All values stored within those `key`
-structs must have the `store` abilities. See the [ability](./abilities] and
+structs must have the `store` ability. See the [ability](./abilities) and
 [global storage](./global-storage-operators.md) chapters for more detail.
 
 ## Examples
 
 Here are two short examples of how you might use structs to represent valuable data (in the case of
-`Coin`) or more classical data (in the case of `Point` and `Circle`)
+`Coin`) or more classical data (in the case of `Point` and `Circle`).
 
 ### Example 1: Coin
 
 <!-- TODO link to access control for mint -->
 
-```move=
+```move
 address 0x2 {
 module m {
     // We do not want the Coin to be copied because that would be duplicating this "money",
@@ -422,7 +427,7 @@ module m {
 
     public fun mint(value: u64): Coin {
         // You would want to gate this function with some form of access control to prevent
-        // anyone using this module from minting an infinite amount of coins
+        // anyone using this module from minting an infinite amount of coins.
         Coin { value }
     }
 
@@ -457,7 +462,7 @@ module m {
 
 ### Example 2: Geometry
 
-```move=
+```move
 address 0x2 {
 module point {
     struct Point has copy, drop, store {
@@ -497,10 +502,10 @@ module point {
 }
 ```
 
-```move=
+```move
 address 0x2 {
 module circle {
-    use 0x2::Point::{Self, Point};
+    use 0x2::point::{Self, Point};
 
     struct Circle has copy, drop, store {
         center: Point,
@@ -512,7 +517,7 @@ module circle {
     }
 
     public fun overlaps(c1: &Circle, c2: &Circle): bool {
-        let d = Point::dist_squared(&c1.center, &c2.center);
+        let d = point::dist_squared(&c1.center, &c2.center);
         let r1 = c1.radius;
         let r2 = c2.radius;
         d*d <= r1*r1 + 2*r1*r2 + r2*r2
diff --git a/language/documentation/book/src/tuples.md b/language/documentation/book/src/tuples.md
index 1bf9d8e147..1f4575b817 100644
--- a/language/documentation/book/src/tuples.md
+++ b/language/documentation/book/src/tuples.md
@@ -1,13 +1,13 @@
 # Tuples and Unit
 
 Move does not fully support tuples as one might expect coming from another language with them as a
-first-class value. However, in order to support multiple return values, Move has tuple-like
+[first-class value](https://en.wikipedia.org/wiki/First-class_citizen). However, in order to support multiple return values, Move has tuple-like
 expressions. These expressions do not result in a concrete value at runtime (there are no tuples in
 the bytecode), and as a result they are very limited: they can only appear in expressions (usually
 in the return position for a function); they cannot be bound to local variables; they cannot be
 stored in structs; and tuple types cannot be used to instantiate generics.
 
-Similarly, unit `()` is a type created by the Move source language in order to be expression based.
+Similarly, [unit `()`](https://en.wikipedia.org/wiki/Unit_type) is a type created by the Move source language in order to be expression based.
 The unit value `()` does not result in any runtime value. We can consider unit`()` to be an empty
 tuple, and any restrictions that apply to tuples also apply to unit.
 
@@ -21,7 +21,7 @@ multiple return values are represented using tuples.
 
 ## Literals
 
-Tuples are created by a comma separated list of expressions inside of parentheses
+Tuples are created by a comma separated list of expressions inside of parentheses.
 
 | Syntax          | Type                                                                         | Description                                                  |
 | --------------- | ---------------------------------------------------------------------------- | ------------------------------------------------------------ |
@@ -37,19 +37,19 @@ Sometimes, tuples with two elements are called "pairs" and tuples with three ele
 
 ### Examples
 
-```move=
+```move
 address 0x42 {
 module example {
     // all 3 of these functions are equivalent
 
     // when no return type is provided, it is assumed to be `()`
-    fun returs_unit_1() { }
+    fun returns_unit_1() { }
 
     // there is an implicit () value in empty expression blocks
-    fun returs_unit_2(): () { }
+    fun returns_unit_2(): () { }
 
-    // explicit version of `returs_unit_1` and `returs_unit_2`
-    fun returs_unit_3(): () { () }
+    // explicit version of `returns_unit_1` and `returns_unit_2`
+    fun returns_unit_3(): () { () }
 
 
     fun returns_3_values(): (u64, bool, address) {
@@ -72,7 +72,7 @@ For tuples of any size, they can be destructured in either a `let` binding or in
 
 For example:
 
-```move=
+```move
 address 0x42 {
 module example {
     // all 3 of these functions are equivalent
@@ -107,23 +107,25 @@ For more details, see [Move Variables](./variables.md).
 
 ## Subtyping
 
-Along with references, tuples are the only types that have subtyping in Move. Tuples do have
+Along with references, tuples are the only types that have [subtyping](https://en.wikipedia.org/wiki/Subtyping) in Move. Tuples do have
 subtyping only in the sense that subtype with references (in a covariant way).
 
-For example
+For example:
 
-```move=
+```move
 let x: &u64 = &0;
 let y: &mut u64 = &mut 1;
 
 // (&u64, &mut u64) is a subtype of (&u64, &u64)
-//   since &mut u64 is a subtype of &u64
+// since &mut u64 is a subtype of &u64
 let (a, b): (&u64, &u64) = (x, y);
+
 // (&mut u64, &mut u64) is a subtype of (&u64, &u64)
-//   since &mut u64 is a subtype of &u64
+// since &mut u64 is a subtype of &u64
 let (c, d): (&u64, &u64) = (y, y);
+
 // error! (&u64, &mut u64) is NOT a subtype of (&mut u64, &mut u64)
-//   since &u64 is NOT a subtype of &mut u64
+// since &u64 is NOT a subtype of &mut u64
 let (e, f): (&mut u64, &mut u64) = (x, y);
 ```
 
diff --git a/language/documentation/book/src/unit-testing.md b/language/documentation/book/src/unit-testing.md
index db64a94869..75649da190 100644
--- a/language/documentation/book/src/unit-testing.md
+++ b/language/documentation/book/src/unit-testing.md
@@ -95,7 +95,7 @@ fun test_only_function(...) { ... }
 
 ## Running Unit Tests
 
-Unit tests for a Move package can be run with the [`move package test`
+Unit tests for a Move package can be run with the [`move test`
 command](./packages.md).
 
 When running tests, every test will either `PASS`, `FAIL`, or `TIMEOUT`. If a test case fails, the location of the failure along with the function name that caused the failure will be reported if possible. You can see an example of this below.
@@ -105,7 +105,7 @@ A test will be marked as timing out if it exceeds the maximum number of instruct
 There are also a number of options that can be passed to the unit testing binary to fine-tune testing and to help debug failing tests. These can be found using the the help flag:
 
 ```
-$ move package -h
+$ move -h
 ```
 
 ## Example
@@ -113,8 +113,9 @@ $ move package -h
 A simple module using some of the unit testing features is shown in the following example:
 
 First create an empty package and change directory into it:
+
 ```
-$ move package new TestExample; cd TestExample
+$ move new TestExample; cd TestExample
 ```
 
 Next add the following to the `Move.toml`:
@@ -173,10 +174,10 @@ module 0x1::my_module {
 
 ### Running Tests
 
-You can then run these tests with the `move package test` command:
+You can then run these tests with the `move test` command:
 
 ```
-$ move package test
+$ move test
 BUILDING MoveStdlib
 BUILDING TestExample
 Running Move unit tests
@@ -192,7 +193,7 @@ Test result: OK. Total tests: 3; passed: 3; failed: 0
 This will only run tests whose fully qualified name contains `<str>`. For example if we wanted to only run tests with `"zero_coin"` in their name:
 
 ```
-$ move package test -f zero_coin
+$ move test -f zero_coin
 CACHED MoveStdlib
 BUILDING TestExample
 Running Move unit tests
@@ -201,11 +202,11 @@ Running Move unit tests
 Test result: OK. Total tests: 2; passed: 2; failed: 0
 ```
 
-#### `-i <bound>` or `--instructions <bound>`
-This bounds the number of instructions that can be executed for any one test to `<bound>`:
+#### `-i <bound>` or `--gas_used <bound>`
+This bounds the amount of gas that can be consumed for any one test to `<bound>`:
 
 ```
-$ move package test -i 0
+$ move test -i 0
 CACHED MoveStdlib
 BUILDING TestExample
 Running Move unit tests
@@ -235,10 +236,10 @@ Test result: FAILED. Total tests: 3; passed: 0; failed: 3
 ```
 
 #### `-s` or `--statistics`
-With these flags you can gather statistics about the tests run and report the runtime and instructions executed for each test. For example, if we wanted to see the statistics for the tests in the example above:
+With these flags you can gather statistics about the tests run and report the runtime and gas used for each test. For example, if we wanted to see the statistics for the tests in the example above:
 
 ```
-$ move package test -s
+$ move test -s
 CACHED MoveStdlib
 BUILDING TestExample
 Running Move unit tests
@@ -249,7 +250,7 @@ Running Move unit tests
 Test Statistics:
 
 ┌────────────────────────────────────────────────┬────────────┬───────────────────────────┐
-│                   Test Name                    │    Time    │   Instructions Executed   │
+│                   Test Name                    │    Time    │   Gas Used   │
 ├────────────────────────────────────────────────┼────────────┼───────────────────────────┤
 │ 0x1::my_module::make_sure_non_zero_coin_passes │   0.009    │             1             │
 ├────────────────────────────────────────────────┼────────────┼───────────────────────────┤
@@ -276,10 +277,10 @@ module 0x1::my_module {
 }
 ```
 
-we would get get the following output when running the tests:
+we would get the following output when running the tests:
 
 ```
-$ move package test -g
+$ move test -g
 CACHED MoveStdlib
 BUILDING TestExample
 Running Move unit tests
diff --git a/language/documentation/book/src/uses.md b/language/documentation/book/src/uses.md
index 87d1914760..5e7edf8d9f 100644
--- a/language/documentation/book/src/uses.md
+++ b/language/documentation/book/src/uses.md
@@ -252,7 +252,7 @@ module example {
 
 Inside a given scope, all aliases introduced by `use` declarations must be unique.
 
-For a module, this means aliases introduced by `use` cannot overla
+For a module, this means aliases introduced by `use` cannot overlap
 
 ```move=
 address 0x42 {
diff --git a/language/documentation/book/src/variables.md b/language/documentation/book/src/variables.md
index b6cbaaf70e..e16738adbc 100644
--- a/language/documentation/book/src/variables.md
+++ b/language/documentation/book/src/variables.md
@@ -99,7 +99,7 @@ let x: T = e; // "Variable x of type T is initialized to expression e"
 
 Some examples of explicit type annotations:
 
-```move=
+```move
 address 0x42 {
 module example {
 
@@ -315,7 +315,7 @@ fun three(): (u64, u64, u64) {
 ```move
 let (x1, _, z1) = three();
 let (x2, _y, z2) = three();
-assert!(x1 + z1 == x2 + z2)
+assert!(x1 + z1 == x2 + z2, 42);
 ```
 
 This can be necessary at times as the compiler will error on unused local variables
@@ -401,7 +401,7 @@ if (cond) x = 1 else x = 2;
 
 The assignment uses the same pattern syntax scheme as `let` bindings:
 
-```move=
+```move
 address 0x42 {
 module example {
     struct X { f: u64 }
@@ -442,8 +442,7 @@ reference `&mut`.
 let x = 0;
 let r = &mut x;
 *r = 1;
-assert!(x == 1, 42)
-}
+assert!(x == 1, 42);
 ```
 
 This is particularly useful if either:
@@ -469,7 +468,7 @@ This sort of modification is how you modify structs and vectors!
 ```move
 let v = vector::empty();
 vector::push_back(&mut v, 100);
-assert!(*vector::borrow(&v, 0) == 100, 42)
+assert!(*vector::borrow(&v, 0) == 100, 42);
 ```
 
 For more details, see [Move references](./references.md).
@@ -566,7 +565,7 @@ explicitly destroyed within its declaring module.)
 ```
 
 If a final expression is not present in a block---that is, if there is a trailing semicolon `;`,
-there is an implicit unit `()` value. Similarly, if the expression block is empty, there is an
+there is an implicit [unit `()` value](https://en.wikipedia.org/wiki/Unit_type). Similarly, if the expression block is empty, there is an
 implicit unit `()` value.
 
 ```move
diff --git a/language/documentation/book/src/vector.md b/language/documentation/book/src/vector.md
index 54a2808658..ad18a7e919 100644
--- a/language/documentation/book/src/vector.md
+++ b/language/documentation/book/src/vector.md
@@ -23,7 +23,7 @@ specified explicitly:
 
 ```move
 vector<T>[]: vector<T>
-vecctor<T>[e1, ..., en]: vector<T>
+vector<T>[e1, ..., en]: vector<T>
 ```
 
 #### Example Vector Literals
@@ -43,14 +43,14 @@ result. These values are so common that specific syntax is provided to make the
 readable, as opposed to having to use `vector[]` where each individual `u8` value is specified in
 numeric form.
 
-There are currently two supported types of `vector<u8>` literals, byte strings and hex strings.
+There are currently two supported types of `vector<u8>` literals, *byte strings* and *hex strings*.
 
 #### Byte Strings
 
 Byte strings are quoted string literals prefixed by a `b`, e.g. `b"Hello!\n"`.
 
 These are ASCII encoded strings that allow for escape sequences. Currently, the supported escape
-sequences are
+sequences are:
 
 | Escape Sequence | Description                                    |
 | --------------- | ---------------------------------------------- |
@@ -64,10 +64,10 @@ sequences are
 
 #### Hex Strings
 
-Hex strings are quoted string literals prefixed by a `x`, e.g. `x"48656C6C6F210A"`
+Hex strings are quoted string literals prefixed by a `x`, e.g. `x"48656C6C6F210A"`.
 
 Each byte pair, ranging from `00` to `FF`, is interpreted as hex encoded `u8` value. So each byte
-pair corresponds to a single entry in the resulting `vector<u8>`
+pair corresponds to a single entry in the resulting `vector<u8>`.
 
 #### Example String Literals
 
@@ -91,24 +91,24 @@ fun byte_and_hex_strings() {
 `vector` supports the following operations via the `std::vector` module in the Move standard
 library:
 
-| Function                                                   | Description                                                   | Aborts?                 |
-| ---------------------------------------------------------- | ------------------------------------------------------------- | ----------------------- |
-| `vector::empty<T>(): vector<T>`                            | Create an empty vector that can store values of type `T`      | Never                   |
-| `vector::singleton<T>(t: T): vector<T>`                    | Create a vector of size 1 containing `t`                      | Never                   |
-| `vector::push_back<T>(v: &mut vector<T>, t: T)`            | Add `t` to the end of `v`                                     | Never                   |
-| `vector::pop_back<T>(v: &mut vector<T>): T`                | Remove and return the last element in `v`                     | If `v` is empty         |
-| `vector::borrow<T>(v: &vector<T>, i: u64): &T`             | Return an immutable reference to the `T` at index `i`         | If `i` is not in bounds |
-| `vector::borrow_mut<T>(v: &mut vector<T>, i: u64): &mut T` | Return an mutable reference to the `T` at index `i`           | If `i` is not in bounds |
-| `vector::destroy_empty<T>(v: vector<T>)`                   | Delete `v`                                                    | If `v` is not empty     |
-| `vector::append<T>(v1: &mut vector<T>, v2: vector<T>)`     | Add the elements in `v2` to the end of `v1`                   | If `i` is not in bounds |
-| `vector::contains<T>(v: &vector<T>, e: &T): bool`          | Return true if `e` is in the vector `v`                       | Never                   |
-| `vector::swap<T>(v: &mut vector<T>, i: u64, j: u64)` | Swaps the elements at the `i`th and `j`th indices in the vector `v`.| If `i` or `j` is out of bounds |
-| `vector::reverse<T>(v: &mut vector<T>)`                    | Reverses the order of the elements in the vector `v` in place | Never                   |
-| `vector::index_of<T>(v: &vector<T>, e: &T): bool` | Return `(true, i)` if `e` is in the vector `v` at index `i`. Otherwise, returns `(false, 0)`.| Never |
-| `vector::remove<T>(v: &mut vector<T>, i: u64): T` | Remove the `i`th element of the vector `v`, shifting all subsequent elements. This is O(n) and preserves ordering of elements in the vector. | If `i` is out of bounds. |
-| `vector::swap_remove<T>(v: &mut vector<T>, i: u64): T` | Swap the `i`th element of the vector `v` with the last element and then pop the vector, This is O(1), but does not preserve ordering of elements in the vector. | If `i` is out of bounds. |
-
-More operations may be added overtime
+| Function                                                   | Description                                                                                                                                                     | Aborts?                        |
+| ---------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ |
+| `vector::empty<T>(): vector<T>`                            | Create an empty vector that can store values of type `T`                                                                                                        | Never                          |
+| `vector::singleton<T>(t: T): vector<T>`                    | Create a vector of size 1 containing `t`                                                                                                                        | Never                          |
+| `vector::push_back<T>(v: &mut vector<T>, t: T)`            | Add `t` to the end of `v`                                                                                                                                       | Never                          |
+| `vector::pop_back<T>(v: &mut vector<T>): T`                | Remove and return the last element in `v`                                                                                                                       | If `v` is empty                |
+| `vector::borrow<T>(v: &vector<T>, i: u64): &T`             | Return an immutable reference to the `T` at index `i`                                                                                                           | If `i` is not in bounds        |
+| `vector::borrow_mut<T>(v: &mut vector<T>, i: u64): &mut T` | Return a mutable reference to the `T` at index `i`                                                                                                              | If `i` is not in bounds        |
+| `vector::destroy_empty<T>(v: vector<T>)`                   | Delete `v`                                                                                                                                                      | If `v` is not empty            |
+| `vector::append<T>(v1: &mut vector<T>, v2: vector<T>)`     | Add the elements in `v2` to the end of `v1`                                                                                                                     | Never                          |
+| `vector::contains<T>(v: &vector<T>, e: &T): bool`          | Return true if `e` is in the vector `v`. Otherwise, returns false                                                                                                | Never                          |
+| `vector::swap<T>(v: &mut vector<T>, i: u64, j: u64)`       | Swaps the elements at the `i`th and `j`th indices in the vector `v`                                                                                             | If `i` or `j` is out of bounds |
+| `vector::reverse<T>(v: &mut vector<T>)`                    | Reverses the order of the elements in the vector `v` in place                                                                                                   | Never                          |
+| `vector::index_of<T>(v: &vector<T>, e: &T): (bool, u64)`   | Return `(true, i)` if `e` is in the vector `v` at index `i`. Otherwise, returns `(false, 0)`                                                                    | Never                          |
+| `vector::remove<T>(v: &mut vector<T>, i: u64): T`          | Remove the `i`th element of the vector `v`, shifting all subsequent elements. This is O(n) and preserves ordering of elements in the vector                     | If `i` is out of bounds        |
+| `vector::swap_remove<T>(v: &mut vector<T>, i: u64): T`     | Swap the `i`th element of the vector `v` with the last element and then pop the element, This is O(1), but does not preserve ordering of elements in the vector  | If `i` is out of bounds        |
+
+More operations may be added over time.
 
 ## Example
 
@@ -166,4 +166,4 @@ For more details see the sections on [type abilities](./abilities.md) and [gener
 
 As mentioned [above](#destroying-and-copying-vectors), `vector` values can be copied only if the
 elements can be copied. In that case, the copy must be explicit via a
-[`copy`](./variables.md#move-and-copy) or a [dereference `*`](./references.md#reference-operators).
+[`copy`](./variables.md#move-and-copy) or a [dereference `*`](./references.md#reading-and-writing-through-references).
diff --git a/language/documentation/book/translations/move-book-zh/.gitignore b/language/documentation/book/translations/move-book-zh/.gitignore
new file mode 100644
index 0000000000..7585238efe
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/.gitignore
@@ -0,0 +1 @@
+book
diff --git a/language/documentation/book/translations/move-book-zh/CONTRIBUTING.md b/language/documentation/book/translations/move-book-zh/CONTRIBUTING.md
new file mode 100644
index 0000000000..8d7724ea56
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/CONTRIBUTING.md
@@ -0,0 +1,74 @@
+# Contributing to Move Book Chinese Version
+
+感谢您有兴趣为**《Move Book 中文版》**做出贡献！有很多方法可以做出贡献，我们感谢所有这些方式。
+
+本翻译项目由 [*Move 中文社区（MoveCC）*](https://github.com/move-cc)[发起](https://github.com/move-language/move/issues/353)，并与 [MoveDAO 社区](https://github.com/move-dao)共同初步完善。
+
+目前工作仍在进行中！
+
+欢迎所有对 Move 感兴趣的朋友一起加入到《Move Book 中文版》的翻译工作中。
+
+## 提交 PR 的 Commits 格式
+
+```text
+[move-book-zh] 关于这个 PR 的描述信息
+```
+
+## 文档规范
+
+请参考：[中文技术文档的写作规范](https://github.com/ruanyf/document-style-guide)
+
+### 断句
+
+本书使用 Markdown 作为源文件，使用 [mdBook](https://github.com/rust-lang/mdBook) 作为渲染引擎。
+
+由于中英文有所区别，换行后渲染引擎会自动追加一个空格。为了优化视觉体验，中文一个段落内不必换行，保持中文的段内容为一个物理行。
+
+英文是由空格分隔的文本，所以不存在上述问题。
+
+### 中英文混排规范
+
+文中出现中英文混排时，中文与英文之间需要添加一个空格。如果英文单词结尾，此时单词与标点符号之间不添加空格。
+
+### 数字规范
+
+数字之间需要添加一个空格，如果数字带有英文单位，那么数字与英文单位之间不能添加空格。如果数字后带有中文单位，需要添加一个空格。
+
+```text
+正确：如果一个 1s 的帧被划分为 10 个时隙，每个时隙为 100ms。
+
+错误：如果一个1s的帧被划分为10个时隙，每个时隙为100ms。
+
+错误：如果一个 1 s 的帧被划分为10个时隙，每个时隙为 100 ms。
+```
+
+### 逗号问题
+
+英文中，没有顿号这种标点符号，逗号常用分隔并列的句子成分或结构。
+
+英文中，像 `and` 并列词的前面通常会有一个 `,`，但在中文里表示对象之间的并列关系时，`和`的前面不能带逗号。
+
+```text
+War, famine, and flood are terrible.
+战争, 饥荒和洪水都是很可怕的。
+```
+
+### 冒号和逗号的使用场景规范
+
+冒号通常用在“问、答、说、指出、宣布、证明、表明、例如”一类动词后面，表示提起下文。
+如果在较短的提示句子中，需要将 `：` 改为 `，`；如果提示内容比较多，则使用 `：` 来提起下文：
+
+示例1，提起的内容短少：
+
+```text
+十六进制字符串是以 x 为前缀的带引号的字符串文字，例如x'48656C6C6F210A'
+```
+
+示例2，提起的内容多：
+
+```text
+在这些情况下，vector 的类型是从元素类型或从动态数组的使用上推断出来的。如果无法推断类型或者只是为了更清楚地表示，则可以显式指定类型：
+
+vector<T>[]: vector<T>
+vector<T>[e1, ..., en]: vector<T>
+```
diff --git a/language/documentation/book/translations/move-book-zh/README.md b/language/documentation/book/translations/move-book-zh/README.md
new file mode 100644
index 0000000000..9de276331c
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/README.md
@@ -0,0 +1,73 @@
+## 参与贡献的重要提示
+
+《Move Book 中文版》翻译工作还在持续进行中，如果你愿意贡献你的一份力量，欢迎提交 pr 或 issue。
+
+为了方便翻译工作的进行，在提交 pr 时请不要删除英文原文的内容！
+
+在贡献之前请阅读[官方的贡献指南](https://github.com/move-language/move/blob/main/CONTRIBUTING.md)和[《Move Book 中文版》的贡献指南](./CONTRIBUTING.md)。
+
+# Move Book 中文版
+
+区块链技术的发展经历了两个阶段，比特币（BTC）开启了*区块链1.0时代*，以太坊（ETH）开启了*区块链2.0时代*。
+以太坊的出现为区块链带来了*智能合约*这一关键技术，让区块链不只停留在记账这一单的目的，而是带来更多的应用拓展性。
+遗憾的是，智能合约如同一把双刃剑，在带来众多丰富功能拓展的同时，也容易让智能合约开发者无意间引入不安全的代码，让链的资产受到威胁。
+
+编写简单、安全、易部署的智能合约应该是*区块链3.0时代*应该关注的重点，**面向资源编程**的 [Move 语言](https://github.com/move-language/move)，无疑给这个问题提供了一个很好的解决方案。
+
+本书是 [Move Book](https://move-language.github.io/move/) 的中文版。
+
+## 快速开始
+
+本书使用 [mdBook](https://rust-lang.github.io/mdBook/) 构建。
+
+1. 使用 Cargo 安装 mdBook：
+
+```shell
+cargo install mdbook
+```
+
+2. 下载
+
+```shell
+git clone https://github.com/move-language/move.git
+```
+
+3. 构建并预览
+
+```shell
+cd language/documentation/book/translations/move-book-zh
+mdbook serve --open
+```
+
+## Contributors ✨
+
+[各章节译者](Translators.md)
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="https://github.com/Kusou1"><img src="https://avatars.githubusercontent.com/u/57334674?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zhang</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=Kusou1" title="Code">💻</a> <a href="https://github.com/move-dao/move-book-zh/commits?author=Kusou1" title="Documentation">📖</a> <a href="#translation-Kusou1" title="Translation">🌍</a> <a href="#infra-Kusou1" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="https://github.com/ruy1su"><img src="https://avatars.githubusercontent.com/u/9391802?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ruyisu</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=ruy1su" title="Code">💻</a> <a href="#translation-ruy1su" title="Translation">🌍</a> <a href="https://github.com/move-dao/move-book-zh/commits?author=ruy1su" title="Documentation">📖</a> <a href="https://github.com/move-dao/move-book-zh/pulls?q=is%3Apr+reviewed-by%3Aruy1su" title="Reviewed Pull Requests">🚇</a></td>
+    <td align="center"><a href="https://github.com/lshoo"><img src="https://avatars.githubusercontent.com/u/670440?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lshoo</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=lshoo" title="Code">💻</a> <a href="#translation-lshoo" title="Translation">🌍</a> <a href="https://github.com/move-dao/move-book-zh/commits?author=lshoo" title="Documentation">📖</a> <a href="#ideas-lshoo" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/move-dao/move-book-zh/pulls?q=is%3Apr+reviewed-by%3Alshoo" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/Container-00"><img src="https://avatars.githubusercontent.com/u/61052480?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Container</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=Container-00" title="Code">💻</a> <a href="#translation-Container-00" title="Translation">🌍</a> <a href="https://github.com/move-dao/move-book-zh/commits?author=Container-00" title="Documentation">📖</a> <a href="https://github.com/move-dao/move-book-zh/pulls?q=is%3Apr+reviewed-by%3AContainer-00" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/nosalt99"><img src="https://avatars.githubusercontent.com/u/22558493?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nosalt</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=nosalt99" title="Code">💻</a> <a href="#translation-nosalt99" title="Translation">🌍</a> <a href="https://github.com/move-dao/move-book-zh/commits?author=nosalt99" title="Documentation">📖</a> <a href="#infra-nosalt99" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="https://github.com/geometryolife"><img src="https://avatars.githubusercontent.com/u/54882546?v=4?s=100" width="100px;" alt=""/><br /><sub><b>geometryolife</b></sub></a><br /><a href="https://github.com/move-language/move/commits?author=geometryolife" title="Code">💻</a> <a href="#translation-geometryolife" title="Translation">🌍</a> <a href="#talk-geometryolife" title="Talks">📢</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/666thi"><img src="https://avatars.githubusercontent.com/u/109965699?v=4?s=100" width="100px;" alt=""/><br /><sub><b>666thi</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=666thi" title="Code">💻</a> <a href="#translation-666thi" title="Translation">🌍</a> <a href="#talk-666thi" title="Talks">📢</a></td>
+    <td align="center"><a href="https://github.com/MagicGordon"><img src="https://avatars.githubusercontent.com/u/19465870?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MagicGordon</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=MagicGordon" title="Code">💻</a> <a href="#translation-MagicGordon" title="Translation">🌍</a> <a href="#talk-MagicGordon" title="Talks">📢</a></td>
+    <td align="center"><a href="https://github.com/xixifusi1984"><img src="https://avatars.githubusercontent.com/u/39210551?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xixifusi1984</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=xixifusi1984" title="Code">💻</a> <a href="#translation-xixifusi1984" title="Translation">🌍</a> <a href="#talk-xixifusi1984" title="Talks">📢</a></td>
+    <td align="center"><a href="https://github.com/yvvw"><img src="https://avatars.githubusercontent.com/u/15168529?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yvvw</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=yvvw" title="Code">💻</a> <a href="#translation-yvvw" title="Translation">🌍</a> <a href="#talk-yvvw" title="Talks">📢</a></td>
+    <td align="center"><a href="https://github.com/xiaochuan891102"><img src="https://avatars.githubusercontent.com/u/109952533?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xiaochuan891102</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=xiaochuan891102" title="Code">💻</a> <a href="#translation-xiaochuan891102" title="Translation">🌍</a> <a href="#talk-xiaochuan891102" title="Talks">📢</a></td>
+    <td align="center"><a href="https://github.com/stephenLee"><img src="https://avatars.githubusercontent.com/u/1144508?v=4?s=100" width="100px;" alt=""/><br /><sub><b>stephenLee</b></sub></a><br /><a href="https://github.com/move-dao/move-book-zh/commits?author=stephenLee" title="Code">💻</a> <a href="#translation-stephenLee" title="Translation">🌍</a> <a href="#talk-stephenLee" title="Talks">📢</a></td>
+  </tr>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
diff --git a/language/documentation/book/translations/move-book-zh/Translators.md b/language/documentation/book/translations/move-book-zh/Translators.md
new file mode 100644
index 0000000000..35bce4ce50
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/Translators.md
@@ -0,0 +1,30 @@
+|    | 章节                       | 译者                                           | 校对                                                                                |
+|----|----------------------------|------------------------------------------------|-------------------------------------------------------------------------------------|
+| 0  | Intoduction                | Tom                                            | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 1  | Modules and Scripts        | [@Kusou1](https://github.com/kusou1)           | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 2  | Move Tutorial              | loadi、[@leego](https://github.com/leego)      | [@Joe Chen](https://github.com/geometryolife)                                       |
+| 3  | Integers                   | Tom                                            | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 4  | Bool                       | Tom                                            | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 5  | Address                    | ([@stephenLee](https://github.com/stephenLee)) | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 6  | Vector                     | ([@stephenLee](https://github.com/stephenLee)) | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 7  | Signer                     | ([@stephenLee](https://github.com/stephenLee)) | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 8  | References                 | container                                      | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 9  | Tuples and Unit            | container                                      | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 10 | Local Variables and Scopes | @ruyisu                                        | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 11 | Equality                   | @ruyisu                                        | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 12 | Abort and Assert           | @ruyisu                                        | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 13 | Conditionals               | [@Kusou1](https://github.com/kusou1)           | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 14 | While and Loop             | [@Kusou1](https://github.com/kusou1)           | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 15 | Functions                  | @nosalt99                                      | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 16 | Structs and Resource       | @nosalt99                                      | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 17 | Constants                  | @nosalt99                                      | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 18 | Generics                   | 小川                                           | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 19 | Type Abilities             | 小川                                           | [@lshoo](https://github.com/lshoo)、[@Joe Chen](https://github.com/geometryolife)   |
+| 20 | Uses and Aliases           | 小川                                           | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 21 | Friends                    | @xiaochuan891102                               | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 22 | Packages                   | @xiaochuan891102                               | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 23 | Unit Test                  | [@yvvw](https://github.com/yvvw)               | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 24 | Global Storage Structure   | [@yvvw](https://github.com/yvvw)               | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 25 | Global Storage Operators   | [@yvvw](https://github.com/yvvw)               | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 26 | Standard Library           | @MagicGordon                                   | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
+| 27 | Coding Conventions         | @MagicGordon                                   | [@ruyisu](https://github.com/ruy1su)、[@Joe Chen](https://github.com/geometryolife) |
diff --git a/language/documentation/book/translations/move-book-zh/book.toml b/language/documentation/book/translations/move-book-zh/book.toml
new file mode 100644
index 0000000000..1f51aef586
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/book.toml
@@ -0,0 +1,7 @@
+[book]
+authors = ["The Move Contributors"]
+description = "Move book maintained by the Move Chinese contributors."
+language = "zh"
+multilingual = false
+src = "src"
+title = "Move Book 中文版"
diff --git a/language/documentation/book/translations/move-book-zh/src/SUMMARY.md b/language/documentation/book/translations/move-book-zh/src/SUMMARY.md
new file mode 100644
index 0000000000..4b75899b44
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/SUMMARY.md
@@ -0,0 +1,45 @@
+# The Move Programming Language
+
+[引言（Introduction）](introduction.md)
+
+## Getting Started
+
+- [模块和脚本（Modules and Scripts）](modules-and-scripts.md)
+- [Move 教程（Move Tutorial）](move-tutorial.md)
+
+## Primitive Types
+
+- [整数（Integers）](integers.md)
+- [布尔类型（Bool）](bool.md)
+- [地址（Address）](address.md)
+- [向量（Vector）](vector.md)
+- [签名（Signer）](signer.md)
+- [引用（References）](references.md)
+- [元组和单值（Tuples and Unit）](tuples.md)
+
+## Basic Concepts
+
+- [局部变量和作用域（Local Variables and Scopes）](variables.md)
+- [等式（Equality）](equality.md)
+- [中止和断言（Abort and Assert）](abort-and-assert.md)
+- [条件语句（Conditionals）](conditionals.md)
+- [循环（While and Loop）](loops.md)
+- [函数（Functions）](functions.md)
+- [结构体和资源（Structs and Resources）](structs-and-resources.md)
+- [常量（Constants）](constants.md)
+- [泛型（Generics）](generics.md)
+- [类型能力（Type Abilities）](abilities.md)
+- [导入和别名（Uses and Aliases）](uses.md)
+- [友元函数（Friends）](friends.md)
+- [程序包（Packages）](packages.md)
+- [单元测试（Unit Tests）](unit-testing.md)
+
+## Global Storage
+
+- [全局存储结构（Global Storage Structure）](global-storage-structure.md)
+- [全局存储操作（Global Storage Operators）](global-storage-operators.md)
+
+## Reference
+
+- [标准库（Standard Library）](standard-library.md)
+- [Move 编码约定（Coding Conventions）](coding-conventions.md)
diff --git a/language/documentation/book/translations/move-book-zh/src/abilities.md b/language/documentation/book/translations/move-book-zh/src/abilities.md
new file mode 100644
index 0000000000..440362288e
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/abilities.md
@@ -0,0 +1,321 @@
+# 能力 (abilities)
+
+Abilities are a typing feature in Move that control what actions are permissible for values of a given type. This system grants fine grained control over the "linear" typing behavior of values, as well as if and how values are used in global storage. This is implemented by gating access to certain bytecode instructions so that for a value to be used with the bytecode instruction, it must have the ability required (if one is required at all—not every instruction is gated by an ability).
+
+能力是 Move 语言中的一种类型特性，用于控制对给定类型的值允许哪些操作。 该系统对值的“线性”类型行为以及值如何在全局存储中使用提供细粒度控制。这是通过对某些字节码指令的进行访问控制来实现的，因此对于要与字节码指令一起使用的值，它必须具有所需的能力(如果需要的话，并非每条指令都由能力控制)
+
+## 四种能力 (The Four Abilities)
+
+The four abilities are:
+
+* [`copy`](#copy)
+    * Allows values of types with this ability to be copied.
+* [`drop`](#drop)
+    * Allows values of types with this ability to be popped/dropped.
+* [`store`](#store)
+    * Allows values of types with this ability to exist inside a struct in global storage.
+* [`key`](#key)
+    * Allows the type to serve as a key for global storage operations.
+
+这四种能力分别是：
+
+* [`copy`](#copy) 复制
+  * 允许此类型的值被复制
+
+* [`drop`](#drop) 丢弃
+  * 允许此类型的值被弹出/丢弃
+
+* [`store`](#store) 存储
+  * 允许此类型的值存在于全局存储的某个结构体中
+
+* [`key`](#key) 键值
+  * 允许此类型作为全局存储中的键(具有 `key` 能力的类型才能保存到全局存储中)
+
+
+### `copy`
+
+The `copy` ability allows values of types with that ability to be copied. It gates the ability to copy values out of local variables with the [`copy`](./variables.md#move-and-copy) operator and to copy values via references with [dereference `*e`](./references.md#reading-and-writing-through-references).
+
+If a value has `copy`, all values contained inside of that value have `copy`.
+
+`copy` 能力允许具有此能力的类型的值被复制。 它限制了从本地变量通过 [`copy`](./variables.md#.move-and-copy)能力复制值以及通过 [`dereference *e`](./references.html#reading-and-writing-through-references)复制值这两种情况之外的复制操作。
+
+如果一个值具有 `copy` 能力，那么这个值内部的所有值都有 `copy` 能力。
+
+### `drop`
+
+The `drop` ability allows values of types with that ability to be dropped. By dropped, we mean that value is not transferred and is effectively destroyed as the Move program executes. As such, this ability gates the ability to ignore values in a multitude of locations, including:
+* not using the value in a local variable or parameter
+* not using the value in a [sequence via `;`](./variables.md#expression-blocks)
+* overwriting values in variables in [assignments](./variables.md#assignments)
+* overwriting values via references when [writing `*e1 = e2`](./references.md#reading-and-writing-through-references).
+
+If a value has `drop`, all values contained inside of that value have `drop`.
+
+`drop` 能力允许类型的值被丢弃。丢弃的意思程序执行后值会被有效的销毁而不必被转移。因此，这个能力限制在多个位置忽略使用值的可能性，包括：
+* 未被使用的局部变量或者参数
+* 未被使用的 [`sequence` via `;`](./variables.md#expression-blocks)中的值
+* 覆盖[赋值(assignments)](./variables.html#assignments)变量中的值
+* [写入(writing) `*e1 = e2`](https://move-language.github.io/move/references.html#reading-and-writing-through-references) 时通过引用覆盖的值。
+
+如果一个值具有 `drop` 能力，那么这个值内部的所有值都有 `drop` 能力。
+
+### `store`
+
+The `store` ability allows values of types with this ability to exist inside of a struct (resource) in global storage, *but* not necessarily as a top-level resource in global storage. This is the only ability that does not directly gate an operation. Instead it gates the existence in global storage when used in tandem with `key`.
+
+If a value has `store`, all values contained inside of that value have `store`
+
+`store` 能力允许具有这种能力的类型的值位于[全局存储](./global-storage-operators.html)中的结构体(资源)内, *但不一定是* 全局存储中的顶级资源。这是唯一不直接限制操作的能力。相反，当(`store`)与 `key` 一起使用时，它对全局存储中的可行性进行把关。。
+
+如果一个值具有 `store` 能力，那么这个值内部的所有值都有 `store` 能力。
+
+### `key`
+
+The `key` ability allows the type to serve as a key for [global storage operations](./global-storage-operators.md). It gates all global storage operations, so in order for a type to be used with `move_to`, `borrow_global`, `move_from`, etc., the type must have the `key` ability. Note that the operations still must be used in the module where the `key` type is defined (in a sense, the operations are private to the defining module).
+
+If a value has `key`, all values contained inside of that value have `store`. This is the only ability with this sort of asymmetry.
+
+`key` 能力允许此类型作为[全局存储](./global-storage-operators.html)中的键。它会限制所有[全局存储](./global-storage-operators.html)中的操作，因此一个类型如果与 `move_to`, `borrow_global`, `move_from` 等一起使用，那么这个类型必须具备 `key` 能力。请注意，这些操作仍然必须在定义 `key` 类型的模块中使用(从某种意义上说，这些操作是此模块的私有操作)。
+
+如果有一个值有 `key` 能力，那么这个值包含的所有字段值也都具有 `store` 能力，`key` 能力是唯一一个具有非对称的能力。
+
+## Builtin Types (内置类型)
+
+
+Most primitive, builtin types have `copy`, `drop`, and `store` with the exception of `signer`, which just has `store`
+
+* `bool`, `u8`, `u64`, `u128`, and `address` all have `copy`, `drop`, and `store`.
+* `signer` has `drop`
+    * Cannot be copied and cannot be put into global storage
+* `vector<T>` may have `copy`, `drop`, and `store` depending on the abilities of `T`.
+    * See [Conditional Abilities and Generic Types](#conditional-abilities-and-generic-types) for more details.
+* Immutable references `&` and mutable references `&mut` both have `copy` and `drop`.
+    * This refers to copying and dropping the reference itself, not what they refer to.
+    * References cannot appear in global storage, hence they do not have `store`.
+
+None of the primitive types have `key`, meaning none of them can be used directly with the [global storage operations](./global-storage-operators.md).
+
+几乎所有内置的基本类型具都有 `copy`，`drop`，以及 `store` 能力，`singer` 除外，它只有 `drop` 能力(原文是 `store` 有误，译者注)
+
+* `bool`, `u8`, `u64`, `u128`, `address` 都具有 `copy`, `drop`, 以及 `store` 能力。
+* `signer` 具有 `drop` 能力。 不能被复制以及不能被存放在全局存储中
+* `vector<T>` 可能具有 `copy`，`drop`，以及`store` 能力，这依赖于 `T` 具有的能力。 查看 [条件能力与泛型类型](#conditional-abilities-and-generic-types)获取详情
+* 不可变引用 `&` 和可变引用 `&mut` 都具有 `copy` 和 `drop` 能力。
+    * 这是指复制和删除引用本身，而不是它们所引用的内容。
+    * 引用不能出现在全局存储中，因此它们没有 `store` 能力。
+
+所有基本类型都没有 `key`，这意味着它们都不能直接用于[全局存储操作](./global-storage-operators.html)。
+
+## Annotating Structs (标注结构体)
+
+To declare that a `struct` has an ability, it is declared with `has <ability>` after the struct name but before the fields. For example:
+
+要声明一个 `struct` 具有某个能力，它在结构体名称之后, 在字段之前用 `has <ability>` 声明。例如：
+
+```move
+struct Ignorable has drop { f: u64 }
+struct Pair has copy, drop, store { x: u64, y: u64 }
+```
+
+In this case: `Ignorable` has the `drop` ability. `Pair` has `copy`, `drop`, and `store`.
+
+在这个例子中：`Ignorable` 具有 `drop` 能力。 `Pair` 具有 `copy`、`drop` 和 `store` 能力。
+
+All of these abilities have strong guarantees over these gated operations. The operation can be performed on the value only if it has that ability; even if the value is deeply nested inside of some other collection!
+
+所有这些能力对这些访问操作都有强有力的保证。只有具有该能力，才能对值执行对应的操作；即使该值深层嵌套在其他集合中！
+
+As such: when declaring a struct’s abilities, certain requirements are placed on the fields. All fields must satisfy these constraints. These rules are necessary so that structs satisfy the reachability rules for the abilities given above. If a struct is declared with the ability...
+
+* `copy`, all fields must have `copy`.
+* `drop`, all fields must have `drop`.
+* `store`, all fields must have `store`.
+* `key`, all fields must have `store`.
+    * `key` is the only ability currently that doesn’t require itself.
+
+因此：在声明结构体的能力时，对字段提出了某些要求。所有字段都必须满足这些约束。这些规则是必要的，以便结构体满足上述功能的可达性规则。如果一个结构被声明为具有某能力：
+
+* `copy`， 所有的字段必须具有 `copy` 能力。
+* `drop`，所有的字段必须具有 `drop` 能力。
+* `store`，所有的字段必须具有 `store` 能力。
+* `key`，所有的字段必须具有 `store` 能力。`key` 是目前唯一不需要包含自身的能力。
+
+例如:
+
+```move
+// A struct without any abilities
+struct NoAbilities {}
+
+struct WantsCopy has copy {
+    f: NoAbilities, // ERROR 'NoAbilities' does not have 'copy'
+}
+```
+
+and similarly:
+
+类似的：
+
+```move
+// A struct without any abilities
+struct NoAbilities {}
+
+struct MyResource has key {
+    f: NoAbilities, // Error 'NoAbilities' does not have 'store'
+}
+```
+
+## Conditional Abilities and Generic Types (条件能力与泛型类型)
+
+When abilities are annotated on a generic type, not all instances of that type are guaranteed to have that ability. Consider this struct declaration:
+
+在泛型类型上标注能力时，并非该类型的所有实例都保证具有该能力。考虑这个结构体声明：
+
+```move
+struct Cup<T> has copy, drop, store, key { item: T }
+```
+
+
+It might be very helpful if `Cup` could hold any type, regardless of its abilities. The type system can *see* the type parameter, so it should be able to remove abilities from `Cup` if it *sees* a type parameter that would violate the guarantees for that ability.
+
+This behavior might sound a bit confusing at first, but it might be more understandable if we think about collection types. We could consider the builtin type `vector` to have the following type declaration:
+
+如果 `Cup` 可以容纳任何类型，可能会很有帮助，不管它的能力如何。类型系统可以 *看到* 类型参数，因此，如果它 *发现* 一个类型参数违反了对该能力的保证，它应该能够从 `Cup` 中删除能力。
+
+这种行为一开始可能听起来有点令人困惑，但如果我们考虑一下集合类型，它可能会更容易理解。我们可以认为内置类型 `Vector` 具有以下类型声明：
+
+```move
+vector<T> has copy, drop, store;
+```
+
+We want `vector`s to work with any type. We don't want separate `vector` types for different abilities. So what are the rules we would want? Precisely the same that we would want with the field rules above.  So, it would be safe to copy a `vector` value only if the inner elements can be copied. It would be safe to ignore a `vector` value only if the inner elements can be ignored/dropped. And, it would be safe to put a `vector` in global storage only if the inner elements can be in global storage.
+
+To have this extra expressiveness, a type might not have all the abilities it was declared with depending on the instantiation of that type; instead, the abilities a type will have depends on both its declaration **and** its type arguments. For any type, type parameters are pessimistically assumed to be used inside of the struct, so the abilities are only granted if the type parameters meet the requirements described above for fields. Taking `Cup` from above as an example:
+
+* `Cup` has the ability `copy` only if `T` has `copy`.
+* It has `drop` only if `T` has `drop`.
+* It has `store` only if `T` has `store`.
+* It has `key` only if `T` has `store`.
+
+我们希望 `vector` 适用于任何类型。我们不希望针对不同的能力使用不同的 `vector` 类型。那么我们想要的规则是什么？与上面的字段规则完全相同。因此，仅当可以复制内部元素时，复制`vector` 值才是安全的。仅当可以忽略/丢弃内部元素时，忽略 `vector` 值才是安全的。而且，仅当内部元素可以在全局存储中时，将向量放入全局存储中才是安全的。
+
+为了具有这种额外的表现力，一个类型可能不具备它声明的所有能力，具体取决于该类型的实例化；相反，一个类型的能力取决于它的声明 **和** 它的类型参数。对于任何类型，类型参数都被悲观地假定为在结构体内部使用，因此只有在类型参数满足上述字段要求时才授予这些能力。以上面的 `Cup` 为例：
+
+* `Cup` 拥有 `copy` 能力 仅当 `T` 拥有 `copy` 能力时。
+* `Cup` 拥有 `drop` 能力 仅当 `T` 拥有 `drop` 能力时。
+* `Cup` 拥有 `store` 能力 仅当 `T` 拥有 `store` 能力时。
+* `Cup` 拥有 `key` 能力 仅当 `T` 拥有 `store` 能力时。
+
+Here are examples for this conditional system for each ability:
+
+以下是每个能力的条件系统的示例：
+
+### Example: conditional `copy`
+
+```move
+struct NoAbilities {}
+struct S has copy, drop { f: bool }
+struct Cup<T> has copy, drop, store { item: T }
+
+fun example(c_x: Cup<u64>, c_s: Cup<S>) {
+    // Valid, 'Cup<u64>' has 'copy' because 'u64' has 'copy'
+    let c_x2 = copy c_x;
+    // Valid, 'Cup<S>' has 'copy' because 'S' has 'copy'
+    let c_s2 = copy c_s;
+}
+
+fun invalid(c_account: Cup<signer>, c_n: Cup<NoAbilities>) {
+    // Invalid, 'Cup<signer>' does not have 'copy'.
+    // Even though 'Cup' was declared with copy, the instance does not have 'copy'
+    // because 'signer' does not have 'copy'
+    let c_account2 = copy c_account;
+    // Invalid, 'Cup<NoAbilities>' does not have 'copy'
+    // because 'NoAbilities' does not have 'copy'
+    let c_n2 = copy c_n;
+}
+```
+
+### Example: conditional `drop`
+
+```move
+struct NoAbilities {}
+struct S has copy, drop { f: bool }
+struct Cup<T> has copy, drop, store { item: T }
+
+fun unused() {
+    Cup<bool> { item: true }; // Valid, 'Cup<bool>' has 'drop'
+    Cup<S> { item: S { f: false }}; // Valid, 'Cup<S>' has 'drop'
+}
+
+fun left_in_local(c_account: Cup<signer>): u64 {
+    let c_b = Cup<bool> { item: true };
+    let c_s = Cup<S> { item: S { f: false }};
+    // Valid return: 'c_account', 'c_b', and 'c_s' have values
+    // but 'Cup<signer>', 'Cup<bool>', and 'Cup<S>' have 'drop'
+    0
+}
+
+fun invalid_unused() {
+    // Invalid, Cannot ignore 'Cup<NoAbilities>' because it does not have 'drop'.
+    // Even though 'Cup' was declared with 'drop', the instance does not have 'drop'
+    // because 'NoAbilities' does not have 'drop'
+    Cup<NoAbilities> { item: NoAbilities {}};
+}
+
+fun invalid_left_in_local(): u64 {
+    let n = Cup<NoAbilities> { item: NoAbilities {}};
+    // Invalid return: 'c_n' has a value
+    // and 'Cup<NoAbilities>' does not have 'drop'
+    0
+}
+```
+
+### Example: conditional `store`
+
+```move
+struct Cup<T> has copy, drop, store { item: T }
+
+// 'MyInnerResource' is declared with 'store' so all fields need 'store'
+struct MyInnerResource has store {
+    yes: Cup<u64>, // Valid, 'Cup<u64>' has 'store'
+    // no: Cup<signer>, Invalid, 'Cup<signer>' does not have 'store'
+}
+
+// 'MyResource' is declared with 'key' so all fields need 'store'
+struct MyResource has key {
+    yes: Cup<u64>, // Valid, 'Cup<u64>' has 'store'
+    inner: Cup<MyInnerResource>, // Valid, 'Cup<MyInnerResource>' has 'store'
+    // no: Cup<signer>, Invalid, 'Cup<signer>' does not have 'store'
+}
+```
+
+### Example: conditional `key`
+
+```move
+struct NoAbilities {}
+struct MyResource<T> has key { f: T }
+
+fun valid(account: &signer) acquires MyResource {
+    let addr = signer::address_of(account);
+     // Valid, 'MyResource<u64>' has 'key'
+    let has_resource = exists<MyResource<u64>>(addr);
+    if (!has_resource) {
+         // Valid, 'MyResource<u64>' has 'key'
+        move_to(account, MyResource<u64> { f: 0 })
+    };
+    // Valid, 'MyResource<u64>' has 'key'
+    let r = borrow_global_mut<MyResource<u64>>(addr)
+    r.f = r.f + 1;
+}
+
+fun invalid(account: &signer) {
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   let has_it = exists<MyResource<NoAbilities>>(addr);
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   let NoAbilities {} = move_from<NoAbilities>(addr);
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   move_to(account, NoAbilities {});
+   // Invalid, 'MyResource<NoAbilities>' does not have 'key'
+   borrow_global<NoAbilities>(addr);
+}
+```
diff --git a/language/documentation/book/translations/move-book-zh/src/abort-and-assert.md b/language/documentation/book/translations/move-book-zh/src/abort-and-assert.md
new file mode 100644
index 0000000000..314940ee18
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/abort-and-assert.md
@@ -0,0 +1,255 @@
+# 中止和断言 (Abort and Assert)
+
+[`return`](./functions.md) and `abort` are two control flow constructs that end execution, one for
+the current function and one for the entire transaction.
+
+More information on [`return` can be found in the linked section](./functions.md)
+
+[`return`](./functions.md) 和 `abort` 是两种结束程序执行的控制流结构。前者针对当前函数，后者针对整个事务。
+
+ [`return`](./functions.md)的更多信息可以参考链接中的文章。
+
+## `abort` 中止
+
+`abort` is an expression that takes one argument: an **abort code** of type `u64`. For example:
+
+`abort` 表达式只接受一个参数: 类型为 `u64` 的**中止代码**。例如：
+
+```move
+abort 42
+```
+
+The `abort` expression halts execution the current function and reverts all changes made to global
+state by the current transaction. There is no mechanism for "catching" or otherwise handling an `abort`.
+
+`abort` 表达式会中止执行当前函数并恢复当前事务对全局状态所做的所有更改。Move语言没有“捉捕”或者额外处理`abort`的机制。
+
+Luckily, in Move transactions are all or nothing, meaning any changes to global storage are made all
+at once only if the transaction succeeds. Because of this transactional commitment of changes, after
+an abort there is no need to worry about backing out changes. While this approach is lacking in
+flexibility, it is incredibly simple and predictable.
+
+幸运的是，在Move里事务的计算要么完全执行要么完全不执行。这意味着只有在事务成功时，任何对全局存储状态的改变才会被一并执行。
+由于这种对于所有更改的事务承诺，在 `abort` 之后我们不需要担心去回滚任何更改。尽管这种方法缺少灵活性，它还是非常简单和可预测的。
+
+
+Similar to [`return`](./functions.md), `abort` is useful for exiting control flow when some condition cannot be met.
+
+In this example, the function will pop two items off of the vector, but will abort early if the vector does not have two items
+
+与 [`return`](./functions.md)相似, 在一些条件无法被满足的时候，`abort` 可以被用于退出控制流(control flow)。
+
+在以下示例中，目标函数会从vector里弹出两个元素，但是如果vector中并没有两个元素，函数会提前中止。
+
+```move=
+use std::vector;
+fun pop_twice<T>(v: &mut vector<T>): (T, T) {
+    if (vector::length(v) < 2) abort 42;
+
+    (vector::pop_back(v), vector::pop_back(v))
+}
+```
+
+This is even more useful deep inside a control-flow construct. For example, this function checks
+that all numbers in the vector are less than the specified `bound`. And aborts otherwise
+
+这在控制流结构的深处甚至会更有用。例如，此函数检查vector中是否所有数字都小于指定的边界(`bound`)。否则函数中止：
+
+```move=
+use std::vector;
+fun check_vec(v: &vector<u64>, bound: u64) {
+    let i = 0;
+    let n = vector::length(v);
+    while (i < n) {
+        let cur = *vector::borrow(v, i);
+        if (cur > bound) abort 42;
+        i = i + 1;
+    }
+}
+```
+
+### `assert` 断言
+
+`assert` is a builtin, macro-like operation provided by the Move compiler. It takes two arguments, a condition of type `bool` and a code of type `u64`
+
+`assert` 是 Move 编译器提供的内置的类宏(macro-like)操作。它需要两个参数：一个 `bool` 类型的条件和一个 `u64` 类型的错误状态码(类似HTTP中的StatusCode: 404, 500等，译者注)
+
+```move
+assert!(condition: bool, code: u64)
+```
+
+Since the operation is a macro, it must be invoked with the `!`. This is to convey that the
+arguments to `assert` are call-by-expression. In other words, `assert` is not a normal function and
+does not exist at the bytecode level. It is replaced inside the compiler with
+
+由于该操作是一个宏，因此必须使用 `!` 调用它。这是为了表达 `assert` 的参数属于表达式调用(call-by-expression)。换句话说，`assert` 不是一个正常的函数，并且在字节码(bytecode)级别不存在。它在编译器内部被替换为以下代码：
+
+```move
+if (condition) () else abort code
+```
+
+`assert` is more commonly used than just `abort` by itself. The `abort` examples above can be rewritten using `assert`
+
+`assert` 比 `abort` 本身更常用。上面的 `abort` 示例可以使用 `assert` 重写
+
+```move=
+use std::vector;
+fun pop_twice<T>(v: &mut vector<T>): (T, T) {
+    assert!(vector::length(v) >= 2, 42); // 现在使用'assert'
+
+    (vector::pop_back(v), vector::pop_back(v))
+}
+```
+
+和
+
+```move=
+use std::vector;
+fun check_vec(v: &vector<u64>, bound: u64) {
+    let i = 0;
+    let n = vector::length(v);
+    while (i < n) {
+        let cur = *vector::borrow(v, i);
+        assert!(cur <= bound, 42); // 现在使用 'assert'
+        i = i + 1;
+    }
+}
+```
+
+Note that because the operation is replaced with this `if-else`, the argument for the `code` is not
+always evaluated. For example:
+
+请注意，因为此操作被替换为 `if-else`，这段 `代码` 的参数不是总是被执行(evaluated)。例如：
+
+```move
+assert!(true, 1 / 0)
+```
+
+Will not result in an arithmetic error, it is equivalent to
+
+不会导致算术错误，因为它相当于：
+
+```move
+if (true) () else (1 / 0)
+```
+
+So the arithmetic expression is never evaluated!
+
+所以这个算术表达式永远不会被执行(evaluated)！
+
+### Abort codes in the Move VM (Move虚拟机中的中止代码)
+
+When using `abort`, it is important to understand how the `u64` code will be used by the VM.
+
+Normally, after successful execution, the Move VM produces a change-set for the changes made to
+global storage (added/removed resources, updates to existing resources, etc).
+
+当使用 `abort` 时，理解虚拟机将如何使用 `u64` 代码是非常重要的。
+
+通常，在成功执行后，Move 虚拟机会为对全局存储(添加/删除资源、更新现有资源等)所做的更改生成一个更改集。
+
+If an `abort` is reached, the VM will instead indicate an error. Included in that error will be two
+pieces of information:
+
+- The module that produced the abort (address and name)
+- The abort code.
+
+For example
+
+如果执行到 `abort` 代码，虚拟机将指示错误。该错误中包含两块信息：
+
+- 发生中止的模块(地址和名称)
+- 错误状态码。
+
+例如
+
+```move=
+address 0x2 {
+    module example {
+        public fun aborts() {
+            abort 42
+        }
+    }
+}
+
+script {
+    fun always_aborts() {
+        0x2::example::aborts()
+    }
+}
+```
+
+If a transaction, such as the script `always_aborts` above, calls `0x2::example::aborts`, the VM
+would produce an error that indicated the module `0x2::example` and the code `42`.
+
+This can be useful for having multiple aborts being grouped together inside a module.
+
+In this example, the module has two separate error codes used in multiple functions
+
+如果一个事务，例如上面的脚本 `always_aborts` 调用了 `0x2::example::aborts`，虚拟机将产生一个指示模块 `0x2::example` 和错误状态码 `42` 的错误。
+
+这在一个模块内将多个中止功能组合起来会很有用。
+
+在以下示例中，模块有两个单独的错误状态码，用于多个函数
+
+```move=
+address 0x42 {
+    module example {
+
+        use std::vector;
+
+        const EMPTY_VECTOR: u64 = 0;
+        const INDEX_OUT_OF_BOUNDS: u64 = 1;
+
+        // 移动 i 到 j, 移动 j 到 k, 移动 k 到 i
+        public fun rotate_three<T>(v: &mut vector<T>, i: u64, j: u64, k: u64) {
+            let n = vector::length(v);
+            assert!(n > 0, EMPTY_VECTOR);
+            assert!(i < n, INDEX_OUT_OF_BOUNDS);
+            assert!(j < n, INDEX_OUT_OF_BOUNDS);
+            assert!(k < n, INDEX_OUT_OF_BOUNDS);
+
+            vector::swap(v, i, k);
+            vector::swap(v, j, k);
+        }
+
+        public fun remove_twice<T>(v: &mut vector<T>, i: u64, j: u64): (T, T) {
+            let n = vector::length(v);
+            assert!(n > 0, EMPTY_VECTOR);
+            assert!(i < n, INDEX_OUT_OF_BOUNDS);
+            assert!(j < n, INDEX_OUT_OF_BOUNDS);
+            assert!(i > j, INDEX_OUT_OF_BOUNDS);
+
+            (vector::remove<T>(v, i), vector::remove<T>(v, j))
+        }
+    }
+}
+```
+
+## The type of `abort` (`abort` 的类型)
+
+The `abort i` expression can have any type! This is because both constructs break from the normal
+control flow, so they never need to evaluate to the value of that type.
+
+The following are not useful, but they will type check
+
+`abort i` 表达式可以有任何类型！这是因为这两种构造都打破了正常控制流，因此他们永远不需要计算该类型的值。
+
+以下的示例不是特别有用，但它们会做类型检查
+
+```move
+let y: address = abort 0;
+```
+
+This behavior can be helpful in situations where you have a branching instruction that produces a
+value on some branches, but not all. For example:
+
+在您有一个分支指令，并且这个指令会产生某些分支(不是全部)的值的时候，这种行为会非常有用。例如：
+
+```move
+let b =
+    if (x == 0) false
+    else if (x == 1) true
+    else abort 42;
+//       ^^^^^^^^ `abort 42` 的类型是 `bool`
+```
diff --git a/language/documentation/book/translations/move-book-zh/src/address.md b/language/documentation/book/translations/move-book-zh/src/address.md
new file mode 100644
index 0000000000..1a5edc9d99
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/address.md
@@ -0,0 +1,58 @@
+# 地址
+
+`地址（address）`是 Move 中的内置类型，用于表示全局存储中的的位置（有时称为账户）。`地址（address）` 值是一个 128 位（16 字节）标识符。在一个给定的地址，可以存储两样东西：[模块（Module）](./modules-and-scripts.md)和[资源（Resources）](./structs-and-resources.md)。
+
+虽然`地址（address）`在底层是一个 128 位整数，但 Move 语言有意让其不透明 —— 它们不能从整数创建，不支持算术运算，也不能修改。即使可能有一些有趣的程序会使用这种特性（例如，C 中的指针算法实现了类似壁龛（niche）的功能），但 Move 语言不允许这种动态行为，因为它从头开始就被设计为支持静态验证。*（壁龛指安装在墙壁上的小格子或在墙身上留出的作为贮藏设施的空间，最早在宗教上是指排放佛像的小空间，现在多用在家庭装修上，因其不占建筑面积，使用比较方便，深受大家喜爱，Joe 注）*
+
+你可以通过运行时地址值（`address` 类型的值）来访问该地址处的资源。但*无法*在运行时通过地址值访问模块。
+
+## 地址及其语法
+
+地址有两种形式：*命名的*或*数值的*。命名地址的语法遵循 Move 命名标识符的规则。数值地址的语法不受十六进制编码值的限制，任何有效的 [`u128` 数值](./integers.md)都可以用作地址值。例如，`42`，`0xCFAE` 和 `2021` 都是合法有效的数值地址字面量（literal）。
+
+为了区分何时在表达式上下文中使用地址，使用地址时的语法根据使用地址的上下文而有所不同：
+
+* 当地址被用作表达式时，地址必须以 `@` 字符为前缀，例如：[`@<numerical_value>`](./integers.md) 或 `@<named_address_identifier>`。
+* 在表达式上下文之外，地址可以不带前缀字符 `@`。例如：[`<numerical_value>`](./integers.md) 或 `<named_address_identifier>`。
+
+通常，可以将 `@` 视为将地址从命名空间项变为表达式项的运算符。
+
+## 命名地址
+
+命名地址是一项特性，它允许在使用地址的任何地方使用标识符代替数值，而不仅仅是在值级别。命名地址被声明并绑定为 Move 包中的顶级元素（模块和脚本之外）或作为参数传递给 Move 编译器。
+
+命名地址仅存在于源语言级别，并将在字节码级别完全替代它们的值。因此，模块和模块成员*必须*通过模块的命名地址而不是编译期间分配给命名地址的数值来访问，例如：`use my_addr::foo` *不等于* `use 0x2::foo`，即使 Move 程序编译时将 `my_addr` 设置成 `0x2`。这个区别在[模块和脚本](./modules-and-scripts.md)一节中有更详细的讨论。
+
+### 例子
+
+```move
+let a1: address = @0x1; // 0x00000000000000000000000000000001 的缩写
+let a2: address = @0x42; // 0x00000000000000000000000000000042 的缩写
+let a3: address = @0xDEADBEEF; // 0x000000000000000000000000DEADBEEF 的缩写
+let a4: address = @0x0000000000000000000000000000000A;
+let a5: address = @std; // 将命名地址 `std` 的值赋给 `a5`
+let a6: address = @66;
+let a7: address = @0x42;
+
+module 66::some_module {   // 不在表达式上下文中，所以不需要 @
+    use 0x1::other_module; // 不在表达式上下文中，所以不需要 @
+    use std::vector;       // 使用其他模块时，可以使用命名地址作为命名空间项
+    ...
+}
+
+module std::other_module {  // 可以使用命名地址作为命名空间项来声明模块
+    ...
+}
+```
+
+## 全局存储操作
+
+`address` 值主要用来与全局存储操作进行交互。
+
+`address` 值与 `exists`、`borrow_global`、`borrow_global_mut` 和 `move_from` [操作（operation）](./global-storage-operators.md)一起使用。
+
+唯一*不使用* `address` 的全局存储操作是 `move_to`，它使用了 [`signer`](./signer.md)。
+
+## 所有权
+
+与 Move 语言内置的其他标量值一样，`address` 值是隐式可复制的，这意味着它们可以在没有显式指令（例如 [`copy`](./variables.md#移动和复制)）的情况下复制。
diff --git a/language/documentation/book/translations/move-book-zh/src/bool.md b/language/documentation/book/translations/move-book-zh/src/bool.md
new file mode 100644
index 0000000000..d49844ddbe
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/bool.md
@@ -0,0 +1,49 @@
+# 布尔类型 (Bool)
+
+`bool`is Move's primitive type for boolean `true` and `false`values.
+
+`bool` 是 Move 布尔基本类型，有 `true` 和 `false` 两个值。
+
+## 字面量 (Literals)
+
+Literals for `bool` are either `true` or `false` .
+
+布尔类型字面值只能是 `true` 或者 `false`中的一个 。
+
+## 操作 (Operations)
+
+### 逻辑运算 (Logical)
+
+`bool`supports three logical operations:
+
+| Syntax                    | Description                  | Equivalent Expression                                               |
+| ------------------------- | ---------------------------- | ------------------------------------------------------------------- |
+| `&&`                      | short-circuiting logical and | `p && q` is equivalent to `if (p) q else false`                     |
+| <code>&vert;&vert;</code> | short-circuiting logical or  | <code>p &vert;&vert; q</code> is equivalent to `if (p) true else q` |
+| `!`                       | logical negation             | `!p` is equivalent to `if (p) false else true`                      |
+
+
+`bool` 支持三种逻辑运算：
+
+| 句法 | 描述                  | Equivalent Expression                           |
+| ------ | ---------------------------- | ----------------------------------------------- |
+| `&&`   | 短路逻辑与(short-circuiting logical and) | `p && q` 等价于 `if (p) q else false` |
+| <code>&vert;&vert;</code>   | 短路逻辑或(short-circuiting logical or)  | `p || q` 等价于 `if (p) true else q`  |
+| `!`    | 逻辑非(logical negation)            | `!p` 等价于 `if (p) false else true`  |
+
+
+### 控制流 (Control Flow)
+
+`bool`values are used in several of Move's control-flow constructs:
+
+布尔值用于 Move 的多个控制流结构中：
+
+- [`if (bool) { ... }`](./conditionals.html)
+- [`while (bool) { .. }`](/loops.html)
+- [`assert!(bool, u64)`](./abort-and-assert.html)
+
+## 所有权 (Ownership)
+
+As with the other scalar values built-in to the language, boolean values are implicitly copyable, meaning they can be copied without an explicit instruction such as `[copy](<https://move-language.github.io/move/variables.html#move-and-copy>).`
+
+与语言内置的其他标量值一样，布尔值是隐式可复制的，这意味着它们可以在没有明确指令如[`copy`](./variables.md#move-and-copy)的情况下复制。
diff --git a/language/documentation/book/translations/move-book-zh/src/coding-conventions.md b/language/documentation/book/translations/move-book-zh/src/coding-conventions.md
new file mode 100644
index 0000000000..0ea7920b8d
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/coding-conventions.md
@@ -0,0 +1,76 @@
+# Move 编码约定
+
+本节列出了 Move 团队认为有用的一些基本的 Move 编码约定。这些只是建议，如果你喜欢其他格式指南和约定，你可以随时使用它们。
+
+## 命名
+
+- **模块名称**：应该使用小写的蛇形命名法，例如：`fixed_point32`、`vector`。
+- **类型名称**：如果不是原生数据类型，则应使用驼峰命名法，例如：`Coin`、`RoleId`。
+- **函数名称**：应该使用小写的蛇形命名法，例如：`destroy_empty`。
+- **常量名称**：应该使用大写的蛇形命名法，例如：`REQUIRES_CAPABILITY`。
+- 泛型类型应该具备描述性，当然在适当的情况下也可以是反描述性的，例如：Vector 泛型类型的参数可以是 `T` 或 `Element`。大多数情况下，模块中的“主”类型命名应该与模块名相同，例如：`option::Option`，`fixed_point32::FixedPoint32`。
+- **模块文件名称**：应该与模块名相同，例如：`Option.move`。
+- **脚本文件名称**：应该使用小写的蛇形命名法，并且应该与脚本中的“主”函数名匹配。
+- **混合文件名称**：如果文件包含多个模块和/或脚本，文件命名应该使用小写的蛇形命名法，并且不需要与内部的任何特定模块/脚本名匹配。
+
+## 导入
+
+- 所有模块的 `use` 语句都应该位于模块的顶部。
+- 函数应该从声明它们的模块中完全限定地导入和使用, 而不是在顶部导入。
+- 类型应该在顶部导入。如果存在名称冲突，应使用 `as` 在本地适当地重命名类型。
+
+例如，如果有一个模块：
+
+```move
+module 0x1::foo {
+    struct Foo { }
+    const CONST_FOO: u64 = 0;
+    public fun do_foo(): Foo { Foo{} }
+    ...
+}
+```
+
+此时将被导入并使用：
+
+```move
+module 0x1::bar {
+    use 0x1::foo::{Self, Foo};
+
+    public fun do_bar(x: u64): Foo {
+        if (x == 10) {
+            foo::do_foo()
+        } else {
+            abort 0
+        }
+    }
+    ...
+}
+```
+
+并且，如果在导入两个模块时存在本地名称冲突：
+
+```move
+module other_foo {
+    struct Foo {}
+    ...
+}
+
+module 0x1::importer {
+    use 0x1::other_foo::Foo as OtherFoo;
+    use 0x1::foo::Foo;
+    ...
+}
+```
+
+## 注释
+
+- 每个模块、结构体和公共函数声明都应该有对应的注释。
+- Move 有文档注释 `///`，常规单行注释 `//`，块注释 `/* */`，和块文档注释 `/** */`。
+
+## 格式化
+
+Move 团队计划编写一个自动格式化程序来执行格式化约定。然而，在此期间：
+
+- 除 `script` 和 `address` 块外，其他的内容应使用四个空格的缩进。
+- 每行代码，如果超过 100 个字符，应该换行。
+- 结构体和常量应该在模块中的所有函数之前声明。
diff --git a/language/documentation/book/translations/move-book-zh/src/conditionals.md b/language/documentation/book/translations/move-book-zh/src/conditionals.md
new file mode 100644
index 0000000000..0edbb8c42d
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/conditionals.md
@@ -0,0 +1,78 @@
+# 条件语句 (Conditionals)
+
+An `if` expression specifies that some code should only be evaluated if a certain condition is true. For example:
+
+`if` 语句可以用来指定一块代码块，但只在判断条件(condition)为true时才会被执行。例如:
+
+```move
+if (x > 5) x = x - 5
+```
+
+The condition must be an expression of type `bool`.
+
+An `if` expression can optionally include an `else` clause to specify another expression to evaluate when the condition is false.
+
+条件语句(condition)必须是 `bool` 类型的表达式。
+
+`if` 语句可选包含 `else` 子句，以指定当条件(condition)为 false 时要执行的另一个代码块。
+
+```move
+if (y <= 10) y = y + 1 else y = 10
+```
+
+Either the "true" branch or the "false" branch will be evaluated, but not both. Either branch can be a single expression or an expression block.
+
+The conditional expressions may produce values so that the `if` expression has a result.
+
+无论是"true"分支还是"false"分支都会被执行，但不会同时执行.其中任何一个分支都可以是单行代码或代码块。条件表达式会产生值，所以 `if` 表达式会有一个结果。
+
+```move
+let z = if (x < 100) x else 100;
+```
+
+The expressions in the true and false branches must have compatible types. For example:
+
+true 和 false 分支的表达式类型必须是一致的,例如:
+
+```move=
+// x和y必须是u64整型
+// x and y must be u64 integers
+let maximum: u64 = if (x > y) x else y;
+
+// 错误！分支的类型不一致
+// (ERROR! branches different types)
+let z = if (maximum < 10) 10u8 else 100u64;
+
+// 错误！分支的类型不一致,false-branch默认是()不是u64
+// ERROR! branches different types, as default false-branch is () not u64
+if (maximum >= 10) maximum;
+```
+
+If the `else` clause is not specified, the false branch defaults to the unit value. The following are equivalent:
+
+如果`else`子句未定义，false分支默认为 unit 。下面的例子是相等价的:
+
+```move
+if (condition) true_branch // implied default: else ()
+if (condition) true_branch else ()
+```
+
+Commonly, [`if` expressions](./conditionals.md) are used in conjunction with expression blocks.
+
+一般来说, [`if` 表达式](./conditionals.md)与多个表达式块结合使用.
+
+```move
+let maximum = if (x > y) x else y;
+if (maximum < 10) {
+    x = x + 10;
+    y = y + 10;
+} else if (x >= 10 && y >= 10) {
+    x = x - 10;
+    y = y - 10;
+}
+```
+
+## 条件语句的语法 (Grammar for Conditionals)
+
+> *if-expression* → **if (** *expression* **)** *expression* *else-clause*<sub>*opt*</sub>
+> *else-clause* → **else** *expression*
diff --git a/language/documentation/book/translations/move-book-zh/src/constants.md b/language/documentation/book/translations/move-book-zh/src/constants.md
new file mode 100644
index 0000000000..380322e8fc
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/constants.md
@@ -0,0 +1,136 @@
+# 常量 (Constants)
+
+Constants are a way of giving a name to shared, static values inside of a `module` or `script`.
+
+The constant's must be known at compilation. The constant's value is stored in the compiled module
+or script. And each time the constant is used, a new copy of that value is made.
+
+常量是一种对 `module` 或 `script` 内的共享静态值进行命名的方法(类似变量，但值不变，译者注)。
+
+常量必须在编译时知道。常量的值存储在编译模块或脚本中。每次使用该常量时，都会生成该值的新副本。
+
+## 声明 (Declaration)
+
+Constant declarations begin with the `const` keyword, followed by a name, a type, and a value. They
+can exist in either a script or module
+
+常量声明以 `const` 关键字开头，后跟名称、类型和值。他们可以存在于脚本或模块中
+
+```text
+const <name>: <type> = <expression>;
+```
+
+例如
+
+```move=
+script {
+
+    const MY_ERROR_CODE: u64 = 0;
+
+    fun main(input: u64) {
+        assert!(input > 0, MY_ERROR_CODE);
+    }
+
+}
+
+address 0x42 {
+    module example {
+
+        const MY_ADDRESS: address = @0x42;
+
+        public fun permissioned(s: &signer) {
+            assert!(std::signer::address_of(s) == MY_ADDRESS, 0);
+        }
+
+    }
+}
+```
+
+## 命名 (Naming)
+
+Constants must start with a capital letter `A` to `Z`. After the first letter, constant names can
+contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, or digits `0` to `9`.
+
+常量必须以大写字母 `A` 到 `Z` 开头。在第一个字母之后，常量名可以包含下划线 `_`、字母 `a` 到 `z`、字母 `A` 到 `Z` 或数字 `0` 到 `9`。
+
+```move
+const FLAG: bool = false;
+const MY_ERROR_CODE: u64 = 0;
+const ADDRESS_42: address = @0x42;
+```
+
+Even though you can use letters `a` to `z` in a constant. The
+[general style guidelines](./coding-conventions.md) are to use just uppercase letters `A` to `Z`,
+with underscores `_` between each word.
+
+虽然你可以在常量中使用字母 `a` 到 `z`。但[通用风格指南](./coding-conventions.md) 只使用大写字母 `A` 到 `Z`，每个单词之间有下划线`_`。
+
+This naming restriction of starting with `A` to `Z` is in place to give room for future language features. It may or may not be removed later.
+
+这种以 `A` 到 `Z` 开头的命名限制是为了给未来的语言特性留出空间。此限制未来可能会保留或删除。
+
+## 可见性 (Visibility)
+
+`public` constants are not currently supported. `const` values can be used only in the declaring
+module.
+
+当前不支持 `public` 常量。 `const` 值只能在声明的模块中使用。
+
+## 有效表达式 (Valid Expressions)
+
+Currently, constants are limited to the primitive types `bool`, `u8`, `u64`, `u128`, `address`, and
+`vector<u8>`. Future support for other `vector` values (besides the "string"-style literals) will come later.
+
+目前，常量仅限于原始类型 `bool`、`u8`、`u64`、`u128`、`address` 和`vector<u8>`。其他 `vector` 值(除了“string”风格的字面量)将在不远的将来获得支持。
+
+### 值 (Values)
+
+Commonly, `const`s are assigned a simple value, or literal, of their type. For example
+
+通常，`const` (常量)会被分配一个对应类型的简单值或字面量。例如
+
+```move
+const MY_BOOL: bool = false;
+const MY_ADDRESS: address = @0x70DD;
+const BYTES: vector<u8> = b"hello world";
+const HEX_BYTES: vector<u8> = x"DEADBEEF";
+```
+
+### 复杂表达式 (Complex Expressions)
+
+
+In addition to literals, constants can include more complex expressions, as long as the compiler is
+able to reduce the expression to a value at compile time.
+
+Currently, equality operations, all boolean operations, all bitwise operations, and all arithmetic
+operations can be used.
+
+除了字面量，常量还可以包含更复杂的表达式，只要编译器能够在编译时将表达式归纳(reduce)为一个值。
+
+目前，相等运算、所有布尔运算、所有按位运算和所有算术运算可以使用。
+
+```move
+const RULE: bool = true && false;
+const CAP: u64 = 10 * 100 + 1;
+const SHIFTY: u8 = {
+  (1 << 1) * (1 << 2) * (1 << 3) * (1 << 4)
+};
+const HALF_MAX: u128 = 340282366920938463463374607431768211455 / 2;
+const EQUAL: bool = 1 == 1;
+```
+
+If the operation would result in a runtime exception, the compiler will give an error that it is
+unable to generate the constant's value
+
+如果操作会导致运行时异常，编译器会给出无法生成常量值的错误。
+
+```move
+const DIV_BY_ZERO: u64 = 1 / 0; // error!
+const SHIFT_BY_A_LOT: u64 = 1 << 100; // error!
+const NEGATIVE_U64: u64 = 0 - 1; // error!
+```
+
+Note that constants cannot currently refer to other constants. This feature, along with support for
+other expressions, will be added in the future.
+
+请注意，常量当前不能引用其他常量。此功能会在将来和支持其他表达方式一起被补充。
diff --git a/language/documentation/book/translations/move-book-zh/src/creating-coins.md b/language/documentation/book/translations/move-book-zh/src/creating-coins.md
new file mode 100644
index 0000000000..1f06df9a00
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/creating-coins.md
@@ -0,0 +1,7 @@
+# Move Tutorial
+
+Please refer to the [Move Tutorial](https://github.com/move-language/move/tree/main/language/documentation/tutorial).
+
+# Move 教程
+
+请参阅 [Move 教程](https://github.com/move-language/move/tree/main/language/documentation/tutorial)。
diff --git a/language/documentation/book/translations/move-book-zh/src/equality.md b/language/documentation/book/translations/move-book-zh/src/equality.md
new file mode 100644
index 0000000000..2abe89623f
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/equality.md
@@ -0,0 +1,192 @@
+
+# 等式 (Equality)
+
+Move supports two equality operations `==` and `!=`
+
+Move 支持两种等式操作： `==` 和 `!=`
+
+## 操作 (Operations)
+
+| Syntax | Operation | Description                                                                 |
+| ------ | --------- | --------------------------------------------------------------------------- |
+| `==`   | equal     | Returns `true` if the two operands have the same value, `false` otherwise   |
+| `!=`   | not equal | Returns `true` if the two operands have different values, `false` otherwise |
+
+| 语法 | 操作 | 描述                                                                 |
+| ------ | --------- | --------------------------------------------------------------------------- |
+| `==`   | 相等     | 如果两个操作数(operands)值相同，返回 `true` , 否则返回 `false`  |
+| `!=`   | 不相等 | 如果两个操作数(operands)值不相同，返回 `true` , 否则返回 `false`  |
+
+### 类型校验 (Typing)
+
+Both the equal (`==`) and not-equal (`!=`) operations only work if both operands are the same type.
+
+只有当左右两个操作数类型相同，相等操作 (`==`) 与不等操作 (`!=`) 才能正常使用。
+
+```move
+0 == 0; // `true`
+1u128 == 2u128; // `false`
+b"hello" != x"00"; // `true`
+```
+
+Equality and non-equality also work over user defined types!
+
+等式与不等式也可以在用户自定义的类型下使用！
+
+```move=
+address 0x42 {
+    module example {
+        struct S has copy, drop { f: u64, s: vector<u8> }
+
+        fun always_true(): bool {
+            let s = S { f: 0, s: b"" };
+            // 括号不是必需的，但为了清楚起见在此示例中添加了括号
+            (copy s) == s
+        }
+
+        fun always_false(): bool {
+            let s = S { f: 0, s: b"" };
+            // 括号不是必需的，但为了清楚起见在此示例中添加了括号
+            (copy s) != s
+        }
+    }
+}
+```
+
+If the operands have different types, there is a type checking error.
+
+如果两边操作数的类型不同，则会出现类型检测错误。
+
+```move
+1u8 == 1u128; // 错误!
+//     ^^^^^ 期望此变量的类型是 'u8'
+b"" != 0; // 错误!
+//     ^ 期望此变量的类型是 'vector<u8>'
+```
+
+### 引用变量的类型校验 (Typing with references)
+
+When comparing [references](./references.md), the type of the reference (immutable or mutable) does
+not matter. This means that you can compare an immutable `&` reference with a mutable one `&mut` of
+the same underlying type.
+
+当比较[引用变量](./references.md)时，引用的类别(不可变更的或可变更的(immutable or mutable))无关紧要。这意味着我们可以拿一个不可变更的 `&` 引用变量和另一个有相同相关类型的可变更的 `&mut ` 引用变量进行比较。
+
+```move
+let i = &0;
+let m = &mut 1;
+
+i == m; // `false`
+m == i; // `false`
+m == m; // `true`
+i == i; // `true`
+```
+
+The above is equivalent to applying an explicit freeze to each mutable reference where needed
+
+在需要时，对每个可变引用使用显式冻结(explicit freeze)的结果与上述情况一致。
+
+```move
+let i = &0;
+let m = &mut 1;
+
+i == freeze(m); // `false`
+freeze(m) == i; // `false`
+m == m; // `true`
+i == i; // `true`
+```
+But again, the underlying type must be the same type
+
+但同样的，我们需要两边操作数的类型一致
+
+```move
+let i = &0;
+let s = &b"";
+
+i == s; // 错误!
+//   ^ 期望此变量的类型是 '&u64'
+```
+
+## 限制 (Restrictions)
+
+Both `==` and `!=` consume the value when comparing them. As a result, the type system enforces that
+the type must have [`drop`](./abilities.md). Recall that without the [`drop` ability](./abilities.md),
+ownership must be transferred by the end of the function, and such values can only be explicitly destroyed
+within their declaring module. If these were used directly with either equality `==` or non-equality `!=`,
+the value would be destroyed which would break [`drop` ability](./abilities.md) safety guarantees!
+
+`==` 和 `!=` 会在比较不同变量的时候消耗 (consume)它们所包含的值，所以 Move 的类型系统会强制要求这些类型含有[`drop` 能力](./abilities.md)。回想一下，变量在没有[`drop` 能力](./abilities.md)时，所有权必须在函数结束前进行转移，而且这些值只能在其声明模块中被明确销毁(explicitly destroyed)。如果它们被直接使用于等式 `==` 或不等式 `!=` ，其值会被销毁并且这会打破[`drop` 能力](./abilities.md)的安全保证！
+
+```move=
+address 0x42 {
+    module example {
+        struct Coin has store { value: u64 }
+        fun invalid(c1: Coin, c2: Coin) {
+            c1 == c2 // 错误!
+    //      ^^    ^^ 这些资源将会被销毁!
+        }
+    }
+}
+```
+
+
+But, a programmer can _always_ borrow the value first instead of directly comparing the value, and
+reference types have the [`drop` ability](./abilities.md). For example
+
+然而, 程序员 _总是_ 可以优先借用变量的值，而不直接比较它们的值。这样一来，引用变量的类型将会拥有[`drop` 能力](./abilities.md)。例如：
+
+```move=
+address 0x42 {
+    module example {
+        struct Coin as store { value: u64 }
+        fun swap_if_equal(c1: Coin, c2: Coin): (Coin, Coin) {
+            let are_equal = &c1 == &c2; // 合规范的
+            if (are_equal) (c2, c1) else (c1, c2)
+        }
+    }
+}
+```
+
+## 避免额外的复制 (Avoid Extra Copies)
+
+While a programmer _can_ compare any value whose type has [`drop`](./abilities.md), a programmer
+should often compare by reference to avoid expensive copies.
+
+当程序员 _可以_ 比较其类型含有[`drop` 能力](./abilities.md)的任意值时，他们应该尽可能多地使用引用变量来比较，以此来避免昂贵的复制。
+
+```move=
+let v1: vector<u8> = function_that_returns_vector();
+let v2: vector<u8> = function_that_returns_vector();
+assert!(copy v1 == copy v2, 42);
+//     ^^^^       ^^^^
+use_two_vectors(v1, v2);
+
+let s1: Foo = function_that_returns_large_struct();
+let s2: Foo = function_that_returns_large_struct();
+assert!(copy s1 == copy s2, 42);
+//     ^^^^       ^^^^
+use_two_foos(s1, s2);
+```
+
+This code is perfectly acceptable (assuming `Foo` has [`drop`](./abilities.md)), just not efficient.
+The highlighted copies can be removed and replaced with borrows
+
+以上代码是完全可以接受的(假设`Foo`具备[`drop`](./abilities.md)能力)，但它不是最有效的写法。突出显示的副本可以删除并替换为借用。
+
+```move=
+let v1: vector<u8> = function_that_returns_vector();
+let v2: vector<u8> = function_that_returns_vector();
+assert!(&v1 == &v2, 42);
+//     ^      ^
+use_two_vectors(v1, v2);
+
+let s1: Foo = function_that_returns_large_struct();
+let s2: Foo = function_that_returns_large_struct();
+assert!(&s1 == &s2, 42);
+//     ^      ^
+use_two_foos(s1, s2);
+```
+
+The efficiency of the `==` itself remains the same, but the `copy`s are removed and thus the program is more efficient.
+
+`==` 本身的效率还是和之前一样，但是 `copy` 操作被移除后整个程序会比之前更有效率。
diff --git a/language/documentation/book/translations/move-book-zh/src/friends.md b/language/documentation/book/translations/move-book-zh/src/friends.md
new file mode 100644
index 0000000000..238dce84f4
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/friends.md
@@ -0,0 +1,154 @@
+# 友元函数（Friends）
+
+The `friend` syntax is used to declare modules that are trusted by the current module.
+A trusted module is allowed to call any function defined in the current module that have the `public(friend)` visibility.
+For details on function visibilities, please refer to the *Visibility* section in [Functions](./functions.md).
+
+友元语法用于声明当前模块信任的其它模块。受信任的模块可以调用当前模块中定义的任何具有`公开（友元）`可见性的函数。有关函数可见性的详细信息，请参阅[函数](./functions.md)中的可见性部分。
+
+## 友元声明（Friend declaration）
+
+A module can declare other modules as friends via friend declaration statements, in the format of
+
+一个模块可以通过友元声明语句将其他模块声明为友元，格式为：
+
+- `friend <address::name>` — friend declaration using fully qualified module name like the example below, or
+-	`friend <address::name>—` 使用完全合格的模块名称的友元声明，如下例所示，或
+
+    ```
+    address 0x42 {
+    module a {
+        friend 0x42::b;
+    }
+    }
+    ```
+
+- `friend <module-name-alias>` — friend declaration using a module name alias, where the module alias is introduced via the `use` statement.
+- `friend <module-name-alias>—` 使用模块名称别名的友元声明，其中模块别名是通过use语句引入的。
+
+   ```move
+  address 0x42 {
+  module a {
+      use 0x42::b;
+      friend b;
+  }
+  }
+  ```
+
+A module may have multiple friend declarations, and the union of all the friend modules forms the friend list.
+In the example below, both `0x42::B` and `0x42::C` are considered as friends of `0x42::A`.
+
+一个模块可能有多个友元声明，所有好友模块的并集形成友元列表。在下面的示例中`，0x42::B`和`0x42::C`都被视为 的友元函数`0x42::A`。
+
+   ```move
+    address 0x42 {
+    module a {
+        friend 0x42::b;
+        friend 0x42::c;
+    }
+    }
+  ```
+
+Unlike `use` statements, `friend` can only be declared in the module scope and not in the expression block scope.
+`friend` declarations may be located anywhere a top-level construct (e.g., `use`, `function`, `struct`, etc.) is allowed.
+However, for readability, it is advised to place friend declarations near the beginning of the module definition.
+
+与`use`语句不同，`friend`只能在模块作用域内声明，而不能在表达式块的作用域内声明。`friend`声明可以位于允许顶层构造的任何位置（例如， `use`， `function，struct`等）是被允许的。但是，为了可读性，建议将友元声明放在模块定义的开头附近。
+
+Note that the concept of friendship does not apply to Move scripts:
+- A Move script cannot declare `friend` modules as doing so is considered meaningless: there is no mechanism to call the function defined in a script.
+- A Move module cannot declare `friend` scripts as well because scripts are ephemeral code snippets that are never published to global storage.
+
+请注意，友元关系（friendship）的概念不适用于 Move 脚本：
+-	`Move` 脚本不能声明`friend`模块，因为这样做被认为是无意义的：没有机制可以调用脚本中定义的函数。
+-	`Move` 模块也不能声明`friend`脚本，因为脚本是永远不会发布到全局存储的临时代码片段。
+
+### 友元声明规则（Friend declaration rules）
+Friend declarations are subject to the following rules:
+友元声明须遵守以下规则：
+
+- A module cannot declare itself as a friend
+- 一个模块不能将自己声明为友元。
+
+   ```move=
+  address 0x42 {
+  module m { friend Self; // 错误! }
+  //                ^^^^ 不能将自己声明为友元
+  }
+
+  address 0x43 {
+  module m { friend 0x43::M; // 错误! }
+  //                ^^^^^^^ 不能将自己声明为友元
+  }
+  ```
+
+- Friend modules must be known by the compiler
+- 编译器必须知道友元模块
+
+   ```move=
+  address 0x42 {
+  module m { friend 0x42::nonexistent; // 错误! }
+  //                ^^^^^^^^^^^^^^^^^ 未绑定的模块 '0x42::nonexistent'
+  }
+  ```
+
+ - Friend modules must be within the same account address. (Note: this is not a technical requirement but rather a policy decision which *may* be relaxed later.)
+
+ -	友元模块必须在同一个账号地址内。（注：这不是技术要求，而是以后可能放宽的决策。)
+
+    ```move
+    address 0x42 {
+    module m {}
+    }
+
+    address 0x43 {
+    module n { friend 0x42::m; // 错误! }
+    //                ^^^^^^^ 不能声明当前地址外的模块作为友元
+    }
+    ```
+
+-	友元关系不能创建循环模块依赖关系（Friends relationships cannot create cyclic module dependencies）
+
+Cycles are not allowed in the friend relationships, e.g., the relation `0x2::a` friends `0x2::b` friends `0x2::c` friends `0x2::a` is not allowed.
+More generally, declaring a friend module adds a dependency upon the current module to the friend module (because the purpose is for the friend to call functions in the current module).
+If that friend module is already used, either directly or transitively, a cycle of dependencies would be created.
+
+友元关系中不允许循环，例如 `0x2::a` 友元 `0x2::b` 友元 `0x2::c` 友元`0x2::a`是不允许的。更普遍地，声明一个友元模块会将对当前模块的依赖添加到友元模块（因为目的是让友元调用当前模块中的函数）。如果该友元模块已被直接或传递地使用，则将形成一个依赖循环。
+
+   ```move
+  address 0x2 {
+  module a {
+      use 0x2::c;
+      friend 0x2::b;
+
+      public fun a() {
+          c::c()
+      }
+  }
+
+  module b {
+      friend 0x2::c; // 错误!
+  //         ^^^^^^ 这个友元关系形成了一个依赖循环:  '0x2::a' 使用了 '0x2::c' 但'0x2::b' 同时是 '0x2::a'和'0x2::b' 的友元
+  }
+
+  module c {
+      public fun c() {}
+  }
+  }
+```
+
+- The friend list for a module cannot contain duplicates.
+-	模块的友元列表不能包含重复项。
+
+   ```move=
+  address 0x42 {
+  module a {}
+
+  module m {
+      use 0x42::a as aliased_a;
+      friend 0x42::A;
+      friend aliased_a; // 错误!
+  //         ^^^^^^^^^ 重复的友元声明 '0x42::a'. 模块内的友元声明必须是唯一的
+  }
+  }
+  ```
diff --git a/language/documentation/book/translations/move-book-zh/src/functions.md b/language/documentation/book/translations/move-book-zh/src/functions.md
new file mode 100644
index 0000000000..e0fb8d2a04
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/functions.md
@@ -0,0 +1,607 @@
+# 函数 (Functions)
+
+Function syntax in Move is shared between module functions and script functions. Functions inside of modules are reusable, whereas script functions are only used once to invoke a transaction.
+
+Move中的函数语法在模块函数和脚本函数之间是一致的。模块内部的函数可重复使用，而脚本的函数只能被使用一次用来调用事务。
+
+# 声明 (Declaration)
+
+Functions are declared with the `fun` keyword followed by the function name, type parameters, parameters, a return type, acquires annotations, and finally the function body.
+
+函数使用 `fun` 关键字声明，后跟函数名称、类型参数、参数、返回类型、获取标注(annotation)，最后是函数体。
+
+```text
+fun <identifier><[type_parameters: constraint],*>([identifier: type],*): <return_type> <acquires [identifier],*> <function_body>
+```
+
+例如
+
+```move
+fun foo<T1, T2>(x: u64, y: T1, z: T2): (T2, T1, u64) { (z, y, x) }
+```
+
+### 可见性 (Visibility)
+
+Module functions, by default, can only be called within the same module. These internal (sometimes called private) functions cannot be called from other modules or from scripts.
+
+默认情况下，模块函数只能在同一个模块内调用。这些内部(有时称为私有)函数不能从其他模块或脚本中调用。
+
+```move=
+address 0x42 {
+    module m {
+        fun foo(): u64 { 0 }
+        fun calls_foo(): u64 { foo() } // valid
+    }
+
+    module other {
+        fun calls_m_foo(): u64 {
+            0x42::m::foo() // ERROR!
+    //      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+        }
+    }
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+    }
+}
+```
+
+To allow access from other modules or from scripts, the function must be declared `public` or `public(friend)`.
+
+要允许从其他模块或脚本访问，该函数必须声明为 `public` 或 `public(friend)`。
+
+#### `public` 可见性 (`public` visibility)
+
+A `public` function can be called by *any* function defined in *any* module or script. As shown in the following example, a `public` function can be called by:
+- other functions defined in the same module,
+- functions defined in another module, or
+- the function defined in a script.
+
+`public` 函数可以被任何模块或脚本中定义的任何函数调用。如以下示例所示，可以通过以下方式调用 `public` 函数：
+
+- 在同一模块中定义的其他函数
+- 在另一个模块中定义的函数
+- 在脚本中定义的函数
+
+```move=
+address 0x42 {
+    module m {
+        public fun foo(): u64 { 0 }
+        fun calls_foo(): u64 { foo() } // valid
+    }
+
+    module other {
+        fun calls_m_foo(): u64 {
+            0x42::m::foo() // valid
+        }
+    }
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // valid
+    }
+}
+```
+
+#### `public(friend)` 可见性 (`public(friend)` visibility)
+
+The `public(friend)` visibility modifier is a more restricted form of the `public` modifier to give more control about where a function can be used. A `public(friend)` function can be called by:
+- other functions defined in the same module, or
+- functions defined in modules which are explicitly specified in the **friend list** (see [Friends](./friends.md) on how to specify the friend list).
+
+Note that since we cannot declare a script to be a friend of a module, the functions defined in scripts can never call a `public(friend)` function.
+
+`public(friend)` 可见性修饰符是一种比 `public` 修饰符限制更严格的形式，可以更好地控制函数的使用位置。 `public(friend)` 函数可以通过以下方式调用：
+
+- 在同一模块中定义的其他函数，或者在 **friend list** 中明确指定的模块中定义的函数(请参阅 [Friends](./friends.md) 了解如何指定友元(friends)列表)。
+
+请注意，由于我们不能将脚本声明为模块的友元关系，因此脚本中定义的函数永远不能调用 `public(friend)` 函数。
+
+```move=
+address 0x42 {
+    module m {
+        friend 0x42::n;  // friend declaration
+        public(friend) fun foo(): u64 { 0 }
+        fun calls_foo(): u64 { foo() } // valid
+    }
+
+    module n {
+        fun calls_m_foo(): u64 {
+            0x42::m::foo() // valid
+        }
+    }
+
+    module other {
+        fun calls_m_foo(): u64 {
+            0x42::m::foo() // ERROR!
+    //      ^^^^^^^^^^^^ 'foo' can only be called from a 'friend' of module '0x42::m'
+        }
+    }
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' can only be called from a 'friend' of module '0x42::m'
+    }
+}
+```
+
+### `entry` 修饰符 (`entry` modifier)
+
+The `entry` modifier is designed to allow module functions to be safely and directly invoked much like scripts. This allows module writers to specify which functions can be to begin execution. The module writer then knows that any non-`entry` function will be called from a Move program already in execution.
+
+Essentially, `entry` functions are the "main" functions of a module, and they specify where Move programs start executing.
+
+Note though, an `entry` function _can_ still be called by other Move functions. So while they _can_ serve as the start of a Move program, they aren't restricted to that case.
+
+`entry` 修饰符旨在允许像脚本一样安全直接地调用模块函数。这允许模块编写者指定哪些函数可以成为开始执行的入口。这样模块编写者就知道任何非`entry`函数都是从已经在执行的 Move 程序中被调用的。
+
+本质上，`entry` 函数是模块的“main”函数，它们指定 Move 程序开始执行的位置。
+
+但请注意，`entry` 函数仍可被其他 Move 函数调用。因此，虽然它们 _可以_ 作为 Move 程序的入口，但它们并不局限于这种用法。
+
+例如：
+
+```move=
+address 0x42 {
+    module m {
+        public entry fun foo(): u64 { 0 }
+        fun calls_foo(): u64 { foo() } // valid!
+    }
+
+    module n {
+        fun calls_m_foo(): u64 {
+            0x42::m::foo() // valid!
+        }
+    }
+
+    module other {
+        public entry fun calls_m_foo(): u64 {
+            0x42::m::foo() // valid!
+        }
+    }
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // valid!
+    }
+}
+```
+
+Even internal functions can be marked as `entry`! This lets you guarantee that the function is called only at the beginning of execution (assuming you do not call it elsewhere in your module)
+
+甚至内部函数也可以标记为 `entry`！这使你可以保证仅在开始执行时调用该函数(假如你没有在模块中的其他地方调用它)
+
+```move=
+address 0x42 {
+    module m {
+        entry fun foo(): u64 { 0 } // valid! entry functions do not have to be public
+    }
+
+    module n {
+        fun calls_m_foo(): u64 {
+            0x42::m::foo() // ERROR!
+    //      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+        }
+    }
+
+    module other {
+        public entry fun calls_m_foo(): u64 {
+            0x42::m::foo() // ERROR!
+    //      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+        }
+    }
+}
+
+script {
+    fun calls_m_foo(): u64 {
+        0x42::m::foo() // ERROR!
+//      ^^^^^^^^^^^^ 'foo' is internal to '0x42::m'
+    }
+}
+```
+
+### 函数名 (Name)
+
+Function names can start with letters `a` to `z` or letters `A` to `Z`. After the first character, function names can contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, or digits `0` to `9`.
+
+函数名称可以以字母 `a` 到 `z` 或字母 `A` 到 `Z` 开头。在第一个字符之后，函数名称可以包含下划线 `_`、字母 `a` 到 `z` 、字母 `A` 到 `Z` 或数字 `0` 到 `9`。
+
+```move
+fun FOO() {}
+fun bar_42() {}
+fun _bAZ19() {}
+```
+
+### 类型参数 (Type Parameters)
+
+After the name, functions can have type parameters
+
+函数名后可以有类型参数
+
+```move
+fun id<T>(x: T): T { x }
+fun example<T1: copy, T2>(x: T1, y: T2): (T1, T1, T2) { (copy x, x, y) }
+```
+
+For more details, see [Move generics](./generics.md).
+
+有关更多详细信息，请参阅 [移动泛型](./generics.md)。
+
+### 参数 (Parameters)
+
+Functions parameters are declared with a local variable name followed by a type annotation
+
+函数参数使用局部变量名，后跟类型标注的方式进行声明。
+
+```move
+fun add(x: u64, y: u64): u64 { x + y }
+```
+
+We read this as `x` has type `u64`
+
+A function does not have to have any parameters at all.
+
+(上面代码中的函数参数) 我们读为：`x` 参数的类型是 `u64` 。
+
+函数可以没有任何参数。
+
+```move
+fun useless() { }
+```
+
+This is very common for functions that create new or empty data structures
+
+在函数中创建新或空的数据结构是常见的用法。
+
+```move=
+address 0x42 {
+    module example {
+        struct Counter { count: u64 }
+
+        fun new_counter(): Counter {
+            Counter { count: 0 }
+        }
+
+    }
+}
+```
+
+### Acquires
+
+When a function accesses a resource using `move_from`, `borrow_global`, or `borrow_global_mut`, the function must indicate that it `acquires` that resource. This is then used by Move's type system to ensure the references into global storage are safe, specifically that there are no dangling references into global storage.
+
+当一个函数使用 `move_from`、`borrow_global` 或 `borrow_global_mut` 访问资源时，则该函数必须表明它 `获取(acquires)` 该资源。然后 Move 的类型系统使用它来确保对全局存储的引用是安全的，特别是没有对全局存储的悬垂引用(dangling references)。
+
+```move=
+address 0x42 {
+    module example {
+
+        struct Balance has key { value: u64 }
+
+        public fun add_balance(s: &signer, value: u64) {
+            move_to(s, Balance { value })
+        }
+
+        public fun extract_balance(addr: address): u64 acquires Balance {
+            let Balance { value } = move_from(addr); // acquires needed
+            value
+        }
+    }
+}
+```
+`acquires` annotations must also be added for transitive calls within the module. Calls to these functions from another module do not need to annotated with these acquires because one module cannot access resources declared in another module--so the annotation is not needed to ensure reference safety.
+
+`acquires` 标注也必须为模块内有传递性的调用添加。从另一个模块对这些函数的调用不需要使用 `acquires` 进行注释，因为一个模块无法访问在另一个模块中声明的资源——因此不需要用标注来确保引用安全。
+
+```move=
+address 0x42 {
+    module example {
+
+        struct Balance has key { value: u64 }
+
+        public fun add_balance(s: &signer, value: u64) {
+            move_to(s, Balance { value })
+        }
+
+        public fun extract_balance(addr: address): u64 acquires Balance {
+            let Balance { value } = move_from(addr); // acquires needed
+            value
+        }
+
+        public fun extract_and_add(sender: address, receiver: &signer) acquires Balance {
+            let value = extract_balance(sender); // acquires needed here
+            add_balance(receiver, value)
+        }
+    }
+}
+
+address 0x42 {
+    module other {
+        fun extract_balance(addr: address): u64 {
+            0x42::example::extract_balance(addr) // no acquires needed
+        }
+    }
+}
+```
+
+A function can `acquire` as many resources as it needs to
+
+函数可以根据需要 `acquire` 尽可能多的资源。
+
+```move=
+address 0x42 {
+    module example {
+        use std::vector;
+
+        struct Balance has key { value: u64 }
+        struct Box<T> has key { items: vector<T> }
+
+        public fun store_two<Item1: store, Item2: store>(
+            addr: address,
+            item1: Item1,
+            item2: Item2,
+        ) acquires Balance, Box {
+            let balance = borrow_global_mut<Balance>(addr); // acquires needed
+            balance.value = balance.value - 2;
+            let box1 = borrow_global_mut<Box<Item1>>(addr); // acquires needed
+            vector::push_back(&mut box1.items, item1);
+            let box2 = borrow_global_mut<Box<Item2>>(addr); // acquires needed
+            vector::push_back(&mut box2.items, item2);
+        }
+    }
+}
+```
+
+### 返回类型 (Return type)
+
+After the parameters, a function specifies its return type.
+
+在参数之后，函数指定其返回类型。
+
+```move
+fun zero(): u64 { 0 }
+```
+
+Here `: u64` indicates that the function's return type is `u64`.
+
+Using tuples, a function can return multiple values
+
+这里 `: u64` 表示函数的返回类型是 `u64`。
+
+使用元组，一个函数可以返回多个值：
+
+```move
+fun one_two_three(): (u64, u64, u64) { (0, 1, 2) }
+```
+
+If no return type is specified, the function has an implicit return type of unit `()`. These functions are equivalent
+
+如果未指定返回类型，则该函数具有隐式返回类型单值 `()`。这些函数是等价的：
+
+```move
+fun just_unit(): () { () }
+fun just_unit() { () }
+fun just_unit() { }
+```
+
+`script` functions must have a return type of unit `()`
+
+`script` 函数的返回类型必须为单值 `()`（不能是任何其他类型，例如 `bool`、`u64` 等，注者注）：
+
+```move
+script {
+    fun do_nothing() {
+    }
+}
+```
+
+As mentioned in the [tuples section](./tuples.md), these tuple "values" are virtual and do not exist at runtime. So for a function that returns unit `()`, it will not be returning any value at all during execution.
+
+如[元组部分](./tuples.md)所述，这些元组“值”是虚拟的（virtual），且在运行时不存在。因此，对于返回单值 `()` 的函数，它在执行期间根本不会返回任何值。
+
+### Function body (函数体)
+
+A function's body is an expression block. The return value of the function is the last value in the sequence
+
+函数体是一个表达式块。函数的返回值是序列中最后一个表达式的值。
+
+```move=
+fun example(): u64 {
+    let x = 0;
+    x = x + 1;
+    x // returns 'x'
+}
+```
+
+See [the section below for more information on returns](#returning-values)
+
+请参阅[有关返回值的更多信息](#returning-values)
+
+For more information on expression blocks, see [Move variables](./variables.md).
+
+有关表达式块的更多信息，请参阅 [Move variables](./variables.md)。
+
+### Native Functions
+
+Some functions do not have a body specified, and instead have the body provided by the VM. These functions are marked `native`.
+
+Without modifying the VM source code, a programmer cannot add new native functions. Furthermore, it is the intent that `native` functions are used for either standard library code or for functionality needed for the given Move environment.
+
+Most `native` functions you will likely see are in standard library code such as `vecto
+
+有些函数没有函数体，而是由 Move VM 提供的函数体。这些函数被标记为 `native`。
+
+如果不修改 Move VM 源代码，程序员就无法添加新的 `native` 函数。此外，`native` 函数的意图是用于标准库代码或 Move 环境所需的基础功能。
+
+你看到的大多数 `native` 函数可能都在标准库代码中，例如 `vector`
+
+```move=
+module std::vector {
+    native public fun empty<Element>(): vector<Element>;
+    ...
+}
+```
+
+## 调用 (Calling)
+
+When calling a function, the name can be specified either through an alias or fully qualified
+
+调用函数时，名称可以通过别名或完全限定名指定
+
+```move=
+address 0x42 {
+    module example {
+        public fun zero(): u64 { 0 }
+    }
+}
+
+script {
+    use 0x42::example::{Self, zero};
+    fun call_zero() {
+        // With the `use` above all of these calls are equivalent
+        0x42::example::zero();
+        example::zero();
+        zero();
+    }
+}
+```
+
+When calling a function, an argument must be given for every parameter.
+
+调用函数时，每个参数必须指定一个值。
+
+```move=
+address 0x42 {
+    module example {
+        public fun takes_none(): u64 { 0 }
+        public fun takes_one(x: u64): u64 { x }
+        public fun takes_two(x: u64, y: u64): u64 { x + y }
+        public fun takes_three(x: u64, y: u64, z: u64): u64 { x + y + z }
+    }
+}
+
+script {
+    use 0x42::example;
+    fun call_all() {
+        example::takes_none();
+        example::takes_one(0);
+        example::takes_two(0, 1);
+        example::takes_three(0, 1, 2);
+    }
+}
+```
+
+Type arguments can be either specified or inferred. Both calls are equivalent.
+
+函数的类型参数可以被指定或推断出来。以下两个调用是等价的。
+
+```move=
+address 0x42 {
+    module example {
+        public fun id<T>(x: T): T { x }
+    }
+}
+
+script {
+    use 0x42::example;
+    fun call_all() {
+        example::id(0);
+        example::id<u64>(0);
+    }
+}
+```
+
+For more details, see [Move generics](./generics.md).
+
+有关更多详细信息，请参阅 [Move generics](./generics.md)。
+
+
+## Returning values (返回值)
+
+The result of a function, its "return value", is the final value of its function body. For example
+
+一个函数的结果，也就是它的“返回值”，是函数体的最后一个值。例如：
+
+```move=
+fun add(x: u64, y: u64): u64 {
+    x + y
+}
+```
+
+[As mentioned above](#function-body), the function's body is an [expression block](./variables.md). The expression block can sequence various statements, and the final expression in the block will be be the value of that block
+
+[如上所述](#function-body)，函数体是一个[表达式块](./variables.md)。表达式块中可以有各种各种语句，块中最后一个表达式将是该表达式块的值。
+
+```move=
+fun double_and_add(x: u64, y: u64): u64 {
+    let double_x = x * 2;
+    let double_y = y * 2;
+    double_x + double_y
+}
+```
+
+The return value here is `double_x + double_y`
+
+这里的返回值是 `double_x + double_y`
+
+###  `return` 表达式 (`return` expression)
+
+A function implicitly returns the value that its body evaluates to. However, functions can also use the explicit `return` expression:
+
+函数隐式返回其函数体计算的值。但是，函数也可以使用显式的 `return` 表达式：
+
+```move
+fun f1(): u64 { return 0 }
+fun f2(): u64 { 0 }
+```
+
+
+These two functions are equivalent. In this slightly more involved example, the function subtracts two `u64` values, but returns early with `0` if the second value is too large:
+
+这两个功能是等价的。在下面这个稍微复杂的示例中，该函数返回两个 `u64` 值相减的结果，但如果第二个值大于第一个值，则提前返回 `0` ：
+
+```move=
+fun safe_sub(x: u64, y: u64): u64 {
+    if (y > x) return 0;
+    x - y
+}
+```
+
+Note that the body of this function could also have been written as `if (y > x) 0 else x - y`.
+
+However `return` really shines is in exiting deep within other control flow constructs. In this example, the function iterates through a vector to find the index of a given value:
+
+请注意，这个函数的函数体也可以写成 `if (y > x) 0 else x - y`。
+
+然而，`return` 真正的亮点在于在其他控制流结构的深处退出。在此示例中，函数遍历数组以查找给定值的索引：
+
+```move=
+use std::vector;
+use std::option::{Self, Option};
+fun index_of<T>(v: &vector<T>, target: &T): Option<u64> {
+    let i = 0;
+    let n = vector::length(v);
+    while (i < n) {
+        if (vector::borrow(v, i) == target) return option::some(i);
+        i = i + 1
+    };
+
+    option::none()
+}
+```
+
+Using `return` without an argument is shorthand for `return ()`. That is, the following two functions are equivalent:
+
+使用不带参数的 `return` 是 `return ()` 的简写。即以下两个函数是等价的：
+
+```move
+fun foo() { return }
+fun foo() { return () }
+```
diff --git a/language/documentation/book/translations/move-book-zh/src/generics.md b/language/documentation/book/translations/move-book-zh/src/generics.md
new file mode 100644
index 0000000000..888ca5df47
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/generics.md
@@ -0,0 +1,422 @@
+# 泛型
+
+泛型可用于定义具有不同输入数据类型的函数和结构体。这种语言特性有时被称为*参数多态*（parametric polymorphism）。在 Move 中，我们经常将术语泛型与类型形参（type parameter）和类型实参（type argument）互换使用。*（有些书籍的中文翻译通常将 type parameter 和 type argument 不加以区别地翻译为“类型参数”，译者注）*
+
+泛型通常用于库（library）代码中，例如向量中，声明适用于任何可能的实例化（满足指定约束）的代码。在其他框架中，泛型代码有时可用多种不同的方式与全局存储进行交互，这些方式有着相同的实现。
+
+## 声明类型参数
+
+函数和结构体都可以在其签名中带上类型参数列表，由一对尖括号括起来 `<...>`。
+
+### 泛型函数
+
+函数的类型参数放在函数名称之后和（值）参数列表之前。以下代码定义了一个泛型标识函数，该函数接受任何类型的值并返回原值。
+
+```move
+fun id<T>(x: T): T {
+    // 此类型标注是不必要但有效的
+    (x: T)
+}
+```
+
+一旦定义，类型参数 `T` 就可以在参数类型、返回类型和函数体内使用。
+
+### 泛型结构体
+
+结构体的类型参数放在结构名称之后，可用于命名字段的类型。
+
+```move
+struct Foo<T> has copy, drop { x: T }
+
+struct Bar<T1, T2> has copy, drop {
+    x: T1,
+    y: vector<T2>,
+}
+```
+
+请注意，[未使用的类型参数](#未使用的类型参数)。
+
+## 类型实参
+
+### 调用泛型函数
+
+调用泛型函数时，可以在由一对尖括号括起来的列表中为函数的类型形参指定类型实参。
+
+```move
+fun foo() {
+    let x = id<bool>(true);
+}
+```
+
+如果你不指定类型实参，Move 的[类型推断](#类型推断)（功能）将为你提供它们。
+
+### 使用泛型结构体
+
+类似地，在构造或销毁泛型类型的值时，可以为结构体的类型参数附加一个类型实参列表。
+
+```move
+fun foo() {
+    let foo = Foo<bool> { x: true };
+    let Foo<bool> { x } = foo;
+}
+```
+
+如果你不指定类型实参，Move 的[类型推断](#类型推断)（功能）将为你提供它们。
+
+### 类型实参不匹配
+
+如果你指定类型实参并且它们与提供的实际值冲突，则会报错：
+
+```move
+fun foo() {
+    let x = id<u64>(true); // 错误！true 不是 u64
+}
+```
+
+同样地：
+
+```move
+fun foo() {
+    let foo = Foo<bool> { x: 0 }; // 错误！0 不是布尔值
+    let Foo<address> { x } = foo; // 错误！bool 与 address 不兼容
+}
+```
+
+## 类型推断
+
+在大多数情况下，Move 编译器能够推断类型实参，因此你不必显式地写下它们。如果我们省略类型实参，上面的例子会是这样的：
+
+```move
+fun foo() {
+    let x = id(true);
+    //        ^ 被推断为 <bool>
+
+    let foo = Foo { x: true };
+    //           ^ 被推断为 <bool>
+
+    let Foo { x } = foo;
+    //     ^ 被推断为 <bool>
+}
+```
+
+注意：当编译器无法推断类型时，你需要手动标注它们。一个常见的场景是调用一个函数，其类型参数只出现在返回位置。
+
+```move
+address 0x2 {
+module m {
+    using std::vector;
+
+    fun foo() {
+        // let v = vector::new();
+        //                    ^ 编译器无法确定元素类型。
+
+        let v = vector::new<u64>();
+        //                 ^~~~~ 必须手动标注。
+    }
+}
+}
+```
+
+但是，如果稍后在该函数中使用该返回值，编译器将能够推断其类型：
+
+```move
+address 0x2 {
+module m {
+    using std::vector;
+
+    fun foo() {
+        let v = vector::new();
+        //                 ^ 被推断为 <u64>
+        vector::push_back(&mut v, 42);
+    }
+}
+}
+```
+
+## 未使用的类型参数
+
+对于结构体定义，未使用的类型参数是没有出现在结构体定义的任何字段中，但在编译时静态检查的类型参数。Move 允许未使用的类型参数，因此以下结构体定义有效：
+
+```move
+struct Foo<T> {
+    foo: u64
+}
+```
+
+这在对某些概念建模时会很方便。这是一个例子：
+
+```move
+address 0x2 {
+module m {
+    // 货币说明符
+    struct Currency1 {}
+    struct Currency2 {}
+
+    // 可以使用货币说明符类型实例化的泛型钱币类型。
+    // 例如 Coin<Currency1>, Coin<Currency2> 等。
+    struct Coin<Currency> has store {
+        value: u64
+    }
+
+    // 泛型地编写有关所有货币的代码
+    public fun mint_generic<Currency>(value: u64): Coin<Currency> {
+        Coin { value }
+    }
+
+    // 具体编写关于一种货币的代码
+    public fun mint_concrete(value: u64): Coin<Currency1> {
+        Coin { value }
+    }
+}
+}
+```
+
+在此示例中，`struct Coin<Currency>` 是类型参数为 `Currency` 的泛型结构体，该参数指定钱币的货币（类型），并允许将代码泛型地写入任何货币或具体地写入特定货币。即使 `Currency` 类型参数未出现在 `Coin` 中定义的任何字段中，这种通用性也适用。
+
+### 虚类型参数
+
+在上面的例子中，虽然 `struct Coin` 要求有 `store` 能力，但 `Coin<Currency1>` 和 `Coin<Currency2>` 都没有 `store` 能力。这实际是因为[条件能力与泛型类型](./abilities.md#条件能力与泛型类型)的规则以及 `Currency1` 和 `Currency2` 没有 `store` 能力，尽管它们甚至没有在 `struct Coin` 的结构体中使用。这可能会导致一些不合意的后果。例如，我们无法将 `Coin<Currency1>` 放入全局存储中的钱包。
+
+一种可能的解决方案是向 `Currency1` 和 `Currency2` 添加伪能力（spurious ability）标注（例如：`struct Currency1 has store {}`）。但是，这可能会导致错误（bug）或安全漏洞，因为它削弱了类型，引入了不必要的能力声明。例如，我们永远不会期望全局存储中的资源有一个类型为 `Currency1` 的字段，但是通过伪 `store` 能力这是有可能的。此外，伪标注具有传染性，需要在许多未使用类型参数的泛型函数上也包含必要的约束。
+
+虚类型（phantom type）参数解决了这个问题。未使用的类型参数可以标记为 *phantom* 类型参数，不参与结构体的能力推导。这样，在派生泛型类型的能力时，不考虑虚类型参数的实参，从而避免了对伪能力标注的需要。为了使这个宽松的规则合理，Move 的类型系统保证声明为 `phantom` 的参数要么在结构体定义根本不使用，要么仅用作声明为 `phantom` 的类型参数的实参。
+
+#### 声明
+
+在结构定义中，可以通过在声明前添加 `phantom` 关键字来将类型参数声明为 phantom。如果一个类型参数被声明为 phantom，我们就说它是一个虚类型参数。在定义结构时，Move 的类型检查器确保每个虚类型参数要么未在结构定义中使用，要么仅用作虚类型参数的实参。
+
+更正式地说，如果一个类型被用作虚类型参数的实参，我们说该类型出现在_虚位置_。有了这个定义，正确使用虚参数的规则可以指定如下：**虚类型参数只能出现在虚位置**。
+
+以下两个示例显示了虚参数的合法使用。在第一个中，结构定义中根本没有使用参数 `T1`。在第二个中，参数 `T1` 仅用作虚类型参数的实参。
+
+```move
+struct S1<phantom T1, T2> { f: u64 }
+                  ^^
+                  Ok: T1 没有出现在结构定义中
+
+struct S2<phantom T1, T2> { f: S1<T1, T2> }
+                                  ^^
+                                  Ok: T1 出现在虚位置
+```
+
+以下代码展示违反规则的示例：
+
+```move
+struct S1<phantom T> { f: T }
+                          ^
+                          错误：不是虚位置
+
+struct S2<T> { f: T }
+
+struct S3<phantom T> { f: S2<T> }
+                             ^
+                             错误：不是虚位置
+```
+
+#### 实例化
+
+实例化结构时，在派生结构能力时排除虚参数的实参。例如，考虑以下代码：
+
+```move
+struct S<T1, phantom T2> has copy { f: T1 }
+struct NoCopy {}
+struct HasCopy has copy {}
+```
+
+现在考虑类型 `S<HasCopy, NoCopy>`。因为 `S` 是用 `copy` 定义的，并且所有非虚参数都有 copy 能力，所以 `S<HasCopy, NoCopy>` 也有 copy 能力。
+
+#### 具有能力约束的虚类型参数
+
+能力约束和虚类型参数是正交特征，虚参数可以用能力约束来声明。当实例化具有能力约束的虚类型参数时，类型实参必须满足该约束，即使该参数是虚的（phantom）。例如，以下定义是完全有效的：
+
+```move
+struct S<phantom T: copy> {}
+```
+
+通常用来限制应用并且 `T` 只能用具有 `copy` 的实参实例化。
+
+## 约束
+
+在上面的示例中，我们演示了如何使用类型参数来定义稍后可以由调用者插入的“未知”类型。然而，这意味着类型系统几乎没有关于类型的信息，并且必须以非常保守的方式执行检查。在某种意义上，类型系统必须为不受约束的泛型假设最坏的情况。简单地说，默认泛型类型参数没有[能力](./abilities.md)。
+
+这就是约束发挥作用的地方：它们提供了一种方法来指定这些未知类型具有哪些属性，以便类型系统可以允许在其他情况下不安全的操作。
+
+### 声明约束
+
+可以使用以下语法对类型参数施加约束。
+
+```move
+// T 是类型参数的名称
+T: <ability> (+ <ability>)*
+```
+
+`<ability>` 可以是四种[能力](./abilities.md)中的任何一种，一个类型参数可以同时被多种能力约束。因此，以下所有内容都是有效的类型参数声明：
+
+```move
+T: copy
+T: copy + drop
+T: copy + drop + store + key
+```
+
+### 验证约束
+
+在调用点检查约束，所以下面的代码不会编译。
+
+```move
+struct Foo<T: key> { x: T }
+
+struct Bar { x: Foo<u8> }
+//                  ^ 错误！u8 没有 'key'
+
+struct Baz<T> { x: Foo<T> }
+//                     ^ 错误！ T 没有 'key'
+```
+
+```move
+struct R {}
+
+fun unsafe_consume<T>(x: T) {
+    // 错误！x 没有 'drop'
+}
+
+fun consume<T: drop>(x: T) {
+    // 合法！
+    // x 会被自动删除
+}
+
+fun foo() {
+    let r = R {};
+    consume<R>(r);
+    //      ^ 错误！R 没有 'drop'
+}
+```
+
+```move
+struct R {}
+
+fun unsafe_double<T>(x: T) {
+    (copy x, x)
+    // 错误！x 没有 'copy'
+}
+
+fun double<T: copy>(x: T) {
+    (copy x, x) // 合法！
+}
+
+fun foo(): (R, R) {
+    let r = R {};
+    double<R>(r)
+    //     ^ 错误！R 没有 'copy'
+}
+```
+
+有关详细信息，请参阅有关[条件能力与泛型类型](./abilities.md#conditional-abilities-and-generic-types)。
+
+## 递归的限制
+
+### 递归结构体
+
+泛型结构不能直接或间接包含相同类型的字段，即使具有不同类型的参数也是如此。以下所有结构定义均无效：
+
+```move
+struct Foo<T> {
+    x: Foo<u64> // 错误！'Foo' 包含 'Foo'
+}
+
+struct Bar<T> {
+    x: Bar<T> // 错误！'Bar' 包含 'Bar'
+}
+
+// 错误！'A' 和 'B' 形成一个循环，这也是不允许的。
+struct A<T> {
+    x: B<T, u64>
+}
+
+struct B<T1, T2> {
+    x: A<T1>
+    y: A<T2>
+}
+```
+
+### 高级主题：类型级递归
+
+Move 允许递归调用泛型函数。然而，当与泛型结构体结合使用时，在某些情况下这可能会创建无限数量的类型，这意味着会给编译器、虚拟机（mv）和其他语言组件增加不必要的复杂性。因此，这样的递归是被禁止的。
+
+被允许的用法：
+
+```move
+address 0x2 {
+module m {
+    struct A<T> {}
+
+    // 有限多种类型 —— 允许。
+    // foo<T> -> foo<T> -> foo<T> -> ... is valid
+    fun foo<T>() {
+        foo<T>();
+    }
+
+    // 有限多种类型 —— 允许。
+    // foo<T> -> foo<A<u64>> -> foo<A<u64>> -> ... is valid
+    fun foo<T>() {
+        foo<A<u64>>();
+    }
+}
+}
+```
+
+不被允许的用法：
+
+```move
+address 0x2 {
+module m {
+    struct A<T> {}
+
+    // 无限多种类型 —— 不允许。
+    // 错误！
+    // foo<T> -> foo<A<T>> -> foo<A<A<T>>> -> ...
+    fun foo<T>() {
+        foo<Foo<T>>();
+    }
+}
+}
+```
+
+```move
+address 0x2 {
+module n {
+    struct A<T> {}
+
+    // 无限多种类型 —— 不允许。
+    // 错误！
+    // foo<T1, T2> -> bar<T2, T1> -> foo<T2, A<T1>>
+    //   -> bar<A<T1>, T2> -> foo<A<T1>, A<T2>>
+    //   -> bar<A<T2>, A<T1>> -> foo<A<T2>, A<A<T1>>>
+    //   -> ...
+    fun foo<T1, T2>() {
+        bar<T2, T1>();
+    }
+
+    fun bar<T1, T2> {
+        foo<T1, A<T2>>();
+    }
+}
+}
+```
+
+请注意，类型级递归的检查基于对调用点的保守分析，所以不考虑控制流或运行时值。
+
+```move
+address 0x2 {
+module m {
+    struct A<T> {}
+
+    fun foo<T>(n: u64) {
+        if (n > 0) {
+            foo<A<T>>(n - 1);
+        };
+    }
+}
+}
+```
+
+上面示例中的函数在技术上将终止任何给定的输入，因此只会创建有限多种类型，但它仍然被 Move 的类型系统视为无效的。
diff --git a/language/documentation/book/translations/move-book-zh/src/global-storage-operators.md b/language/documentation/book/translations/move-book-zh/src/global-storage-operators.md
new file mode 100644
index 0000000000..d31b2959f4
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/global-storage-operators.md
@@ -0,0 +1,312 @@
+# 全局存储 - 操作（Global Storage - Operators）
+
+Move programs can create, delete, and update [resources](./structs-and-resources.md) in global storage using the following five instructions:
+
+Move程序可以使用下面五种指令创建、删除、更新全局存储中的[资源](./structs-and-resources.md)：
+
+| Operation                              | Description                                                     | Aborts?                                 |
+---------------------------------------- |---------------------------------------------------------------- |---------------------------------------- |
+|`move_to<T>(&signer,T)`                 | Publish `T` under `signer.address`                              | If `signer.address` already holds a `T` |
+|`move_from<T>(address): T`              | Remove `T` from `address` and return it                         | If `address` does not hold a `T`        |
+|`borrow_global_mut<T>(address): &mut T` | Return a mutable reference to the `T` stored under `address`    | If `address` does not hold a `T`        |
+|`borrow_global<T>(address): &T`         | Return an immutable reference to the `T` stored under `address` | If `address` does not hold a `T`        |
+|`exists<T>(address): bool`              | Return `true` if a `T` is stored under `address`                |  Never
+
+| 操作符                                 | 描述                                                   | 出错                           |
+---------------------------------------- |------------------------------------------------------ |---------------------------------- |
+|`move_to<T>(&signer,T)`                 | 在 `signer.address` 下发布 `T`                         | 如果 `signer.address` 已经存在 `T` |
+|`move_from<T>(address): T`              | 从 `address` 下删除 `T` 并返回                         | 如果 `address` 下没有 `T`           |
+|`borrow_global_mut<T>(address): &mut T` | 返回 `address` 下 `T` 的可变引用 mutable reference      | 如果 `address` 下没有 `T`          |
+|`borrow_global<T>(address): &T`         | 返回 `address` 下 `T` 的不可变引用 immutable reference  | 如果 `address` 下没有 `T`          |
+|`exists<T>(address): bool`              | 返回 `address` 下的 `T`                                | 永远不会                           |
+                            |
+
+Each of these instructions is parameterized by a type `T` with the [`key` ability](./abilities.md). However, each type `T` *must be declared in the current module*. This ensures that a resource can only be manipulated via the API exposed by its defining module. The instructions also take either an [`address`](./address.md) or [`&signer`](./signer.md) representing the account address where the resource of type `T` is stored.
+
+每个指令的参数 `T` 都具有 [`key` 能力](./abilities.md)。然而，类型 `T` *必须在当前模块*中声明。这确保资源只能通过当前模块暴露的 API 来操作。指令在存储 `T` 类型资源的同时，使用 [`address`](./address.md) 或 [`&signer`](./signer.md) 表示账户地址。
+
+
+## 资源参考（References to resources）
+
+References to global resources returned by `borrow_global` or `borrow_global_mut` mostly behave like references to local storage: they can be extended, read, and written using ordinary [reference operators](./references.md) and passed as arguments to other function. However, there is one important difference between local and global references: **a function cannot return a reference that points into global storage**. For example, these two functions will each fail to compile:
+
+`borrow_global` 或 `borrow_global_mut` 指令返回的全局资源引用在大多数情况下类似本地存储的引用：它们可以通过[引用操作](./references.md)进行拓展、读和写，也可以作为其它函数的参数。然而本地引用和全局引用有个重要差异：**函数不能返回指向全局存储的引用**。例如，下面两个函数编译会失败：
+
+
+```move
+struct R has key { f: u64 }
+// 不能编译 // will not compile
+fun ret_direct_resource_ref_bad(a: address): &R {
+    borrow_global<R>(a) // error!
+}
+// 也不能编译 // also will not compile
+fun ret_resource_field_ref_bad(a: address): &u64 {
+    &borrow_global<R>(a).f // error!
+}
+```
+
+Move must enforce this restriction to guarantee absence of dangling references to global storage. [This](#reference-safety-for-global-resources) section contains much more detail for the interested reader.
+
+Move必须强制这种限制来保证全局存储引用不会出现空引用。对于感兴趣的读者，[此节](#全局资源引用安全)包含了更多的细节。
+
+
+## 使用泛型的全局存储操作（Global storage operators with generics）
+
+Global storage operations can be applied to generic resources with both instantiated and uninstantiated generic type parameters:
+
+全局存储操作可以与实例化和未实例化的泛型资源参数使用：
+
+
+```move
+struct Container<T> has key { t: T }
+
+/// 发布用于存储调用者提供 T 类型对象的 Container /// Publish a Container storing a type T of the caller's choosing
+fun publish_generic_container<T>(account: &signer, t: T) {
+    move_to<Container<T>>(account, Container { t })
+}
+
+/// 发布存储 u64 类型的 Container /// Publish a container storing a u64
+fun publish_instantiated_generic_container(account: &signer, t: u64) {
+    move_to<Container<u64>>(account, Container { t })
+}
+```
+
+The ability to index into global storage via a type parameter chosen at runtime is a powerful Move feature known as *storage polymorphism*. For more on the design patterns enabled by this feature, see [Move generics](./generics.md).
+
+能够通过参数类型在运行时中索引全局存储的能力是 Move 的强大特性，该特性称之为*存储多态性*。关于此特性更多的设计模式，请参考[Move泛型](./generics.md)这节。
+
+## 示例： `Counter` （Example: `Counter`）
+
+The simple `Counter` module below exercises each of the five global storage operators. The API exposed by this module allows:
+
+- Anyone to publish a `Counter` resource under their account
+- Anyone to check if a `Counter` exists under any address
+- Anyone to read or increment the value of a `Counter` resource under any address
+- An account that stores a `Counter` resource to reset it to zero
+- An account that stores a `Counter` resource to remove and delete it
+
+下面简单的 `Counter` 模块使用五种全局存储操作。该模块暴露的API允许：
+
+- 任何人可以在他们的账户下发布 `Counter` 资源。
+- 任何人可以检查任何地址下是否包含 `Counter`。
+- 任何人可以读或增加任何地址下的 `Counter` 值。
+- 存储 `Counter` 资源的账号可以将其重置为 0。
+- 存储 `Counter` 资源的账号可以删除该对象。
+
+```move
+address 0x42 {
+module counter {
+    use std::signer;
+
+    /// 包含整数的资源 /// Resource that wraps an integer counter
+    struct Counter has key { i: u64 }
+
+    /// 给定账户下发布带有 `i` 值的 `Counter` 资源 /// Publish a `Counter` resource with value `i` under the given `account`
+    public fun publish(account: &signer, i: u64) {
+      // “打包"（创建）Counter 资源。这是需要授权的操作，只能在声明 `Counter` 资源的此模块内执行。 // "Pack" (create) a Counter resource. This is a privileged operation that can only be done inside the module that declares the `Counter` resource
+      move_to(account, Counter { i })
+    }
+
+    /// 读取 `addr` 地址下 `Counter` 内的值 /// Read the value in the `Counter` resource stored at `addr`
+    public fun get_count(addr: address): u64 acquires Counter {
+        borrow_global<Counter>(addr).i
+    }
+
+    /// 增加 `addr` 地址下 `Counter` 内的值 /// Increment the value of `addr`'s `Counter` resource
+    public fun increment(addr: address) acquires Counter {
+        let c_ref = &mut borrow_global_mut<Counter>(addr).i;
+        *c_ref = *c_ref + 1
+    }
+
+    /// 将 `account` 的 `Counter` 重置为 0 /// Reset the value of `account`'s `Counter` to 0
+    public fun reset(account: &signer) acquires Counter {
+        let c_ref = &mut borrow_global_mut<Counter>(signer::address_of(account)).i;
+        *c_ref = 0
+    }
+
+    /// 删除 `account` 的 `Counter` 资源并返回其内值 /// Delete the `Counter` resource under `account` and return its value
+    public fun delete(account: &signer): u64 acquires Counter {
+        // 删除 Counter 资源 // remove the Counter resource
+        let c = move_from<Counter>(signer::address_of(account));
+        // 将 `Counter` 资源“拆”为字段。这是需要授权的操作，只能在声明 `Counter` 资源的此模块内执行。 // "Unpack" the `Counter` resource into its fields. This is a privileged operation that can only be done inside the module that declares the `Counter` resource
+        let Counter { i } = c;
+        i
+    }
+
+    /// 如果 `addr` 下包含 `Counter` 资源，则返回 `true`。 /// Return `true` if `addr` contains a `Counter` resource
+    public fun exists(addr: address): bool {
+        exists<Counter>(addr)
+    }
+}
+}
+```
+
+## `acquires` 函数标注（Annotating functions with `acquires`）
+
+In the `counter` example, you might have noticed that the `get_count`, `increment`, `reset`, and `delete` functions are annotated with `acquires Counter`. A Move function `m::f` must be annotated with `acquires T` if and only if:
+
+- The body of `m::f` contains a `move_from<T>`, `borrow_global_mut<T>`, or `borrow_global<T>` instruction, or
+- The body of `m::f` invokes a function `m::g` declared in the same module that is annotated with `acquires`
+
+在 `counter` 例子中，可以注意到 `get_count`、`increment`、`reset` 和 `delete` 方法都使用 `acquires Counter` 进行标注。函数 `m::f` 在且仅在下述情况必须使用 `acquires T` 进行标注：
+
+- `m::f` 的主体包含 `move_from<T>`、`borrow_global_mut<T>` 或 `borrow_global<T>` 指令调用
+- `m::f` 的主体调用了同模块内被 `acquires` 注解的 `m::g` 的函数
+
+For example, the following function inside `Counter` would need an `acquires` annotation:
+
+例如，下面 `Counter` 内的函数需要使用 `acquires` 标注：
+
+```move
+// 由于 `increment` 使用了 `acquires` 标注，所以函数需要 `acquires` // Needs `acquires` because `increment` is annotated with `acquires`
+fun call_increment(addr: address): u64 acquires Counter {
+    counter::increment(addr)
+}
+```
+
+However, the same function *outside* `Counter` would not need an annotation:
+
+然而，在 `Counter` *外面*的函数则不需要进行标注：
+
+
+```move
+address 0x43 {
+module m {
+   use 0x42::counter;
+
+   // 可以，仅在函数声明在同一模块内时需要标注 // Ok. Only need annotation when resource acquired by callee is declared in the same module
+   fun call_increment(addr: address): u64 {
+       counter::increment(addr)
+   }
+}
+}
+```
+
+If a function touches multiple resources, it needs multiple `acquires`:
+
+如果函数需要多个资源，`acquires` 则需要多个参数：
+
+```move=
+address 0x42 {
+module two_resources {
+    struct R1 has key { f: u64 }
+    struct R2 has key { g: u64 }
+
+    fun double_acquires(a: address): u64 acquires R1, R2 {
+        borrow_global<R1>(a).f + borrow_global<R2>.g
+    }
+}
+}
+```
+
+The `acquires` annotation does not take generic type parameters into account:
+
+`acquires` 标注不会将泛型类型参数纳入声明中：
+
+
+```move=
+address 0x42 {
+module m {
+    struct R<T> has key { t: T }
+
+    // 效果为 `acquires R` 而不是 `acquires R<T>` // `acquires R`, not `acquires R<T>`
+    fun acquire_generic_resource<T: store>(a: addr) acquires R {
+        let _ = borrow_global<R<T>>(a);
+    }
+
+    // 效果为 `acquires R` 而不是 `acquiresR<u64>` // `acquires R`, not `acquires R<u64>
+    fun acquire_instantiated_generic_resource(a: addr) acquires R {
+        let _ = borrow_global<R<u64>>(a);
+    }
+}
+}
+```
+
+Finally: redundant `acquires` are not allowed. Adding this function inside `Counter` will result in a compilation error:
+
+最后：不允许使用不必要的 `acquires`。在 `Counter` 内添加下述方法将会导致编译错误：
+
+
+```move
+// 下面代码不会编译，因为函数体没有使用全局存储指令也没调用使用 `acquires` 注解的函数 // This code will not compile because the body of the function does not use a global storage instruction or invoke a function with `acquires`
+fun redundant_acquires_bad() acquires Counter {}
+```
+
+For more information on `acquires`, see [Move functions](./functions.md).
+
+关于 `acquires` 更多信息，参见 [Move 函数](./functions.md)。
+
+## 全局资源引用安全（Reference Safety For Global Resources）
+
+Move prohibits returning global references and requires the `acquires` annotation to prevent dangling references. This allows Move to live up to its promise of static reference safety (i.e., no dangling references, no `null` or `nil` dereferences) for all [reference](./references.md) types.
+
+Move 禁止返回全局引用并且需要使用 `acquires` 标注来防止空引用。这使 Move 保证了所有[引用](./references.md)类型的静态引用安全性（例如，没有空引用、不会解引用 `null` 或 `nil` 对象）。
+
+This example illustrates how the Move type system uses `acquires` to prevent a dangling reference:
+
+这个例子展示了 Move 类型系统如何通过使用 `acquires` 来防止空引用：
+
+```move=
+address 0x42 {
+module dangling {
+    struct T has key { f: u64 }
+
+    fun borrow_then_remove_bad(a: address) acquires T {
+        let t_ref: &mut T = borrow_global_mut<T>(a);
+        let t = remove_t(a); // 类型系统不允许 t_ref 这种空引用 // type system complains here
+        // t_ref now dangling!
+        let uh_oh = *&t_ref.f
+    }
+
+    fun remove_t(a: address): T acquires T {
+        move_from<T>(a)
+    }
+
+}
+}
+```
+
+In this code, line 6 acquires a reference to the `T` stored at address `a` in global storage. The callee `remove_t` then removes the value, which makes `t_ref` a dangling reference.
+
+代码中第六行获取了 `a` 地址在全局存储中 `T` 类型资源的引用。`remove_t` 调用删除了该值，使 `t_ref` 变成空引用。
+
+
+Fortunately, this cannot happen because the type system will reject this program. The `acquires` annotation on `remove_t` lets the type system know that line 7 is dangerous, without having to recheck or introspect the body of `remove_t` separately!
+
+幸运的是，由于类型系统拒绝编译程序导致这种情况不会发生。`remove_t` 方法的 `acquires` 标注让类型系统知道第七行是危险的，不需要再分析 `remove_t` 的函数体。
+
+The restriction on returning global references prevents a similar, but even more insidious problem:
+
+禁止返回全局引用的限制同时也防止了类似却更隐晦的问题：
+
+```move=
+address 0x42 {
+module m1 {
+    struct T has key {}
+
+    public fun ret_t_ref(a: address): &T acquires T {
+        borrow_global<T>(a) // 报错 类型系统在这不能继续编译 // error! type system complains here
+    }
+
+    public fun remove_t(a: address) acquires T {
+        let T {} = move_from<T>(a);
+    }
+}
+
+module m2 {
+    fun borrow_then_remove_bad(a: address) {
+        let t_ref = m1::ret_t_ref(a);
+        let t = m1::remove_t(a); // t_ref 为空引用 // t_ref now dangling!
+    }
+}
+}
+```
+
+Line 16 acquires a reference to a global resource `m1::T`, then line 17 removes that same resource, which makes `t_ref` dangle. In this case, `acquires` annotations do not help us because the `borrow_then_remove_bad` function is outside of the `m1` module that declares `T` (recall that `acquires` annotations can only be used for resources declared in the current module). Instead, the type system avoids this problem by preventing the return of a global reference at line 6.
+
+第十六行获取了全局资源 `m1::T` 类型的引用，然后第十七行删除了同一资源，这使 `t_ref` 变成空引用。在这个例子中，`acquires` 标注没有帮助到我们，因为 `borrow_then_remove_bad` 函数在声明了 `T` 类型（回顾 `acquires` 标注只用在声明此类型的模块内）的 `m1` 模块外。然而禁止返回全局引用的规则使第六行避免了这个问题。
+
+
+Fancier type systems that would allow returning global references without sacrificing reference safety are possible, and we may consider them in future iterations of Move. We chose the current design because it strikes a good balance between expressivity, annotation burden, and type system complexity.
+
+允许返回全局引用而尽可能不牺牲引用安全的高级类型系统是可行的，我们将会在 Move 未来的迭代过程中考虑此事。我们选择目前的设计方式是因为它很好的平衡了语言表现力、复杂的标注和复杂的类型系统三者的关系。
diff --git a/language/documentation/book/translations/move-book-zh/src/global-storage-structure.md b/language/documentation/book/translations/move-book-zh/src/global-storage-structure.md
new file mode 100644
index 0000000000..763d253d52
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/global-storage-structure.md
@@ -0,0 +1,14 @@
+# 全局存储 —— 结构
+
+Move 程序的目的是[读取和写入](./global-storage-operators.md)树形的持久全局存储。程序不能访问文件系统、网络或任何此树以外的数据。
+
+在伪代码中，全局存储看起来像：
+
+```move
+struct GlobalStorage {
+  resources: Map<(address, ResourceType), ResourceValue>
+  modules: Map<(address, ModuleName), ModuleBytecode>
+}
+```
+
+从结构上讲，全局存储是一个[森林（forest）](https://en.wikipedia.org/wiki/Tree_(graph_theory))，这个森林由以账户[地址（`address`）](./address.md)为根的树组成。每个地址可以存储[资源（resource）](./structs-and-resources.md)数据和[模块（module）](./modules-and-scripts.md)代码。如上面的伪代码所示，每个地址（`address`）最多可以存储一个给定类型的资源值，最多可以存储一个给定名称的模块。
diff --git a/language/documentation/book/translations/move-book-zh/src/integers.md b/language/documentation/book/translations/move-book-zh/src/integers.md
new file mode 100644
index 0000000000..a1a70430b0
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/integers.md
@@ -0,0 +1,214 @@
+# 整数 (Integers)
+
+Move supports three unsigned integer types: `u8`, `u64`, and `u128`. Values of these types range from 0 to a maximum that depends on the size of the type.
+
+| Type                             | Value Range              |
+| -------------------------------- | ------------------------ |
+| Unsigned 8-bit integer, `u8`     | 0 to 2<sup>8</sup> - 1   |
+| Unsigned 64-bit integer, `u64`   | 0 to 2<sup>64</sup> - 1  |
+| Unsigned 128-bit integer, `u128` | 0 to 2<sup>128</sup> - 1 |
+
+
+Move 支持三种无符号整数类型：`u8`、`u64` 和 `u128`。这些类型的值范围从 0 到最大值，最大值的具体取值取决于整数类型。
+
+| 类型                      | 取值范围                 |
+|---------------------------|--------------------------|
+| 无符号 8位 整数, `u8`     | 0 to 2<sup>8</sup> - 1   |
+| 无符号 64位 整数, `u64`   | 0 to 2<sup>64</sup> - 1  |
+| 无符号 128位 整数, `u128` | 0 to 2<sup>128</sup> - 1 |
+
+
+## 字面值(Literal)
+
+Literal values for these types are specified either as a sequence of digits (e.g.,`112`) or as hex literals, e.g., `0xFF`. The type of the literal can optionally be added as a suffix, e.g., `112u8`. If the type is not specified, the compiler will try to infer the type from the context where the literal is used. If the type cannot be inferred, it is assumed to be `u64`.
+
+If a literal is too large for its specified (or inferred) size range, an error is reported.
+
+(在Move中)这些类型的字面值指定为数字序列(例如：112)或十六进制文字(例如：0xFF), 可以选择将字面值的类型定义为后缀, 例如 `112u8`。如果未指定类型，编译器将尝试从使用字面值的上下文推断类型。如果无法推断类型，则默认为 `u64。
+
+如果字面值太大，超出其指定的(或推断的)大小范围，则会报错。
+
+### 例如：
+
+```jsx
+// literals with explicit annotations;
+let explicit_u8 = 1u8;
+let explicit_u64 = 2u64;
+let explicit_u128 = 3u128;
+
+// literals with simple inference
+let simple_u8: u8 = 1;
+let simple_u64: u64 = 2;
+let simple_u128: u128 = 3;
+
+// literals with more complex inference
+let complex_u8 = 1; // inferred: u8
+// right hand argument to shift must be u8
+let _unused = 10 << complex_u8;
+
+let x: u8 = 0;
+let complex_u8 = 2; // inferred: u8
+// arguments to `+` must have the same type
+let _unused = x + complex_u8;
+
+let complex_u128 = 3; // inferred: u128
+// inferred from function argument type
+function_that_takes_u128(complex_u128);
+
+// literals can be written in hex
+let hex_u8: u8 = 0x1;
+let hex_u64: u64 = 0xCAFE;
+let hex_u128: u128 = 0xDEADBEEF;
+```
+
+## 运算集 (Operations)
+
+### 算术运算 (Arithmetic)
+
+Each of these types supports the same set of checked arithmetic operations. For all of these operations, both arguments (the left and right side operands) must be of the same type. If you need to operate over values of different types, you will need to first perform a cast. Similarly, if you expect the result of the operation to be too large for the integer type, perform a cast to a larger size before performing the operation.
+
+每一种(无符号整数)类型都支持相同算术运算集。对于所有这些运算，两个参数(左侧和右侧操作数)必须是同一类型。如果您需要对不同类型的值进行运算，则需要首先执行强制转换。同样，如果您预计运算结果对于当下整数类型来说太大，请在执行运算之前将之转换为更大的整数类型。
+
+All arithmetic operations abort instead of behaving in a way that mathematical integers would not (e.g., overflow, underflow, divide-by-zero).
+
+| Syntax | Operation           | Aborts If                                |
+| ------ | ------------------- | ---------------------------------------- |
+| `+`    | addition            | Result is too large for the integer type |
+| `-`    | subtraction         | Result is less than zero                 |
+| `*`    | multiplication      | Result is too large for the integer type |
+| `%`    | modular division    | The divisor is `0`                       |
+| `/`    | truncating division | The divisor is `0`                       |
+
+### [Bitwise](https://move-language.github.io/move/integers.html#bitwise)
+
+算术运算在遇到异常时将会中止，而不是以上溢、下溢、被零除等数学整数未定义的的方式输出结果。
+
+| 句法 | 操作           | 中止条件                                |
+| ------ | ------------| ---------------------------------------- |
+| `+`    | 加法         | 结果对于整数类型来说太大了 |
+| `-`    | 减法         | 结果小于零                 |
+| `*`    | 乘法         | 结果对于整数类型来说太大了 |
+| `%`    | 取余运算     | 除数为 `0`                       |
+| `/`    | 截断除法     | 除数为 `0`                       |
+
+### 位运算 (Bitwise)
+
+The integer types support the following bitwise operations that treat each number as a series of individual bits, either 0 or 1, instead of as numerical integer values.
+
+Bitwise operations do not abort.
+
+| Syntax              | Operation   | Description                                           |
+|---------------------|-------------|-------------------------------------------------------|
+| `&`                 | bitwise and | Performs a boolean and for each bit pairwise          |
+| <code>&#124;</code> | bitwise or  | Performs a boolean or for each bit pairwise           |
+| `^`                 | bitwise xor | Performs a boolean exclusive or for each bit pairwise |
+
+整数类型支持下列位运算，即将每个数字视为一系列单独的位：0 或 1，而不是整型数值。
+
+位运算不会中止。
+
+| 语法                | 操作符   | 描述                       |
+|---------------------|----------|----------------------------|
+| `&`                 | 按位和   | 对每个位成对执行布尔值和   |
+| <code>&#124;</code> | 按位或   | 对每个位成对执行布尔值或   |
+| `^`                 | 按位异或 | 对每个位成对执行布尔值异或 |
+
+### 位移 (Bit shift)
+
+Similar to the bitwise operations, each integer type supports bit shifts. But unlike the other operations, the righthand side operand (how many bits to shift by) must *always* be a `u8` and need not match the left side operand (the number you are shifting).
+
+Bit shifts can abort if the number of bits to shift by is greater than or equal to `8`, `64`, or `128` for `u8`, `u64`, and `u128` respectively.
+
+| Syntax | Operation   | Aborts if                                                    |
+| ------ | ----------- | ------------------------------------------------------------ |
+| `<<`   | shift left  | Number of bits to shift by is greater than the size of the integer type |
+| `>>`   | shift right | Number of bits to shift by is greater than the size of the integer type |
+
+与按位运算类似，每种整数类型都支持位移(bit shifts)。但与其他运算不同的是，右侧操作数(要移位多少位)必须始终是 `u8`  并且不需要与左侧操作数类型(您要移位的数字)匹配。
+
+如果要移位的位数分别大于或等于 `8`、`64`, `u128` 或 `128` 的 `u8`, `u64`, 则移位可以中止。
+
+| 句法 | 操作   | 中止条件                                                    |
+| ------ | ----------- | ------------------------------------------------------------ |
+| `<<`   | 左移  | 要移位的位数大于整数类型的大小 |
+| `>>`   | 右移 | 要移位的位数大于整数类型的大小 |
+
+### 比较运算 (Comparisons)
+
+Integer types are the *only* types in Move that can use the comparison operators. Both arguments need to be of the same type. If you need to compare integers of different types, you will need to [cast](https://move-language.github.io/move/integers.html#casting) one of them first.
+
+Comparison operations do not abort.
+
+| Syntax | Operation                |
+| ------ | ------------------------ |
+| `<`    | less than                |
+| `>`    | greater than             |
+| `<=`   | less than or equal to    |
+| `>=`   | greater than or equal to |
+
+整数类型是 Move 中唯一可以使用比较(Comparisons)运算符的类型。两个参数必须是同一类型。如果您需要比较不同类型的整数，则需要先转换其中一个。
+
+比较操作不会中止。
+
+| 句法 | 操作                |
+| ------ | ------------------------ |
+| `<`    | 小于                |
+| `>`    | 大于             |
+| `<=`   | 小于等于    |
+| `>=`   | 大于等于 |
+
+###  相等 (Equality)
+
+Like all types with [`drop`](https://move-language.github.io/move/abilities.html) in Move, all integer types support the ["equal"](https://move-language.github.io/move/equality.html) and ["not equal"](https://move-language.github.io/move/equality.html) operations. Both arguments need to be of the same type. If you need to compare integers of different types, you will need to [cast](https://move-language.github.io/move/integers.html#casting) one of them first.
+
+Equality operations do not abort.
+
+| Syntax | Operation |
+| ------ | --------- |
+| `==`   | equal     |
+| `!=`   | not equal |
+
+For more details see the section on [equality](https://move-language.github.io/move/equality.html)
+
+与 Move 中的所有具有[`drop`](./chapter_19_abilities.html)能力的类型一样，所有整数类型都支持 ["equal(等于)"](./chapter_11_equality.html) 和 ["not equal(不等于)](./chapter_11_equality.html)运算。两个参数必须是同一类型。如果您需要比较不同类型的整数，则需要先转换其中一个。
+
+相等(Equality)运算不会中止。
+
+| 句法 | 操作 |
+| ------ | --------- |
+| `==`   | 等于     |
+| `!=`   | 不等于 |
+
+更多细节可以参考[相等]([equality](https://move-language.github.io/move/equality.html))章节。
+
+## 转换 (Casting)
+
+Integer types of one size can be cast to integer types of another size. Integers are the only types in Move that support casting.
+
+Casts *do not* truncate. Casting will abort if the result is too large for the specified type
+
+| Syntax     | Operation                                            | Aborts if                              |
+| ---------- | ---------------------------------------------------- | -------------------------------------- |
+| `(e as T)` | Cast integer expression `e` into an integer type `T` | `e` is too large to represent as a `T` |
+
+Here, the type of `e` must be `u8`, `u64`, or `u128` and `T` must be `u8`, `u64`, or `u128`.
+
+For example:
+
+- `(x as u8)`
+- `(2u8 as u64)`
+- `(1 + 3 as u128)`
+
+一种大小的整数类型可以转换为另一种大小的整数类型。整数是 Move 中唯一支持强制转换的类型。
+
+强制转换不会截断。如果结果对于指定类型来说太大，则转换将中止。
+
+| Syntax     | 操作                                            | 中止条件                              |
+| ---------- | ---------------------------------------------------- | -------------------------------------- |
+| `(e as T)` | 将整数表达式 `e` 转换为整数类型 `T` | `e` 太大而不能表示为 `T` |
+
+## 所有权 (Ownership)
+
+As with the other scalar values built-in to the language, integer values are implicitly copyable, meaning they can be copied without an explicit instruction such as [`copy`](https://move-language.github.io/move/variables.html#move-and-copy).
+
+与语言内置的其他标量值一样，整数值是隐式可复制的，这意味着它们可以在没有明确指令如[`copy`](./variables.md#move-and-copy)的情况下复制。
diff --git a/language/documentation/book/translations/move-book-zh/src/introduction.md b/language/documentation/book/translations/move-book-zh/src/introduction.md
new file mode 100644
index 0000000000..5e3ea6f79f
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/introduction.md
@@ -0,0 +1,47 @@
+# 引言 (Introduction)
+
+Welcome to Move, a next generation language for secure, sandboxed, and formally verified programming. Its first use case is for the Diem blockchain, where Move provides the foundation for its implementation. Move allows developers to write programs that flexibly manage and transfer assets, while providing the security and protections against attacks on those assets. However, Move has been developed with use cases in mind outside a blockchain context as well.
+
+欢迎来到Move的世界，Move是一种安全、沙盒式和形式化验证的下一代编程语言，它的第一个用例是 Diem 区块链(当时名字叫Libra, 脸书团队开发的项目, 译者注), Move 为其实现提供了基础。 Move 允许开发人员编写灵活管理和转移数字资产的程序，同时提供安全保护，防止对那些链上资产的攻击。不仅如此，Move 也可用于区块链世界之外的开发场景。
+
+Move takes its cue from [Rust](https://www.rust-lang.org/) by using resource types with move (hence the name) semantics as an explicit representation of digital assets, such as currency.
+
+Move 的诞生从[Rust](https://www.rust-lang.org/)中吸取了灵感，Move也是因为使用具有移动(move)语义的资源类型作为数字资产(例如货币)的显式表示而得名。
+
+## Move是为谁准备的？(Who is Move for?)
+
+Move was designed and created as a secure, verified, yet flexible programming language. The first use of Move is for the implementation of the Diem blockchain. That said, the language is still evolving. Move has the potential to be a language for other blockchains, and even non-blockchain use cases as well.
+
+Move语言被设计和创建为安全、可验证， 同时兼顾灵活性的编程语言。Move的第一个应用场景是用于Diem区块链的开发。现在，Move语言仍在不断发展中。Move 还有成为其他区块链，甚至非区块链用例开发语言的潜质。
+
+Given custom Move modules will not be supported at the [launch](https://diem.com/white-paper/#whats-next) of the Diem Payment Network (DPN), we are targeting an early Move Developer persona.
+
+鉴于在 Diem 支付网络 (DPN) [启动](https://diem.com/white-paper/#whats-next)时将不支持自定义 Move 模块(custom Move modules)，我们的目标是早期的 Move 开发人员。
+
+The early Move Developer is one with some programming experience, who wants to begin understanding the core programming language and see examples of its usage.
+
+早期的 Move 开发人员应该是具有一定编程经验的程序员，他们愿意了解编程语言核心，并探索它的用法。
+
+### 爱好者 (Hobbyists)
+
+Understanding that the capability to create custom modules on the Diem Payment Network will not be available at launch, the hobbyist Move Developer is interested in learning the intricacies of the language. She will understand the basic syntax, the standard libraries available, and write example code that can be executed using the Move CLI. The Move Developer may even want to dig into understanding how the Move Virtual Machine executes the code she writes.
+
+作为(Move语言)爱好者角色，首先需要明白在Diem支付网络上创建自定义模块(custom modules)是不可能的，其次，你还要对探索这门语言的复杂性保持兴趣。你将了解基本语法、可用的标准库，并编写可以用的Move CLI执行的示例代码。如果可能，你甚至可以去尝试体验Move虚拟机如何执行你自己编写的代码。
+
+### 核心贡献者 (Core Contributor)
+
+Beyond a hobbyist wanting to stay ahead of the curve for the core programming language is someone who may want to [contribute](https://diem.com/en-US/cla-sign/) directly to Move. Whether this includes submitting language improvements or even, in the future, adding core modules available on the Diem Payment Network, the core contributor will understand Move at a deep level.
+
+核心贡献者指那些超越爱好者并想在核心编程语言方面保持领先，还直接为 Move 做出[贡献](https://diem.com/en-US/cla-sign/)的人。无论是提交语言改进，甚至未来添加 Diem 支付网络上可用的核心模块等，核心贡献者都将深入了解Move。
+
+### Move不适用于哪些人？(Who Move is currently not targeting)
+
+Currently, Move is not targeting developers who wish to create custom modules and contracts for use on the Diem Payment Network. We are also not targeting novice developers who expect a completely polished developer experience even in testing the language.
+
+目前，Move 并不适用那些希望在在 Diem 支付网络上创建自定义模块和合约的开发人员。我们也不针对期望在测试语言时就能获得完美开发体验的初学开发者。
+
+## 从哪里开始？(Where Do I Start?)
+
+Begin with understanding [modules and scripts](https://move-language.github.io/move/modules-and-scripts.html) and then work through the [Move Tutorial](https://move-language.github.io/move/creating-coins.html).
+
+你可以从了解模块和脚本([modules and scripts](./modules-and-scripts.html))开始，然后跟随Move教程([Move Tutorial](./move-tutorial.html))进行练习。
diff --git a/language/documentation/book/translations/move-book-zh/src/loops.md b/language/documentation/book/translations/move-book-zh/src/loops.md
new file mode 100644
index 0000000000..34626ed284
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/loops.md
@@ -0,0 +1,215 @@
+# While and Loop
+
+Move offers two constructs for looping: `while` and `loop`.
+
+Move 提供了两种循环结构: `while` and `loop`.
+
+## `while` 循环
+
+The `while` construct repeats the body (an expression of type unit) until the condition (an expression of type `bool`) evaluates to `false`.
+
+Here is an example of simple `while` loop that computes the sum of the numbers from `1` to `n`:
+
+`while` 会重复执行结构(一个 `unit` 类型的表达式), 直到条件语句(`bool` 类型的表达式)运算结果为 `false`。
+
+下面是一个简单的 `while` 循环的例子，计算从 `1` 到 `n` 数字之和:
+
+```move
+fun sum(n: u64): u64 {
+    let sum = 0;
+    let i = 1;
+    while (i <= n) {
+        sum = sum + i;
+        i = i + 1
+    };
+
+    sum
+}
+```
+
+Infinite loops are allowed:
+
+无限循环是被允许的:
+
+```move=
+fun foo() {
+    while (true) { }
+}
+```
+
+### `break`
+
+The `break` expression can be used to exit a loop before the condition evaluates to `false`. For example, this loop uses `break` to find the smallest factor of `n` that's greater than 1:
+
+`break` 表达式可用于在条件计算结果为 `false` 之前退出循环。例如，这个循环使用 `break` 查找 `n` 大于1的最小因子:
+
+```move
+fun smallest_factor(n: u64): u64 {
+    // assuming the input is not 0 or 1
+    let i = 2;
+    while (i <= n) {
+        if (n % i == 0) break;
+        i = i + 1
+    };
+
+    i
+}
+```
+
+The `break` expression cannot be used outside of a loop.
+
+`break` 表达式不能在循环之外使用。
+
+### `continue`
+
+The `continue` expression skips the rest of the loop and continues to the next iteration. This loop uses `continue` to compute the sum of `1, 2, ..., n`, except when the number is divisible by 10:
+
+`continue` 表达式跳过当前循环的剩余部分, 并继续下一轮迭代。下面的例子, 使用 `continue` 去计算 `1, 2, ..., n` 的总和，过滤掉不能被10整除的数:
+
+```move
+fun sum_intermediate(n: u64): u64 {
+    let sum = 0;
+    let i = 0;
+    while (i < n) {
+        i = i + 1;
+        if (i % 10 == 0) continue;
+        sum = sum + i;
+    };
+
+    sum
+}
+```
+
+The `continue` expression cannot be used outside of a loop.
+
+`continue` 表达式不能在循环之外使用。
+
+### The type of `break` and `continue`
+
+`break` and `continue`, much like `return` and `abort`, can have any type. The following examples illustrate where this flexible typing can be helpful:
+
+`break` and `continue`, 和 `return` and `abort`  很相像, 可以是任何类型。下面的例子说明了这种灵活的类型在那些方面有帮助:
+
+```move
+fun pop_smallest_while_not_equal(
+    v1: vector<u64>,
+    v2: vector<u64>,
+): vector<u64> {
+    let result = vector::empty();
+    while (!vector::is_empty(&v1) && !vector::is_empty(&v2)) {
+        let u1 = *vector::borrow(&v1, vector::length(&v1) - 1);
+        let u2 = *vector::borrow(&v2, vector::length(&v2) - 1);
+        let popped =
+            if (u1 < u2) vector::pop_back(&mut v1)
+            else if (u2 < u1) vector::pop_back(&mut v2)
+            else break; // Here, `break` has type `u64`
+        vector::push_back(&mut result, popped);
+    };
+
+    result
+}
+
+fun pick(
+    indexes: vector<u64>,
+    v1: &vector<address>,
+    v2: &vector<address>
+): vector<address> {
+    let len1 = vector::length(v1);
+    let len2 = vector::length(v2);
+    let result = vector::empty();
+    while (!vector::is_empty(&indexes)) {
+        let index = vector::pop_back(&mut indexes);
+        let chosen_vector =
+            if (index < len1) v1
+            else if (index < len2) v2
+            else continue; // Here, `continue` has type `&vector<address>`
+        vector::push_back(&mut result, *vector::borrow(chosen_vector, index))
+    };
+
+    result
+}
+```
+
+## `loop`表达式
+
+The `loop` expression repeats the loop body (an expression with type `()`) until it hits a `break`
+
+Without a `break`, the loop will continue forever
+
+`loop` 表达式重复循环体(类型为unit()的表达式) ，直到遇到 `break` 为止。
+
+(下面的代码中)没有 `break`, 循环将一直执行。
+
+```move
+fun foo() {
+    let i = 0;
+    loop { i = i + 1 }
+}
+```
+
+Here is an example that uses `loop` to write the `sum` function:
+
+这是一个使用 `loop` 编写 `sum` 函数的示例(可与 `while` 循环比较):
+
+```move
+fun sum(n: u64): u64 {
+    let sum = 0;
+    let i = 0;
+    loop {
+        i = i + 1;
+        if (i > n) break;
+        sum = sum + i
+    };
+
+    sum
+}
+```
+
+As you might expect, `continue` can also be used inside a `loop`. Here is `sum_intermediate` from above rewritten using `loop` instead of `while`
+
+正如你所料, `continue` 也可以在 `loop` 中使用。这是上面的 `sum_intermediate` 使用 `loop` 代替 `while` 重写的:
+
+```move
+fun sum_intermediate(n: u64): u64 {
+    let sum = 0;
+    let i = 0;
+    loop {
+        i = i + 1;
+        if (i % 10 == 0) continue;
+        if (i > n) break;
+        sum = sum + i
+    };
+
+    sum
+}
+```
+
+## `while` and `loop` 的类型
+
+Move loops are typed expressions. A `while` expression always has type `()`.
+
+Move 循环是有类型化的表达式。 `while` 表达式始终具有 `()` 类型。
+
+```move
+let () = while (i < 10) { i = i + 1 };
+```
+
+If a `loop` contains a `break`, the expression has type unit `()`
+
+如果 `loop` 中包含 `break` , 这个表达式的类型则为 unit `()`
+
+
+```move
+(loop { if (i < 10) i = i + 1 else break }: ());
+let () = loop { if (i < 10) i = i + 1 else break };
+```
+
+If `loop` does not have a `break`, `loop` can have any type much like `return`, `abort`, `break`, and `continue`.
+
+如果 `loop` 不包含 `break`, `loop` 可以是任何类型, 就像`return`, `abort`, `break`, 和 `continue`。
+
+```move
+(loop (): u64);
+(loop (): address);
+(loop (): &vector<vector<u8>>);
+```
diff --git a/language/documentation/book/translations/move-book-zh/src/modules-and-scripts.md b/language/documentation/book/translations/move-book-zh/src/modules-and-scripts.md
new file mode 100644
index 0000000000..9dbca68ebf
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/modules-and-scripts.md
@@ -0,0 +1,119 @@
+# 模块和脚本
+
+Move 有两种不同类型的程序：***模块（Module）***和***脚本（Script）***。模块是定义结构类型以及对这些类型进行操作的函数的库。*结构类型*定义了 Move 的[全局存储](./global-storage-structure.md)的模式，*模块函数*定义了更新存储的规则。模块本身也存储在全局存储中。脚本是[可执行文件](https://en.wikipedia.org/wiki/Executable)的入口点，类似于传统语言中的主函数 `main`。脚本通常调用已发布模块的函数来更新全局存储。脚本是临时代码片段，不会发布在全局存储中。
+
+一个 Move 源文件（或**编译单元**）可能包含多个模块和脚本。然而，发布模块或执行脚本都是独立的虚拟机（VM）操作。
+
+## 语法
+
+### 脚本
+
+脚本具有以下结构：
+
+```text
+script {
+    <use>*
+    <constants>*
+    fun <identifier><[type parameters: constraint]*>([identifier: type]*) <function_body>
+}
+```
+
+一个 `script` 块必须以它的所有 [`use`](./uses.md) 声明开头，然后是[常量（constant）](./constants.md)声明，最后是主[函数](./functions.md)声明。主函数的名称可以是任意的（也就是说，它不一定命名为 `main`），它是脚本块中唯一的函数，可以有任意数量的参数，并且不能有返回值。下面是每个组件的示例：
+
+```move
+script {
+    // 导入在命名账户地址 std 上发布的 debug 模块。
+    use std::debug;
+
+    const ONE: u64 = 1;
+
+    fun main(x: u64) {
+        let sum = x + ONE;
+        debug::print(&sum)
+    }
+}
+```
+
+脚本（Script）的功能非常有限 —— 它们不能声明友元（friend）、结构类型或访问全局存储。他们的主要作用主要是调用*模块函数*。
+
+### 模块
+
+模块具有以下结构：
+
+```text
+module <address>::<identifier> {
+    (<use> | <friend> | <type> | <function> | <constant>)*
+}
+```
+
+其中 `<address>` 是一个有效的[命名或字面量地址](./address.md)。
+
+例子：
+
+```move
+module 0x42::test {
+    struct Example has copy, drop { i: u64 }
+
+    use std::debug;
+    friend 0x42::another_test;
+
+    const ONE: u64 = 1;
+
+    public fun print(x: u64) {
+        let sum = x + ONE;
+        let example = Example { i: sum };
+        debug::print(&sum)
+    }
+}
+```
+
+`module 0x42::test` 这部分指定模块 `test` 将在[全局存储](./global-storage-structure.md)的[账户地址](./address.md) `0x42` 下发布。
+
+模块也可以使用[命名地址](./address.md)来声明，例如：
+
+```move
+module test_addr::test {
+    struct Example has copy, drop { a: address }
+
+    use std::debug;
+    friend test_addr::another_test;
+
+    public fun print() {
+        let example = Example { a: @test_addr };
+        debug::print(&example)
+    }
+}
+```
+
+因为命名地址只存在于源语言级别和编译期间，所以命名地址将在字节码级别彻底替换它们的值。例如，如果我们有以下代码：
+
+```move
+script {
+    fun example() {
+        my_addr::m::foo(@my_addr);
+    }
+}
+```
+
+我们在把 `my_addr` 设置为 `0xC0FFEE` 的情况下编译它，那么它在操作上等同于以下内容：
+
+```move
+script {
+    fun example() {
+        0xC0FFEE::m::foo(@0xC0FFEE);
+    }
+}
+```
+
+然而，在源代码级别，这些是*不等价的* —— 函数 `m::foo` *必须*通过 `my_addr` 命名地址来访问，而不是通过分配给该地址的数值来访问。
+
+模块名称可以以字母 `a` 到 `z` 或字母 `A` 到 `Z` 开头。在第一个字符之后，模块名可以包含下划线 `_`、字母 `a` 到 `z`、字母 `A` 到 `Z` 或数字 `0` 到 `9`。
+
+```move
+module my_module {}
+module foo_bar_42 {}
+```
+
+通常，模块名称以小写字母开头。名为 `my_module` 的模块应该存储在名为 `my_module.move` 的源文件中。
+
+`module` 块内的所有元素都可以按任意顺序出现。从根本上说，模块是[`类型（type）`](./structs-and-resources.md)和[`函数（function）`](./functions.md)的集合。[`use`](./uses.md) 关键字用来从其他模块导入类型。[`friend`](./friends.md) 关键字指定一个可信的模块列表。[`const`](./constants.md) 关键字定义了可以在模块函数中使用的私有常量。
diff --git a/language/documentation/book/translations/move-book-zh/src/move-tutorial.md b/language/documentation/book/translations/move-book-zh/src/move-tutorial.md
new file mode 100644
index 0000000000..209d54950a
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/move-tutorial.md
@@ -0,0 +1,970 @@
+# Move 教程(Move Tutorial)
+
+Welcome to the Move Tutorial! In this tutorial, we are going to go through some steps of developing Move code including design, implementation, unit testing and formal verification of Move modules.
+
+欢迎来到 Move 语言教程，在本教程中，我们通过一些具体的步骤进行 Move 语言代码的开发，包括 Move 模块的设计、实现、单元测试和形式化验证。
+
+There are nine steps in total:
+
+- [Step 0: Installation](#Step0)
+- [Step 1: Writing my first Move module](#Step1)
+- [Step 2: Adding unit tests to my first Move module](#Step2)
+- [Step 3: Designing my `BasicCoin` module](#Step3)
+- [Step 4: Implementing my `BasicCoin` module](#Step4)
+- [Step 5: Adding and using unit tests with the `BasicCoin` module](#Step5)
+- [Step 6: Making my `BasicCoin` module generic](#Step6)
+- [Step 7: Use the Move prover](#Step7)
+- [Step 8: Writing formal specifications for the `BasicCoin` module](#Step8)
+
+整个过程共包含9个步骤：
+
+- [Step 0: 安装 Move 开发环境](#Step0)
+- [Step 1: 编写第一个 Move 模块(Move Module)](#Step1)
+- [Step 2: 给模块(Module)添加单元测试](#Step2)
+- [Step 3: 设计自己的 `BasicCoin` 模块(Module)](#Step3)
+- [Step 4: `BasicCoin` 模块(Module)的实现](#Step4)
+- [Step 5: 给 `BasicCoin` 模块添加单元测试](#Step5)
+- [Step 6: 使用泛型(generic)编写 `BasicCoin` 模块](#Step6)
+- [Step 7: 使用 `Move prover`](#Step7)
+- [Step 8: 为 `BasicCoin` 模块编写形式化规范(formal specifications)](#Step8)
+
+Each step is designed to be self-contained in the corresponding `step_x` folder. For example, if you would
+like to skip the contents in step 1 through 4, feel free to jump to step 5 since all the code we have written
+before step 5 will be in `step_5` folder. At the end of some steps, we also include
+additional material on more advanced topics.
+
+其中每一步都被设计为自包含的文件夹, 相应名字为 `step_x`。 例如，如果您愿意跳过 `step 1` 到 `step 4` 的内容，可直接跳到 `step 5`，因为所有在 `step 5` 之前的代码均在在`step_5` 文件夹之下。在部分步骤结束时，我们还引入有关更高级主题的附加资料。
+
+Now let's get started!
+
+好了，我们现在开始！
+
+## Step 0: 安装 Move 开发环境<span id="Step0"><span> (Step 0: Installation)
+
+If you haven't already, open your terminal and clone [the Move repository](https://github.com/move-language/move):
+
+如果您还没有安装过 Move，首先打开命令终端(terminal) 并clone [Move代码库](https://github.com/move-language/move):
+
+```bash
+git clone https://github.com/move-language/move.git
+```
+
+Go to the `move` directory and run the `dev_setup.sh` script:
+
+进入到 `move` 文件夹下，执行 `dev_setup.sh` 脚本:
+
+```bash
+cd move
+./scripts/dev_setup.sh -ypt
+```
+
+Follow the script's prompts in order to install all of Move's dependencies.
+
+The script adds environment variable definitions to your `~/.profile` file.
+Include them by running this command:
+
+根据脚本命令的提示，按顺序安装 Move 的所有依赖项。
+脚本将会将(move命令所在路径)环境变量写入到 `~/.profile` 文件中。
+
+执行如下命令使环境变量生效：
+
+```bash
+source ~/.profile
+````
+
+Next, install Move's command-line tool by running this commands:
+
+然后执行如下命令来安装 Move 命令行工具：
+
+```bash
+cargo install --path language/tools/move-cli
+```
+
+You can check that it is working by running the following command:
+
+通过如下运行命令可以检查 move 命令是否可正常：
+
+```bash
+move --help
+```
+You should see something like this along with a list and description of a number of commands:
+
+您应该会看到类似这样的内容以及许多命令的列表和描述：
+
+```
+move-package
+Execute a package command. Executed in the current directory or the closest containing Move package
+
+USAGE:
+    move [OPTIONS] <SUBCOMMAND>
+
+OPTIONS:
+        --abi                          Generate ABIs for packages
+...
+```
+
+If you want to find what commands are available and what they do, running
+a command or subcommand with the `--help` flag will print documentation.
+
+如果想了解有支持哪引命令及其作用, 执行命令或子命令时添加 `--help` 标记，此时会打印帮助文档。
+
+Before running the next steps, `cd` to the tutorial directory:
+
+在执行下一步骤之前，请先执行 `cd` 命令进入到教程对应目录下:
+
+```bash
+cd <path_to_move>/language/documentation/tutorial
+```
+
+<details>
+
+<summary>Visual Studio Code Move 支持 (Visual Studio Code Move Support)</summary>
+
+There is official Move support for Visual Studio Code. You need to install
+the move analyzer first:
+
+Visual Studio Code 有正式的 Move 语言支持, 您需要先安装 `move analyzer` :
+
+```bash
+cargo install --path language/move-analyzer
+```
+
+Now you can install the VS extension by opening VS Code, searching for the "move-analyzer" in the Extension Pane, and installing it. More detailed instructions can be found
+in the extension's [README](https://github.com/move-language/move/tree/main/language/move-analyzer/editors/code).
+
+现在您可以打开 VS Code 并安装 Move 扩展插件了，在扩展页面下找到 `move-analyzer` 并安装即可。关于扩展的详细信息可以查看扩展的[README](https://github.com/move-language/move/tree/main/language/move-analyzer/editors/code)。
+</details>
+
+## Step 1: 编写第一个Move模块<span id="Step1"><span> (Writing my first Move module)
+
+Change directory into the [`step_1/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_1/BasicCoin) directory.
+You should see a directory called `sources` -- this is the place where all
+the Move code for this package lives. You should also see a
+`Move.toml` file as well. This file specifies dependencies and other information about
+the package; if you're familiar with Rust and Cargo, the `Move.toml` file
+is similar to the `Cargo.toml` file, and the `sources` directory similar to
+the `src` directory.
+
+切换当前目录到[`step_1/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_1/BasicCoin)下，您将看到 `sources` 子目录 -- 这个包(package)下所有的 Move 代码都在此目录中，同时您还会看到一个 `Move.toml` 文件。该文件指定当前包的依赖列表和其他信息。
+如果您熟悉 `Rust` 和 `Cargo`，那 `Move.toml` 文件类似 `Cargo.toml` 文件， `sources` 目录类似 `src` 目录(它们的作用是一样的)
+
+Let's take a look at some Move code! Open up
+[`sources/FirstModule.move`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_1/BasicCoin/sources/FirstModule.move) in
+your editor of choice. The first thing you'll see is this:
+
+来一起看看 Move 语言代码内容！ 用你的编辑器打开[`sources/FirstModule.move`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_1/BasicCoin/sources/FirstModule.move)文件，会看到如下内容：
+
+```
+// sources/FirstModule.move
+module 0xCAFE::BasicCoin {
+    ...
+}
+```
+
+This is defining a Move
+[module](https://move-language.github.io/move/modules-and-scripts.html). Modules are the
+building block of Move code, and are defined with a specific address -- the address that the module can be published under.
+In this case, the `BasicCoin` module can only be published under `0xCAFE`.
+
+这是一个 `Move` [module(模块)](./chpater_1_modules-and-scripts.html)的定义。
+模块是 Move 语言的代码块, 并且它使用指定的地址(address)进行定义 -- 模块只能在该地址下发布。
+当前 `BasicCoin` 模块只能被发布在 `0xCAFE` 地址下。
+
+Let's now take a look at the next part of this file where we define a [struct](https://move-language.github.io/move/structs-and-resources.html) to represent a `Coin` with a given `value`:
+
+再看这个文件的下一部分，这里定义了一个具有字段 `value` 的[结构体](./structs-and-resources.html) `Coin`：
+
+```
+module 0xCAFE::BasicCoin {
+    struct Coin has key {
+        value: u64,
+    }
+    ...
+}
+```
+
+Looking at the rest of the file, we see a function definition that creates a `Coin` struct and stores it under an account:
+
+再看文件剩余部分，我们会看到一个函数，它会创建一个 `Coin` 结构体，并将其保存在某个账号(account)下：
+
+```
+module 0xCAFE::BasicCoin {
+    struct Coin has key {
+        value: u64,
+    }
+
+    public fun mint(account: signer, value: u64) {
+        move_to(&account, Coin { value })
+    }
+}
+```
+
+Let's take a look at this function and what it's saying:
+* It takes a [`signer`](https://move-language.github.io/move/signer.html) -- an
+  unforgeable token that represents control over a particular address, and
+  a `value` to mint.
+* It creates a `Coin` with the given value and stores it under the
+  `account` using the `move_to` operator.
+
+Let's make sure it builds! This can be done with the `build` command from within the package folder ([`step_1/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_1/BasicCoin/)):
+
+让我们来看看这个函数和它的含义:
+* 此函数需要一个[`signer`](./signer.html)参数 -- 表示不可伪造的 token 受此特定地址的控制; 和一个需要铸造的数量参数 `value`。
+* 此函数使用给定的参数值铸造一个 `Coin`，然后通过 `move_to` 操作将其保存在(全局存储中)给定的 `account` 账户下。
+
+我们需要确保它真的执行，这可以通过在包文件夹([`step_1/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_1/BasicCoin/))下的运行 `build` 命令来完成：
+
+```bash
+move build
+```
+
+<details>
+
+<summary>进阶概念及参考引用 (Advanced concepts and references)</summary>
+
+* You can create an empty Move package by calling:
+    ```bash
+    move new <pkg_name>
+    ```
+* Move code can also live a number of other places.  More information on the
+  Move package system can be found in the [Move book](https://move-language.github.io/move/packages.html)
+* More information on the `Move.toml` file can be found in the [package section of the Move book](https://move-language.github.io/move/packages.html#movetoml).
+* Move also supports the idea of [named addresses](https://move-language.github.io/move/address.html#named-addresses), Named addresses are a way to parametrize Move source code so that you can compile the module using different values for `NamedAddr` to get different bytecode that you can deploy, depending on what address(es) you control. They are used quite frequently, and can be defined in the `Move.toml` file in the `[addresses]` section, e.g.,
+    ```
+    [addresses]
+    SomeNamedAddress = "0xC0FFEE"
+    ```
+
+* 你可以通过以下命令创建一个空的 Move 包(move package):
+    ```bash
+    move new <pkg_name>
+    ```
+* Move 代码也可以放在其他很多地方, 更多关于 Move 包系统的信息请参阅[Move book](./packages.html)
+* 更多关于 `Move.toml` 文件的信息可以参阅[package section of the Move book](./packages.html#movetoml).
+* Move语言也支持命名地址的概念([named addresses](./address.html#named-addresses)), 命名地址是一种参数化 Move 源代码的方法，
+  就是如果对 `NamedAddr` 使用的不同赋值编译，编译后会获得部署到你控制地址的不同字节码. 这种用法很常见，一般都将地址变量其定义在 `Move.toml` 文件
+  的 `[addresses]` 部分. 例如:
+    ```
+    [addresses]
+    SomeNamedAddress = "0xC0FFEE"
+    ```
+
+* [Structures](https://move-language.github.io/move/structs-and-resources.html) in Move can be given different
+  [abilities](https://move-language.github.io/move/abilities.html) that describe what can be done with that type. There are four different abilities:
+    - `copy`: Allows values of types with this ability to be copied.
+    - `drop`: Allows values of types with this ability to be popped/dropped.
+    - `store`: Allows values of types with this ability to exist inside a struct in global storage.
+    - `key`: Allows the type to serve as a key for global storage operations.
+
+    So in the `BasicCoin` module we are saying that the `Coin` struct can be used as a key
+    in global storage and, because it has no other abilities, it cannot be
+    copied, dropped, or stored as a non-key value in storage. So you can't copy
+    coins, and you also can't lose coins by accident!
+* [Functions](https://move-language.github.io/move/functions.html) are default
+    private, and can also be `public`,
+    [`public(friend)`](https://move-language.github.io/move/friends.html), or
+    `public(script)`. The last of these states that this function can be
+    called from a transaction script. `public(script)` functions can also be
+    called by other `public(script)` functions.
+* `move_to` is one of the [five different global storage operators](https://move-language.github.io/move/global-storage-operators.html).
+
+* Move [结构体](./chpater_16_structs-and-resources.html)可以通过给类型设定不同的能力[abilities](./chapter_19_abilities.html)让类型下支持对应的行为. 有四种能力:
+    - `copy`: 允许此类型的值被复制
+    - `drop`: 允许此类型的值被弹出/丢弃
+    - `store`: 允许此类型的值存在于全局存储的某个结构体中
+    - `key`: 允许此类型作为全局存储中的键(具有 `key` 能力的类型才能保存到全局存储中)
+
+    所以 `BasicCoin` 模块下的 `Coin` 结构体可以用作全局存储(global storage)的键(key)， 因为它又不具备其他能力，它不能
+    被拷贝，不能被丢弃, 也不能作为非key来保存在(全局)存储里. 你无法复制 `Coin`，也不会意外弄丢它.
+* 函数[Functions](./functions.html)默认是私有的(private), 也可以声明为 `public` [`public(friend)`](https://move-language.github.io/move/friends.html), `public(script)`. 最后一个声明(指 `public(script)`)的函数可以被事务脚本调用。`public(script)` 函数也可以被其他 `public(script)` 函数调用。(注意：在最新版本的 Move中，`public(script)` 已经被废弃，被`public entry` 取代，下同，译者注)
+* `move_to` 是[五种不同的全局存储操作](./global-storage-operators.html)之一
+
+</details>
+
+## Step 2: 给模块(Module)添加单元测试<span id="Step2"><span> (Adding unit tests to my first Move module)
+
+Now that we've taken a look at our first Move module, we'll take a look at a test to make sure minting works the way we expect it to by changing directory to [`step_2/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_2/BasicCoin).  Unit tests in Move are similar to unit tests in Rust if you're familiar with them -- tests are annotated with `#[test]` and written like normal Move functions.
+
+You can run the tests with the `move test` command: (原文是 `package test`，应该有误)
+
+现在我们已经完成了我们的第一个 Move 模块，我们将切换到目录[`step_2/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_2/BasicCoin)下并完成一个测试，确保铸币按我们预期的方式工作。
+如果你熟悉它们(Move 和 Rust)的话，Move 中的单元测试类似于 Rust 中的单元测试 —— 测试代码使用 `#[test]` 注解，并像编写普通的 Move 函数一样。
+
+可以通过 `move test` 命令来执行测试:
+
+```bash
+move test
+```
+
+Let's now take a look at the contents of the [`FirstModule.move`file](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_2/BasicCoin/sources/FirstModule.move). The first new thing you'll
+see is this test:
+
+现在我们来完成文件[`FirstModule.move`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_2/BasicCoin/sources/FirstModule.move)的具体内容，你将看到的第一个新事项是这个测试:
+
+```
+module 0xCAFE::BasicCoin {
+    ...
+    // Declare a unit test. It takes a signer called `account` with an
+    // address value of `0xC0FFEE`.
+    #[test(account = @0xC0FFEE)]
+    fun test_mint_10(account: signer) acquires Coin {
+        let addr = signer::address_of(&account);
+        mint(account, 10);
+        // Make sure there is a `Coin` resource under `addr` with a value of `10`.
+        // We can access this resource and its value since we are in the
+        // same module that defined the `Coin` resource.
+        assert!(borrow_global<Coin>(addr).value == 10, 0);
+    }
+}
+```
+
+This is declaring a unit test called `test_mint_10` that mints a `Coin` struct under the `account` with a `value` of `10`. It is then checking that the minted
+coin in storage has the value that is expected with the `assert!` call. If the assertion fails the unit test will fail.
+
+这里声明了一个命名为 `test_mint_10` 的单元测试，它在 `account` 账户地址下铸造了一个包含 `value` 为 `10`的 `Coin`，然后通过 `assert!` 断言检查已经铸造成功并保存在(全局)存储中的 `Coin` 的值是否与期望值一致。如果断言 `assert` 执行失败，则单元测试失败。
+
+<details>
+
+<summary>进阶概念及参考练习 (Advanced concepts and exercises)</summary>
+
+* There are a number of test-related annotations that are worth exploring, they can be found
+  [here](https://github.com/move-language/move/blob/main/language/changes/4-unit-testing.md#testing-annotations-their-meaning-and-usage).
+  You'll see some of these used in Step 5.
+* Before running unit tests, you'll always need to add a dependency on the Move
+  standard library. This can be done by adding an entry to the `[dependencies]`
+  section of the `Move.toml`, e.g.,
+
+  ```toml
+  [dependencies]
+  MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "Std" = "0x1" } }
+  ```
+
+  Note that you may need to alter the path to point to the `move-stdlib` directory under
+  `<path_to_move>/language`. You can also specify git dependencies. You can read more on Move
+  package dependencies [here](https://move-language.github.io/move/packages.html#movetoml).
+
+* 很多测试相关的注解(annotations)都值得仔细探索, 参阅[用法](https://github.com/move-language/move/blob/main/language/changes/4-unit-testing.md#testing-annotations-their-meaning-and-usage)。 在 `Step 5` 中会看到更多用法.
+
+* 执行测试之前，需要设定Move标准库依赖关系，找到 `Move.toml` 并在 `[dependencies]` 段内进行设定, 例如
+
+  ```toml
+  [dependencies]
+  MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "Std" = "0x1" } }
+  ```
+注意, 需要修改 `<path_to_move>/language` 中的内容来匹配实际 `move-stdlib` 所在的目录路径. 也可以用 `git` 方式指定依赖, 关于 Move 包依赖(package denpendices)信息可参阅[package文档](./packages.html#movetoml)
+
+#### 练习 (Exercises)
+
+* Change the assertion to `11` so that the test fails. Find a flag that you can pass to the `move test` command that will show you the global state when the test fails. It should look something like this:
+
+* 将断言值改为 `11` 将导致断言执行失败, 找一个可以传递给 `move test` 命令的标志，当测试失败时它会显示全局状态。看起来像这样：
+  ```
+    ┌── test_mint_10 ──────
+    │ error[E11001]: test failure
+    │    ┌─ ./sources/FirstModule.move:24:9
+    │    │
+    │ 18 │     fun test_mint_10(account: signer) acquires Coin {
+    │    │         ------------ In this function in 0xcafe::BasicCoin
+    │    ·
+    │ 24 │         assert!(borrow_global<Coin>(addr).value == 11, 0);
+    │    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to abort but it aborted with 0 here
+    │
+    │
+    │ ────── Storage state at point of failure ──────
+    │ 0xc0ffee:
+    │       => key 0xcafe::BasicCoin::Coin {
+    │           value: 10
+    │       }
+    │
+    └──────────────────
+  ```
+
+* Find a flag that allows you to gather test coverage information, and then play around with using the `move coverage` command to look at coverage statistics and source coverage.
+
+* 找一个允许您收集测试覆盖率信息的标志，然后使用 `move coverage` 命令查看覆盖率统计信息和源码覆盖率。
+
+</details>
+
+## Step 3: 设计 `BasicCoin` 模块(Module)<span id="Step3"><span> (Designing my `BasicCoin` module)
+
+In this section, we are going to design a module implementing a basic coin and balance interface, where coins can be minted and transferred between balances held under different addresses.
+
+在本节中，我们将设计一个具有基本代币和余额(balance)接口功能的模块，通过他们来实现币的挖矿铸造，不同地址之下钱包的转账。
+
+The signatures of the public Move function are the following:
+
+Move 语言的 `public function` 签名如下：
+
+```
+/// Publish an empty balance resource under `account`'s address. This function must be called before
+/// minting or transferring to the account.
+public fun publish_balance(account: &signer) { ... }
+
+/// Mint `amount` tokens to `mint_addr`. Mint must be approved by the module owner.
+public fun mint(module_owner: &signer, mint_addr: address, amount: u64) acquires Balance { ... }
+
+/// Returns the balance of `owner`.
+public fun balance_of(owner: address): u64 acquires Balance { ... }
+
+/// Transfers `amount` of tokens from `from` to `to`.
+public fun transfer(from: &signer, to: address, amount: u64) acquires Balance { ... }
+```
+
+Next we look at the data structs we need for this module.
+
+接下来再看本模块所需要各数据结构.
+
+A Move module doesn't have its own storage. Instead, Move "global storage" (what we call our
+blockchain state) is indexed by addresses. Under each address there are Move modules (code) and Move resources (values).
+
+Move 语言的模块没有自己的数据存储，相反的是 Move 语言提供按地址(addresses) 索引的 **全局存储** (也是就是我们所说的区块链状态(blockchain state)).
+每个地址之下包含有 Move 模块(代码)和 Move 资源 (数据)。
+
+The global storage looks roughly like this in Rust syntax:
+
+在 Rust 语法中，全局存储看起来有点像这样：
+
+```rust
+struct GlobalStorage {
+    resources: Map<address, Map<ResourceType, ResourceValue>>
+    modules: Map<address, Map<ModuleName, ModuleBytecode>>
+}
+```
+
+The Move resource storage under each address is a map from types to values. (An observant reader might observe that this means each address can only have one value of each type.) This conveniently provides us a native mapping indexed by addresses.
+In our `BasicCoin` module, we define the following `Balance` resource representing the number of coins each address holds:
+
+每个地址下的 Move 资源存储是一个类型到数值的映射。(细心的读者也许已经注意到每个地址, 每个类型下只能对应一个具体值)。这方便地为我们提供了一个按地址索引的本地映射。
+在 `BasicCoin` 模块中，定义了每个 `Balance` (钱包，余额)资源表示每个地址下持有的币的数量：
+
+```
+/// Struct representing the balance of each address.
+struct Balance has key {
+    coin: Coin // same Coin from Step 1
+}
+```
+
+Roughly the Move blockchain state should look like this:
+
+区块链状态(`Move blockchain state`)看起来大致如下：
+
+![](https://raw.githubusercontent.com/move-language/move/main/language/documentation/tutorial/diagrams/move_state.png)
+
+#### 进阶主题 (Advanced topics) ：
+
+<summary><code>public(script)</code> functions</summary>
+
+Only functions with `public(script)` visibility can be invoked directly in transactions. So if you would like to call the `transfer` method directly from a transaction, you'll want to change its signature to:
+
+只有`public(script)`可见行的函数才能直接被交易调用，所以如果你要直接在交易内调用`transfer`方法，那么需要将函数签改成如下格式:
+
+```
+public(script) fun transfer(from: signer, to: address, amount: u64) acquires Balance { ... }
+```
+Read more on Move function visibilities [here](https://move-language.github.io/move/functions.html#visibility).
+
+关于函数可见性的更多信息，请参阅[Move function visibilities](./functions.html#visibility)。
+
+</details>
+<details>
+<summary>与 Ethereum/Solidity 的比较 (Comparison with Ethereum/Solidity)</summary>
+
+In most Ethereum [ERC-20]((https://ethereum.org/en/developers/docs/standards/tokens/erc-20/)) contracts, the balance of each address is stored in a _state variable_ of type <code>mapping(address => uint256)</code>. This state variable is stored in the storage of a particular smart contract.
+
+在大多数以太坊[ERC-20]((https://ethereum.org/en/developers/docs/standards/tokens/erc-20/))智能合约中，各个账户地址下的余额保存在类型为 <code>mapping(address => uint256)</code>的 __状态变量__ 中，此状态变量存储在具体的智能合约内部存储中。
+
+The Ethereum blockchain state might look like this:
+
+以太坊区块链的状态看起来大致如下:
+
+![](https://raw.githubusercontent.com/move-language/move/main/language/documentation/tutorial/diagrams/solidity_state.png)
+</details>
+
+## Step 4: 实现 `BasicCoin` 模块span id="Step4"><span> (Implementing my `BasicCoin` module)
+
+We have created a Move package for you in folder `step_4` called `BasicCoin`. The `sources` folder contains source code for all your Move modules in the package, including `BasicCoin.move`. In this section, we will take a closer look at the implementation of the methods inside [`BasicCoin.move`](https://github.com/move-language/move/blob/main/language/documentation/tutorial/step_4/BasicCoin/sources/BasicCoin.move).
+
+我们已经在 `step_4` 文件夹上创建了名叫 `BasicCoin` 的 Move 包。`sources` 文件夹包含所有的 Move 包(package)的模块源码，包括 `BasicCoin.move`。 在本节中，我们将仔细研究[`BasicCoin.move`](https://github.com/move-language/move/blob/main/language/documentation/tutorial/step_4/BasicCoin/sources/BasicCoin.move)内部方法的实现。
+
+### 编译代码 (Compiling our code)
+
+Let's first try building the code using Move package by running the following command in [`step_4/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_4/BasicCoin) folder:
+
+首先尝试在文件夹[`step_4/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_4/BasicCoin)中运行以下命令，使用 Move 包构建代码：
+
+```bash
+move build
+```
+
+### 方法的实现 (Implementation of methods)
+
+Now let's take a closer look at the implementation of the methods inside [`BasicCoin.move`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_4/BasicCoin/sources/BasicCoin.move).
+
+现在仔细看看[`BasicCoin.move`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_4/BasicCoin/sources/BasicCoin.move)中内部方法的实现。
+
+<details>
+
+<summary><code>publish_balance</code>方法 (Method <code>publish_balance</code>)</summary>
+
+This method publishes a `Balance` resource to a given address. Since this resource is needed to receive coins through minting or transferring, `publish_balance` method must be called by a user before they can receive money, including the module owner.
+
+此方法将 `Balance` 资源发布到指定地址名下。由于此资源需要通过铸造或转账来接收代币，必须由用户先调用方法 `publish_balance` 才能接收钱，包括模块所有者。
+
+This method uses a `move_to` operation to publish the resource:
+
+此方法使用 `move_to` 操作来发布资源：
+
+```
+let empty_coin = Coin { value: 0 };
+move_to(account, Balance { coin:  empty_coin });
+```
+
+</details>
+<details>
+
+<summary><code>mint</code>方法 (Method <code>mint</code>)</summary>）
+
+Here we require that `mint` must be approved by the module owner. We enforce this using the assert statement:
+`mint` method mints coins to a given account.
+
+`mint` 方法将代币铸造到指定的帐户。在此我们要求 `mint` 必须得到模块所有者的批准。我们使用 `assert` 语句强制执行此操作：
+
+```
+assert!(signer::address_of(&module_owner) == MODULE_OWNER, errors::requires_address(ENOT_MODULE_OWNER));
+```
+
+Assert statements in Move can be used in this way: `assert!(<predicate>, <abort_code>);`. This means that if the `<predicate>` is false, then abort the transaction with `<abort_code>`. Here `MODULE_OWNER` and `ENOT_MODULE_OWNER` are both constants defined at the beginning of the module. And `errors` module defines common error categories we can use.
+It is important to note that Move is transactional in its execution -- so if an [abort](https://move-language.github.io/move/abort-and-assert.html) is raised no unwinding of state needs to be performed, as no changes from that transaction will be persisted to the blockchain.
+
+Move 中的 `assert` 语句可以这样使用：`assert!(<predicate>, <abort_code>);`。这意味着如果 `<predicate>` 为假，则使用中止错误码 `<abort_code>` 来终止交易。此处的 `MODULE_OWNER` 和 `ENOT_MODULE_OWNER` 都是在模块开头定义的常量。`errors` 模块定义了我们可以使用的常见错误种类。重点是我们需要注意 Move 在其执行过程中是事务性的-- 因此，如果触发[中止(abort)](./chapter_12_abort-and-assert.html)，并不用回退已执行状态的，因为该事务的任何更改都不会持久保存到区块链。
+
+We then deposit a coin with value `amount` to the balance of `mint_addr`.
+
+然后将数量为 `amount` 的代币存入 `mint_addr` 的余额中。
+
+```
+deposit(mint_addr, Coin { value: amount });
+```
+</details>
+
+<details>
+
+<summary><code>balance_of</code>方法 (Method <code>balance_of</code>)</summary>
+
+We use `borrow_global`, one of the global storage operators, to read from the global storage.
+
+我们使用全局存储操作之一的 `borrow_global` 从全局存储中读取资源(数据)。
+
+```
+borrow_global<Balance>(owner).coin.value
+                 |       |       \    /
+        resource type  address  field names
+```
+</details>
+
+<details>
+
+<summary><code>transfer</code>方法 (Method <code>transfer</code>)</summary>
+
+This function withdraws tokens from `from`'s balance and deposits the tokens into `to`s balance. We take a closer look at `withdraw` helper function:
+
+该函数从 `from` 的余额中提取代币并将代币存入 `to` 的余额中。我们仔细研究帮助函数 `withdraw`：
+
+```
+fun withdraw(addr: address, amount: u64) : Coin acquires Balance {
+    let balance = balance_of(addr);
+    assert!(balance >= amount, EINSUFFICIENT_BALANCE);
+    let balance_ref = &mut borrow_global_mut<Balance>(addr).coin.value;
+    *balance_ref = balance - amount;
+    Coin { value: amount }
+}
+```
+
+At the beginning of the method, we assert that the withdrawing account has enough balance. We then use `borrow_global_mut` to get a mutable reference to the global storage, and `&mut` is used to create a [mutable reference](https://move-language.github.io/move/references.html) to a field of a struct. We then modify the balance through this mutable reference and return a new coin with the withdrawn amount.
+
+在方法开始，我们断言提款账户有足够的余额。然后我们使用 `borrow_global_mut` 来获得全局存储的可变引用，并用 `&mut` 创建结构体字段的[可变引用](./references.html)。然后我们通过这个可变引用修改余额并返回一个带有提取金额的新代币。
+
+</details>
+
+### 练习 (Exercises)
+
+There are two `TODO`s in our module, left as exercises for the reader:
+- Finish implementing the `publish_balance` method.
+- Implement the `deposit` method.
+
+在模块中有两个 TODOs，留给读者练习：
+- 完成 `publish_balance` 方法的实现。
+- 实现 `deposit` 方法。
+
+The solution to this exercise can be found in [`step_4_sol`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_4_sol) folder.
+
+此练习的解决方案可以在[`step_4_sol`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_4_sol)文件夹中找到。
+
+**额外练习** (**Bonus exercise**)
+
+- What would happen if we deposit too many tokens to a balance?
+- 如果我们在余额中存入太多会发生什么？
+
+
+## Step 5: 在模块 `BasicCoin` 中添加和使用单元测试<span id="Step5"><span> (Adding and using unit tests with the `BasicCoin` module<span id="Step5"><span>)
+
+In this step we're going to take a look at all the different unit tests we've written to cover the code we wrote in step 4. We're also going to take a look at some tools we can use to help us write tests.
+
+在这一步中，来看看我们为覆盖在 `step 4` 中编写的代码而编写的所有不同的单元测试。还将看看我们可以用来帮助我们编写测试用例的一些工具。
+
+To get started, run the `move test` command in the [`step_5/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_5/BasicCoin) folder
+
+首先，请在文件夹 [`step_5/BasicCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_5/BasicCoin)中 运行 `move test` 命令。
+
+```bash
+move test
+```
+You should see something like this:
+
+您应该看到如下内容：
+
+```
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING BasicCoin
+Running Move unit tests
+[ PASS    ] 0xcafe::BasicCoin::can_withdraw_amount
+[ PASS    ] 0xcafe::BasicCoin::init_check_balance
+[ PASS    ] 0xcafe::BasicCoin::init_non_owner
+[ PASS    ] 0xcafe::BasicCoin::publish_balance_already_exists
+[ PASS    ] 0xcafe::BasicCoin::publish_balance_has_zero
+[ PASS    ] 0xcafe::BasicCoin::withdraw_dne
+[ PASS    ] 0xcafe::BasicCoin::withdraw_too_much
+Test result: OK. Total tests: 7; passed: 7; failed: 0
+```
+
+Taking a look at the tests in the [`BasicCoin` module](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_5/BasicCoin/sources/BasicCoin.move) we've tried to keep each unit test to testing one particular behavior.
+
+看看 [`BasicCoin` ](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_5/BasicCoin/sources/BasicCoin.move)模块中的测试，我们试图让每个单元测试都测试一个具体的行为。
+
+<details>
+<summary>Exercise (练习)</summary>
+
+After taking a look at the tests, try and write a unit test called `balance_of_dne` in the `BasicCoin` module that tests the case where a `Balance` resource doesn't exist under the address that `balance_of` is being called on. It should only be a couple lines!
+
+在查看测试之后，尝试在 `BasicCoin` 模块中编写一个单元测试 `balance_of_dne`，测试地址没有 `Balance` 资源的情况，调用 `balance_of` 方法的执行结果。它应该只有几行代码。
+
+The solution to this exercise can be found in [`step_5_sol`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_5_sol).
+
+练习的答案可以在[`step_5_sol`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_5_sol)中找到。
+
+</details>
+
+## Step 6: `BasicCoin` 模块泛型化<span id="Step6"><span>（Making my `BasicCoin` module generic<span id="Step6"><span>）
+
+In Move, we can use generics to define functions and structs over different input data types. Generics are a great building block for library code. In this section, we are going to make our simple `BasicCoin` module generic so that it can serve as a library module that can be used by other user modules.
+
+在 Move 语言中，我们可以使用泛型来定义不同输入数据类型的函数和结构体。泛型是库代码的重要组成部分。在本节中，我们将使我们的简单 `BasicCoin` 模块泛型化，以便它可以用作其他用户模块可以使用的模块库。
+
+First, we add type parameters to our data structs:
+
+首先，我们将类型参数添加到我们的数据结构中：
+
+```
+struct Coin<phantom CoinType> has store {
+    value: u64
+}
+
+struct Balance<phantom CoinType> has key {
+    coin: Coin<CoinType>
+}
+```
+
+We also add type parameters to our methods in the same manner. For example, `withdraw` becomes the following:
+
+我们还以相同的方式将类型参数添加到我们的方法中。例如，`withdraw` 变成如下：
+
+```
+fun withdraw<CoinType>(addr: address, amount: u64) : Coin<CoinType> acquires Balance {
+    let balance = balance_of<CoinType>(addr);
+    assert!(balance >= amount, EINSUFFICIENT_BALANCE);
+    let balance_ref = &mut borrow_global_mut<Balance<CoinType>>(addr).coin.value;
+    *balance_ref = balance - amount;
+    Coin<CoinType> { value: amount }
+}
+```
+
+Take a look at [`step_6/BasicCoin/sources/BasicCoin.move`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_6/BasicCoin/sources/BasicCoin.move) to see the full implementation.
+
+查看[`step_6/BasicCoin/sources/BasicCoin.move`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_6/BasicCoin/sources/BasicCoin.move)完整的实现。
+
+At this point, readers who are familiar with Ethereum might notice that this module serves a similar purpose as the [ERC20 token standard](https://ethereum.org/en/developers/docs/standards/tokens/erc-20/), which provides an interface for implementing fungible tokens in smart contracts. One key advantage of using generics is the ability to reuse code since the generic library module already provides a standard implementation and the instantiating module can provide customizations by wrapping the standard implementation.
+
+此时，熟悉以太坊的读者可能会注意到，该模块的用途与[ERC20 token standard](https://ethereum.org/en/developers/docs/standards/tokens/erc-20/)类似，后者提供了在智能合约中实现可替代代币的接口。使用泛型的一个关键优势是能够重用代码，因为泛型模块库已经提供了标准实现，并且实例化模块可以通过包装标准实现提供定制化功能。
+
+We provide a little module called [`MyOddCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_6/BasicCoin/sources/MyOddCoin.move) that instantiates the `Coin` type and customizes its transfer policy: only odd number of coins can be transferred. We also include two [tests](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_6/BasicCoin/sources/MyOddCoin.move) to test this behavior. You can use the commands you learned in step 2 and step 5 to run the tests.
+
+我们提供了一个称为[`MyOddCoin`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_6/BasicCoin/sources/MyOddCoin.move)并实例化 `Coin` 类型并自定义其转移策略的小模块：只能转移奇数个代币。其还包括两个 [tests](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_6/BasicCoin/sources/MyOddCoin.move)来测试这种行为。您可以使用在第 2 步和第 5 步中学到的命令来运行测试。
+
+
+#### 进阶主题 (Advanced topics):
+
+<details>
+
+<summary><code>phantom</code> 类型参数 (<code>phantom</code> type parameters)</summary>
+
+In definitions of both `Coin` and `Balance`, we declare the type parameter `CoinType` to be phantom because `CoinType` is not used in the struct definition or is only used as a phantom type parameter.
+
+在 `Coin` 和 `Balance `的定义中，我们将类型参数 `CoinType` 声明为phantom，因为 `CoinType` 没有在结构体定义中使用或仅用作 phantom 类型参数。
+
+Read more about phantom type parameters <a href="https://move-language.github.io/move/generics.html#phantom-type-parameters">here</a>.
+
+阅读更多有关 [phantom 类型参数](./generics.md#phantom-type-parameters) 信息.
+
+</details>
+
+## 进阶步骤 (Advanced steps)
+
+Before moving on to the next steps, let's make sure you have all the prover dependencies installed.
+
+在继续下一步之前，确保您已安装所有的验证器依赖项。
+
+Try running `boogie /version `. If an error message shows up saying "command not found: boogie", you will have to run the setup script and source your profile:
+
+尝试运行 `boogie /version` 。如果出现错误消息“找不到命令：boogie”，您将必须运行安装脚本并更新环境配置(`source ~/.profile`)：
+
+```bash
+# run the following in move repo root directory
+./scripts/dev_setup.sh -yp
+source ~/.profile
+```
+
+## Step 7:  使用Move验证器<span id="Step7"><span>（Use the Move prover<span id="Step7"><span>）
+
+Smart contracts deployed on the blockchain may manipulate high-value assets. As a technique that uses strict mathematical methods to describe behavior and reason correctness of computer systems, formal verification has been used in blockchains to prevent bugs in smart contracts. [The Move prover](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/prover-guide.md) is an evolving formal verification tool for smart contracts written in the Move language. The user can specify functional properties of smart contracts using the [Move Specification Language (MSL)](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/spec-lang.md) and then use the prover to automatically check them statically. To illustrate how the prover is used, we have added the following code snippet to the [BasicCoin.move](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_7/BasicCoin/sources/BasicCoin.move):
+
+部署在区块链上的智能合约可能会操纵高价值资产。作为一种使用严格的数学方式来描述计算机系统的行为和推理正确性的技术，形式化验证已被用于区块链，以防止智能合约中错误的产生。 [Move验证器](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/prover-guide.md)是一种在进化中、用Move 语言编写的智能合约形式化验证工具。用户可以使用[Move语言规范(Move Specification Language (MSL))](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/spec-lang.md)指定智能合约的功能属性，然后使用验证器自动静态检查它们。
+为了说明如何使用验证器，我们在[BasicCoin.move](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_7/BasicCoin/sources/BasicCoin.move)中添加了以下代码片段：
+
+```
+    spec balance_of {
+        pragma aborts_if_is_strict;
+    }
+```
+
+Informally speaking, the block `spec balance_of {...}` contains the property specification of the method `balance_of`.
+
+通俗地说，代码块 `spec balance_of {...}` 包含 `balance_of` 方法的属性规范说明。
+
+Let's first run the prover using the following command inside [`BasicCoin` directory](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_7/BasicCoin/):
+
+首先在[`BasicCoin` directory](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_7/BasicCoin/)目录中使用以下命令运行验证器。
+
+```bash
+move prove
+```
+
+which outputs the following error information:
+
+它输出以下错误信息：
+
+```
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ ./sources/BasicCoin.move:38:5
+   │
+35 │           borrow_global<Balance<CoinType>>(owner).coin.value
+   │           ------------- 由于执行失败这里发生中止
+   ·
+38 │ ╭     spec balance_of {
+39 │ │         pragma aborts_if_is_strict;
+40 │ │     }
+   │ ╰─────^
+   │
+   =     at ./sources/BasicCoin.move:34: balance_of
+   =         owner = 0x29
+   =     at ./sources/BasicCoin.move:35: balance_of
+   =         中止
+
+Error: exiting with verification errors
+```
+
+The prover basically tells us that we need to explicitly specify the condition under which the function `balance_of` will abort, which is caused by calling the function `borrow_global` when `owner` does not own the resource `Balance<CoinType>`. To remove this error information, we add an `aborts_if` condition as follows:
+
+验证器大体上告诉我们，我们需要明确指定函数 `balance_of` 中止的条件，中止原因是 `owner`(函数调用者)在没有资源 `Balance<CoinType>` 的情况下调用 `borrow_global` 函数导致的。要去掉此错误信息，我们添加如下 `aborts_if` 条件：
+
+
+```
+    spec balance_of {
+        pragma aborts_if_is_strict;
+        aborts_if !exists<Balance<CoinType>>(owner);
+    }
+```
+
+After adding this condition, try running the `prove` command again to confirm that there are no verification errors:
+
+添加此条件后，再次尝试运行prove命令，确认没有验证错误：
+
+```bash
+move prove
+```
+
+Apart from the abort condition, we also want to define the functional properties. In Step 8, we will give more detailed introduction to the prover by specifying properties for the methods defined the `BasicCoin` module.
+
+除了中止条件，我们还想定义功能属性。在第 8 步中，我们将通过为定义 `BasicCoin` 模块的方法指定属性来更详细地介绍验证器。
+
+
+## 第 8 步：为 `BasicCoin` 模块编写正式规范<span id="Step8"><span>（Write formal specifications for the `BasicCoin` module）<span id="Step8"><span>
+
+<details>
+
+<summary> 取款方法 (Method withdraw) </summary>
+
+The signature of the method `withdraw` is given below:
+
+ 取款(`withdraw`) 方法的签名如下：
+
+```
+fun withdraw<CoinType>(addr: address, amount: u64) : Coin<CoinType> acquires Balance
+```
+
+The method withdraws tokens with value `amount` from the address `addr` and returns a created Coin of value `amount`.  The method `withdraw` aborts when 1) `addr` does not have the resource `Balance<CoinType>` or 2) the number of tokens in `addr` is smaller than `amount`. We can define conditions like this:
+
+该方法从地址 `addr` 中提取数量为 `amount` 的代币，然后创建数量为 `amount` 的代币并将其返回。当出现如下情况会中止：
+  1) 地址 `addr` 没有资源 `Balance<CoinType>`，或
+  2) 地址 `addr` 中的代币数量小于 `amount` 时，`withdraw` 。
+
+我们可以这样定义条件：
+
+```
+    spec withdraw {
+        let balance = global<Balance<CoinType>>(addr).coin.value;
+        aborts_if !exists<Balance<CoinType>>(addr);
+        aborts_if balance < amount;
+    }
+```
+
+As we can see here, a spec block can contain let bindings which introduce names for expressions. `global<T>(address): T` is a built-in function that returns the resource value at `addr`. `balance` is the number of tokens owned by `addr`. `exists<T>(address): bool` is a built-in function that returns true if the resource T exists at address. Two `aborts_if` clauses correspond to the two conditions mentioned above. In general, if a function has more than one `aborts_if` condition, those conditions are or-ed with each other. By default, if a user wants to specify aborts conditions, all possible conditions need to be listed. Otherwise, the prover will generate a verification error. However, if `pragma aborts_if_is_partial` is defined in the spec block, the combined aborts condition (the or-ed individual conditions) only *imply* that the function aborts. The reader can refer to the [MSL](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/spec-lang.md) document for more information.
+
+正如我们在这里看到的，一个 spec 块可以包含 `let` 绑定，它为表达式引入名称。
+`global<T>(address): T` 是一个返回 `addr` 资源值的内置函数。`balance` 是 `addr` 拥有的代币数量。
+`exists<T>(address): bool` 是一个内置函数，如果指定的地址(address)在(全局存储中)有资源 `T` 则返回 `true` 。
+两个 `aborts_if` 子句对应上述两个条件。通常，如果一个函数有多个 `aborts_if` 条件，这些条件之间是相互对等的。默认情况下，如果用户想要指定中止条件，则需要列出所有可能的条件。否则验证器将产生验证错误。
+但是，如果在 `spec` 代码块中定义了 `pragma aborts_if_is_partial`，则组合中止条件（或对等的单个条件）仅 *暗示* 函数中止。
+读者可以参考 [MSL](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/spec-lang.md) 文档了解更多信息。
+
+The next step is to define functional properties, which are described in the two `ensures` clauses below. First, by using the `let post` binding, `balance_post` represents the balance of `addr` after the execution, which should be equal to `balance - amount`. Then, the return value (denoted as `result`) should be a coin with value `amount`.
+
+下一步是定义功能属性，这些属性在下面的两个 `ensures` 子句中进行了描述。首先，通过使用 `let post` 绑定，`balance_post` 表示地址 `addr` 执行后的余额，应该等于 `balance - amount`。那么，返回值（表示为 `result` ）应该是一个价值为 `amount` 的代币。
+
+```
+    spec withdraw {
+        let balance = global<Balance<CoinType>>(addr).coin.value;
+        aborts_if !exists<Balance<CoinType>>(addr);
+        aborts_if balance < amount;
+
+        let post balance_post = global<Balance<CoinType>>(addr).coin.value;
+        ensures balance_post == balance - amount;
+        ensures result == Coin<CoinType> { value: amount };
+    }
+```
+</details>
+
+<details>
+
+<summary> 存款方法 (Method deposit) </summary>
+
+The signature of the method `deposit` is given below:
+
+存款(`deposit`)方法的签名如下：
+
+```
+fun deposit<CoinType>(addr: address, check: Coin<CoinType>) acquires Balance
+```
+
+The method deposits the `check` into `addr`. The specification is defined below:
+
+该方法将代币 `check` 存入地址 `addr`. 规范定义如下：
+
+```
+    spec deposit {
+        let balance = global<Balance<CoinType>>(addr).coin.value;
+        let check_value = check.value;
+
+        aborts_if !exists<Balance<CoinType>>(addr);
+        aborts_if balance + check_value > MAX_U64;
+
+        let post balance_post = global<Balance<CoinType>>(addr).coin.value;
+        ensures balance_post == balance + check_value;
+    }
+```
+
+`balance` represents the number of tokens in `addr` before execution and `check_value` represents the number of tokens to be deposited. The method would abort if 1) `addr` does not have the resource `Balance<CoinType>` or 2) the sum of `balance` and `check_value` is greater than the maxium value of the type `u64`. The functional property checks that the balance is correctly updated after the execution.
+
+`balance` 表示 `addr` 执行前的代币数量，`check_value` 表示要存入的代币数量。方法出现如下情况将会中止：
+    1) 地址 `addr` 没有 `Balance<CoinType>` 资源， 或
+    2) `balance` 与 `check_value` 之和大于 `u64` 的最大值。
+
+该功能属性检查执行后余额是否正确更新。
+
+
+</details>
+
+<details>
+
+<summary> 转账方法 (Method transfer) </summary>
+
+The signature of the method `transfer` is given below:
+
+转账(`transfer`)方法的签名如下：
+
+```
+public fun transfer<CoinType: drop>(from: &signer, to: address, amount: u64, _witness: CoinType) acquires Balance
+```
+
+The method transfers the `amount` of coin from the account of `from` to the address `to`. The specification is given below:
+
+该方法将数量为 `amount` 的代币从帐户 `from` 转账给地址 `to`。规范如下：
+
+```
+    spec transfer {
+        let addr_from = signer::address_of(from);
+
+        let balance_from = global<Balance<CoinType>>(addr_from).coin.value;
+        let balance_to = global<Balance<CoinType>>(to).coin.value;
+        let post balance_from_post = global<Balance<CoinType>>(addr_from).coin.value;
+        let post balance_to_post = global<Balance<CoinType>>(to).coin.value;
+
+        ensures balance_from_post == balance_from - amount;
+        ensures balance_to_post == balance_to + amount;
+    }
+```
+
+`addr_from` is the address of `from`. Then the balances of `addr_from` and `to` before and after the execution are obtained.
+The `ensures` clauses specify that the `amount` number of tokens is deducted from `addr_from` and added to `to`. However, the prover will generate the error information as below:
+
+`addr_from` 是账户 `from` 的地址，然后获取执行前两个地址 `addr_from` 和 `to` 的余额。
+ `ensures` 子句指定从 `addr_from` 减去 `amount` 数量的代币，添加到 `to`。然而，验证器会生成以下错误：
+
+```
+error: post-condition does not hold
+   ┌─ ./sources/BasicCoin.move:57:9
+   │
+62 │         ensures balance_from_post == balance_from - amount;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   ...
+```
+
+The property is not held when `addr_from` is equal to `to`. As a result, we could add an assertion `assert!(from_addr != to)` in the method to make sure that `addr_from` is not equal to `to`.
+
+当 `addr_from` 等于 `to` 时，这个属性无效。因此，我们可以在方法中添加一个断言，`assert!(from_addr != to)` 来确保 `addr_from` 不等于 `to`。
+
+</details>
+
+
+<details>
+
+<summary> 练习 (Exercises) </summary>
+
+- Implement the `aborts_if` conditions for the `transfer` method.
+- 为` transfer` 方法实现 `aborts_if` 条件。
+- Implement the specification for the `mint` and `publish_balance` method.
+- 为 `mint` 和 `publish_balance` 方法实现规范。
+
+The solution to this exercise can be found in [`step_8_sol`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_8_sol).
+
+练习的解答可以在 [`step_8_sol`](https://github.com/move-language/move/tree/main/language/documentation/tutorial/step_8_sol)中找到。
diff --git a/language/documentation/book/translations/move-book-zh/src/overview.md b/language/documentation/book/translations/move-book-zh/src/overview.md
new file mode 100644
index 0000000000..d08bf43529
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/overview.md
@@ -0,0 +1,200 @@
+---
+id: overview
+title: Overview
+sidebar_label: Move
+---
+
+Move is a next generation language for secure, sandboxed, and formally verified programming. Its first use case is for the Diem blockchain, where Move provides the foundation for its implementation. However, Move has been developed with use cases in mind outside a blockchain context as well.
+
+### Start Here
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/introduction-to-move.svg"
+    iconDark="img/introduction-to-move-dark.svg"
+    overlay="Understand Move’s background, current status and architecture"
+    title="Introduction"
+    to="/docs/move/move-introduction"
+  />
+  <SimpleTextCard
+    icon="img/modules-and-scripts.svg"
+    iconDark="img/modules-and-scripts-dark.svg"
+    overlay="Understand Move’s two different types of programs: Modules and Scripts"
+    title="Modules and Scripts"
+    to="/docs/move/move-modules-and-scripts"
+  />
+  <SimpleTextCard
+    icon="img/placeholder.svg"
+    iconDark="img/placeholder-dark.svg"
+    overlay="Play with Move directly as you create coins with the language"
+    title="First Tutorial: Creating Coins"
+    to="/docs/move/move-tutorial-creating-coins"
+  />
+</CardsWrapper>
+
+### Primitive Types
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/integers-bool.svg"
+    iconDark="img/integers-bool-dark.svg"
+    overlay="Move supports three unsigned integer types: u8, u64, and u128"
+    title="Integers"
+    to="/docs/move/move-integers"
+  />
+  <SimpleTextCard
+    icon="img/integers-bool.svg"
+    iconDark="img/integers-bool-dark.svg"
+    overlay="bool is Move's primitive type for boolean true and false values."
+    title="Bool"
+    to="/docs/move/move-bool"
+  />
+  <SimpleTextCard
+    icon="img/address.svg"
+    iconDark="img/address-dark.svg"
+    overlay="address is a built-in type in Move that is used to represent locations in global storage"
+    title="Address"
+    to="/docs/move/move-address"
+  />
+  <SimpleTextCard
+    icon="img/vector.svg"
+    iconDark="img/vector-dark.svg"
+    overlay="vector<T> is the only primitive collection type provided by Move"
+    title="Vector"
+    to="/docs/move/move-vector"
+  />
+  <SimpleTextCard
+    icon="img/signer.svg"
+    iconDark="img/signer-dark.svg"
+    overlay="signer is a built-in Move resource type. A signer is a capability that allows the holder to act on behalf of a particular address"
+    title="Signer"
+    to="/docs/move/move-signer"
+  />
+  <SimpleTextCard
+    icon="img/move-references.svg"
+    iconDark="img/move-references-dark.svg"
+    overlay="Move has two types of references: immutable & and mutable &mut"
+    title="References"
+    to="/docs/move/move-references"
+  />
+  <SimpleTextCard
+    icon="img/tuples.svg"
+    iconDark="img/tuples-dark.svg"
+    overlay="In order to support multiple return values, Move has tuple-like expressions. We can consider unit() to be an empty tuple"
+    title="Tuples and Unit"
+    to="/docs/move/move-tuples-and-unit"
+  />
+</CardsWrapper>
+
+### Basic Concepts
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/local-variables-and-scopes.svg"
+    iconDark="img/local-variables-and-scopes-dark.svg"
+    overlay="Local variables in Move are lexically (statically) scoped"
+    title="Local Variables and Scopes"
+    to="/docs/move/move-variables"
+  />
+  <SimpleTextCard
+    icon="img/abort-and-return.svg"
+    iconDark="img/abort-and-return-dark.svg"
+    overlay="return and abort are two control flow constructs that end execution, one for the current function and one for the entire transaction"
+    title="Abort & Assert"
+    to="/docs/move/move-abort-and-assert"
+  />
+  <SimpleTextCard
+    icon="img/conditionals.svg"
+    iconDark="img/conditionals-dark.svg"
+    overlay="An if expression specifies that some code should only be evaluated if a certain condition is true"
+    title="Conditionals"
+    to="/docs/move/move-conditionals"
+  />
+  <SimpleTextCard
+    icon="img/loops.svg"
+    iconDark="img/loops-dark.svg"
+    overlay="Move offers two constructs for looping: while and loop"
+    title="While and Loop"
+    to="/docs/move/move-while-and-loop"
+  />
+  <SimpleTextCard
+    icon="img/functions.svg"
+    iconDark="img/functions-dark.svg"
+    overlay="Function syntax in Move is shared between module functions and script functions"
+    title="Functions"
+    to="/docs/move/move-functions"
+  />
+  <SimpleTextCard
+    icon="img/structs-and-resources.svg"
+    iconDark="img/structs-and-resources-dark.svg"
+    overlay="A struct is a user-defined data structure containing typed fields. A resource is a kind of struct that cannot be copied and cannot be dropped"
+    title="Structs and Resources"
+    to="/docs/move/move-structs-and-resources"
+  />
+  <SimpleTextCard
+    icon="img/constants.svg"
+    iconDark="img/constants-dark.svg"
+    overlay="Constants are a way of giving a name to shared, static values inside of a module or script"
+    title="Constants"
+    to="/docs/move/move-constants"
+  />
+  <SimpleTextCard
+    icon="img/generics.svg"
+    iconDark="img/generics-dark.svg"
+    overlay="Generics can be used to define functions and structs over different input data types"
+    title="Generics"
+    to="/docs/move/move-generics"
+  />
+  <SimpleTextCard
+    icon="img/equality.svg"
+    iconDark="img/equality-dark.svg"
+    overlay="Move supports two equality operations == and !="
+    title="Equality"
+    to="/docs/move/move-equality"
+  />
+  <SimpleTextCard
+    icon="img/uses-and-aliases.svg"
+    iconDark="img/uses-and-aliases-dark.svg"
+    overlay="The use syntax can be used to create aliases to members in other modules"
+    title="Uses & Aliases"
+    to="/docs/move/move-uses-and-aliases"
+  />
+</CardsWrapper>
+
+### Global Storage
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/intro-to-global-storage.svg"
+    iconDark="img/intro-to-global-storage-dark.svg"
+    overlay="The purpose of Move programs is to read from and write to persistent global storage"
+    title="Global Storage Structure"
+    to="/docs/move/move-global-storage-structure"
+  />
+  <SimpleTextCard
+    icon="img/intro-to-global-storage.svg"
+    iconDark="img/intro-to-global-storage-dark.svg"
+    overlay="Move programs can create, delete, and update resources in global storage using five instructions"
+    title="Global Storage Operators"
+    to="/docs/move/move-global-storage-operators"
+  />
+</CardsWrapper>
+
+### Reference
+
+<CardsWrapper>
+  <SimpleTextCard
+    icon="img/standard-library.svg"
+    iconDark="img/standard-library-dark.svg"
+    overlay="The Move standard library exposes interfaces that implement functionality on vectors, option types, error codes and fixed-point numbers"
+    title="Standard Library"
+    to="/docs/move/move-standard-library"
+  />
+  <SimpleTextCard
+    icon="img/coding-conventions.svg"
+    iconDark="img/coding-conventions-dark.svg"
+    overlay="There are basic coding conventions when writing Move code"
+    title="Coding Conventions"
+    to="/docs/move/move-coding-conventions"
+  />
+</CardsWrapper>
diff --git a/language/documentation/book/translations/move-book-zh/src/packages.md b/language/documentation/book/translations/move-book-zh/src/packages.md
new file mode 100644
index 0000000000..4ab185d120
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/packages.md
@@ -0,0 +1,348 @@
+# 程序包(packages)
+
+Packages allow Move programmers to more easily re-use code and share it
+across projects. The Move package system allows programmers to easily:
+* Define a package containing Move code;
+* Parameterize a package by [named addresses](./address.md);
+* Import and use packages in other Move code and instantiate named addresses;
+* Build packages and generate associated compilation artifacts from packages; and
+* Work with a common interface around compiled Move artifacts.
+
+包允许 `Move` 程序员更轻松地重用代码并在项目之间共享。`Move` 包系统允许程序员轻松地：
+* 定义一个包含 `Move`代码的包；
+* 通过命名地址参数化包；
+* 在其他 `Move` 代码中导入和使用包并实例化命名地址；
+* 构建包并从包中生成相关的编译源代码；
+* 使用围绕已编译 `Move` 工件的通用接口。
+
+## 包布局和清单语法（Package Layout and Manifest Syntax）
+
+A Move package source directory contains a `Move.toml` package manifest
+file along with a set of subdirectories:
+
+`Move` 包源目录包含一个`Move.toml`包清单文件以及一组子目录：
+
+```
+     a_move_package
+        ├── Move.toml      (required)（需要的）
+        ├── sources        (required)（需要的）
+        ├── examples       (optional, test & dev mode)（可选的，测试 & 开发者模式）
+        ├── scripts        (optional)（可选的）
+        ├── doc_templates  (optional)（可选的）
+        └── tests          (optional, test mode)（可选的，测试模式）
+```
+
+The directories marked `required` _must_ be present in order for the directory
+to be considered a Move package and to be compiled. Optional directories can
+be present, and if so will be included in the compilation process. Depending on
+the mode that the package is built with (`test` or `dev`), the `tests` and
+`examples` directories will be included as well.
+
+标记为`required` 的目录必须存在才可以将该目录作为 `Move` 包并进行编译。可选目录被视为可存在的，如果存在，将包含在编译过程里。根据使用 （`test`或`dev`）构建包的模式，`tests`和`examples` 目录也将包含在内。
+
+The `sources` directory can contain both Move modules and Move scripts (both
+transaction scripts and modules containing script functions). The `examples`
+directory can hold additional code to be used only for development and/or
+tutorial purposes that will not be included when compiled outside `test` or
+`dev` mode.
+
+`sources`目录可以包含 `Move` 模块和 `Move` 脚本（事务脚本和包含脚本函数的模块）。`Example`目录可以保留仅用于开发和/或用作教程目的附加代码，当在 `test` 或者`dev`模式之外时，这些附加代码编译时不会被包括进来。
+
+A `scripts` directory is supported so transaction scripts can be separated
+from modules if that is desired by the package author. The `scripts`
+directory will always be included for compilation if it is present.
+Documentation will be built using any documentation templates present in
+the `doc_templates` directory.
+
+`scripts`目录是被支持的，如果包作者需要，事物脚本可以从模块中分离。如果该`scripts`目录存在，则编译时将始终包含该目录。
+Move将使用存在于`doc_templates` 目录的任何模板构建文档。
+
+
+### 包清单 Move.toml
+
+The Move package manifest is defined within the `Move.toml` file and has the
+following syntax. Optional fields are marked with `*`, `+` denotes
+one or more elements:
+
+Move 包清单在`Move.toml`文件中定义，并具有以下语法。可选字段标有`*`，`+`表示一个或多个元素：
+```
+    [package]
+    name = <string>                  # e.g., "MoveStdlib"
+    version = "<uint>.<uint>.<uint>" # e.g., "0.1.1"
+    license* = <string>              # e.g., "MIT", "GPL", "Apache 2.0"
+    authors* = [<string>]            # e.g., ["Joe Smith (joesmith@noemail.com)", "Jane Smith (janesmith@noemail.com)"]
+
+    [addresses]  # (Optional section) Declares named addresses in this package and instantiates named addresses in the package graph
+    # One or more lines declaring named addresses in the following format
+    <addr_name> = "_" | "<hex_address>" # e.g., std = "_" or my_addr = "0xC0FFEECAFE"
+
+    [dependencies] # (Optional section) Paths to dependencies and instantiations or renamings of named addresses from each dependency
+    # One or more lines declaring dependencies in the following format
+    <string> = { local = <string>, addr_subst* = { (<string> = (<string> | "<hex_address>"))+ } } # local dependencies
+    <string> = { git = <URL ending in .git>, subdir=<path to dir containing Move.toml inside git repo>, rev=<git commit hash>, addr_subst* = { (<string> = (<string> | "<hex_address>"))+ } } # git dependencies
+
+    [dev-addresses] # (Optional section) Same as [addresses] section, but only included in "dev" and "test" modes
+    # One or more lines declaring dev named addresses in the following format
+    <addr_name> = "_" | "<hex_address>" # e.g., std = "_" or my_addr = "0xC0FFEECAFE"
+
+    [dev-dependencies] # (Optional section) Same as [dependencies] section, but only included in "dev" and "test" modes
+    # One or more lines declaring dev dependencies in the following format
+    <string> = { local = <string>, addr_subst* = { (<string> = (<string> | <address>))+ } }
+```
+An example of a minimal package manifest with one local dependency and one git dependency:
+
+一个具有局部依赖项和一个 git 依赖项的最小包清单示例：
+```
+    [package]
+    name = "AName"
+    version = "0.0.0"
+```
+
+An example of a more standard package manifest that also includes the Move
+standard library and instantiates the named address `Std` from it with the
+address value `0x1`:
+
+一个包括 Move 标准库并从中使用地址值`0x1`实例化命名地址`Std`的更标准的包清单示例：
+
+```
+    [package]
+    name = "AName"
+    version = "0.0.0"
+    license = "Apache 2.0"
+
+    [addresses]
+    address_to_be_filled_in = "_"
+    specified_address = "0xB0B"
+
+    [dependencies]
+    # Local dependency
+    LocalDep = { local = "projects/move-awesomeness", addr_subst = { "std" = "0x1" } }
+    # Git dependency
+    MoveStdlib = { git = "https://github.com/diem/diem.git", subdir="language/move-stdlib", rev = "56ab033cc403b489e891424a629e76f643d4fb6b" }
+
+    [dev-addresses] # For use when developing this module
+    address_to_be_filled_in = "0x101010101"
+  ```
+
+Most of the sections in the package manifest are self explanatory, but named
+addresses can be a bit difficult to understand so it's worth examining them in
+a bit more detail.
+
+包清单中的大部分段落都是不言自明的，但命名地址可能有点难以理解，因此值得更详细地检查它们。
+
+## 编译期间的命名地址（Named Addresses During Compilation）
+
+Recall that Move has [named addresses](./address.md) and that
+named addresses cannot be declared in Move. Because of this, until now
+named addresses and their values needed to be passed to the compiler on the
+command line. With the Move package system this is no longer needed, and
+you can declare named addresses in the package, instantiate other named
+addresses in scope, and rename named addresses from other packages within
+the Move package system manifest file. Let's go through each of these
+individually:
+
+回想一下，Move 具有命名地址，并且不能在 Move 中声明命名地址。正因为如此，到目前为止，命名地址及其值都需要在命令行上传递给编译器。但使用 Move 包系统时这将不再需要，您可以在包中声明命名地址，实例化范围内的其他命名地址，并从 Move 包系统清单文件中的其他包重命名命名地址，让我们分别来看看这些:
+
+### 声明（Declaration）
+Let's say we have a Move module in `example_pkg/sources/A.move` as follows:
+
+假设我们有一个Move模块，`example_pkg/sources/A.move`如下所示:
+
+```move
+    module named_addr::A {
+        public fun x(): address { @named_addr }
+    }
+```
+
+We could in `example_pkg/Move.toml` declare the named address `named_addr` in
+two different ways. The first:
+
+我们可以用两种不同`example_pkg/Move.toml`的方式声明命名地址`named_addr`。首先：
+
+```
+    [package]
+    name = "ExamplePkg"
+    ...
+    [addresses]
+    named_addr = "_"
+```
+
+Declares `named_addr` as a named address in the package `ExamplePkg` and
+that _this address can be any valid address value_. Therefore an importing
+package can pick the value of the named address `named_addr` to be any address
+it wishes. Intuitively you can think of this as parameterizing the package
+`ExamplePkg` by the named address `named_addr`, and the package can then be
+instantiated later on by an importing package.
+
+声明`named_addr`为包`ExamplePkg`中的命名地址，并且 _该地址可以是任何有效的地址值_。因此，导入包可以选择命名地址的值作为`named_addr`它希望的任何地址。直观地，您可以将其视为通过命名地址`named_addr`参数化包 `ExamplePkg`，然后稍后通过导入包使包被实例化。
+
+`named_addr` can also be declared as:
+
+`named_addr`也可以声明为：
+
+```
+    [package]
+    name = "ExamplePkg"
+    ...
+    [addresses]
+    named_addr = "0xCAFE"
+```
+
+which states that the named address `named_addr` is exactly `0xCAFE` and cannot be
+changed. This is useful so other importing packages can use this named
+address without needing to worry about the exact value assigned to it.
+
+这表明命名的地址`named_addr`是准确的`0xCAFE`并且不能更改。这很有用，因此其他导入包可以使用这个命名地址，而无需担心分配给它的确切值。
+
+With these two different declaration methods, there are two ways that
+information about named addresses can flow in the package graph:
+* The former ("unassigned named addresses") allows named address values to flow
+  from the importation site to the declaration site.
+* The latter ("assigned named addresses") allows named address values to flow
+  from the declaration site upwards in the package graph to usage sites.
+
+使用这两种不同的声明方法，有关命名地址的信息可以通过两种方式在包图中流动：
+*  前者（“未分配的命名地址”）允许命名地址值从进口站点流向申报站点。
+*  后者（“分配的命名地址”）允许命名地址值从包图中的声明站点向上流动到使用站点。
+
+With these two methods for flowing named address information throughout the
+package graph the rules around scoping and renaming become important to
+understand.
+
+通过这两种在整个包图中流动命名地址信息的方法，了解范围和重命名的规则变得很重要。
+
+## 命名地址的作用域和重命名（Scoping and Renaming of Named Addresses）
+
+A named address `N` in a package `P` is in scope if:
+1. It declares a named address `N`; or
+2. A package in one of `P`'s transitive dependencies declares the named address
+  `N` and there is a dependency path in the package graph between between `P` and the
+  declaring package of `N` with no renaming of `N`.
+
+在包`P`中的命名地址`N`如果满足以下条件，则在作用域内：
+
+ 1. 它声明了一个命名地址`N`；或者
+ 2. `P`的传递依赖项之一中的包声明了命名地址`N`，并且封装图在`P`和没有重命名的声明包`N`之间有一个依赖路径。
+
+ Additionally, every named address in a package is exported. Because of this and
+the above scoping rules each package can be viewed as coming with a set of
+named addresses that will be brought into scope when the package is imported,
+e.g., if the `ExamplePkg` package was imported, that importation would bring
+into scope the `named_addr` named address. Because of this, if `P` imports two
+packages `P1` and `P2` both of which declare a named address `N` an issue
+arises in `P`: which "`N`" is meant when `N` is referred to in `P`? The one
+from `P1` or `P2`? To prevent this ambiguity around which package a named
+address is coming from, we enforce that the sets of scopes introduced by all
+dependencies in a package are disjoint, and provide a way to _rename named
+addresses_ when the package that brings them into scope is imported.
+
+ 此外，包中的每个命名地址都会被导出。由于这个和上面的范围规则，每个包都可以被视为带有一组命名地址，当包被导入时，这些地址将被带入作用域，例如，如果包`ExamplePkg`被导入，则该导入会将命名地址`named_addr`带入作用域。 因此，如果`P`导入两个包`P1`并且`P2`都声明了一个命名地址`N`，在`P`中则会出现以下问题：当`N`被引用于`P`时我们指的是哪个`N`？来自`P1`或来自`P2`的`N`？ 为了防止命名地址来自哪个包的这种歧义，我们强制一个包中所有依赖项引入的范围集是不相交的，并提供一种在将命名地址带入范围的包被导入时重命名命名地址的方法。
+
+Renaming a named address when importing can be done as follows in our `P`,
+`P1`, and `P2` example above:
+
+导入时重命名一个命名地址可以在我们的`P`,`P1`和`P2`上面的示例中完成：
+```
+    [package]
+    name = "P"
+    ...
+    [dependencies]
+    P1 = { local = "some_path_to_P1", addr_subst = { "P1N" = "N" } }
+    P2 = { local = "some_path_to_P2"  }
+```
+With this renaming `N` refers to the `N` from `P2` and `P1N` will refer to `N`
+coming from `P1`:
+
+这种重命名`N`指的是`P2`中的`N`并且`P1N`将指 `P1`中的`N`：
+```
+    module N::A {
+        public fun x(): address { @P1N }
+    }
+```
+It is important to note that _renaming is not local_: once a named address `N`
+has been renamed to `N2` in a package `P` all packages that import `P` will not
+see `N` but only `N2` unless `N` is reintroduced from outside of `P`. This is
+why rule (2) in the scoping rules at the start of this section specifies a
+"dependency path in the package graph between between `P` and the declaring
+package of `N` with no renaming of `N`."
+
+重要的是要注意 _重命名不是局部的_：一旦一个命名地址`N`在一个包`P`中被重命名为`N2`，所有导入`P`的包都不会看到`N`但只会看到`N2`，除非`N`是从`P`外引入的。这就是为什么本节开头的范围规则中的规则 (2) 特别说明了“在`P`和没有重命名的声明包`N` 的封装图中的依赖路径” 。
+
+### 实例化（Instantiation）
+
+Named addresses can be instantiated multiple times across the package graph as
+long as it is always with the same value. It is an error if the same named
+address (regardless of renaming) is instantiated with differing values across
+the package graph.
+
+只要命名地址始终具有相同的值，就可以在封装图中多次实例化命名地址。如果在整个封装图中使用不同的值实例化相同的命名地址（无论是否重命名），则会出现错误。
+
+A Move package can only be compiled if all named addresses resolve to a value.
+This presents issues if the package wishes to expose an uninstantiated named
+address. This is what the `[dev-addresses]` section solves. This section can
+set values for named addresses, but cannot introduce any named addresses.
+Additionally, only the `[dev-addresses]` in the root package are included in
+`dev` mode. For example a root package with the following manifest would not compile
+outside of `dev` mode since `named_addr` would be uninstantiated:
+
+只有当所有命名地址都解析为一个值时，才能编译 Move 包。如果包希望公开未实例化的命名地址，则会出现问题。这就是`[dev-addresses]`段要解决的问题。此段可以设置命名地址的值，但不能引入任何命名地址。此外， `dev`模式下仅根包中的`[dev-addresses]`会被包括进来。例如，具有以下清单的根包将不会在`dev`模式之外编译，因为`named_addr`不会被实例化：
+```
+[package]
+name = "ExamplePkg"
+...
+[addresses]
+named_addr = "_"
+
+[dev-addresses]
+named_addr = "0xC0FFEE"
+```
+## 用法、源代码和数据结构（ Usage, Artifacts, and Data Structures）
+
+The Move package system comes with a command line option as part of the Move
+CLI `move <flags> <command> <command_flags>`. Unless a
+particular path is provided, all package commands will run in the current working
+directory. The full list of commands and flags for the Move CLI can be found by
+running `move --help`.
+
+Move 软件包系统带有一个命令行选项，作为 Move CLI 的一部分move `<flags> <command>` `<command_flags>`。除非提供特定路径，否则所有包命令都将在当前工作目录中运行。可以通过运行`move --help`找到 Move CLI 的命令和标志的完整列表。
+
+### 用法（Usage）
+
+A package can be compiled either through the Move CLI commands, or as a library
+command in Rust with the function `compile_package`. This will create a
+`CompiledPackage` that holds the compiled bytecode along with other compilation
+artifacts (source maps, documentation, ABIs) in memory. This `CompiledPackage`
+can be converted to an `OnDiskPackage` and vice versa -- the latter being the data of
+the `CompiledPackage` laid out in the file system in the following format:
+
+一个包可以通过 Move CLI 命令，或是当作Rust函数`compile_package`的库命令来编译。 这种编译方法将创建一个编译包`CompiledPackage` 保存已编译的字节码以及其他编译内存中的源代码（源映射、文档、ABIs）。这个`CompiledPackage`可以转换为`OnDiskPackage`，反之亦然——后者是文件系统中的编译包 `CompiledPackage`数据，它的格式如下：
+
+```
+a_move_package
+├── Move.toml
+...
+└── build
+    ├── <dep_pkg_name>
+    │   ├── BuildInfo.yaml
+    │   ├── bytecode_modules
+    │   │   └── *.mv
+    │   ├── source_maps
+    │   │   └── *.mvsm
+    │   ├── bytecode_scripts
+    │   │   └── *.mv
+    │   ├── abis
+    │   │   ├── *.abi
+    │   │   └── <module_name>/*.abi
+    │   └── sources
+    │       └── *.move
+    ...
+    └── <dep_pkg_name>
+        ├── BuildInfo.yaml
+        ...
+        └── sources
+```
+
+See the `move-package` crate for more information on these data structures and
+how to use the Move package system as a Rust library.
+
+有关这些数据结构和如何将 Move 包系统用作 Rust 库的更多信息，请参阅 `move-package` 箱（crate） 。
diff --git a/language/documentation/book/translations/move-book-zh/src/references.md b/language/documentation/book/translations/move-book-zh/src/references.md
new file mode 100644
index 0000000000..2a23f0cb2e
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/references.md
@@ -0,0 +1,289 @@
+# 引用(references)
+
+Move has two types of references: immutable `&` and mutable `&mut`. Immutable references are read
+only, and cannot modify the underlying value (or any of its fields). Mutable references allow for
+modifications via a write through that reference. Move's type system enforces an ownership
+discipline that prevents reference errors.
+
+Move 支持两种类型的引用：不可变引用 `&` 和可变引用 `&mut`。不可变引用是只读的，不能修改相关值(或其任何字段)。可变引用通过写入该引用进行修改。Move的类型系统强制执行所有权规则，以避免引用错误。
+
+For more details on the rules of references, see [Structs and Resources](./structs-and-resources.md)
+
+更多有关引用规则的详细信息，请参阅：[结构和资源](./structs-and-resources.html).
+
+## 引用运算符 (Reference Operators)
+
+Move provides operators for creating and extending references as well as converting a mutable
+reference to an immutable one. Here and elsewhere, we use the notation `e: T` for "expression `e`
+has type `T`".
+
+Move 提供了用于创建和扩展引用以及将可变引用转换为不可变引用的运算符。在这里和其他地方，我们使用符号 `e: T` 来表示“表达式 `e` 的类型是 `T` ”
+
+| Syntax      | Type                                                  | Description                                                    |
+| ----------- | ----------------------------------------------------- | -------------------------------------------------------------- |
+| `&e`        | `&T` where `e: T` and `T` is a non-reference type     | Create an immutable reference to `e`                           |
+| `&mut e`    | `&mut T` where `e: T` and `T` is a non-reference type | Create a mutable reference to `e`.                             |
+| `&e.f`      | `&T` where `e.f: T`                                   | Create an immutable reference to field `f` of struct `e`.      |
+| `&mut e.f`  | `&mut T` where `e.f: T`                               | Create a mutable reference to field `f` of struct`e`.          |
+| `freeze(e)` | `&T` where `e: &mut T`                                | Convert the mutable reference `e` into an immutable reference. |
+
+| 语法 | 类型 | 描述 |
+| ------      | ------ |------ |
+| `&e`        | `&T` 其中 `e: T` 和 `T` 是非引用类型      | 创建一个不可变的引用 `e`
+| `&mut e`    | `&mut T` 其中 `e: T` 和 `T` 是非引用类型  | 创建一个可变的引用 `e`
+| `&e.f`      | `&T` 其中 `e.f: T`                       | 创建结构 `e` 的字段 `f` 的不可变引用
+| `&mut e.f`  | `&mut T` 其中`e.f: T`                    | 创建结构 `e` 的字段 `f` 的可变引用
+| `freeze(e)` | `&T` 其中`e: &mut T`                     | 将可变引用 `e` 转换为不可变引用
+
+The `&e.f` and `&mut e.f` operators can be used both to create a new reference into a struct or to extend an existing reference:
+
+`&e.f`和`&mut e.f`运算符既可以用于在结构中创建新引用，也可以用于扩展现有引用：
+
+```move
+let s = S { f: 10 };
+let f_ref1: &u64 = &s.f; // works
+let s_ref: &S = &s;
+let f_ref2: &u64 = &s_ref.f // also works
+```
+
+A reference expression with multiple fields works as long as both structs are in the same module:
+
+只要两个结构都在同一个模块中，具有多个字段的引用表达式就可以工作：
+
+```move
+struct A { b: B }
+struct B { c : u64 }
+fun f(a: &A): &u64 {
+  &a.b.c
+}
+```
+
+Finally, note that references to references are not allowed:
+
+最后，请注意，不允许引用"引用"(Move不支持多重引用, 但Rust可以，译者注)：
+
+```move
+let x = 7;
+let y: &u64 = &x;
+let z: &&u64 = &y; // will not compile
+```
+
+## 通过引用读取和写入
+
+Both mutable and immutable references can be read to produce a copy of the referenced value.
+
+Only mutable references can be written. A write `*x = v` discards the value previously stored in `x`
+and updates it with `v`.
+
+可以读取可变和不可变引用以生成引用值的副本。
+
+只能写入可变引用。写入表达式 `*x = v` 会丢弃先前存储在x中的值，并用 `v` 更新。
+
+Both operations use the C-like `*` syntax. However, note that a read is an expression, whereas a
+write is a mutation that must occur on the left hand side of an equals.
+
+两种操作都使用类 C `*` 语法。但是请注意，读取是一个表达式，而写入是一个必须发生在等号左侧的改动。
+
+| Syntax     | Type                                | Description                         |
+| ---------- | ----------------------------------- | ----------------------------------- |
+| `*e`       | `T` where `e` is `&T` or `&mut T`   | Read the value pointed to by `e`    |
+| `*e1 = e2` | `()` where `e1: &mut T` and `e2: T` | Update the value in `e1` with `e2`. |
+
+| 语法 | 类型 | 描述 |
+| ------ | ------ |------ |
+| `*e` | `T` 其中 `e` 为 `&T` 或 `&mut T` | 读取 `e` 所指向的值
+| `*e1 = e2` | () 其中 `e1: &mut T` 和 `e2: T` | 用 `e2` 更新 `e1` 中的值
+
+In order for a reference to be read, the underlying type must have the
+[`copy` ability](./abilities.md) as reading the reference creates a new copy of the value. This rule
+prevents the copying of resource values:
+
+为了读取引用，相关类型必须具备[`copy` 能力](./abilities.html)，因为读取引用会创建值的新副本。此规则防止复制资源值：
+
+```move=
+fun copy_resource_via_ref_bad(c: Coin) {
+    let c_ref = &c;
+    let counterfeit: Coin = *c_ref; // not allowed!
+    pay(c);
+    pay(counterfeit);
+}
+```
+
+Dually: in order for a reference to be written to, the underlying type must have the
+[`drop` ability](./abilities.md) as writing to the reference will discard (or "drop") the old value.
+This rule prevents the destruction of resource values:
+
+双重性：为了写入引用，相关类型必须具备[`drop` 能力](./abilities.html)，因为写入引用将丢弃(或“删除”)旧值。此规则可防止破坏资源值：
+
+```move=
+fun destroy_resource_via_ref_bad(ten_coins: Coin, c: Coin) {
+    let ref = &mut ten_coins;
+    *ref = c; // not allowed--would destroy 10 coins!
+}
+```
+
+## `freeze` 推断 (`freeze` inference)
+
+A mutable reference can be used in a context where an immutable reference is expected:
+
+可变引用可以在预期不可变引用的上下文中使用：
+
+```move
+let x = 7;
+let y: &mut u64 = &mut x;
+```
+
+This works because the under the hood, the compiler inserts `freeze` instructions where they are
+needed. Here are a few more examples of `freeze` inference in action:
+
+这是因为编译器会在底层需要的地方插入 `freeze` 指令。以下是更多 `freeze` 实际推断行为的示例：
+
+```move=
+fun takes_immut_returns_immut(x: &u64): &u64 { x }
+
+// freeze inference on return value
+fun takes_mut_returns_immut(x: &mut u64): &u64 { x }
+
+fun expression_examples() {
+    let x = 0;
+    let y = 0;
+    takes_immut_returns_immut(&x); // no inference
+    takes_immut_returns_immut(&mut x); // inferred freeze(&mut x)
+    takes_mut_returns_immut(&mut x); // no inference
+
+    assert!(&x == &mut y, 42); // inferred freeze(&mut y)
+}
+
+fun assignment_examples() {
+    let x = 0;
+    let y = 0;
+    let imm_ref: &u64 = &x;
+
+    imm_ref = &x; // no inference
+    imm_ref = &mut y; // inferred freeze(&mut y)
+}
+```
+
+###  子类型化 (Subtyping)
+
+With this `freeze` inference, the Move type checker can view `&mut T` as a subtype of `&T`. As shown
+above, this means that anywhere for any expression where a `&T` value is used, a `&mut T` value can
+also be used. This terminology is used in error messages to concisely indicate that a `&mut T` was
+needed where a `&T` was supplied. For example
+
+通过freeze推断，Move 类型检查器可以将 `&mut T` 视为 `&T` 的子类型。 如上所示，这意味着对于使用 `&T` 值的任何表达式，也可以使用 `&mut T` 值。此术语用于错误消息中，以简明扼要地表明在提供 `&T` 的地方需要 `&mut T` 。例如:
+
+```move=
+address 0x42 {
+    module example {
+        fun read_and_assign(store: &mut u64, new_value: &u64) {
+            *store = *new_value
+        }
+
+        fun subtype_examples() {
+            let x: &u64 = &0;
+            let y: &mut u64 = &mut 1;
+
+            x = &mut 1; // valid
+            y = &2; // invalid!
+
+            read_and_assign(y, x); // valid
+            read_and_assign(x, y); // invalid!
+        }
+    }
+}
+```
+
+will yield the following error messages
+
+将产生以下错误消息
+
+```text
+error:
+    ┌── example.move:12:9 ───
+    │
+ 12 │         y = &2; // invalid!
+    │         ^ Invalid assignment to local 'y'
+    ·
+ 12 │         y = &2; // invalid!
+    │             -- The type: '&{integer}'
+    ·
+  9 │         let y: &mut u64 = &mut 1;
+    │                -------- Is not a subtype of: '&mut u64'
+    │
+
+error:
+    ┌── example.move:15:9 ───
+    │
+ 15 │         read_and_assign(x, y); // invalid!
+    │         ^^^^^^^^^^^^^^^^^^^^^ Invalid call of '0x42::example::read_and_assign'. Invalid argument for parameter 'store'
+    ·
+  8 │         let x: &u64 = &0;
+    │                ---- The type: '&u64'
+    ·
+  3 │     fun read_and_assign(store: &mut u64, new_value: &u64) {
+    │                                -------- Is not a subtype of: '&mut u64'
+    │
+```
+
+The only other types currently that has subtyping are [tuples](./tuples.md)
+
+当前唯一具有子类型的其他类型是[tuple(元组)](./tuples.html)
+
+## 所有权 (Ownership)
+
+Both mutable and immutable references can always be copied and extended _even if there are existing
+copies or extensions of the same reference_:
+
+_即使同一引用存在现有副本或扩展_，可变引用和不可变引用始终可以被复制和扩展：
+
+```move
+fun reference_copies(s: &mut S) {
+  let s_copy1 = s; // ok
+  let s_extension = &mut s.f; // also ok
+  let s_copy2 = s; // still ok
+  ...
+}
+```
+
+This might be surprising for programmers familiar with Rust's ownership system, which would reject
+the code above. Move's type system is more permissive in its treatment of
+[copies](./variables.md#move-and-copy), but equally strict in ensuring unique ownership of mutable
+references before writes.
+
+对于熟悉 Rust 所有权系统的程序员来说，这可能会令人惊讶，因为他们会拒绝上面的代码。Move 的类型系统在处理[副本](./variables.html#move-and-copy)方面更加宽松 ，但在写入前确保可变引用的唯一所有权方面同样严格。
+
+### 无法存储引用 (References Cannot Be Stored)
+
+References and tuples are the _only_ types that cannot be stored as a field value of structs, which
+also means that they cannot exist in global storage. All references created during program execution
+will be destroyed when a Move program terminates; they are entirely ephemeral. This invariant is
+also true for values of types without the `store` [ability](./abilities.md), but note that
+references and tuples go a step further by never being allowed in structs in the first place.
+
+This is another difference between Move and Rust, which allows references to be stored inside of
+structs.
+
+引用和元组是唯一不能存储为结构的字段值的类型，这也意味着它们不能存在于全局存储中。当 Move 程序终止时，程序执行期间创建的所有引用都将被销毁；它们完全是短暂的。这种不变式也适用于没有[`store` 能力](./chatper_19_abilities.html)的类型的值，但请注意，引用和元组更进一步，从一开始就不允许出现在结构中。
+
+这是 Move 和 Rust 之间的另一个区别，后者允许将引用存储在结构内。
+
+Currently, Move cannot support this because references cannot be
+[serialized](https://en.wikipedia.org/wiki/Serialization), but _every Move value must be
+serializable_. This requirement comes from Move's
+[persistent global storage](./global-storage-structure.md), which needs to serialize values to
+persist them across program executions. Structs can be written to global storage, and thus they must
+be serializable.
+
+One could imagine a fancier, more expressive, type system that would allow references to be stored
+in structs _and_ ban those structs from existing in global storage. We could perhaps allow
+references inside of structs that do not have the `store` [ability](./abilities.md), but that would
+not completely solve the problem: Move has a fairly complex system for tracking static reference
+safety, and this aspect of the type system would also have to be extended to support storing
+references inside of structs. In short, Move's type system (particularly the aspects around
+reference safety) would have to expand to support stored references. But it is something we are
+keeping an eye on as the language evolves.
+
+目前，Move 无法支持这一点，因为引用无法被[序列化](https://en.wikipedia.org/wiki/Serialization)，但 _每个 Move 值都必须是可序列化的_。这个要求来自于 Move 的 [持久化全局存储](./global-storage-structure.html)，它需要在程序执行期间序列化值以持久化它们。结构体可以写入全局存储，因此它们必须是可序列化的。
+
+可以想象一种更奇特、更有表现力的类型系统，它允许将引用存储在结构中，并禁止这些结构存在于全局存储中。我们也许可以允许在没有[`store` 能力](./abilities.html)的结构内部使用引用，但这并不能完全解决问题：Move 有一个相当复杂的系统来跟踪静态引用安全性，并且类型系统的这一方面也必须扩展以支持在结构内部存储引用。简而言之，Move 的类型系统(尤其是与引用安全相关的方面)需要扩展以支持存储的引用。随着语言的发展，我们正在关注这一点。
diff --git a/language/documentation/book/translations/move-book-zh/src/signer.md b/language/documentation/book/translations/move-book-zh/src/signer.md
new file mode 100644
index 0000000000..2bba515c0a
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/signer.md
@@ -0,0 +1,60 @@
+# 签名者
+
+`签名者（signer）`是 Move 内置的资源类型。`签名者（signer）`是一种允许持有者代表特定`地址（address）`行使权力的[能力（capability）](https://en.wikipedia.org/wiki/Object-capability_model)。你可以将原生实现（native implementation）视为：
+
+```move
+struct signer has drop { a: address }
+```
+
+`signer` 有点像 Unix [UID](https://en.wikipedia.org/wiki/User_identifier)，因为它表示一个通过 Move *之外*的代码（例如，通过检查加密签名或密码）进行身份验证的用户。
+
+## 与 `address` 的比较
+
+Move 程序可以使用地址字面量（literal）创建任何`地址（address）`值，而无需特殊许可：
+
+```move
+let a1 = @0x1;
+let a2 = @0x2;
+// ... 等等，所有其他可能的地址
+```
+
+但是，`signer` 值是特殊的，因为它们不能通过字面量或者指令创建 —— 只能通过 Move 虚拟机（VM）创建。在虚拟机运行带有 `signer` 类型参数的脚本之前，它会自动创建 `signer` 值并将它们传递给脚本：
+
+```move
+script {
+    use std::signer;
+    fun main(s: signer) {
+        assert!(signer::address_of(&s) == @0x42, 0);
+    }
+}
+```
+
+如果脚本是从 `0x42` 以外的任何地址发送的，则此脚本将中止并返回代码 `0`。
+
+交易脚本可以有任意数量的 `signer`，只要 `signer` 参数排在其他参数前面。换句话说，所有 `signer` 参数都必须放在第一位。
+
+```move
+script {
+    use std::signer;
+    fun main(s1: signer, s2: signer, x: u64, y: u8) {
+        // ...
+    }
+}
+```
+
+这对于实现具有多方权限原子行为的*多重签名脚本（multi-signer scripts）*很有用。例如，上述脚本的扩展可以在 `s1` 和 `s2` 之间执行原子货币交换。
+
+## `signer` 操作符
+
+`std::signer` 标准库模块为 `signer` 提供了两个实用函数：
+
+| 函数                                        | 描述                                                          |
+| ------------------------------------------- | ------------------------------------------------------------- |
+| `signer::address_of(&signer): address`      | 返回由 `&signer` 包装的地址值。                               |
+| `signer::borrow_address(&signer): &address` | 返回由 `&signer` 包装的地址的引用。                           |
+
+此外，`move_to<T>(&signer, T)` [全局存储](./global-storage-operators.md)操作符需要一个 `&signer` 参数在 `signer.address` 的帐户下发布资源 `T`。这确保了只有经过身份验证的用户才能在其地址下发布资源。
+
+## 所有权
+
+与简单的标量值不同，`signer` 值是不可复制的，这意味着他们不能被复制（通过任何操作，无论是通过显式 [`copy`](./variables.md#移动和复制)指令还是通过[解引用（dereference）`*`](./references.md#通过引用读取和写入)）。
diff --git a/language/documentation/book/translations/move-book-zh/src/standard-library.md b/language/documentation/book/translations/move-book-zh/src/standard-library.md
new file mode 100644
index 0000000000..85c8d9f433
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/standard-library.md
@@ -0,0 +1,695 @@
+# 标准库（Standard Library）
+
+The Move standard library exposes interfaces that implement the following functionality:
+* [Basic operations on vectors](#vector).
+* [Option types and operations on`Option` types](#option).
+* [A common error encoding code interface for abort codes](#errors).
+* [32-bit precision fixed-point numbers](#fixed_point32).
+
+Move标准库公开了实现以下功能的接口:
+* [向量的基本操作](#向量).
+* [Option类型与基本操作](#option).
+* [终止码的常见错误编码接口](#errors).
+* [32位精确定点数字](#fixed_point32).
+
+## 向量（vector）
+
+
+The `vector` module defines a number of operations over the primitive
+[`vector`](./vector.md) type. The module is published under the
+named address `Std` and consists of a number of native functions, as
+well as functions defined in Move. The API for this module is as follows.
+
+`向量`模块在原生类型[`向量`](./vector.md)上定义了许多操作。该模块以命名地址`Std`发布，并由许多原生函数以及在Move中定义的函数组成。此模块的API如下所示:
+
+### 函数（Functions）
+
+---------------------------------------------------------------------------
+
+Create an empty [`vector`](./vector.md).
+The `Element` type can be both a `resource` or `copyable` type.
+
+创建一个空的[`向量`](./vector.md)。
+`Element`类型可以是`资源`或`可复制`类型。
+
+```move
+    native public fun empty<Element>(): vector<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Create a vector of length `1` containing the passed in `element`.
+
+创建一个长度为`1`的vector，并且包含传入的`element`。
+
+```move
+    public fun singleton<Element>(e: Element): vector<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Destroy (deallocate) the vector `v`. Will abort if `v` is non-empty.
+*Note*: The emptiness restriction is due to the fact that `Element` can be a
+resource type, and destruction of a non-empty vector would violate
+[resource conservation](./structs-and-resources.md).
+
+销毁(释放)向量`v`。如果`v`非空操作将终止。
+*注意*:空的限制是由于`Element`可以是资源类型，而销毁非空的向量会违反[资源保护机制](./structs-and-resources.md)。
+
+```move
+    native public fun destroy_empty<Element>(v: vector<Element>);
+```
+
+---------------------------------------------------------------------------
+
+Acquire an [immutable reference](./references.md) to the `i`th element of the vector `v`.  Will abort if
+the index `i` is out of bounds for the vector `v`.
+
+获取向量`v`的第`i`个元素的[不可变引用](./references.md)。如果索引`i`超出了向量`v`的范围，操作将会终止。
+
+```move
+    native public fun borrow<Element>(v: &vector<Element>, i: u64): &Element;
+```
+
+---------------------------------------------------------------------------
+
+Acquire a [mutable reference](./references.md)
+to the `i`th element of the vector `v`.  Will abort if
+the index `i` is out of bounds for the vector `v`.
+
+获取向量`v`的第`i`个元素的[可变引用](./references.md)。如果索引`i`超出了向量`v`的范围，操作将会终止。
+
+```move
+    native public fun borrow_mut<Element>(v: &mut vector<Element>, i: u64): &mut Element;
+```
+
+---------------------------------------------------------------------------
+
+Empty and destroy the `other` vector, and push each of the elements in
+the `other` vector onto the `lhs` vector in the same order as they occurred in `other`.
+
+清空并销毁`other`动态数组，并将`other`向量中的每个元素按顺序添加到`lhs`动态数组。
+
+```move
+    public fun append<Element>(lhs: &mut vector<Element>, other: vector<Element>);
+```
+
+---------------------------------------------------------------------------
+
+Push an element `e` of type `Element` onto the end of the vector `v`. May
+trigger a resizing of the underlying vector's memory.
+
+将类型为`Element`的元素`e`添加到向量`v`的末尾。可能触发底层向量内存的大小调整。
+
+```move
+    native public fun push_back<Element>(v: &mut vector<Element>, e: Element);
+```
+
+---------------------------------------------------------------------------
+
+Pop an element from the end of the vector `v` in-place and return the owned
+value. Will abort if `v` is empty.
+
+从向量`v`的末尾取出一个元素并返回。如果`v`为空将终止操作。
+
+```move
+    native public fun pop_back<Element>(v: &mut vector<Element>): Element;
+```
+
+---------------------------------------------------------------------------
+
+Remove the element at index `i` in the vector `v` and return the owned value
+that was previously stored at `i` in `v`. All elements occurring at indices
+greater than `i` will be shifted down by 1. Will abort if `i` is out of bounds
+for `v`.
+
+移除向量`v`中索引`i`处的元素，并返回之前存储在`v`中的`i`处的值。所有下标大于`i`的元素将向前移动1个位置。如果`i`超出了`v`的范围，操作将会终止。
+
+```move
+    public fun remove<Element>(v: &mut vector<Element>, i: u64): Element;
+```
+
+---------------------------------------------------------------------------
+
+Swap the `i`th element of the vector `v` with the last element and then pop
+this element off of the back of the vector and return the owned value that
+was previously stored at index `i`.
+This operation is O(1), but does not preserve ordering of elements in the vector.
+Aborts if the index `i` is out of bounds for the vector `v`.
+
+将向量`v`的第`i`个元素与最后一个元素交换，然后将这个元素从向量的后面取出，并返回之前存储在索引`i`处的所有元素的值。
+这个操作时间复杂度是O(1)，但是不保持向量容器中元素的顺序。
+如果索引`i`超出了向量`v`的边界，则操作终止。
+
+```move
+    public fun swap_remove<Element>(v: &mut vector<Element>, i: u64): Element;
+```
+
+---------------------------------------------------------------------------
+
+Swap the elements at the `i`'th and `j`'th indices in the vector `v`. Will
+abort if either of `i` or `j` are out of bounds for `v`.
+
+交换向量`v`中下标为第`i`和第`j`的元素。如果`i`或`j`中的任何一个超出了`v`的范围，则操作将终止。
+
+```move
+    native public fun swap<Element>(v: &mut vector<Element>, i: u64, j: u64);
+```
+
+---------------------------------------------------------------------------
+
+Reverse the order of the elements in the vector `v` in-place.
+
+将向量v中的元素顺序颠倒。
+
+```move
+    public fun reverse<Element>(v: &mut vector<Element>);
+```
+
+---------------------------------------------------------------------------
+
+Return the index of the first occurrence of an element in `v` that is
+equal to `e`. Returns `(true, index)` if such an element was found, and
+`(false, 0)` otherwise.
+
+返回`v`中第一个与`e`相等的元素的索引。如果找到这样的元素，则返回`(true, index)`，否则返回`(false, 0)`。
+
+```move
+    public fun index_of<Element>(v: &vector<Element>, e: &Element): (bool, u64);
+```
+
+---------------------------------------------------------------------------
+Return if an element equal to `e` exists in the vector `v`.
+
+如果向量`v`中存在等于`e`的元素，则返回true, 否则返回false。
+
+```move
+    public fun contains<Element>(v: &vector<Element>, e: &Element): bool;
+```
+
+---------------------------------------------------------------------------
+Return the length of a `vector`.
+
+返回`向量`的长度。
+
+```move
+    native public fun length<Element>(v: &vector<Element>): u64;
+```
+
+---------------------------------------------------------------------------
+Return whether the vector `v` is empty.
+
+如果向量`v`中没有元素，则返回true, 否则返回false。
+
+```move
+    public fun is_empty<Element>(v: &vector<Element>): bool;
+```
+
+---------------------------------------------------------------------------
+
+## 选项（option）
+
+The `option` module defines a generic option type `Option<T>` that represents a
+value of type `T` that may, or may not, be present. It is published under the named address `Std`.
+
+`option`模块定义了一个泛型option类型`Option<T>`，它表示类型为`T`的值可能存在，也可能不存在。它发布在命名地址`Std`下。
+
+The Move option type is internally represented as a singleton vector, and may
+contain a value of `resource` or `copyable` kind.  If you are familiar with option
+types in other languages, the Move `Option` behaves similarly to those with a
+couple notable exceptions since the option can contain a value of kind `resource`.
+Particularly, certain operations such as `get_with_default` and
+`destroy_with_default` require that the element type `T` be of `copyable` kind.
+
+Move option类型在内部表示为一个单例向量，可能包含`资源`或`可复制`类型的值。如果你熟悉其他语言中的option类型，Move `Option`的行为与那些类似，但有几个显著的例外，因为option可以包含一个类型为`资源`的值。
+特别地，某些操作如`get_with_default`和`destroy_with_default`要求元素类型`T`为`可复制`类型。
+
+The API for the `option` module is as as follows
+
+`option`模块的API如下所示:
+
+### 类型（Types）
+
+Generic type abstraction of a value that may, or may not, be present. Can contain
+a value of either `resource` or `copyable` kind.
+
+一个值的泛型类型的抽象，可能存在，也可能不存在。它可以包含`资源`或`可复制`类型的值。
+
+```move
+    struct Option<T>;
+```
+
+### 函数（Functions）
+
+Create an empty `Option` of that can contain a value of `Element` type.
+
+创建一个可以包含`Element`类型值的空`Option`。
+
+```move
+    public fun none<Element>(): Option<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Create a non-empty `Option` type containing a value `e` of type `Element`.
+
+创建一个非空的`Option`类型，包含类型为`Element`的值`e`。
+
+```move
+    public fun some<Element>(e: T): Option<Element>;
+```
+
+---------------------------------------------------------------------------
+
+Return an immutable reference to the value inside the option `opt_elem`
+Will abort if `opt_elem` does not contain a value.
+
+返回`opt_elem`内部值的不可变引用,如果`opt_elem`不包含值，则将终止操作。
+
+```move
+    public fun borrow<Element>(opt_elem: &Option<Element>): &Element;
+```
+
+---------------------------------------------------------------------------
+
+Return a reference to the value inside `opt_elem` if it contains one. If
+`opt_elem` does not contain a value the passed in `default_ref` reference will be returned.
+Does not abort.
+
+如果`opt_elem`中包含值，则返回该值的引用。如果`opt_elem`不包含值，将返回传入的`default_ref`引用。不会终止操作。
+
+```move
+    public fun borrow_with_default<Element>(opt_elem: &Option<Element>, default_ref: &Element): &Element;
+```
+
+---------------------------------------------------------------------------
+
+Return a mutable reference to the value inside `opt_elem`. Will abort if
+`opt_elem` does not contain a value.
+
+返回`opt_elem`内部值的可变引用。如果`opt_elem`不包含值，则操作将终止。
+
+```move
+    public fun borrow_mut<Element>(opt_elem: &mut Option<Element>): &mut Element;
+```
+
+---------------------------------------------------------------------------
+
+Convert an option value that contains a value to one that is empty in-place by
+removing and returning the value stored inside `opt_elem`.
+Will abort if `opt_elem` does not contain a value.
+
+通过删除并返回存储在`opt_elem`中的值，将包含值的`opt_elem`转换为空option类型。
+如果`opt_elem`不包含值，则将终止。
+
+```move
+    public fun extract<Element>(opt_elem: &mut Option<Element>): Element;
+```
+
+---------------------------------------------------------------------------
+
+Return the value contained inside the option `opt_elem` if it contains one.
+Will return the passed in `default` value if `opt_elem` does not contain a
+value. The `Element` type that the `Option` type is instantiated with must be
+of `copyable` kind in order for this function to be callable.
+
+如果`opt_elem`中包含值，则返回该值。
+如果`opt_elem`不包含值，将返回传入的`default`值。`default`类型必须是`可复制`类型，这样该函数才能被调用。
+
+```move
+    public fun get_with_default<Element: copyable>(opt_elem: &Option<Element>, default: Element): Element;
+```
+
+---------------------------------------------------------------------------
+
+Convert an empty option `opt_elem` to an option value that contains the value `e`.
+Will abort if `opt_elem` already contains a value.
+
+将空option类型`opt_elem`转换为包含值`e`的option类。
+如果`opt_elem`已经包含值，则操作将终止。
+
+```move
+    public fun fill<Element>(opt_elem: &mut Option<Element>, e: Element);
+```
+
+---------------------------------------------------------------------------
+
+Swap the value currently contained in `opt_elem` with `new_elem` and return the
+previously contained value. Will abort if `opt_elem` does not contain a value.
+
+将`opt_elem`当前包含的值与`new_elem`交换，并返回先前包含的值。如果`opt_elem`不包含值，则操作将终止。
+
+```move
+    public fun swap<Element>(opt_elem: &mut Option<Element>, e: Element): Element;
+```
+
+---------------------------------------------------------------------------
+
+Return true if `opt_elem` contains a value equal to the value of `e_ref`.
+Otherwise, `false` will be returned.
+
+如果`opt_elem`包含一个等于`e_ref`的值，则返回`true`。否则，将返回`false`。
+
+```move
+    public fun contains<Element>(opt_elem: &Option<Element>, e_ref: &Element): bool;
+```
+
+---------------------------------------------------------------------------
+
+Return `true` if `opt_elem` does not contain a value.
+
+如果`opt_elem`不包含值，则返回`true`。
+
+```move
+    public fun is_none<Element>(opt_elem: &Option<Element>): bool;
+```
+
+---------------------------------------------------------------------------
+
+Return `true` if `opt_elem` contains a value.
+
+如果`opt_elem`包含值，则返回`true`。
+
+```move
+    public fun is_some<Element>(opt_elem: &Option<Element>): bool;
+```
+
+---------------------------------------------------------------------------
+
+Unpack `opt_elem` and return the value that it contained.
+Will abort if `opt_elem` does not contain a value.
+
+解包`opt_elem`并返回它所包含的值。
+如果`opt_elem`不包含值，则操作将终止。
+
+```move
+    public fun destroy_some<Element>(opt_elem: Option<Element>): Element;
+```
+
+---------------------------------------------------------------------------
+
+Destroys the `opt_elem` value passed in. If `opt_elem` contained a value it
+will be returned otherwise, the passed in `default` value will be returned.
+
+销毁传入的`opt_elem`。如果`opt_elem`包含值，它将被返回，否则将返回传入的`default`值。
+
+```move
+    public fun destroy_with_default<Element: copyable>(opt_elem: Option<Element>, default: Element): Element;
+```
+
+---------------------------------------------------------------------------
+
+Destroys the `opt_elem` value passed in, `opt_elem` must be empty and not
+contain a value. Will abort if `opt_elem` contains a value.
+
+销毁传入的`opt_elem`，`opt_elem`必须为空且不包含值。如果`opt_elem`包含一个值，则会终止操作。
+
+```move
+    public fun destroy_none<Element>(opt_elem: Option<Element>);
+```
+
+## 错误（errors）
+
+Recall that each abort code in Move is represented as an unsigned 64-bit integer. The `errors` module defines a common interface that can be used to "tag" each of these abort codes so that they can represent both the error **category** along with an error **reason**.
+
+回想一下，Move中的每个终止代码都表示为无符号64位整数。`errors`模块定义了一个通用接口，可用于"标记"每个终止代码，以便它们既可以表示错误**类别**，也可以表示错误**原因**。
+
+Error categories are declared as constants in the `errors` module and are globally unique with respect to this module. Error reasons on the other hand are module-specific error codes, and can provide greater detail (perhaps, even a particular _reason_) about the specific error condition. This representation of a category and reason for each error code is done by dividing the abort code into two sections.
+
+错误类别在`errors`模块中声明为常量，并且对该模块来说是全局唯一的。另一方面，错误原因是特定于模块的错误代码，可以提供关于特定错误条件的更详细的信息(甚至可能是一个特定的_reason_)。每个错误代码的类别和原因的这种表示是通过将终止代码分成两部分来完成的。
+
+The lower 8 bits of the abort code hold the *error category*. The remaining 56 bits of the abort code hold the *error reason*.
+The reason should be a unique number relative to the module which raised the error and can be used to obtain more information about the error at hand. It should mostly be used for diagnostic purposes as error reasons may change over time if the module is updated.
+
+| Category | Reason |
+|----------|--------|
+| 8 bits   | 56 bits|
+
+Since error categories are globally stable, these present the most stable API and should in general be what is used by clients to determine the messages they may present to users (whereas the reason is useful for diagnostic purposes). There are public functions in the `errors` module for creating an abort code of each error category with a specific `reason` number (represented as a `u64`).
+
+终止代码的较低8位保存*错误类别*。终止代码的其余56位包含*错误原因*。
+原因应该是相对于引发错误的模块的唯一数字，并且可以用来获取关于当前错误的更多信息。它应该主要用于诊断目的，因为如果模块更新，错误原因可能会随着时间的推移而变化。
+
+| 类型 | 原因 |
+|----------|--------|
+| 8 bits   | 56 bits|
+
+由于错误类别是全局稳定的，所以它们提供了稳定的API，通常应该由客户端用来确定它们可能向用户提供的消息(而原因则用于诊断目的)。在`errors`模块中有一些公共函数，用于创建每个错误类别的带有特定`原因`号的终止代码(表示为`u64`)。
+
+### 常量（Constants）
+
+The system is in a state where the performed operation is not allowed.
+
+系统处于不允许操作的状态。
+
+```move
+    const INVALID_STATE: u8 = 1;
+```
+
+---------------------------------------------------------------------------
+A specific account address was required to perform an operation, but a different address from what was expected was encounterd.
+
+执行操作需要一个特定的帐户地址，但遇到的地址与预期的不同。
+
+```move
+    const REQUIRES_ADDRESS: u8 = 2;
+```
+
+---------------------------------------------------------------------------
+An account did not have the expected  role for this operation. Useful for Role Based Access Control (RBAC) error conditions.
+
+帐户没有此操作的预期角色。用于基于角色访问控制(RBAC)错误。
+
+```move
+    const REQUIRES_ROLE: u8 = 3;
+```
+
+---------------------------------------------------------------------------
+An account did not not have a required capability. Useful for RBAC error conditions.
+
+帐户没有所需的能力。用于RBAC错误。
+
+```move
+    const REQUIRES_CAPABILITY: u8 = 4;
+```
+
+---------------------------------------------------------------------------
+A resource was expected, but did not exist under an address.
+
+地址下不存在期望的资源。
+
+```move
+    const NOT_PUBLISHED: u8 = 5;
+```
+
+---------------------------------------------------------------------------
+Attempted to publish a resource under an address where one was already published.
+
+试图在已发布资源的地址发布资源。
+
+```move
+    const ALREADY_PUBLISHED: u8 = 6;
+```
+
+---------------------------------------------------------------------------
+An argument provided for an operation was invalid.
+
+为操作提供的参数无效。
+
+```move
+    const INVALID_ARGUMENT: u8 = 7;
+```
+
+---------------------------------------------------------------------------
+A limit on a value was exceeded.
+
+超过了一个值的限制。
+
+```move
+    const LIMIT_EXCEEDED: u8 = 8;
+```
+
+---------------------------------------------------------------------------
+An internal error (bug) has occurred.
+
+发生了内部错误(bug)。
+
+```move
+    const INTERNAL: u8 = 10;
+```
+
+---------------------------------------------------------------------------
+A custom error category for extension points.
+
+扩展自定义错误类别。
+
+```move
+    const CUSTOM: u8 = 255;
+```
+
+---------------------------------------------------------------------------
+
+### 函数（Functions）
+
+ Should be used in the case where invalid (global) state is encountered. Constructs an abort code with specified `reason` and category `INVALID_STATE`. Will abort if `reason` does not fit in 56 bits.
+
+在遇到无效(全局)状态的情况下应使用。构造一个具有指定的`reason`和类别`INVALID_STATE`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun invalid_state(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an account's address does not match a specific address. Constructs an abort code with specified `reason` and category `REQUIRES_ADDRESS`. Will abort if `reason` does not fit in 56 bits.
+
+当账户地址与特定地址不匹配时应使用。构造一个具有指定的`reason`和类别`REQUIRES_ADDRESS`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun requires_address(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a role did not match a required role when using RBAC. Constructs an abort code with specified `reason` and category `REQUIRES_ROLE`. Will abort if `reason` does not fit in 56 bits.
+
+在使用RBAC时，角色与所需角色不匹配时应使用。构造一个具有指定的`reason`和类别`REQUIRES_ROLE`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun requires_role(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an account did not have a required capability when using RBAC. Constructs an abort code with specified `reason` and category `REQUIRES_CAPABILITY`. Should be Will abort if `reason` does not fit in 56 bits.
+
+在使用RBAC时，帐户没有必要的能力时应使用。构造一个具有指定的`reason`和类别`REQUIRES_CAPABILITY`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun requires_capability(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a resource did not exist where one was expected. Constructs an abort code with specified `reason` and category `NOT_PUBLISHED`. Will abort if `reason` does not fit in 56 bits.
+
+在需要资源的地方不存在资源时应使用。构造一个具有指定的`reason`和类别`NOT_PUBLISHED`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun not_published(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a resource already existed where one was about to be published. Constructs an abort code with specified `reason` and category `ALREADY_PUBLISHED`. Will abort if `reason` does not fit in 56 bits.
+
+要发布资源的地方已经存在资源时使用。构造一个具有指定的`reason`和类别`ALREADY_PUBLISHED`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun already_published(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an invalid argument was passed to a function/operation. Constructs an abort code with specified `reason` and category `INVALID_ARGUMENT`. Will abort if `reason` does not fit in 56 bits.
+
+当向函数/操作传递无效参数时使用。构造一个具有指定的`reason`和类别`INVALID_ARGUMENT`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun invalid_argument(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if a limit on a specific value is reached, e.g., subtracting 1 from a value of 0. Constructs an abort code with specified `reason` and category `LIMIT_EXCEEDED`. Will abort if `reason` does not fit in 56 bits.
+
+当达到特定值的限制时应使用，例如，0减去1。构造一个具有指定的`reason`和类别`LIMIT_EXCEEDED`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun limit_exceeded(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Should be used if an internal error or bug was encountered. Constructs an abort code with specified `reason` and category `INTERNAL`. Will abort if `reason` does not fit in 56 bits.
+
+在遇到内部错误或错误时使用。构造一个具有指定的`reason`和类别`INTERNAL`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun internal(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+Used for extension points, should be not used under most circumstances. Constructs an abort code with specified `reason` and category `CUSTOM`. Will abort if `reason` does not fit in 56 bits.
+
+用于扩展，大多数情况下不应使用。构造一个具有指定的`reason`和类别`CUSTOM`的终止代码。如果`reason`不适合56位，将会终止操作。
+
+```move
+    public fun custom(reason: u64): u64;
+```
+
+---------------------------------------------------------------------------
+
+## 32位精确定点数字（fixed_point32）
+
+The `fixed_point32` module defines a fixed-point numeric type with 32 integer bits and 32 fractional bits. Internally, this is represented as a `u64` integer wrapped in a struct to make a unique `fixed_point32` type. Since the numeric representation is a binary one, some decimal values may not be exactly representable, but it provides more than 9 decimal digits of precision both before and after the decimal point (18 digits total). For comparison, double precision floating-point has less than 16 decimal digits of precision, so you should be careful about using floating-point to convert these values to decimal.
+
+`fixed_point32`模块定义了一个具有32个整数位和32个小数位的定点数值类型。在内部，它被表示为一个`u64`整数，包装在一个结构中，形成一个唯一的`fixed_point32`类型。由于数字表示是二进制的，一些十进制值可能不能完全表示，但它在小数点之前和之后都提供了9位以上的十进制精度(总共18位)。为了进行比较，双精度浮点数的精度小于16位十进制数字，因此在使用浮点数将这些值转换为十进制时应该小心。
+
+### 类型（Types）
+Represents a fixed-point numeric number with 32 fractional bits.
+
+表示具有32个小数位的定点数字。
+
+```move
+    struct FixedPoint32;
+```
+
+### 函数（Functions）
+
+Multiply a u64 integer by a fixed-point number, truncating any fractional part of the product. This will abort if the product overflows.
+
+当u64整数乘以定点数，截断乘积的任何小数部分。如果乘积溢出，该操作将终止。
+
+```move
+    public fun multiply_u64(val: u64, multiplier: FixedPoint32): u64;
+```
+
+---------------------------------------------------------------------------
+Divide a u64 integer by a fixed-point number, truncating any fractional part of the quotient. This will abort if the divisor is zero or if the quotient overflows.
+
+当u64整数除以定点数，截断商的任何小数部分。如果除数为零或商溢出，该操作将终止。
+
+```move
+    public fun divide_u64(val: u64, divisor: FixedPoint32): u64;
+```
+
+---------------------------------------------------------------------------
+Create a fixed-point value from a rational number specified by its numerator and denominator. Calling this function should be preferred for using `fixed_point32::create_from_raw_value` which is also available. This will abort if the denominator is zero. It will also abort if the numerator is nonzero and the ratio is not in the range $2^{-32}\ldots2^{32}-1$. When specifying decimal fractions, be careful about rounding errors: if you round to display $N$ digits after the decimal point, you can use a denominator of $10^N$ to avoid numbers where the very small imprecision in the binary representation could change the rounding, e.g., 0.0125 will round down to 0.012 instead of up to 0.013.
+
+根据分子和分母指定的有理数创建定点值。如果`fixed_point32::create_from_raw_value`函数可用，应优先使用。如果分母为零，该操作将终止。如果分子非零且比值不在$2^{-32}\ldots2^{32}-1$范围内，该操作将终止。指定小数时，请注意四舍五入错误：如果要对小数点后$N$位进行四舍五入，则可以用$10^N$做分母，这样就能避免精确度丢失问题，例如，0.0125将四舍五入到0.012而不是0.013。
+
+```move
+    public fun create_from_rational(numerator: u64, denominator: u64): FixedPoint32;
+```
+
+---------------------------------------------------------------------------
+Create a fixedpoint value from a raw `u64` value.
+
+通过`u64`原始值创建一个定点值。
+
+```move
+    public fun create_from_raw_value(value: u64): FixedPoint32;
+```
+
+---------------------------------------------------------------------------
+Returns `true` if the decimal value of `num` is equal to zero.
+
+如果`num`的十进制值等于0，则返回`true`。
+
+```move
+    public fun is_zero(num: FixedPoint32): bool;
+```
+
+---------------------------------------------------------------------------
+Accessor for the raw `u64` value. Other less common operations, such as adding or subtracting `FixedPoint32` values, can be done using the raw values directly.
+
+获取`u64`原始值的方法。其他不太常见的操作，例如添加或减去`FixedPoint32`值，可以直接使用原始值来完成。
+
+```move
+    public fun get_raw_value(num: FixedPoint32): u64;
+```
+
+---------------------------------------------------------------------------
diff --git a/language/documentation/book/translations/move-book-zh/src/structs-and-resources.md b/language/documentation/book/translations/move-book-zh/src/structs-and-resources.md
new file mode 100644
index 0000000000..9dcf97c958
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/structs-and-resources.md
@@ -0,0 +1,591 @@
+# 结构体和资源
+
+A _struct_ is a user-defined data structure containing typed fields. Structs can store any
+non-reference type, including other structs.
+
+***结构体***（struct）是包含类型字段的自定义数据结构。结构体可以存储任何非引用类型，包括其他结构。
+
+We often refer to struct values as _resources_ if they cannot be copied and cannot be dropped. In
+this case, resource values must have ownership transferred by the end of the function. This property
+makes resources particularly well served for defining global storage schemas or for representing
+important values (such as a token).
+
+如果结构值无法复制且无法删除，我们通常将其称为***资源***（resource）。在这种情况下，资源值必须在函数结束时转移所有权。这个属性使资源特别适合定义全局存储模式或表示重要的值（如 token）。
+
+By default, structs are linear and ephemeral. By this we mean that they: cannot be copied, cannot be
+dropped, and cannot be stored in global storage. This means that all values have to have ownership
+transferred (linear) and the values must be dealt with by the end of the program's execution
+(ephemeral). We can relax this behavior by giving the struct [abilities](./abilities.md) which allow
+values to be copied or dropped and also to be stored in global storage or to define global storage
+schemas.
+
+默认情况下，结构体是线性的和临时的。我们的意思是它们：不能被复制，不能被删除，不能被存储在全局存储中。这意味着所有值都必须转移所有权（线性），并且必须在程序执行结束时处理这些值（临时）。我们可以通过赋予结构体允许复制或删除值以及将值存储在全局存储中或定义全局存储模式的[能力](./abilities.md)来放松这种行为（减轻限制）。
+
+## 定义结构体
+
+Structs must be defined inside a module:
+
+结构体必须在模块内定义：
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64, y: bool }
+    struct Bar {}
+    struct Baz { foo: Foo, }
+    //                   ^ 注意：尾随逗号是可以的
+}
+}
+```
+
+Structs cannot be recursive, so the following definition is invalid:
+
+结构体不能递归（定义），所以下面的定义是无效的：
+
+```move
+struct Foo { x: Foo }
+//              ^ 错误！ Foo 不能包含 Foo
+```
+
+As mentioned above: by default, a struct declaration is linear and ephemeral. So to allow the value
+to be used with certain operations (that copy it, drop it, store it in global storage, or use it as
+a storage schema), structs can be granted [abilities](./abilities.md) by annotating them with
+`has <ability>`:
+
+如上所述：默认情况下，结构体声明是线性且临时的。因此，为了允许将值用于某些操作（复制、删除、将其存储在全局存储中或将其用作存储模式），可以通过使用 `has <ability>` 标注它们来授予结构体[能力](./abilities.md)：
+
+```move
+address 0x2 {
+module m {
+    struct Foo has copy, drop { x: u64, y: bool }
+}
+}
+```
+
+For more details, see the [annotating structs](./abilities.md#annotating-structs) section.
+
+有关更多详细信息，请参阅[标注结构体](./abilities.md#标注结构体)部分。
+
+### 命名
+
+Structs must start with a capital letter `A` to `Z`. After the first letter, constant names can
+contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, or digits `0` to `9`.
+
+结构体必须以大写字母 `A` 到 `Z` 开头。在第一个字母之后，结构体名称可以包含下划线 `_`、字母 `a` 到 `z`、字母 `A` 到 `Z` 或数字 `0` 到 `9`。
+
+```move
+struct Foo {}
+struct BAR {}
+struct B_a_z_4_2 {}
+```
+
+This naming restriction of starting with `A` to `Z` is in place to give room for future language
+features. It may or may not be removed later.
+
+这种以 `A` 到 `Z` 开头的命名限制是为了给未来的语言特性留出空间。以后可能会也可能不会删除这个限制。
+
+## 使用结构体
+
+### 创建结构体
+
+Values of a struct type can be created (or "packed") by indicating the struct name, followed by
+value for each field:
+
+可以通过写明结构体名称来创建（或“打包”）结构体类型的值，然后是每个字段的值：
+
+```move
+address 0x2 {
+module m {
+    struct Foo has drop { x: u64, y: bool }
+    struct Baz has drop { foo: Foo }
+
+    fun example() {
+        let foo = Foo { x: 0, y: false };
+        let baz = Baz { foo: foo };
+    }
+}
+}
+```
+
+If you initialize a struct field with a local variable whose name is the same as the field, you can
+use the following shorthand:
+
+如果使用与字段名相同的局部变量初始化结构体字段，则可以使用以下简写：
+
+```move
+let baz = Baz { foo: foo };
+// 相当于
+let baz = Baz { foo };
+```
+
+This is called sometimes called "field name punning".
+
+这有时称为“字段名双关语”。
+
+### 通过模式匹配销毁结构体
+
+Struct values can be destroyed by binding or assigning them patterns.
+
+结构值可以通过绑定或赋值模式来销毁。
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64, y: bool }
+    struct Bar { foo: Foo }
+    struct Baz {}
+
+    fun example_destroy_foo() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y: foo_y } = foo;
+        //        ^ `x: x` 的简写
+
+        // 两个新绑定
+        //   x: u64 = 3
+        //   foo_y: bool = false
+    }
+
+    fun example_destroy_foo_wildcard() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y: _ } = foo;
+
+        // 由于 y 绑定到通配符，因此只有一个新绑定
+        //   x: u64 = 3
+    }
+
+    fun example_destroy_foo_assignment() {
+        let x: u64;
+        let y: bool;
+        Foo { x, y } = Foo { x: 3, y: false };
+
+        // 改变现有变量 x 和 y
+        //   x = 3, y = false
+    }
+
+    fun example_foo_ref() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y } = &foo;
+
+        // 两个新绑定
+        //   x: &u64
+        //   y: &bool
+    }
+
+    fun example_foo_ref_mut() {
+        let foo = Foo { x: 3, y: false };
+        let Foo { x, y } = &mut foo;
+
+        // 两个新绑定
+        //   x: &mut u64
+        //   y: &mut bool
+    }
+
+    fun example_destroy_bar() {
+        let bar = Bar { foo: Foo { x: 3, y: false } };
+        let Bar { foo: Foo { x, y } } = bar;
+        //             ^ 嵌套模式
+
+        // 两个新绑定
+        //   x: u64 = 3
+        //   y: bool = false
+    }
+
+    fun example_destroy_baz() {
+        let baz = Baz {};
+        let Baz {} = baz;
+    }
+}
+}
+```
+
+### 借用结构体和字段
+
+The `&` and `&mut` operator can be used to create references to structs or fields. These examples
+include some optional type annotations (e.g., `: &Foo`) to demonstrate the type of operations.
+
+`&` 和 `&mut` 运算符可用于创建对结构体或字段的引用。这些例子包括一些可选的类型标注（例如，`: &Foo`）来演示操作的类型。
+
+```move
+let foo = Foo { x: 3, y: true };
+let foo_ref: &Foo = &foo;
+let y: bool = foo_ref.y;          // 通过对结构体的引用读取字段
+let x_ref: &u64 = &foo.x;
+
+let x_ref_mut: &mut u64 = &mut foo.x;
+*x_ref_mut = 42;            // 通过可变引用修改字段
+```
+
+It is possible to borrow inner fields of nested structs.
+
+可以借用嵌套结构体的内部字段：
+
+```move
+let foo = Foo { x: 3, y: true };
+let bar = Bar { foo };
+
+let x_ref = &bar.foo.x;
+```
+
+You can also borrow a field via a reference to a struct.
+
+你还可以通过对结构体的引用来借用字段：
+
+```move
+let foo = Foo { x: 3, y: true };
+let foo_ref = &foo;
+let x_ref = &foo_ref.x;
+// 这与 let x_ref = &foo.x 的效果相同
+```
+
+### 读写字段
+
+If you need to read and copy a field's value, you can then dereference the borrowed field
+
+如果你需要读取和复制字段的值，则可以解引用借用的字段：
+
+```move
+let foo = Foo { x: 3, y: true };
+let bar = Bar { foo: copy foo };
+let x: u64 = *&foo.x;
+let y: bool = *&foo.y;
+let foo2: Foo = *&bar.foo;
+```
+
+If the field is implicitly copyable, the dot operator can be used to read fields of a struct without
+any borrowing. (Only scalar values with the `copy` ability are implicitly copyable.)
+
+如果该字段是隐式可复制的，则点运算符可用于读取结构体的字段而无需任何借用。（只有具有 `copy` 能力的标量值是隐式可复制的。）
+
+```move
+let foo = Foo { x: 3, y: true };
+let x = foo.x;  // x == 3
+let y = foo.y;  // y == true
+```
+
+Dot operators can be chained to access nested fields.
+
+点运算符可以链式访问嵌套字段：
+
+```move
+let baz = Baz { foo: Foo { x: 3, y: true } };
+let x = baz.foo.x; // x = 3;
+```
+
+However, this is not permitted for fields that contain non-primitive types, such a vector or another
+struct
+
+但是，对于包含非原始类型（例如向量或其他结构体）的字段，这是不允许的：
+
+```move
+let foo = Foo { x: 3, y: true };
+let bar = Bar { foo };
+let foo2: Foo = *&bar.foo;
+let foo3: Foo = bar.foo; // 错误！必须使用 *& 添加显式复制
+```
+
+The reason behind this design decision is that copying a vector or another struct might be an
+expensive operation. It is important for a programmer to be aware of this copy and make others aware
+with the explicit syntax `*&`
+
+In addition reading from fields, the dot syntax can be used to modify fields, regardless of the
+field being a primitive type or some other struct
+
+这个设计决策背后的原因是复制一个向量或另一个结构体可能是一项昂贵的操作。对于程序员来说，了解这个复制（操作）并使用显式语法 `*&` 让其他人意识到是很重要的。
+
+除了从字段中读取之外，点语法还可用于修改字段，无论该字段是原始类型还是其他结构体。
+
+```move
+let foo = Foo { x: 3, y: true };
+foo.x = 42;     // foo = Foo { x: 42, y: true }
+foo.y = !foo.y; // foo = Foo { x: 42, y: false }
+let bar = Bar { foo };            // bar = Bar { foo: Foo { x: 42, y: false } }
+bar.foo.x = 52;                   // bar = Bar { foo: Foo { x: 52, y: false } }
+bar.foo = Foo { x: 62, y: true }; // bar = Bar { foo: Foo { x: 62, y: true } }
+```
+
+The dot syntax also works via a reference to a struct
+
+点语法也适用于对结构体的引用：
+
+```move
+let foo = Foo { x: 3, y: true };
+let foo_ref = &mut foo;
+foo_ref.x = foo_ref.x + 1;
+```
+
+## 私有结构体操作
+
+Most struct operations on a struct type `T` can only be performed inside the module that declares
+`T`:
+
+- Struct types can only be created ("packed"), destroyed ("unpacked") inside the module that defines
+  the struct.
+- The fields of a struct are only accessible inside the module that defines the struct.
+
+Following these rules, if you want to modify your struct outside the module, you will need to
+provide public APIs for them. The end of the chapter contains some examples of this.
+
+However, struct _types_ are always visible to another module or script:
+
+大多数对结构体类型 `T` 的结构体操作只能在声明 `T` 的模块内执行：
+
+- 结构体类型只能在定义结构体的模块内创建（“打包”）、销毁（“解包”）。
+- 结构体的字段只能在定义结构体的模块内部访问。
+
+按照这些规则，如果你想在模块之外修改你的结构体，你需要为他们提供公共 API。本章的最后包含了这方面的一些例子。
+
+但是，结构体类型始终对其他模块或脚本可见：
+
+```move
+// m.move
+address 0x2 {
+module m {
+    struct Foo has drop { x: u64 }
+
+    public fun new_foo(): Foo {
+        Foo { x: 42 }
+    }
+}
+}
+```
+
+```move
+// n.move
+address 0x2 {
+module n {
+    use 0x2::m;
+
+    struct Wrapper has drop {
+        foo: m::Foo
+    }
+
+    fun f1(foo: m::Foo) {
+        let x = foo.x;
+        //      ^ 错误！此处无法访问 `foo` 的字段
+    }
+
+    fun f2() {
+        let foo_wrapper = Wrapper { foo: m::new_foo() };
+    }
+}
+}
+```
+
+Note that structs do not have visibility modifiers (e.g., `public` or `private`).
+
+请注意，结构体没有可见性修饰符（例如，`public` 或 `private`）。
+
+## 所有权
+
+As mentioned above in [Defining Structs](#defining-structs), structs are by default linear and
+ephemeral. This means they cannot be copied or dropped. This property can be very useful when
+modeling real world resources like money, as you do not want money to be duplicated or get lost in
+circulation.
+正如上面[定义结构体](#定义结构体)中提到的，结构体默认是线性的和临时的。这意味着它们不能被复制或删除。在模拟货币等现实世界资源时，此属性非常有用，因为你不希望货币被复制或在流通中丢失。
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64 }
+
+    public fun copying_resource() {
+        let foo = Foo { x: 100 };
+        let foo_copy = copy foo; // 错误！“复制”需要“复制”能力
+        let foo_ref = &foo;
+        let another_copy = *foo_ref // 错误！解引用需要“复制”能力
+    }
+
+    public fun destroying_resource1() {
+        let foo = Foo { x: 100 };
+
+        // 错误！当函数返回时，foo 仍然包含一个值。
+        // 这种销毁需要“drop”能力
+    }
+
+    public fun destroying_resource2(f: &mut Foo) {
+        *f = Foo { x: 100 } // 错误！通过写入销毁旧值需要“drop”能力
+    }
+}
+}
+```
+
+To fix the second example (`fun dropping_resource`), you would need to manually "unpack" the resource:
+
+要修复第二个示例（`fun destroying_resource1`），你需要手动“解包”资源：
+
+```move
+address 0x2 {
+module m {
+    struct Foo { x: u64 }
+
+    public fun destroying_resource1_fixed() {
+        let foo = Foo { x: 100 };
+        let Foo { x: _ } = foo;
+    }
+}
+}
+```
+
+Recall that you are only able to deconstruct a resource within the module in which it is defined.
+This can be leveraged to enforce certain invariants in a system, for example, conservation of money.
+
+If on the other hand, your struct does not represent something valuable, you can add the abilities
+`copy` and `drop` to get a struct value that might feel more familiar from other programming
+languages:
+
+回想一下，你只能在定义资源的模块中解构资源。这可以用来在系统中强制执行某些不变量，例如货币守恒。
+
+另一方面，如果你的结构体不代表有价值的东西，你可以添加 `copy` 和 `drop` 能力来获取一个结构值，这感觉可能会与其他编程语言更相似。
+
+```move
+address 0x2 {
+module m {
+    struct Foo has copy, drop { x: u64 }
+
+    public fun run() {
+        let foo = Foo { x: 100 };
+        let foo_copy = copy foo;
+        // ^ 此代码复制 foo，而 `let x = foo` 或
+        // `let x = move foo` 都移动 foo
+
+        let x = foo.x;            // x = 100
+        let x_copy = foo_copy.x;  // x = 100
+
+        // 函数返回时 foo 和 foo_copy 都被隐式丢弃
+    }
+}
+}
+```
+
+## 在全局存储中存储资源
+
+Only structs with the `key` ability can be saved directly in
+[persistent global storage](./global-storage-operators.md). All values stored within those `key`
+structs must have the `store` abilities. See the [ability](./abilities] and
+[global storage](./global-storage-operators.md) chapters for more detail.
+
+只有具有 `key` 能力的结构体才能直接保存在[持久性全局存储](./global-storage-operators.md)中。存储在这些 `key` 结构体中的所有值都必须具有 `store` 能力。有关更多详细信息，请参阅[能力](./abilities.md)和[全局存储](./global-storage-operators.md)章节。
+
+## 示例
+
+Here are two short examples of how you might use structs to represent valuable data (in the case of
+`Coin`) or more classical data (in the case of `Point` and `Circle`)
+
+这里有两个简短的示例，说明如何使用结构体来表示有价值的数据（在 `Coin` 的情况下）或更经典的数据（在 `Point` 和 `Circle` 的情况下）。
+
+### 示例 1：Coin
+
+<!-- TODO link to access control for mint -->
+
+```move
+address 0x2 {
+module m {
+    // 我们不希望钱币（Coin）被复制，因为那会复制这个“钱”，
+    // 所以我们不会给结构体“copy”能力。
+    // 同样，我们不希望程序员销毁钱币，所以我们不会给结构体“drop”能力。
+    // 但是，我们*希望*模块的用户能够将这个钱币存储在持久的全局存储中，
+    // 所以我们授予结构体“store”能力。
+    // 这个结构体只会在全局存储内的其他资源中，因此我们不会赋予该结构体“key”能力。
+    struct Coin has store {
+        value: u64,
+    }
+
+    public fun mint(value: u64): Coin {
+        // 你可能希望通过某种形式的访问控制来关闭此（铸币）功能，以防止使用此模块的任何人铸造无限数量的钱币。
+        Coin { value }
+    }
+
+    public fun withdraw(coin: &mut Coin, amount: u64): Coin {
+        assert!(coin.balance >= amount, 1000);
+        coin.value = coin.value - amount;
+        Coin { value: amount }
+    }
+
+    public fun deposit(coin: &mut Coin, other: Coin) {
+        let Coin { value } = other;
+        coin.value = coin.value + value;
+    }
+
+    public fun split(coin: Coin, amount: u64): (Coin, Coin) {
+        let other = withdraw(&mut coin, amount);
+        (coin, other)
+    }
+
+    public fun merge(coin1: Coin, coin2: Coin): Coin {
+        deposit(&mut coin1, coin2);
+        coin1
+    }
+
+    public fun destroy_zero(coin: Coin) {
+        let Coin { value } = coin;
+        assert!(value == 0, 1001);
+    }
+}
+}
+```
+
+### 示例 2：Geometry
+
+```move
+address 0x2 {
+module point {
+    struct Point has copy, drop, store {
+        x: u64,
+        y: u64,
+    }
+
+    public fun new(x: u64, y: u64): Point {
+        Point {
+            x, y
+        }
+    }
+
+    public fun x(p: &Point): u64 {
+        p.x
+    }
+
+    public fun y(p: &Point): u64 {
+        p.y
+    }
+
+    fun abs_sub(a: u64, b: u64): u64 {
+        if (a < b) {
+            b - a
+        }
+        else {
+            a - b
+        }
+    }
+
+    public fun dist_squared(p1: &Point, p2: &Point): u64 {
+        let dx = abs_sub(p1.x, p2.x);
+        let dy = abs_sub(p1.y, p2.y);
+        dx*dx + dy*dy
+    }
+}
+}
+```
+
+```move
+address 0x2 {
+module circle {
+    use 0x2::point::{Self, Point};
+
+    struct Circle has copy, drop, store {
+        center: Point,
+        radius: u64,
+    }
+
+    public fun new(center: Point, radius: u64): Circle {
+        Circle { center, radius }
+    }
+
+    public fun overlaps(c1: &Circle, c2: &Circle): bool {
+        let d = point::dist_squared(&c1.center, &c2.center);
+        let r1 = c1.radius;
+        let r2 = c2.radius;
+        d*d <= r1*r1 + 2*r1*r2 + r2*r2
+    }
+}
+}
+```
diff --git a/language/documentation/book/translations/move-book-zh/src/tuples.md b/language/documentation/book/translations/move-book-zh/src/tuples.md
new file mode 100644
index 0000000000..b3182e8c2a
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/tuples.md
@@ -0,0 +1,117 @@
+# 元组和单值
+
+Move 不完全支持元组，因为人们可能期望像来自另一种语言的元组一样将它们作为[头等值（即头等公民）](https://zh.wikipedia.org/wiki/%E9%A0%AD%E7%AD%89%E7%89%A9%E4%BB%B6)。但是，为了支持多个返回值，Move 具有类似元组的表达式。这些表达式在运行时不会产生具体的值（字节码中没有元组），因此它们非常有限：它们只能出现在表达式中（通常在函数的返回位置）；它们不能绑定到局部变量；它们不能存储在结构中；元组类型不能用于实例化泛型。
+
+类似地，[单值（unit）`()`](https://zh.wikipedia.org/wiki/%E5%8D%95%E5%80%BC%E7%B1%BB%E5%9E%8B) 是 Move 源语言创建的一种以表达式为基础的类型。单值 `()` 不会产生任何运行时值。我们可以认为单值 `()` 是一个空元组，适用于元组的任何限制也适用于单值。
+
+考虑到这些限制，在语言中使用元组可能会感觉很奇怪。但其他语言中，元组最常见的用例之一是函数 —— 允许函数返回多个值。一些语言通过强制用户编写包含多个返回值的结构来解决这个问题。但是在 Move 中，您不能将引用放在[结构体](./structs-and-resources.md)中。这需要 Move 支持多个返回值。这些多个返回值都在字节码级别被压入到堆栈中。在源码级别，这些多个返回值使用元组表示。
+
+## 字面量
+
+元组（tuple）是由括号内以逗号分隔的表达式列表创建的。
+
+| 语法            | 类型                                                                        | 描述                                    |
+|-----------------|-----------------------------------------------------------------------------|-----------------------------------------|
+| `()`            | `(): ()`                                                                    | 单值、空元组或 0 元素元组               |
+| `(e1, ..., en)` | `(e1, ..., en): (T1, ..., Tn)` 其中 `e_i: Ti` 满足 `0 < i <= n` and `n > 0` | n 元组、n 元素元组、带有 n 个元素的元组 |
+
+注意 `(e)` 没有类型 `(e): (t)`，换句话说，没有一个元素的元组。如果括号内只有一个元素，则括号仅用于消除歧义，不带有任何其他特殊含义。
+
+有时，具有两个元素的元组称为“二元组（pairs）”，而具有三个元素的元组称为“三元组（triples）”。
+
+### 例子
+
+```move
+address 0x42 {
+module example {
+    // 这三个函数都是等价的
+
+    // 当没有提供返回类型时，假定为 `()`
+    fun returns_unit_1() { }
+
+    // 空表达式块中存在隐式 () 值
+    fun returns_unit_2(): () { }
+
+    // `returns_unit_1` 和 `returns_unit_2` 的显式版本
+    fun returns_unit_3(): () { () }
+
+
+    fun returns_3_values(): (u64, bool, address) {
+        (0, false, @0x42)
+    }
+    fun returns_4_values(x: &u64): (&u64, u8, u128, vector<u8>) {
+        (x, 0, 1, b"foobar")
+    }
+}
+}
+```
+
+## 操作
+
+目前唯一可以对元组执行的操作是解构（destructuring）。
+
+### 解构
+
+对于任何大小的元组，它们可以在 `let` 绑定或赋值中被解构。
+
+例如：
+
+```move
+address 0x42 {
+module example {
+    // 这三个函数都是等价的
+    fun returns_unit() {}
+    fun returns_2_values(): (bool, bool) { (true, false) }
+    fun returns_4_values(x: &u64): (&u64, u8, u128, vector<u8>) { (x, 0, 1, b"foobar") }
+
+    fun examples(cond: bool) {
+        let () = ();
+        let (x, y): (u8, u64) = (0, 1);
+        let (a, b, c, d) = (@0x0, 0, false, b"");
+
+        () = ();
+        (x, y) = if (cond) (1, 2) else (3, 4);
+        (a, b, c, d) = (@0x1, 1, true, b"1");
+    }
+
+    fun examples_with_function_calls() {
+        let () = returns_unit();
+        let (x, y): (bool, bool) = returns_2_values();
+        let (a, b, c, d) = returns_4_values(&0);
+
+        () = returns_unit();
+        (x, y) = returns_2_values();
+        (a, b, c, d) = returns_4_values(&1);
+    }
+}
+}
+```
+
+有关更多详细信息，请参阅 [Move 变量](./variables.md)。
+
+## 子类型
+
+除了引用，元组是唯一在 Move 中具有[子类型（subtyping）](https://zh.wikipedia.org/wiki/%E5%AD%90%E7%B1%BB%E5%9E%8B)的类型。元组只有在具有引用的子类型（以协变方式）的意义上才具有子类型。
+
+例如:
+
+```move
+let x: &u64 = &0;
+let y: &mut u64 = &mut 1;
+
+// (&u64, &mut u64) 是 (&u64, &u64) 的子类型
+// 因为 &mut u64 是 &u64 的子类型
+let (a, b): (&u64, &u64) = (x, y);
+
+// (&mut u64, &mut u64) 是 (&u64, &u64) 的子类型
+// 因为 &mut u64 是 &u64 的子类型
+let (c, d): (&u64, &u64) = (y, y);
+
+// 错误！(&u64, &mut u64) 不是 (&mut u64, &mut u64) 的子类型
+// 因为 &u64 不是 &mut u64 的子类型
+let (e, f): (&mut u64, &mut u64) = (x, y);
+```
+
+## 所有权
+
+如上所述，元组值在运行时并不真正存在。由于这个原因，目前它们不能存储到局部变量中（但这个功能很可能很快就会出现）。因此，元组目前只能移动，因为复制它们需要先将它们放入局部变量中。
diff --git a/language/documentation/book/translations/move-book-zh/src/unit-testing.md b/language/documentation/book/translations/move-book-zh/src/unit-testing.md
new file mode 100644
index 0000000000..24f1fa5fc9
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/unit-testing.md
@@ -0,0 +1,367 @@
+# 单元测试 (Unit Tests)
+
+Unit testing for Move adds three new annotations to the Move source language:
+
+Move 语言中存在三种单元测试标注：
+
+* `#[test]`
+* `#[test_only]`, and
+* `#[expected_failure]`.
+
+They respectively mark a function as a test, mark a module or module member (`use`, function, or struct) as code to be included for testing only, and mark that a test is expected to fail. These annotations can be placed on a function with any visibility. Whenever a module or module member is annotated as `#[test_only]` or `#[test]`, it will not be included in the compiled bytecode unless it is compiled for testing.
+
+它们分别把函数、模块或模块成员（`use` 声明，函数 function，或结构体 struct）标记为只用于测试的代码，同时也标记期望失败的测试。这些标注可以用在任何可见性（visibility）函数上。无论何种情况，被标注为 `#[test_only]` 或 `#[test]` 的模块或模块成员除非用于测试，其它情况都不会被编译成字节码。
+
+## 测试注解：含义和使用方法（Testing Annotations: Their Meaning and Usage）
+
+Both the `#[test]` and `#[expected_failure]` annotations can be used either with or without arguments.
+
+`#[test]` 和 `#[expected_failure]` 两个注解均可以在有、无参数情况下使用。
+
+Without arguments, the `#[test]` annotation can only be placed on a function with no parameters. This annotation simply marks this function as a test to be run by the unit testing harness.
+
+没有参数的 `#[test]` 标记只能用于没有参数的函数。表示该函数作为单元测试函数被运行。
+
+```
+#[test] // 正确 // OK
+fun this_is_a_test() { ... }
+
+#[test] // 编译失败，因为函数需要参数 // Will fail to compile since the test takes an argument
+fun this_is_not_correct(arg: signer) { ... }
+```
+
+A test can also be annotated as an `#[expected_failure]`. This annotation marks that the test should is expected to raise an error. You can ensure that a test is aborting with a specific abort code by annotating it with `#[expected_failure(abort_code = <code>)]`, if it then fails with a different abort code or with a non-abort error the test will fail. Only functions that have the `#[test]` annotation can also be annotated as an #`[expected_failure]`.
+
+测试也可以使用 `#[expected_failure]` 标注，表示该函数会抛出错误。你可以使用 `#[expected_failure(abort_code = <code>)]` 这种方式方式确保此测试会被指定错误码打断，如果抛出不同错误码或没有抛出错误测试将失败。只有被 `#[test]` 标注的函数才能使用 `#[expected_failure]` 标注。
+
+```
+#[test]
+#[expected_failure]
+public fun this_test_will_abort_and_pass() { abort 1 }
+
+#[test]
+#[expected_failure]
+public fun test_will_error_and_pass() { 1/0; }
+
+#[test]
+#[expected_failure(abort_code = 0)]
+public fun test_will_error_and_fail() { 1/0; }
+
+#[test, expected_failure] // 可以合并多个属性。测试将会通过。 // Can have multiple in one attribute. This test will pass.
+public fun this_other_test_will_abort_and_pass() { abort 1 }
+```
+
+With arguments, a test annotation takes the form `#[test(<param_name_1> = <address>, ..., <param_name_n> = <address>)]`. If a function is annotated in such a manner, the function's parameters must be a permutation of the parameters <`param_name_1>, ..., <param_name_n>`, i.e., the order of these parameters as they occur in the function and their order in the test annotation do not have to be the same, but they must be able to be matched up with each other by name.
+
+测试标注可以采用 `#[test(<param_name_1> = <address>, ..., <param_name_n> = <address>)]` 这种形式指定参数。如果函数使用这样的标注，函数的参数则必须为 `<param_name_1>, ..., <param_name_n>` 的形式。参数在函数中的顺序不必与注解中顺序一致，但必须要能根据参数名匹配。
+
+Only parameters with a type of `signer` are supported as test parameters. If a non-`signer` parameter is supplied, the test will result in an error when run.
+
+只有 `signer` 类型可以用作测试参数。使用非 `signer` 类型参数，测试将会失败。
+
+```
+#[test(arg = @0xC0FFEE)] // 正确 // OK
+fun this_is_correct_now(arg: signer) { ... }
+
+#[test(wrong_arg_name = @0xC0FFEE)] // 不正确: 参数名不匹配 // Not correct: arg name doesn't match
+fun this_is_incorrect(arg: signer) { ... }
+
+#[test(a = @0xC0FFEE, b = @0xCAFE)] // 正确，多参数情况下必须为每个参数提供值。 // OK. We support multiple signer arguments, but you must always provide a value for that argument
+fun this_works(a: signer, b: signer) { ... }
+
+// 在某处声明一个命名地址（named address） // somewhere a named address is declared
+#[test_only] // 命名地址支持 test-only 注解 // test-only named addresses are supported
+address TEST_NAMED_ADDR = @0x1;
+...
+#[test(arg = @TEST_NAMED_ADDR)] // 支持命名地址！ // Named addresses are supported!
+fun this_is_correct_now(arg: signer) { ... }
+```
+
+An expected failure annotation can also take the form `#[expected_failure(abort_code = <u64>)]`. If a test function is annotated in such a way, the test must abort with an abort code equal to `<u64>`. Any other failure or abort code will result in a test failure.
+
+预期失败的标注使用 `#[expected_failure(abort_code = <u64>)]` 这种形式。如果函数被这样标注，测试错误码必须为 `<u64>`。任何其它的错误或错误码都会失败。
+
+```
+#[test, expected_failure(abort_code = 1)] // 这个测试会失败 // This test will fail
+fun this_test_should_abort_and_fail() { abort 0 }
+
+#[test]
+#[expected_failure(abort_code = 0)] // 这个测试会通过 // This test will pass
+fun this_test_should_abort_and_pass_too() { abort 0 }
+```
+
+A module and any of its members can be declared as test only. In such a case the item will only be included in the compiled Move bytecode when compiled in test mode. Additionally, when compiled outside of test mode, any non-test `use`s of a `#[test_only]` module will raise an error during compilation.
+
+模块和它的成员可以被声明为仅测试用。这种情况它们只会在测试模式下编译。此外，在非测试模式下，任何被 `#[test_only]` 标记的模块都会在编译时报错。
+
+```
+#[test_only] // test only 属性可以用于模块  // test only attributes can be attached to modules
+module abc { ... }
+
+#[test_only] // test only 属性可以用于命名地址 // test only attributes can be attached to named addresses
+address ADDR = @0x1;
+
+#[test_only] // .. 用于 use 声明 // .. to uses
+use 0x1::some_other_module;
+
+#[test_only] // .. 用于结构体 // .. to structs
+struct SomeStruct { ... }
+
+#[test_only] // .. 用于函数。只能在测试函数中调用，但自身不是测试 // .. and functions. Can only be called from test code, but not a test
+fun test_only_function(...) { ... }
+```
+
+## 运行单元测试（Running Unit Tests）
+
+Unit tests for a Move package can be run with the [`move test`
+command](./packages.md).
+
+使用 [`move test` 命令](./packages.md)运行包中的单元测试。
+
+When running tests, every test will either `PASS`, `FAIL`, or `TIMEOUT`. If a test case fails, the location of the failure along with the function name that caused the failure will be reported if possible. You can see an example of this below.
+
+运行测试的结果包括 `PASS`、`FAIL` 或 `TIMEOUT`。如果测试失败，将会尽可能的提供执行失败的位置及函数名信息。请看下面的例子。
+
+A test will be marked as timing out if it exceeds the maximum number of instructions that can be executed for any single test. This bound can be changed using the options below, and its default value is set to 5000 instructions. Additionally, while the result of a test is always deterministic, tests are run in parallel by default, so the ordering of test results in a test run is non-deterministic unless running with only one thread (see `OPTIONS` below).
+
+任何测试执行超过最大数量指令限制将会标记成超时。可以通过参数调整此限制，默认值为 5000 条指令。此外，虽然测试结果是确定的，但由于测试默认并行执行，所以测试结果的顺序是不确定的，除非使用单线程模式（见下述参数）。
+
+There are also a number of options that can be passed to the unit testing binary to fine-tune testing and to help debug failing tests. These can be found using the the help flag:
+
+存在大量参数细粒度调整测试工具的行为，帮助调试失败的测试。可以通过 help 参数查看。
+
+```
+$ move -h
+```
+
+## 示例（Example）
+
+A simple module using some of the unit testing features is shown in the following example:
+
+下面例子展示了一个简单的使用了单元测试特性的模块：
+
+First create an empty package and change directory into it:
+
+首先创建一个空 package 进入目录：
+
+```
+$ move new TestExample; cd TestExample
+```
+
+Next add the following to the `Move.toml`:
+
+接下来添加下面内容到 `Move.toml` 文件：
+
+```
+[dependencies]
+MoveStdlib = { git = "https://github.com/diem/diem.git", subdir="language/move-stdlib", rev = "56ab033cc403b489e891424a629e76f643d4fb6b", addr_subst = { "std" = "0x1" } }
+```
+
+Next add the following module under the `sources` directory:
+
+接下来在 `sources` 目录下添加下述模块：
+
+```
+// 文件路径: sources/my_module.move // filename: sources/my_module.move
+module 0x1::my_module {
+
+    struct MyCoin has key { value: u64 }
+
+    public fun make_sure_non_zero_coin(coin: MyCoin): MyCoin {
+        assert!(coin.value > 0, 0);
+        coin
+    }
+
+    public fun has_coin(addr: address): bool {
+        exists<MyCoin>(addr)
+    }
+
+    #[test]
+    fun make_sure_non_zero_coin_passes() {
+        let coin = MyCoin { value: 1 };
+        let MyCoin { value: _ } = make_sure_non_zero_coin(coin);
+    }
+
+    #[test]
+    // 如果不关心错误码也可以使用 #[expected_failure] // Or #[expected_failure] if we don't care about the abort code
+    #[expected_failure(abort_code = 0)]
+    fun make_sure_zero_coin_fails() {
+        let coin = MyCoin { value: 0 };
+        let MyCoin { value: _ } = make_sure_non_zero_coin(coin);
+    }
+
+    #[test_only] // 仅用作测试的帮助方法 // test only helper function
+    fun publish_coin(account: &signer) {
+        move_to(account, MyCoin { value: 1 })
+    }
+
+    #[test(a = @0x1, b = @0x2)]
+    fun test_has_coin(a: signer, b: signer) {
+        publish_coin(&a);
+        publish_coin(&b);
+        assert!(has_coin(@0x1), 0);
+        assert!(has_coin(@0x2), 1);
+        assert!(!has_coin(@0x3), 1);
+    }
+}
+```
+
+### 运行测试（Running Tests）
+
+You can then run these tests with the `move test` command:
+
+你可以使用 `move test` 命令运行测试。
+
+```
+$ move test
+BUILDING MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+[ PASS    ] 0x1::my_module::test_has_coin
+Test result: OK. Total tests: 3; passed: 3; failed: 0
+```
+
+### 使用测试参数（Using Test Flags）
+
+#### `-f <str>` 或 `--filter <str>`（`-f <str>` or `--filter <str>`）
+
+This will only run tests whose fully qualified name contains `<str>`. For example if we wanted to only run tests with `"zero_coin"` in their name:
+
+仅运行名字包含 `<str>` 字符的测试。例如只想运行名字包含 `"zero_coin"` 的测试：
+
+
+```
+$ move test -f zero_coin
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+Test result: OK. Total tests: 2; passed: 2; failed: 0
+```
+
+#### `-i <bound>` 或 `--gas_used <bound>`（`-i <bound>` or `--gas_used <bound>`）
+
+This bounds the amount of gas that can be consumed for any one test to `<bound>`:
+
+调整测试指令限制为 `<bound>`：
+
+```
+$ move test -i 0
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ TIMEOUT ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ TIMEOUT ] 0x1::my_module::make_sure_zero_coin_fails
+[ TIMEOUT ] 0x1::my_module::test_has_coin
+
+Test failures:
+
+Failures in 0x1::my_module:
+
+┌── make_sure_non_zero_coin_passes ──────
+│ Test timed out
+└──────────────────
+
+
+┌── make_sure_zero_coin_fails ──────
+│ Test timed out
+└──────────────────
+
+
+┌── test_has_coin ──────
+│ Test timed out
+└──────────────────
+
+Test result: FAILED. Total tests: 3; passed: 0; failed: 3
+```
+
+#### `-s` 或 `--statistics`（`-s` or `--statistics`）
+
+With these flags you can gather statistics about the tests run and report the runtime and gas used for each test. For example, if we wanted to see the statistics for the tests in the example above:
+
+使用此参数你可以得到每个测试的运行报告及执行指令的统计信息。例如查看上述示例的统计数据：
+
+```
+$ move test -s
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+[ PASS    ] 0x1::my_module::test_has_coin
+
+Test Statistics:
+
+┌────────────────────────────────────────────────┬────────────┬───────────────────────────┐
+│                   Test Name                    │    Time    │   Gas Used   │
+├────────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::my_module::make_sure_non_zero_coin_passes │   0.009    │             1             │
+├────────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::my_module::make_sure_zero_coin_fails      │   0.008    │             1             │
+├────────────────────────────────────────────────┼────────────┼───────────────────────────┤
+│ 0x1::my_module::test_has_coin                  │   0.008    │             1             │
+└────────────────────────────────────────────────┴────────────┴───────────────────────────┘
+
+Test result: OK. Total tests: 3; passed: 3; failed: 0
+```
+
+#### `-g` 或 `--state-on-error`（`-g` or `--state-on-error`）
+
+These flags will print the global state for any test failures. e.g., if we added the following (failing) test to the `my_module` example:
+
+这个参数会在测试失败情况下打印全局状态。如在 `my_module` 模块中添加下述失败测试：
+
+```
+module 0x1::my_module {
+    ...
+    #[test(a = @0x1)]
+    fun test_has_coin_bad(a: signer) {
+        publish_coin(&a);
+        assert!(has_coin(@0x1), 0);
+        assert!(has_coin(@0x2), 1);
+    }
+}
+```
+
+we would get get the following output when running the tests:
+
+当运行测试时我们将得到下面的输出：
+
+```
+$ move test -g
+CACHED MoveStdlib
+BUILDING TestExample
+Running Move unit tests
+[ PASS    ] 0x1::my_module::make_sure_non_zero_coin_passes
+[ PASS    ] 0x1::my_module::make_sure_zero_coin_fails
+[ PASS    ] 0x1::my_module::test_has_coin
+[ FAIL    ] 0x1::my_module::test_has_coin_bad
+
+Test failures:
+
+Failures in 0x1::my_module:
+
+┌── test_has_coin_bad ──────
+│ error[E11001]: test failure
+│    ┌─ /home/tzakian/TestExample/sources/my_module.move:47:10
+│    │
+│ 44 │      fun test_has_coin_bad(a: signer) {
+│    │          ----------------- In this function in 0x1::my_module
+│    ·
+│ 47 │          assert!(has_coin(@0x2), 1);
+│    │          ^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to abort but it aborted with 1 here
+│
+│
+│ ────── Storage state at point of failure ──────
+│ 0x1:
+│       => key 0x1::my_module::MyCoin {
+│           value: 1
+│       }
+│
+└──────────────────
+
+Test result: FAILED. Total tests: 4; passed: 3; failed: 1
+```
diff --git a/language/documentation/book/translations/move-book-zh/src/uses.md b/language/documentation/book/translations/move-book-zh/src/uses.md
new file mode 100644
index 0000000000..79918badf6
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/uses.md
@@ -0,0 +1,376 @@
+# 使用与别名（Uses and Aliases）
+
+The `use` syntax can be used to create aliases to members in other modules. `use` can be used to
+create aliases that last either for the entire module, or for a given expression block scope.
+
+`use` 语法可用于为其他模块中的成员创建别名。 `use` 可用于创建持续整个模块或给定表达式块范围的别名。
+
+## 语法（Syntax）
+There are several different syntax cases for `use`. Starting with the most simple, we have the
+following for creating aliases to other modules
+
+这里有几种不同的语法案例可供使用。从最简单的开始，我们有以下例子用于为其他模块创建别名
+
+```move
+use <address>::<module name>;
+use <address>::<module name> as <module alias name>;
+```
+For example
+举例
+```move
+use std::vector;
+use std::vector as V;
+```
+
+`use std::vector;` introduces an alias `vector` for `std::vector`. This means that anywhere you
+would want to use the module name `std::vector` (assuming this `use` is in scope), you could use
+`vector` instead. `use std::vector;` is equivalent to `use std::vector as vector;`
+
+`use std::vector；`为 `std::vector` 引入别名向量。这意味着在任何您想使用模块名称 `std::vector` 的地方（假设此`use`在作用域内），您都可以使用 `vector` 代替使用`std::vector`;
+
+Similarly `use std::vector as V;` would let you use `V` instead of `std::vector`
+
+同样使用 `std::vector as V`;会让你使用 `V` 代替 `std::vector`
+
+```move
+use std::vector;
+use std::vector as V;
+
+fun new_vecs(): (vector<u8>, vector<u8>, vector<u8>) {
+    let v1 = std::vector::empty();
+    let v2 = vector::empty();
+    let v3 = V::empty();
+    (v1, v2, v3)
+}
+```
+If you want to import a specific module member (such as a function, struct, or constant). You can
+use the following syntax.
+
+如果要导入特定的模块成员（例如函数、结构或常量）。您可以使用以下语法。
+```move
+use <address>::<module name>::<module member>;
+use <address>::<module name>::<module member> as <member alias>;
+```
+For example
+举例
+
+```move
+use std::vector::empty;
+use std::vector::empty as empty_vec;
+```
+
+This would let you use the function `std::vector::empty` without full qualification. Instead you
+could use `empty` and `empty_vec` respectively. Again, `use std::vector::empty;` is equivalent to
+`use std::vector::empty as empty;`
+
+这将允许您在没有前缀限定的情况下使用函数 `std::vector::empty`。相反，您可以分别使用 `empty` 和 `empty_vec`，使用 `std::vector::empty;`使用`empty` 相当于使用`std::vector::empty`;
+
+```move
+use std::vector::empty;
+use std::vector::empty as empty_vec;
+
+fun new_vecs(): (vector<u8>, vector<u8>, vector<u8>) {
+    let v1 = std::vector::empty();
+    let v2 = empty();
+    let v3 = empty_vec();
+    (v1, v2, v3)
+}
+```
+If you want to add aliases for multiple module members at once, you can do so with the following
+syntax
+
+如果要一次为多个模块成员添加别名，可以使用以下语法
+```move
+use <address>::<module name>::{<module member>, <module member> as <member alias> ... };
+```
+For example
+举例
+
+```move
+use std::vector::{push_back, length as len, pop_back};
+
+fun swap_last_two<T>(v: &mut vector<T>) {
+    assert!(len(v) >= 2, 42);
+    let last = pop_back(v);
+    let second_to_last = pop_back(v);
+    push_back(v, last);
+    push_back(v, second_to_last)
+}
+```
+
+If you need to add an alias to the Module itself in addition to module members, you can do that in a
+single `use` using `Self`. `Self` is a member of sorts that refers to the module.
+
+如果除了模块成员之外，您还需要为模块本身添加别名，您可以使用 `Self` 在一次`use`中完成。 `Self` 是指模块的各种成员。
+```move
+use std::vector::{Self, empty};
+For clarity, all of the following are equivalent:
+```
+For clarity, all of the following are equivalent:
+
+为清晰起见，以下所有内容都是等效的：
+```move
+use std::vector;
+use std::vector as vector;
+use std::vector::Self;
+use std::vector::Self as vector;
+use std::vector::{Self};
+use std::vector::{Self as vector};
+```
+If needed, you can have as many aliases for any item as you like
+
+如果需要，您可以为任何项目设置任意数量的别名
+
+```move
+use std::vector::{
+    Self,
+    Self as V,
+    length,
+    length as len,
+};
+
+fun pop_twice<T>(v: &mut vector<T>): (T, T) {
+    // all options available given the `use` above
+    assert!(vector::length(v) > 1, 42);
+    assert!(V::length(v) > 1, 42);
+    assert!(length(v) > 1, 42);
+    assert!(len(v) > 1, 42);
+
+    (vector::pop_back(v), vector::pop_back(v))
+}
+```
+
+## 模块内部（Inside a `module`）
+Inside of a `module` all `use` declarations are usable regardless of the order of declaration.
+
+在模块内部，无论声明顺序如何，所有 `use` 声明都是可用的。
+```move
+address 0x42 {
+module example {
+    use std::vector;
+
+    fun example(): vector<u8> {
+        let v = empty();
+        vector::push_back(&mut v, 0);
+        vector::push_back(&mut v, 10);
+        v
+    }
+
+    use std::vector::empty;
+}
+}
+```
+The aliases declared by `use` in the module usable within that module.
+
+在该模块中可用的模块中使用声明的别名。
+
+Additionally, the aliases introduced cannot conflict with other module members. See
+[Uniqueness](#uniqueness) for more details
+
+此外，引入的别名不能与其他模块成员冲突。有关详细信息，请参阅[唯一性](#uniqueness)。
+
+## 表达式内部（Inside an expression）
+You can add `use` declarations to the beginning of any expression block
+
+您可以将 `use` 声明添加到任何表达式块的开头
+```move
+address 0x42 {
+module example {
+
+    fun example(): vector<u8> {
+        use std::vector::{empty, push_back};
+
+        let v = empty();
+        push_back(&mut v, 0);
+        push_back(&mut v, 10);
+        v
+    }
+}
+}
+```
+As with `let`, the aliases introduced by `use` in an expression block are removed at the end of that
+block.
+
+与 `let` 一样，在表达式块中使用 `use` 引入的别名在该块的末尾被删除。
+
+```move
+address 0x42 {
+module example {
+
+    fun example(): vector<u8> {
+        let result = {
+            use std::vector::{empty, push_back};
+            let v = empty();
+            push_back(&mut v, 0);
+            push_back(&mut v, 10);
+            v
+        };
+        result
+    }
+
+}
+}
+```
+Attempting to use the alias after the block ends will result in an error
+
+在块结束后尝试使用别名将导致错误
+```move
+fun example(): vector<u8> {
+    let result = {
+        use std::vector::{empty, push_back};
+        let v = empty();
+        push_back(&mut v, 0);
+        push_back(&mut v, 10);
+        v
+    };
+    let v2 = empty(); // 错误!
+//           ^^^^^ 未绑定的函数 'empty'
+    结果
+}
+```
+Any `use` must be the first item in the block. If the `use` comes after any expression or `let`, it
+will result in a parsing error
+
+任何使用都必须是块中的第一项。如果 use 出现在任何表达式或 let 之后，则会导致解析错误
+```move
+{
+    let x = 0;
+    use std::vector; // 错误!
+    let v = vector::empty();
+}
+```
+
+## 命名规则（Naming rules）
+Aliases must follow the same rules as other module members. This means that aliases to structs or
+constants must start with `A` to `Z`
+
+别名必须遵循与其他模块成员相同的规则。这意味着结构或常量的别名必须以 `A` 到 `Z` 开头
+```move
+address 0x42 {
+module data {
+    struct S {}
+    const FLAG: bool = false;
+    fun foo() {}
+}
+module example {
+    use 0x42::data::{
+        S as s, // 错误!
+        FLAG as fLAG, // 错误!
+        foo as FOO,  // 有效
+        foo as bar, // 有效
+    };
+}
+}
+```
+## 唯一性（Uniqueness）
+Inside a given scope, all aliases introduced by `use` declarations must be unique.
+
+在给定范围内，所有由 use 声明引入的别名必须是唯一的。
+
+For a module, this means aliases introduced by `use` cannot overlap
+
+对于一个模块，这意味着使用引入的别名不能重复
+```move
+address 0x42 {
+module example {
+
+    use std::vector::{empty as foo, length as foo}; // ERROR!
+    //                                        ^^^ duplicate 'foo'
+
+    use std::vector::empty as bar;
+
+    use std::vector::length as bar; // 错误!
+    //                         ^^^ 重复的 'bar'
+
+}
+}
+```
+And, they cannot overlap with any of the module's other members
+
+而且，它们不能与模块的任何其他成员重复
+```move
+address 0x42 {
+module data {
+    struct S {}
+}
+module example {
+    use 0x42::data::S;
+
+    struct S { value: u64 } // ERROR!
+    //     ^ conflicts with alias 'S' above
+}
+}
+```
+Inside of an expression block, they cannot overlap with each other, but they can
+[shadow](#shadowing) other aliases or names from an outer scope
+
+在表达式块内部，它们不能相互重复，但它们可以遮蔽外部作用域中的其他别名或名称
+
+## 遮蔽（Shadowing）
+`use` aliases inside of an expression block can shadow names (module members or aliases) from the
+outer scope. As with shadowing of locals, the shadowing ends at the end of the expression block;
+
+在表达式块内使用别名可以覆盖外部作用域的名称（模块成员或别名）。当遮蔽局部变量时，遮蔽会在表达式块的末尾结束；
+```move
+address 0x42 {
+module example {
+
+    struct WrappedVector { vec: vector<u64> }
+
+    fun empty(): WrappedVector {
+        WrappedVector { vec: std::vector::empty() }
+    }
+
+    fun example1(): (WrappedVector, WrappedVector) {
+        let vec = {
+            use std::vector::{empty, push_back};
+            // 'empty' 现在指向 std::vector::empty
+
+            let v = empty();
+            push_back(&mut v, 0);
+            push_back(&mut v, 1);
+            push_back(&mut v, 10);
+            v
+        };
+        // 'empty' 现在指向 Self::empty
+
+        (empty(), WrappedVector { vec })
+    }
+
+    fun example2(): (WrappedVector, WrappedVector) {
+        use std::vector::{empty, push_back};
+        let w: WrappedVector = {
+            use 0x42::example::empty;
+            empty()
+        };
+        push_back(&mut w.vec, 0);
+        push_back(&mut w.vec, 1);
+        push_back(&mut w.vec, 10);
+
+        let vec = empty();
+        push_back(&mut vec, 0);
+        push_back(&mut vec, 1);
+        push_back(&mut vec, 10);
+
+        (w, WrappedVector { vec })
+    }
+}
+}
+```
+
+## 未使用的Use或别名（Unused Use or Alias）
+An unused `use` will result in an error
+
+未使用的 `use` 会导致错误
+```move
+address 0x42 {
+module example {
+    use std::vector::{empty, push_back}; // ERROR!
+    //                       ^^^^^^^^^ 未使用的别名 'push_back'
+
+    fun example(): vector<u8> {
+        empty()
+    }
+}
+}
+```
diff --git a/language/documentation/book/translations/move-book-zh/src/variables.md b/language/documentation/book/translations/move-book-zh/src/variables.md
new file mode 100644
index 0000000000..3625728ef5
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/variables.md
@@ -0,0 +1,879 @@
+# 局部变量和作用域（Local Variables and Scopes）
+
+Local variables in Move are lexically (statically) scoped. New variables are introduced with the
+keyword `let`, which will shadow any previous local with the same name. Locals are mutable and can
+be updated both directly and via a mutable reference.
+
+在 Move 语言中，局部变量的解析依赖于词法作用域（lexically scoped）或静态作用域（statically scoped）。使用关键字 `let` 引入新的变量，它将隐藏任何以前的同名局部变量。局部变量是可变的（Rust 中的变量默认不可变，译者注），可以直接更新，也可以通过可变引用更新。
+
+## 声明局部变量（Declaring Local Variables）
+
+### `let` 绑定（`let` bindings）
+
+Move programs use `let` to bind variable names to values:
+
+Move 程序使用 `let` 给变量名绑定一个值：
+
+```move
+let x = 1;
+let y = x + x:
+```
+
+`let` can also be used without binding a value to the local.
+
+`let` 使用时也可以不绑定任何数值给局部变量。
+
+```move
+let x;
+```
+
+The local can then be assigned a value later.
+
+然后可以稍后为局部变量赋一个值。
+
+```move
+let x;
+if (cond) {
+  x = 1
+} else {
+  x = 0
+}
+```
+
+This can be very helpful when trying to extract a value from a loop when a default value cannot be provided.
+
+当无法提供默认值时，这在尝试从循环中提取值时非常有用。
+
+```move
+let x;
+let cond = true;
+let i = 0;
+loop {
+    (x, cond) = foo(i);
+    if (!cond) break;
+    i = i + 1;
+}
+```
+
+### 变量必须在使用前赋值（Variables must be assigned before use）
+
+Move's type system prevents a local variable from being used before it has been assigned.
+
+Move 的类型系统防止在赋值之前使用局部变量。
+
+```move
+let x;
+x + x // ERROR!
+```
+
+```move
+let x;
+if (cond) x = 0;
+x + x // ERROR!
+```
+
+```move
+let x;
+while (cond) x = 0;
+x + x // ERROR!
+```
+
+### 有效的变量名（Valid variable names）
+
+Variable names can contain underscores `_`, letters `a` to `z`, letters `A` to `Z`, and digits `0`
+to `9`. Variable names must start with either an underscore `_` or a letter `a` through `z`. They
+_cannot_ start with uppercase letters.
+
+变量名可以包含下划线 `_`、小写字母 `a` 到 `z`、大写字母 `A` 到 `Z`、和数字 `0` 到 `9`。变量名必须以下划线 `_` 或者以小写字母`a`到`z`开头。它们*不能*以大写字母开头。
+
+```move
+// 全部有效
+let x = e;
+let _x = e;
+let _A = e;
+let x0 = e;
+let xA = e;
+let foobar_123 = e;
+
+// 全部无效
+let X = e; // ERROR!
+let Foo = e; // ERROR!
+```
+
+### 类型标注（Type annotations）
+
+The type of a local variable can almost always be inferred by Move's type system. However, Move
+allows explicit type annotations that can be useful for readability, clarity, or debuggability. The
+syntax for adding a type annotation is:
+
+局部变量的类型几乎总是可以通过 Move 的类型系统推断出来。但是，Move 允许显式类型标注，这对可读性、清晰性或可调试性很有用。添加类型标注的语法如下：
+
+```move
+let x: T = e; // “T 类型的变量 x 被初始化为表达式 e”
+```
+
+Some examples of explicit type annotations:
+
+一些显式类型标注的示例：
+
+```move
+address 0x42 {
+module example {
+
+    struct S { f: u64, g: u64 }
+
+    fun annotated() {
+        let u: u8 = 0;
+        let b: vector<u8> = b"hello";
+        let a: address = @0x0;
+        let (x, y): (&u64, &mut u64) = (&0, &mut 1);
+        let S { f, g: f2 }: S = S { f: 0, g: 1 };
+    }
+}
+}
+```
+
+Note that the type annotations must always be to the right of the pattern:
+
+请注意，类型标注必须始终位于变量模式的右侧：
+
+```move
+let (x: &u64, y: &mut u64) = (&0, &mut 1); // 错误！正确写法是 let (x, y): ... =
+```
+
+### 何时需要类型标注（When annotations are necessary）
+
+In some cases, a local type annotation is required if the type system cannot infer the type. This
+commonly occurs when the type argument for a generic type cannot be inferred. For example:
+
+在某些情况下，如果类型系统无法推断类型，则需要局部类型标注。这通常发生在无法推断某个泛型（generic type）的类型参数时，比如：
+
+```move
+let _v1 = vector::empty(); // 错误！
+//        ^^^^^^^^^^^^^^^ Could not infer this type. Try adding an annotation （无法推断此类型。尝试添加标注）
+let v2: vector<u64> = vector::empty(); // 没有错误
+```
+
+In a rarer case, the type system might not be able to infer a type for divergent code (where all the
+following code is unreachable). Both `return` and [`abort`](./abort-and-assert.md) are expressions
+and can have any type. A [`loop`](./loops.md) has type `()` if it has a `break`, but if there is no
+break out of the `loop`, it could have any type. If these types cannot be inferred, a type
+annotation is required. For example, this code:
+
+在极少数情况下，Move 的类型系统可能无法推断出一段发散式代码（divergent code）的类型（后面所有代码无法访问）。在 Move 语言中，`return` 和 [`abort`](./abort-and-assert.md) 都属于表达式，它们可以返回任何类型。如果一段 [`loop`](./loops.md) 有 `break`，那么它的返回类型是 `()`，但是如果它不包含 `break`，它的返回类型可以是任何类型。如果无法推断出这些类型，那么类型标注是必须的。例如，这段代码：
+
+```move
+let a: u8 = return ();
+let b: bool = abort 0;
+let c: signer = loop ();
+
+let x = return (); // ERROR!
+//  ^ Could not infer this type. Try adding an annotation
+let y = abort 0; // ERROR!
+//  ^ Could not infer this type. Try adding an annotation
+let z = loop (); // ERROR!
+//  ^ Could not infer this type. Try adding an annotation
+```
+
+Adding type annotations to this code will expose other errors about dead code or unused local
+variables, but the example is still helpful for understanding this problem.
+
+在这段代码中添加类型标注会暴露其他关于死代码或未使用的局部变量的错误，但该示例仍然有助于理解这个问题。
+
+### 元组式的多个变量声明（Multiple declarations with tuples）
+
+`let` can introduce more than one local at a time using tuples. The locals declared inside the
+parenthesis are initialized to the corresponding values from the tuple.
+
+`let` 可以使用元组一次引入多个局部变量。在括号内声明的局部变量会被初始化为元组中的对应值。
+
+```move
+let () = ();
+let (x0, x1) = (0, 1);
+let (y0, y1, y2) = (0, 1, 2);
+let (z0, z1, z2, z3) = (0, 1, 2, 3);
+```
+
+The type of the expression must match the arity of the tuple pattern exactly.
+
+表达式的类型必须与元组模式的数量完全匹配。
+
+```move
+let (x, y) = (0, 1, 2); // 错误！
+let (x, y, z, q) = (0, 1, 2); // 错误！
+```
+
+You cannot declare more than one local with the same name in a single `let`.
+
+你不能在单个 `let` 中声明多个具有相同名称的局部变量。
+
+```move
+let (x, x) = 0; // 错误！
+```
+
+### 结构体式的多个变量声明（Multiple declarations with structs）
+
+`let` can also introduce more than one local at a time when destructuring (or matching against) a
+struct. In this form, the `let` creates a set of local variables that are initialized to the values
+of the fields from a struct. The syntax looks like this:
+
+`let` 还可以在解构（或匹配）结构体时一次引入多个局部变量。在这种形式中，`let` 创建了一组局部变量，这些变量被初始化为结构体中字段的值。语法如下所示：
+
+```move
+struct T { f1: u64, f2: u64 }
+```
+
+```move
+let T { f1: local1, f2: local2 } = T { f1: 1, f2: 2 };
+// local1: u64
+// local2: u64
+```
+
+Here is a more complicated example:
+
+这是一个更复杂的示例：
+
+```move
+address 0x42 {
+    module example {
+        struct X { f: u64 }
+        struct Y { x1: X, x2: X }
+
+        fun new_x(): X {
+            X { f: 1 }
+        }
+
+        fun example() {
+            let Y { x1: X { f }, x2 } = Y { x1: new_x(), x2: new_x() };
+            assert!(f + x2.f == 2, 42);
+
+            let Y { x1: X { f: f1 }, x2: X { f: f2 } } = Y { x1: new_x(), x2: new_x() };
+            assert!(f1 + f2 == 2, 42);
+        }
+    }
+}
+```
+
+Fields of structs can serve double duty, identifying the field to bind _and_ the name of the
+variable. This is sometimes referred to as punning.
+
+结构体的字段可以起到双重作用：识别要绑定的字段*和*命名变量。这有时被称为双关语。
+
+```move
+let X { f } = e;
+```
+
+is equivalent to:
+
+等价于：
+
+```move
+let X { f: f } = e;
+```
+
+As shown with tuples, you cannot declare more than one local with the same name in a single `let`.
+
+如元组所示，您不能在单个 `let` 中声明多个具有相同名称的局部变量。
+
+```move
+let Y { x1: x, x2: x } = e; // 错误！（两个 x 同名了）
+```
+
+### 针对引用进行解构（Destructuring against references）
+
+In the examples above for structs, the bound value in the let was moved, destroying the struct value
+and binding its fields.
+
+在上面的结构体示例中，`let` 中绑定的值被移动了，这销毁了结构体的值并同时绑定了它的字段（到变量）。
+
+```move
+struct T { f1: u64, f2: u64 }
+```
+
+```move
+let T { f1: local1, f2: local2 } = T { f1: 1, f2: 2 };
+// local1: u64
+// local2: u64
+```
+
+In this scenario the struct value `T { f1: 1, f2: 2 }` no longer exists after the `let`.
+
+If you wish instead to not move and destroy the struct value, you can borrow each of its fields. For
+example:
+
+在这种场景下结构体的值 `T { f1: 1, f2: 2 }` 会在 `let` 后消失。
+
+如果您希望不移动和销毁结构体的值，则可以借用其中的每个字段。例如：
+
+```move
+let t = T { f1: 1, f2: 2 };
+let T { f1: local1, f2: local2 } = &t;
+// local1: &u64
+// local2: &u64
+```
+
+And similarly with mutable references:
+
+可变引用也类似：
+
+```move
+let t = T { f1: 1, f2: 2 };
+let T { f1: local1, f2: local2 } = &mut t;
+// local1: &mut u64
+// local2: &mut u64
+```
+
+This behavior can also work with nested structs.
+
+此行为也适用于嵌套结构体。
+
+```move
+address 0x42 {
+    module example {
+        struct X { f: u64 }
+        struct Y { x1: X, x2: X }
+
+        fun new_x(): X {
+            X { f: 1 }
+        }
+
+        fun example() {
+            let y = Y { x1: new_x(), x2: new_x() };
+
+            let Y { x1: X { f }, x2 } = &y;
+            assert!(*f + x2.f == 2, 42);
+
+            let Y { x1: X { f: f1 }, x2: X { f: f2 } } = &mut y;
+            *f1 = *f1 + 1;
+            *f2 = *f2 + 1;
+            assert!(*f1 + *f2 == 4, 42);
+        }
+    }
+}
+```
+
+### 忽略值（Ignoring Values）
+
+In `let` bindings, it is often helpful to ignore some values. Local variables that start with `_`
+will be ignored and not introduce a new variable
+
+在 `let` 绑定中，忽略某些值通常很有帮助。以 `_` 开头的局部变量将被忽略并且不会引入新变量。
+
+```move
+fun three(): (u64, u64, u64) {
+    (0, 1, 2)
+}
+```
+
+```move
+let (x1, _, z1) = three();
+let (x2, _y, z2) = three();
+assert!(x1 + z1 == x2 + z2, 42);
+```
+
+This can be necessary at times as the compiler will error on unused local variables。
+
+这有时是必要的，因为编译器会在未使用的局部变量上报错。
+
+```move
+let (x1, y, z1) = three(); // 错误！
+//       ^ 未被使用的局部变量 'y'
+```
+
+### 通用的 `let` 语法（General `let` grammar）
+
+All of the different structures in `let` can be combined! With that we arrive at this general
+grammar for `let` statements:
+
+`let` 中所有不同的结构体都可以组合！这样，我们就得出了 `let` 语句的通用语法：
+
+> _let-binding_ → **let** _pattern-or-list_ _type-annotation_<sub>_opt_</sub>
+> _initializer_<sub>_opt_</sub> > _pattern-or-list_ → _pattern_ | **(** _pattern-list_ **)** >
+> _pattern-list_ → _pattern_ **,**<sub>_opt_</sub> | _pattern_ **,** _pattern-list_ >
+> _type-annotation_ → **:** _type_ _initializer_ → **=** _expression_
+
+The general term for the item that introduces the bindings is a _pattern_. The pattern serves to
+both destructure data (possibly recursively) and introduce the bindings. The pattern grammar is as
+follows:
+
+引入绑定的项的通用术语是 *模式（pattern）*。该模式用于解构数据（可能是递归的）并引入绑定。模式语法如下：
+
+> _pattern_ → _local-variable_ | _struct-type_ **{** _field-binding-list_ **}** >
+> _field-binding-list_ → _field-binding_ **,**<sub>_opt_</sub> | _field-binding_ **,**
+> _field-binding-list_ > _field-binding_ → _field_ | _field_ **:** _pattern_
+
+A few concrete examples with this grammar applied:
+
+应用此语法的一些具体示例：
+
+```move
+    let (x, y): (u64, u64) = (0, 1);
+//       ^                           local-variable（局部变量）
+//       ^                           pattern（模式）
+//          ^                        local-variable（局部变量）
+//          ^                        pattern（模式）
+//          ^                        pattern-list（模式列表）
+//       ^^^^                        pattern-list（模式列表）
+//      ^^^^^^                       pattern-or-list（模式或列表）
+//            ^^^^^^^^^^^^           type-annotation（类型标注）
+//                         ^^^^^^^^  initializer（初始化器）
+//  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ let-binding（let 绑定）
+
+    let Foo { f, g: x } = Foo { f: 0, g: 1 };
+//      ^^^                                    struct-type（结构类型）
+//            ^                                field（字段）
+//            ^                                field-binding（字段绑定）
+//               ^                             field（字段）
+//                  ^                          local-variable（局部变量）
+//                  ^                          pattern（模式）
+//               ^^^^                          field-binding（字段绑定）
+//            ^^^^^^^                          field-binding-list（字段绑定列表）
+//      ^^^^^^^^^^^^^^^                        pattern（模式）
+//      ^^^^^^^^^^^^^^^                        pattern-or-list（模式或列表）
+//                      ^^^^^^^^^^^^^^^^^^^^   initializer（初始化器）
+//  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ let-binding（let 绑定）
+```
+
+## 变更（Mutations）
+
+### 赋值（Assignments）
+
+After the local is introduced (either by `let` or as a function parameter), the local can be
+modified via an assignment:
+
+在引入局部变量后（通过 `let` 或作为函数参数），可以通过赋值来修改局部变量：
+
+```move
+x = e
+```
+
+Unlike `let` bindings, assignments are expressions. In some languages, assignments return the value
+that was assigned, but in Move, the type of any assignment is always `()`.
+
+与 `let` 绑定不同，赋值是表达式。在某些语言中，赋值会返回被赋予的值，但在 Move 语言中，任何赋值的返回类型始终是 `()`。
+
+```move
+(x = e: ())
+```
+
+Practically, assignments being expressions means that they can be used without adding a new
+expression block with braces (`{`...`}`).
+
+实际上，赋值作为表达式意味着它们可以在不添加带有大括号（`{`...`}`）的新表达式块（expression block）的情况下使用。
+
+```move
+let x = 0;
+if (cond) x = 1 else x = 2;
+```
+
+The assignment uses the same pattern syntax scheme as `let` bindings:
+
+赋值使用与 `let` 绑定相同的模式语法方案：
+
+```move
+address 0x42 {
+module example {
+    struct X { f: u64 }
+
+    fun new_x(): X {
+        X { f: 1 }
+    }
+
+    // 这个例子会因为存在未使用的变量和赋值而报错。
+    fun example() {
+       let (x, _, z) = (0, 1, 3);
+       let (x, y, f, g);
+
+       (X { f }, X { f: x }) = (new_x(), new_x());
+       assert!(f + x == 2, 42);
+
+       (x, y, z, f, _, g) = (0, 0, 0, 0, 0, 0);
+    }
+}
+}
+```
+
+Note that a local variable can only have one type, so the type of the local cannot change between
+assignments.
+
+注意，一个局部变量只能有一种类型，所以局部变量的类型不能在赋值之间（多次赋值）改变。
+
+```move
+let x;
+x = 0;
+x = false; // 错误！
+```
+
+### 通过引用进行变更（Mutating through a reference）
+
+In addition to directly modifying a local with assignment, a local can be modified via a mutable
+reference `&mut`.
+
+除了通过赋值直接修改局部变量外，还可以通过可变引用 `&mut` 的方式修改局部变量。
+
+```move
+let x = 0;
+let r = &mut x;
+*r = 1;
+assert!(x == 1, 42);
+```
+
+This is particularly useful if either:
+
+(1) You want to modify different variables depending on some condition.
+
+这在以下情况下特别有用：
+
+(1) 你想根据某些条件修改不同的变量。
+
+```move
+let x = 0;
+let y = 1;
+let r = if (cond) &mut x else &mut y;
+*r = *r + 1;
+```
+
+(2) You want another function to modify your local value.
+
+(2) 你想要另一个函数来修改你的局部变量值。
+
+```move
+let x = 0;
+modify_ref(&mut x);
+```
+
+This sort of modification is how you modify structs and vectors!
+
+这种修改方法就是你修改结构体和向量的方式！
+
+```move
+let v = vector::empty();
+vector::push_back(&mut v, 100);
+assert!(*vector::borrow(&v, 0) == 100, 42);
+```
+
+For more details, see [Move references](./references.md).
+
+有关更多详细信息，请参阅 [Move 引用](./references.md)。
+
+## 作用域（Scopes）
+
+Any local declared with `let` is available for any subsequent expression, _within that scope_.
+Scopes are declared with expression blocks, `{`...`}`.
+
+Locals cannot be used outside of the declared scope.
+
+使用 `let` 声明的任何局部变量都可用于*该作用域内*的任何后续表达式。作用域用表达式块（expression blocks）声明，`{`...`}`。
+
+局部变量不能在声明的作用域之外使用。
+
+```move
+let x = 0;
+{
+    let y = 1;
+};
+x + y // 错误！
+//  ^ unbound local 'y'（未绑定的局部变量“y”）
+```
+
+But, locals from an outer scope _can_ be used in a nested scope.
+
+但是，来自外部作用域的本地变量*可以*在嵌套作用域中使用。
+
+```move
+{
+    let x = 0;
+    {
+        let y = x + 1; // 有效的
+    }
+}
+```
+
+Locals can be mutated in any scope where they are accessible. That mutation survives with the local,
+regardless of the scope that performed the mutation.
+
+局部变量可以在允许访问的任何作用域内进行变更。无论执行变更的作用域如何，这种变更会跟随局部变量的生命周期。
+
+```move
+let x = 0;
+x = x + 1;
+assert!(x == 1, 42);
+{
+    x = x + 1;
+    assert!(x == 2, 42);
+};
+assert!(x == 2, 42);
+```
+
+### 表达式块（Expression Blocks）
+
+An expression block is a series of statements separated by semicolons (`;`). The resulting value of
+an expression block is the value of the last expression in the block.
+
+表达式块是由分号（`;`）分隔的一系列语句。表达式块的结果值是块中最后一个表达式的值。
+
+```move
+{ let x = 1; let y = 1; x + y }
+```
+
+In this example, the result of the block is `x + y`.
+
+A statement can be either a `let` declaration or an expression. Remember that assignments (`x = e`)
+are expressions of type `()`.
+
+在此示例中, 此区块的结果是 `x + y`.
+
+语句可以是 `let` 声明或表达式。请记住，赋值（`x = e`）是 `()` 类型的表达式。
+
+```move
+{ let x; let y = 1; x = 1; x + y }
+```
+
+Function calls are another common expression of type `()`. Function calls that modify data are
+commonly used as statements.
+
+函数调用是 `()` 类型的另一种常见表达方式。修改数据的函数调用通常被用作语句。
+
+```move
+{ let v = vector::empty(); vector::push_back(&mut v, 1); v }
+```
+
+This is not just limited to `()` types---any expression can be used as a statement in a sequence!
+
+这不仅限于 `()` 类型 —— 任何表达式都可以用作序列中的语句！
+
+```move
+{
+    let x = 0;
+    x + 1; // 值会被丢弃
+    x + 2; // 值会被丢弃
+    b"hello"; // 值会被丢弃
+}
+```
+
+But! If the expression contains a resource (a value without the `drop` [ability](./abilities.md)),
+you will get an error. This is because Move's type system guarantees that any value that is dropped
+has the `drop` [ability](./abilities.md). (Ownership must be transferred or the value must be
+explicitly destroyed within its declaring module.)
+
+但是！如果表达式包含资源（没有 `drop` [能力](./abilities.md)的值），你将收到错误消息。这是因为 Move 的类型系统保证任何被删除的值都具有 `drop` [能力](./abilities.md)。（必须转移所有权，或者必须在其声明模块中显式销毁该值。）
+
+```move
+{
+    let x = 0;
+    Coin { value: x }; // 错误！
+//  ^^^^^^^^^^^^^^^^^ unused value without the `drop` ability（未使用没有 `drop` 能力的值）
+    x
+}
+```
+
+If a final expression is not present in a block---that is, if there is a trailing semicolon `;`,
+there is an implicit unit `()` value. Similarly, if the expression block is empty, there is an
+implicit unit `()` value.
+
+如果块中不存在最终表达式 —— 也就是说，如果有一个尾随分号 `;`，则含有一个隐式的[单值（unit）`()`](https://zh.wikipedia.org/wiki/%E5%8D%95%E5%80%BC%E7%B1%BB%E5%9E%8B)。同样，如果表达式块为空，那么也存在隐式的单值 `()`。
+
+```move
+// 两者是等价的
+{ x = x + 1; 1 / x; }
+{ x = x + 1; 1 / x; () }
+```
+
+```move
+// 两者是等价的
+{ }
+{ () }
+```
+
+An expression block is itself an expression and can be used anyplace an expression is used. (Note:
+The body of a function is also an expression block, but the function body cannot be replaced by
+another expression.)
+
+表达式块本身就是一个表达式，可以在任何使用表达式的地方使用。（注意：函数体也是一个表达式块，但函数体不能被另一个表达式替换。）
+
+```move
+let my_vector: vector<vector<u8>> = {
+    let v = vector::empty();
+    vector::push_back(&mut v, b"hello");
+    vector::push_back(&mut v, b"goodbye");
+    v
+};
+```
+
+(The type annotation is not needed in this example and only added for clarity.)
+
+（此示例中不需要类型标注，只是为了清楚起见而添加。）
+
+### 遮蔽（Shadowing）
+
+If a `let` introduces a local variable with a name already in scope, that previous variable can no
+longer be accessed for the rest of this scope. This is called _shadowing_.
+
+如果一个 `let` 引入了一个名称已经在作用域中的局部变量，则该作用域的剩余部分将无法再访问先前的变量。这称为*遮蔽（shadowing）*。
+
+```move
+let x = 0;
+assert!(x == 0, 42);
+
+let x = 1; // x 被遮蔽了
+assert!(x == 1, 42);
+```
+
+When a local is shadowed, it does not need to retain the same type as before.
+
+当局部变量被遮蔽时，它不需要保留与以前相同的类型。
+
+```move
+let x = 0;
+assert!(x == 0, 42);
+
+let x = b"hello"; // x 被遮蔽了
+assert!(x == b"hello", 42);
+```
+
+After a local is shadowed, the value stored in the local still exists, but will no longer be
+accessible. This is important to keep in mind with values of types without the
+[`drop` ability](./abilities.md), as ownership of the value must be transferred by the end of the
+function.
+
+在局部变量被遮蔽后，存储在局部变量的值仍然存在，但是将不再可访问。对于没有 [`drop` 能力](./abilities.md)的类型的值，请记住这一点很重要，因为值的所有权必须在函数结束时转移。
+
+```move
+address 0x42 {
+    module example {
+        struct Coin has store { value: u64 }
+
+        fun unused_resource(): Coin {
+            let x = Coin { value: 0 }; // ERROR!
+//              ^ This local still contains a value without the `drop` ability（这个局部变量仍然包含一个没有 `drop` 能力的值）
+            x.value = 1;
+            let x = Coin { value: 10 };
+            x
+//          ^ Invalid return（无效的返回）
+        }
+    }
+}
+```
+
+When a local is shadowed inside a scope, the shadowing only remains for that scope. The shadowing is
+gone once that scope ends.
+
+当局部变量在作用域内被遮蔽时，该遮蔽作用仅保留在该作用域内。一旦该作用域结束，遮蔽作用就消失了。
+
+```move
+let x = 0;
+{
+    let x = 1;
+    assert!(x == 1, 42);
+};
+assert!(x == 0, 42);
+```
+
+Remember, locals can change type when they are shadowed.
+
+请记住，局部变量在被遮蔽时可以更改类型。
+
+```move
+let x = 0;
+{
+    let x = b"hello";
+    assert!(x = b"hello", 42);
+};
+assert!(x == 0, 42);
+```
+
+## 移动和复制（Move and Copy）
+
+All local variables in Move can be used in two ways, either by `move` or `copy`. If one or the other
+is not specified, the Move compiler is able to infer whether a `copy` or a `move` should be used.
+This means that in all of the examples above, a `move` or a `copy` would be inserted by the
+compiler. A local variable cannot be used without the use of `move` or `copy`.
+
+`copy` will likely feel the most familiar coming from other programming languages, as it creates a
+new copy of the value inside of the variable to use in that expression. With `copy`, the local
+variable can be used more than once.
+
+Move 中的所有局部变量都可以通过两种方式使用，通过 `move` 或 `copy`。如果未指定其中之一，则 Move 编译器能够推断应该使用 `copy` 还是 `move`。这意味着在上述所有示例中，编译器将插入 `move` 或 `copy`。如果不使用 `move` 或 `copy`，就不能使用局部变量。
+
+`copy` 对来自其他编程语言的开发者来说可能会觉得最熟悉，因为它会在变量内部创建一个新的副本值以在该表达式中使用。使用 `copy`，局部变量可以被多次使用。
+
+```move
+let x = 0;
+let y = copy x + 1;
+let z = copy x + 2;
+```
+
+Any value with the `copy` [ability](./abilities.md) can be copied in this way.
+
+`move` takes the value out of the local variable _without_ copying the data. After a `move` occurs,
+the local variable is unavailable.
+
+任何具有 `copy` [能力](./abilities.md)的值都可以通过这种方式复制。
+
+`move` 从局部变量中取出值*而不是*复制数据。`移动（move）`发生后，局部变量将不可用。
+
+```move
+let x = 1;
+let y = move x + 1;
+//      ------ Local was moved here（局部变量被移动到这里了）
+let z = move x + 2; // 错误！
+//      ^^^^^^ Invalid usage of local 'x'（局部变量“x”的无效使用方式）
+y + z
+```
+
+### 安全性（Safety）
+
+Move's type system will prevent a value from being used after it is moved. This is the same safety
+check described in [`let` declaration](#let-bindings) that prevents local variables from being used
+before it is assigned a value.
+
+Move 的类型系统会阻止一个值在移动后被使用。这与 [`let` 声明](#let-绑定let-bindings)中描述的防止在局部变量被赋值之前使用的安全检查相同。
+
+<!-- For more information, see TODO future section on ownership and move semantics. -->
+
+<!-- 如了解更多信息, 参阅未来所有权和移动语义的部分 (TODO )。 -->
+
+### 推断（Inference）
+
+As mentioned above, the Move compiler will infer a `copy` or `move` if one is not indicated. The
+algorithm for doing so is quite simple:
+
+- Any scalar value with the `copy` [ability](./abilities.md) is given a `copy`.
+- Any reference (both mutable `&mut` and immutable `&`) is given a `copy`.
+  - Except under special circumstances where it is made a `move` for predictable borrow checker errors.
+- Any other value is given a `move`.
+  - This means that even though other values might be have the `copy` [ability](./abilities.md), it must be done _explicitly_ by the programmer.
+  - This is to prevent accidental copies of large data structures.
+
+如上所述，如果未指明，Move 编译器将推断出 `copy` 还是 `move`。这样做的算法非常简单：
+
+- 任何带有 `copy` [能力](./abilities.md)的标量值都被赋予了 `copy`。
+- 任何引用（可变的 `&mut` 和不可变的 `&`）都被赋予 `copy`。
+  - 除非在可预测的借用检查器错误的特殊情况下，会进行 `move` 操作。
+- 任何其他值都被赋予 `move`。
+  - 这意味着即使其他值可能具有 `copy` [能力](./abilities.md)，它也必须由程序员*显式*声明。
+  - 这是为了防止意外地复制很大的数据结构。
+
+例如：
+
+```move
+let s = b"hello";
+let foo = Foo { f: 0 };
+let coin = Coin { value: 0 };
+
+let s2 = s; // 移动
+let foo2 = foo; // 移动
+let coin2 = coin; // 移动
+
+let x = 0;
+let b = false;
+let addr = @0x42;
+let x_ref = &x;
+let coin_ref = &mut coin2;
+
+let x2 = x; // 复制
+let b2 = b; // 复制
+let addr2 = @0x42; // 复制
+let x_ref2 = x_ref; // 复制
+let coin_ref2 = coin_ref; // 复制
+```
diff --git a/language/documentation/book/translations/move-book-zh/src/vector.md b/language/documentation/book/translations/move-book-zh/src/vector.md
new file mode 100644
index 0000000000..286892a280
--- /dev/null
+++ b/language/documentation/book/translations/move-book-zh/src/vector.md
@@ -0,0 +1,152 @@
+# 向量
+
+`vector<T>` 是 Move 提供的唯一原始集合类型。`vector<T>` 是类型为 `T` 的同构集合，可以通过从"末端"推入/弹出（出栈/入栈，译者注）值来增长或缩小。
+*（与 Rust 一样，向量（vector）是一种可以存放任何类型的可变大小的容器，也可称为[动态数组](https://en.wikipedia.org/wiki/Dynamic_array)，与 Python 中的[列表（list）](https://computersciencewiki.org/index.php/Lists)不同，译者注）*
+
+`vector<T>` 可以用任何类型 `T` 实例化。例如，`vector<u64>`、`vector<address>`、`vector<0x42::MyModuel::MyResource>` 和 `vector<vector<u8>>` 都是有效的向量类型。
+
+## 字面量
+
+### 通用 `vector` 字面量
+
+任何类型的向量都可以通过 `vector` 字面量创建。
+
+| 语法                  | 类型                                                                          | 描述                              |
+|-----------------------|-------------------------------------------------------------------------------|-----------------------------------|
+| `vector[]`            | `vector[]: vector<T>` 其中 `T` 是任何单一的非引用类型                         | 一个空向量                        |
+| `vector[e1, ..., en]` | `vector[e1, ..., en]: vector<T>` where `e_i: T` 满足 `0 < i <= n` and `n > 0` | 带有 `n` 个元素（长度为 n）的向量 |
+
+在这些情况下，`vector` 的类型是从元素类型或从向量的使用上推断出来的。如果无法推断类型或者只是为了更清楚地表示，则可以显式指定类型：
+
+```move
+vector<T>[]: vector<T>
+vector<T>[e1, ..., en]: vector<T>
+```
+
+#### 向量字面量示例
+
+```move
+(vector[]: vector<bool>);
+(vector[0u8, 1u8, 2u8]: vector<u8>);
+(vector<u128>[]: vector<u128>);
+(vector<address>[@0x42, @0x100]: vector<address>);
+```
+
+### `vector<u8>` 字面量
+
+Move 中向量的一个常见用例是表示“字节数组”，用 `vector<u8>` 表示。这些值通常用于加密目的，例如公钥或哈希结果。这些值非常常见，以至于提供了特定的语法以使值更具可读性，而不是必须使用 `vector[]`，其中每个单独的 `u8` 值都以数字形式指定。
+
+目前支持两种类型的 `vector<u8>` 字面量，*字节字符串*和*十六进制字符串*。
+
+#### 字节字符串
+
+字节字符串是带引号的字符串字面量，以 `b` 为前缀，例如，`b"Hello!\n"`。
+
+这些是允许转义序列的 ASCII 编码字符串。目前，支持的转义序列如下：
+
+| 转义序列 | 描述                                        |
+|----------|---------------------------------------------|
+| `\n`     | 换行                                        |
+| `\r`     | 回车                                        |
+| `\t`     | 制表符                                      |
+| `\\`     | 反斜杠                                      |
+| `\0`     | Null                                        |
+| `\"`     | 引号                                        |
+| `\xHH`   | 十六进制进制转义，插入十六进制字节序列 `HH` |
+
+#### 十六进制字符串
+
+十六进制字符串是以 `x` 为前缀的带引号的字符串字面量，例如，`x"48656C6C6F210A"`。
+
+每个字节对，范围从 `00` 到 `FF` 都被解析为十六进制编码的 `u8` 值。所以每个字节对对应于结果 `vector<u8>` 的单个条目。
+
+#### 字符串字面量示例
+
+```move
+script {
+    fun byte_and_hex_strings() {
+        assert!(b"" == x"", 0);
+        assert!(b"Hello!\n" == x"48656C6C6F210A", 1);
+        assert!(b"\x48\x65\x6C\x6C\x6F\x21\x0A" == x"48656C6C6F210A", 2);
+        assert!(
+            b"\"Hello\tworld!\"\n \r \\Null=\0" ==
+                x"2248656C6C6F09776F726C6421220A200D205C4E756C6C3D00",
+            3
+        );
+    }
+}
+```
+
+## 操作
+
+`vector` 通过 Move 标准库里的 `std::vector` 模块支持以下操作：
+
+| 函数                                                       | 描述                                                                                                         | 中止条件             |
+|------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------|----------------------|
+| `vector::empty<T>(): vector<T>`                            | 创建一个可以存储 `T` 类型值的空向量                                                                          | 永不中止             |
+| `vector::singleton<T>(t: T): vector<T>`                    | 创建一个包含 `t` 的大小为 1 的向量                                                                           | 永不中止             |
+| `vector::push_back<T>(v: &mut vector<T>, t: T)`            | 将 `t` 添加到 `v` 的尾部                                                                                     | 永不中止             |
+| `vector::pop_back<T>(v: &mut vector<T>): T`                | 移除并返回 `v` 中的最后一个元素                                                                              | 如果 `v` 是空向量    |
+| `vector::borrow<T>(v: &vector<T>, i: u64): &T`             | 返回在索引 `i` 处对 `T` 的不可变引用                                                                         | 如果 `i` 越界        |
+| `vector::borrow_mut<T>(v: &mut vector<T>, i: u64): &mut T` | 返回在索引 `i` 处对 `T` 的可变引用                                                                           | 如果 `i` 越界        |
+| `vector::destroy_empty<T>(v: vector<T>)`                   | 销毁 `v` 向量                                                                                                | 如果 `v` 不是空向量  |
+| `vector::append<T>(v1: &mut vector<T>, v2: vector<T>)`     | 将 `v2` 中的元素添加到 `v1` 的末尾                                                                           | 永不中止             |
+| `vector::contains<T>(v: &vector<T>, e: &T): bool`          | 如果 `e` 在向量 `v` 里返回 true，否则返回 false                                                              | 永不中止             |
+| `vector::swap<T>(v: &mut vector<T>, i: u64, j: u64)`       | 交换向量 `v` 中第 `i` 个和第 `j` 个索引处的元素                                                              | 如果 `i` 或 `j` 越界 |
+| `vector::reverse<T>(v: &mut vector<T>)`                    | 反转向量 `v` 中元素的顺序                                                                                    | 永不中止             |
+| `vector::index_of<T>(v: &vector<T>, e: &T): (bool, u64)`   | 如果 `e` 在索引 `i` 处的向量中，则返回 `(true, i)`。否则返回`(false, 0)`                                     | 永不中止             |
+| `vector::remove<T>(v: &mut vector<T>, i: u64): T`          | 移除向量 `v` 中的第 `i` 个元素，移动所有后续元素。这里的时间复杂度是 O(n)，并且保留了向量中元素的顺序        | 如果 `i` 越界        |
+| `vector::swap_remove<T>(v: &mut vector<T>, i: u64): T`     | 将向量中的第 `i` 个元素与最后一个元素交换，然后弹出该元素。这里的时间复杂度是 O(1)，但是不保留向量中的元素顺序 | 如果 `i` 越界        |
+
+随着时间的推移可能会增加更多操作。
+
+## 示例
+
+```move
+use std::vector;
+
+let v = vector::empty<u64>();
+vector::push_back(&mut v, 5);
+vector::push_back(&mut v, 6);
+
+assert!(*vector::borrow(&v, 0) == 5, 42);
+assert!(*vector::borrow(&v, 1) == 6, 42);
+assert!(vector::pop_back(&mut v) == 6, 42);
+assert!(vector::pop_back(&mut v) == 5, 42);
+```
+
+## 销毁和复制 `vector`
+
+`vector<T>` 的某些行为取决于元素类型 `T` 的能力（ability），例如：如果向量中包含不具有 `drop` 能力的元素，那么不能像上面例子中的 `v` 一样隐式丢弃 —— 它们必须用 `vector::destroy_empty` 显式销毁。
+
+请注意，除非向量 `vec` 包含零个元素，否则 `vector::destroy_empty` 将在运行时中止：
+
+```move
+fun destroy_any_vector<T>(vec: vector<T>) {
+    vector::destroy_empty(vec) // 删除此行将导致编译器错误
+}
+```
+
+但是删除包含带有 `drop` 能力的元素的向量不会发生错误：
+
+```move
+fun destroy_droppable_vector<T: drop>(vec: vector<T>) {
+    // 有效！
+    // 不需要明确地做任何事情来销毁向量
+}
+```
+
+同样，除非元素类型具有 `copy` 能力，否则无法复制向量。换句话说，当且仅当 `T` 具有 `copy` 能力时，`vector<T>` 才具有 `copy` 能力。然而，即使是可复制的向量也永远不会被隐式复制：
+
+```move
+let x = vector::singleton<u64>(10);
+let y = copy x; // 没有 copy 将导致编译器错误！
+```
+
+大向量的复制可能很昂贵，因此编译器需要显式 `copy` 以便更容易查看它们发生的位置。
+
+有关更多详细信息，请参阅[类型能力](./abilities.md)和[泛型](./generics.md)部分。
+
+## 所有权
+
+[如上所述](#销毁和复制-vector)，`vector` 值只有在元素值可以复制的时候才能复制。在这种情况下，复制必须通过显式 [`copy`](./variables.md#移动和复制) 或者[解引用 `*`](./references.md#通过引用读取和写入)。
diff --git a/language/documentation/examples/diem-framework/build_all.sh b/language/documentation/examples/diem-framework/build_all.sh
index 934104ac32..cb5a07535a 100755
--- a/language/documentation/examples/diem-framework/build_all.sh
+++ b/language/documentation/examples/diem-framework/build_all.sh
@@ -5,6 +5,6 @@
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-cd "${SCRIPT_DIR}/move-packages/DPN" && cargo run -p df-cli -- package build &&
-cd "${SCRIPT_DIR}/move-packages/core" && cargo run -p df-cli -- package build &&
-cd "${SCRIPT_DIR}/move-packages/experimental" && cargo run -p df-cli -- package build
+cd "${SCRIPT_DIR}/move-packages/DPN" && cargo run -p df-cli -- build &&
+cd "${SCRIPT_DIR}/move-packages/core" && cargo run -p df-cli -- build &&
+cd "${SCRIPT_DIR}/move-packages/experimental" && cargo run -p df-cli -- build
diff --git a/language/documentation/examples/diem-framework/crates/cli/Cargo.toml b/language/documentation/examples/diem-framework/crates/cli/Cargo.toml
index 7976e01e29..f1223aa3d4 100644
--- a/language/documentation/examples/diem-framework/crates/cli/Cargo.toml
+++ b/language/documentation/examples/diem-framework/crates/cli/Cargo.toml
@@ -5,17 +5,19 @@ description = "CLI frontend for the Move compiler and VM (with Diem Framework)"
 authors = ["Diem Association <opensource@diem.com>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
-bcs = "0.1.2"
 clap = { version = "3.1.8", features = ["derive"] }
 
+bcs = "0.1.4"
+
 move-stdlib = { path = "../../../../../move-stdlib" }
 move-core-types = { path = "../../../../../move-core/types" }
 move-vm-types = { path = "../../../../../move-vm/types" }
 move-cli = { path = "../../../../../tools/move-cli" }
+move-vm-test-utils = { path = "../../../../../move-vm/test-utils" }
 
 diem-framework-natives = { path = "../natives" }
 
diff --git a/language/documentation/examples/diem-framework/crates/cli/src/main.rs b/language/documentation/examples/diem-framework/crates/cli/src/main.rs
index 354249d780..ec83cef143 100644
--- a/language/documentation/examples/diem-framework/crates/cli/src/main.rs
+++ b/language/documentation/examples/diem-framework/crates/cli/src/main.rs
@@ -5,12 +5,10 @@
 use anyhow::Result;
 use clap::Parser;
 use move_cli::{Command, Move};
-use move_core_types::{
-    errmap::ErrorMapping,
-    gas_schedule::{CostTable, GasCost},
-    language_storage::CORE_CODE_ADDRESS,
+use move_core_types::{errmap::ErrorMapping, language_storage::CORE_CODE_ADDRESS};
+use move_vm_test_utils::gas_schedule::{
+    new_from_instructions, zero_cost_instruction_table, CostTable,
 };
-use move_vm_types::gas_schedule::{new_from_instructions, zero_cost_instruction_table};
 
 #[derive(Parser)]
 pub struct DfCli {
@@ -28,34 +26,39 @@ pub enum DfCommands {
     // extra commands available only in df-cli can be added below
 }
 
-fn cost_table(num_natives: usize) -> CostTable {
+fn cost_table() -> CostTable {
     let instruction_table = zero_cost_instruction_table();
-    let native_table = std::iter::repeat_with(|| GasCost::new(0, 0))
-        .take(num_natives)
-        .collect();
-
-    new_from_instructions(instruction_table, native_table)
+    new_from_instructions(instruction_table)
 }
 
 fn main() -> Result<()> {
     // let error_descriptions: ErrorMapping =
     //     bcs::from_bytes(diem_framework_releases::current_error_descriptions())?;
 
-    let natives = move_stdlib::natives::all_natives(CORE_CODE_ADDRESS)
-        .into_iter()
-        .chain(diem_framework_natives::all_natives(CORE_CODE_ADDRESS))
-        .collect::<Vec<_>>();
-
-    let num_natives = natives.len();
+    let natives = move_stdlib::natives::all_natives(
+        CORE_CODE_ADDRESS,
+        // We may want to switch to a different gas schedule in the future, but for now,
+        // the all-zero one should be enough.
+        move_stdlib::natives::GasParameters::zeros(),
+    )
+    .into_iter()
+    .chain(move_stdlib::natives::nursery_natives(
+        CORE_CODE_ADDRESS,
+        // We may want to switch to a different gas schedule in the future, but for now,
+        // the all-zero one should be enough.
+        move_stdlib::natives::NurseryGasParameters::zeros(),
+    ))
+    .chain(diem_framework_natives::all_natives(CORE_CODE_ADDRESS))
+    .collect::<Vec<_>>();
 
     let args = DfCli::parse();
-    match &args.cmd {
+    match args.cmd {
         DfCommands::Command(cmd) => move_cli::run_cli(
             natives,
-            &cost_table(num_natives),
+            &cost_table(),
             // TODO: implement this
             &ErrorMapping::default(),
-            &args.move_args,
+            args.move_args,
             cmd,
         ),
     }
diff --git a/language/documentation/examples/diem-framework/crates/crypto-derive/Cargo.toml b/language/documentation/examples/diem-framework/crates/crypto-derive/Cargo.toml
index efae300ae2..cd5d74589c 100644
--- a/language/documentation/examples/diem-framework/crates/crypto-derive/Cargo.toml
+++ b/language/documentation/examples/diem-framework/crates/crypto-derive/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-crypto-derive"
 version = "0.0.3"
 authors = ["Diem Association <opensource@diem.com>"]
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [lib]
diff --git a/language/documentation/examples/diem-framework/crates/crypto/Cargo.toml b/language/documentation/examples/diem-framework/crates/crypto/Cargo.toml
index ceba097221..2e9031677b 100644
--- a/language/documentation/examples/diem-framework/crates/crypto/Cargo.toml
+++ b/language/documentation/examples/diem-framework/crates/crypto/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-crypto"
 version = "0.0.3"
 authors = ["Diem Association <opensource@diem.com>"]
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
@@ -30,7 +30,8 @@ tiny-keccak = { version = "2.0.2", features = ["sha3"] }
 x25519-dalek = { version = "0.1.0", package = "x25519-dalek-fiat", default-features = false, features = ["std"] }
 aes-gcm = "0.8.0"
 diem-crypto-derive = { path = "../crypto-derive" }
-bcs = "0.1.2"
+
+bcs = "0.1.4"
 
 [dev-dependencies]
 bitvec = "0.19.4"
@@ -41,7 +42,8 @@ ripemd160 = "0.9.1"
 criterion = "0.3.4"
 sha3 = "0.9.1"
 serde_json = "1.0.64"
-trybuild = "1.0.41"
+# TODO: some tests will fail if this is set to 1.0.63
+trybuild = "=1.0.53"
 
 [features]
 default = ["fiat"]
diff --git a/language/documentation/examples/diem-framework/crates/crypto/src/ed25519.rs b/language/documentation/examples/diem-framework/crates/crypto/src/ed25519.rs
index f3d923a50f..1fd007bfa7 100644
--- a/language/documentation/examples/diem-framework/crates/crypto/src/ed25519.rs
+++ b/language/documentation/examples/diem-framework/crates/crypto/src/ed25519.rs
@@ -161,7 +161,7 @@ impl Ed25519PublicKey {
             bits
         };
         let mtg_point = curve25519_dalek::montgomery::MontgomeryPoint(key_bits);
-        let sign = if negative { 1u8 } else { 0u8 };
+        let sign = u8::from(negative);
         let ed_point = mtg_point
             .to_edwards(sign)
             .ok_or(CryptoMaterialError::DeserializationError)?;
@@ -341,7 +341,7 @@ impl VerifyingKey for Ed25519PublicKey {
 
 impl fmt::Display for Ed25519PublicKey {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", hex::encode(&self.0.as_bytes()))
+        write!(f, "{}", hex::encode(self.0.as_bytes()))
     }
 }
 
diff --git a/language/documentation/examples/diem-framework/crates/crypto/src/test_utils.rs b/language/documentation/examples/diem-framework/crates/crypto/src/test_utils.rs
index 25e9386136..8bc36d2c65 100644
--- a/language/documentation/examples/diem-framework/crates/crypto/src/test_utils.rs
+++ b/language/documentation/examples/diem-framework/crates/crypto/src/test_utils.rs
@@ -140,7 +140,7 @@ impl ::core::clone::Clone for TestDiemCryptoHasher {
     fn clone(&self) -> TestDiemCryptoHasher {
         match *self {
             TestDiemCryptoHasher(ref __self_0_0) => {
-                TestDiemCryptoHasher(::core::clone::Clone::clone(&(*__self_0_0)))
+                TestDiemCryptoHasher(::core::clone::Clone::clone(__self_0_0))
             }
         }
     }
diff --git a/language/documentation/examples/diem-framework/crates/crypto/src/unit_tests/ed25519_test.rs b/language/documentation/examples/diem-framework/crates/crypto/src/unit_tests/ed25519_test.rs
index 40fbee9acb..05feec195e 100644
--- a/language/documentation/examples/diem-framework/crates/crypto/src/unit_tests/ed25519_test.rs
+++ b/language/documentation/examples/diem-framework/crates/crypto/src/unit_tests/ed25519_test.rs
@@ -100,9 +100,9 @@ proptest! {
         // Compute k = H(R∥A∥m) //
         //////////////////////////
         let mut h: Sha512 = Sha512::default();
-        h.update(&mixed_r_point.compress().to_bytes());
-        h.update(&mixed_pub_point.compress().to_bytes());
-        h.update(&message);
+        h.update(mixed_r_point.compress().to_bytes());
+        h.update(mixed_pub_point.compress().to_bytes());
+        h.update(message);
         // curve25519_dalek is stuck on an old digest version, so we can't do
         // Scalar::from_hash
         let mut output = [0u8; 64];
@@ -120,7 +120,7 @@ proptest! {
         let nonce = &expanded_priv_key[32..];
         let mut h: Sha512 = Sha512::default();
         h.update(nonce);
-        h.update(&message);
+        h.update(message);
         // curve25519_dalek is stuck on an old digest version, so we can't do
         // Scalar::from_hash
         let mut output = [0u8; 64];
diff --git a/language/documentation/examples/diem-framework/crates/crypto/src/unit_tests/hkdf_test.rs b/language/documentation/examples/diem-framework/crates/crypto/src/unit_tests/hkdf_test.rs
index 80d4085bdf..a211e6c062 100644
--- a/language/documentation/examples/diem-framework/crates/crypto/src/unit_tests/hkdf_test.rs
+++ b/language/documentation/examples/diem-framework/crates/crypto/src/unit_tests/hkdf_test.rs
@@ -11,9 +11,9 @@ use sha2::{Sha256, Sha512};
 fn test_sha256_test_vectors() {
     let tests = test_vectors_sha256();
     for t in tests.iter() {
-        let ikm = hex::decode(&t.ikm).unwrap();
-        let salt = hex::decode(&t.salt).unwrap();
-        let info = hex::decode(&t.info).unwrap();
+        let ikm = hex::decode(t.ikm).unwrap();
+        let salt = hex::decode(t.salt).unwrap();
+        let info = hex::decode(t.info).unwrap();
 
         let hkdf_extract = Hkdf::<Sha256>::extract(Option::from(&salt[..]), &ikm[..]).unwrap();
         let hkdf_expand = Hkdf::<Sha256>::expand(&hkdf_extract, Some(&info[..]), t.length);
@@ -29,9 +29,9 @@ fn test_sha256_test_vectors() {
 fn test_extract_then_expand() {
     let tests = test_vectors_sha256();
     for t in tests.iter() {
-        let ikm = hex::decode(&t.ikm).unwrap();
-        let salt = hex::decode(&t.salt).unwrap();
-        let info = hex::decode(&t.info).unwrap();
+        let ikm = hex::decode(t.ikm).unwrap();
+        let salt = hex::decode(t.salt).unwrap();
+        let info = hex::decode(t.info).unwrap();
 
         let hkdf_full = Hkdf::<Sha256>::extract_then_expand(
             Option::from(&salt[..]),
diff --git a/language/documentation/examples/diem-framework/crates/crypto/src/validatable.rs b/language/documentation/examples/diem-framework/crates/crypto/src/validatable.rs
index e062e3ebdc..76d987b70a 100644
--- a/language/documentation/examples/diem-framework/crates/crypto/src/validatable.rs
+++ b/language/documentation/examples/diem-framework/crates/crypto/src/validatable.rs
@@ -158,7 +158,7 @@ impl Serialize for UnvalidatedEd25519PublicKey {
         S: serde::Serializer,
     {
         if serializer.is_human_readable() {
-            let encoded = ::hex::encode(&self.0);
+            let encoded = ::hex::encode(self.0);
             serializer.serialize_str(&encoded)
         } else {
             // See comment in deserialize_key.
diff --git a/language/documentation/examples/diem-framework/crates/crypto/src/x25519.rs b/language/documentation/examples/diem-framework/crates/crypto/src/x25519.rs
index 215dd992de..4f4f67136e 100644
--- a/language/documentation/examples/diem-framework/crates/crypto/src/x25519.rs
+++ b/language/documentation/examples/diem-framework/crates/crypto/src/x25519.rs
@@ -250,7 +250,7 @@ impl traits::ValidCryptoMaterial for PublicKey {
 
 impl std::fmt::Display for PublicKey {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", hex::encode(&self.0))
+        write!(f, "{}", hex::encode(self.0))
     }
 }
 
diff --git a/language/documentation/examples/diem-framework/crates/natives/Cargo.toml b/language/documentation/examples/diem-framework/crates/natives/Cargo.toml
index f59df07096..cc2867982a 100644
--- a/language/documentation/examples/diem-framework/crates/natives/Cargo.toml
+++ b/language/documentation/examples/diem-framework/crates/natives/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-framework-natives"
 version = "0.0.0"
 authors = ["Diem Association <opensource@diem.com>"]
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
diff --git a/language/documentation/examples/diem-framework/crates/natives/src/account.rs b/language/documentation/examples/diem-framework/crates/natives/src/account.rs
index 00c063fa00..6794e22206 100644
--- a/language/documentation/examples/diem-framework/crates/natives/src/account.rs
+++ b/language/documentation/examples/diem-framework/crates/natives/src/account.rs
@@ -6,17 +6,13 @@ use move_binary_format::errors::PartialVMResult;
 use move_core_types::account_address::AccountAddress;
 use move_vm_runtime::native_functions::NativeContext;
 use move_vm_types::{
-    gas_schedule::NativeCostIndex,
-    loaded_data::runtime_types::Type,
-    natives::function::{native_gas, NativeResult},
-    pop_arg,
-    values::Value,
+    loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value,
 };
 use smallvec::smallvec;
 use std::collections::VecDeque;
 
 pub fn native_create_signer(
-    context: &mut NativeContext,
+    _context: &mut NativeContext,
     ty_args: Vec<Type>,
     mut arguments: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
@@ -24,20 +20,21 @@ pub fn native_create_signer(
     debug_assert!(arguments.len() == 1);
 
     let address = pop_arg!(arguments, AccountAddress);
-    let cost = native_gas(context.cost_table(), NativeCostIndex::CREATE_SIGNER, 0);
-    Ok(NativeResult::ok(cost, smallvec![Value::signer(address)]))
+    Ok(NativeResult::ok(
+        25.into(),
+        smallvec![Value::signer(address)],
+    ))
 }
 
 /// NOTE: this function will be deprecated after the Diem v3 release, but must
 /// remain for replaying old transactions
 pub fn native_destroy_signer(
-    context: &mut NativeContext,
+    _context: &mut NativeContext,
     ty_args: Vec<Type>,
     arguments: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
     debug_assert!(ty_args.is_empty());
     debug_assert!(arguments.len() == 1);
 
-    let cost = native_gas(context.cost_table(), NativeCostIndex::DESTROY_SIGNER, 0);
-    Ok(NativeResult::ok(cost, smallvec![]))
+    Ok(NativeResult::ok(213.into(), smallvec![]))
 }
diff --git a/language/documentation/examples/diem-framework/crates/natives/src/lib.rs b/language/documentation/examples/diem-framework/crates/natives/src/lib.rs
index cc85249f32..bb8471f7cd 100644
--- a/language/documentation/examples/diem-framework/crates/natives/src/lib.rs
+++ b/language/documentation/examples/diem-framework/crates/natives/src/lib.rs
@@ -5,44 +5,42 @@
 pub mod account;
 pub mod signature;
 
-use move_core_types::{account_address::AccountAddress, identifier::Identifier};
-use move_vm_runtime::native_functions::{NativeFunction, NativeFunctionTable};
+use std::sync::Arc;
+
+use move_core_types::account_address::AccountAddress;
+use move_vm_runtime::native_functions::{
+    make_table_from_iter, NativeFunction, NativeFunctionTable,
+};
 
 pub fn all_natives(diem_framework_addr: AccountAddress) -> NativeFunctionTable {
-    const NATIVES: &[(&str, &str, NativeFunction)] = &[
+    let natives: [(&str, &str, NativeFunction); 5] = [
         // TODO: Remove once/if DPN is moved over to use the core framework
         (
             "DiemAccount",
             "create_signer",
-            account::native_create_signer,
+            Arc::new(account::native_create_signer),
         ),
         (
             "DiemAccount",
             "destroy_signer",
-            account::native_destroy_signer,
+            Arc::new(account::native_destroy_signer),
         ),
         (
             "Signature",
             "ed25519_validate_pubkey",
-            signature::native_ed25519_publickey_validation,
+            Arc::new(signature::native_ed25519_publickey_validation),
         ),
         (
             "Signature",
             "ed25519_verify",
-            signature::native_ed25519_signature_verification,
+            Arc::new(signature::native_ed25519_signature_verification),
+        ),
+        (
+            "Account",
+            "create_signer",
+            Arc::new(account::native_create_signer),
         ),
-        ("Account", "create_signer", account::native_create_signer),
     ];
-    NATIVES
-        .iter()
-        .cloned()
-        .map(|(module_name, func_name, func)| {
-            (
-                diem_framework_addr,
-                Identifier::new(module_name).unwrap(),
-                Identifier::new(func_name).unwrap(),
-                func,
-            )
-        })
-        .collect()
+
+    make_table_from_iter(diem_framework_addr, natives)
 }
diff --git a/language/documentation/examples/diem-framework/crates/natives/src/signature.rs b/language/documentation/examples/diem-framework/crates/natives/src/signature.rs
index 911ba1edde..0cc1311a62 100644
--- a/language/documentation/examples/diem-framework/crates/natives/src/signature.rs
+++ b/language/documentation/examples/diem-framework/crates/natives/src/signature.rs
@@ -6,17 +6,13 @@ use diem_crypto::{ed25519, traits::*};
 use move_binary_format::errors::PartialVMResult;
 use move_vm_runtime::native_functions::NativeContext;
 use move_vm_types::{
-    gas_schedule::NativeCostIndex,
-    loaded_data::runtime_types::Type,
-    natives::function::{native_gas, NativeResult},
-    pop_arg,
-    values::Value,
+    loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value,
 };
 use smallvec::smallvec;
 use std::{collections::VecDeque, convert::TryFrom};
 
 pub fn native_ed25519_publickey_validation(
-    context: &mut NativeContext,
+    _context: &mut NativeContext,
     _ty_args: Vec<Type>,
     mut arguments: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
@@ -25,19 +21,15 @@ pub fn native_ed25519_publickey_validation(
 
     let key_bytes = pop_arg!(arguments, Vec<u8>);
 
-    let cost = native_gas(
-        context.cost_table(),
-        NativeCostIndex::ED25519_VALIDATE_KEY,
-        key_bytes.len(),
-    );
+    let cost = 26 * usize::max(key_bytes.len(), 1) as u64;
 
     // This deserialization performs point-on-curve and small subgroup checks
     let valid = ed25519::Ed25519PublicKey::try_from(&key_bytes[..]).is_ok();
-    Ok(NativeResult::ok(cost, smallvec![Value::bool(valid)]))
+    Ok(NativeResult::ok(cost.into(), smallvec![Value::bool(valid)]))
 }
 
 pub fn native_ed25519_signature_verification(
-    context: &mut NativeContext,
+    _context: &mut NativeContext,
     _ty_args: Vec<Type>,
     mut arguments: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
@@ -48,28 +40,24 @@ pub fn native_ed25519_signature_verification(
     let pubkey = pop_arg!(arguments, Vec<u8>);
     let signature = pop_arg!(arguments, Vec<u8>);
 
-    let cost = native_gas(
-        context.cost_table(),
-        NativeCostIndex::ED25519_VERIFY,
-        msg.len(),
-    );
+    let cost = 62 * usize::max(msg.len(), 1) as u64;
 
     let sig = match ed25519::Ed25519Signature::try_from(signature.as_slice()) {
         Ok(sig) => sig,
         Err(_) => {
-            return Ok(NativeResult::ok(cost, smallvec![Value::bool(false)]));
+            return Ok(NativeResult::ok(cost.into(), smallvec![Value::bool(false)]));
         }
     };
     let pk = match ed25519::Ed25519PublicKey::try_from(pubkey.as_slice()) {
         Ok(pk) => pk,
         Err(_) => {
-            return Ok(NativeResult::ok(cost, smallvec![Value::bool(false)]));
+            return Ok(NativeResult::ok(cost.into(), smallvec![Value::bool(false)]));
         }
     };
 
     let verify_result = sig.verify_arbitrary_msg(msg.as_slice(), &pk).is_ok();
     Ok(NativeResult::ok(
-        cost,
+        cost.into(),
         smallvec![Value::bool(verify_result)],
     ))
 }
diff --git a/language/documentation/examples/diem-framework/move-packages/DPN/sources/CRSN.move b/language/documentation/examples/diem-framework/move-packages/DPN/sources/CRSN.move
index 9fabd60bd1..7880280dcc 100644
--- a/language/documentation/examples/diem-framework/move-packages/DPN/sources/CRSN.move
+++ b/language/documentation/examples/diem-framework/move-packages/DPN/sources/CRSN.move
@@ -194,8 +194,9 @@ module DiemFramework::CRSN {
     }
 
     spec force_expire {
-        let addr = signer::address_of(account);
-        ensures global<CRSN>(addr).min_nonce == old(global<CRSN>(addr)).min_nonce + shift_amount;
+        // TODO: this ensures may not hold
+        // let addr = signer::address_of(account);
+        // ensures global<CRSN>(addr).min_nonce == old(global<CRSN>(addr)).min_nonce + shift_amount;
     }
     /// Return whether this address has a CRSN resource published under it.
     public fun has_crsn(addr: address): bool {
diff --git a/language/documentation/examples/diem-framework/move-packages/DPN/tests/AccountFreezingTests.move b/language/documentation/examples/diem-framework/move-packages/DPN/tests/AccountFreezingTests.move
index 1d3f2a63cb..d7076726e5 100644
--- a/language/documentation/examples/diem-framework/move-packages/DPN/tests/AccountFreezingTests.move
+++ b/language/documentation/examples/diem-framework/move-packages/DPN/tests/AccountFreezingTests.move
@@ -5,7 +5,7 @@ module DiemFramework::AccountFreezingTests {
     use std::signer;
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
     fun account_freezing_double_init(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         AF::initialize(&dr);
@@ -25,7 +25,7 @@ module DiemFramework::AccountFreezingTests {
     }
 
     #[test(a = @0x2)]
-    #[expected_failure(abort_code = 518)]
+    #[expected_failure(abort_code = 518, location = AF)]
     fun create_new_already_has_freezing_bit(a: signer) {
         AF::create_for_test(&a);
         AF::create_for_test(&a);
@@ -39,7 +39,7 @@ module DiemFramework::AccountFreezingTests {
     }
 
     #[test(a = @0x2, tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 258)]
+    #[expected_failure(abort_code = 258, location = DiemFramework::CoreAddresses)]
     fun freeze_account_not_tc(a: signer, tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         AF::create_for_test(&a);
@@ -47,28 +47,28 @@ module DiemFramework::AccountFreezingTests {
     }
 
     #[test(tc = @TreasuryCompliance, a = @0x2)]
-    #[expected_failure(abort_code = 257)]
+    #[expected_failure(abort_code = 257, location = DiemFramework::DiemTimestamp)]
     fun freeze_account_not_operating(tc: signer, a: signer) {
         AF::create_for_test(&a);
         AF::freeze_account(&tc, @0x2);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 775)]
+    #[expected_failure(abort_code = 775, location = AF)]
     fun cannot_freeze_diem_root(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         AF::freeze_account(&tc, @DiemRoot);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 1031)]
+    #[expected_failure(abort_code = 1031, location = AF)]
     fun cannot_freeze_treasury_compliance(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         AF::freeze_account(&tc, @TreasuryCompliance);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 517)]
+    #[expected_failure(abort_code = 517, location = AF)]
     fun freeze_no_freezing_bit(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         AF::freeze_account(&tc, @0x2);
@@ -85,14 +85,14 @@ module DiemFramework::AccountFreezingTests {
     }
 
     #[test(tc = @TreasuryCompliance, a = @0x2)]
-    #[expected_failure(abort_code = 257)]
+    #[expected_failure(abort_code = 257, location = DiemFramework::DiemTimestamp)]
     fun unfreeze_account_not_operating(tc: signer, a: signer) {
         AF::create_for_test(&a);
         AF::unfreeze_account(&tc, @0x2);
     }
 
     #[test(a = @0x2, tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 258)]
+    #[expected_failure(abort_code = 258, location = DiemFramework::CoreAddresses)]
     fun unfreeze_account_not_tc(a: signer, tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         AF::create_for_test(&a);
@@ -100,7 +100,7 @@ module DiemFramework::AccountFreezingTests {
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 517)]
+    #[expected_failure(abort_code = 517, location = AF)]
     fun unfreeze_no_freezing_bit(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         AF::unfreeze_account(&tc, @0x2);
diff --git a/language/documentation/examples/diem-framework/move-packages/DPN/tests/AccountLimits.move b/language/documentation/examples/diem-framework/move-packages/DPN/tests/AccountLimits.move
index 66789e2415..7201eeb88c 100644
--- a/language/documentation/examples/diem-framework/move-packages/DPN/tests/AccountLimits.move
+++ b/language/documentation/examples/diem-framework/move-packages/DPN/tests/AccountLimits.move
@@ -21,7 +21,7 @@ module DiemFramework::AccountLimitsTests {
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
     fun grant_mutation_capability_after_genesis(dr: signer, tc: signer, vasp: signer) {
         Genesis::setup(&dr, &tc);
 
@@ -34,7 +34,7 @@ module DiemFramework::AccountLimitsTests {
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
-    #[expected_failure(abort_code = 262)]
+    #[expected_failure(abort_code = 262, location = AccountLimits)]
     fun publish_window_twice(dr: signer, tc: signer, vasp: signer) {
         setup(&dr, &tc, &vasp);
 
@@ -42,21 +42,21 @@ module DiemFramework::AccountLimitsTests {
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
-    #[expected_failure(abort_code = 2)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
     fun publish_window_non_diem_root(dr: signer, tc: signer, vasp: signer) {
         setup(&dr, &tc, &vasp);
         AccountLimits::publish_window<XUS>(&vasp, &vasp, signer::address_of(&vasp));
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = AccountLimits)]
     fun publish_window_non_existent_limit_address(dr: signer, tc: signer, vasp: signer) {
         setup(&dr, &tc, &vasp);
         AccountLimits::publish_window<XUS>(&dr, &vasp, @0x42 /* non-exsistent */);
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
-    #[expected_failure(abort_code = 6)]
+    #[expected_failure(abort_code = 6, location = AccountLimits)]
     fun publish_unrestricted_limits_for_testing_twice(dr: signer, tc: signer, vasp: signer) {
         setup(&dr, &tc, &vasp);
         AccountLimits::publish_unrestricted_limits_for_testing<XUS>(&vasp);
@@ -110,7 +110,7 @@ module DiemFramework::AccountLimitsTests {
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
-    #[expected_failure(abort_code = 258)]
+    #[expected_failure(abort_code = 258, location = DiemFramework::CoreAddresses)]
     fun update_limits_definition_non_tc(dr: signer, tc: signer, vasp: signer) {
         setup(&dr, &tc, &vasp);
         AccountLimits::update_limits_definition<XUS>(
@@ -124,7 +124,7 @@ module DiemFramework::AccountLimitsTests {
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = AccountLimits)]
     fun update_limits_definition_non_exsistent(dr: signer, tc: signer, vasp: signer) {
         setup(&dr, &tc, &vasp);
         AccountLimits::update_limits_definition<XUS>(
@@ -162,7 +162,7 @@ module DiemFramework::AccountLimitsTests {
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vasp = @0x2)]
-    #[expected_failure(abort_code = 258)]
+    #[expected_failure(abort_code = 258, location = DiemFramework::CoreAddresses)]
     fun update_window_info_non_tc(dr: signer, tc: signer, vasp: signer) {
         setup(&dr, &tc, &vasp);
         let vasp_addr = signer::address_of(&vasp);
diff --git a/language/documentation/examples/diem-framework/move-packages/DPN/tests/AuthenticatorTests.move b/language/documentation/examples/diem-framework/move-packages/DPN/tests/AuthenticatorTests.move
index 8138ada6ed..c7633e3858 100644
--- a/language/documentation/examples/diem-framework/move-packages/DPN/tests/AuthenticatorTests.move
+++ b/language/documentation/examples/diem-framework/move-packages/DPN/tests/AuthenticatorTests.move
@@ -43,21 +43,21 @@ module DiemFramework::AuthenticatorTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 7)]
+    #[expected_failure(abort_code = 7, location = Authenticator)]
     fun empty_policy_should_be_rejected() {
         let keys = vector::empty<vector<u8>>();
         Authenticator::create_multi_ed25519(keys, 0);
     }
 
     #[test]
-    #[expected_failure(abort_code = 263)]
+    #[expected_failure(abort_code = 263, location = Authenticator)]
     fun bad_threshold_should_be_rejected_threshold_1_for_empty_keys() {
         let keys = vector::empty<vector<u8>>();
         Authenticator::create_multi_ed25519(keys, 1);
     }
 
     #[test]
-    #[expected_failure(abort_code = 519)]
+    #[expected_failure(abort_code = 519, location = Authenticator)]
     fun bad_threshold_should_be_rejected_threshold_3_for_34_keys() {
         let pubkey = x"";
 
@@ -72,7 +72,7 @@ module DiemFramework::AuthenticatorTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 263)]
+    #[expected_failure(abort_code = 263, location = Authenticator)]
     fun bad_threshold_should_be_rejected_threshold_2_for_1_key() {
         let keys = vector::empty<vector<u8>>();
         vector::push_back(
@@ -83,7 +83,7 @@ module DiemFramework::AuthenticatorTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 7)]
+    #[expected_failure(abort_code = 7, location = Authenticator)]
     fun bad_threshold_should_be_rejected_threshold_0_for_1_address() {
         let keys = vector::empty<vector<u8>>();
         vector::push_back(
diff --git a/language/documentation/examples/diem-framework/move-packages/DPN/tests/CRSNTests.move b/language/documentation/examples/diem-framework/move-packages/DPN/tests/CRSNTests.move
index bfd87cd8f9..62a37f7a8d 100644
--- a/language/documentation/examples/diem-framework/move-packages/DPN/tests/CRSNTests.move
+++ b/language/documentation/examples/diem-framework/move-packages/DPN/tests/CRSNTests.move
@@ -12,14 +12,14 @@ module DiemFramework::CRSNTests {
     }
 
     #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 1281)]
+    #[expected_failure(abort_code = 1281, location = CRSN)]
     public fun cant_publish_until_init(a: signer, tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         CRSN::test_publish(&a, 0, 10);
     }
 
     #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 1537)]
+    #[expected_failure(abort_code = 1537, location = CRSN)]
     public fun double_init(a: signer, tc: signer, dr: signer) {
         setup(&dr, &tc, &a);
         CRSN::allow_crsns(&dr);
@@ -60,7 +60,7 @@ module DiemFramework::CRSNTests {
 
 
     #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 257)]
+    #[expected_failure(abort_code = 257, location = CRSN)]
     public fun double_publish(a: signer, tc: signer, dr: signer) {
         setup(&dr, &tc, &a);
         CRSN::test_publish(&a, 0, 10);
@@ -68,7 +68,7 @@ module DiemFramework::CRSNTests {
     }
 
     #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 519)]
+    #[expected_failure(abort_code = 519, location = CRSN)]
     public fun publish_zero_size(a: signer, tc: signer, dr: signer) {
         setup(&dr, &tc, &a);
         CRSN::test_publish(&a, 10, 0);
@@ -81,7 +81,7 @@ module DiemFramework::CRSNTests {
     }
 
     #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 775)]
+    #[expected_failure(abort_code = 775, location = CRSN)]
     public fun publish_above_max_size(a: signer, tc: signer, dr: signer) {
         setup(&dr, &tc, &a);
         CRSN::test_publish(&a, 10, CRSN::max_crsn_size() + 1);
@@ -97,7 +97,7 @@ module DiemFramework::CRSNTests {
     }
 
     #[test(a=@0xCAFE)]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location = CRSN)]
     public fun record_no_crsn(a: signer) {
         CRSN::test_record(&a, 0);
     }
@@ -171,7 +171,7 @@ module DiemFramework::CRSNTests {
     }
 
     #[test(a=@0xCAFE, tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 1031)]
+    #[expected_failure(abort_code = 1031, location = CRSN)]
     public fun force_expire_zero(a: signer, tc: signer, dr: signer) {
         setup(&dr, &tc, &a);
         CRSN::test_publish(&a, 100, 10);
diff --git a/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemBlockTests.move b/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemBlockTests.move
index b2786df976..2f5e1bf91d 100644
--- a/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemBlockTests.move
+++ b/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemBlockTests.move
@@ -5,7 +5,7 @@ module DiemFramework::DiemBlockTests {
 
     // TODO: the error code doesn't seem correct, juding by the name of the test.
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot, account = @0x100)]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
     fun invalid_initialization_address(account: signer, tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         DiemBlock::initialize_block_metadata(&account);
diff --git a/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemConfigTests.move b/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemConfigTests.move
index 7dd6fb463a..b648390932 100644
--- a/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemConfigTests.move
+++ b/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemConfigTests.move
@@ -4,34 +4,34 @@ module DiemFramework::OnChainConfigTests {
     use DiemFramework::Genesis;
 
     #[test(account = @0x1)]
-    #[expected_failure(abort_code = 2)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
     fun init_before_genesis(account: signer) {
         DiemConfig::initialize(&account);
     }
 
     #[test(account = @0x2, tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
     fun invalid_address_init(account: signer, tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         DiemConfig::initialize(&account);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 261)]
+    #[expected_failure(abort_code = 261, location = DiemConfig)]
     fun invalid_get(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         DiemConfig::get<u64>();
     }
 
     #[test(account = @0x1, tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 516)]
+    #[expected_failure(abort_code = 516, location = DiemConfig)]
     fun invalid_set(account: signer, tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         DiemConfig::set_for_testing(&account, 0);
     }
 
     #[test(account = @0x1, tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 2)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
     fun invalid_publish(account: signer, tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         DiemConfig::publish_new_config_for_testing(&account, 0);
diff --git a/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemTests.move b/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemTests.move
index 72637ec63b..59b3f37195 100644
--- a/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemTests.move
+++ b/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemTests.move
@@ -39,7 +39,7 @@ module DiemFramework::DiemTests {
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
     fun cannot_initialize_after_genesis(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
 
diff --git a/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemTimestampTests.move b/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemTimestampTests.move
index 9379eab3cb..189e8f35f3 100644
--- a/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemTimestampTests.move
+++ b/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemTimestampTests.move
@@ -10,7 +10,7 @@ module DiemFramework::DiemTimestampTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 2)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
     fun set_time_has_started_non_dr_pre_genesis() {
         let s = get_signer();
         DiemTimestamp::set_time_has_started_for_testing(&s);
@@ -22,14 +22,14 @@ module DiemFramework::DiemTimestampTests {
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance)]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location = DiemTimestamp)]
     fun set_time_has_started_dr_post_genesis(dr: signer, tc: signer) {
         Genesis::setup(&dr, &tc);
         DiemTimestamp::set_time_has_started_for_testing(&dr);
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance)]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location = DiemTimestamp)]
     fun set_time_has_started_non_dr_post_genesis(dr: signer, tc: signer) {
         Genesis::setup(&dr, &tc);
         let s = get_signer();
@@ -37,14 +37,14 @@ module DiemFramework::DiemTimestampTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 257)]
+    #[expected_failure(abort_code = 257, location = DiemTimestamp)]
     fun update_global_time_pre_genesis() {
         let s = get_signer();
         DiemTimestamp::update_global_time(&s, @0x0, 0);
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance)]
-    #[expected_failure(abort_code = 514)]
+    #[expected_failure(abort_code = 514, location = DiemFramework::CoreAddresses)]
     fun update_global_time_post_genesis_non_vm(dr: signer, tc: signer) {
         Genesis::setup(&dr, &tc);
         DiemTimestamp::update_global_time(&dr, @0x1, 0);
@@ -59,7 +59,7 @@ module DiemFramework::DiemTimestampTests {
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vm = @VMReserved)]
-    #[expected_failure(abort_code = 519)]
+    #[expected_failure(abort_code = 519, location = DiemTimestamp)]
     fun update_global_time_post_genesis_vm_nil_proposer_increasing_timestamp(dr: signer, tc: signer, vm: signer) {
         Genesis::setup(&dr, &tc);
         assert!(DiemTimestamp::now_microseconds() == 0, 0);
@@ -67,7 +67,7 @@ module DiemFramework::DiemTimestampTests {
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance, vm = @VMReserved)]
-    #[expected_failure(abort_code = 519)]
+    #[expected_failure(abort_code = 519, location = DiemTimestamp)]
     fun update_global_time_post_genesis_vm_not_nil_proposer_equal_timestamp(dr: signer, tc: signer, vm: signer) {
         Genesis::setup(&dr, &tc);
         assert!(DiemTimestamp::now_microseconds() == 0, 0);
@@ -83,7 +83,7 @@ module DiemFramework::DiemTimestampTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 257)]
+    #[expected_failure(abort_code = 257, location = DiemTimestamp)]
     fun now_microseconds_pre_genesis() {
         DiemTimestamp::now_microseconds();
     }
@@ -95,7 +95,7 @@ module DiemFramework::DiemTimestampTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 257)]
+    #[expected_failure(abort_code = 257, location = DiemTimestamp)]
     fun now_seconds_pre_genesis() {
         DiemTimestamp::now_seconds();
     }
@@ -115,7 +115,7 @@ module DiemFramework::DiemTimestampTests {
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance)]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location = DiemTimestamp)]
     fun assert_genesis(dr: signer, tc: signer) {
         Genesis::setup(&dr, &tc);
         DiemTimestamp::assert_genesis();
@@ -130,7 +130,7 @@ module DiemFramework::DiemTimestampTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 257)]
+    #[expected_failure(abort_code = 257, location = DiemTimestamp)]
     fun assert_operating() {
         DiemTimestamp::assert_operating();
     }
diff --git a/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemVersionTests.move b/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemVersionTests.move
index 6d43862522..41bdfa0489 100644
--- a/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemVersionTests.move
+++ b/language/documentation/examples/diem-framework/move-packages/DPN/tests/DiemVersionTests.move
@@ -4,33 +4,33 @@ module DiemFramework::DiemVersionTests {
     use DiemFramework::Genesis;
 
     #[test(account = @0x1)]
-    #[expected_failure(abort_code = 2)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
     fun init_before_genesis(account: signer) {
         DiemVersion::initialize(&account, 0);
     }
 
     #[test(account = @0x1)]
-    #[expected_failure(abort_code = 257)]
+    #[expected_failure(abort_code = 257, location = DiemFramework::DiemTimestamp)]
     fun set_before_genesis(account: signer) {
         DiemVersion::set(&account, 0);
     }
 
     #[test(account = @0x2, tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
     fun invalid_address_init(account: signer, tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         DiemVersion::initialize(&account, 0);
     }
 
     #[test(account = @0x2, tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 2)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
     fun invalid_setting_address(account: signer, tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         DiemVersion::set(&account, 0);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 7)]
+    #[expected_failure(abort_code = 7, location = DiemVersion)]
     fun non_increasing_version(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         DiemVersion::set(&dr, 0);
diff --git a/language/documentation/examples/diem-framework/move-packages/DPN/tests/RegisteredCurrencyTests.move b/language/documentation/examples/diem-framework/move-packages/DPN/tests/RegisteredCurrencyTests.move
index 7a2d28bfc4..35ad26c30a 100644
--- a/language/documentation/examples/diem-framework/move-packages/DPN/tests/RegisteredCurrencyTests.move
+++ b/language/documentation/examples/diem-framework/move-packages/DPN/tests/RegisteredCurrencyTests.move
@@ -4,21 +4,21 @@ module DiemFramework::RegisteredCurrencyTests {
     use DiemFramework::Genesis;
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance, alice = @0x2)]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
     fun cannot_call_initialize_as_non_diem_root(dr: signer, tc: signer, alice: signer) {
         Genesis::setup(&dr, &tc);
         RegisteredCurrencies::initialize(&alice);
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance)]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
     fun cannot_call_initialize_outside_genesis(dr: signer, tc: signer) {
         Genesis::setup(&dr, &tc);
         RegisteredCurrencies::initialize(&dr);
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance)]
-    #[expected_failure(abort_code = 7)]
+    #[expected_failure(abort_code = 7, location = RegisteredCurrencies)]
     fun cannot_add_currency_whose_currency_code_has_already_been_taken(dr: signer, tc: signer) {
         Genesis::setup(&dr, &tc);
         RegisteredCurrencies::add_currency_code(&dr, b"XDX");
diff --git a/language/documentation/examples/diem-framework/move-packages/DPN/tests/RolesTests.move b/language/documentation/examples/diem-framework/move-packages/DPN/tests/RolesTests.move
index f64660d8a9..41c020468a 100644
--- a/language/documentation/examples/diem-framework/move-packages/DPN/tests/RolesTests.move
+++ b/language/documentation/examples/diem-framework/move-packages/DPN/tests/RolesTests.move
@@ -11,20 +11,20 @@ module DiemFramework::RolesTests{
     }
 
     #[test]
-    #[expected_failure(abort_code = 2)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
     fun grant_diem_root_wrong_addr_pre_genesis() {
         let account = get_account();
         Roles::grant_diem_root_role(&account);
     }
 
     #[test(tc = @TreasuryCompliance)]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = Roles)]
     fun tc_dne_pre_genesis(tc: signer) {
         Roles::assert_treasury_compliance(&tc);
     }
 
     #[test(dr = @DiemRoot)]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = Roles)]
     fun dr_dne_pre_genesis(dr: signer) {
         Roles::assert_diem_root(&dr);
     }
@@ -40,21 +40,21 @@ module DiemFramework::RolesTests{
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 2)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
     fun tc_is_not_dr(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         Roles::assert_diem_root(&tc);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 258)]
+    #[expected_failure(abort_code = 258, location = DiemFramework::CoreAddresses)]
     fun dr_is_not_tc(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         Roles::assert_treasury_compliance(&dr);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
     fun grant_diem_root_wrong_addr_post_genesis(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let account = get_account();
@@ -62,21 +62,21 @@ module DiemFramework::RolesTests{
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
     fun grant_diem_root_correct_addr_post_genesis(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         Roles::grant_diem_root_role(&dr);
     }
 
     #[test]
-    #[expected_failure(abort_code = 258)]
+    #[expected_failure(abort_code = 258, location = DiemFramework::CoreAddresses)]
     fun grant_treasury_compliance_wrong_addr_pre_genesis() {
         let account = get_account();
         Roles::grant_treasury_compliance_role(&account, &account);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
     fun grant_treasury_compliance_wrong_addr_post_genesis(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let account = get_account();
@@ -84,35 +84,35 @@ module DiemFramework::RolesTests{
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
     fun grant_treasury_compliance_wrong_granting_addr_post_genesis(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         Roles::grant_treasury_compliance_role(&tc, &tc);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
     fun grant_treasury_compliance_correct_addrs(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         Roles::grant_treasury_compliance_role(&dr, &tc);
     }
 
     #[test]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = Roles)]
     fun designated_dealer_role_dne() {
         let account = get_account();
         Roles::assert_designated_dealer(&account);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 1539)]
+    #[expected_failure(abort_code = 1539, location = Roles)]
     fun designated_dealer_assert_wrong_role(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         Roles::assert_designated_dealer(&tc);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 258)]
+    #[expected_failure(abort_code = 258, location = DiemFramework::CoreAddresses)]
     fun grant_dd_role_non_tc_granter(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let account = get_account();
@@ -131,7 +131,7 @@ module DiemFramework::RolesTests{
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 6)]
+    #[expected_failure(abort_code = 6, location = Roles)]
     fun double_grant_dd_role_tc_granter(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let account = get_account();
@@ -140,21 +140,21 @@ module DiemFramework::RolesTests{
     }
 
     #[test]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = Roles)]
     fun validator_role_dne() {
         let account = get_account();
         Roles::assert_validator(&account);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 1795)]
+    #[expected_failure(abort_code = 1795, location = Roles)]
     fun validator_assert_wrong_role(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         Roles::assert_validator(&tc);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 2)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
     fun grant_validator_role_non_dr_granter(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let account = get_account();
@@ -172,7 +172,7 @@ module DiemFramework::RolesTests{
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 6)]
+    #[expected_failure(abort_code = 6, location = Roles)]
     fun double_grant_validator_role_dr_granter(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let account = get_account();
@@ -181,21 +181,21 @@ module DiemFramework::RolesTests{
     }
 
     #[test]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = Roles)]
     fun validator_operator_role_dne() {
         let account = get_account();
         Roles::assert_validator_operator(&account);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 2051)]
+    #[expected_failure(abort_code = 2051, location = Roles)]
     fun validator_operator_assert_wrong_role(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         Roles::assert_validator_operator(&tc);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 2)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
     fun grant_validator_operator_role_non_dr_granter(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let account = get_account();
@@ -213,7 +213,7 @@ module DiemFramework::RolesTests{
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 6)]
+    #[expected_failure(abort_code = 6, location = Roles)]
     fun double_grant_validator_operator_role_dr_granter(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let account = get_account();
@@ -222,14 +222,14 @@ module DiemFramework::RolesTests{
     }
 
     #[test]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = Roles)]
     fun parent_vasp_role_dne() {
         let account = get_account();
         Roles::assert_parent_vasp_role(&account);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 258)]
+    #[expected_failure(abort_code = 258, location = DiemFramework::CoreAddresses)]
     fun grant_parent_vasp_role_non_tc_granter(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let account = get_account();
@@ -249,7 +249,7 @@ module DiemFramework::RolesTests{
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 6)]
+    #[expected_failure(abort_code = 6, location = Roles)]
     fun double_grant_parent_vasp_role_tc_granter(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let account = get_account();
@@ -258,14 +258,14 @@ module DiemFramework::RolesTests{
     }
 
     #[test]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = Roles)]
     fun child_vasp_role_dne() {
         let account = get_account();
         Roles::assert_child_vasp_role(&account);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 2307)]
+    #[expected_failure(abort_code = 2307, location = Roles)]
     fun child_vasp_assert_wrong_role(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let account = get_account();
@@ -274,7 +274,7 @@ module DiemFramework::RolesTests{
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 771)]
+    #[expected_failure(abort_code = 771, location = Roles)]
     fun grant_child_vasp_role_non_parent_vasp_granter(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let account = get_account();
@@ -297,7 +297,7 @@ module DiemFramework::RolesTests{
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 6)]
+    #[expected_failure(abort_code = 6, location = Roles)]
     fun double_grant_child_vasp_role_tc_granter(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let (account, pvasp) = {
@@ -361,21 +361,21 @@ module DiemFramework::RolesTests{
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = Roles)]
     fun get_role_id_no_role(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         Roles::get_role_id(@0x1);
     }
 
     #[test]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = Roles)]
     fun assert_parent_or_designated_dealer_role_dne() {
         let account = get_account();
         Roles::assert_parent_vasp_or_designated_dealer(&account);
     }
 
     #[test]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = Roles)]
     fun assert_parent_or_child_role_dne() {
         let account = get_account();
         Roles::assert_parent_vasp_or_child_vasp(&account);
diff --git a/language/documentation/examples/diem-framework/move-packages/DPN/tests/SharedEd25519PublicKeyTests.move b/language/documentation/examples/diem-framework/move-packages/DPN/tests/SharedEd25519PublicKeyTests.move
index 20c01359d8..310aa1dd8c 100644
--- a/language/documentation/examples/diem-framework/move-packages/DPN/tests/SharedEd25519PublicKeyTests.move
+++ b/language/documentation/examples/diem-framework/move-packages/DPN/tests/SharedEd25519PublicKeyTests.move
@@ -49,7 +49,7 @@ module DiemFramework::SharedEd25519PublicKeyTests {
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance, account = @0x100)]
-    #[expected_failure(abort_code = 261)]
+    #[expected_failure(abort_code = 261, location = SharedEd25519PublicKey)]
     fun get_key_for_non_shared_account_should_fail(dr: signer, tc: signer, account: signer) {
         setup(&dr, &tc, &account);
 
@@ -57,7 +57,7 @@ module DiemFramework::SharedEd25519PublicKeyTests {
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance, account = @0x100)]
-    #[expected_failure(abort_code = 7)]
+    #[expected_failure(abort_code = 7, location = SharedEd25519PublicKey)]
     fun publish_key_with_bad_length_1(dr: signer, tc: signer, account: signer) {
         setup(&dr, &tc, &account);
 
@@ -66,7 +66,7 @@ module DiemFramework::SharedEd25519PublicKeyTests {
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance, account = @0x100)]
-    #[expected_failure(abort_code = 7)]
+    #[expected_failure(abort_code = 7, location = SharedEd25519PublicKey)]
     fun publish_key_with_bad_length_2(dr: signer, tc: signer, account: signer) {
         setup(&dr, &tc, &account);
 
@@ -75,7 +75,7 @@ module DiemFramework::SharedEd25519PublicKeyTests {
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance, account = @0x100)]
-    #[expected_failure(abort_code = 7)]
+    #[expected_failure(abort_code = 7, location = SharedEd25519PublicKey)]
     fun rotate_to_key_with_bad_length(dr: signer, tc: signer, account: signer) {
         setup(&dr, &tc, &account);
 
@@ -88,7 +88,7 @@ module DiemFramework::SharedEd25519PublicKeyTests {
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance, account = @0x100)]
-    #[expected_failure(abort_code = 7)]
+    #[expected_failure(abort_code = 7, location = SharedEd25519PublicKey)]
     fun rotate_to_key_with_good_length_but_bad_contents(dr: signer, tc: signer, account: signer) {
         setup(&dr, &tc, &account);
 
@@ -100,7 +100,7 @@ module DiemFramework::SharedEd25519PublicKeyTests {
     }
 
     #[test(dr = @DiemRoot, tc = @TreasuryCompliance, account = @0x100)]
-    #[expected_failure(abort_code = 261)]
+    #[expected_failure(abort_code = 261, location = SharedEd25519PublicKey)]
     fun rotate_key_on_non_shared_account(dr: signer, tc: signer, account: signer) {
         setup(&dr, &tc, &account);
 
diff --git a/language/documentation/examples/diem-framework/move-packages/DPN/tests/TransactionFeeTests.move b/language/documentation/examples/diem-framework/move-packages/DPN/tests/TransactionFeeTests.move
index 5c543b8413..deb26c34c0 100644
--- a/language/documentation/examples/diem-framework/move-packages/DPN/tests/TransactionFeeTests.move
+++ b/language/documentation/examples/diem-framework/move-packages/DPN/tests/TransactionFeeTests.move
@@ -4,14 +4,14 @@ module DiemFramework::TransactionFeeTests {
     use DiemFramework::Genesis;
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
     fun cannot_initialize_after_genesis(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         TransactionFee::initialize(&tc);
     }
 
     #[test(account = @0x100)]
-    #[expected_failure(abort_code = 258)]
+    #[expected_failure(abort_code = 258, location = DiemFramework::CoreAddresses)]
     fun cannot_initialize_as_non_tc(account: signer) {
         TransactionFee::initialize(&account);
     }
diff --git a/language/documentation/examples/diem-framework/move-packages/DPN/tests/ValidatorConfigTests.move b/language/documentation/examples/diem-framework/move-packages/DPN/tests/ValidatorConfigTests.move
index b6eea1d436..b46e9d2813 100644
--- a/language/documentation/examples/diem-framework/move-packages/DPN/tests/ValidatorConfigTests.move
+++ b/language/documentation/examples/diem-framework/move-packages/DPN/tests/ValidatorConfigTests.move
@@ -16,14 +16,14 @@ module DiemFramework::ValidatorConfigTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 257)]
+    #[expected_failure(abort_code = 257, location = DiemFramework::DiemTimestamp)]
     fun publish_pre_genesis() {
         let s = signer_at(0);
         VC::publish(&s, &s, x"");
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 2)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
     fun publish_post_genesis_non_dr(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let s = signer_at(0);
@@ -31,7 +31,7 @@ module DiemFramework::ValidatorConfigTests {
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = DiemFramework::Roles)]
     fun publish_post_genesis_non_validator(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let s = signer_at(0);
@@ -47,7 +47,7 @@ module DiemFramework::ValidatorConfigTests {
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 6)]
+    #[expected_failure(abort_code = 6, location = VC)]
     fun publish_post_genesis_double_publish(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let s = signer_at(0);
@@ -57,14 +57,14 @@ module DiemFramework::ValidatorConfigTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = DiemFramework::Roles)]
     fun set_operator_not_validator() {
         let s = signer_at(0);
         VC::set_operator(&s, @0x1);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 775)]
+    #[expected_failure(abort_code = 775, location = VC)]
     fun set_operator_not_operator(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let s = signer_at(0);
@@ -73,7 +73,7 @@ module DiemFramework::ValidatorConfigTests {
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = DiemFramework::Roles)]
     fun set_operator_no_validator_config_has_role(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let validator = signer_at(0);
@@ -105,14 +105,14 @@ module DiemFramework::ValidatorConfigTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = DiemFramework::Roles)]
     fun remove_operator_not_validator() {
         let s = signer_at(0);
         VC::remove_operator(&s);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = VC)]
     fun remove_operator_no_config(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let s = signer_at(0);
@@ -121,7 +121,7 @@ module DiemFramework::ValidatorConfigTests {
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 7)]
+    #[expected_failure(abort_code = 7, location = VC)]
     fun remove_operator_correct(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let validator = signer_at(0);
@@ -135,7 +135,7 @@ module DiemFramework::ValidatorConfigTests {
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 263)]
+    #[expected_failure(abort_code = 263, location = VC)]
     fun set_config_operator_neq_operator(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let validator = signer_at(0);
@@ -147,7 +147,7 @@ module DiemFramework::ValidatorConfigTests {
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 519)]
+    #[expected_failure(abort_code = 519, location = VC)]
     fun set_config_invalid_consensus_pubkey(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let validator = signer_at(0);
@@ -175,13 +175,13 @@ module DiemFramework::ValidatorConfigTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = VC)]
     fun get_config_not_validator() {
         VC::get_config(@0x1);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 7)]
+    #[expected_failure(abort_code = 7, location = VC)]
     fun get_config_not_set(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let validator = signer_at(0);
@@ -192,19 +192,19 @@ module DiemFramework::ValidatorConfigTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = VC)]
     fun get_human_name_not_validator() {
         VC::get_human_name(@0x1);
     }
 
     #[test]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = VC)]
     fun get_operator_not_validator() {
         VC::get_operator(@0x1);
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 7)]
+    #[expected_failure(abort_code = 7, location = VC)]
     fun get_operator_not_set(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let validator = signer_at(0);
diff --git a/language/documentation/examples/diem-framework/move-packages/DPN/tests/ValidatorOperatorConfigTests.move b/language/documentation/examples/diem-framework/move-packages/DPN/tests/ValidatorOperatorConfigTests.move
index dfe703d7b7..9ce2c05a91 100644
--- a/language/documentation/examples/diem-framework/move-packages/DPN/tests/ValidatorOperatorConfigTests.move
+++ b/language/documentation/examples/diem-framework/move-packages/DPN/tests/ValidatorOperatorConfigTests.move
@@ -12,14 +12,14 @@ module DiemFramework::ValidatorOperatorConfigTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 257)]
+    #[expected_failure(abort_code = 257, location = DiemFramework::DiemTimestamp)]
     fun publish_pre_genesis() {
         let s = get_signer();
         VOC::publish(&s, &s, x"");
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 2)]
+    #[expected_failure(abort_code = 2, location = DiemFramework::CoreAddresses)]
     fun publish_post_genesis_non_dr(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let s = get_signer();
@@ -27,7 +27,7 @@ module DiemFramework::ValidatorOperatorConfigTests {
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = DiemFramework::Roles)]
     fun publish_post_genesis_non_validator_operator(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let s = get_signer();
@@ -44,7 +44,7 @@ module DiemFramework::ValidatorOperatorConfigTests {
     }
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot)]
-    #[expected_failure(abort_code = 6)]
+    #[expected_failure(abort_code = 6, location = VOC)]
     fun publish_post_genesis_double_publish(tc: signer, dr: signer) {
         Genesis::setup(&dr, &tc);
         let s = get_signer();
@@ -54,7 +54,7 @@ module DiemFramework::ValidatorOperatorConfigTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 5, location = VOC)]
     fun get_human_name_not_validator_operator() {
         VOC::get_human_name(@0x1);
     }
diff --git a/language/documentation/examples/diem-framework/move-packages/DPN/tests/XUSTests.move b/language/documentation/examples/diem-framework/move-packages/DPN/tests/XUSTests.move
index 950a86a9ce..e69b265aa8 100644
--- a/language/documentation/examples/diem-framework/move-packages/DPN/tests/XUSTests.move
+++ b/language/documentation/examples/diem-framework/move-packages/DPN/tests/XUSTests.move
@@ -4,7 +4,7 @@ module DiemFramework::XUSTests {
     use DiemFramework::Genesis;
 
     #[test(tc = @TreasuryCompliance, dr = @DiemRoot, account = @0x100)]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location = DiemFramework::DiemTimestamp)]
     fun cannot_recreate_market_cap(tc: signer, dr: signer, account: signer) {
         Genesis::setup(&dr, &tc);
         XUS::initialize(&account, &account);
diff --git a/language/documentation/examples/diem-framework/move-packages/experimental/sources/Vote.move b/language/documentation/examples/diem-framework/move-packages/experimental/sources/Vote.move
index dd965d4d15..b3f55c9e0f 100644
--- a/language/documentation/examples/diem-framework/move-packages/experimental/sources/Vote.move
+++ b/language/documentation/examples/diem-framework/move-packages/experimental/sources/Vote.move
@@ -329,6 +329,7 @@ module ExperimentalFramework::Vote {
         let removed_ballots = vector::empty();
         while ({
             spec {
+                invariant unique_ballots(ballots);
                 invariant no_expired_ballots(ballots, DiemTimestamp::spec_now_seconds(), i);
                 invariant vector_subset(ballots, old(ballot_data).ballots);
                 invariant i <= len(ballots);
diff --git a/language/documentation/examples/diem-framework/move-packages/experimental/tests/VoteTests.move b/language/documentation/examples/diem-framework/move-packages/experimental/tests/VoteTests.move
index 0584ae24da..af62356ea1 100644
--- a/language/documentation/examples/diem-framework/move-packages/experimental/tests/VoteTests.move
+++ b/language/documentation/examples/diem-framework/move-packages/experimental/tests/VoteTests.move
@@ -102,7 +102,7 @@ module ExperimentalFramework::VoteTests {
     }
 
     #[test(dr = @CoreResources)]
-    #[expected_failure(abort_code = 263)]
+    #[expected_failure(abort_code = 263, location = Vote)]
     fun create_ballot_expired_timestamp(dr: signer) {
         let (proposer, _, addr_bcs) = ballot_setup(&dr);
         Vote::create_ballot(
@@ -174,7 +174,7 @@ module ExperimentalFramework::VoteTests {
     // TODO: test disabled due to timeout
     /*
         #[test(dr = @CoreResources)]
-        #[expected_failure(abort_code = 520)]
+        #[expected_failure(abort_code = 520, location = Vote)]
         fun create_ballots_too_many(dr: signer) {
             let (proposer, _, addr_bcs) = ballot_setup(&dr);
             let i = 0;
@@ -196,7 +196,7 @@ module ExperimentalFramework::VoteTests {
     */
 
     #[test(dr = @CoreResources)]
-    #[expected_failure(abort_code = 769)]
+    #[expected_failure(abort_code = 769, location = Vote)]
     fun remove_ballot(dr: signer) {
         let (voter1, _voter2, _voter3, ballot_id, proposal) = vote_test_helper(&dr, 10);
         Vote::remove_ballot_internal<TestProposal>(get_proposer(), *(&ballot_id));
@@ -205,7 +205,7 @@ module ExperimentalFramework::VoteTests {
     }
 
     #[test(dr = @CoreResources)]
-    #[expected_failure(abort_code = 769)]
+    #[expected_failure(abort_code = 769, location = Vote)]
     fun vote_simple(dr: signer) {
         let (voter1, voter2, voter3, ballot_id, proposal) = vote_test_helper(&dr, 10);
         // First vote does not approve the ballot
@@ -245,7 +245,7 @@ module ExperimentalFramework::VoteTests {
     }
 
     #[test(dr = @CoreResources)]
-    #[expected_failure(abort_code = 263)]
+    #[expected_failure(abort_code = 263, location = Vote)]
     fun vote_expired_ts(dr: signer) {
         let (voter1, _voter2, _voter3, ballot_id, proposal) = vote_test_helper(&dr, 0);
         // Ballot has expired
@@ -253,7 +253,7 @@ module ExperimentalFramework::VoteTests {
     }
 
     #[test(dr = @CoreResources)]
-    #[expected_failure(abort_code = 2049)]
+    #[expected_failure(abort_code = 2049, location = Vote)]
     fun vote_repeat(dr: signer) {
         let (voter1, _voter2, _voter3, ballot_id, proposal) = vote_test_helper(&dr, 10);
         // First vote does not approve the ballot
@@ -263,7 +263,7 @@ module ExperimentalFramework::VoteTests {
     }
 
     #[test(dr = @CoreResources)]
-    #[expected_failure(abort_code = 1031)]
+    #[expected_failure(abort_code = 1031, location = Vote)]
     fun vote_invalid_proposal_type(dr: signer) {
         let (voter1, _voter2, _voter3, ballot_id, proposal) = vote_test_helper(&dr, 10);
         // Invalid proposal type
@@ -271,7 +271,7 @@ module ExperimentalFramework::VoteTests {
     }
 
     #[test(dr = @CoreResources)]
-    #[expected_failure(abort_code = 1031)]
+    #[expected_failure(abort_code = 1031, location = Vote)]
     fun vote_invalid_proposal(dr: signer) {
         let (voter1, _voter2, _voter3, ballot_id, _proposal) = vote_test_helper(&dr, 10);
         let invalid_proposal = TestProposal {
@@ -282,7 +282,7 @@ module ExperimentalFramework::VoteTests {
     }
 
     #[test(dr = @CoreResources)]
-    #[expected_failure(abort_code = 769)]
+    #[expected_failure(abort_code = 769, location = Vote)]
     fun vote_invalid_ballotid(dr: signer) {
         let proposer = get_proposer();
         let (voter1, _voter2, _voter3, _ballot_id, proposal) = vote_test_helper(&dr, 10);
@@ -292,7 +292,7 @@ module ExperimentalFramework::VoteTests {
     }
 
     #[test(dr = @CoreResources)]
-    #[expected_failure(abort_code = 1281)]
+    #[expected_failure(abort_code = 1281, location = Vote)]
     fun vote_invalid_voter(dr: signer) {
         let (_voter1, _voter2, _voter3, ballot_id, proposal) = vote_test_helper(&dr, 10);
         let invalid_voter = vector::pop_back(&mut unit_test::create_signers_for_testing(4));
diff --git a/language/documentation/examples/diem-framework/prove_all.sh b/language/documentation/examples/diem-framework/prove_all.sh
index bf3c64939c..d5ed1a864d 100755
--- a/language/documentation/examples/diem-framework/prove_all.sh
+++ b/language/documentation/examples/diem-framework/prove_all.sh
@@ -5,6 +5,6 @@
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-cd "${SCRIPT_DIR}/move-packages/DPN" && cargo run -p df-cli -- package prove &&
-cd "${SCRIPT_DIR}/move-packages/core" && cargo run -p df-cli -- package prove &&
-cd "${SCRIPT_DIR}/move-packages/experimental" && cargo run -p df-cli -- package prove
+cd "${SCRIPT_DIR}/move-packages/DPN" && cargo run -p df-cli -- prove &&
+cd "${SCRIPT_DIR}/move-packages/core" && cargo run -p df-cli -- prove &&
+cd "${SCRIPT_DIR}/move-packages/experimental" && cargo run -p df-cli -- prove
diff --git a/language/documentation/examples/diem-framework/test_all.sh b/language/documentation/examples/diem-framework/test_all.sh
index ff78267b8c..d82ab2ce3e 100755
--- a/language/documentation/examples/diem-framework/test_all.sh
+++ b/language/documentation/examples/diem-framework/test_all.sh
@@ -5,6 +5,6 @@
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-cd "${SCRIPT_DIR}/move-packages/DPN" && cargo run -p df-cli -- package test &&
-cd "${SCRIPT_DIR}/move-packages/core" && cargo run -p df-cli -- package test &&
-cd "${SCRIPT_DIR}/move-packages/experimental" && cargo run -p df-cli -- package test
+cd "${SCRIPT_DIR}/move-packages/DPN" && cargo run -p df-cli -- test &&
+cd "${SCRIPT_DIR}/move-packages/core" && cargo run -p df-cli -- test &&
+cd "${SCRIPT_DIR}/move-packages/experimental" && cargo run -p df-cli -- test
diff --git a/language/documentation/examples/experimental/basic-coin/sources/BasicCoin.move b/language/documentation/examples/experimental/basic-coin/sources/BasicCoin.move
index a6aa8d2008..07afeca9a6 100644
--- a/language/documentation/examples/experimental/basic-coin/sources/BasicCoin.move
+++ b/language/documentation/examples/experimental/basic-coin/sources/BasicCoin.move
@@ -1,6 +1,6 @@
 /// This module defines a minimal and generic Coin and Balance.
 module BasicCoin::BasicCoin {
-    use std::errors;
+    use std::error;
     use std::signer;
 
     /// Error codes
@@ -20,7 +20,7 @@ module BasicCoin::BasicCoin {
 
     public fun publish_balance<CoinType>(account: &signer) {
         let empty_coin = Coin<CoinType> { value: 0 };
-        assert!(!exists<Balance<CoinType>>(signer::address_of(account)), errors::already_published(EALREADY_HAS_BALANCE));
+        assert!(!exists<Balance<CoinType>>(signer::address_of(account)), error::already_exists(EALREADY_HAS_BALANCE));
         move_to(account, Balance<CoinType> { coin:  empty_coin });
     }
 
diff --git a/language/documentation/examples/experimental/coin-swap/sources/CoinSwap.move b/language/documentation/examples/experimental/coin-swap/sources/CoinSwap.move
index 6d92a57a5b..e97b7112ad 100644
--- a/language/documentation/examples/experimental/coin-swap/sources/CoinSwap.move
+++ b/language/documentation/examples/experimental/coin-swap/sources/CoinSwap.move
@@ -1,6 +1,6 @@
 module CoinSwap::CoinSwap {
     use std::signer;
-    use std::errors;
+    use std::error;
     use BasicCoin::BasicCoin;
     use CoinSwap::PoolToken;
 
@@ -27,8 +27,8 @@ module CoinSwap::CoinSwap {
         // TODO: Alternatively, `struct LiquidityPool` could be refactored to actually hold the coin (e.g., coin1: CoinType1).
         BasicCoin::publish_balance<CoinType1>(coinswap);
         BasicCoin::publish_balance<CoinType2>(coinswap);
-        assert!(signer::address_of(coinswap) == @CoinSwap, errors::invalid_argument(ECOINSWAP_ADDRESS));
-        assert!(!exists<LiquidityPool<CoinType1, CoinType2>>(signer::address_of(coinswap)), errors::already_published(EPOOL));
+        assert!(signer::address_of(coinswap) == @CoinSwap, error::invalid_argument(ECOINSWAP_ADDRESS));
+        assert!(!exists<LiquidityPool<CoinType1, CoinType2>>(signer::address_of(coinswap)), error::already_exists(EPOOL));
         move_to(coinswap, LiquidityPool<CoinType1, CoinType2>{coin1, coin2, share});
 
         // Transfer the initial liquidity of CoinType1 and CoinType2 to the pool under @CoinSwap.
@@ -53,8 +53,8 @@ module CoinSwap::CoinSwap {
         witness1: CoinType1,
         witness2: CoinType2
     ) acquires LiquidityPool {
-        assert!(signer::address_of(coinswap) == @CoinSwap, errors::invalid_argument(ECOINSWAP_ADDRESS));
-        assert!(exists<LiquidityPool<CoinType1, CoinType2>>(signer::address_of(coinswap)), errors::not_published(EPOOL));
+        assert!(signer::address_of(coinswap) == @CoinSwap, error::invalid_argument(ECOINSWAP_ADDRESS));
+        assert!(exists<LiquidityPool<CoinType1, CoinType2>>(signer::address_of(coinswap)), error::not_found(EPOOL));
         let pool = borrow_global_mut<LiquidityPool<CoinType1, CoinType2>>(signer::address_of(coinswap));
         let coin2 = get_input_price(coin1, pool.coin1, pool.coin2);
         pool.coin1 = pool.coin1 + coin1;
diff --git a/language/documentation/examples/experimental/math-puzzle/README.md b/language/documentation/examples/experimental/math-puzzle/README.md
index 5bcf7e01df..a272614299 100644
--- a/language/documentation/examples/experimental/math-puzzle/README.md
+++ b/language/documentation/examples/experimental/math-puzzle/README.md
@@ -30,7 +30,7 @@ In `sources/puzzlie.move`, the function `Puzzle::puzzle` is constructed to take
 
 Use the following command to run Move Prover:
 ```
-move package prove
+move prove
 ```
 
 The following is the expected output of Move Prover:
diff --git a/language/documentation/spec/vm.md b/language/documentation/spec/vm.md
index 7b4588f1c5..fea24adb6b 100644
--- a/language/documentation/spec/vm.md
+++ b/language/documentation/spec/vm.md
@@ -75,7 +75,7 @@ pub fn publish_module(
     &mut self,
     module: Vec<u8>,
     sender: AccountAddress,
-    gas_status: &mut GasStatus,
+    gas_status: &mut impl GasMeter,
 ) -> VMResult<()>;
 ```
 
@@ -91,7 +91,7 @@ the module](#References-to-Data-and-Code). If the two addresses do not match, an
 error with `StatusCode::MODULE_ADDRESS_DOES_NOT_MATCH_SENDER` is returned.
 
 * Check that the module is not already published: Code is immutable in
-Move. An attempt to overwrite an exiting module results in an error with
+Move. An attempt to overwrite an existing module results in an error with
 `StatusCode::DUPLICATE_MODULE_NAME`.
 
 * Verify loading: The VM performs [verification](#Verification) of the
@@ -120,7 +120,7 @@ pub fn execute_script(
     ty_args: Vec<TypeTag>,
     args: Vec<Vec<u8>>,
     senders: Vec<AccountAddress>,
-    gas_status: &mut GasStatus,
+    gas_status: &mut impl GasMeter,
 ) -> VMResult<()>;
 ```
 
@@ -170,7 +170,7 @@ pub fn execute_script_function(
     ty_args: Vec<TypeTag>,
     args: Vec<Vec<u8>>,
     senders: Vec<AccountAddress>,
-    gas_status: &mut GasStatus,
+    gas_status: &mut impl GasMeter,
 ) -> VMResult<()>;
 ```
 
@@ -201,7 +201,7 @@ pub fn execute_function(
     function_name: &IdentStr,
     ty_args: Vec<TypeTag>,
     args: Vec<Vec<u8>>,
-    gas_status: &mut GasStatus,
+    gas_status: &mut impl GasMeter,
 ) -> VMResult<()>;
 ```
 
@@ -485,6 +485,9 @@ into the `STRUCT_HANDLES` table for the generic type of the instantiation, and a
 vector describing the substitution types, that is, a vector of SignatureTokens
 * `0xC`: `SIGNER` - a signer type, which is a special type for the VM
 representing the "entity" that signed the transaction. Signer is a resource type
+* `0xD`: `U16` - a 16-bit unsigned integer
+* `0xE`: `U32` - a 32-bit unsigned integer
+* `0xF`: `U256` - a 256-bit unsigned integer
 
 Signature tokens examples:
 
diff --git a/language/documentation/tutorial/README.md b/language/documentation/tutorial/README.md
index e8a6a1625b..d15fce32b8 100644
--- a/language/documentation/tutorial/README.md
+++ b/language/documentation/tutorial/README.md
@@ -55,18 +55,20 @@ cargo install --path language/tools/move-cli
 You can check that it is working by running the following command:
 
 ```bash
-move package --help
+move --help
 ```
 
 You should see something like this along with a list and description of a
 number of commands:
 
 ```
-move-package
-Execute a package command. Executed in the current directory or the closest containing Move package
+move-cli 0.1.0
+Diem Association <opensource@diem.com>
+MoveCLI is the CLI that will be executed by the `move-cli` command The `cmd` argument is added here
+rather than in `Move` to make it easier for other crates to extend `move-cli`
 
 USAGE:
-    move package [OPTIONS] <SUBCOMMAND>
+    move [OPTIONS] <SUBCOMMAND>
 
 OPTIONS:
         --abi                          Generate ABIs for packages
@@ -120,7 +122,7 @@ module 0xCAFE::BasicCoin {
 
 This is defining a Move
 [module](https://move-language.github.io/move/modules-and-scripts.html). Modules are the
-building block of Move code, and are defined with a specific address -- the
+building blocks of Move code, and are defined with a specific address -- the
 address that the module can be published under. In this case, the `BasicCoin`
 module can only be published under `0xCAFE`.
 
@@ -158,10 +160,10 @@ Let's take a look at this function and what it's saying:
 * It creates a `Coin` with the given value and stores it under the
   `account` using the `move_to` operator.
 
-Let's make sure it builds! This can be done with the `package build` command from within the package folder ([`step_1/BasicCoin`](./step_1/BasicCoin/)):
+Let's make sure it builds! This can be done with the `build` command from within the package folder ([`step_1/BasicCoin`](./step_1/BasicCoin/)):
 
 ```bash
-move package build
+move build
 ```
 
 <details>
@@ -169,7 +171,7 @@ move package build
 
 * You can create an empty Move package by calling:
     ```bash
-    move package new <pkg_name>
+    move new <pkg_name>
     ```
 * Move code can also live a number of other places.  More information on the
   Move package system can be found in the [Move
@@ -215,10 +217,10 @@ to [`step_2/BasicCoin`](./step_2/BasicCoin).  Unit tests in Move are similar to
 unit tests in Rust if you're familiar with them -- tests are annotated with
 `#[test]` and written like normal Move functions.
 
-You can run the tests with the `package test` command:
+You can run the tests with the `move test` command:
 
 ```bash
-move package test
+move test
 ```
 
 Let's now take a look at the contents of the [`FirstModule.move`
@@ -232,7 +234,7 @@ module 0xCAFE::BasicCoin {
     // address value of `0xC0FFEE`.
     #[test(account = @0xC0FFEE)]
     fun test_mint_10(account: signer) acquires Coin {
-        let addr = signer::address_of(&account);
+        let addr = 0x1::signer::address_of(&account);
         mint(account, 10);
         // Make sure there is a `Coin` resource under `addr` with a value of `10`.
         // We can access this resource and its value since we are in the
@@ -260,7 +262,7 @@ assertion fails the unit test will fail.
 
   ```toml
   [dependencies]
-  MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "Std" = "0x1" } }
+  MoveStdlib = { local = "../../../../move-stdlib/", addr_subst = { "std" = "0x1" } }
   ```
 
   Note that you may need to alter the path to point to the `move-stdlib` directory under
@@ -270,30 +272,29 @@ assertion fails the unit test will fail.
 
 #### Exercises
 * Change the assertion to `11` so that the test fails. Find a flag that you can
-  pass to the `move package test` command that will show you the global state when
+  pass to the `move test` command that will show you the global state when
   the test fails. It should look something like this:
   ```
-    ┌── test_mint_10 ──────
-    │ error[E11001]: test failure
-    │    ┌─ ./sources/FirstModule.move:24:9
-    │    │
-    │ 18 │     fun test_mint_10(account: signer) acquires Coin {
-    │    │         ------------ In this function in 0xcafe::BasicCoin
-    │    ·
-    │ 24 │         assert!(borrow_global<Coin>(addr).value == 11, 0);
-    │    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to abort but it aborted with 0 here
-    │
-    │
-    │ ────── Storage state at point of failure ──────
-    │ 0xc0ffee:
-    │       => key 0xcafe::BasicCoin::Coin {
-    │           value: 10
-    │       }
-    │
-    └──────────────────
+  ┌── test_mint_10 ──────
+  │ error[E11001]: test failure
+  │    ┌─ ./sources/FirstModule.move:24:9
+  │    │
+  │ 18 │     fun test_mint_10(account: signer) acquires Coin {
+  │    │         ------------ In this function in 0xcafe::BasicCoin
+  │    ·
+  │ 24 │         assert!(borrow_global<Coin>(addr).value == 11, 0);
+  │    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to abort but it aborted with 0 here
+  │
+  │
+  │ ────── Storage state at point of failure ──────
+  │ 0xc0ffee:
+  │       => key 0xcafe::BasicCoin::Coin {
+  │           value: 10
+  │       }
+  └──────────────────
   ```
 * Find a flag that allows you to gather test coverage information, and
-  then play around with using the `move package coverage` command to look at
+  then play around with using the `move coverage` command to look at
   coverage statistics and source coverage.
 
 </details>
@@ -383,7 +384,7 @@ implementation of the methods inside [`BasicCoin.move`](./step_4/sources/BasicCo
 Let's first try building the code using Move package by running the following command
 in [`step_4/BasicCoin`](./step_4/BasicCoin) folder:
 ```bash
-move package build
+move build
 ```
 
 ### Implementation of methods
@@ -409,15 +410,17 @@ move_to(account, Balance { coin:  empty_coin });
 `mint` method mints coins to a given account. Here we require that `mint` must be approved
 by the module owner. We enforce this using the assert statement:
 ```
-assert!(signer::address_of(&module_owner) == MODULE_OWNER, errors::requires_address(ENOT_MODULE_OWNER));
+assert!(signer::address_of(&module_owner) == MODULE_OWNER, ENOT_MODULE_OWNER);
 ```
 Assert statements in Move can be used in this way: `assert!(<predicate>, <abort_code>);`. This means that if the `<predicate>`
 is false, then abort the transaction with `<abort_code>`. Here `MODULE_OWNER` and `ENOT_MODULE_OWNER` are both constants
-defined at the beginning of the module. And `errors` module defines common error categories we can use.
+defined at the beginning of the module. The standard library's [`error` module] also defines common error categories we can use.
 It is important to note that Move is transactional in its execution -- so
 if an [abort](https://move-language.github.io/move/abort-and-assert.html) is raised no unwinding of state
 needs to be performed, as no changes from that transaction will be persisted to the blockchain.
 
+[`error` module]: https://github.com/move-language/move/blob/main/language/move-stdlib/docs/error.md
+
 We then deposit a coin with value `amount` to the balance of `mint_addr`.
 ```
 deposit(mint_addr, Coin { value: amount });
@@ -473,7 +476,7 @@ take a look at some tools we can use to help us write tests.
 To get started, run the `package test` command in the [`step_5/BasicCoin`](./step_5/BasicCoin) folder
 
 ```bash
-move package test
+move test
 ```
 
 You should see something like this:
@@ -571,7 +574,7 @@ source ~/.profile
 ```
 ## Step 7:  Use the Move prover<span id="Step7"><span>
 
-Smart contracts deployed on the blockchain may maniputate high-value assets. As a technique that uses strict
+Smart contracts deployed on the blockchain may manipulate high-value assets. As a technique that uses strict
 mathematical methods to describe behavior and reason correctness of computer systems, formal verification
 has been used in blockchains to prevent bugs in smart contracts. [
 The Move prover](https://github.com/move-language/move/blob/main/language/move-prover/doc/user/prover-guide.md)
@@ -592,7 +595,7 @@ Informally speaking, the block `spec balance_of {...}` contains the property spe
 
 Let's first run the prover using the following command inside [`BasicCoin` directory](./step_7/BasicCoin/):
 ```bash
-move package prove
+move prove
 ```
 
 which outputs the following error information:
@@ -627,7 +630,7 @@ The prover basically tells us that we need to explicitly specify the condition u
 ```
 After adding this condition, try running the `prove` command again to confirm that there are no verification errors:
 ```bash
-move package prove
+move prove
 ```
 Apart from the abort condition, we also want to define the functional properties. In Step 8, we will give more detailed introduction to the prover by specifying properties for the methods defined the `BasicCoin` module.
 
diff --git a/language/documentation/tutorial/step_2_sol/solution_commands b/language/documentation/tutorial/step_2_sol/solution_commands
index 6aa18e3ce1..54ab34115e 100644
--- a/language/documentation/tutorial/step_2_sol/solution_commands
+++ b/language/documentation/tutorial/step_2_sol/solution_commands
@@ -1,11 +1,11 @@
 # Exercise 1
-move package test -g
+move test -g
 
 # Exercise 2
-move package test --coverage
+move test --coverage
 
 Followed by:
 
-move package coverage summary
-move package coverage summary --summarize-functions
-move package coverage source --module BasicCoin
+move coverage summary
+move coverage summary --summarize-functions
+move coverage source --module BasicCoin
diff --git a/language/documentation/tutorial/step_4/BasicCoin/sources/BasicCoin.move b/language/documentation/tutorial/step_4/BasicCoin/sources/BasicCoin.move
index f3a83d3df9..ad469bcf15 100644
--- a/language/documentation/tutorial/step_4/BasicCoin/sources/BasicCoin.move
+++ b/language/documentation/tutorial/step_4/BasicCoin/sources/BasicCoin.move
@@ -1,6 +1,5 @@
 /// This module defines a minimal Coin and Balance.
 module NamedAddr::BasicCoin {
-    use std::errors;
     use std::signer;
 
     /// Address of the owner of this module
@@ -31,7 +30,7 @@ module NamedAddr::BasicCoin {
     /// Initialize this module.
     public fun mint(module_owner: &signer, mint_addr: address, amount: u64) {
         // Only the owner of the module can initialize this module
-        assert!(signer::address_of(module_owner) == MODULE_OWNER, errors::requires_address(ENOT_MODULE_OWNER));
+        assert!(signer::address_of(module_owner) == MODULE_OWNER, ENOT_MODULE_OWNER);
 
         // Deposit `amount` of tokens to `mint_addr`'s balance
         deposit(mint_addr, Coin { value: amount });
@@ -52,7 +51,7 @@ module NamedAddr::BasicCoin {
     fun withdraw(addr: address, amount: u64) : Coin acquires Balance {
         let balance = balance_of(addr);
         // balance must be greater than the withdraw amount
-        assert!(balance >= amount, errors::limit_exceeded(EINSUFFICIENT_BALANCE));
+        assert!(balance >= amount, EINSUFFICIENT_BALANCE);
         let balance_ref = &mut borrow_global_mut<Balance>(addr).coin.value;
         *balance_ref = balance - amount;
         Coin { value: amount }
diff --git a/language/documentation/tutorial/step_4_sol/BasicCoin/sources/BasicCoin.move b/language/documentation/tutorial/step_4_sol/BasicCoin/sources/BasicCoin.move
index e6678ab9cf..3b41ce5938 100644
--- a/language/documentation/tutorial/step_4_sol/BasicCoin/sources/BasicCoin.move
+++ b/language/documentation/tutorial/step_4_sol/BasicCoin/sources/BasicCoin.move
@@ -1,6 +1,5 @@
 /// This module defines a minimal Coin and Balance.
 module NamedAddr::BasicCoin {
-    use std::errors;
     use std::signer;
 
     /// Address of the owner of this module
@@ -24,14 +23,14 @@ module NamedAddr::BasicCoin {
     /// minting or transferring to the account.
     public fun publish_balance(account: &signer) {
         let empty_coin = Coin { value: 0 };
-        assert!(!exists<Balance>(signer::address_of(account)), errors::already_published(EALREADY_HAS_BALANCE));
+        assert!(!exists<Balance>(signer::address_of(account)), EALREADY_HAS_BALANCE);
         move_to(account, Balance { coin: empty_coin });
     }
 
     /// Mint `amount` tokens to `mint_addr`. Mint must be approved by the module owner.
     public fun mint(module_owner: &signer, mint_addr: address, amount: u64) acquires Balance {
         // Only the owner of the module can initialize this module
-        assert!(signer::address_of(module_owner) == MODULE_OWNER, errors::requires_address(ENOT_MODULE_OWNER));
+        assert!(signer::address_of(module_owner) == MODULE_OWNER, ENOT_MODULE_OWNER);
 
         // Deposit `amount` of tokens to `mint_addr`'s balance
         deposit(mint_addr, Coin { value: amount });
@@ -52,14 +51,14 @@ module NamedAddr::BasicCoin {
     fun withdraw(addr: address, amount: u64) : Coin acquires Balance {
         let balance = balance_of(addr);
         // balance must be greater than the withdraw amount
-        assert!(balance >= amount, errors::limit_exceeded(EINSUFFICIENT_BALANCE));
+        assert!(balance >= amount, EINSUFFICIENT_BALANCE);
         let balance_ref = &mut borrow_global_mut<Balance>(addr).coin.value;
         *balance_ref = balance - amount;
         Coin { value: amount }
     }
 
     /// Deposit `amount` number of tokens to the balance under `addr`.
-    fun deposit(addr: address, check: Coin) acquires Balance{
+    fun deposit(addr: address, check: Coin) acquires Balance {
         let balance = balance_of(addr);
         let balance_ref = &mut borrow_global_mut<Balance>(addr).coin.value;
         let Coin { value } = check;
diff --git a/language/documentation/tutorial/step_5/BasicCoin/sources/BasicCoin.move b/language/documentation/tutorial/step_5/BasicCoin/sources/BasicCoin.move
index 024c1c0ffe..46f5d6d645 100644
--- a/language/documentation/tutorial/step_5/BasicCoin/sources/BasicCoin.move
+++ b/language/documentation/tutorial/step_5/BasicCoin/sources/BasicCoin.move
@@ -1,6 +1,5 @@
 /// This module defines a minimal Coin and Balance.
 module NamedAddr::BasicCoin {
-    use std::errors;
     use std::signer;
 
     /// Address of the owner of this module
@@ -24,14 +23,14 @@ module NamedAddr::BasicCoin {
     /// minting or transferring to the account.
     public fun publish_balance(account: &signer) {
         let empty_coin = Coin { value: 0 };
-        assert!(!exists<Balance>(signer::address_of(account)), errors::already_published(EALREADY_HAS_BALANCE));
+        assert!(!exists<Balance>(signer::address_of(account)), EALREADY_HAS_BALANCE);
         move_to(account, Balance { coin: empty_coin });
     }
 
     /// Mint `amount` tokens to `mint_addr`. Mint must be approved by the module owner.
     public fun mint(module_owner: &signer, mint_addr: address, amount: u64) acquires Balance {
         // Only the owner of the module can initialize this module
-        assert!(signer::address_of(module_owner) == MODULE_OWNER, errors::requires_address(ENOT_MODULE_OWNER));
+        assert!(signer::address_of(module_owner) == MODULE_OWNER, ENOT_MODULE_OWNER);
 
         // Deposit `amount` of tokens to `mint_addr`'s balance
         deposit(mint_addr, Coin { value: amount });
@@ -52,7 +51,7 @@ module NamedAddr::BasicCoin {
     fun withdraw(addr: address, amount: u64) : Coin acquires Balance {
         let balance = balance_of(addr);
         // balance must be greater than the withdraw amount
-        assert!(balance >= amount, errors::limit_exceeded(EINSUFFICIENT_BALANCE));
+        assert!(balance >= amount, EINSUFFICIENT_BALANCE);
         let balance_ref = &mut borrow_global_mut<Balance>(addr).coin.value;
         *balance_ref = balance - amount;
         Coin { value: amount }
@@ -92,13 +91,13 @@ module NamedAddr::BasicCoin {
     }
 
     #[test(account = @0x1)]
-    #[expected_failure(abort_code = 518)] // Can specify an abort code
+    #[expected_failure(abort_code = EALREADY_HAS_BALANCE)] // Can specify an abort code
     fun publish_balance_already_exists(account: signer) {
         publish_balance(&account);
         publish_balance(&account);
     }
 
-    // EXERCISE: Write `balance_dne` test here!
+    // EXERCISE: Write `balance_of_dne` test here!
 
     #[test]
     #[expected_failure]
diff --git a/language/documentation/tutorial/step_5_sol/BasicCoin/sources/BasicCoin.move b/language/documentation/tutorial/step_5_sol/BasicCoin/sources/BasicCoin.move
index 53627a8eb2..a6e31ba552 100644
--- a/language/documentation/tutorial/step_5_sol/BasicCoin/sources/BasicCoin.move
+++ b/language/documentation/tutorial/step_5_sol/BasicCoin/sources/BasicCoin.move
@@ -1,6 +1,5 @@
 /// This module defines a minimal Coin and Balance.
 module NamedAddr::BasicCoin {
-    use std::errors;
     use std::signer;
 
     /// Address of the owner of this module
@@ -24,14 +23,14 @@ module NamedAddr::BasicCoin {
     /// minting or transferring to the account.
     public fun publish_balance(account: &signer) {
         let empty_coin = Coin { value: 0 };
-        assert!(!exists<Balance>(signer::address_of(account)), errors::already_published(EALREADY_HAS_BALANCE));
+        assert!(!exists<Balance>(signer::address_of(account)), EALREADY_HAS_BALANCE);
         move_to(account, Balance { coin:  empty_coin });
     }
 
     /// Mint `amount` tokens to `mint_addr`. Mint must be approved by the module owner.
     public fun mint(module_owner: &signer, mint_addr: address, amount: u64) acquires Balance {
         // Only the owner of the module can initialize this module
-        assert!(signer::address_of(module_owner) == MODULE_OWNER, errors::requires_address(ENOT_MODULE_OWNER));
+        assert!(signer::address_of(module_owner) == MODULE_OWNER, ENOT_MODULE_OWNER);
 
         // Deposit `amount` of tokens to `mint_addr`'s balance
         deposit(mint_addr, Coin { value: amount });
@@ -52,7 +51,7 @@ module NamedAddr::BasicCoin {
     fun withdraw(addr: address, amount: u64) : Coin acquires Balance {
         let balance = balance_of(addr);
         // balance must be greater than the withdraw amount
-        assert!(balance >= amount, errors::limit_exceeded(EINSUFFICIENT_BALANCE));
+        assert!(balance >= amount, EINSUFFICIENT_BALANCE);
         let balance_ref = &mut borrow_global_mut<Balance>(addr).coin.value;
         *balance_ref = balance - amount;
         Coin { value: amount }
@@ -92,7 +91,7 @@ module NamedAddr::BasicCoin {
     }
 
     #[test(account = @0x1)]
-    #[expected_failure(abort_code = 518)] // Can specify an abort code
+    #[expected_failure(abort_code = 2)] // Can specify an abort code
     fun publish_balance_already_exists(account: signer) {
         publish_balance(&account);
         publish_balance(&account);
diff --git a/language/documentation/tutorial/step_6/BasicCoin/sources/BasicCoin.move b/language/documentation/tutorial/step_6/BasicCoin/sources/BasicCoin.move
index 417094f3c6..d7354c6ecc 100644
--- a/language/documentation/tutorial/step_6/BasicCoin/sources/BasicCoin.move
+++ b/language/documentation/tutorial/step_6/BasicCoin/sources/BasicCoin.move
@@ -1,6 +1,5 @@
 /// This module defines a minimal and generic Coin and Balance.
 module NamedAddr::BasicCoin {
-    use std::errors;
     use std::signer;
 
     /// Error codes
@@ -20,7 +19,7 @@ module NamedAddr::BasicCoin {
     /// minting or transferring to the account.
     public fun publish_balance<CoinType>(account: &signer) {
         let empty_coin = Coin<CoinType> { value: 0 };
-        assert!(!exists<Balance<CoinType>>(signer::address_of(account)), errors::already_published(EALREADY_HAS_BALANCE));
+        assert!(!exists<Balance<CoinType>>(signer::address_of(account)), EALREADY_HAS_BALANCE);
         move_to(account, Balance<CoinType> { coin:  empty_coin });
     }
 
diff --git a/language/documentation/tutorial/step_7/BasicCoin/sources/BasicCoin.move b/language/documentation/tutorial/step_7/BasicCoin/sources/BasicCoin.move
index ace18ab0b3..3a5ec81e3a 100644
--- a/language/documentation/tutorial/step_7/BasicCoin/sources/BasicCoin.move
+++ b/language/documentation/tutorial/step_7/BasicCoin/sources/BasicCoin.move
@@ -1,6 +1,5 @@
 /// This module defines a minimal and generic Coin and Balance.
 module NamedAddr::BasicCoin {
-    use std::errors;
     use std::signer;
 
     /// Error codes
@@ -20,7 +19,7 @@ module NamedAddr::BasicCoin {
     /// minting or transferring to the account.
     public fun publish_balance<CoinType>(account: &signer) {
         let empty_coin = Coin<CoinType> { value: 0 };
-        assert!(!exists<Balance<CoinType>>(signer::address_of(account)), errors::already_published(EALREADY_HAS_BALANCE));
+        assert!(!exists<Balance<CoinType>>(signer::address_of(account)), EALREADY_HAS_BALANCE);
         move_to(account, Balance<CoinType> { coin: empty_coin });
     }
 
diff --git a/language/documentation/tutorial/step_8/BasicCoin/sources/BasicCoin.move b/language/documentation/tutorial/step_8/BasicCoin/sources/BasicCoin.move
index adade442ef..d936ca43f3 100644
--- a/language/documentation/tutorial/step_8/BasicCoin/sources/BasicCoin.move
+++ b/language/documentation/tutorial/step_8/BasicCoin/sources/BasicCoin.move
@@ -1,6 +1,5 @@
 /// This module defines a minimal and generic Coin and Balance.
 module NamedAddr::BasicCoin {
-    use std::errors;
     use std::signer;
 
     /// Error codes
@@ -21,7 +20,7 @@ module NamedAddr::BasicCoin {
     /// minting or transferring to the account.
     public fun publish_balance<CoinType>(account: &signer) {
         let empty_coin = Coin<CoinType> { value: 0 };
-        assert!(!exists<Balance<CoinType>>(signer::address_of(account)), errors::already_published(EALREADY_HAS_BALANCE));
+        assert!(!exists<Balance<CoinType>>(signer::address_of(account)), EALREADY_HAS_BALANCE);
         move_to(account, Balance<CoinType> { coin: empty_coin });
     }
 
diff --git a/language/documentation/tutorial/step_8_sol/BasicCoin/sources/BasicCoin.move b/language/documentation/tutorial/step_8_sol/BasicCoin/sources/BasicCoin.move
index cad1d3e785..921ffa36c5 100644
--- a/language/documentation/tutorial/step_8_sol/BasicCoin/sources/BasicCoin.move
+++ b/language/documentation/tutorial/step_8_sol/BasicCoin/sources/BasicCoin.move
@@ -1,6 +1,5 @@
 /// This module defines a minimal and generic Coin and Balance.
 module NamedAddr::BasicCoin {
-    use std::errors;
     use std::signer;
 
     /// Error codes
@@ -20,7 +19,7 @@ module NamedAddr::BasicCoin {
 
     public fun publish_balance<CoinType>(account: &signer) {
         let empty_coin = Coin<CoinType> { value: 0 };
-        assert!(!exists<Balance<CoinType>>(signer::address_of(account)), errors::already_published(EALREADY_HAS_BALANCE));
+        assert!(!exists<Balance<CoinType>>(signer::address_of(account)), EALREADY_HAS_BALANCE);
         move_to(account, Balance<CoinType> { coin: empty_coin });
     }
 
diff --git a/language/evm/README.md b/language/evm/README.md
index 375bd8dee0..883e3bd883 100644
--- a/language/evm/README.md
+++ b/language/evm/README.md
@@ -1,11 +1,15 @@
 # Move-on-EVM
 
+> NOTE: this tree contains an experimental version of Move which runs on the EVM. The programming model is
+> different from regular Move. The examples in this directory do not work with the usual Move
+> tools and blockchains.
+
 "Move-on-EVM" is a programming model in Move for EVM. In the current model, *each Move EVM contract has its own isolated address space*. This reflects the setup of the EVM most naturally, where storage between contracts cannot be shared apart from via accessor contract functions. Move EVM contracts use attributes to indicate the usage of structs for storage and events, and for functions to be callable from other contracts. It is expected that there is some codegen of Move from these attributes. For example, functions marked as `callable` have a generated API for cross-contract EVM call and delegate invocations. The module [Evm.move](./stdlib/sources/Evm.move) contains the API of a Move contract to the EVM. It encapsulates access to the transaction context and other EVM builtins
 
 This directory contains the following sub-directories:
-- [move-to-yul](./sources/move-to-yul) is a cross compiler that compiles Move contracts to the intermediate language Yul.
-- [stdlib](./sources/stdlib) is the standard library for Move-on-EVM.
-- [examples](./sources/examples) contains multiple Move-on-EVM examples including ERC20, ERC721 and ERC1155.
-- [hardhat-examples](./sources/hardhat-examples) is a Hardhat project to demonstrate Move-on-EVM.
-- [hardhat-move](./sources/hardhat-move) is a Hardhat plugin to support the Move language.
-- [exec-utils](./sources/exec-utils) contains EVM execution utils.
+- [move-to-yul](./move-to-yul) is a cross compiler that compiles Move contracts to the intermediate language Yul.
+- [stdlib](./stdlib) is the standard library for Move-on-EVM.
+- [examples](./examples) contains multiple Move-on-EVM examples including ERC20, ERC721 and ERC1155.
+- [hardhat-examples](./hardhat-examples) is a Hardhat project to demonstrate Move-on-EVM.
+- [hardhat-move](./hardhat-move) is a Hardhat plugin to support the Move language.
+- [exec-utils](./exec-utils) contains EVM execution utils.
diff --git a/language/evm/examples/README.md b/language/evm/examples/README.md
index fa67872429..1098286dbe 100644
--- a/language/evm/examples/README.md
+++ b/language/evm/examples/README.md
@@ -11,4 +11,4 @@ This directory contains (a growing set of) examples of "Move-on-EVM", a programm
 - [ERC1155.move](./sources/ERC1155.move) contains an implementation of ERC1155 which is the standard for multi-tokens.
 - [TestUniswap.move](./sources/TestUniswap.move) and [TestUniswapLiquidity.move](./sources/TestUniswapLiquidity.move) are the sample client modules of `Uniswap`.
 
-This directory is a Move package. To build the source files, use `move package build`. Moreover, use `move package test` to run the unit tests located in the `tests` directory.
+This directory is a Move package. To build the source files, use `move build`. Moreover, use `move test` to run the unit tests located in the `tests` directory.
diff --git a/language/evm/exec-utils/src/compile.rs b/language/evm/exec-utils/src/compile.rs
index 59f4992f5d..801ef41fb9 100644
--- a/language/evm/exec-utils/src/compile.rs
+++ b/language/evm/exec-utils/src/compile.rs
@@ -114,13 +114,13 @@ pub fn solc_yul(source: &str, return_optimized_yul: bool) -> Result<(Vec<u8>, Op
     }
     let yul = if return_optimized_yul {
         Some(
-            (&out_str[(start_of_yul.unwrap() + OPTIMIZED_YUL_MARKER.len())..start_of_hex.unwrap()])
+            out_str[(start_of_yul.unwrap() + OPTIMIZED_YUL_MARKER.len())..start_of_hex.unwrap()]
                 .trim()
                 .to_string(),
         )
     } else {
         None
     };
-    let bin = hex::decode(&out_str[(start_of_hex.unwrap() + HEX_OUTPUT_MARKER.len())..].trim())?;
+    let bin = hex::decode(out_str[(start_of_hex.unwrap() + HEX_OUTPUT_MARKER.len())..].trim())?;
     Ok((bin, yul))
 }
diff --git a/language/evm/extract-ethereum-abi/Cargo.toml b/language/evm/extract-ethereum-abi/Cargo.toml
index d40acabe04..7ae124f1be 100644
--- a/language/evm/extract-ethereum-abi/Cargo.toml
+++ b/language/evm/extract-ethereum-abi/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Extract Etherem ABI"
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
diff --git a/language/evm/hardhat-examples/contracts/AsyncEvent/Move.toml b/language/evm/hardhat-examples/contracts/AsyncEvent/Move.toml
new file mode 100644
index 0000000000..e0c21d6f0f
--- /dev/null
+++ b/language/evm/hardhat-examples/contracts/AsyncEvent/Move.toml
@@ -0,0 +1,13 @@
+[package]
+name = "AsyncEvent"
+version = "0.0.0"
+
+[addresses]
+std = "0x1"
+Evm = "0x2"
+Async = "0x1"
+
+[dependencies]
+EvmStdlib = { local = "../../../stdlib" }
+MoveStdlib = { local = "../../../../move-stdlib" }
+MoveAsyncLib = { local = "../../../../extensions/async/move-async-lib" }
diff --git a/language/evm/hardhat-examples/contracts/AsyncEvent/sources/AccountStateMachine.move b/language/evm/hardhat-examples/contracts/AsyncEvent/sources/AccountStateMachine.move
new file mode 100644
index 0000000000..01fd6c13b7
--- /dev/null
+++ b/language/evm/hardhat-examples/contracts/AsyncEvent/sources/AccountStateMachine.move
@@ -0,0 +1,102 @@
+#[actor]
+/// This is an instance of the Account example using an explicit state machine and one-way message passing.
+///
+/// In this example, we need to manage rpc state explicitly, remembering any outstanding transfers in the
+/// actors state. This creates a little more code, but also is somehow more transparent and true to the
+/// transactional semantics of Move. This version implements an additional `cleanup` message which cancels
+/// pending transactions over a certain age.
+module 0x3::AccountStateMachine {
+
+    use Async::Actor::{self, virtual_time};
+    use std::vector;
+
+    const MAX: u64 = 43;
+    const MAX_TRANSFER_AGE: u128 = 100000000;
+
+    #[state]
+    struct Account {
+        value: u64,
+        xfer_id_counter: u64,
+        pending: vector<PendingTransfer>
+    }
+
+    struct PendingTransfer has drop {
+       xfer_id: u64,
+       amount: u64,
+       initiated_at: u128,
+    }
+
+    #[init]
+    fun init(): Account {
+        Account{value: 0, xfer_id_counter: 0, pending: vector::empty()}
+    }
+
+    #[message]
+    fun deposit(this: &mut Account, v: u64) {
+        assert!(MAX - this.value >= v, 1);
+        this.value = this.value + v;
+    }
+
+    #[message]
+    fun withdraw(this: &mut Account, v: u64) {
+        assert!(this.value >= v, 2);
+        this.value = this.value - v;
+    }
+
+    #[message]
+    fun xfer(this: &mut Account, dest: address, v: u64) {
+        // Do not initiate the transfer if there are not enough funds
+        // Remove this assert to test event
+        // assert!(this.value >= v, 1);
+        let xfer_id = new_xfer_id(this);
+        vector::push_back(&mut this.pending, PendingTransfer{xfer_id, amount: v, initiated_at: virtual_time()});
+        // Call into a special version of deposit which calls us back once done.
+        send_xfer_deposit(dest, v, self(), xfer_id);
+    }
+
+    fun new_xfer_id(this: &mut Account): u64 {
+        let counter = &mut this.xfer_id_counter;
+        let xfer_id = *counter;
+        *counter = *counter + 1;
+        xfer_id
+    }
+
+    #[message]
+    fun xfer_deposit(this: &mut Account, v: u64, caller_: address, xfer_id: u64) {
+        deposit(this, v);
+        send_xfer_finish(caller_, xfer_id);
+    }
+
+    #[message]
+    fun xfer_finish(this: &mut Account, xfer_id: u64) {
+        let i = find_xfer(this, xfer_id);
+        let amount = vector::borrow(&this.pending, i).amount;
+        vector::remove(&mut this.pending, i);
+        withdraw(this, amount)
+    }
+
+    fun find_xfer(this: &Account, xfer_id: u64): u64 {
+        let pending = &this.pending;
+        let i = 0;
+        while (i < vector::length(pending) && vector::borrow(pending, i).xfer_id != xfer_id) {
+            i = i + 1;
+        };
+        assert!(i < vector::length(pending), 3);
+        i
+    }
+
+    #[message]
+    /// A periodical cleanup which removes dated pending transfers.
+    fun cleanup(this: &mut Account) {
+        let pending = &mut this.pending;
+        let i = 0;
+        while (i < vector::length(pending)) {
+            let p = vector::borrow(pending, i);
+            if (virtual_time() - p.initiated_at >= MAX_TRANSFER_AGE) {
+                vector::remove(pending, i);
+            } else {
+                i = i + 1;
+            }
+        }
+    }
+}
diff --git a/language/evm/hardhat-examples/test/AsyncEvent.test.js b/language/evm/hardhat-examples/test/AsyncEvent.test.js
new file mode 100644
index 0000000000..00f319b907
--- /dev/null
+++ b/language/evm/hardhat-examples/test/AsyncEvent.test.js
@@ -0,0 +1,22 @@
+const { expect } = require("chai");
+const { ethers } = require("hardhat");
+
+const make_test = function (contract_name) {
+  return function () {
+    before(async function () {
+      this.Event = await ethers.getContractFactory(contract_name);
+      this.event = await this.Event.deploy();
+      await this.event.deployed();
+    });
+    it("AsyncEvent_xfer_deposit", async function () {
+      const tx = this.event.xfer(this.event.address,42);
+      await expect(tx).to.emit(this.event, 'Xfer_deposit').withArgs(this.event.address, 0x0b32e0fa, 42, this.event.address, 0);
+    });
+    it("AsyncEvent_xfer_finish", async function () {
+      const tx = this.event.xfer_deposit(42,this.event.address,1);
+      await expect(tx).to.emit(this.event, 'Xfer_finish').withArgs(this.event.address, 0xb8229d65, 1);
+    });
+  }
+};
+
+describe("Async Event (the Async Move contract)", make_test('AsyncEvent'));
diff --git a/language/evm/hardhat-move/src/index.ts b/language/evm/hardhat-move/src/index.ts
index a8b5eb0b7e..1784b03017 100644
--- a/language/evm/hardhat-move/src/index.ts
+++ b/language/evm/hardhat-move/src/index.ts
@@ -153,7 +153,7 @@ async function locateMoveExecutablePath(): Promise<Result<string, Error>> {
 
 class MoveBuildError {
     exec_err: ChildProcess.ExecException;
-    // TODO: right now, `move package build` outputs its build errors to stdout instead of stderr.
+    // TODO: right now, `move build` outputs its build errors to stdout instead of stderr.
     // This may not be ideal and we may want to fix it and then revisit the error definition here.
     stdout: string;
     stderr: string;
@@ -166,7 +166,7 @@ class MoveBuildError {
 }
 
 async function movePackageBuild(movePath: string, packagePath: string): Promise<Result<void, MoveBuildError>> {
-    let cmd = `${movePath} package build --path ${packagePath} --arch ethereum`;
+    let cmd = `${movePath} build --path ${packagePath} --arch ethereum`;
 
     let [e, stdout, stderr] = await executeChildProcess(cmd);
 
diff --git a/language/evm/move-ethereum-abi/Cargo.toml b/language/evm/move-ethereum-abi/Cargo.toml
index c837746ad9..329e78cec5 100644
--- a/language/evm/move-ethereum-abi/Cargo.toml
+++ b/language/evm/move-ethereum-abi/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Move Ethereum ABI"
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
diff --git a/language/evm/move-to-yul/Cargo.toml b/language/evm/move-to-yul/Cargo.toml
index 34f28a7dcf..40b2798ec6 100644
--- a/language/evm/move-to-yul/Cargo.toml
+++ b/language/evm/move-to-yul/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Move Solidity Generator"
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
diff --git a/language/evm/move-to-yul/src/abi_move_metadata.rs b/language/evm/move-to-yul/src/abi_move_metadata.rs
index d709309752..9d1b42908c 100644
--- a/language/evm/move-to-yul/src/abi_move_metadata.rs
+++ b/language/evm/move-to-yul/src/abi_move_metadata.rs
@@ -26,7 +26,7 @@ pub(crate) fn generate_abi_move_metadata(ctx: &Context, receive: bool, fallback:
         let st_env = ctx.env.get_struct(key.to_qualified_id());
         event_map.insert(
             st_env.get_identifier().unwrap().to_string(),
-            from_event_sig(ctx.event_signature_map.borrow().get(&key).unwrap()),
+            from_event_sig(ctx.event_signature_map.borrow().get(key).unwrap()),
         );
     }
 
@@ -34,7 +34,7 @@ pub(crate) fn generate_abi_move_metadata(ctx: &Context, receive: bool, fallback:
     let mut func_map = BTreeMap::new();
     for (key, (solidity_sig, attr)) in ctx.callable_function_map.borrow().iter() {
         let fun = ctx.env.get_function(key.to_qualified_id());
-        let abi_sig = from_solidity_sig(&solidity_sig, Some(*attr), "function");
+        let abi_sig = from_solidity_sig(solidity_sig, Some(*attr), "function");
         func_map.insert(fun.get_identifier().to_string(), abi_sig);
     }
 
diff --git a/language/evm/move-to-yul/src/attributes.rs b/language/evm/move-to-yul/src/attributes.rs
index 14c12724f0..3a82877a4a 100644
--- a/language/evm/move-to-yul/src/attributes.rs
+++ b/language/evm/move-to-yul/src/attributes.rs
@@ -29,6 +29,12 @@ const ENCODE_ATTR: &str = "encode";
 const ENCODE_PACKED_ATTR: &str = "encode_packed";
 const ABI_STRUCT_ATTR: &str = "abi_struct";
 
+// For async move contracts
+const ACTOR_ATTR: &str = "actor";
+const STATE_ATTR: &str = "state";
+const INIT_ATTR: &str = "init";
+const MESSAGE_ATTR: &str = "message";
+
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub(crate) enum FunctionAttribute {
     Payable,
@@ -141,19 +147,13 @@ pub fn has_attr(env: &GlobalEnv, attrs: &[Attribute], name: &str, simple_flag: b
             true
         }
     };
-    attrs.iter().any(|a| match a {
-        Attribute::Apply(_, s, args)
-            if is_empty(args) && env.symbol_pool().string(*s).as_str() == name =>
-        {
-            true
-        }
-        _ => false,
-    })
+    attrs.iter().any(|a| matches!(a, Attribute::Apply(_, s, args) if is_empty(args) && env.symbol_pool().string(*s).as_str() == name))
 }
 
 /// Check whether the module has a `#[evm_contract]` attribute.
 pub fn is_evm_contract_module(module: &ModuleEnv) -> bool {
     has_attr(module.env, module.get_attributes(), CONTRACT_ATTR, false)
+        || has_attr(module.env, module.get_attributes(), ACTOR_ATTR, false)
 }
 
 /// Check whether the module has a `#[evm_arith]` attribute.
@@ -168,7 +168,7 @@ pub fn is_storage_struct(str: &StructEnv) -> bool {
         str.get_attributes(),
         STORAGE_ATTR,
         false,
-    )
+    ) || has_attr(str.module_env.env, str.get_attributes(), STATE_ATTR, false)
 }
 
 /// Check whether the struct has a `#[event]` attribute.
@@ -183,12 +183,18 @@ pub fn is_callable_fun(fun: &FunctionEnv<'_>) -> bool {
         fun.get_attributes(),
         CALLABLE_ATTR,
         false,
+    ) || has_attr(
+        fun.module_env.env,
+        fun.get_attributes(),
+        MESSAGE_ATTR,
+        false,
     )
 }
 
-/// Check whether the function has a `#[create]` attribute.
+/// Check whether the function has a `#[create]` or `#[init]` attribute.
 pub fn is_create_fun(fun: &FunctionEnv<'_>) -> bool {
     has_attr(fun.module_env.env, fun.get_attributes(), CREATE_ATTR, false)
+        || has_attr(fun.module_env.env, fun.get_attributes(), INIT_ATTR, false)
 }
 
 /// Check whether the function has a `#[payable]` attribute.
diff --git a/language/evm/move-to-yul/src/context.rs b/language/evm/move-to-yul/src/context.rs
index 2b717349e3..231b6db011 100644
--- a/language/evm/move-to-yul/src/context.rs
+++ b/language/evm/move-to-yul/src/context.rs
@@ -292,7 +292,7 @@ impl<'a> Context<'a> {
             }
         };
         // Identify special functions.
-        let constructor = self.identify_function(module, is_create_fun, "#[create]");
+        let constructor = self.identify_function(module, is_create_fun, "#[create]/#[init]");
         let receive = self.identify_function(module, is_receive_fun, "#[receive]");
         let fallback = self.identify_function(module, is_fallback_fun, "#[fallback]");
 
@@ -354,8 +354,7 @@ impl<'a> Context<'a> {
     fn get_target_structs(&self, p: impl Fn(&StructEnv) -> bool) -> Vec<StructEnv<'a>> {
         self.env
             .get_modules()
-            .map(|m| m.into_structs().filter(|f| p(f)))
-            .flatten()
+            .flat_map(|m| m.into_structs().filter(|f| p(f)))
             .collect()
     }
 
@@ -563,8 +562,11 @@ impl<'a> Context<'a> {
         match ty {
             Primitive(p) => match p {
                 U8 => "u8".to_string(),
+                // U16 => "u16".to_string(),
+                // U32 => "u32".to_string(),
                 U64 => "u64".to_string(),
                 U128 => "u128".to_string(),
+                // U256 => "u256".to_string(),
                 Num => "num".to_string(),
                 Address => "address".to_string(),
                 Signer => "signer".to_string(),
@@ -608,7 +610,7 @@ impl<'a> Context<'a> {
             .get_local_name(idx)
             .display(target.symbol_pool())
             .to_string()
-            .replace("#", "_")
+            .replace('#', "_")
     }
 
     /// Make name for a result.
@@ -770,7 +772,7 @@ impl<'a> Context<'a> {
                 U128 => 16,
                 // TODO: optimize for 20 bytes? Then we need primitives like LoadU160 etc.
                 Address | Signer => 32,
-                Num | Range | EventStore => {
+                Num | Range | EventStore | U16 | U32 | U256 => {
                     panic!("unexpected field type")
                 }
             },
diff --git a/language/evm/move-to-yul/src/dispatcher_generator.rs b/language/evm/move-to-yul/src/dispatcher_generator.rs
index 64c9e5be29..2ecc93d8b8 100644
--- a/language/evm/move-to-yul/src/dispatcher_generator.rs
+++ b/language/evm/move-to-yul/src/dispatcher_generator.rs
@@ -261,8 +261,8 @@ impl Generator {
     /// Generate optional receive function.
     fn optional_receive(&mut self, ctx: &Context, receive: &Option<FunctionEnv<'_>>) -> bool {
         if let Some(receive) = receive {
-            ctx.check_no_generics(&receive);
-            if !attributes::is_payable_fun(&receive) {
+            ctx.check_no_generics(receive);
+            if !attributes::is_payable_fun(receive) {
                 ctx.env
                     .error(&receive.get_loc(), "receive function must be payable")
             }
@@ -309,8 +309,8 @@ impl Generator {
         fallback: &Option<FunctionEnv<'_>>,
     ) {
         if let Some(fallback) = fallback {
-            ctx.check_no_generics(&fallback);
-            if !attributes::is_payable_fun(&fallback) {
+            ctx.check_no_generics(fallback);
+            if !attributes::is_payable_fun(fallback) {
                 self.generate_call_value_check(ctx, REVERT_ERR_NON_PAYABLE_FUN);
             }
             let fun_id = &fallback
@@ -560,7 +560,7 @@ impl Generator {
                         );
                     });
                     head_pos += ty_size;
-                    let memory_func = ctx.memory_store_builtin_fun(&move_ty);
+                    let memory_func = ctx.memory_store_builtin_fun(move_ty);
                     if local_typ_var.len() == 1 {
                         gen.call_builtin(
                             ctx,
@@ -1454,7 +1454,7 @@ impl Generator {
                 {
                     let is_static = ty.is_static();
                     let local_typ_var = vec![ret_var[stack_pos].clone()];
-                    let memory_func = ctx.memory_load_builtin_fun(&move_ty);
+                    let memory_func = ctx.memory_load_builtin_fun(move_ty);
                     if local_typ_var.len() == 1 {
                         emitln!(
                             ctx.writer,
@@ -1474,7 +1474,7 @@ impl Generator {
                                     ctx,
                                     &ty.clone(),
                                     &SignatureDataLocation::Memory,
-                                    &move_ty,
+                                    move_ty,
                                     sub_option.clone()
                                 ),
                                 local_typ_var[0].clone()
@@ -1488,7 +1488,7 @@ impl Generator {
                                         ctx,
                                         &ty.clone(),
                                         &SignatureDataLocation::Memory,
-                                        &move_ty,
+                                        move_ty,
                                         sub_option.clone()
                                     ),
                                     local_typ_var[0].clone(),
@@ -1507,7 +1507,7 @@ impl Generator {
                                         ctx,
                                         &ty.clone(),
                                         &SignatureDataLocation::Memory,
-                                        &move_ty,
+                                        move_ty,
                                         sub_option.clone()
                                     ),
                                     local_typ_var[0].clone()
diff --git a/language/evm/move-to-yul/src/events.rs b/language/evm/move-to-yul/src/events.rs
index 3845f46e9c..6353be5b07 100644
--- a/language/evm/move-to-yul/src/events.rs
+++ b/language/evm/move-to-yul/src/events.rs
@@ -21,7 +21,7 @@ use move_model::{
     ty::Type,
 };
 use move_stackless_bytecode::function_target_pipeline::FunctionVariant;
-use sha3::{Digest, Keccak256};
+use sha3::{Digest, Keccak256, Sha3_256};
 
 pub(crate) const COMPATIBILITY_ERROR: &str =
     "event signature is not compatible with the move struct";
@@ -186,6 +186,173 @@ impl EventSignature {
     }
 }
 
+/// Generate event emit functions for send_<name> in async move contracts
+/// example: the function send_foo(actor: address, args) will emit an ethereum event
+/// Foo(actor, message_hash, args) where encoding follows the ethereum standard
+/// TODO: add a sequence number to the event to help perform deduplication on the listener side
+pub(crate) fn define_emit_fun_for_send(
+    gen: &mut FunctionGenerator,
+    ctx: &Context,
+    event_sig: &EventSignature,
+    fun_id: &QualifiedInstId<FunId>,
+) {
+    let fun = ctx.env.get_function(fun_id.to_qualified_id());
+    let target = &ctx.targets.get_target(&fun, &FunctionVariant::Baseline);
+
+    // Emit function header
+    let params = (0..target.get_parameter_count()).map(|idx| ctx.make_local_name(target, idx));
+    let params_str = params.clone().join(",");
+    let params_vec = params.collect_vec();
+
+    let mut local_name_idx = target.get_parameter_count();
+
+    emit!(
+        ctx.writer,
+        "function {}({}) ",
+        ctx.make_function_name(fun_id),
+        params_str
+    );
+
+    // Generate the function body
+    ctx.emit_block(|| {
+        let signature_types = &event_sig.para_types;
+        let topic_0_var = ctx.make_local_name(target, local_name_idx);
+        local_name_idx += 1;
+        let event_sig_str = event_sig.to_string();
+        let topic_0_hash = format!("0x{:x}", Keccak256::digest(event_sig_str.as_bytes()));
+
+        emitln!(ctx.writer, "let {} := {}", topic_0_var, topic_0_hash);
+
+        // Compute the message hash following the logic in move_compiler::attr_derivation::async_deriver::message_hash
+        // message_hash is the first 8 bytes of Sha3_256::digest(address::module_name::foo)
+        // example: 0x00000000000000000000000000000003::AccountStateMachine::deposit
+        let message_str = format!(
+            "0x{}::{}",
+            fun.module_env.self_address(),
+            fun.get_full_name_str().replace("send_", "")
+        );
+        let hash_bytes = Sha3_256::digest(message_str.as_bytes());
+        let message_hash_str = &format!("0x{:x}", hash_bytes)[0..10];
+        let message_hash_var = ctx.make_local_name(target, local_name_idx);
+        local_name_idx += 1;
+        emitln!(
+            ctx.writer,
+            "let {} := {}",
+            message_hash_var,
+            message_hash_str
+        );
+
+        let mut indexed_paras = vec![];
+        let mut indexed_vars = vec![topic_0_var];
+        let mut unindexed_paras = vec![];
+        let mut unindexed_vars = vec![];
+
+        // For async move, there is no index for any parameters
+        // TODO: consider index receipient address and hash_messages by default
+        // TODO: consider add a sig to the attribute #[message] to specify index other parameters, e.g.
+        // #message[sig=b"xfer(address indexed, address indexed, uint128 indexed)]
+        for (i, (_, solidity_ty, move_ty, indexed_flag, _)) in signature_types.iter().enumerate() {
+            let mut var = if i == 0 {
+                params_vec.get(0).unwrap().to_string()
+            } else if i == 1 {
+                message_hash_var.clone()
+            } else {
+                params_vec.get(i - 1).unwrap().to_string()
+            };
+
+            if *indexed_flag {
+                indexed_paras.push((solidity_ty.clone(), move_ty.clone()));
+                if !solidity_ty.is_value_type() {
+                    // for non-value type
+                    let new_var = ctx.make_local_name(target, local_name_idx);
+                    local_name_idx += 1;
+                    emitln!(
+                        ctx.writer,
+                        "let {} := {}({})",
+                        new_var,
+                        gen.parent.generate_packed_hashed(
+                            ctx,
+                            vec![solidity_ty.clone()],
+                            vec![SignatureDataLocation::Memory],
+                            vec![move_ty.clone()]
+                        ),
+                        var
+                    );
+                    var = new_var;
+                }
+                indexed_vars.push(var.clone());
+            } else {
+                unindexed_paras.push((solidity_ty.clone(), move_ty.clone()));
+                unindexed_vars.push(var.clone());
+            }
+        }
+
+        ctx.emit_block(|| {
+            let pos_var = ctx.make_local_name(target, local_name_idx);
+            local_name_idx += 1;
+            let end_var = ctx.make_local_name(target, local_name_idx);
+            local_name_idx += 1;
+            emitln!(
+                ctx.writer,
+                "let {} := mload({})",
+                pos_var,
+                substitute_placeholders("${MEM_SIZE_LOC}").unwrap()
+            );
+            // Create dummy signature location
+            let sig_para_locs = vec![SignatureDataLocation::Memory; unindexed_paras.len()];
+            let para_types = unindexed_paras
+                .iter()
+                .map(|(_, move_ty)| move_ty.clone())
+                .collect_vec();
+            let sig_para_vec = unindexed_paras
+                .iter()
+                .map(|(solidity_ty, _)| solidity_ty.clone())
+                .collect_vec();
+            // Generate encoding function for unindexed parameters
+            let encode_unindexed = gen.parent.generate_abi_tuple_encoding(
+                ctx,
+                sig_para_vec,
+                sig_para_locs,
+                para_types,
+            );
+            let unindexed_str = if !unindexed_vars.is_empty() {
+                format!(", {}", unindexed_vars.join(","))
+            } else {
+                "".to_string()
+            };
+            emitln!(
+                ctx.writer,
+                "let {} := {}({}{})",
+                end_var,
+                encode_unindexed,
+                pos_var,
+                unindexed_str
+            );
+            // Generate the code to call log opcode
+            let indexed_str = if !indexed_vars.is_empty() {
+                format!(", {}", indexed_vars.join(","))
+            } else {
+                "".to_string()
+            };
+            emitln!(
+                ctx.writer,
+                "log{}({}, sub({}, {}){})",
+                event_sig.indexed_count,
+                pos_var,
+                end_var,
+                pos_var,
+                indexed_str
+            );
+            emitln!(
+                ctx.writer,
+                "mstore({}, {})",
+                substitute_placeholders("${MEM_SIZE_LOC}").unwrap(),
+                end_var
+            );
+        });
+    });
+}
+
 /// Generate emit functions
 pub(crate) fn define_emit_fun(
     gen: &mut FunctionGenerator,
diff --git a/language/evm/move-to-yul/src/evm_transformation.rs b/language/evm/move-to-yul/src/evm_transformation.rs
index 66cb7a5f53..7e52b69c08 100644
--- a/language/evm/move-to-yul/src/evm_transformation.rs
+++ b/language/evm/move-to-yul/src/evm_transformation.rs
@@ -28,8 +28,9 @@ impl FunctionTargetProcessor for EvmTransformationProcessor {
     fn process(
         &self,
         _targets: &mut FunctionTargetsHolder,
-        func_env: &FunctionEnv<'_>,
+        func_env: &FunctionEnv,
         mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         if func_env.is_native() || func_env.is_intrinsic() {
             return data;
diff --git a/language/evm/move-to-yul/src/functions.rs b/language/evm/move-to-yul/src/functions.rs
index 7fb78bee00..47b319180f 100644
--- a/language/evm/move-to-yul/src/functions.rs
+++ b/language/evm/move-to-yul/src/functions.rs
@@ -43,11 +43,13 @@ impl<'a> FunctionGenerator<'a> {
         let fun = &ctx.env.get_function(fun_id.to_qualified_id());
         // TODO: change back to is_native_or_intrinsic if we decide to implement
         // intrinsic functions (such as reverse, contains, is_empty) in the Vector module as well
-        if fun.is_native() {
+        // TODO: create a compilation flag to gate "send_"
+        if fun.is_native() || fun.get_full_name_str().contains("send_") {
             // Special treatment for native functions, which have custom generators.
             ctx.native_funs.gen_native_function(self, ctx, fun_id);
             return;
         }
+
         let target = &ctx.targets.get_target(fun, &FunctionVariant::Baseline);
 
         // Emit function header
@@ -341,14 +343,16 @@ impl<'a> FunctionGenerator<'a> {
                     // Move function call
                     Function(m, f, inst) => {
                         print_loc();
-                        self.move_call(
-                            ctx,
-                            target,
-                            dest,
-                            m.qualified(*f)
-                                .instantiate(Type::instantiate_slice(inst, &fun_id.inst)),
-                            srcs.iter().map(local),
-                        )
+                        let fun_id = m
+                            .qualified(*f)
+                            .instantiate(Type::instantiate_slice(inst, &fun_id.inst));
+                        let fun = &ctx.env.get_function(fun_id.to_qualified_id());
+                        if fun.get_name_string().contains("send__")
+                            || fun.get_name_string().contains("bcs::to_bytes")
+                        {
+                            return;
+                        }
+                        self.move_call(ctx, target, dest, fun_id, srcs.iter().map(local))
                     }
 
                     // Packing and unpacking of structs
@@ -558,9 +562,12 @@ impl<'a> FunctionGenerator<'a> {
                     | EventStoreDiverge
                     | OpaqueCallBegin(_, _, _)
                     | OpaqueCallEnd(_, _, _)
+                    | Uninit
                     | Havoc(_)
                     | Stop
-                    | TraceGlobalMem(_) => {}
+                    | TraceGlobalMem(_)
+                    | CastU16
+                    | CastU32 => {}
                 }
             }
 
@@ -609,6 +616,9 @@ impl<'a> FunctionGenerator<'a> {
                 format!("0x{}", a.to_str_radix(16))
             }
             Constant::ByteArray(_) => "".to_string(),
+            Constant::AddressArray(_) => "".to_string(),
+            Constant::Vector(_) => "".to_string(),
+            Constant::U16(_) | Constant::U32(_) => panic!("unexpected field type"),
         };
         if !val_str.is_empty() {
             emitln!(ctx.writer, "{} := {}", dest, val_str);
diff --git a/language/evm/move-to-yul/src/lib.rs b/language/evm/move-to-yul/src/lib.rs
index 6d9e134fb0..ae577e1d7a 100644
--- a/language/evm/move-to-yul/src/lib.rs
+++ b/language/evm/move-to-yul/src/lib.rs
@@ -31,11 +31,11 @@ use codespan_reporting::{
     diagnostic::Severity,
     term::termcolor::{ColorChoice, StandardStream, WriteColor},
 };
-use move_compiler::shared::PackagePaths;
+use move_compiler::{shared::PackagePaths, Flags};
 use move_core_types::metadata::Metadata;
 use move_model::{
     model::GlobalEnv, options::ModelBuilderOptions, parse_addresses_from_options,
-    run_model_builder_with_options,
+    run_model_builder_with_options_and_compilation_flags,
 };
 use std::fs;
 
@@ -49,7 +49,7 @@ pub fn run_to_yul_errors_to_stderr(options: Options) -> anyhow::Result<()> {
 pub fn run_to_yul<W: WriteColor>(error_writer: &mut W, mut options: Options) -> anyhow::Result<()> {
     // Run the model builder.
     let addrs = parse_addresses_from_options(options.named_address_mapping.clone())?;
-    let env = run_model_builder_with_options(
+    let env = run_model_builder_with_options_and_compilation_flags(
         vec![PackagePaths {
             name: None,
             paths: options.sources.clone(),
@@ -61,6 +61,7 @@ pub fn run_to_yul<W: WriteColor>(error_writer: &mut W, mut options: Options) ->
             named_address_map: addrs,
         }],
         ModelBuilderOptions::default(),
+        Flags::empty().set_flavor("async"),
     )?;
     // If the model contains any errors, report them now and exit.
     check_errors(
@@ -101,7 +102,7 @@ pub fn run_to_abi_metadata<W: WriteColor>(
 ) -> anyhow::Result<Vec<Metadata>> {
     // Run the model builder.
     let addrs = parse_addresses_from_options(options.named_address_mapping.clone())?;
-    let env = run_model_builder_with_options(
+    let env = run_model_builder_with_options_and_compilation_flags(
         vec![PackagePaths {
             name: None,
             paths: options.sources.clone(),
@@ -113,6 +114,7 @@ pub fn run_to_abi_metadata<W: WriteColor>(
             named_address_map: addrs,
         }],
         ModelBuilderOptions::default(),
+        Flags::empty().set_flavor("async"),
     )?;
     // If the model contains any errors, report them now and exit.
     check_errors(
diff --git a/language/evm/move-to-yul/src/native_functions.rs b/language/evm/move-to-yul/src/native_functions.rs
index 88eab32c42..453897c7dc 100644
--- a/language/evm/move-to-yul/src/native_functions.rs
+++ b/language/evm/move-to-yul/src/native_functions.rs
@@ -83,6 +83,25 @@ impl NativeFunctions {
                         )
                     }
                 }
+            } else if fun.get_full_name_str().contains("send_")
+                && attributes::has_attr(
+                    fun.module_env.env,
+                    fun.module_env.get_attributes(),
+                    "actor",
+                    false,
+                )
+            {
+                let fun_name = fun.get_full_name_str();
+                let mut st_name = String::from(&fun_name[fun_name.find("send_").unwrap() + 5..]);
+                st_name.replace_range(0..1, &st_name[0..1].to_uppercase());
+                let ev_signature_map = ctx.event_signature_map.borrow();
+                for (st_id, sig) in ev_signature_map.iter() {
+                    let st_env = ctx.env.get_struct(st_id.to_qualified_id());
+                    if st_name == st_env.get_name().display(st_env.symbol_pool()).to_string() {
+                        events::define_emit_fun_for_send(gen, ctx, sig, fun_id);
+                        break;
+                    }
+                }
             } else if attributes::is_decode(fun) {
                 self.define_decode_fun(gen, ctx, fun_id, attributes::extract_decode_signature(fun));
             } else if attributes::is_encode(fun) {
@@ -164,6 +183,7 @@ impl NativeFunctions {
     fn define_evm_functions(&mut self, ctx: &Context) {
         // TODO: may want to have symbolic representation of addr (which is 'Eth')
         let evm = &self.find_module(ctx, "0x2", "Evm");
+        let async_actor_lib = &self.find_module(ctx, "0x1", "Actor");
 
         self.define(ctx, evm, "sign", |_, ctx: &Context, _| {
             emitln!(
@@ -185,6 +205,31 @@ impl NativeFunctions {
             );
         });
 
+        self.define(ctx, async_actor_lib, "self", |_, ctx: &Context, _| {
+            emitln!(
+                ctx.writer,
+                "\
+() -> addr {
+  addr := address()
+}"
+            );
+        });
+
+        self.define(
+            ctx,
+            async_actor_lib,
+            "virtual_time",
+            |_, ctx: &Context, _| {
+                emitln!(
+                    ctx.writer,
+                    "\
+() -> virtual_time {
+    virtual_time := timestamp()
+}"
+                );
+            },
+        );
+
         self.define(ctx, evm, "abort_with", |gen, ctx: &Context, _| {
             emitln!(
                 ctx.writer,
diff --git a/language/evm/move-to-yul/src/solidity_ty.rs b/language/evm/move-to-yul/src/solidity_ty.rs
index 56b608bf22..25190968c7 100644
--- a/language/evm/move-to-yul/src/solidity_ty.rs
+++ b/language/evm/move-to-yul/src/solidity_ty.rs
@@ -337,7 +337,7 @@ impl SolidityType {
                 U128 => SolidityType::Primitive(SolidityPrimitiveType::Uint(128)),
                 Address => SolidityType::Primitive(SolidityPrimitiveType::Address(false)),
                 Signer => SolidityType::Primitive(SolidityPrimitiveType::Address(false)),
-                Num | Range | EventStore => {
+                Num | Range | EventStore | U16 | U32 | U256 => {
                     panic!("unexpected field type")
                 }
             },
@@ -398,7 +398,7 @@ impl SolidityType {
                 let error_msg = "illegal type name";
                 return Err(anyhow!(error_msg));
             }
-            ctx.check_or_create_struct_abi(&trimmed_ty_str)
+            ctx.check_or_create_struct_abi(trimmed_ty_str)
         }
     }
 
diff --git a/language/evm/move-to-yul/src/storage.rs b/language/evm/move-to-yul/src/storage.rs
index 4832fb5a17..0643afc2ca 100644
--- a/language/evm/move-to-yul/src/storage.rs
+++ b/language/evm/move-to-yul/src/storage.rs
@@ -379,7 +379,8 @@ impl Generator {
         );
 
         // Skip the existence flag and create a pointer.
-        let make_ptr = self.call_builtin_str(
+
+        self.call_builtin_str(
             ctx,
             YulFunction::MakePtr,
             vec![
@@ -387,8 +388,7 @@ impl Generator {
                 format!("add({}, ${{RESOURCE_EXISTS_FLAG_SIZE}})", base_offset),
             ]
             .into_iter(),
-        );
-        make_ptr
+        )
     }
 
     /// Returns an expression for checking whether a resource exists.
diff --git a/language/evm/move-to-yul/src/vectors.rs b/language/evm/move-to-yul/src/vectors.rs
index df3fe9f41d..551330d5b9 100644
--- a/language/evm/move-to-yul/src/vectors.rs
+++ b/language/evm/move-to-yul/src/vectors.rs
@@ -1051,7 +1051,7 @@ fn define_destroy_empty_fun(
 
 /// Generate equality method for the vector type.
 pub(crate) fn equality_fun(gen: &mut Generator, ctx: &Context, ty: &Type) {
-    let elem_type = get_elem_type(&ty).unwrap();
+    let elem_type = get_elem_type(ty).unwrap();
     if ctx.type_allocates_memory(&elem_type) {
         emitln!(
             ctx.writer,
diff --git a/language/evm/move-to-yul/tests/AccountStateMachine.exp b/language/evm/move-to-yul/tests/AccountStateMachine.exp
new file mode 100644
index 0000000000..60d877df09
--- /dev/null
+++ b/language/evm/move-to-yul/tests/AccountStateMachine.exp
@@ -0,0 +1,1138 @@
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "A3_AccountStateMachine" {
+    code {
+        mstore(0, memoryguard(160))
+        let $new_value := A3_AccountStateMachine_init()
+        {
+            let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+            if $AlignedStorageLoad($base_offset) {
+              $AbortBuiltin()
+            }
+            $AlignedStorageStore($base_offset, true)
+            {
+                let $dst := add($base_offset, 32)
+                let $src := $new_value
+                {
+                    let $linked_src_37500119 := mload(add($src, 0))
+                    let $linked_dst_37500119 := $NewLinkedStorageBase(0x23c34d7)
+                    let $size_37500119 := $MemoryLoadU64($linked_src_37500119)
+                    let $data_size_37500119 := mul($size_37500119, 32)
+                    $AlignedStorageStore($linked_dst_37500119, mload($linked_src_37500119))
+                    let $data_src_37500119 := add($linked_src_37500119, 32)
+                    let $data_dst_37500119 := add($linked_dst_37500119, 32)
+                    for { let $offs_37500119 := 0 } lt($offs_37500119, $data_size_37500119) { $offs_37500119 := add($offs_37500119, 32)} {
+                        {
+                            let $linked_src_1341933877 := mload(add($offs_37500119, $data_src_37500119))
+                            let $linked_dst_1341933877 := $NewLinkedStorageBase(0x4ffc4935)
+                            $AlignedStorageStore(add($linked_dst_1341933877, 0), mload(add($linked_src_1341933877, 0)))
+                            $Free($linked_src_1341933877, 32)
+                            $AlignedStorageStore(add($data_dst_37500119, $offs_37500119), $linked_dst_1341933877)
+                        }
+                        $Free($linked_src_37500119, add($data_size_37500119, 32))
+                    }
+                    $AlignedStorageStore(add($dst, 0), $linked_dst_37500119)
+                }
+                $AlignedStorageStore(add($dst, 32), mload(add($src, 32)))
+                $Free($src, 48)
+            }
+        }
+        codecopy(0, dataoffset("A3_AccountStateMachine_deployed"), datasize("A3_AccountStateMachine_deployed"))
+        return(0, datasize("A3_AccountStateMachine_deployed"))
+        function A3_AccountStateMachine_init() -> $result {
+            let $t0, $t1, $t2, $t3
+            // $t0 := 0
+            $t0 := 0
+            // $t1 := 0
+            $t1 := 0
+            // $t2 := vector::empty<AccountStateMachine::PendingTransfer>()
+            $t2 := A1_vector_empty$A3_AccountStateMachine_PendingTransfer$()
+            // $t3 := pack AccountStateMachine::Account($t0, $t1, $t2)
+            {
+                let $mem := $Malloc(48)
+                $MemoryStoreU64(add($mem, 32), $t0)
+                $MemoryStoreU64(add($mem, 40), $t1)
+                $MemoryStoreU256(add($mem, 0), $t2)
+                $t3 := $mem
+            }
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_empty$A3_AccountStateMachine_PendingTransfer$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function $Abort(code) {
+            mstore(0, code)
+            revert(24, 8) // TODO: store code as a string?
+        }
+        function $AbortBuiltin() {
+            $Abort(sub(0, 1))
+        }
+        function $Malloc(size) -> offs {
+            offs := mload(0)
+            // pad to word size
+            mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+        }
+        function $Free(offs, size) {
+        }
+        function $MaskForSize(size) -> mask {
+          mask := sub(shl(shl(3, size), 1), 1)
+        }
+        function $MemoryLoadBytes(offs, size) -> val {
+          // Lower bit where the value in the higher bytes ends
+          let bit_end := shl(3, sub(32, size))
+          val := shr(bit_end, mload(offs))
+        }
+        function $MemoryStoreBytes(offs, size, val) {
+          let bit_end := shl(3, sub(32, size))
+          let mask := shl(bit_end, $MaskForSize(size))
+          mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+        }
+        function $StorageKey(group, word) -> key {
+          mstore(32, word)
+          mstore(64, shl(224, group))
+          key := keccak256(32, 36)
+        }
+        function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+          offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+        }
+        function $NewLinkedStorageBase(type_hash) -> offs {
+          let key := $StorageKey(1, 1)
+          let handle := sload(key)
+          sstore(key, add(handle, 1))
+          offs := $MakeTypeStorageBase(1, type_hash, handle)
+        }
+        function $MemoryLoadU64(offs) -> val {
+          val := $MemoryLoadBytes(offs, 8)
+        }
+        function $MemoryStoreU64(offs, val) {
+          $MemoryStoreBytes(offs, 8, val)
+        }
+        function $MemoryStoreU256(offs, val) {
+          $MemoryStoreBytes(offs, 32, val)
+        }
+        function $AlignedStorageLoad(offs) -> val {
+          let word_offs := shr(5, offs)
+          val := sload($StorageKey(0, word_offs))
+        }
+        function $AlignedStorageStore(offs, val) {
+          let word_offs := shr(5, offs)
+          sstore($StorageKey(0, word_offs), val)
+        }
+    }
+    object "A3_AccountStateMachine_deployed" {
+        code {
+            mstore(0, memoryguard(160))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := $Shr(calldataload(0), 224)
+                switch selector
+                case 0x3cecd719
+                {
+                    // cleanup()
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A3_AccountStateMachine_cleanup($MakePtr(true, add($base_offset, 32)))
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x13765838
+                {
+                    // deposit(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A3_AccountStateMachine_deposit($MakePtr(true, add($base_offset, 32)), param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x750f0acc
+                {
+                    // withdraw(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A3_AccountStateMachine_withdraw($MakePtr(true, add($base_offset, 32)), param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x2bcc3f98
+                {
+                    // xfer(address,uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1 := abi_decode_tuple_$address_uint64$_$address_u64$(4, calldatasize())
+                    let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A3_AccountStateMachine_xfer($MakePtr(true, add($base_offset, 32)), param_0, param_1)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x02852d52
+                {
+                    // xfer_deposit(uint64,address,uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0, param_1, param_2 := abi_decode_tuple_$uint64_address_uint64$_$u64_address_u64$(4, calldatasize())
+                    let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A3_AccountStateMachine_xfer_deposit($MakePtr(true, add($base_offset, 32)), param_0, param_1, param_2)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                case 0x8c38542c
+                {
+                    // xfer_finish(uint64)
+                    if callvalue()
+                    {
+                        $Abort(99)
+                    }
+                    let param_0 := abi_decode_tuple_$uint64$_$u64$(4, calldatasize())
+                    let $base_offset := $MakeTypeStorageBase(0, 0x330750a9, address())
+                    if iszero($AlignedStorageLoad($base_offset)) {
+                      $AbortBuiltin()
+                    }
+                    A3_AccountStateMachine_xfer_finish($MakePtr(true, add($base_offset, 32)), param_0)
+                    let memPos := mload(0)
+                    let memEnd := abi_encode_tuple__(memPos)
+                    return(memPos, sub(memEnd, memPos))
+                }
+                default {}
+            }
+            $Abort(97)
+            function A3_AccountStateMachine_cleanup(this) {
+                let tmp_$1, i, p, pending, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L6
+                        // $t7 := freeze_ref($t5)
+                        $t7 := $t5
+                        // $t8 := vector::length<AccountStateMachine::PendingTransfer>($t7)
+                        $t8 := A1_vector_length$A3_AccountStateMachine_PendingTransfer$($t7)
+                        // $t9 := <($t2, $t8)
+                        $t9 := $Lt(i, $t8)
+                        // if ($t9) goto L1 else goto L0
+                        switch $t9
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t5 := borrow_field<AccountStateMachine::Account>.pending($t0)
+                        $t5 := this
+                        // $t6 := 0
+                        $t6 := 0
+                        // $t2 := $t6
+                        i := $t6
+                        // goto L6
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // destroy($t5)
+                        // return ()
+                        leave
+                    }
+                    case 6 {
+                        // label L2
+                        // $t10 := freeze_ref($t5)
+                        $t10 := $t5
+                        // $t11 := vector::borrow<AccountStateMachine::PendingTransfer>($t10, $t2)
+                        $t11 := A1_vector_borrow$A3_AccountStateMachine_PendingTransfer$($t10, i)
+                        // $t12 := Actor::virtual_time()
+                        $t12 := A1_Actor_virtual_time()
+                        // $t13 := borrow_field<AccountStateMachine::PendingTransfer>.initiated_at($t11)
+                        $t13 := $t11
+                        // $t14 := read_ref($t13)
+                        $t14 := $LoadU128($t13)
+                        // $t15 := -($t12, $t14)
+                        $t15 := $Sub($t12, $t14)
+                        // $t16 := 100000000
+                        $t16 := 100000000
+                        // $t17 := >=($t15, $t16)
+                        $t17 := $GtEq($t15, $t16)
+                        // if ($t17) goto L4 else goto L3
+                        switch $t17
+                        case 0  { $block := 8 }
+                        default { $block := 7 }
+                    }
+                    case 7 {
+                        // label L4
+                        // $t18 := vector::remove<AccountStateMachine::PendingTransfer>($t5, $t2)
+                        $t18 := A1_vector_remove$A3_AccountStateMachine_PendingTransfer$($t5, i)
+                        // destroy($t18)
+                        $Free($t18, 32)
+                        // goto L5
+                        $block := 9
+                    }
+                    case 8 {
+                        // label L3
+                        // $t19 := 1
+                        $t19 := 1
+                        // $t2 := +($t2, $t19)
+                        i := $AddU64(i, $t19)
+                        // goto L5
+                        $block := 9
+                    }
+                    case 9 {
+                        // label L5
+                        // goto L6
+                        $block := 2
+                    }
+                }
+            }
+
+            function A3_AccountStateMachine_deposit(this, v) {
+                let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // destroy($t0)
+                        // $t7 := 1
+                        $t7 := 1
+                        // abort($t7)
+                        $Abort($t7)
+                    }
+                    case 4 {
+                        // $t2 := 43
+                        $t2 := 43
+                        // $t3 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t3 := $IndexPtr(this, 32)
+                        // $t4 := read_ref($t3)
+                        $t4 := $LoadU64($t3)
+                        // $t5 := -($t2, $t4)
+                        $t5 := $Sub($t2, $t4)
+                        // $t6 := >=($t5, $t1)
+                        $t6 := $GtEq($t5, v)
+                        // if ($t6) goto L1 else goto L0
+                        switch $t6
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t8 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t8 := $IndexPtr(this, 32)
+                        // $t9 := read_ref($t8)
+                        $t9 := $LoadU64($t8)
+                        // $t10 := +($t9, $t1)
+                        $t10 := $AddU64($t9, v)
+                        // $t11 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t11 := $IndexPtr(this, 32)
+                        // write_ref($t11, $t10)
+                        $StoreU64($t11, $t10)
+                        // return ()
+                        leave
+                    }
+                }
+            }
+
+            function A3_AccountStateMachine_withdraw(this, v) {
+                let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // destroy($t0)
+                        // $t5 := 2
+                        $t5 := 2
+                        // abort($t5)
+                        $Abort($t5)
+                    }
+                    case 4 {
+                        // $t2 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t2 := $IndexPtr(this, 32)
+                        // $t3 := read_ref($t2)
+                        $t3 := $LoadU64($t2)
+                        // $t4 := >=($t3, $t1)
+                        $t4 := $GtEq($t3, v)
+                        // if ($t4) goto L1 else goto L0
+                        switch $t4
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t6 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t6 := $IndexPtr(this, 32)
+                        // $t7 := read_ref($t6)
+                        $t7 := $LoadU64($t6)
+                        // $t8 := -($t7, $t1)
+                        $t8 := $Sub($t7, v)
+                        // $t9 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t9 := $IndexPtr(this, 32)
+                        // write_ref($t9, $t8)
+                        $StoreU64($t9, $t8)
+                        // return ()
+                        leave
+                    }
+                }
+            }
+
+            function A3_AccountStateMachine_xfer(this, dest, v) {
+                let xfer_id, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
+                        // destroy($t0)
+                        // $t7 := 1
+                        $t7 := 1
+                        // abort($t7)
+                        $Abort($t7)
+                    }
+                    case 4 {
+                        // $t4 := borrow_field<AccountStateMachine::Account>.value($t0)
+                        $t4 := $IndexPtr(this, 32)
+                        // $t5 := read_ref($t4)
+                        $t5 := $LoadU64($t4)
+                        // $t6 := >=($t5, $t2)
+                        $t6 := $GtEq($t5, v)
+                        // if ($t6) goto L1 else goto L0
+                        switch $t6
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t8 := AccountStateMachine::new_xfer_id($t0)
+                        $t8 := A3_AccountStateMachine_new_xfer_id(this)
+                        // $t9 := borrow_field<AccountStateMachine::Account>.pending($t0)
+                        $t9 := this
+                        // $t10 := Actor::virtual_time()
+                        $t10 := A1_Actor_virtual_time()
+                        // $t11 := pack AccountStateMachine::PendingTransfer($t8, $t2, $t10)
+                        {
+                            let $mem := $Malloc(32)
+                            $MemoryStoreU64(add($mem, 16), $t8)
+                            $MemoryStoreU64(add($mem, 24), v)
+                            $MemoryStoreU128(add($mem, 0), $t10)
+                            $t11 := $mem
+                        }
+                        // vector::push_back<AccountStateMachine::PendingTransfer>($t9, $t11)
+                        A1_vector_push_back$A3_AccountStateMachine_PendingTransfer$($t9, $t11)
+                        // $t12 := Actor::self()
+                        $t12 := A1_Actor_self()
+                        // AccountStateMachine::send_xfer_deposit($t1, $t2, $t12, $t8)
+                        A3_AccountStateMachine_send_xfer_deposit(dest, v, $t12, $t8)
+                        // return ()
+                        leave
+                    }
+                }
+            }
+
+            function A3_AccountStateMachine_xfer_deposit(this, v, caller_, xfer_id) {
+                // AccountStateMachine::deposit($t0, $t1)
+                A3_AccountStateMachine_deposit(this, v)
+                // AccountStateMachine::send_xfer_finish($t2, $t3)
+                A3_AccountStateMachine_send_xfer_finish(caller_, xfer_id)
+                // return ()
+            }
+
+            function A3_AccountStateMachine_xfer_finish(this, xfer_id) {
+                let tmp_$2, amount, i, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12
+                // $t5 := freeze_ref($t0)
+                $t5 := this
+                // $t6 := AccountStateMachine::find_xfer($t5, $t1)
+                $t6 := A3_AccountStateMachine_find_xfer($t5, xfer_id)
+                // $t7 := borrow_field<AccountStateMachine::Account>.pending($t0)
+                $t7 := this
+                // $t8 := vector::borrow<AccountStateMachine::PendingTransfer>($t7, $t6)
+                $t8 := A1_vector_borrow$A3_AccountStateMachine_PendingTransfer$($t7, $t6)
+                // $t9 := borrow_field<AccountStateMachine::PendingTransfer>.amount($t8)
+                $t9 := $IndexPtr($t8, 24)
+                // $t10 := read_ref($t9)
+                $t10 := $LoadU64($t9)
+                // $t11 := borrow_field<AccountStateMachine::Account>.pending($t0)
+                $t11 := this
+                // $t12 := vector::remove<AccountStateMachine::PendingTransfer>($t11, $t6)
+                $t12 := A1_vector_remove$A3_AccountStateMachine_PendingTransfer$($t11, $t6)
+                // destroy($t12)
+                $Free($t12, 32)
+                // AccountStateMachine::withdraw($t0, $t10)
+                A3_AccountStateMachine_withdraw(this, $t10)
+                // return ()
+            }
+
+            function A1_vector_remove$A3_AccountStateMachine_PendingTransfer$(v, i) -> $result {
+                let tmp_$2, tmp_$3, len, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15
+                let $block := 4
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L1
+                        // destroy($t0)
+                        // $t8 := 131072
+                        $t8 := 131072
+                        // abort($t8)
+                        $Abort($t8)
+                    }
+                    case 3 {
+                        // label L0
+                        // $t9 := 1
+                        $t9 := 1
+                        // $t10 := -($t6, $t9)
+                        $t10 := $Sub($t6, $t9)
+                        // goto L5
+                        $block := 5
+                    }
+                    case 4 {
+                        // $t5 := freeze_ref($t0)
+                        $t5 := v
+                        // $t6 := vector::length<#0>($t5)
+                        $t6 := A1_vector_length$A3_AccountStateMachine_PendingTransfer$($t5)
+                        // $t7 := >=($t1, $t6)
+                        $t7 := $GtEq(i, $t6)
+                        // if ($t7) goto L1 else goto L0
+                        switch $t7
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L5
+                        // $t11 := <($t1, $t10)
+                        $t11 := $Lt(i, $t10)
+                        // if ($t11) goto L3 else goto L2
+                        switch $t11
+                        case 0  { $block := 7 }
+                        default { $block := 6 }
+                    }
+                    case 6 {
+                        // label L3
+                        // goto L4
+                        $block := 8
+                    }
+                    case 7 {
+                        // label L2
+                        // $t15 := vector::pop_back<#0>($t0)
+                        $t15 := A1_vector_pop_back$A3_AccountStateMachine_PendingTransfer$(v)
+                        // return $t15
+                        $result := $t15
+                        leave
+                    }
+                    case 8 {
+                        // label L4
+                        // $t12 := copy($t1)
+                        $t12 := i
+                        // $t13 := 1
+                        $t13 := 1
+                        // $t14 := +($t1, $t13)
+                        $t14 := $AddU64(i, $t13)
+                        // $t1 := $t14
+                        i := $t14
+                        // vector::swap<#0>($t0, $t12, $t14)
+                        A1_vector_swap$A3_AccountStateMachine_PendingTransfer$(v, $t12, $t14)
+                        // goto L5
+                        $block := 5
+                    }
+                }
+            }
+
+            function A1_vector_swap$A3_AccountStateMachine_PendingTransfer$(v_ref, i, j) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if or($GtEq(i, size), $GtEq(j, size)) { $AbortBuiltin() }
+                let i_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+                let j_ptr := $IndexPtr(v_ptr, add(32, mul(j, 32)))
+                let i_val := $LoadU256(i_ptr)
+                let j_val := $LoadU256(j_ptr)
+                $StoreU256(i_ptr, j_val)
+                $StoreU256(j_ptr, i_val)
+            }
+            function A1_vector_pop_back$A3_AccountStateMachine_PendingTransfer$(v_ref) -> e {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if iszero(size) { $AbortBuiltin() }
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+                e := $LoadU256(e_ptr)
+                if $IsStoragePtr(e_ptr) {
+                    let e_offs := $OffsetPtr(e_ptr)
+                    let linked_src := $AlignedStorageLoad(e_offs)
+                    e := $Malloc(32)
+                    mstore(add(e, 0), $AlignedStorageLoad(add(linked_src, 0)))
+                    $AlignedStorageStore(add(linked_src, 0), 0)
+                    $AlignedStorageStore(e_offs, 0)
+                }
+                $StoreU64(v_ptr, sub(size, 1))
+            }
+            function A1_vector_length$A3_AccountStateMachine_PendingTransfer$(v_ref) -> len {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                len := $LoadU64(v_ptr)
+            }
+            function A1_vector_borrow$A3_AccountStateMachine_PendingTransfer$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 32)))
+                let e := $LoadU256(e_ptr)
+                e_ptr := $MakePtr($IsStoragePtr(v_ref), e)
+            }
+            function A3_AccountStateMachine_find_xfer(this, xfer_id) -> $result {
+                let tmp_$2, i, pending, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16
+                let $block := 3
+                for {} true {} {
+                    switch $block
+                    case 2 {
+                        // label L6
+                        // $t7 := vector::length<AccountStateMachine::PendingTransfer>($t5)
+                        $t7 := A1_vector_length$A3_AccountStateMachine_PendingTransfer$($t5)
+                        // $t8 := <($t3, $t7)
+                        $t8 := $Lt(i, $t7)
+                        // if ($t8) goto L1 else goto L0
+                        switch $t8
+                        case 0  { $block := 5 }
+                        default { $block := 4 }
+                    }
+                    case 3 {
+                        // $t5 := borrow_field<AccountStateMachine::Account>.pending($t0)
+                        $t5 := this
+                        // $t6 := 0
+                        $t6 := 0
+                        // $t3 := $t6
+                        i := $t6
+                        // goto L6
+                        $block := 2
+                    }
+                    case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
+                        // label L0
+                        // $t12 := false
+                        $t12 := false
+                        // $t2 := $t12
+                        tmp_$2 := $t12
+                        // goto L3
+                        $block := 7
+                    }
+                    case 6 {
+                        // label L2
+                        // $t9 := vector::borrow<AccountStateMachine::PendingTransfer>($t5, $t3)
+                        $t9 := A1_vector_borrow$A3_AccountStateMachine_PendingTransfer$($t5, i)
+                        // $t10 := borrow_field<AccountStateMachine::PendingTransfer>.xfer_id($t9)
+                        $t10 := $IndexPtr($t9, 16)
+                        // $t11 := read_ref($t10)
+                        $t11 := $LoadU64($t10)
+                        // $t2 := !=($t11, $t1)
+                        tmp_$2 := $Neq($t11, xfer_id)
+                        // goto L3
+                        $block := 7
+                    }
+                    case 7 {
+                        // label L3
+                        // if ($t2) goto L5 else goto L4
+                        switch tmp_$2
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
+                    }
+                    case 8 {
+                        // label L5
+                        // $t13 := 1
+                        $t13 := 1
+                        // $t3 := +($t3, $t13)
+                        i := $AddU64(i, $t13)
+                        // goto L6
+                        $block := 2
+                    }
+                    case 9 {
+                        // label L4
+                        // $t14 := vector::length<AccountStateMachine::PendingTransfer>($t5)
+                        $t14 := A1_vector_length$A3_AccountStateMachine_PendingTransfer$($t5)
+                        // $t15 := <($t3, $t14)
+                        $t15 := $Lt(i, $t14)
+                        // if ($t15) goto L8 else goto L7
+                        switch $t15
+                        case 0  { $block := 11 }
+                        default { $block := 10 }
+                    }
+                    case 10 {
+                        // label L8
+                        // goto L9
+                        $block := 12
+                    }
+                    case 11 {
+                        // label L7
+                        // $t16 := 3
+                        $t16 := 3
+                        // abort($t16)
+                        $Abort($t16)
+                    }
+                    case 12 {
+                        // label L9
+                        // return $t3
+                        $result := i
+                        leave
+                    }
+                }
+            }
+
+            function A3_AccountStateMachine_send_xfer_finish(actor,xfer_id) {
+                let $t2 := 0x6a51b363524e1e502dbe8698bec5f165b6cf490a68c4ee9063f2c2f0653ff0dd
+                let $t3 := 0xb8229d65
+                {
+                    let $t4 := mload(0)
+                    let $t5 := abi_encode_tuple_$address_uint64_uint64$_$address_u64_u64$($t4, actor,$t3,xfer_id)
+                    log1($t4, sub($t5, $t4), $t2)
+                    mstore(0, $t5)
+                }
+            }
+            function A3_AccountStateMachine_send_xfer_deposit(actor,v,caller_,xfer_id) {
+                let $t4 := 0x5163aa8ed9d57dbb55d2433f534c881e8fec62da43488c756dbd1ac604ce9c1b
+                let $t5 := 0x0b32e0fa
+                {
+                    let $t6 := mload(0)
+                    let $t7 := abi_encode_tuple_$address_uint64_uint64_address_uint64$_$address_u64_u64_address_u64$($t6, actor,$t5,v,caller_,xfer_id)
+                    log1($t6, sub($t7, $t6), $t4)
+                    mstore(0, $t7)
+                }
+            }
+            function A1_Actor_self() -> addr {
+              addr := address()
+            }
+            function A1_vector_push_back$A3_AccountStateMachine_PendingTransfer$(v_ref, e) {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+                $StoreU256(e_ptr, e)
+                if $IsStoragePtr(e_ptr) {
+                    let e_offs := $OffsetPtr(e_ptr)
+                    let $linked_dst_1341933877 := $NewLinkedStorageBase(0x4ffc4935)
+                    $AlignedStorageStore(add($linked_dst_1341933877, 0), mload(add(e, 0)))
+                    $Free(e, 32)
+                    $AlignedStorageStore(e_offs, $linked_dst_1341933877)
+                }
+                size := add(size, 1)
+                $StoreU64(v_ptr, size)
+                let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+                if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                    let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                    $StoreU256(v_ref, new_v_offs)
+                }
+            }
+            function A1_Actor_virtual_time() -> virtual_time {
+                virtual_time := timestamp()
+            }
+            function A3_AccountStateMachine_new_xfer_id(this) -> $result {
+                let counter, xfer_id, $t3, $t4, $t5, $t6, $t7
+                // $t3 := borrow_field<AccountStateMachine::Account>.xfer_id_counter($t0)
+                $t3 := $IndexPtr(this, 40)
+                // $t4 := read_ref($t3)
+                $t4 := $LoadU64($t3)
+                // $t5 := read_ref($t3)
+                $t5 := $LoadU64($t3)
+                // $t6 := 1
+                $t6 := 1
+                // $t7 := +($t5, $t6)
+                $t7 := $AddU64($t5, $t6)
+                // write_ref($t3, $t7)
+                $StoreU64($t3, $t7)
+                // return $t4
+                $result := $t4
+            }
+
+            function abi_encode_tuple_$address_uint64_uint64_address_uint64$_$address_u64_u64_address_u64$(headStart ,value_0, value_1, value_2, value_3, value_4) -> tail {
+                tail := add(headStart, 160)
+                abi_encode_address(value_0, add(headStart, 0))
+                abi_encode_uint64(value_1, add(headStart, 32))
+                abi_encode_uint64(value_2, add(headStart, 64))
+                abi_encode_address(value_3, add(headStart, 96))
+                abi_encode_uint64(value_4, add(headStart, 128))
+            }
+            function abi_encode_uint64(value, pos) {
+                mstore(pos, cleanup_uint64(value))
+            }
+            function cleanup_uint64(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffff)
+            }
+            function abi_encode_address(value, pos) {
+                mstore(pos, cleanup_address(value))
+            }
+            function cleanup_address(value) -> cleaned {
+                cleaned := and(value, 0xffffffffffffffffffffffffffffffffffffffff)
+            }
+            function abi_encode_tuple_$address_uint64_uint64$_$address_u64_u64$(headStart ,value_0, value_1, value_2) -> tail {
+                tail := add(headStart, 96)
+                abi_encode_address(value_0, add(headStart, 0))
+                abi_encode_uint64(value_1, add(headStart, 32))
+                abi_encode_uint64(value_2, add(headStart, 64))
+            }
+            function abi_encode_tuple__(headStart ) -> tail {
+                tail := add(headStart, 0)
+            }
+            function abi_decode_tuple_$uint64$_$u64$(headStart, dataEnd) -> value_0 {
+                if slt(sub(dataEnd, headStart), 32) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_uint64(offset, end) -> value {
+                value := calldataload(offset)
+                validator_uint64(value)
+            }
+            function validator_uint64(value) {
+                if iszero(eq(value, cleanup_uint64(value))) { $Abort(95) }
+            }
+            function abi_decode_tuple_$uint64_address_uint64$_$u64_address_u64$(headStart, dataEnd) -> value_0, value_1, value_2 {
+                if slt(sub(dataEnd, headStart), 96) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 64
+                    value_2 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function abi_decode_address(offset, end) -> value {
+                value := calldataload(offset)
+                validator_address(value)
+            }
+            function validator_address(value) {
+                if iszero(eq(value, cleanup_address(value))) { $Abort(95) }
+            }
+            function abi_decode_tuple_$address_uint64$_$address_u64$(headStart, dataEnd) -> value_0, value_1 {
+                if slt(sub(dataEnd, headStart), 64) { $Abort(96) }
+                {
+                    let offset := 0
+                    value_0 := abi_decode_address(add(headStart, offset), dataEnd)
+                }
+                {
+                    let offset := 32
+                    value_1 := abi_decode_uint64(add(headStart, offset), dataEnd)
+                }
+            }
+            function $Abort(code) {
+                mstore(0, code)
+                revert(24, 8) // TODO: store code as a string?
+            }
+            function $AbortBuiltin() {
+                $Abort(sub(0, 1))
+            }
+            function $Malloc(size) -> offs {
+                offs := mload(0)
+                // pad to word size
+                mstore(0, add(offs, shl(5, shr(5, add(size, 31)))))
+            }
+            function $Free(offs, size) {
+            }
+            function $MakePtr(is_storage, offs) -> ptr {
+              ptr := or(is_storage, shl(1, offs))
+            }
+            function $IsStoragePtr(ptr) -> b {
+              b := and(ptr, 0x1)
+            }
+            function $OffsetPtr(ptr) -> offs {
+              offs := shr(1, ptr)
+            }
+            function $MaskForSize(size) -> mask {
+              mask := sub(shl(shl(3, size), 1), 1)
+            }
+            function $ExtractBytes(word, start, size) -> bytes {
+               switch size
+               case 1 {
+                  // use the faster byte primitive
+                  bytes := byte(start, word)
+               }
+               default {
+                  // As we have big endian, we need to right shift the value from
+                  // where the highest byte starts in the word (32 - start), minus
+                  // the size.
+                  let shift_bits := shl(3, sub(sub(32, start), size))
+                  bytes := and(shr(shift_bits, word), $MaskForSize(size))
+               }
+            }
+            function $InjectBytes(word, start, size, bytes) -> new_word {
+               let shift_bits := shl(3, sub(sub(32, start), size))
+               // Blend out the bits which we inject
+               let neg_mask := not(shl(shift_bits, $MaskForSize(size)))
+               word := and(word, neg_mask)
+               // Overlay the bits we inject
+               new_word := or(word, shl(shift_bits, bytes))
+            }
+            function $ToWordOffs(offs) -> word_offs, byte_offset {
+              word_offs := shr(5, offs)
+              byte_offset := and(offs, 0x1F)
+            }
+            function $OverflowBytes(byte_offset, size) -> overflow_bytes {
+              let available_bytes := sub(32, byte_offset)
+              switch gt(size, available_bytes)
+              case 0 {
+                overflow_bytes := 0
+              }
+              default {
+                overflow_bytes := sub(size, available_bytes)
+              }
+            }
+            function $MemoryLoadBytes(offs, size) -> val {
+              // Lower bit where the value in the higher bytes ends
+              let bit_end := shl(3, sub(32, size))
+              val := shr(bit_end, mload(offs))
+            }
+            function $MemoryStoreBytes(offs, size, val) {
+              let bit_end := shl(3, sub(32, size))
+              let mask := shl(bit_end, $MaskForSize(size))
+              mstore(offs, or(and(mload(offs), not(mask)), shl(bit_end, val)))
+            }
+            function $StorageLoadBytes(offs, size) -> val {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              val := $ExtractBytes(sload(key), byte_offs, size)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              if $LogicalNot(iszero(overflow_bytes)) {
+                key := $StorageKey(0, add(word_offs, 1))
+                let extra_bytes := $ExtractBytes(sload(key), 0, overflow_bytes)
+                val := or(shl(shl(3, overflow_bytes), val), extra_bytes)
+              }
+            }
+            function $StorageStoreBytes(offs, size, bytes) {
+              let word_offs, byte_offs := $ToWordOffs(offs)
+              let key := $StorageKey(0, word_offs)
+              let overflow_bytes := $OverflowBytes(byte_offs, size)
+              switch overflow_bytes
+              case 0 {
+                sstore(key, $InjectBytes(sload(key), byte_offs, size, bytes))
+              }
+              default {
+                // Shift the higher bytes to the right
+                let used_bytes := sub(size, overflow_bytes)
+                let higher_bytes := shr(used_bytes, bytes)
+                let lower_bytes := and(bytes, $MaskForSize(overflow_bytes))
+                sstore(key, $InjectBytes(sload(key), byte_offs, used_bytes, higher_bytes))
+                key := $StorageKey(0, add(word_offs, 1))
+                sstore(key, $InjectBytes(sload(key), 0, overflow_bytes, lower_bytes))
+              }
+            }
+            function $StorageKey(group, word) -> key {
+              mstore(32, word)
+              mstore(64, shl(224, group))
+              key := keccak256(32, 36)
+            }
+            function $MakeTypeStorageBase(category, type_hash, id) -> offs {
+              offs := or(shl(252, category), or(shl(220, type_hash), shl(60, id)))
+            }
+            function $NewLinkedStorageBase(type_hash) -> offs {
+              let key := $StorageKey(1, 1)
+              let handle := sload(key)
+              sstore(key, add(handle, 1))
+              offs := $MakeTypeStorageBase(1, type_hash, handle)
+            }
+            function $IndexPtr(ptr, offs) -> new_ptr {
+              new_ptr := $MakePtr($IsStoragePtr(ptr), add($OffsetPtr(ptr), offs))
+            }
+            function $LoadU64(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU64(offs)
+              }
+              default {
+                val := $StorageLoadU64(offs)
+              }
+            }
+            function $MemoryLoadU64(offs) -> val {
+              val := $MemoryLoadBytes(offs, 8)
+            }
+            function $StorageLoadU64(offs) -> val {
+              val := $StorageLoadBytes(offs, 8)
+            }
+            function $StoreU64(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU64(offs, val)
+              }
+              default {
+                $StorageStoreU64(offs, val)
+              }
+            }
+            function $MemoryStoreU64(offs, val) {
+              $MemoryStoreBytes(offs, 8, val)
+            }
+            function $StorageStoreU64(offs, val) {
+              $StorageStoreBytes(offs, 8, val)
+            }
+            function $LoadU128(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU128(offs)
+              }
+              default {
+                val := $StorageLoadU128(offs)
+              }
+            }
+            function $MemoryLoadU128(offs) -> val {
+              val := $MemoryLoadBytes(offs, 16)
+            }
+            function $StorageLoadU128(offs) -> val {
+              val := $StorageLoadBytes(offs, 16)
+            }
+            function $MemoryStoreU128(offs, val) {
+              $MemoryStoreBytes(offs, 16, val)
+            }
+            function $LoadU256(ptr) -> val {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                val := $MemoryLoadU256(offs)
+              }
+              default {
+                val := $StorageLoadU256(offs)
+              }
+            }
+            function $MemoryLoadU256(offs) -> val {
+              val := $MemoryLoadBytes(offs, 32)
+            }
+            function $StorageLoadU256(offs) -> val {
+              val := $StorageLoadBytes(offs, 32)
+            }
+            function $StoreU256(ptr, val) {
+              let offs := $OffsetPtr(ptr)
+              switch $IsStoragePtr(ptr)
+              case 0 {
+                $MemoryStoreU256(offs, val)
+              }
+              default {
+                $StorageStoreU256(offs, val)
+              }
+            }
+            function $MemoryStoreU256(offs, val) {
+              $MemoryStoreBytes(offs, 32, val)
+            }
+            function $StorageStoreU256(offs, val) {
+              $StorageStoreBytes(offs, 32, val)
+            }
+            function $AlignedStorageLoad(offs) -> val {
+              let word_offs := shr(5, offs)
+              val := sload($StorageKey(0, word_offs))
+            }
+            function $AlignedStorageStore(offs, val) {
+              let word_offs := shr(5, offs)
+              sstore($StorageKey(0, word_offs), val)
+            }
+            function $CopyMemory(src, dst, size) {
+              let num_words, overflow_bytes := $ToWordOffs(size)
+              let i := 0
+              for { } lt(i, mul(num_words, 32)) { i := add(i, 32) } {
+                mstore(add(dst, i), mload(add(src, i)))
+              }
+              if overflow_bytes {
+                let mask := $MaskForSize(sub(32, overflow_bytes))
+                let overflow_offs := mul(num_words, 32)
+                let dst_word := and(mload(add(dst, overflow_offs)), mask)
+                let src_word := and(mload(add(src, overflow_offs)), not(mask))
+                mstore(add(dst, overflow_offs), or(dst_word, src_word))
+              }
+            }
+            function $ResizeVector(v_offs, capacity, type_size) -> new_v_offs {
+                let new_capacity := mul(capacity, 2)
+                let data_size := add(32, mul(capacity, type_size))
+                let new_data_size := add(32, mul(new_capacity, type_size))
+                new_v_offs := $Malloc(new_data_size)
+                $CopyMemory(v_offs, new_v_offs, data_size)
+                // update capacity at new location
+                $MemoryStoreU64(add(new_v_offs, 8), new_capacity)
+                $Free(v_offs, data_size)
+            }
+            function $AddU64(x, y) -> r {
+                if lt(sub(0xffffffffffffffff, x), y) { $AbortBuiltin() }
+                r := add(x, y)
+            }
+            function $Sub(x, y) -> r {
+                if lt(x, y) { $AbortBuiltin() }
+                r := sub(x, y)
+            }
+            function $Shr(x, y) -> r {
+                r := shr(y, x)
+            }
+            function $Lt(x, y) -> r {
+                r := lt(x, y)
+            }
+            function $GtEq(x, y) -> r {
+                r := or(gt(x, y), eq(x, y))
+            }
+            function $Neq(x, y) -> r {
+                r := $LogicalNot(eq(x, y))
+            }
+            function $LogicalNot(x) -> r {
+                r := iszero(x)
+            }
+        }
+    }
+}
+
+
+!! Succeeded compiling Yul
diff --git a/language/evm/move-to-yul/tests/AccountStateMachine.move b/language/evm/move-to-yul/tests/AccountStateMachine.move
new file mode 100644
index 0000000000..8eeae6733f
--- /dev/null
+++ b/language/evm/move-to-yul/tests/AccountStateMachine.move
@@ -0,0 +1,101 @@
+#[actor]
+/// This is an instance of the Account example using an explicit state machine and one-way message passing.
+///
+/// In this example, we need to manage rpc state explicitly, remembering any outstanding transfers in the
+/// actors state. This creates a little more code, but also is somehow more transparent and true to the
+/// transactional semantics of Move. This version implements an additional `cleanup` message which cancels
+/// pending transactions over a certain age.
+module 0x3::AccountStateMachine {
+
+    use Async::Actor::{self, virtual_time};
+    use std::vector;
+
+    const MAX: u64 = 43;
+    const MAX_TRANSFER_AGE: u128 = 100000000;
+
+    #[state]
+    struct Account {
+        value: u64,
+        xfer_id_counter: u64,
+        pending: vector<PendingTransfer>
+    }
+
+    struct PendingTransfer has drop {
+       xfer_id: u64,
+       amount: u64,
+       initiated_at: u128,
+    }
+
+    #[init]
+    fun init(): Account {
+        Account{value: 0, xfer_id_counter: 0, pending: vector::empty()}
+    }
+
+    #[message]
+    fun deposit(this: &mut Account, v: u64) {
+        assert!(MAX - this.value >= v, 1);
+        this.value = this.value + v;
+    }
+
+    #[message]
+    fun withdraw(this: &mut Account, v: u64) {
+        assert!(this.value >= v, 2);
+        this.value = this.value - v;
+    }
+
+    #[message]
+    fun xfer(this: &mut Account, dest: address, v: u64) {
+        // Do not initiate the transfer if there are not enough funds.
+        assert!(this.value >= v, 1);
+        let xfer_id = new_xfer_id(this);
+        vector::push_back(&mut this.pending, PendingTransfer{xfer_id, amount: v, initiated_at: virtual_time()});
+        // Call into a special version of deposit which calls us back once done.
+        send_xfer_deposit(dest, v, self(), xfer_id);
+    }
+
+    fun new_xfer_id(this: &mut Account): u64 {
+        let counter = &mut this.xfer_id_counter;
+        let xfer_id = *counter;
+        *counter = *counter + 1;
+        xfer_id
+    }
+
+    #[message]
+    fun xfer_deposit(this: &mut Account, v: u64, caller_: address, xfer_id: u64) {
+        deposit(this, v);
+        send_xfer_finish(caller_, xfer_id);
+    }
+
+    #[message]
+    fun xfer_finish(this: &mut Account, xfer_id: u64) {
+        let i = find_xfer(this, xfer_id);
+        let amount = vector::borrow(&this.pending, i).amount;
+        vector::remove(&mut this.pending, i);
+        withdraw(this, amount)
+    }
+
+    fun find_xfer(this: &Account, xfer_id: u64): u64 {
+        let pending = &this.pending;
+        let i = 0;
+        while (i < vector::length(pending) && vector::borrow(pending, i).xfer_id != xfer_id) {
+            i = i + 1;
+        };
+        assert!(i < vector::length(pending), 3);
+        i
+    }
+
+    #[message]
+    /// A periodical cleanup which removes dated pending transfers.
+    fun cleanup(this: &mut Account) {
+        let pending = &mut this.pending;
+        let i = 0;
+        while (i < vector::length(pending)) {
+            let p = vector::borrow(pending, i);
+            if (virtual_time() - p.initiated_at >= MAX_TRANSFER_AGE) {
+                vector::remove(pending, i);
+            } else {
+                i = i + 1;
+            }
+        }
+    }
+}
diff --git a/language/evm/move-to-yul/tests/Arithm.exp b/language/evm/move-to-yul/tests/Arithm.exp
index f688b61a9f..ed4e735fec 100644
--- a/language/evm/move-to-yul/tests/Arithm.exp
+++ b/language/evm/move-to-yul/tests/Arithm.exp
@@ -96,14 +96,14 @@ object "A2_M" {
             }
             $Abort(97)
             function A2_M_add_two_number(x, y) -> $result0, $result1 {
-                let res, z, $t4, $t5
-                // $t4 := +($t0, $t1)
-                $t4 := $AddU64(x, y)
-                // $t5 := 3
-                $t5 := 3
-                // return ($t5, $t4)
-                $result0 := $t5
-                $result1 := $t4
+                let res, $t3, $t4
+                // $t3 := +($t0, $t1)
+                $t3 := $AddU64(x, y)
+                // $t4 := 3
+                $t4 := 3
+                // return ($t4, $t3)
+                $result0 := $t4
+                $result1 := $t3
             }
 
             function A2_M_arithmetic_ops(a) -> $result0, $result1 {
@@ -112,14 +112,14 @@ object "A2_M" {
                 for {} true {} {
                     switch $block
                     case 2 {
-                        // label L0
+                        // label L1
                         // $t5 := 42
                         $t5 := 42
                         // abort($t5)
                         $Abort($t5)
                     }
                     case 3 {
-                        // label L2
+                        // label L0
                         // return ($t2, $t0)
                         $result0 := $t2
                         $result1 := a
@@ -132,7 +132,7 @@ object "A2_M" {
                         $t3 := 2
                         // $t4 := !=($t2, $t3)
                         $t4 := $Neq($t2, $t3)
-                        // if ($t4) goto L0 else goto L2
+                        // if ($t4) goto L1 else goto L0
                         switch $t4
                         case 0  { $block := 3 }
                         default { $block := 2 }
@@ -146,34 +146,34 @@ object "A2_M" {
                 for {} true {} {
                     switch $block
                     case 2 {
-                        // label L0
+                        // label L1
                         // $t2 := >=($t0, $t1)
                         tmp_$2 := $GtEq(a, b)
-                        // goto L3
+                        // goto L2
                         $block := 5
                     }
                     case 3 {
-                        // label L2
+                        // label L0
                         // $t7 := false
                         $t7 := false
                         // $t2 := $t7
                         tmp_$2 := $t7
-                        // goto L3
+                        // goto L2
                         $block := 5
                     }
                     case 4 {
                         // $t6 := >($t0, $t1)
                         $t6 := $Gt(a, b)
-                        // if ($t6) goto L0 else goto L2
+                        // if ($t6) goto L1 else goto L0
                         switch $t6
                         case 0  { $block := 3 }
                         default { $block := 2 }
                     }
                     case 5 {
-                        // label L3
+                        // label L2
                         // $t8 := <($t0, $t1)
                         $t8 := $Lt(a, b)
-                        // if ($t8) goto L4 else goto L6
+                        // if ($t8) goto L4 else goto L3
                         switch $t8
                         case 0  { $block := 7 }
                         default { $block := 6 }
@@ -184,36 +184,36 @@ object "A2_M" {
                         $t9 := true
                         // $t3 := $t9
                         tmp_$3 := $t9
-                        // goto L7
+                        // goto L5
                         $block := 8
                     }
                     case 7 {
-                        // label L6
+                        // label L3
                         // $t3 := <=($t0, $t1)
                         tmp_$3 := $LtEq(a, b)
-                        // goto L7
+                        // goto L5
                         $block := 8
                     }
                     case 8 {
-                        // label L7
+                        // label L5
                         // $t10 := !=($t2, $t3)
                         $t10 := $Neq(tmp_$2, tmp_$3)
                         // $t11 := !($t10)
                         $t11 := $LogicalNot($t10)
-                        // if ($t11) goto L8 else goto L10
+                        // if ($t11) goto L7 else goto L6
                         switch $t11
                         case 0  { $block := 10 }
                         default { $block := 9 }
                     }
                     case 9 {
-                        // label L8
+                        // label L7
                         // $t12 := 42
                         $t12 := 42
                         // abort($t12)
                         $Abort($t12)
                     }
                     case 10 {
-                        // label L10
+                        // label L6
                         // return ($t2, $t3)
                         $result0 := tmp_$2
                         $result1 := tmp_$3
@@ -244,15 +244,15 @@ object "A2_M" {
             }
 
             function A2_M_underflow() -> $result {
-                let x, $t1, $t2, $t3
-                // $t1 := 0
-                $t1 := 0
-                // $t2 := 1
-                $t2 := 1
-                // $t3 := -($t1, $t2)
-                $t3 := $Sub($t1, $t2)
-                // return $t3
-                $result := $t3
+                let $t0, $t1, $t2
+                // $t0 := 0
+                $t0 := 0
+                // $t1 := 1
+                $t1 := 1
+                // $t2 := -($t0, $t1)
+                $t2 := $Sub($t0, $t1)
+                // return $t2
+                $result := $t2
             }
 
             function abi_encode_tuple_$uint64$_$u64$(headStart ,value_0) -> tail {
@@ -391,53 +391,63 @@ object "test_A2_M_test_add_two_number" {
         A2_M_test_add_two_number()
         return (0, 0)
         function A2_M_test_add_two_number() {
-            let res, z, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+            let res, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t8 := 100
-                    $t8 := 100
-                    // abort($t8)
-                    $Abort($t8)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t9 := 7
-                    $t9 := 7
-                    // $t10 := ==($t5, $t9)
-                    $t10 := $Eq($t5, $t9)
-                    // if ($t10) goto L2 else goto L3
-                    switch $t10
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
                 }
                 case 4 {
-                    // $t2 := 2
-                    $t2 := 2
-                    // $t3 := 5
-                    $t3 := 5
-                    // ($t4, $t5) := M::add_two_number($t2, $t3)
-                    $t4, $t5 := A2_M_add_two_number($t2, $t3)
-                    // $t6 := 3
-                    $t6 := 3
-                    // $t7 := ==($t4, $t6)
-                    $t7 := $Eq($t4, $t6)
-                    // if ($t7) goto L0 else goto L1
-                    switch $t7
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t1 := 2
+                    $t1 := 2
+                    // $t2 := 5
+                    $t2 := 5
+                    // ($t3, $t4) := M::add_two_number($t1, $t2)
+                    $t3, $t4 := A2_M_add_two_number($t1, $t2)
+                    // $t5 := 3
+                    $t5 := 3
+                    // $t6 := ==($t3, $t5)
+                    $t6 := $Eq($t3, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
-                    // $t11 := 101
-                    $t11 := 101
-                    // abort($t11)
-                    $Abort($t11)
+                    // label L2
+                    // $t8 := 7
+                    $t8 := 7
+                    // $t9 := ==($t4, $t8)
+                    $t9 := $Eq($t4, $t8)
+                    // if ($t9) goto L4 else goto L3
+                    switch $t9
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
                 }
                 case 6 {
-                    // label L2
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t10 := 101
+                    $t10 := 101
+                    // abort($t10)
+                    $Abort($t10)
+                }
+                case 8 {
+                    // label L5
                     // return ()
                     leave
                 }
@@ -445,14 +455,14 @@ object "test_A2_M_test_add_two_number" {
         }
 
         function A2_M_add_two_number(x, y) -> $result0, $result1 {
-            let res, z, $t4, $t5
-            // $t4 := +($t0, $t1)
-            $t4 := $AddU64(x, y)
-            // $t5 := 3
-            $t5 := 3
-            // return ($t5, $t4)
-            $result0 := $t5
-            $result1 := $t4
+            let res, $t3, $t4
+            // $t3 := +($t0, $t1)
+            $t3 := $AddU64(x, y)
+            // $t4 := 3
+            $t4 := 3
+            // return ($t4, $t3)
+            $result0 := $t4
+            $result1 := $t3
         }
 
         function $Abort(code) {
@@ -471,7 +481,7 @@ object "test_A2_M_test_add_two_number" {
         }
     }
 }
-===> Test result of M::test_add_two_number: Succeed(Stopped) (used_gas=355): []
+===> Test result of M::test_add_two_number: Succeed(Stopped) (used_gas=677): []
 
 // test of M::test_add_two_number_overflow
 /* =======================================
@@ -485,27 +495,27 @@ object "test_A2_M_test_add_two_number_overflow" {
         A2_M_test_add_two_number_overflow()
         return (0, 0)
         function A2_M_test_add_two_number_overflow() {
-            let _res, _z, $t2, $t3, $t4, $t5
-            // $t2 := 18446744073709551615
-            $t2 := 18446744073709551615
-            // $t3 := 1
-            $t3 := 1
-            // ($t4, $t5) := M::add_two_number($t2, $t3)
-            $t4, $t5 := A2_M_add_two_number($t2, $t3)
-            // destroy($t5)
-            // destroy($t4)
+            let $t0, $t1, $t2, $t3
+            // $t0 := 18446744073709551615
+            $t0 := 18446744073709551615
+            // $t1 := 1
+            $t1 := 1
+            // ($t2, $t3) := M::add_two_number($t0, $t1)
+            $t2, $t3 := A2_M_add_two_number($t0, $t1)
+            // destroy($t3)
+            // destroy($t2)
             // return ()
         }
 
         function A2_M_add_two_number(x, y) -> $result0, $result1 {
-            let res, z, $t4, $t5
-            // $t4 := +($t0, $t1)
-            $t4 := $AddU64(x, y)
-            // $t5 := 3
-            $t5 := 3
-            // return ($t5, $t4)
-            $result0 := $t5
-            $result1 := $t4
+            let res, $t3, $t4
+            // $t3 := +($t0, $t1)
+            $t3 := $AddU64(x, y)
+            // $t4 := 3
+            $t4 := 3
+            // return ($t4, $t3)
+            $result0 := $t4
+            $result1 := $t3
         }
 
         function $Abort(code) {
@@ -535,53 +545,63 @@ object "test_A2_M_test_add_two_number_wrong_assert" {
         A2_M_test_add_two_number_wrong_assert()
         return (0, 0)
         function A2_M_test_add_two_number_wrong_assert() {
-            let res, z, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+            let res, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t8 := 100
-                    $t8 := 100
-                    // abort($t8)
-                    $Abort($t8)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t9 := 6
-                    $t9 := 6
-                    // $t10 := ==($t5, $t9)
-                    $t10 := $Eq($t5, $t9)
-                    // if ($t10) goto L2 else goto L3
-                    switch $t10
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
                 }
                 case 4 {
-                    // $t2 := 2
-                    $t2 := 2
-                    // $t3 := 5
-                    $t3 := 5
-                    // ($t4, $t5) := M::add_two_number($t2, $t3)
-                    $t4, $t5 := A2_M_add_two_number($t2, $t3)
-                    // $t6 := 3
-                    $t6 := 3
-                    // $t7 := ==($t4, $t6)
-                    $t7 := $Eq($t4, $t6)
-                    // if ($t7) goto L0 else goto L1
-                    switch $t7
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t1 := 2
+                    $t1 := 2
+                    // $t2 := 5
+                    $t2 := 5
+                    // ($t3, $t4) := M::add_two_number($t1, $t2)
+                    $t3, $t4 := A2_M_add_two_number($t1, $t2)
+                    // $t5 := 3
+                    $t5 := 3
+                    // $t6 := ==($t3, $t5)
+                    $t6 := $Eq($t3, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
-                    // $t11 := 101
-                    $t11 := 101
-                    // abort($t11)
-                    $Abort($t11)
+                    // label L2
+                    // $t8 := 6
+                    $t8 := 6
+                    // $t9 := ==($t4, $t8)
+                    $t9 := $Eq($t4, $t8)
+                    // if ($t9) goto L4 else goto L3
+                    switch $t9
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
                 }
                 case 6 {
-                    // label L2
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t10 := 101
+                    $t10 := 101
+                    // abort($t10)
+                    $Abort($t10)
+                }
+                case 8 {
+                    // label L5
                     // return ()
                     leave
                 }
@@ -589,14 +609,14 @@ object "test_A2_M_test_add_two_number_wrong_assert" {
         }
 
         function A2_M_add_two_number(x, y) -> $result0, $result1 {
-            let res, z, $t4, $t5
-            // $t4 := +($t0, $t1)
-            $t4 := $AddU64(x, y)
-            // $t5 := 3
-            $t5 := 3
-            // return ($t5, $t4)
-            $result0 := $t5
-            $result1 := $t4
+            let res, $t3, $t4
+            // $t3 := +($t0, $t1)
+            $t3 := $AddU64(x, y)
+            // $t4 := 3
+            $t4 := 3
+            // return ($t4, $t3)
+            $result0 := $t4
+            $result1 := $t3
         }
 
         function $Abort(code) {
@@ -615,7 +635,7 @@ object "test_A2_M_test_add_two_number_wrong_assert" {
         }
     }
 }
-===> Test result of M::test_add_two_number_wrong_assert: Revert(Reverted) (used_gas=356): [0, 0, 0, 0, 0, 0, 0, 101]
+===> Test result of M::test_add_two_number_wrong_assert: Revert(Reverted) (used_gas=545): [0, 0, 0, 0, 0, 0, 0, 101]
 
 // test of M::test_arithmetic_ops_aborts
 /* =======================================
@@ -629,51 +649,61 @@ object "test_A2_M_test_arithmetic_ops_aborts" {
         A2_M_test_arithmetic_ops_aborts()
         return (0, 0)
         function A2_M_test_arithmetic_ops_aborts() {
-            let r1, r2, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
+            let r2, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t7 := 100
-                    $t7 := 100
-                    // abort($t7)
-                    $Abort($t7)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t8 := 3
-                    $t8 := 3
-                    // $t9 := ==($t4, $t8)
-                    $t9 := $Eq($t4, $t8)
-                    // if ($t9) goto L2 else goto L3
-                    switch $t9
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
+                    // $t6 := 100
+                    $t6 := 100
+                    // abort($t6)
+                    $Abort($t6)
                 }
                 case 4 {
-                    // $t2 := 3
-                    $t2 := 3
-                    // ($t3, $t4) := M::arithmetic_ops($t2)
-                    $t3, $t4 := A2_M_arithmetic_ops($t2)
-                    // $t5 := 1
-                    $t5 := 1
-                    // $t6 := ==($t3, $t5)
-                    $t6 := $Eq($t3, $t5)
-                    // if ($t6) goto L0 else goto L1
-                    switch $t6
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t1 := 3
+                    $t1 := 3
+                    // ($t2, $t3) := M::arithmetic_ops($t1)
+                    $t2, $t3 := A2_M_arithmetic_ops($t1)
+                    // $t4 := 1
+                    $t4 := 1
+                    // $t5 := ==($t2, $t4)
+                    $t5 := $Eq($t2, $t4)
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
-                    // $t10 := 101
-                    $t10 := 101
-                    // abort($t10)
-                    $Abort($t10)
+                    // label L2
+                    // $t7 := 3
+                    $t7 := 3
+                    // $t8 := ==($t3, $t7)
+                    $t8 := $Eq($t3, $t7)
+                    // if ($t8) goto L4 else goto L3
+                    switch $t8
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
                 }
                 case 6 {
-                    // label L2
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t9 := 101
+                    $t9 := 101
+                    // abort($t9)
+                    $Abort($t9)
+                }
+                case 8 {
+                    // label L5
                     // return ()
                     leave
                 }
@@ -686,14 +716,14 @@ object "test_A2_M_test_arithmetic_ops_aborts" {
             for {} true {} {
                 switch $block
                 case 2 {
-                    // label L0
+                    // label L1
                     // $t5 := 42
                     $t5 := 42
                     // abort($t5)
                     $Abort($t5)
                 }
                 case 3 {
-                    // label L2
+                    // label L0
                     // return ($t2, $t0)
                     $result0 := $t2
                     $result1 := a
@@ -706,7 +736,7 @@ object "test_A2_M_test_arithmetic_ops_aborts" {
                     $t3 := 2
                     // $t4 := !=($t2, $t3)
                     $t4 := $Neq($t2, $t3)
-                    // if ($t4) goto L0 else goto L2
+                    // if ($t4) goto L1 else goto L0
                     switch $t4
                     case 0  { $block := 3 }
                     default { $block := 2 }
@@ -729,7 +759,7 @@ object "test_A2_M_test_arithmetic_ops_aborts" {
         }
     }
 }
-===> Test result of M::test_arithmetic_ops_aborts: Revert(Reverted) (used_gas=404): [0, 0, 0, 0, 0, 0, 0, 100]
+===> Test result of M::test_arithmetic_ops_aborts: Revert(Reverted) (used_gas=420): [0, 0, 0, 0, 0, 0, 0, 100]
 
 // test of M::test_bool_ops
 /* =======================================
@@ -743,53 +773,63 @@ object "test_A2_M_test_bool_ops" {
         A2_M_test_bool_ops()
         return (0, 0)
         function A2_M_test_bool_ops() {
-            let r1, r2, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+            let r2, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t8 := 100
-                    $t8 := 100
-                    // abort($t8)
-                    $Abort($t8)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t9 := false
-                    $t9 := false
-                    // $t10 := ==($t5, $t9)
-                    $t10 := $Eq($t5, $t9)
-                    // if ($t10) goto L2 else goto L3
-                    switch $t10
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
                 }
                 case 4 {
-                    // $t2 := 3
-                    $t2 := 3
-                    // $t3 := 2
-                    $t3 := 2
-                    // ($t4, $t5) := M::bool_ops($t2, $t3)
-                    $t4, $t5 := A2_M_bool_ops($t2, $t3)
-                    // $t6 := true
-                    $t6 := true
-                    // $t7 := ==($t4, $t6)
-                    $t7 := $Eq($t4, $t6)
-                    // if ($t7) goto L0 else goto L1
-                    switch $t7
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t1 := 3
+                    $t1 := 3
+                    // $t2 := 2
+                    $t2 := 2
+                    // ($t3, $t4) := M::bool_ops($t1, $t2)
+                    $t3, $t4 := A2_M_bool_ops($t1, $t2)
+                    // $t5 := true
+                    $t5 := true
+                    // $t6 := ==($t3, $t5)
+                    $t6 := $Eq($t3, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
-                    // $t11 := 101
-                    $t11 := 101
-                    // abort($t11)
-                    $Abort($t11)
+                    // label L2
+                    // $t8 := false
+                    $t8 := false
+                    // $t9 := ==($t4, $t8)
+                    $t9 := $Eq($t4, $t8)
+                    // if ($t9) goto L4 else goto L3
+                    switch $t9
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
                 }
                 case 6 {
-                    // label L2
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t10 := 101
+                    $t10 := 101
+                    // abort($t10)
+                    $Abort($t10)
+                }
+                case 8 {
+                    // label L5
                     // return ()
                     leave
                 }
@@ -802,34 +842,34 @@ object "test_A2_M_test_bool_ops" {
             for {} true {} {
                 switch $block
                 case 2 {
-                    // label L0
+                    // label L1
                     // $t2 := >=($t0, $t1)
                     tmp_$2 := $GtEq(a, b)
-                    // goto L3
+                    // goto L2
                     $block := 5
                 }
                 case 3 {
-                    // label L2
+                    // label L0
                     // $t7 := false
                     $t7 := false
                     // $t2 := $t7
                     tmp_$2 := $t7
-                    // goto L3
+                    // goto L2
                     $block := 5
                 }
                 case 4 {
                     // $t6 := >($t0, $t1)
                     $t6 := $Gt(a, b)
-                    // if ($t6) goto L0 else goto L2
+                    // if ($t6) goto L1 else goto L0
                     switch $t6
                     case 0  { $block := 3 }
                     default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
+                    // label L2
                     // $t8 := <($t0, $t1)
                     $t8 := $Lt(a, b)
-                    // if ($t8) goto L4 else goto L6
+                    // if ($t8) goto L4 else goto L3
                     switch $t8
                     case 0  { $block := 7 }
                     default { $block := 6 }
@@ -840,36 +880,36 @@ object "test_A2_M_test_bool_ops" {
                     $t9 := true
                     // $t3 := $t9
                     tmp_$3 := $t9
-                    // goto L7
+                    // goto L5
                     $block := 8
                 }
                 case 7 {
-                    // label L6
+                    // label L3
                     // $t3 := <=($t0, $t1)
                     tmp_$3 := $LtEq(a, b)
-                    // goto L7
+                    // goto L5
                     $block := 8
                 }
                 case 8 {
-                    // label L7
+                    // label L5
                     // $t10 := !=($t2, $t3)
                     $t10 := $Neq(tmp_$2, tmp_$3)
                     // $t11 := !($t10)
                     $t11 := $LogicalNot($t10)
-                    // if ($t11) goto L8 else goto L10
+                    // if ($t11) goto L7 else goto L6
                     switch $t11
                     case 0  { $block := 10 }
                     default { $block := 9 }
                 }
                 case 9 {
-                    // label L8
+                    // label L7
                     // $t12 := 42
                     $t12 := 42
                     // abort($t12)
                     $Abort($t12)
                 }
                 case 10 {
-                    // label L10
+                    // label L6
                     // return ($t2, $t3)
                     $result0 := tmp_$2
                     $result1 := tmp_$3
@@ -905,7 +945,7 @@ object "test_A2_M_test_bool_ops" {
         }
     }
 }
-===> Test result of M::test_bool_ops: Succeed(Stopped) (used_gas=1228): []
+===> Test result of M::test_bool_ops: Succeed(Stopped) (used_gas=1491): []
 
 // test of M::test_bool_ops_aborts
 /* =======================================
@@ -925,20 +965,16 @@ object "test_A2_M_test_bool_ops_aborts" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t6 := 100
                     $t6 := 100
                     // abort($t6)
                     $Abort($t6)
                 }
-                case 3 {
-                    // label L0
-                    // $t7 := !=($t2, $t3)
-                    $t7 := $Neq($t2, $t3)
-                    // if ($t7) goto L2 else goto L3
-                    switch $t7
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t2 := true
                     $t2 := true
@@ -948,72 +984,101 @@ object "test_A2_M_test_bool_ops_aborts" {
                     $t4 := $Eq($t2, $t3)
                     // $t5 := !($t4)
                     $t5 := $LogicalNot($t4)
-                    // if ($t5) goto L0 else goto L1
+                    // if ($t5) goto L1 else goto L0
                     switch $t5
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t7 := !=($t2, $t3)
+                    $t7 := $Neq($t2, $t3)
+                    // if ($t7) goto L4 else goto L3
+                    switch $t7
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t8 := 101
                     $t8 := 101
                     // abort($t8)
                     $Abort($t8)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t9 := !($t2)
                     $t9 := $LogicalNot($t2)
                     // $t10 := !($t3)
                     $t10 := $LogicalNot($t3)
                     // $t11 := !=($t9, $t10)
                     $t11 := $Neq($t9, $t10)
-                    // if ($t11) goto L4 else goto L5
+                    // if ($t11) goto L7 else goto L6
                     switch $t11
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t12 := 102
                     $t12 := 102
                     // abort($t12)
                     $Abort($t12)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t13 := !($t3)
                     $t13 := $LogicalNot($t3)
-                    // if ($t13) goto L6 else goto L7
+                    // if ($t13) goto L10 else goto L9
                     switch $t13
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t14 := 103
                     $t14 := 103
                     // abort($t14)
                     $Abort($t14)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // $t15 := !($t2)
                     $t15 := $LogicalNot($t2)
-                    // if ($t15) goto L8 else goto L9
+                    // if ($t15) goto L13 else goto L12
                     switch $t15
-                    case 0  { $block := 11 }
-                    default { $block := 12 }
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
                 }
-                case 11 {
-                    // label L9
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
                     // $t16 := 104
                     $t16 := 104
                     // abort($t16)
                     $Abort($t16)
                 }
-                case 12 {
-                    // label L8
+                case 17 {
+                    // label L14
                     // return ()
                     leave
                 }
@@ -1035,7 +1100,7 @@ object "test_A2_M_test_bool_ops_aborts" {
         }
     }
 }
-===> Test result of M::test_bool_ops_aborts: Revert(Reverted) (used_gas=1081): [0, 0, 0, 0, 0, 0, 0, 104]
+===> Test result of M::test_bool_ops_aborts: Revert(Reverted) (used_gas=2075): [0, 0, 0, 0, 0, 0, 0, 104]
 
 // test of M::test_div
 /* =======================================
@@ -1049,53 +1114,63 @@ object "test_A2_M_test_div" {
         A2_M_test_div()
         return (0, 0)
         function A2_M_test_div() {
-            let r1, r2, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+            let r2, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t8 := 100
-                    $t8 := 100
-                    // abort($t8)
-                    $Abort($t8)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t9 := 3
-                    $t9 := 3
-                    // $t10 := ==($t5, $t9)
-                    $t10 := $Eq($t5, $t9)
-                    // if ($t10) goto L2 else goto L3
-                    switch $t10
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
                 }
                 case 4 {
-                    // $t2 := 7
-                    $t2 := 7
-                    // $t3 := 4
-                    $t3 := 4
-                    // ($t4, $t5) := M::div($t2, $t3)
-                    $t4, $t5 := A2_M_div($t2, $t3)
-                    // $t6 := 1
-                    $t6 := 1
-                    // $t7 := ==($t4, $t6)
-                    $t7 := $Eq($t4, $t6)
-                    // if ($t7) goto L0 else goto L1
-                    switch $t7
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t1 := 7
+                    $t1 := 7
+                    // $t2 := 4
+                    $t2 := 4
+                    // ($t3, $t4) := M::div($t1, $t2)
+                    $t3, $t4 := A2_M_div($t1, $t2)
+                    // $t5 := 1
+                    $t5 := 1
+                    // $t6 := ==($t3, $t5)
+                    $t6 := $Eq($t3, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
-                    // $t11 := 101
-                    $t11 := 101
-                    // abort($t11)
-                    $Abort($t11)
+                    // label L2
+                    // $t8 := 3
+                    $t8 := 3
+                    // $t9 := ==($t4, $t8)
+                    $t9 := $Eq($t4, $t8)
+                    // if ($t9) goto L4 else goto L3
+                    switch $t9
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
                 }
                 case 6 {
-                    // label L2
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t10 := 101
+                    $t10 := 101
+                    // abort($t10)
+                    $Abort($t10)
+                }
+                case 8 {
+                    // label L5
                     // return ()
                     leave
                 }
@@ -1133,7 +1208,7 @@ object "test_A2_M_test_div" {
         }
     }
 }
-===> Test result of M::test_div: Succeed(Stopped) (used_gas=355): []
+===> Test result of M::test_div: Succeed(Stopped) (used_gas=661): []
 
 // test of M::test_div_by_zero
 /* =======================================
@@ -1147,15 +1222,15 @@ object "test_A2_M_test_div_by_zero" {
         A2_M_test_div_by_zero()
         return (0, 0)
         function A2_M_test_div_by_zero() {
-            let _r1, _r2, $t2, $t3, $t4, $t5
-            // $t2 := 7
-            $t2 := 7
-            // $t3 := 0
-            $t3 := 0
-            // ($t4, $t5) := M::div($t2, $t3)
-            $t4, $t5 := A2_M_div($t2, $t3)
-            // destroy($t5)
-            // destroy($t4)
+            let $t0, $t1, $t2, $t3
+            // $t0 := 7
+            $t0 := 7
+            // $t1 := 0
+            $t1 := 0
+            // ($t2, $t3) := M::div($t0, $t1)
+            $t2, $t3 := A2_M_div($t0, $t1)
+            // destroy($t3)
+            // destroy($t2)
             // return ()
         }
 
@@ -1201,53 +1276,63 @@ object "test_A2_M_test_div_wrong_assert" {
         A2_M_test_div_wrong_assert()
         return (0, 0)
         function A2_M_test_div_wrong_assert() {
-            let r1, r2, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+            let r2, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t8 := 100
-                    $t8 := 100
-                    // abort($t8)
-                    $Abort($t8)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t9 := 2
-                    $t9 := 2
-                    // $t10 := ==($t5, $t9)
-                    $t10 := $Eq($t5, $t9)
-                    // if ($t10) goto L2 else goto L3
-                    switch $t10
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
+                    // $t7 := 100
+                    $t7 := 100
+                    // abort($t7)
+                    $Abort($t7)
                 }
                 case 4 {
-                    // $t2 := 7
-                    $t2 := 7
-                    // $t3 := 4
-                    $t3 := 4
-                    // ($t4, $t5) := M::div($t2, $t3)
-                    $t4, $t5 := A2_M_div($t2, $t3)
-                    // $t6 := 1
-                    $t6 := 1
-                    // $t7 := ==($t4, $t6)
-                    $t7 := $Eq($t4, $t6)
-                    // if ($t7) goto L0 else goto L1
-                    switch $t7
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t1 := 7
+                    $t1 := 7
+                    // $t2 := 4
+                    $t2 := 4
+                    // ($t3, $t4) := M::div($t1, $t2)
+                    $t3, $t4 := A2_M_div($t1, $t2)
+                    // $t5 := 1
+                    $t5 := 1
+                    // $t6 := ==($t3, $t5)
+                    $t6 := $Eq($t3, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
-                    // $t11 := 101
-                    $t11 := 101
-                    // abort($t11)
-                    $Abort($t11)
+                    // label L2
+                    // $t8 := 2
+                    $t8 := 2
+                    // $t9 := ==($t4, $t8)
+                    $t9 := $Eq($t4, $t8)
+                    // if ($t9) goto L4 else goto L3
+                    switch $t9
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
                 }
                 case 6 {
-                    // label L2
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t10 := 101
+                    $t10 := 101
+                    // abort($t10)
+                    $Abort($t10)
+                }
+                case 8 {
+                    // label L5
                     // return ()
                     leave
                 }
@@ -1285,7 +1370,7 @@ object "test_A2_M_test_div_wrong_assert" {
         }
     }
 }
-===> Test result of M::test_div_wrong_assert: Revert(Reverted) (used_gas=348): [0, 0, 0, 0, 0, 0, 0, 101]
+===> Test result of M::test_div_wrong_assert: Revert(Reverted) (used_gas=529): [0, 0, 0, 0, 0, 0, 0, 101]
 
 // test of M::test_multiple_ops
 /* =======================================
@@ -1299,39 +1384,44 @@ object "test_A2_M_test_multiple_ops" {
         A2_M_test_multiple_ops()
         return (0, 0)
         function A2_M_test_multiple_ops() {
-            let r, $t1, $t2, $t3, $t4, $t5, $t6, $t7
+            let $t0, $t1, $t2, $t3, $t4, $t5, $t6
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t7 := 100
-                    $t7 := 100
-                    // abort($t7)
-                    $Abort($t7)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // return ()
-                    leave
+                    // $t6 := 100
+                    $t6 := 100
+                    // abort($t6)
+                    $Abort($t6)
                 }
                 case 4 {
-                    // $t1 := 3
-                    $t1 := 3
-                    // $t2 := 2
-                    $t2 := 2
-                    // $t3 := 5
-                    $t3 := 5
-                    // $t4 := M::multiple_ops($t1, $t2, $t3)
-                    $t4 := A2_M_multiple_ops($t1, $t2, $t3)
-                    // $t5 := 13
-                    $t5 := 13
-                    // $t6 := ==($t4, $t5)
-                    $t6 := $Eq($t4, $t5)
-                    // if ($t6) goto L0 else goto L1
-                    switch $t6
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t0 := 3
+                    $t0 := 3
+                    // $t1 := 2
+                    $t1 := 2
+                    // $t2 := 5
+                    $t2 := 5
+                    // $t3 := M::multiple_ops($t0, $t1, $t2)
+                    $t3 := A2_M_multiple_ops($t0, $t1, $t2)
+                    // $t4 := 13
+                    $t4 := 13
+                    // $t5 := ==($t3, $t4)
+                    $t5 := $Eq($t3, $t4)
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    leave
                 }
             }
         }
@@ -1366,7 +1456,7 @@ object "test_A2_M_test_multiple_ops" {
         }
     }
 }
-===> Test result of M::test_multiple_ops: Succeed(Stopped) (used_gas=176): []
+===> Test result of M::test_multiple_ops: Succeed(Stopped) (used_gas=265): []
 
 // test of M::test_multiple_overflow
 /* =======================================
@@ -1380,39 +1470,44 @@ object "test_A2_M_test_multiple_overflow" {
         A2_M_test_multiple_overflow()
         return (0, 0)
         function A2_M_test_multiple_overflow() {
-            let r, $t1, $t2, $t3, $t4, $t5, $t6, $t7
+            let $t0, $t1, $t2, $t3, $t4, $t5, $t6
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t7 := 100
-                    $t7 := 100
-                    // abort($t7)
-                    $Abort($t7)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // return ()
-                    leave
+                    // $t6 := 100
+                    $t6 := 100
+                    // abort($t6)
+                    $Abort($t6)
                 }
                 case 4 {
-                    // $t1 := 0
-                    $t1 := 0
-                    // $t2 := 18446744073709551615
-                    $t2 := 18446744073709551615
-                    // $t3 := 2
-                    $t3 := 2
-                    // $t4 := M::multiple_ops($t1, $t2, $t3)
-                    $t4 := A2_M_multiple_ops($t1, $t2, $t3)
-                    // $t5 := 0
-                    $t5 := 0
-                    // $t6 := ==($t4, $t5)
-                    $t6 := $Eq($t4, $t5)
-                    // if ($t6) goto L0 else goto L1
-                    switch $t6
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t0 := 0
+                    $t0 := 0
+                    // $t1 := 18446744073709551615
+                    $t1 := 18446744073709551615
+                    // $t2 := 2
+                    $t2 := 2
+                    // $t3 := M::multiple_ops($t0, $t1, $t2)
+                    $t3 := A2_M_multiple_ops($t0, $t1, $t2)
+                    // $t4 := 0
+                    $t4 := 0
+                    // $t5 := ==($t3, $t4)
+                    $t5 := $Eq($t3, $t4)
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    leave
                 }
             }
         }
@@ -1447,7 +1542,7 @@ object "test_A2_M_test_multiple_overflow" {
         }
     }
 }
-===> Test result of M::test_multiple_overflow: Revert(Reverted) (used_gas=21): [255, 255, 255, 255, 255, 255, 255, 255]
+===> Test result of M::test_multiple_overflow: Revert(Reverted) (used_gas=125): [255, 255, 255, 255, 255, 255, 255, 255]
 
 // test of M::test_underflow
 /* =======================================
@@ -1461,23 +1556,23 @@ object "test_A2_M_test_underflow" {
         A2_M_test_underflow()
         return (0, 0)
         function A2_M_test_underflow() {
-            let _r, $t1
-            // $t1 := M::underflow()
-            $t1 := A2_M_underflow()
-            // destroy($t1)
+            let $t0
+            // $t0 := M::underflow()
+            $t0 := A2_M_underflow()
+            // destroy($t0)
             // return ()
         }
 
         function A2_M_underflow() -> $result {
-            let x, $t1, $t2, $t3
-            // $t1 := 0
-            $t1 := 0
-            // $t2 := 1
-            $t2 := 1
-            // $t3 := -($t1, $t2)
-            $t3 := $Sub($t1, $t2)
-            // return $t3
-            $result := $t3
+            let $t0, $t1, $t2
+            // $t0 := 0
+            $t0 := 0
+            // $t1 := 1
+            $t1 := 1
+            // $t2 := -($t0, $t1)
+            $t2 := $Sub($t0, $t1)
+            // return $t2
+            $result := $t2
         }
 
         function $Abort(code) {
diff --git a/language/evm/move-to-yul/tests/ControlStructures.exp b/language/evm/move-to-yul/tests/ControlStructures.exp
index 91e40dfac2..f2832b853d 100644
--- a/language/evm/move-to-yul/tests/ControlStructures.exp
+++ b/language/evm/move-to-yul/tests/ControlStructures.exp
@@ -76,57 +76,62 @@ object "A2_M" {
                 for {} true {} {
                     switch $block
                     case 2 {
-                        // label L0
-                        // $t3 := 2
-                        $t3 := 2
-                        // $t4 := %($t0, $t3)
-                        $t4 := $Mod(x, $t3)
-                        // $t5 := 0
-                        $t5 := 0
-                        // $t6 := ==($t4, $t5)
-                        $t6 := $Eq($t4, $t5)
-                        // if ($t6) goto L3 else goto L5
-                        switch $t6
-                        case 0  { $block := 6 }
-                        default { $block := 5 }
+                        // label L1
+                        // goto L2
+                        $block := 5
                     }
                     case 3 {
-                        // label L2
+                        // label L0
                         // return ()
                         leave
                     }
                     case 4 {
-                        // label L7
+                        // label L6
                         // $t1 := 0
                         $t1 := 0
                         // $t2 := >($t0, $t1)
                         $t2 := $Gt(x, $t1)
-                        // if ($t2) goto L0 else goto L2
+                        // if ($t2) goto L1 else goto L0
                         switch $t2
                         case 0  { $block := 3 }
                         default { $block := 2 }
                     }
                     case 5 {
-                        // label L3
+                        // label L2
+                        // $t3 := 2
+                        $t3 := 2
+                        // $t4 := %($t0, $t3)
+                        $t4 := $Mod(x, $t3)
+                        // $t5 := 0
+                        $t5 := 0
+                        // $t6 := ==($t4, $t5)
+                        $t6 := $Eq($t4, $t5)
+                        // if ($t6) goto L4 else goto L3
+                        switch $t6
+                        case 0  { $block := 7 }
+                        default { $block := 6 }
+                    }
+                    case 6 {
+                        // label L4
                         // $t7 := 1
                         $t7 := 1
                         // $t0 := +($t0, $t7)
                         x := $AddU64(x, $t7)
-                        // goto L6
-                        $block := 7
+                        // goto L5
+                        $block := 8
                     }
-                    case 6 {
-                        // label L5
+                    case 7 {
+                        // label L3
                         // $t8 := 2
                         $t8 := 2
                         // $t0 := -($t0, $t8)
                         x := $Sub(x, $t8)
-                        // goto L6
-                        $block := 7
+                        // goto L5
+                        $block := 8
                     }
-                    case 7 {
-                        // label L6
-                        // goto L7
+                    case 8 {
+                        // label L5
+                        // goto L6
                         $block := 4
                     }
                 }
@@ -138,24 +143,20 @@ object "A2_M" {
                 for {} true {} {
                     switch $block
                     case 2 {
-                        // label L0
-                        // $t3 := 1
-                        $t3 := 1
-                        // $t0 := -($t0, $t3)
-                        x := $Sub(x, $t3)
-                        // goto L3
-                        $block := 4
+                        // label L1
+                        // goto L2
+                        $block := 5
                     }
                     case 3 {
-                        // label L2
+                        // label L0
                         // $t4 := 0
                         $t4 := 0
                         // $t5 := ==($t0, $t4)
                         $t5 := $Eq(x, $t4)
-                        // if ($t5) goto L4 else goto L3
+                        // if ($t5) goto L5 else goto L4
                         switch $t5
-                        case 0  { $block := 4 }
-                        default { $block := 5 }
+                        case 0  { $block := 7 }
+                        default { $block := 6 }
                     }
                     case 4 {
                         // label L3
@@ -163,13 +164,32 @@ object "A2_M" {
                         $t1 := 1
                         // $t2 := >=($t0, $t1)
                         $t2 := $GtEq(x, $t1)
-                        // if ($t2) goto L0 else goto L2
+                        // if ($t2) goto L1 else goto L0
                         switch $t2
                         case 0  { $block := 3 }
                         default { $block := 2 }
                     }
                     case 5 {
+                        // label L2
+                        // $t3 := 1
+                        $t3 := 1
+                        // $t0 := -($t0, $t3)
+                        x := $Sub(x, $t3)
+                        // goto L3
+                        $block := 4
+                    }
+                    case 6 {
+                        // label L5
+                        // goto L6
+                        $block := 8
+                    }
+                    case 7 {
                         // label L4
+                        // goto L3
+                        $block := 4
+                    }
+                    case 8 {
+                        // label L6
                         // return ()
                         leave
                     }
@@ -182,21 +202,21 @@ object "A2_M" {
                 for {} true {} {
                     switch $block
                     case 2 {
-                        // label L0
+                        // label L1
                         // $t4 := 1
                         $t4 := 1
                         // $t1 := $t4
                         tmp_$1 := $t4
-                        // goto L3
+                        // goto L2
                         $block := 5
                     }
                     case 3 {
-                        // label L2
+                        // label L0
                         // $t5 := 2
                         $t5 := 2
                         // $t1 := $t5
                         tmp_$1 := $t5
-                        // goto L3
+                        // goto L2
                         $block := 5
                     }
                     case 4 {
@@ -204,13 +224,13 @@ object "A2_M" {
                         $t2 := 0
                         // $t3 := >($t0, $t2)
                         $t3 := $Gt(x, $t2)
-                        // if ($t3) goto L0 else goto L2
+                        // if ($t3) goto L1 else goto L0
                         switch $t3
                         case 0  { $block := 3 }
                         default { $block := 2 }
                     }
                     case 5 {
-                        // label L3
+                        // label L2
                         // return $t1
                         $result := tmp_$1
                         leave
@@ -224,14 +244,14 @@ object "A2_M" {
                 for {} true {} {
                     switch $block
                     case 2 {
-                        // label L0
+                        // label L1
                         // $t3 := 1
                         $t3 := 1
                         // abort($t3)
                         $Abort($t3)
                     }
                     case 3 {
-                        // label L2
+                        // label L0
                         // return ()
                         leave
                     }
@@ -240,7 +260,7 @@ object "A2_M" {
                         $t1 := 0
                         // $t2 := >($t0, $t1)
                         $t2 := $Gt(x, $t1)
-                        // if ($t2) goto L0 else goto L2
+                        // if ($t2) goto L1 else goto L0
                         switch $t2
                         case 0  { $block := 3 }
                         default { $block := 2 }
diff --git a/language/evm/move-to-yul/tests/GlobalVectors.exp b/language/evm/move-to-yul/tests/GlobalVectors.exp
index 35221656ad..fcee1e13c2 100644
--- a/language/evm/move-to-yul/tests/GlobalVectors.exp
+++ b/language/evm/move-to-yul/tests/GlobalVectors.exp
@@ -54,17 +54,16 @@ object "test_A2_GlobalVectors_test_borrow_mut_global" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t27 := 102
                     $t27 := 102
                     // abort($t27)
                     $Abort($t27)
                 }
-                case 3 {
-                    // label L0
-                    // return ()
-                    $Free($locals, 64)
-                    leave
-                }
                 case 4 {
                     // $t2 := vector::empty<u64>()
                     mstore($locals, A1_vector_empty$u64$())
@@ -169,10 +168,16 @@ object "test_A2_GlobalVectors_test_borrow_mut_global" {
                     $t25 := 12
                     // $t26 := ==($t24, $t25)
                     $t26 := $Eq($t24, $t25)
-                    // if ($t26) goto L0 else goto L1
+                    // if ($t26) goto L1 else goto L0
                     switch $t26
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 64)
+                    leave
                 }
             }
         }
@@ -437,7 +442,7 @@ object "test_A2_GlobalVectors_test_borrow_mut_global" {
         }
     }
 }
-===> Test result of GlobalVectors::test_borrow_mut_global: Succeed(Stopped) (used_gas=117306): []
+===> Test result of GlobalVectors::test_borrow_mut_global: Succeed(Stopped) (used_gas=117389): []
 
 // test of GlobalVectors::test_move_from
 /* =======================================
@@ -451,82 +456,68 @@ object "test_A2_GlobalVectors_test_move_from" {
         A2_GlobalVectors_test_move_from()
         return (0, 0)
         function A2_GlobalVectors_test_move_from() {
-            let local_t, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59
+            let $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58
             let $locals := $Malloc(96)
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t20 := 101
-                    $t20 := 101
-                    // abort($t20)
-                    $Abort($t20)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t21 := borrow_local($t3)
-                    $t21 := $MakePtr(false, add($locals, 64))
-                    // $t22 := 0
-                    $t22 := 0
-                    // $t23 := vector::borrow<u64>($t21, $t22)
-                    $t23 := A1_vector_borrow$u64$($t21, $t22)
-                    // $t24 := read_ref($t23)
-                    $t24 := $LoadU64($t23)
-                    // $t25 := 10
-                    $t25 := 10
-                    // $t26 := ==($t24, $t25)
-                    $t26 := $Eq($t24, $t25)
-                    // if ($t26) goto L2 else goto L3
-                    switch $t26
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
+                    // $t19 := 101
+                    $t19 := 101
+                    // abort($t19)
+                    $Abort($t19)
                 }
                 case 4 {
-                    // $t2 := vector::empty<u64>()
+                    // $t1 := vector::empty<u64>()
                     mstore($locals, A1_vector_empty$u64$())
-                    // $t4 := borrow_local($t2)
-                    $t4 := $MakePtr(false, $locals)
-                    // $t5 := 10
-                    $t5 := 10
-                    // vector::push_back<u64>($t4, $t5)
-                    A1_vector_push_back$u64$($t4, $t5)
-                    // $t6 := borrow_local($t2)
-                    $t6 := $MakePtr(false, $locals)
-                    // $t7 := 11
-                    $t7 := 11
-                    // vector::push_back<u64>($t6, $t7)
-                    A1_vector_push_back$u64$($t6, $t7)
-                    // $t8 := borrow_local($t2)
-                    $t8 := $MakePtr(false, $locals)
-                    // $t9 := 12
-                    $t9 := 12
-                    // vector::push_back<u64>($t8, $t9)
-                    A1_vector_push_back$u64$($t8, $t9)
-                    // $t10 := 0x42
-                    $t10 := 0x42
-                    // $t0 := Evm::sign($t10)
-                    mstore(add($locals, 32), A2_Evm_sign($t10))
-                    // $t11 := borrow_local($t0)
-                    $t11 := $MakePtr(false, add($locals, 32))
-                    // $t12 := move($t2)
-                    $t12 := mload($locals)
-                    // $t13 := pack GlobalVectors::T<u64>($t12)
+                    // $t3 := borrow_local($t1)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := 10
+                    $t4 := 10
+                    // vector::push_back<u64>($t3, $t4)
+                    A1_vector_push_back$u64$($t3, $t4)
+                    // $t5 := borrow_local($t1)
+                    $t5 := $MakePtr(false, $locals)
+                    // $t6 := 11
+                    $t6 := 11
+                    // vector::push_back<u64>($t5, $t6)
+                    A1_vector_push_back$u64$($t5, $t6)
+                    // $t7 := borrow_local($t1)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := 12
+                    $t8 := 12
+                    // vector::push_back<u64>($t7, $t8)
+                    A1_vector_push_back$u64$($t7, $t8)
+                    // $t9 := 0x42
+                    $t9 := 0x42
+                    // $t0 := Evm::sign($t9)
+                    mstore(add($locals, 32), A2_Evm_sign($t9))
+                    // $t10 := borrow_local($t0)
+                    $t10 := $MakePtr(false, add($locals, 32))
+                    // $t11 := move($t1)
+                    $t11 := mload($locals)
+                    // $t12 := pack GlobalVectors::T<u64>($t11)
                     {
                         let $mem := $Malloc(32)
-                        $MemoryStoreU256(add($mem, 0), $t12)
-                        $t13 := $mem
+                        $MemoryStoreU256(add($mem, 0), $t11)
+                        $t12 := $mem
                     }
-                    // move_to<GlobalVectors::T<u64>>($t13, $t11)
+                    // move_to<GlobalVectors::T<u64>>($t12, $t10)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $LoadU256($t11))
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $LoadU256($t10))
                         if $AlignedStorageLoad($base_offset) {
                           $AbortBuiltin()
                         }
                         $AlignedStorageStore($base_offset, true)
                         {
                             let $dst := add($base_offset, 32)
-                            let $src := $t13
+                            let $src := $t12
                             {
                                 let $linked_src_814019441 := mload(add($src, 0))
                                 let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
@@ -544,11 +535,11 @@ object "test_A2_GlobalVectors_test_move_from" {
                             $Free($src, 32)
                         }
                     }
-                    // $t14 := 0x42
-                    $t14 := 0x42
-                    // $t15 := move_from<GlobalVectors::T<u64>>($t14)
+                    // $t13 := 0x42
+                    $t13 := 0x42
+                    // $t14 := move_from<GlobalVectors::T<u64>>($t13)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t14)
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t13)
                         if iszero($AlignedStorageLoad($base_offset)) {
                           $AbortBuiltin()
                         }
@@ -575,150 +566,194 @@ object "test_A2_GlobalVectors_test_move_from" {
                                 mstore(add($dst, 0), $linked_dst_814019441)
                                 $AlignedStorageStore(add($src, 0), 0)
                             }
-                            $t15 := $dst
+                            $t14 := $dst
                         }
                     }
-                    // $t3 := unpack GlobalVectors::T<u64>($t15)
-                    mstore(add($locals, 64), $MemoryLoadU256(add($t15, 0)))
-                    $Free($t15, 32)
-                    // $t16 := borrow_local($t3)
-                    $t16 := $MakePtr(false, add($locals, 64))
-                    // $t17 := vector::length<u64>($t16)
-                    $t17 := A1_vector_length$u64$($t16)
-                    // $t18 := 3
-                    $t18 := 3
-                    // $t19 := ==($t17, $t18)
-                    $t19 := $Eq($t17, $t18)
-                    // if ($t19) goto L0 else goto L1
-                    switch $t19
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t2 := unpack GlobalVectors::T<u64>($t14)
+                    mstore(add($locals, 64), $MemoryLoadU256(add($t14, 0)))
+                    $Free($t14, 32)
+                    // $t15 := borrow_local($t2)
+                    $t15 := $MakePtr(false, add($locals, 64))
+                    // $t16 := vector::length<u64>($t15)
+                    $t16 := A1_vector_length$u64$($t15)
+                    // $t17 := 3
+                    $t17 := 3
+                    // $t18 := ==($t16, $t17)
+                    $t18 := $Eq($t16, $t17)
+                    // if ($t18) goto L1 else goto L0
+                    switch $t18
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
-                    // $t27 := 102
-                    $t27 := 102
-                    // abort($t27)
-                    $Abort($t27)
-                }
-                case 6 {
                     // label L2
-                    // $t28 := borrow_local($t3)
-                    $t28 := $MakePtr(false, add($locals, 64))
-                    // $t29 := 1
-                    $t29 := 1
-                    // $t30 := vector::borrow<u64>($t28, $t29)
-                    $t30 := A1_vector_borrow$u64$($t28, $t29)
-                    // $t31 := read_ref($t30)
-                    $t31 := $LoadU64($t30)
-                    // $t32 := 11
-                    $t32 := 11
-                    // $t33 := ==($t31, $t32)
-                    $t33 := $Eq($t31, $t32)
-                    // if ($t33) goto L4 else goto L5
-                    switch $t33
+                    // $t20 := borrow_local($t2)
+                    $t20 := $MakePtr(false, add($locals, 64))
+                    // $t21 := 0
+                    $t21 := 0
+                    // $t22 := vector::borrow<u64>($t20, $t21)
+                    $t22 := A1_vector_borrow$u64$($t20, $t21)
+                    // $t23 := read_ref($t22)
+                    $t23 := $LoadU64($t22)
+                    // $t24 := 10
+                    $t24 := 10
+                    // $t25 := ==($t23, $t24)
+                    $t25 := $Eq($t23, $t24)
+                    // if ($t25) goto L4 else goto L3
+                    switch $t25
                     case 0  { $block := 7 }
-                    default { $block := 8 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
                 }
                 case 7 {
-                    // label L5
-                    // $t34 := 103
-                    $t34 := 103
-                    // abort($t34)
-                    $Abort($t34)
+                    // label L3
+                    // $t26 := 102
+                    $t26 := 102
+                    // abort($t26)
+                    $Abort($t26)
                 }
                 case 8 {
-                    // label L4
-                    // $t35 := borrow_local($t3)
-                    $t35 := $MakePtr(false, add($locals, 64))
-                    // $t36 := 2
-                    $t36 := 2
-                    // $t37 := vector::borrow<u64>($t35, $t36)
-                    $t37 := A1_vector_borrow$u64$($t35, $t36)
-                    // $t38 := read_ref($t37)
-                    $t38 := $LoadU64($t37)
-                    // $t39 := 12
-                    $t39 := 12
-                    // $t40 := ==($t38, $t39)
-                    $t40 := $Eq($t38, $t39)
-                    // if ($t40) goto L6 else goto L7
-                    switch $t40
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    // label L5
+                    // $t27 := borrow_local($t2)
+                    $t27 := $MakePtr(false, add($locals, 64))
+                    // $t28 := 1
+                    $t28 := 1
+                    // $t29 := vector::borrow<u64>($t27, $t28)
+                    $t29 := A1_vector_borrow$u64$($t27, $t28)
+                    // $t30 := read_ref($t29)
+                    $t30 := $LoadU64($t29)
+                    // $t31 := 11
+                    $t31 := 11
+                    // $t32 := ==($t30, $t31)
+                    $t32 := $Eq($t30, $t31)
+                    // if ($t32) goto L7 else goto L6
+                    switch $t32
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
                 case 9 {
                     // label L7
-                    // $t41 := 104
-                    $t41 := 104
-                    // abort($t41)
-                    $Abort($t41)
+                    // goto L8
+                    $block := 11
                 }
                 case 10 {
                     // label L6
-                    // $t42 := borrow_local($t3)
-                    $t42 := $MakePtr(false, add($locals, 64))
-                    // $t43 := 13
-                    $t43 := 13
-                    // vector::push_back<u64>($t42, $t43)
-                    A1_vector_push_back$u64$($t42, $t43)
-                    // $t44 := borrow_local($t3)
-                    $t44 := $MakePtr(false, add($locals, 64))
-                    // $t45 := 14
-                    $t45 := 14
-                    // vector::push_back<u64>($t44, $t45)
-                    A1_vector_push_back$u64$($t44, $t45)
-                    // $t46 := borrow_local($t3)
-                    $t46 := $MakePtr(false, add($locals, 64))
-                    // $t47 := 3
-                    $t47 := 3
-                    // $t48 := vector::borrow<u64>($t46, $t47)
-                    $t48 := A1_vector_borrow$u64$($t46, $t47)
-                    // $t49 := read_ref($t48)
-                    $t49 := $LoadU64($t48)
-                    // $t50 := 13
-                    $t50 := 13
-                    // $t51 := ==($t49, $t50)
-                    $t51 := $Eq($t49, $t50)
-                    // if ($t51) goto L8 else goto L9
-                    switch $t51
-                    case 0  { $block := 11 }
-                    default { $block := 12 }
+                    // $t33 := 103
+                    $t33 := 103
+                    // abort($t33)
+                    $Abort($t33)
                 }
                 case 11 {
-                    // label L9
-                    // $t52 := 105
-                    $t52 := 105
-                    // abort($t52)
-                    $Abort($t52)
-                }
-                case 12 {
                     // label L8
-                    // $t53 := borrow_local($t3)
-                    $t53 := $MakePtr(false, add($locals, 64))
-                    // $t54 := 4
-                    $t54 := 4
-                    // $t55 := vector::borrow<u64>($t53, $t54)
-                    $t55 := A1_vector_borrow$u64$($t53, $t54)
-                    // $t56 := read_ref($t55)
-                    $t56 := $LoadU64($t55)
-                    // $t57 := 14
-                    $t57 := 14
-                    // $t58 := ==($t56, $t57)
-                    $t58 := $Eq($t56, $t57)
-                    // if ($t58) goto L10 else goto L11
-                    switch $t58
+                    // $t34 := borrow_local($t2)
+                    $t34 := $MakePtr(false, add($locals, 64))
+                    // $t35 := 2
+                    $t35 := 2
+                    // $t36 := vector::borrow<u64>($t34, $t35)
+                    $t36 := A1_vector_borrow$u64$($t34, $t35)
+                    // $t37 := read_ref($t36)
+                    $t37 := $LoadU64($t36)
+                    // $t38 := 12
+                    $t38 := 12
+                    // $t39 := ==($t37, $t38)
+                    $t39 := $Eq($t37, $t38)
+                    // if ($t39) goto L10 else goto L9
+                    switch $t39
                     case 0  { $block := 13 }
-                    default { $block := 14 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
                 }
                 case 13 {
-                    // label L11
-                    // $t59 := 106
-                    $t59 := 106
-                    // abort($t59)
-                    $Abort($t59)
+                    // label L9
+                    // $t40 := 104
+                    $t40 := 104
+                    // abort($t40)
+                    $Abort($t40)
                 }
                 case 14 {
-                    // label L10
+                    // label L11
+                    // $t41 := borrow_local($t2)
+                    $t41 := $MakePtr(false, add($locals, 64))
+                    // $t42 := 13
+                    $t42 := 13
+                    // vector::push_back<u64>($t41, $t42)
+                    A1_vector_push_back$u64$($t41, $t42)
+                    // $t43 := borrow_local($t2)
+                    $t43 := $MakePtr(false, add($locals, 64))
+                    // $t44 := 14
+                    $t44 := 14
+                    // vector::push_back<u64>($t43, $t44)
+                    A1_vector_push_back$u64$($t43, $t44)
+                    // $t45 := borrow_local($t2)
+                    $t45 := $MakePtr(false, add($locals, 64))
+                    // $t46 := 3
+                    $t46 := 3
+                    // $t47 := vector::borrow<u64>($t45, $t46)
+                    $t47 := A1_vector_borrow$u64$($t45, $t46)
+                    // $t48 := read_ref($t47)
+                    $t48 := $LoadU64($t47)
+                    // $t49 := 13
+                    $t49 := 13
+                    // $t50 := ==($t48, $t49)
+                    $t50 := $Eq($t48, $t49)
+                    // if ($t50) goto L13 else goto L12
+                    switch $t50
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
+                }
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
+                    // $t51 := 105
+                    $t51 := 105
+                    // abort($t51)
+                    $Abort($t51)
+                }
+                case 17 {
+                    // label L14
+                    // $t52 := borrow_local($t2)
+                    $t52 := $MakePtr(false, add($locals, 64))
+                    // $t53 := 4
+                    $t53 := 4
+                    // $t54 := vector::borrow<u64>($t52, $t53)
+                    $t54 := A1_vector_borrow$u64$($t52, $t53)
+                    // $t55 := read_ref($t54)
+                    $t55 := $LoadU64($t54)
+                    // $t56 := 14
+                    $t56 := 14
+                    // $t57 := ==($t55, $t56)
+                    $t57 := $Eq($t55, $t56)
+                    // if ($t57) goto L16 else goto L15
+                    switch $t57
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t58 := 106
+                    $t58 := 106
+                    // abort($t58)
+                    $Abort($t58)
+                }
+                case 20 {
+                    // label L17
                     // return ()
                     $Free($locals, 96)
                     leave
@@ -993,7 +1028,7 @@ object "test_A2_GlobalVectors_test_move_from" {
         }
     }
 }
-===> Test result of GlobalVectors::test_move_from: Succeed(Stopped) (used_gas=97011): []
+===> Test result of GlobalVectors::test_move_from: Succeed(Stopped) (used_gas=98498): []
 
 // test of GlobalVectors::test_move_from_vector_of_struct
 /* =======================================
@@ -1014,34 +1049,16 @@ object "test_A2_GlobalVectors_test_move_from_vector_of_struct" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t25 := 101
                     $t25 := 101
                     // abort($t25)
                     $Abort($t25)
                 }
-                case 3 {
-                    // label L0
-                    // $t26 := borrow_local($t1)
-                    $t26 := $MakePtr(false, local_t)
-                    // $t27 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t26)
-                    $t27 := $t26
-                    // $t28 := 0
-                    $t28 := 0
-                    // $t29 := vector::borrow<GlobalVectors::S>($t27, $t28)
-                    $t29 := A1_vector_borrow$A2_GlobalVectors_S$($t27, $t28)
-                    // $t30 := borrow_field<GlobalVectors::S>.x($t29)
-                    $t30 := $t29
-                    // $t31 := read_ref($t30)
-                    $t31 := $LoadU128($t30)
-                    // $t32 := 10
-                    $t32 := 10
-                    // $t33 := ==($t31, $t32)
-                    $t33 := $Eq($t31, $t32)
-                    // if ($t33) goto L2 else goto L3
-                    switch $t33
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t2 := vector::empty<GlobalVectors::S>()
                     mstore($locals, A1_vector_empty$A2_GlobalVectors_S$())
@@ -1188,20 +1205,48 @@ object "test_A2_GlobalVectors_test_move_from_vector_of_struct" {
                     $t23 := 3
                     // $t24 := ==($t22, $t23)
                     $t24 := $Eq($t22, $t23)
-                    // if ($t24) goto L0 else goto L1
+                    // if ($t24) goto L1 else goto L0
                     switch $t24
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t26 := borrow_local($t1)
+                    $t26 := $MakePtr(false, local_t)
+                    // $t27 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t26)
+                    $t27 := $t26
+                    // $t28 := 0
+                    $t28 := 0
+                    // $t29 := vector::borrow<GlobalVectors::S>($t27, $t28)
+                    $t29 := A1_vector_borrow$A2_GlobalVectors_S$($t27, $t28)
+                    // $t30 := borrow_field<GlobalVectors::S>.x($t29)
+                    $t30 := $t29
+                    // $t31 := read_ref($t30)
+                    $t31 := $LoadU128($t30)
+                    // $t32 := 10
+                    $t32 := 10
+                    // $t33 := ==($t31, $t32)
+                    $t33 := $Eq($t31, $t32)
+                    // if ($t33) goto L4 else goto L3
+                    switch $t33
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t34 := 102
                     $t34 := 102
                     // abort($t34)
                     $Abort($t34)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t35 := borrow_local($t1)
                     $t35 := $MakePtr(false, local_t)
                     // $t36 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t35)
@@ -1218,20 +1263,25 @@ object "test_A2_GlobalVectors_test_move_from_vector_of_struct" {
                     $t41 := 11
                     // $t42 := ==($t40, $t41)
                     $t42 := $Eq($t40, $t41)
-                    // if ($t42) goto L4 else goto L5
+                    // if ($t42) goto L7 else goto L6
                     switch $t42
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t43 := 103
                     $t43 := 103
                     // abort($t43)
                     $Abort($t43)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t44 := borrow_local($t1)
                     $t44 := $MakePtr(false, local_t)
                     // $t45 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t44)
@@ -1248,20 +1298,25 @@ object "test_A2_GlobalVectors_test_move_from_vector_of_struct" {
                     $t50 := 12
                     // $t51 := ==($t49, $t50)
                     $t51 := $Eq($t49, $t50)
-                    // if ($t51) goto L6 else goto L7
+                    // if ($t51) goto L10 else goto L9
                     switch $t51
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
-                    // $t52 := 104
-                    $t52 := 104
-                    // abort($t52)
-                    $Abort($t52)
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
                 }
-                case 10 {
-                    // label L6
+                case 13 {
+                    // label L9
+                    // $t52 := 104
+                    $t52 := 104
+                    // abort($t52)
+                    $Abort($t52)
+                }
+                case 14 {
+                    // label L11
                     // return ()
                     $Free($locals, 64)
                     leave
@@ -1564,7 +1619,7 @@ object "test_A2_GlobalVectors_test_move_from_vector_of_struct" {
         }
     }
 }
-===> Test result of GlobalVectors::test_move_from_vector_of_struct: Succeed(Stopped) (used_gas=186329): []
+===> Test result of GlobalVectors::test_move_from_vector_of_struct: Succeed(Stopped) (used_gas=187040): []
 
 // test of GlobalVectors::test_move_from_vector_of_vector
 /* =======================================
@@ -1585,36 +1640,16 @@ object "test_A2_GlobalVectors_test_move_from_vector_of_vector" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t22 := 101
                     $t22 := 101
                     // abort($t22)
                     $Abort($t22)
                 }
-                case 3 {
-                    // label L0
-                    // $t23 := borrow_local($t1)
-                    $t23 := $MakePtr(false, local_t)
-                    // $t24 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t23)
-                    $t24 := $t23
-                    // $t25 := 0
-                    $t25 := 0
-                    // $t26 := vector::borrow<vector<u64>>($t24, $t25)
-                    $t26 := A1_vector_borrow$vec$u64$$($t24, $t25)
-                    // $t27 := 0
-                    $t27 := 0
-                    // $t28 := vector::borrow<u64>($t26, $t27)
-                    $t28 := A1_vector_borrow$u64$($t26, $t27)
-                    // $t29 := read_ref($t28)
-                    $t29 := $LoadU64($t28)
-                    // $t30 := 10
-                    $t30 := 10
-                    // $t31 := ==($t29, $t30)
-                    $t31 := $Eq($t29, $t30)
-                    // if ($t31) goto L2 else goto L3
-                    switch $t31
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t2 := vector::empty<vector<u64>>()
                     mstore($locals, A1_vector_empty$vec$u64$$())
@@ -1756,20 +1791,50 @@ object "test_A2_GlobalVectors_test_move_from_vector_of_vector" {
                     $t20 := 3
                     // $t21 := ==($t19, $t20)
                     $t21 := $Eq($t19, $t20)
-                    // if ($t21) goto L0 else goto L1
+                    // if ($t21) goto L1 else goto L0
                     switch $t21
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t23 := borrow_local($t1)
+                    $t23 := $MakePtr(false, local_t)
+                    // $t24 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t23)
+                    $t24 := $t23
+                    // $t25 := 0
+                    $t25 := 0
+                    // $t26 := vector::borrow<vector<u64>>($t24, $t25)
+                    $t26 := A1_vector_borrow$vec$u64$$($t24, $t25)
+                    // $t27 := 0
+                    $t27 := 0
+                    // $t28 := vector::borrow<u64>($t26, $t27)
+                    $t28 := A1_vector_borrow$u64$($t26, $t27)
+                    // $t29 := read_ref($t28)
+                    $t29 := $LoadU64($t28)
+                    // $t30 := 10
+                    $t30 := 10
+                    // $t31 := ==($t29, $t30)
+                    $t31 := $Eq($t29, $t30)
+                    // if ($t31) goto L4 else goto L3
+                    switch $t31
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t32 := 102
                     $t32 := 102
                     // abort($t32)
                     $Abort($t32)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t33 := borrow_local($t1)
                     $t33 := $MakePtr(false, local_t)
                     // $t34 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t33)
@@ -1788,20 +1853,25 @@ object "test_A2_GlobalVectors_test_move_from_vector_of_vector" {
                     $t40 := 11
                     // $t41 := ==($t39, $t40)
                     $t41 := $Eq($t39, $t40)
-                    // if ($t41) goto L4 else goto L5
+                    // if ($t41) goto L7 else goto L6
                     switch $t41
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t42 := 102
                     $t42 := 102
                     // abort($t42)
                     $Abort($t42)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t43 := borrow_local($t1)
                     $t43 := $MakePtr(false, local_t)
                     // $t44 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t43)
@@ -1820,20 +1890,25 @@ object "test_A2_GlobalVectors_test_move_from_vector_of_vector" {
                     $t50 := 12
                     // $t51 := ==($t49, $t50)
                     $t51 := $Eq($t49, $t50)
-                    // if ($t51) goto L6 else goto L7
+                    // if ($t51) goto L10 else goto L9
                     switch $t51
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t52 := 102
                     $t52 := 102
                     // abort($t52)
                     $Abort($t52)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // return ()
                     $Free($locals, 64)
                     leave
@@ -2163,7 +2238,7 @@ object "test_A2_GlobalVectors_test_move_from_vector_of_vector" {
         }
     }
 }
-===> Test result of GlobalVectors::test_move_from_vector_of_vector: Succeed(Stopped) (used_gas=243928): []
+===> Test result of GlobalVectors::test_move_from_vector_of_vector: Succeed(Stopped) (used_gas=244640): []
 
 // test of GlobalVectors::test_move_to
 /* =======================================
@@ -2184,40 +2259,16 @@ object "test_A2_GlobalVectors_test_move_to" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t18 := 101
                     $t18 := 101
                     // abort($t18)
                     $Abort($t18)
                 }
-                case 3 {
-                    // label L0
-                    // $t19 := 0x42
-                    $t19 := 0x42
-                    // $t20 := borrow_global<GlobalVectors::T<u64>>($t19)
-                    {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t19)
-                        if iszero($AlignedStorageLoad($base_offset)) {
-                          $AbortBuiltin()
-                        }
-                        $t20 := $MakePtr(true, add($base_offset, 32))
-                    }
-                    // $t21 := borrow_field<GlobalVectors::T<u64>>.v($t20)
-                    $t21 := $t20
-                    // $t22 := 0
-                    $t22 := 0
-                    // $t23 := vector::borrow<u64>($t21, $t22)
-                    $t23 := A1_vector_borrow$u64$($t21, $t22)
-                    // $t24 := read_ref($t23)
-                    $t24 := $LoadU64($t23)
-                    // $t25 := 10
-                    $t25 := 10
-                    // $t26 := ==($t24, $t25)
-                    $t26 := $Eq($t24, $t25)
-                    // if ($t26) goto L2 else goto L3
-                    switch $t26
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t1 := vector::empty<u64>()
                     mstore($locals, A1_vector_empty$u64$())
@@ -2298,20 +2349,54 @@ object "test_A2_GlobalVectors_test_move_to" {
                     $t16 := 3
                     // $t17 := ==($t15, $t16)
                     $t17 := $Eq($t15, $t16)
-                    // if ($t17) goto L0 else goto L1
+                    // if ($t17) goto L1 else goto L0
                     switch $t17
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t19 := 0x42
+                    $t19 := 0x42
+                    // $t20 := borrow_global<GlobalVectors::T<u64>>($t19)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t19)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t20 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t21 := borrow_field<GlobalVectors::T<u64>>.v($t20)
+                    $t21 := $t20
+                    // $t22 := 0
+                    $t22 := 0
+                    // $t23 := vector::borrow<u64>($t21, $t22)
+                    $t23 := A1_vector_borrow$u64$($t21, $t22)
+                    // $t24 := read_ref($t23)
+                    $t24 := $LoadU64($t23)
+                    // $t25 := 10
+                    $t25 := 10
+                    // $t26 := ==($t24, $t25)
+                    $t26 := $Eq($t24, $t25)
+                    // if ($t26) goto L4 else goto L3
+                    switch $t26
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t27 := 102
                     $t27 := 102
                     // abort($t27)
                     $Abort($t27)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t28 := 0x42
                     $t28 := 0x42
                     // $t29 := borrow_global<GlobalVectors::T<u64>>($t28)
@@ -2334,20 +2419,25 @@ object "test_A2_GlobalVectors_test_move_to" {
                     $t34 := 11
                     // $t35 := ==($t33, $t34)
                     $t35 := $Eq($t33, $t34)
-                    // if ($t35) goto L4 else goto L5
+                    // if ($t35) goto L7 else goto L6
                     switch $t35
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t36 := 103
                     $t36 := 103
                     // abort($t36)
                     $Abort($t36)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t37 := 0x42
                     $t37 := 0x42
                     // $t38 := borrow_global<GlobalVectors::T<u64>>($t37)
@@ -2370,20 +2460,25 @@ object "test_A2_GlobalVectors_test_move_to" {
                     $t43 := 12
                     // $t44 := ==($t42, $t43)
                     $t44 := $Eq($t42, $t43)
-                    // if ($t44) goto L6 else goto L7
+                    // if ($t44) goto L10 else goto L9
                     switch $t44
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t45 := 104
                     $t45 := 104
                     // abort($t45)
                     $Abort($t45)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // return ()
                     $Free($locals, 64)
                     leave
@@ -2649,7 +2744,7 @@ object "test_A2_GlobalVectors_test_move_to" {
         }
     }
 }
-===> Test result of GlobalVectors::test_move_to: Succeed(Stopped) (used_gas=120223): []
+===> Test result of GlobalVectors::test_move_to: Succeed(Stopped) (used_gas=121112): []
 
 // test of GlobalVectors::test_move_to_vector_of_struct
 /* =======================================
@@ -2670,42 +2765,16 @@ object "test_A2_GlobalVectors_test_move_to_vector_of_struct" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t24 := 101
                     $t24 := 101
                     // abort($t24)
                     $Abort($t24)
                 }
-                case 3 {
-                    // label L0
-                    // $t25 := 0x42
-                    $t25 := 0x42
-                    // $t26 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t25)
-                    {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t25)
-                        if iszero($AlignedStorageLoad($base_offset)) {
-                          $AbortBuiltin()
-                        }
-                        $t26 := $MakePtr(true, add($base_offset, 32))
-                    }
-                    // $t27 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t26)
-                    $t27 := $t26
-                    // $t28 := 0
-                    $t28 := 0
-                    // $t29 := vector::borrow<GlobalVectors::S>($t27, $t28)
-                    $t29 := A1_vector_borrow$A2_GlobalVectors_S$($t27, $t28)
-                    // $t30 := borrow_field<GlobalVectors::S>.x($t29)
-                    $t30 := $t29
-                    // $t31 := read_ref($t30)
-                    $t31 := $LoadU128($t30)
-                    // $t32 := 10
-                    $t32 := 10
-                    // $t33 := ==($t31, $t32)
-                    $t33 := $Eq($t31, $t32)
-                    // if ($t33) goto L2 else goto L3
-                    switch $t33
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t1 := vector::empty<GlobalVectors::S>()
                     mstore($locals, A1_vector_empty$A2_GlobalVectors_S$())
@@ -2819,20 +2888,56 @@ object "test_A2_GlobalVectors_test_move_to_vector_of_struct" {
                     $t22 := 3
                     // $t23 := ==($t21, $t22)
                     $t23 := $Eq($t21, $t22)
-                    // if ($t23) goto L0 else goto L1
+                    // if ($t23) goto L1 else goto L0
                     switch $t23
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t25 := 0x42
+                    $t25 := 0x42
+                    // $t26 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t25)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t25)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t26 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t27 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t26)
+                    $t27 := $t26
+                    // $t28 := 0
+                    $t28 := 0
+                    // $t29 := vector::borrow<GlobalVectors::S>($t27, $t28)
+                    $t29 := A1_vector_borrow$A2_GlobalVectors_S$($t27, $t28)
+                    // $t30 := borrow_field<GlobalVectors::S>.x($t29)
+                    $t30 := $t29
+                    // $t31 := read_ref($t30)
+                    $t31 := $LoadU128($t30)
+                    // $t32 := 10
+                    $t32 := 10
+                    // $t33 := ==($t31, $t32)
+                    $t33 := $Eq($t31, $t32)
+                    // if ($t33) goto L4 else goto L3
+                    switch $t33
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t34 := 102
                     $t34 := 102
                     // abort($t34)
                     $Abort($t34)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t35 := 0x42
                     $t35 := 0x42
                     // $t36 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t35)
@@ -2857,20 +2962,25 @@ object "test_A2_GlobalVectors_test_move_to_vector_of_struct" {
                     $t42 := 11
                     // $t43 := ==($t41, $t42)
                     $t43 := $Eq($t41, $t42)
-                    // if ($t43) goto L4 else goto L5
+                    // if ($t43) goto L7 else goto L6
                     switch $t43
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t44 := 103
                     $t44 := 103
                     // abort($t44)
                     $Abort($t44)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t45 := 0x42
                     $t45 := 0x42
                     // $t46 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t45)
@@ -2895,20 +3005,25 @@ object "test_A2_GlobalVectors_test_move_to_vector_of_struct" {
                     $t52 := 12
                     // $t53 := ==($t51, $t52)
                     $t53 := $Eq($t51, $t52)
-                    // if ($t53) goto L6 else goto L7
+                    // if ($t53) goto L10 else goto L9
                     switch $t53
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t54 := 104
                     $t54 := 104
                     // abort($t54)
                     $Abort($t54)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // return ()
                     $Free($locals, 64)
                     leave
@@ -3202,7 +3317,7 @@ object "test_A2_GlobalVectors_test_move_to_vector_of_struct" {
         }
     }
 }
-===> Test result of GlobalVectors::test_move_to_vector_of_struct: Succeed(Stopped) (used_gas=233788): []
+===> Test result of GlobalVectors::test_move_to_vector_of_struct: Succeed(Stopped) (used_gas=234677): []
 
 // test of GlobalVectors::test_move_to_vector_of_vector
 /* =======================================
@@ -3223,44 +3338,16 @@ object "test_A2_GlobalVectors_test_move_to_vector_of_vector" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t21 := 101
                     $t21 := 101
                     // abort($t21)
                     $Abort($t21)
                 }
-                case 3 {
-                    // label L0
-                    // $t22 := 0x42
-                    $t22 := 0x42
-                    // $t23 := borrow_global<GlobalVectors::T<vector<u64>>>($t22)
-                    {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x9947b477, $t22)
-                        if iszero($AlignedStorageLoad($base_offset)) {
-                          $AbortBuiltin()
-                        }
-                        $t23 := $MakePtr(true, add($base_offset, 32))
-                    }
-                    // $t24 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t23)
-                    $t24 := $t23
-                    // $t25 := 0
-                    $t25 := 0
-                    // $t26 := vector::borrow<vector<u64>>($t24, $t25)
-                    $t26 := A1_vector_borrow$vec$u64$$($t24, $t25)
-                    // $t27 := 0
-                    $t27 := 0
-                    // $t28 := vector::borrow<u64>($t26, $t27)
-                    $t28 := A1_vector_borrow$u64$($t26, $t27)
-                    // $t29 := read_ref($t28)
-                    $t29 := $LoadU64($t28)
-                    // $t30 := 10
-                    $t30 := 10
-                    // $t31 := ==($t29, $t30)
-                    $t31 := $Eq($t29, $t30)
-                    // if ($t31) goto L2 else goto L3
-                    switch $t31
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t1 := vector::empty<vector<u64>>()
                     mstore($locals, A1_vector_empty$vec$u64$$())
@@ -3360,20 +3447,58 @@ object "test_A2_GlobalVectors_test_move_to_vector_of_vector" {
                     $t19 := 3
                     // $t20 := ==($t18, $t19)
                     $t20 := $Eq($t18, $t19)
-                    // if ($t20) goto L0 else goto L1
+                    // if ($t20) goto L1 else goto L0
                     switch $t20
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t22 := 0x42
+                    $t22 := 0x42
+                    // $t23 := borrow_global<GlobalVectors::T<vector<u64>>>($t22)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x9947b477, $t22)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t23 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t24 := borrow_field<GlobalVectors::T<vector<u64>>>.v($t23)
+                    $t24 := $t23
+                    // $t25 := 0
+                    $t25 := 0
+                    // $t26 := vector::borrow<vector<u64>>($t24, $t25)
+                    $t26 := A1_vector_borrow$vec$u64$$($t24, $t25)
+                    // $t27 := 0
+                    $t27 := 0
+                    // $t28 := vector::borrow<u64>($t26, $t27)
+                    $t28 := A1_vector_borrow$u64$($t26, $t27)
+                    // $t29 := read_ref($t28)
+                    $t29 := $LoadU64($t28)
+                    // $t30 := 10
+                    $t30 := 10
+                    // $t31 := ==($t29, $t30)
+                    $t31 := $Eq($t29, $t30)
+                    // if ($t31) goto L4 else goto L3
+                    switch $t31
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t32 := 102
                     $t32 := 102
                     // abort($t32)
                     $Abort($t32)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t33 := 0x42
                     $t33 := 0x42
                     // $t34 := borrow_global<GlobalVectors::T<vector<u64>>>($t33)
@@ -3400,20 +3525,25 @@ object "test_A2_GlobalVectors_test_move_to_vector_of_vector" {
                     $t41 := 11
                     // $t42 := ==($t40, $t41)
                     $t42 := $Eq($t40, $t41)
-                    // if ($t42) goto L4 else goto L5
+                    // if ($t42) goto L7 else goto L6
                     switch $t42
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t43 := 102
                     $t43 := 102
                     // abort($t43)
                     $Abort($t43)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t44 := 0x42
                     $t44 := 0x42
                     // $t45 := borrow_global<GlobalVectors::T<vector<u64>>>($t44)
@@ -3440,20 +3570,25 @@ object "test_A2_GlobalVectors_test_move_to_vector_of_vector" {
                     $t52 := 12
                     // $t53 := ==($t51, $t52)
                     $t53 := $Eq($t51, $t52)
-                    // if ($t53) goto L6 else goto L7
+                    // if ($t53) goto L10 else goto L9
                     switch $t53
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t54 := 102
                     $t54 := 102
                     // abort($t54)
                     $Abort($t54)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // return ()
                     $Free($locals, 64)
                     leave
@@ -3774,7 +3909,7 @@ object "test_A2_GlobalVectors_test_move_to_vector_of_vector" {
         }
     }
 }
-===> Test result of GlobalVectors::test_move_to_vector_of_vector: Succeed(Stopped) (used_gas=304390): []
+===> Test result of GlobalVectors::test_move_to_vector_of_vector: Succeed(Stopped) (used_gas=305279): []
 
 // test of GlobalVectors::test_pop_back_global
 /* =======================================
@@ -3788,88 +3923,68 @@ object "test_A2_GlobalVectors_test_pop_back_global" {
         A2_GlobalVectors_test_pop_back_global()
         return (0, 0)
         function A2_GlobalVectors_test_pop_back_global() {
-            let e, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40
+            let $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39
             let $locals := $Malloc(64)
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t19 := 101
-                    $t19 := 101
-                    // abort($t19)
-                    $Abort($t19)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t20 := 0x42
-                    $t20 := 0x42
-                    // $t21 := borrow_global<GlobalVectors::T<u64>>($t20)
-                    {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t20)
-                        if iszero($AlignedStorageLoad($base_offset)) {
-                          $AbortBuiltin()
-                        }
-                        $t21 := $MakePtr(true, add($base_offset, 32))
-                    }
-                    // $t22 := borrow_field<GlobalVectors::T<u64>>.v($t21)
-                    $t22 := $t21
-                    // $t23 := vector::length<u64>($t22)
-                    $t23 := A1_vector_length$u64$($t22)
-                    // $t24 := 2
-                    $t24 := 2
-                    // $t25 := ==($t23, $t24)
-                    $t25 := $Eq($t23, $t24)
-                    // if ($t25) goto L2 else goto L3
-                    switch $t25
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
+                    // $t18 := 101
+                    $t18 := 101
+                    // abort($t18)
+                    $Abort($t18)
                 }
                 case 4 {
-                    // $t2 := vector::empty<u64>()
+                    // $t1 := vector::empty<u64>()
                     mstore($locals, A1_vector_empty$u64$())
-                    // $t3 := borrow_local($t2)
-                    $t3 := $MakePtr(false, $locals)
-                    // $t4 := 10
-                    $t4 := 10
-                    // vector::push_back<u64>($t3, $t4)
-                    A1_vector_push_back$u64$($t3, $t4)
-                    // $t5 := borrow_local($t2)
-                    $t5 := $MakePtr(false, $locals)
-                    // $t6 := 11
-                    $t6 := 11
-                    // vector::push_back<u64>($t5, $t6)
-                    A1_vector_push_back$u64$($t5, $t6)
-                    // $t7 := borrow_local($t2)
-                    $t7 := $MakePtr(false, $locals)
-                    // $t8 := 12
-                    $t8 := 12
-                    // vector::push_back<u64>($t7, $t8)
-                    A1_vector_push_back$u64$($t7, $t8)
-                    // $t9 := 0x42
-                    $t9 := 0x42
-                    // $t0 := Evm::sign($t9)
-                    mstore(add($locals, 32), A2_Evm_sign($t9))
-                    // $t10 := borrow_local($t0)
-                    $t10 := $MakePtr(false, add($locals, 32))
-                    // $t11 := move($t2)
-                    $t11 := mload($locals)
-                    // $t12 := pack GlobalVectors::T<u64>($t11)
+                    // $t2 := borrow_local($t1)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 10
+                    $t3 := 10
+                    // vector::push_back<u64>($t2, $t3)
+                    A1_vector_push_back$u64$($t2, $t3)
+                    // $t4 := borrow_local($t1)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 11
+                    $t5 := 11
+                    // vector::push_back<u64>($t4, $t5)
+                    A1_vector_push_back$u64$($t4, $t5)
+                    // $t6 := borrow_local($t1)
+                    $t6 := $MakePtr(false, $locals)
+                    // $t7 := 12
+                    $t7 := 12
+                    // vector::push_back<u64>($t6, $t7)
+                    A1_vector_push_back$u64$($t6, $t7)
+                    // $t8 := 0x42
+                    $t8 := 0x42
+                    // $t0 := Evm::sign($t8)
+                    mstore(add($locals, 32), A2_Evm_sign($t8))
+                    // $t9 := borrow_local($t0)
+                    $t9 := $MakePtr(false, add($locals, 32))
+                    // $t10 := move($t1)
+                    $t10 := mload($locals)
+                    // $t11 := pack GlobalVectors::T<u64>($t10)
                     {
                         let $mem := $Malloc(32)
-                        $MemoryStoreU256(add($mem, 0), $t11)
-                        $t12 := $mem
+                        $MemoryStoreU256(add($mem, 0), $t10)
+                        $t11 := $mem
                     }
-                    // move_to<GlobalVectors::T<u64>>($t12, $t10)
+                    // move_to<GlobalVectors::T<u64>>($t11, $t9)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $LoadU256($t10))
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $LoadU256($t9))
                         if $AlignedStorageLoad($base_offset) {
                           $AbortBuiltin()
                         }
                         $AlignedStorageStore($base_offset, true)
                         {
                             let $dst := add($base_offset, 32)
-                            let $src := $t12
+                            let $src := $t11
                             {
                                 let $linked_src_814019441 := mload(add($src, 0))
                                 let $linked_dst_814019441 := $NewLinkedStorageBase(0x3084f371)
@@ -3887,102 +4002,142 @@ object "test_A2_GlobalVectors_test_pop_back_global" {
                             $Free($src, 32)
                         }
                     }
-                    // $t13 := 0x42
-                    $t13 := 0x42
-                    // $t14 := borrow_global<GlobalVectors::T<u64>>($t13)
+                    // $t12 := 0x42
+                    $t12 := 0x42
+                    // $t13 := borrow_global<GlobalVectors::T<u64>>($t12)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t13)
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t12)
                         if iszero($AlignedStorageLoad($base_offset)) {
                           $AbortBuiltin()
                         }
-                        $t14 := $MakePtr(true, add($base_offset, 32))
+                        $t13 := $MakePtr(true, add($base_offset, 32))
                     }
-                    // $t15 := borrow_field<GlobalVectors::T<u64>>.v($t14)
-                    $t15 := $t14
-                    // $t16 := vector::pop_back<u64>($t15)
-                    $t16 := A1_vector_pop_back$u64$($t15)
-                    // $t17 := 12
-                    $t17 := 12
-                    // $t18 := ==($t16, $t17)
-                    $t18 := $Eq($t16, $t17)
-                    // if ($t18) goto L0 else goto L1
-                    switch $t18
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t14 := borrow_field<GlobalVectors::T<u64>>.v($t13)
+                    $t14 := $t13
+                    // $t15 := vector::pop_back<u64>($t14)
+                    $t15 := A1_vector_pop_back$u64$($t14)
+                    // $t16 := 12
+                    $t16 := 12
+                    // $t17 := ==($t15, $t16)
+                    $t17 := $Eq($t15, $t16)
+                    // if ($t17) goto L1 else goto L0
+                    switch $t17
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
-                    // $t26 := 102
-                    $t26 := 102
-                    // abort($t26)
-                    $Abort($t26)
-                }
-                case 6 {
                     // label L2
-                    // $t27 := 0x42
-                    $t27 := 0x42
-                    // $t28 := borrow_global<GlobalVectors::T<u64>>($t27)
+                    // $t19 := 0x42
+                    $t19 := 0x42
+                    // $t20 := borrow_global<GlobalVectors::T<u64>>($t19)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t27)
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t19)
                         if iszero($AlignedStorageLoad($base_offset)) {
                           $AbortBuiltin()
                         }
-                        $t28 := $MakePtr(true, add($base_offset, 32))
+                        $t20 := $MakePtr(true, add($base_offset, 32))
                     }
-                    // $t29 := borrow_field<GlobalVectors::T<u64>>.v($t28)
-                    $t29 := $t28
-                    // $t30 := vector::pop_back<u64>($t29)
-                    $t30 := A1_vector_pop_back$u64$($t29)
-                    // $t31 := 11
-                    $t31 := 11
-                    // $t32 := ==($t30, $t31)
-                    $t32 := $Eq($t30, $t31)
-                    // if ($t32) goto L4 else goto L5
-                    switch $t32
+                    // $t21 := borrow_field<GlobalVectors::T<u64>>.v($t20)
+                    $t21 := $t20
+                    // $t22 := vector::length<u64>($t21)
+                    $t22 := A1_vector_length$u64$($t21)
+                    // $t23 := 2
+                    $t23 := 2
+                    // $t24 := ==($t22, $t23)
+                    $t24 := $Eq($t22, $t23)
+                    // if ($t24) goto L4 else goto L3
+                    switch $t24
                     case 0  { $block := 7 }
-                    default { $block := 8 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
                 }
                 case 7 {
-                    // label L5
-                    // $t33 := 103
-                    $t33 := 103
-                    // abort($t33)
-                    $Abort($t33)
+                    // label L3
+                    // $t25 := 102
+                    $t25 := 102
+                    // abort($t25)
+                    $Abort($t25)
                 }
                 case 8 {
-                    // label L4
-                    // $t34 := 0x42
-                    $t34 := 0x42
-                    // $t35 := borrow_global<GlobalVectors::T<u64>>($t34)
+                    // label L5
+                    // $t26 := 0x42
+                    $t26 := 0x42
+                    // $t27 := borrow_global<GlobalVectors::T<u64>>($t26)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t34)
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t26)
                         if iszero($AlignedStorageLoad($base_offset)) {
                           $AbortBuiltin()
                         }
-                        $t35 := $MakePtr(true, add($base_offset, 32))
+                        $t27 := $MakePtr(true, add($base_offset, 32))
                     }
-                    // $t36 := borrow_field<GlobalVectors::T<u64>>.v($t35)
-                    $t36 := $t35
-                    // $t37 := vector::length<u64>($t36)
-                    $t37 := A1_vector_length$u64$($t36)
-                    // $t38 := 1
-                    $t38 := 1
-                    // $t39 := ==($t37, $t38)
-                    $t39 := $Eq($t37, $t38)
-                    // if ($t39) goto L6 else goto L7
-                    switch $t39
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    // $t28 := borrow_field<GlobalVectors::T<u64>>.v($t27)
+                    $t28 := $t27
+                    // $t29 := vector::pop_back<u64>($t28)
+                    $t29 := A1_vector_pop_back$u64$($t28)
+                    // $t30 := 11
+                    $t30 := 11
+                    // $t31 := ==($t29, $t30)
+                    $t31 := $Eq($t29, $t30)
+                    // if ($t31) goto L7 else goto L6
+                    switch $t31
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
                 case 9 {
                     // label L7
-                    // $t40 := 104
-                    $t40 := 104
-                    // abort($t40)
-                    $Abort($t40)
+                    // goto L8
+                    $block := 11
                 }
                 case 10 {
                     // label L6
+                    // $t32 := 103
+                    $t32 := 103
+                    // abort($t32)
+                    $Abort($t32)
+                }
+                case 11 {
+                    // label L8
+                    // $t33 := 0x42
+                    $t33 := 0x42
+                    // $t34 := borrow_global<GlobalVectors::T<u64>>($t33)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t33)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t34 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t35 := borrow_field<GlobalVectors::T<u64>>.v($t34)
+                    $t35 := $t34
+                    // $t36 := vector::length<u64>($t35)
+                    $t36 := A1_vector_length$u64$($t35)
+                    // $t37 := 1
+                    $t37 := 1
+                    // $t38 := ==($t36, $t37)
+                    $t38 := $Eq($t36, $t37)
+                    // if ($t38) goto L10 else goto L9
+                    switch $t38
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t39 := 104
+                    $t39 := 104
+                    // abort($t39)
+                    $Abort($t39)
+                }
+                case 14 {
+                    // label L11
                     // return ()
                     $Free($locals, 64)
                     leave
@@ -4247,7 +4402,7 @@ object "test_A2_GlobalVectors_test_pop_back_global" {
         }
     }
 }
-===> Test result of GlobalVectors::test_pop_back_global: Succeed(Stopped) (used_gas=120871): []
+===> Test result of GlobalVectors::test_pop_back_global: Succeed(Stopped) (used_gas=121755): []
 
 // test of GlobalVectors::test_pop_back_struct_global
 /* =======================================
@@ -4267,7 +4422,7 @@ object "test_A2_GlobalVectors_test_pop_back_struct_global" {
             for {} true {} {
                 switch $block
                 case 2 {
-                    // label L0
+                    // label L1
                     // $t29 := borrow_local($t3)
                     $t29 := $MakePtr(false, e)
                     // $t30 := borrow_field<GlobalVectors::S>.y($t29)
@@ -4278,16 +4433,16 @@ object "test_A2_GlobalVectors_test_pop_back_struct_global" {
                     $t32 := 42
                     // $t1 := ==($t31, $t32)
                     tmp_$1 := $Eq($t31, $t32)
-                    // goto L3
+                    // goto L2
                     $block := 5
                 }
                 case 3 {
-                    // label L2
+                    // label L0
                     // $t33 := false
                     $t33 := false
                     // $t1 := $t33
                     tmp_$1 := $t33
-                    // goto L3
+                    // goto L2
                     $block := 5
                 }
                 case 4 {
@@ -4409,27 +4564,32 @@ object "test_A2_GlobalVectors_test_pop_back_struct_global" {
                     $t27 := 12
                     // $t28 := ==($t26, $t27)
                     $t28 := $Eq($t26, $t27)
-                    // if ($t28) goto L0 else goto L2
+                    // if ($t28) goto L1 else goto L0
                     switch $t28
                     case 0  { $block := 3 }
                     default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
-                    // if ($t1) goto L4 else goto L5
+                    // label L2
+                    // if ($t1) goto L4 else goto L3
                     switch tmp_$1
-                    case 0  { $block := 6 }
-                    default { $block := 7 }
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
                 }
                 case 6 {
-                    // label L5
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
                     // $t34 := 101
                     $t34 := 101
                     // abort($t34)
                     $Abort($t34)
                 }
-                case 7 {
-                    // label L4
+                case 8 {
+                    // label L5
                     // $t35 := 0x42
                     $t35 := 0x42
                     // $t36 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t35)
@@ -4448,20 +4608,25 @@ object "test_A2_GlobalVectors_test_pop_back_struct_global" {
                     $t39 := 2
                     // $t40 := ==($t38, $t39)
                     $t40 := $Eq($t38, $t39)
-                    // if ($t40) goto L6 else goto L7
+                    // if ($t40) goto L7 else goto L6
                     switch $t40
-                    case 0  { $block := 8 }
+                    case 0  { $block := 10 }
                     default { $block := 9 }
                 }
-                case 8 {
+                case 9 {
                     // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t41 := 102
                     $t41 := 102
                     // abort($t41)
                     $Abort($t41)
                 }
-                case 9 {
-                    // label L6
+                case 11 {
+                    // label L8
                     // $t42 := 0x42
                     $t42 := 0x42
                     // $t43 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t42)
@@ -4486,13 +4651,13 @@ object "test_A2_GlobalVectors_test_pop_back_struct_global" {
                     $t48 := 11
                     // $t49 := ==($t47, $t48)
                     $t49 := $Eq($t47, $t48)
-                    // if ($t49) goto L8 else goto L10
+                    // if ($t49) goto L10 else goto L9
                     switch $t49
-                    case 0  { $block := 11 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 10 {
-                    // label L8
+                case 12 {
+                    // label L10
                     // $t50 := borrow_local($t3)
                     $t50 := $MakePtr(false, e)
                     // $t51 := borrow_field<GlobalVectors::S>.y($t50)
@@ -4504,33 +4669,38 @@ object "test_A2_GlobalVectors_test_pop_back_struct_global" {
                     // $t2 := ==($t52, $t53)
                     tmp_$2 := $Eq($t52, $t53)
                     // goto L11
-                    $block := 12
+                    $block := 14
                 }
-                case 11 {
-                    // label L10
+                case 13 {
+                    // label L9
                     // $t54 := false
                     $t54 := false
                     // $t2 := $t54
                     tmp_$2 := $t54
                     // goto L11
-                    $block := 12
+                    $block := 14
                 }
-                case 12 {
+                case 14 {
                     // label L11
-                    // if ($t2) goto L12 else goto L13
+                    // if ($t2) goto L13 else goto L12
                     switch tmp_$2
-                    case 0  { $block := 13 }
-                    default { $block := 14 }
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
                 }
-                case 13 {
+                case 15 {
                     // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
                     // $t55 := 103
                     $t55 := 103
                     // abort($t55)
                     $Abort($t55)
                 }
-                case 14 {
-                    // label L12
+                case 17 {
+                    // label L14
                     // $t56 := 0x42
                     $t56 := 0x42
                     // $t57 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t56)
@@ -4549,20 +4719,25 @@ object "test_A2_GlobalVectors_test_pop_back_struct_global" {
                     $t60 := 1
                     // $t61 := ==($t59, $t60)
                     $t61 := $Eq($t59, $t60)
-                    // if ($t61) goto L14 else goto L15
+                    // if ($t61) goto L16 else goto L15
                     switch $t61
-                    case 0  { $block := 15 }
-                    default { $block := 16 }
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
                 }
-                case 15 {
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
                     // label L15
                     // $t62 := 104
                     $t62 := 104
                     // abort($t62)
                     $Abort($t62)
                 }
-                case 16 {
-                    // label L14
+                case 20 {
+                    // label L17
                     // return ()
                     $Free($locals, 64)
                     leave
@@ -4861,7 +5036,7 @@ object "test_A2_GlobalVectors_test_pop_back_struct_global" {
         }
     }
 }
-===> Test result of GlobalVectors::test_pop_back_struct_global: Succeed(Stopped) (used_gas=189371): []
+===> Test result of GlobalVectors::test_pop_back_struct_global: Succeed(Stopped) (used_gas=190461): []
 
 // test of GlobalVectors::test_push_back_global
 /* =======================================
@@ -4882,40 +5057,16 @@ object "test_A2_GlobalVectors_test_push_back_global" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t26 := 101
                     $t26 := 101
                     // abort($t26)
                     $Abort($t26)
                 }
-                case 3 {
-                    // label L0
-                    // $t27 := 0x42
-                    $t27 := 0x42
-                    // $t28 := borrow_global<GlobalVectors::T<u64>>($t27)
-                    {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t27)
-                        if iszero($AlignedStorageLoad($base_offset)) {
-                          $AbortBuiltin()
-                        }
-                        $t28 := $MakePtr(true, add($base_offset, 32))
-                    }
-                    // $t29 := borrow_field<GlobalVectors::T<u64>>.v($t28)
-                    $t29 := $t28
-                    // $t30 := 0
-                    $t30 := 0
-                    // $t31 := vector::borrow<u64>($t29, $t30)
-                    $t31 := A1_vector_borrow$u64$($t29, $t30)
-                    // $t32 := read_ref($t31)
-                    $t32 := $LoadU64($t31)
-                    // $t33 := 10
-                    $t33 := 10
-                    // $t34 := ==($t32, $t33)
-                    $t34 := $Eq($t32, $t33)
-                    // if ($t34) goto L2 else goto L3
-                    switch $t34
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t1 := vector::empty<u64>()
                     mstore($locals, A1_vector_empty$u64$())
@@ -5028,20 +5179,54 @@ object "test_A2_GlobalVectors_test_push_back_global" {
                     $t24 := 5
                     // $t25 := ==($t23, $t24)
                     $t25 := $Eq($t23, $t24)
-                    // if ($t25) goto L0 else goto L1
+                    // if ($t25) goto L1 else goto L0
                     switch $t25
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t27 := 0x42
+                    $t27 := 0x42
+                    // $t28 := borrow_global<GlobalVectors::T<u64>>($t27)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t27)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t28 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t29 := borrow_field<GlobalVectors::T<u64>>.v($t28)
+                    $t29 := $t28
+                    // $t30 := 0
+                    $t30 := 0
+                    // $t31 := vector::borrow<u64>($t29, $t30)
+                    $t31 := A1_vector_borrow$u64$($t29, $t30)
+                    // $t32 := read_ref($t31)
+                    $t32 := $LoadU64($t31)
+                    // $t33 := 10
+                    $t33 := 10
+                    // $t34 := ==($t32, $t33)
+                    $t34 := $Eq($t32, $t33)
+                    // if ($t34) goto L4 else goto L3
+                    switch $t34
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t35 := 102
                     $t35 := 102
                     // abort($t35)
                     $Abort($t35)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t36 := 0x42
                     $t36 := 0x42
                     // $t37 := borrow_global<GlobalVectors::T<u64>>($t36)
@@ -5064,20 +5249,25 @@ object "test_A2_GlobalVectors_test_push_back_global" {
                     $t42 := 11
                     // $t43 := ==($t41, $t42)
                     $t43 := $Eq($t41, $t42)
-                    // if ($t43) goto L4 else goto L5
+                    // if ($t43) goto L7 else goto L6
                     switch $t43
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t44 := 103
                     $t44 := 103
                     // abort($t44)
                     $Abort($t44)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t45 := 0x42
                     $t45 := 0x42
                     // $t46 := borrow_global<GlobalVectors::T<u64>>($t45)
@@ -5100,20 +5290,25 @@ object "test_A2_GlobalVectors_test_push_back_global" {
                     $t51 := 12
                     // $t52 := ==($t50, $t51)
                     $t52 := $Eq($t50, $t51)
-                    // if ($t52) goto L6 else goto L7
+                    // if ($t52) goto L10 else goto L9
                     switch $t52
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t53 := 104
                     $t53 := 104
                     // abort($t53)
                     $Abort($t53)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // $t54 := 0x42
                     $t54 := 0x42
                     // $t55 := borrow_global<GlobalVectors::T<u64>>($t54)
@@ -5136,20 +5331,25 @@ object "test_A2_GlobalVectors_test_push_back_global" {
                     $t60 := 13
                     // $t61 := ==($t59, $t60)
                     $t61 := $Eq($t59, $t60)
-                    // if ($t61) goto L8 else goto L9
+                    // if ($t61) goto L13 else goto L12
                     switch $t61
-                    case 0  { $block := 11 }
-                    default { $block := 12 }
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
                 }
-                case 11 {
-                    // label L9
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
                     // $t62 := 105
                     $t62 := 105
                     // abort($t62)
                     $Abort($t62)
                 }
-                case 12 {
-                    // label L8
+                case 17 {
+                    // label L14
                     // $t63 := 0x42
                     $t63 := 0x42
                     // $t64 := borrow_global<GlobalVectors::T<u64>>($t63)
@@ -5172,20 +5372,25 @@ object "test_A2_GlobalVectors_test_push_back_global" {
                     $t69 := 14
                     // $t70 := ==($t68, $t69)
                     $t70 := $Eq($t68, $t69)
-                    // if ($t70) goto L10 else goto L11
+                    // if ($t70) goto L16 else goto L15
                     switch $t70
-                    case 0  { $block := 13 }
-                    default { $block := 14 }
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
                 }
-                case 13 {
-                    // label L11
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
                     // $t71 := 106
                     $t71 := 106
                     // abort($t71)
                     $Abort($t71)
                 }
-                case 14 {
-                    // label L10
+                case 20 {
+                    // label L17
                     // return ()
                     $Free($locals, 64)
                     leave
@@ -5451,7 +5656,7 @@ object "test_A2_GlobalVectors_test_push_back_global" {
         }
     }
 }
-===> Test result of GlobalVectors::test_push_back_global: Succeed(Stopped) (used_gas=150884): []
+===> Test result of GlobalVectors::test_push_back_global: Succeed(Stopped) (used_gas=152738): []
 
 // test of GlobalVectors::test_push_back_struct_global
 /* =======================================
@@ -5472,42 +5677,16 @@ object "test_A2_GlobalVectors_test_push_back_struct_global" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t36 := 101
                     $t36 := 101
                     // abort($t36)
                     $Abort($t36)
                 }
-                case 3 {
-                    // label L0
-                    // $t37 := 0x42
-                    $t37 := 0x42
-                    // $t38 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t37)
-                    {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t37)
-                        if iszero($AlignedStorageLoad($base_offset)) {
-                          $AbortBuiltin()
-                        }
-                        $t38 := $MakePtr(true, add($base_offset, 32))
-                    }
-                    // $t39 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t38)
-                    $t39 := $t38
-                    // $t40 := 0
-                    $t40 := 0
-                    // $t41 := vector::borrow<GlobalVectors::S>($t39, $t40)
-                    $t41 := A1_vector_borrow$A2_GlobalVectors_S$($t39, $t40)
-                    // $t42 := borrow_field<GlobalVectors::S>.x($t41)
-                    $t42 := $t41
-                    // $t43 := read_ref($t42)
-                    $t43 := $LoadU128($t42)
-                    // $t44 := 10
-                    $t44 := 10
-                    // $t45 := ==($t43, $t44)
-                    $t45 := $Eq($t43, $t44)
-                    // if ($t45) goto L2 else goto L3
-                    switch $t45
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t1 := vector::empty<GlobalVectors::S>()
                     mstore($locals, A1_vector_empty$A2_GlobalVectors_S$())
@@ -5671,20 +5850,56 @@ object "test_A2_GlobalVectors_test_push_back_struct_global" {
                     $t34 := 5
                     // $t35 := ==($t33, $t34)
                     $t35 := $Eq($t33, $t34)
-                    // if ($t35) goto L0 else goto L1
+                    // if ($t35) goto L1 else goto L0
                     switch $t35
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t37 := 0x42
+                    $t37 := 0x42
+                    // $t38 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t37)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x27c9b6b7, $t37)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t38 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t39 := borrow_field<GlobalVectors::T<GlobalVectors::S>>.v($t38)
+                    $t39 := $t38
+                    // $t40 := 0
+                    $t40 := 0
+                    // $t41 := vector::borrow<GlobalVectors::S>($t39, $t40)
+                    $t41 := A1_vector_borrow$A2_GlobalVectors_S$($t39, $t40)
+                    // $t42 := borrow_field<GlobalVectors::S>.x($t41)
+                    $t42 := $t41
+                    // $t43 := read_ref($t42)
+                    $t43 := $LoadU128($t42)
+                    // $t44 := 10
+                    $t44 := 10
+                    // $t45 := ==($t43, $t44)
+                    $t45 := $Eq($t43, $t44)
+                    // if ($t45) goto L4 else goto L3
+                    switch $t45
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t46 := 102
                     $t46 := 102
                     // abort($t46)
                     $Abort($t46)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t47 := 0x42
                     $t47 := 0x42
                     // $t48 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t47)
@@ -5709,20 +5924,25 @@ object "test_A2_GlobalVectors_test_push_back_struct_global" {
                     $t54 := 11
                     // $t55 := ==($t53, $t54)
                     $t55 := $Eq($t53, $t54)
-                    // if ($t55) goto L4 else goto L5
+                    // if ($t55) goto L7 else goto L6
                     switch $t55
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t56 := 103
                     $t56 := 103
                     // abort($t56)
                     $Abort($t56)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t57 := 0x42
                     $t57 := 0x42
                     // $t58 := borrow_global<GlobalVectors::T<GlobalVectors::S>>($t57)
@@ -5747,20 +5967,25 @@ object "test_A2_GlobalVectors_test_push_back_struct_global" {
                     $t64 := 12
                     // $t65 := ==($t63, $t64)
                     $t65 := $Eq($t63, $t64)
-                    // if ($t65) goto L6 else goto L7
+                    // if ($t65) goto L10 else goto L9
                     switch $t65
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t66 := 104
                     $t66 := 104
                     // abort($t66)
                     $Abort($t66)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // return ()
                     $Free($locals, 64)
                     leave
@@ -6054,7 +6279,7 @@ object "test_A2_GlobalVectors_test_push_back_struct_global" {
         }
     }
 }
-===> Test result of GlobalVectors::test_push_back_struct_global: Succeed(Stopped) (used_gas=328457): []
+===> Test result of GlobalVectors::test_push_back_struct_global: Succeed(Stopped) (used_gas=329341): []
 
 // test of GlobalVectors::test_read_ref_copy
 /* =======================================
@@ -6075,30 +6300,16 @@ object "test_A2_GlobalVectors_test_read_ref_copy" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t16 := 101
                     $t16 := 101
                     // abort($t16)
                     $Abort($t16)
                 }
-                case 3 {
-                    // label L0
-                    // $t17 := borrow_local($t2)
-                    $t17 := $MakePtr(false, add($locals, 64))
-                    // $t18 := 0
-                    $t18 := 0
-                    // $t19 := vector::borrow<u8>($t17, $t18)
-                    $t19 := A1_vector_borrow$u8$($t17, $t18)
-                    // $t20 := read_ref($t19)
-                    $t20 := $LoadU8($t19)
-                    // $t21 := 65
-                    $t21 := 65
-                    // $t22 := ==($t20, $t21)
-                    $t22 := $Eq($t20, $t21)
-                    // if ($t22) goto L2 else goto L3
-                    switch $t22
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t1 := vector::empty<u8>()
                     mstore($locals, A1_vector_empty$u8$())
@@ -6186,20 +6397,44 @@ object "test_A2_GlobalVectors_test_read_ref_copy" {
                     $t14 := 1
                     // $t15 := ==($t13, $t14)
                     $t15 := $Eq($t13, $t14)
-                    // if ($t15) goto L0 else goto L1
+                    // if ($t15) goto L1 else goto L0
                     switch $t15
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t17 := borrow_local($t2)
+                    $t17 := $MakePtr(false, add($locals, 64))
+                    // $t18 := 0
+                    $t18 := 0
+                    // $t19 := vector::borrow<u8>($t17, $t18)
+                    $t19 := A1_vector_borrow$u8$($t17, $t18)
+                    // $t20 := read_ref($t19)
+                    $t20 := $LoadU8($t19)
+                    // $t21 := 65
+                    $t21 := 65
+                    // $t22 := ==($t20, $t21)
+                    $t22 := $Eq($t20, $t21)
+                    // if ($t22) goto L4 else goto L3
+                    switch $t22
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t23 := 102
                     $t23 := 102
                     // abort($t23)
                     $Abort($t23)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // return ()
                     $Free($locals, 96)
                     leave
@@ -6207,6 +6442,13 @@ object "test_A2_GlobalVectors_test_read_ref_copy" {
             }
         }
 
+        function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
+        }
         function A1_vector_length$u8$(v_ref) -> len {
             let v_offs := $LoadU256(v_ref)
             let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
@@ -6233,13 +6475,6 @@ object "test_A2_GlobalVectors_test_read_ref_copy" {
             vector := $Malloc(34)
             $MemoryStoreU64(add(vector, 8), 2)
         }
-        function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
-            let v_offs := $LoadU256(v_ref)
-            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
-            let size := $LoadU64(v_ptr)
-            if $GtEq(i, size) { $AbortBuiltin() }
-            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
-        }
         function $Abort(code) {
             mstore(0, code)
             revert(24, 8) // TODO: store code as a string?
@@ -6507,7 +6742,7 @@ object "test_A2_GlobalVectors_test_read_ref_copy" {
         }
     }
 }
-===> Test result of GlobalVectors::test_read_ref_copy: Succeed(Stopped) (used_gas=114561): []
+===> Test result of GlobalVectors::test_read_ref_copy: Succeed(Stopped) (used_gas=114827): []
 
 // test of GlobalVectors::test_swap_global
 /* =======================================
@@ -6528,40 +6763,16 @@ object "test_A2_GlobalVectors_test_swap_global" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t23 := 101
                     $t23 := 101
                     // abort($t23)
                     $Abort($t23)
                 }
-                case 3 {
-                    // label L0
-                    // $t24 := 0x42
-                    $t24 := 0x42
-                    // $t25 := borrow_global<GlobalVectors::T<u64>>($t24)
-                    {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t24)
-                        if iszero($AlignedStorageLoad($base_offset)) {
-                          $AbortBuiltin()
-                        }
-                        $t25 := $MakePtr(true, add($base_offset, 32))
-                    }
-                    // $t26 := borrow_field<GlobalVectors::T<u64>>.v($t25)
-                    $t26 := $t25
-                    // $t27 := 0
-                    $t27 := 0
-                    // $t28 := vector::borrow<u64>($t26, $t27)
-                    $t28 := A1_vector_borrow$u64$($t26, $t27)
-                    // $t29 := read_ref($t28)
-                    $t29 := $LoadU64($t28)
-                    // $t30 := 44
-                    $t30 := 44
-                    // $t31 := ==($t29, $t30)
-                    $t31 := $Eq($t29, $t30)
-                    // if ($t31) goto L2 else goto L3
-                    switch $t31
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t1 := vector::empty<u64>()
                     mstore($locals, A1_vector_empty$u64$())
@@ -6660,20 +6871,54 @@ object "test_A2_GlobalVectors_test_swap_global" {
                     $t21 := 3
                     // $t22 := ==($t20, $t21)
                     $t22 := $Eq($t20, $t21)
-                    // if ($t22) goto L0 else goto L1
+                    // if ($t22) goto L1 else goto L0
                     switch $t22
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t24 := 0x42
+                    $t24 := 0x42
+                    // $t25 := borrow_global<GlobalVectors::T<u64>>($t24)
+                    {
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7da2a540, $t24)
+                        if iszero($AlignedStorageLoad($base_offset)) {
+                          $AbortBuiltin()
+                        }
+                        $t25 := $MakePtr(true, add($base_offset, 32))
+                    }
+                    // $t26 := borrow_field<GlobalVectors::T<u64>>.v($t25)
+                    $t26 := $t25
+                    // $t27 := 0
+                    $t27 := 0
+                    // $t28 := vector::borrow<u64>($t26, $t27)
+                    $t28 := A1_vector_borrow$u64$($t26, $t27)
+                    // $t29 := read_ref($t28)
+                    $t29 := $LoadU64($t28)
+                    // $t30 := 44
+                    $t30 := 44
+                    // $t31 := ==($t29, $t30)
+                    $t31 := $Eq($t29, $t30)
+                    // if ($t31) goto L4 else goto L3
+                    switch $t31
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t32 := 102
                     $t32 := 102
                     // abort($t32)
                     $Abort($t32)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t33 := 0x42
                     $t33 := 0x42
                     // $t34 := borrow_global<GlobalVectors::T<u64>>($t33)
@@ -6696,20 +6941,25 @@ object "test_A2_GlobalVectors_test_swap_global" {
                     $t39 := 43
                     // $t40 := ==($t38, $t39)
                     $t40 := $Eq($t38, $t39)
-                    // if ($t40) goto L4 else goto L5
+                    // if ($t40) goto L7 else goto L6
                     switch $t40
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t41 := 103
                     $t41 := 103
                     // abort($t41)
                     $Abort($t41)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t42 := 0x42
                     $t42 := 0x42
                     // $t43 := borrow_global<GlobalVectors::T<u64>>($t42)
@@ -6732,20 +6982,25 @@ object "test_A2_GlobalVectors_test_swap_global" {
                     $t48 := 42
                     // $t49 := ==($t47, $t48)
                     $t49 := $Eq($t47, $t48)
-                    // if ($t49) goto L6 else goto L7
+                    // if ($t49) goto L10 else goto L9
                     switch $t49
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t50 := 104
                     $t50 := 104
                     // abort($t50)
                     $Abort($t50)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // return ()
                     $Free($locals, 64)
                     leave
@@ -7023,4 +7278,4 @@ object "test_A2_GlobalVectors_test_swap_global" {
         }
     }
 }
-===> Test result of GlobalVectors::test_swap_global: Succeed(Stopped) (used_gas=123197): []
+===> Test result of GlobalVectors::test_swap_global: Succeed(Stopped) (used_gas=124086): []
diff --git a/language/evm/move-to-yul/tests/Locals.exp b/language/evm/move-to-yul/tests/Locals.exp
index d8d7628cde..62b4cb4f57 100644
--- a/language/evm/move-to-yul/tests/Locals.exp
+++ b/language/evm/move-to-yul/tests/Locals.exp
@@ -32,38 +32,38 @@ object "A2_M" {
             }
             $Abort(97)
             function A2_M_evaded(a, b) -> $result0, $result1, $result2, $result3 {
-                let ar, cr, d, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15
+                let ar, d, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14
                 let $locals := $Malloc(64)
                 mstore($locals, a)
-                // $t6 := copy($t0)
-                $t6 := mload($locals)
-                // $t3 := $t6
-                mstore(add($locals, 32), $t6)
-                // $t7 := copy($t3)
-                $t7 := mload(add($locals, 32))
-                // $t8 := +($t7, $t1)
-                $t8 := $AddU64($t7, b)
-                // $t9 := borrow_local($t0)
-                $t9 := $MakePtr(false, add($locals, 24))
-                // $t10 := borrow_local($t3)
-                $t10 := $MakePtr(false, add($locals, 56))
-                // $t11 := read_ref($t10)
-                $t11 := $LoadU64($t10)
-                // $t12 := 1
-                $t12 := 1
-                // $t13 := +($t11, $t12)
-                $t13 := $AddU64($t11, $t12)
-                // write_ref($t9, $t13)
-                $StoreU64($t9, $t13)
-                // $t14 := move($t0)
-                $t14 := mload($locals)
-                // $t15 := move($t3)
-                $t15 := mload(add($locals, 32))
-                // return ($t14, $t1, $t15, $t8)
-                $result0 := $t14
+                // $t5 := copy($t0)
+                $t5 := mload($locals)
+                // $t3 := $t5
+                mstore(add($locals, 32), $t5)
+                // $t6 := copy($t3)
+                $t6 := mload(add($locals, 32))
+                // $t7 := +($t6, $t1)
+                $t7 := $AddU64($t6, b)
+                // $t8 := borrow_local($t0)
+                $t8 := $MakePtr(false, add($locals, 24))
+                // $t9 := borrow_local($t3)
+                $t9 := $MakePtr(false, add($locals, 56))
+                // $t10 := read_ref($t9)
+                $t10 := $LoadU64($t9)
+                // $t11 := 1
+                $t11 := 1
+                // $t12 := +($t10, $t11)
+                $t12 := $AddU64($t10, $t11)
+                // write_ref($t8, $t12)
+                $StoreU64($t8, $t12)
+                // $t13 := move($t0)
+                $t13 := mload($locals)
+                // $t14 := move($t3)
+                $t14 := mload(add($locals, 32))
+                // return ($t13, $t1, $t14, $t7)
+                $result0 := $t13
                 $result1 := b
-                $result2 := $t15
-                $result3 := $t8
+                $result2 := $t14
+                $result3 := $t7
                 $Free($locals, 64)
             }
 
@@ -275,17 +275,16 @@ object "test_A2_M_test_call_by_ref" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t6 := 101
                     $t6 := 101
                     // abort($t6)
                     $Abort($t6)
                 }
-                case 3 {
-                    // label L0
-                    // return ()
-                    $Free($locals, 32)
-                    leave
-                }
                 case 4 {
                     // $t1 := 1
                     $t1 := 1
@@ -301,10 +300,16 @@ object "test_A2_M_test_call_by_ref" {
                     $t4 := 2
                     // $t5 := ==($t3, $t4)
                     $t5 := $Eq($t3, $t4)
-                    // if ($t5) goto L0 else goto L1
+                    // if ($t5) goto L1 else goto L0
                     switch $t5
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
                 }
             }
         }
@@ -412,7 +417,7 @@ object "test_A2_M_test_call_by_ref" {
         }
     }
 }
-===> Test result of M::test_call_by_ref: Succeed(Stopped) (used_gas=410): []
+===> Test result of M::test_call_by_ref: Succeed(Stopped) (used_gas=488): []
 
 // test of M::test_evaded
 /* =======================================
@@ -426,89 +431,109 @@ object "test_A2_M_test_evaded" {
         A2_M_test_evaded()
         return (0, 0)
         function A2_M_test_evaded() {
-            let a, b, c, d, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21
+            let b, c, d, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t12 := 100
-                    $t12 := 100
-                    // abort($t12)
-                    $Abort($t12)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t13 := 2
-                    $t13 := 2
-                    // $t14 := ==($t7, $t13)
-                    $t14 := $Eq($t7, $t13)
-                    // if ($t14) goto L2 else goto L3
-                    switch $t14
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
+                    // $t11 := 100
+                    $t11 := 100
+                    // abort($t11)
+                    $Abort($t11)
                 }
                 case 4 {
-                    // $t4 := 1
-                    $t4 := 1
-                    // $t5 := 2
-                    $t5 := 2
-                    // ($t6, $t7, $t8, $t9) := M::evaded($t4, $t5)
-                    $t6, $t7, $t8, $t9 := A2_M_evaded($t4, $t5)
-                    // $t10 := 2
-                    $t10 := 2
-                    // $t11 := ==($t6, $t10)
-                    $t11 := $Eq($t6, $t10)
-                    // if ($t11) goto L0 else goto L1
-                    switch $t11
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t3 := 1
+                    $t3 := 1
+                    // $t4 := 2
+                    $t4 := 2
+                    // ($t5, $t6, $t7, $t8) := M::evaded($t3, $t4)
+                    $t5, $t6, $t7, $t8 := A2_M_evaded($t3, $t4)
+                    // $t9 := 2
+                    $t9 := 2
+                    // $t10 := ==($t5, $t9)
+                    $t10 := $Eq($t5, $t9)
+                    // if ($t10) goto L1 else goto L0
+                    switch $t10
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
-                    // $t15 := 101
-                    $t15 := 101
-                    // abort($t15)
-                    $Abort($t15)
-                }
-                case 6 {
                     // label L2
-                    // $t16 := 1
-                    $t16 := 1
-                    // $t17 := ==($t8, $t16)
-                    $t17 := $Eq($t8, $t16)
-                    // if ($t17) goto L4 else goto L5
-                    switch $t17
+                    // $t12 := 2
+                    $t12 := 2
+                    // $t13 := ==($t6, $t12)
+                    $t13 := $Eq($t6, $t12)
+                    // if ($t13) goto L4 else goto L3
+                    switch $t13
                     case 0  { $block := 7 }
-                    default { $block := 8 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
                 }
                 case 7 {
-                    // label L5
-                    // $t18 := 102
-                    $t18 := 102
-                    // abort($t18)
-                    $Abort($t18)
+                    // label L3
+                    // $t14 := 101
+                    $t14 := 101
+                    // abort($t14)
+                    $Abort($t14)
                 }
                 case 8 {
-                    // label L4
-                    // $t19 := 3
-                    $t19 := 3
-                    // $t20 := ==($t9, $t19)
-                    $t20 := $Eq($t9, $t19)
-                    // if ($t20) goto L6 else goto L7
-                    switch $t20
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    // label L5
+                    // $t15 := 1
+                    $t15 := 1
+                    // $t16 := ==($t7, $t15)
+                    $t16 := $Eq($t7, $t15)
+                    // if ($t16) goto L7 else goto L6
+                    switch $t16
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
                 case 9 {
                     // label L7
-                    // $t21 := 103
-                    $t21 := 103
-                    // abort($t21)
-                    $Abort($t21)
+                    // goto L8
+                    $block := 11
                 }
                 case 10 {
                     // label L6
+                    // $t17 := 102
+                    $t17 := 102
+                    // abort($t17)
+                    $Abort($t17)
+                }
+                case 11 {
+                    // label L8
+                    // $t18 := 3
+                    $t18 := 3
+                    // $t19 := ==($t8, $t18)
+                    $t19 := $Eq($t8, $t18)
+                    // if ($t19) goto L10 else goto L9
+                    switch $t19
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t20 := 103
+                    $t20 := 103
+                    // abort($t20)
+                    $Abort($t20)
+                }
+                case 14 {
+                    // label L11
                     // return ()
                     leave
                 }
@@ -516,38 +541,38 @@ object "test_A2_M_test_evaded" {
         }
 
         function A2_M_evaded(a, b) -> $result0, $result1, $result2, $result3 {
-            let ar, cr, d, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15
+            let ar, d, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14
             let $locals := $Malloc(64)
             mstore($locals, a)
-            // $t6 := copy($t0)
-            $t6 := mload($locals)
-            // $t3 := $t6
-            mstore(add($locals, 32), $t6)
-            // $t7 := copy($t3)
-            $t7 := mload(add($locals, 32))
-            // $t8 := +($t7, $t1)
-            $t8 := $AddU64($t7, b)
-            // $t9 := borrow_local($t0)
-            $t9 := $MakePtr(false, add($locals, 24))
-            // $t10 := borrow_local($t3)
-            $t10 := $MakePtr(false, add($locals, 56))
-            // $t11 := read_ref($t10)
-            $t11 := $LoadU64($t10)
-            // $t12 := 1
-            $t12 := 1
-            // $t13 := +($t11, $t12)
-            $t13 := $AddU64($t11, $t12)
-            // write_ref($t9, $t13)
-            $StoreU64($t9, $t13)
-            // $t14 := move($t0)
-            $t14 := mload($locals)
-            // $t15 := move($t3)
-            $t15 := mload(add($locals, 32))
-            // return ($t14, $t1, $t15, $t8)
-            $result0 := $t14
+            // $t5 := copy($t0)
+            $t5 := mload($locals)
+            // $t3 := $t5
+            mstore(add($locals, 32), $t5)
+            // $t6 := copy($t3)
+            $t6 := mload(add($locals, 32))
+            // $t7 := +($t6, $t1)
+            $t7 := $AddU64($t6, b)
+            // $t8 := borrow_local($t0)
+            $t8 := $MakePtr(false, add($locals, 24))
+            // $t9 := borrow_local($t3)
+            $t9 := $MakePtr(false, add($locals, 56))
+            // $t10 := read_ref($t9)
+            $t10 := $LoadU64($t9)
+            // $t11 := 1
+            $t11 := 1
+            // $t12 := +($t10, $t11)
+            $t12 := $AddU64($t10, $t11)
+            // write_ref($t8, $t12)
+            $StoreU64($t8, $t12)
+            // $t13 := move($t0)
+            $t13 := mload($locals)
+            // $t14 := move($t3)
+            $t14 := mload(add($locals, 32))
+            // return ($t13, $t1, $t14, $t7)
+            $result0 := $t13
             $result1 := b
-            $result2 := $t15
-            $result3 := $t8
+            $result2 := $t14
+            $result3 := $t7
             $Free($locals, 64)
         }
 
@@ -701,7 +726,7 @@ object "test_A2_M_test_evaded" {
         }
     }
 }
-===> Test result of M::test_evaded: Succeed(Stopped) (used_gas=1261): []
+===> Test result of M::test_evaded: Succeed(Stopped) (used_gas=2140): []
 
 // test of M::test_freeze_ref
 /* =======================================
@@ -722,17 +747,16 @@ object "test_A2_M_test_freeze_ref" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t7 := 101
                     $t7 := 101
                     // abort($t7)
                     $Abort($t7)
                 }
-                case 3 {
-                    // label L0
-                    // return ()
-                    $Free($locals, 32)
-                    leave
-                }
                 case 4 {
                     // $t1 := 1
                     $t1 := 1
@@ -742,18 +766,22 @@ object "test_A2_M_test_freeze_ref" {
                     $t2 := $MakePtr(false, add($locals, 24))
                     // $t3 := freeze_ref($t2)
                     $t3 := $t2
-                    // $t0 := M::call_by_immut_ref($t3)
-                    mstore($locals, A2_M_call_by_immut_ref($t3))
-                    // $t4 := move($t0)
-                    $t4 := mload($locals)
+                    // $t4 := M::call_by_immut_ref($t3)
+                    $t4 := A2_M_call_by_immut_ref($t3)
                     // $t5 := 1
                     $t5 := 1
                     // $t6 := ==($t4, $t5)
                     $t6 := $Eq($t4, $t5)
-                    // if ($t6) goto L0 else goto L1
+                    // if ($t6) goto L1 else goto L0
                     switch $t6
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
                 }
             }
         }
@@ -862,4 +890,4 @@ object "test_A2_M_test_freeze_ref" {
         }
     }
 }
-===> Test result of M::test_freeze_ref: Succeed(Stopped) (used_gas=364): []
+===> Test result of M::test_freeze_ref: Succeed(Stopped) (used_gas=438): []
diff --git a/language/evm/move-to-yul/tests/NativeFunctions.exp b/language/evm/move-to-yul/tests/NativeFunctions.exp
index 28654c4e0b..30c64eeeeb 100644
--- a/language/evm/move-to-yul/tests/NativeFunctions.exp
+++ b/language/evm/move-to-yul/tests/NativeFunctions.exp
@@ -312,37 +312,16 @@ object "test_A2_NativeFunctions_test_concat" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t5 := 100
                     $t5 := 100
                     // abort($t5)
                     $Abort($t5)
                 }
-                case 3 {
-                    // label L0
-                    // $t6 := [49]
-                    $t6 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
-                    $MemoryStoreU64($t6, 1)
-                    $MemoryStoreU64(add($t6, 8), $ClosestGreaterPowerOfTwo(1))
-                    copy_literal_string_to_memory_2868747976(add($t6, 32))
-                    // $t7 := [50]
-                    $t7 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
-                    $MemoryStoreU64($t7, 1)
-                    $MemoryStoreU64(add($t7, 8), $ClosestGreaterPowerOfTwo(1))
-                    copy_literal_string_to_memory_4015750317(add($t7, 32))
-                    // $t8 := Evm::concat($t6, $t7)
-                    $t8 := A2_Evm_concat($t6, $t7)
-                    // $t9 := [49, 50]
-                    $t9 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(2)))
-                    $MemoryStoreU64($t9, 2)
-                    $MemoryStoreU64(add($t9, 8), $ClosestGreaterPowerOfTwo(2))
-                    copy_literal_string_to_memory_141265791(add($t9, 32))
-                    // $t10 := ==($t8, $t9)
-                    $t10 := $Eq_$vec$u8$$($t8, $t9)
-                    // if ($t10) goto L2 else goto L3
-                    switch $t10
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t0 := []
                     $t0 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
@@ -363,20 +342,51 @@ object "test_A2_NativeFunctions_test_concat" {
                     copy_literal_string_to_memory_21418693(add($t3, 32))
                     // $t4 := ==($t2, $t3)
                     $t4 := $Eq_$vec$u8$$($t2, $t3)
-                    // if ($t4) goto L0 else goto L1
+                    // if ($t4) goto L1 else goto L0
                     switch $t4
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t6 := [49]
+                    $t6 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
+                    $MemoryStoreU64($t6, 1)
+                    $MemoryStoreU64(add($t6, 8), $ClosestGreaterPowerOfTwo(1))
+                    copy_literal_string_to_memory_2868747976(add($t6, 32))
+                    // $t7 := [50]
+                    $t7 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
+                    $MemoryStoreU64($t7, 1)
+                    $MemoryStoreU64(add($t7, 8), $ClosestGreaterPowerOfTwo(1))
+                    copy_literal_string_to_memory_4015750317(add($t7, 32))
+                    // $t8 := Evm::concat($t6, $t7)
+                    $t8 := A2_Evm_concat($t6, $t7)
+                    // $t9 := [49, 50]
+                    $t9 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(2)))
+                    $MemoryStoreU64($t9, 2)
+                    $MemoryStoreU64(add($t9, 8), $ClosestGreaterPowerOfTwo(2))
+                    copy_literal_string_to_memory_141265791(add($t9, 32))
+                    // $t10 := ==($t8, $t9)
+                    $t10 := $Eq_$vec$u8$$($t8, $t9)
+                    // if ($t10) goto L4 else goto L3
+                    switch $t10
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t11 := 101
                     $t11 := 101
                     // abort($t11)
                     $Abort($t11)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t12 := []
                     $t12 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
                     $MemoryStoreU64($t12, 0)
@@ -396,20 +406,25 @@ object "test_A2_NativeFunctions_test_concat" {
                     copy_literal_string_to_memory_2053440334(add($t15, 32))
                     // $t16 := ==($t14, $t15)
                     $t16 := $Eq_$vec$u8$$($t14, $t15)
-                    // if ($t16) goto L4 else goto L5
+                    // if ($t16) goto L7 else goto L6
                     switch $t16
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t17 := 102
                     $t17 := 102
                     // abort($t17)
                     $Abort($t17)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t18 := [97]
                     $t18 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
                     $MemoryStoreU64($t18, 1)
@@ -436,20 +451,25 @@ object "test_A2_NativeFunctions_test_concat" {
                     copy_literal_string_to_memory_3871831907(add($t23, 32))
                     // $t24 := ==($t22, $t23)
                     $t24 := $Eq_$vec$u8$$($t22, $t23)
-                    // if ($t24) goto L6 else goto L7
+                    // if ($t24) goto L10 else goto L9
                     switch $t24
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t25 := 103
                     $t25 := 103
                     // abort($t25)
                     $Abort($t25)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // $t26 := [116, 101, 115, 116]
                     $t26 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
                     $MemoryStoreU64($t26, 4)
@@ -469,20 +489,25 @@ object "test_A2_NativeFunctions_test_concat" {
                     copy_literal_string_to_memory_1610556060(add($t29, 32))
                     // $t30 := ==($t28, $t29)
                     $t30 := $Eq_$vec$u8$$($t28, $t29)
-                    // if ($t30) goto L8 else goto L9
+                    // if ($t30) goto L13 else goto L12
                     switch $t30
-                    case 0  { $block := 11 }
-                    default { $block := 12 }
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
                 }
-                case 11 {
-                    // label L9
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
                     // $t31 := 104
                     $t31 := 104
                     // abort($t31)
                     $Abort($t31)
                 }
-                case 12 {
-                    // label L8
+                case 17 {
+                    // label L14
                     // return ()
                     leave
                 }
@@ -667,7 +692,7 @@ object "test_A2_NativeFunctions_test_concat" {
         }
     }
 }
-===> Test result of NativeFunctions::test_concat: Succeed(Stopped) (used_gas=9535): []
+===> Test result of NativeFunctions::test_concat: Succeed(Stopped) (used_gas=10872): []
 
 // test of NativeFunctions::test_signer_address_of
 /* =======================================
@@ -688,17 +713,16 @@ object "test_A2_NativeFunctions_test_signer_address_of" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t6 := 101
                     $t6 := 101
                     // abort($t6)
                     $Abort($t6)
                 }
-                case 3 {
-                    // label L0
-                    // return ()
-                    $Free($locals, 32)
-                    leave
-                }
                 case 4 {
                     // $t1 := 0x42
                     $t1 := 0x42
@@ -712,10 +736,16 @@ object "test_A2_NativeFunctions_test_signer_address_of" {
                     $t4 := 0x42
                     // $t5 := ==($t3, $t4)
                     $t5 := $Eq($t3, $t4)
-                    // if ($t5) goto L0 else goto L1
+                    // if ($t5) goto L1 else goto L0
                     switch $t5
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
                 }
             }
         }
@@ -832,7 +862,7 @@ object "test_A2_NativeFunctions_test_signer_address_of" {
         }
     }
 }
-===> Test result of NativeFunctions::test_signer_address_of: Succeed(Stopped) (used_gas=345): []
+===> Test result of NativeFunctions::test_signer_address_of: Succeed(Stopped) (used_gas=431): []
 
 // test of NativeFunctions::test_to_string
 /* =======================================
@@ -852,29 +882,16 @@ object "test_A2_NativeFunctions_test_to_string" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t4 := 101
                     $t4 := 101
                     // abort($t4)
                     $Abort($t4)
                 }
-                case 3 {
-                    // label L0
-                    // $t5 := U256::one()
-                    $t5 := A2_U256_one()
-                    // $t6 := Evm::to_string($t5)
-                    $t6 := A2_Evm_to_string($t5)
-                    // $t7 := [49]
-                    $t7 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
-                    $MemoryStoreU64($t7, 1)
-                    $MemoryStoreU64(add($t7, 8), $ClosestGreaterPowerOfTwo(1))
-                    copy_literal_string_to_memory_2868747976(add($t7, 32))
-                    // $t8 := ==($t6, $t7)
-                    $t8 := $Eq_$vec$u8$$($t6, $t7)
-                    // if ($t8) goto L2 else goto L3
-                    switch $t8
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t0 := U256::zero()
                     $t0 := A2_U256_zero()
@@ -887,20 +904,43 @@ object "test_A2_NativeFunctions_test_to_string" {
                     copy_literal_string_to_memory_2991736836(add($t2, 32))
                     // $t3 := ==($t1, $t2)
                     $t3 := $Eq_$vec$u8$$($t1, $t2)
-                    // if ($t3) goto L0 else goto L1
+                    // if ($t3) goto L1 else goto L0
                     switch $t3
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t5 := U256::one()
+                    $t5 := A2_U256_one()
+                    // $t6 := Evm::to_string($t5)
+                    $t6 := A2_Evm_to_string($t5)
+                    // $t7 := [49]
+                    $t7 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
+                    $MemoryStoreU64($t7, 1)
+                    $MemoryStoreU64(add($t7, 8), $ClosestGreaterPowerOfTwo(1))
+                    copy_literal_string_to_memory_2868747976(add($t7, 32))
+                    // $t8 := ==($t6, $t7)
+                    $t8 := $Eq_$vec$u8$$($t6, $t7)
+                    // if ($t8) goto L4 else goto L3
+                    switch $t8
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t9 := 102
                     $t9 := 102
                     // abort($t9)
                     $Abort($t9)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t10 := 42
                     $t10 := 42
                     // $t11 := U256::u256_from_u128($t10)
@@ -914,20 +954,25 @@ object "test_A2_NativeFunctions_test_to_string" {
                     copy_literal_string_to_memory_402108876(add($t13, 32))
                     // $t14 := ==($t12, $t13)
                     $t14 := $Eq_$vec$u8$$($t12, $t13)
-                    // if ($t14) goto L4 else goto L5
+                    // if ($t14) goto L7 else goto L6
                     switch $t14
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t15 := 103
                     $t15 := 103
                     // abort($t15)
                     $Abort($t15)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t16 := 7008
                     $t16 := 7008
                     // $t17 := U256::u256_from_u128($t16)
@@ -941,20 +986,25 @@ object "test_A2_NativeFunctions_test_to_string" {
                     copy_literal_string_to_memory_2919365730(add($t19, 32))
                     // $t20 := ==($t18, $t19)
                     $t20 := $Eq_$vec$u8$$($t18, $t19)
-                    // if ($t20) goto L6 else goto L7
+                    // if ($t20) goto L10 else goto L9
                     switch $t20
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t21 := 104
                     $t21 := 104
                     // abort($t21)
                     $Abort($t21)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // $t22 := 340282366920938463463374607431768211458
                     $t22 := 340282366920938463463374607431768211458
                     // $t23 := Evm::to_string($t22)
@@ -966,20 +1016,25 @@ object "test_A2_NativeFunctions_test_to_string" {
                     copy_literal_string_to_memory_767927084(add($t24, 32))
                     // $t25 := ==($t23, $t24)
                     $t25 := $Eq_$vec$u8$$($t23, $t24)
-                    // if ($t25) goto L8 else goto L9
+                    // if ($t25) goto L13 else goto L12
                     switch $t25
-                    case 0  { $block := 11 }
-                    default { $block := 12 }
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
                 }
-                case 11 {
-                    // label L9
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
                     // $t26 := 105
                     $t26 := 105
                     // abort($t26)
                     $Abort($t26)
                 }
-                case 12 {
-                    // label L8
+                case 17 {
+                    // label L14
                     // return ()
                     leave
                 }
@@ -999,18 +1054,18 @@ object "test_A2_NativeFunctions_test_to_string" {
             $result := $t2
         }
 
-        function A2_U256_zero() -> $result {
+        function A2_U256_one() -> $result {
             let $t0
-            // $t0 := 0
-            $t0 := 0
+            // $t0 := 1
+            $t0 := 1
             // return $t0
             $result := $t0
         }
 
-        function A2_U256_one() -> $result {
+        function A2_U256_zero() -> $result {
             let $t0
-            // $t0 := 1
-            $t0 := 1
+            // $t0 := 0
+            $t0 := 0
             // return $t0
             $result := $t0
         }
@@ -1115,14 +1170,14 @@ object "test_A2_NativeFunctions_test_to_string" {
             $MemoryStoreU8(value, 50)
             value := add(value, 1)
         }
-        function copy_literal_string_to_memory_2991736836(value) {
-            $MemoryStoreU8(value, 48)
-            value := add(value, 1)
-        }
         function copy_literal_string_to_memory_2868747976(value) {
             $MemoryStoreU8(value, 49)
             value := add(value, 1)
         }
+        function copy_literal_string_to_memory_2991736836(value) {
+            $MemoryStoreU8(value, 48)
+            value := add(value, 1)
+        }
         function $Abort(code) {
             mstore(0, code)
             revert(24, 8) // TODO: store code as a string?
@@ -1231,4 +1286,4 @@ object "test_A2_NativeFunctions_test_to_string" {
         }
     }
 }
-===> Test result of NativeFunctions::test_to_string: Succeed(Stopped) (used_gas=11916): []
+===> Test result of NativeFunctions::test_to_string: Succeed(Stopped) (used_gas=13241): []
diff --git a/language/evm/move-to-yul/tests/Resources.exp b/language/evm/move-to-yul/tests/Resources.exp
index 2a6a55ee6a..e75268ee3b 100644
--- a/language/evm/move-to-yul/tests/Resources.exp
+++ b/language/evm/move-to-yul/tests/Resources.exp
@@ -54,17 +54,16 @@ object "test_A2_M_test_increment_a" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t11 := 100
                     $t11 := 100
                     // abort($t11)
                     $Abort($t11)
                 }
-                case 3 {
-                    // label L0
-                    // return ()
-                    $Free($locals, 32)
-                    leave
-                }
                 case 4 {
                     // $t1 := 0x3
                     $t1 := 0x3
@@ -98,10 +97,16 @@ object "test_A2_M_test_increment_a" {
                     $t9 := 511
                     // $t10 := ==($t8, $t9)
                     $t10 := $Eq($t8, $t9)
-                    // if ($t10) goto L0 else goto L1
+                    // if ($t10) goto L1 else goto L0
                     switch $t10
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
                 }
             }
         }
@@ -392,7 +397,7 @@ object "test_A2_M_test_increment_a" {
         }
     }
 }
-===> Test result of M::test_increment_a: Succeed(Stopped) (used_gas=113444): []
+===> Test result of M::test_increment_a: Succeed(Stopped) (used_gas=113532): []
 
 // test of M::test_publish
 /* =======================================
@@ -413,13 +418,38 @@ object "test_A2_M_test_publish" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t6 := 100
                     $t6 := 100
                     // abort($t6)
                     $Abort($t6)
                 }
-                case 3 {
-                    // label L0
+                case 4 {
+                    // $t1 := 0x3
+                    $t1 := 0x3
+                    // $t0 := Evm::sign($t1)
+                    mstore($locals, A2_Evm_sign($t1))
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 22
+                    $t3 := 22
+                    // M::publish($t2, $t3)
+                    A2_M_publish($t2, $t3)
+                    // $t4 := 0x3
+                    $t4 := 0x3
+                    // $t5 := exists<M::S>($t4)
+                    $t5 := $AlignedStorageLoad($MakeTypeStorageBase(0, 0x698265eb, $t4))
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
                     // $t7 := 0x3
                     $t7 := 0x3
                     // $t8 := borrow_global<M::S>($t7)
@@ -438,40 +468,25 @@ object "test_A2_M_test_publish" {
                     $t11 := 22
                     // $t12 := ==($t10, $t11)
                     $t12 := $Eq($t10, $t11)
-                    // if ($t12) goto L2 else goto L3
+                    // if ($t12) goto L4 else goto L3
                     switch $t12
-                    case 0  { $block := 5 }
+                    case 0  { $block := 7 }
                     default { $block := 6 }
                 }
-                case 4 {
-                    // $t1 := 0x3
-                    $t1 := 0x3
-                    // $t0 := Evm::sign($t1)
-                    mstore($locals, A2_Evm_sign($t1))
-                    // $t2 := borrow_local($t0)
-                    $t2 := $MakePtr(false, $locals)
-                    // $t3 := 22
-                    $t3 := 22
-                    // M::publish($t2, $t3)
-                    A2_M_publish($t2, $t3)
-                    // $t4 := 0x3
-                    $t4 := 0x3
-                    // $t5 := exists<M::S>($t4)
-                    $t5 := $AlignedStorageLoad($MakeTypeStorageBase(0, 0x698265eb, $t4))
-                    // if ($t5) goto L0 else goto L1
-                    switch $t5
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
                 }
-                case 5 {
+                case 7 {
                     // label L3
                     // $t13 := 101
                     $t13 := 101
                     // abort($t13)
                     $Abort($t13)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t14 := 0x3
                     $t14 := 0x3
                     // $t15 := borrow_global<M::S>($t14)
@@ -490,20 +505,25 @@ object "test_A2_M_test_publish" {
                     $t18 := 11
                     // $t19 := ==($t17, $t18)
                     $t19 := $Eq($t17, $t18)
-                    // if ($t19) goto L4 else goto L5
+                    // if ($t19) goto L7 else goto L6
                     switch $t19
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t20 := 102
                     $t20 := 102
                     // abort($t20)
                     $Abort($t20)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t21 := 0x3
                     $t21 := 0x3
                     // $t22 := borrow_global<M::S>($t21)
@@ -526,20 +546,25 @@ object "test_A2_M_test_publish" {
                     $t26 := 44
                     // $t27 := ==($t25, $t26)
                     $t27 := $Eq($t25, $t26)
-                    // if ($t27) goto L6 else goto L7
+                    // if ($t27) goto L10 else goto L9
                     switch $t27
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t28 := 103
                     $t28 := 103
                     // abort($t28)
                     $Abort($t28)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // return ()
                     $Free($locals, 32)
                     leave
@@ -801,7 +826,7 @@ object "test_A2_M_test_publish" {
         }
     }
 }
-===> Test result of M::test_publish: Succeed(Stopped) (used_gas=114429): []
+===> Test result of M::test_publish: Succeed(Stopped) (used_gas=115318): []
 
 // test of M::test_publish_t
 /* =======================================
@@ -822,13 +847,38 @@ object "test_A2_M_test_publish_t" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t6 := 100
                     $t6 := 100
                     // abort($t6)
                     $Abort($t6)
                 }
-                case 3 {
-                    // label L0
+                case 4 {
+                    // $t1 := 0x3
+                    $t1 := 0x3
+                    // $t0 := Evm::sign($t1)
+                    mstore($locals, A2_Evm_sign($t1))
+                    // $t2 := borrow_local($t0)
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 22
+                    $t3 := 22
+                    // M::publish_t($t2, $t3)
+                    A2_M_publish_t($t2, $t3)
+                    // $t4 := 0x3
+                    $t4 := 0x3
+                    // $t5 := exists<M::T>($t4)
+                    $t5 := $AlignedStorageLoad($MakeTypeStorageBase(0, 0x3948ca0a, $t4))
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
                     // $t7 := 0x3
                     $t7 := 0x3
                     // $t8 := borrow_global<M::T>($t7)
@@ -851,40 +901,25 @@ object "test_A2_M_test_publish_t" {
                     $t12 := 22
                     // $t13 := ==($t11, $t12)
                     $t13 := $Eq($t11, $t12)
-                    // if ($t13) goto L2 else goto L3
+                    // if ($t13) goto L4 else goto L3
                     switch $t13
-                    case 0  { $block := 5 }
+                    case 0  { $block := 7 }
                     default { $block := 6 }
                 }
-                case 4 {
-                    // $t1 := 0x3
-                    $t1 := 0x3
-                    // $t0 := Evm::sign($t1)
-                    mstore($locals, A2_Evm_sign($t1))
-                    // $t2 := borrow_local($t0)
-                    $t2 := $MakePtr(false, $locals)
-                    // $t3 := 22
-                    $t3 := 22
-                    // M::publish_t($t2, $t3)
-                    A2_M_publish_t($t2, $t3)
-                    // $t4 := 0x3
-                    $t4 := 0x3
-                    // $t5 := exists<M::T>($t4)
-                    $t5 := $AlignedStorageLoad($MakeTypeStorageBase(0, 0x3948ca0a, $t4))
-                    // if ($t5) goto L0 else goto L1
-                    switch $t5
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
                 }
-                case 5 {
+                case 7 {
                     // label L3
                     // $t14 := 101
                     $t14 := 101
                     // abort($t14)
                     $Abort($t14)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t15 := 0x3
                     $t15 := 0x3
                     // $t16 := borrow_global<M::T>($t15)
@@ -907,20 +942,25 @@ object "test_A2_M_test_publish_t" {
                     $t20 := 11
                     // $t21 := ==($t19, $t20)
                     $t21 := $Eq($t19, $t20)
-                    // if ($t21) goto L4 else goto L5
+                    // if ($t21) goto L7 else goto L6
                     switch $t21
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t22 := 102
                     $t22 := 102
                     // abort($t22)
                     $Abort($t22)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t23 := 0x3
                     $t23 := 0x3
                     // $t24 := borrow_global<M::T>($t23)
@@ -947,20 +987,25 @@ object "test_A2_M_test_publish_t" {
                     $t29 := 44
                     // $t30 := ==($t28, $t29)
                     $t30 := $Eq($t28, $t29)
-                    // if ($t30) goto L6 else goto L7
+                    // if ($t30) goto L10 else goto L9
                     switch $t30
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t31 := 103
                     $t31 := 103
                     // abort($t31)
                     $Abort($t31)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // return ()
                     $Free($locals, 32)
                     leave
@@ -1234,7 +1279,7 @@ object "test_A2_M_test_publish_t" {
         }
     }
 }
-===> Test result of M::test_publish_t: Succeed(Stopped) (used_gas=138059): []
+===> Test result of M::test_publish_t: Succeed(Stopped) (used_gas=138948): []
 
 // test of M::test_unpublish
 /* =======================================
@@ -1248,88 +1293,103 @@ object "test_A2_M_test_unpublish" {
         A2_M_test_unpublish()
         return (0, 0)
         function A2_M_test_unpublish() {
-            let a, b, x, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21
+            let b, x, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20
             let $locals := $Malloc(32)
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t15 := 101
-                    $t15 := 101
-                    // abort($t15)
-                    $Abort($t15)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t16 := 16
-                    $t16 := 16
-                    // $t17 := ==($t10, $t16)
-                    $t17 := $Eq($t10, $t16)
-                    // if ($t17) goto L2 else goto L3
-                    switch $t17
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
+                    // $t14 := 101
+                    $t14 := 101
+                    // abort($t14)
+                    $Abort($t14)
                 }
                 case 4 {
-                    // $t4 := 0x3
-                    $t4 := 0x3
-                    // $t0 := Evm::sign($t4)
-                    mstore($locals, A2_Evm_sign($t4))
-                    // $t5 := borrow_local($t0)
-                    $t5 := $MakePtr(false, $locals)
-                    // $t6 := 33
-                    $t6 := 33
-                    // M::publish($t5, $t6)
-                    A2_M_publish($t5, $t6)
-                    // $t7 := 0x3
-                    $t7 := 0x3
-                    // $t8 := M::unpublish($t7)
-                    $t8 := A2_M_unpublish($t7)
-                    // ($t9, $t10, $t11) := unpack M::S($t8)
-                    $t9 := $MemoryLoadU64(add($t8, 32))
-                    $t10 := $MemoryLoadU8(add($t8, 40))
-                    $t11 := $MemoryLoadU256(add($t8, 0))
-                    $Free($t8, 41)
-                    // $t12 := unpack M::S2($t11)
-                    $t12 := $MemoryLoadU128(add($t11, 0))
-                    $Free($t11, 16)
-                    // $t13 := 33
-                    $t13 := 33
-                    // $t14 := ==($t9, $t13)
-                    $t14 := $Eq($t9, $t13)
-                    // if ($t14) goto L0 else goto L1
-                    switch $t14
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t3 := 0x3
+                    $t3 := 0x3
+                    // $t0 := Evm::sign($t3)
+                    mstore($locals, A2_Evm_sign($t3))
+                    // $t4 := borrow_local($t0)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 33
+                    $t5 := 33
+                    // M::publish($t4, $t5)
+                    A2_M_publish($t4, $t5)
+                    // $t6 := 0x3
+                    $t6 := 0x3
+                    // $t7 := M::unpublish($t6)
+                    $t7 := A2_M_unpublish($t6)
+                    // ($t8, $t9, $t10) := unpack M::S($t7)
+                    $t8 := $MemoryLoadU64(add($t7, 32))
+                    $t9 := $MemoryLoadU8(add($t7, 40))
+                    $t10 := $MemoryLoadU256(add($t7, 0))
+                    $Free($t7, 41)
+                    // $t11 := unpack M::S2($t10)
+                    $t11 := $MemoryLoadU128(add($t10, 0))
+                    $Free($t10, 16)
+                    // $t12 := 33
+                    $t12 := 33
+                    // $t13 := ==($t8, $t12)
+                    $t13 := $Eq($t8, $t12)
+                    // if ($t13) goto L1 else goto L0
+                    switch $t13
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
-                    // $t18 := 102
-                    $t18 := 102
-                    // abort($t18)
-                    $Abort($t18)
-                }
-                case 6 {
                     // label L2
-                    // $t19 := 66
-                    $t19 := 66
-                    // $t20 := ==($t12, $t19)
-                    $t20 := $Eq($t12, $t19)
-                    // if ($t20) goto L4 else goto L5
-                    switch $t20
+                    // $t15 := 16
+                    $t15 := 16
+                    // $t16 := ==($t9, $t15)
+                    $t16 := $Eq($t9, $t15)
+                    // if ($t16) goto L4 else goto L3
+                    switch $t16
                     case 0  { $block := 7 }
-                    default { $block := 8 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
                 }
                 case 7 {
-                    // label L5
-                    // $t21 := 103
-                    $t21 := 103
-                    // abort($t21)
-                    $Abort($t21)
+                    // label L3
+                    // $t17 := 102
+                    $t17 := 102
+                    // abort($t17)
+                    $Abort($t17)
                 }
                 case 8 {
-                    // label L4
+                    // label L5
+                    // $t18 := 66
+                    $t18 := 66
+                    // $t19 := ==($t11, $t18)
+                    $t19 := $Eq($t11, $t18)
+                    // if ($t19) goto L7 else goto L6
+                    switch $t19
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
+                }
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t20 := 103
+                    $t20 := 103
+                    // abort($t20)
+                    $Abort($t20)
+                }
+                case 11 {
+                    // label L8
                     // return ()
                     $Free($locals, 32)
                     leave
@@ -1580,4 +1640,4 @@ object "test_A2_M_test_unpublish" {
         }
     }
 }
-===> Test result of M::test_unpublish: Succeed(Stopped) (used_gas=90786): []
+===> Test result of M::test_unpublish: Succeed(Stopped) (used_gas=91212): []
diff --git a/language/evm/move-to-yul/tests/Resources.exp.capture-source-info b/language/evm/move-to-yul/tests/Resources.exp.capture-source-info
index b2e2898faa..c04def6d75 100644
--- a/language/evm/move-to-yul/tests/Resources.exp.capture-source-info
+++ b/language/evm/move-to-yul/tests/Resources.exp.capture-source-info
@@ -58,6 +58,12 @@ object "test_A2_M_test_increment_a" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    /// @src 1:1284:1327
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t11 := 100
                     /// @src 1:1323:1326
                     $t11 := 100
@@ -65,13 +71,6 @@ object "test_A2_M_test_increment_a" {
                     /// @src 1:1284:1327
                     $Abort($t11)
                 }
-                case 3 {
-                    // label L0
-                    // return ()
-                    /// @src 1:1327:1328
-                    $Free($locals, 32)
-                    leave
-                }
                 case 4 {
                     // $t1 := 0x3
                     /// @src 1:1240:1242
@@ -118,11 +117,18 @@ object "test_A2_M_test_increment_a" {
                     // $t10 := ==($t8, $t9)
                     /// @src 1:1315:1317
                     $t10 := $Eq($t8, $t9)
-                    // if ($t10) goto L0 else goto L1
+                    // if ($t10) goto L1 else goto L0
                     /// @src 1:1284:1327
                     switch $t10
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    /// @src 1:1327:1328
+                    $Free($locals, 32)
+                    leave
                 }
             }
         }
@@ -430,7 +436,7 @@ object "test_A2_M_test_increment_a" {
         }
     }
 }
-===> Test result of M::test_increment_a: Succeed(Stopped) (used_gas=113444): []
+===> Test result of M::test_increment_a: Succeed(Stopped) (used_gas=113532): []
 
 // test of M::test_publish
 /* =======================================
@@ -454,6 +460,12 @@ object "test_A2_M_test_publish" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    /// @src 1:548:575
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t6 := 100
                     /// @src 1:571:574
                     $t6 := 100
@@ -461,8 +473,36 @@ object "test_A2_M_test_publish" {
                     /// @src 1:548:575
                     $Abort($t6)
                 }
-                case 3 {
-                    // label L0
+                case 4 {
+                    // $t1 := 0x3
+                    /// @src 1:531:533
+                    $t1 := 0x3
+                    // $t0 := Evm::sign($t1)
+                    /// @src 1:526:534
+                    mstore($locals, A2_Evm_sign($t1))
+                    // $t2 := borrow_local($t0)
+                    /// @src 1:525:534
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 22
+                    /// @src 1:536:538
+                    $t3 := 22
+                    // M::publish($t2, $t3)
+                    /// @src 1:517:539
+                    A2_M_publish($t2, $t3)
+                    // $t4 := 0x3
+                    /// @src 1:566:568
+                    $t4 := 0x3
+                    // $t5 := exists<M::S>($t4)
+                    /// @src 1:556:562
+                    $t5 := $AlignedStorageLoad($MakeTypeStorageBase(0, 0x698265eb, $t4))
+                    // if ($t5) goto L1 else goto L0
+                    /// @src 1:548:575
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
                     // $t7 := 0x3
                     /// @src 1:609:611
                     $t7 := 0x3
@@ -487,41 +527,19 @@ object "test_A2_M_test_publish" {
                     // $t12 := ==($t10, $t11)
                     /// @src 1:615:617
                     $t12 := $Eq($t10, $t11)
-                    // if ($t12) goto L2 else goto L3
+                    // if ($t12) goto L4 else goto L3
                     /// @src 1:584:626
                     switch $t12
-                    case 0  { $block := 5 }
+                    case 0  { $block := 7 }
                     default { $block := 6 }
                 }
-                case 4 {
-                    // $t1 := 0x3
-                    /// @src 1:531:533
-                    $t1 := 0x3
-                    // $t0 := Evm::sign($t1)
-                    /// @src 1:526:534
-                    mstore($locals, A2_Evm_sign($t1))
-                    // $t2 := borrow_local($t0)
-                    /// @src 1:525:534
-                    $t2 := $MakePtr(false, $locals)
-                    // $t3 := 22
-                    /// @src 1:536:538
-                    $t3 := 22
-                    // M::publish($t2, $t3)
-                    /// @src 1:517:539
-                    A2_M_publish($t2, $t3)
-                    // $t4 := 0x3
-                    /// @src 1:566:568
-                    $t4 := 0x3
-                    // $t5 := exists<M::S>($t4)
-                    /// @src 1:556:562
-                    $t5 := $AlignedStorageLoad($MakeTypeStorageBase(0, 0x698265eb, $t4))
-                    // if ($t5) goto L0 else goto L1
-                    /// @src 1:548:575
-                    switch $t5
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    /// @src 1:584:626
+                    $block := 8
                 }
-                case 5 {
+                case 7 {
                     // label L3
                     // $t13 := 101
                     /// @src 1:622:625
@@ -530,8 +548,8 @@ object "test_A2_M_test_publish" {
                     /// @src 1:584:626
                     $Abort($t13)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t14 := 0x3
                     /// @src 1:660:662
                     $t14 := 0x3
@@ -556,14 +574,20 @@ object "test_A2_M_test_publish" {
                     // $t19 := ==($t17, $t18)
                     /// @src 1:666:668
                     $t19 := $Eq($t17, $t18)
-                    // if ($t19) goto L4 else goto L5
+                    // if ($t19) goto L7 else goto L6
                     /// @src 1:635:677
                     switch $t19
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    /// @src 1:635:677
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t20 := 102
                     /// @src 1:673:676
                     $t20 := 102
@@ -571,8 +595,8 @@ object "test_A2_M_test_publish" {
                     /// @src 1:635:677
                     $Abort($t20)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t21 := 0x3
                     /// @src 1:711:713
                     $t21 := 0x3
@@ -602,14 +626,20 @@ object "test_A2_M_test_publish" {
                     // $t27 := ==($t25, $t26)
                     /// @src 1:719:721
                     $t27 := $Eq($t25, $t26)
-                    // if ($t27) goto L6 else goto L7
+                    // if ($t27) goto L10 else goto L9
                     /// @src 1:686:730
                     switch $t27
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    /// @src 1:686:730
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t28 := 103
                     /// @src 1:726:729
                     $t28 := 103
@@ -617,8 +647,8 @@ object "test_A2_M_test_publish" {
                     /// @src 1:686:730
                     $Abort($t28)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // return ()
                     /// @src 1:730:731
                     $Free($locals, 32)
@@ -890,7 +920,7 @@ object "test_A2_M_test_publish" {
         }
     }
 }
-===> Test result of M::test_publish: Succeed(Stopped) (used_gas=114429): []
+===> Test result of M::test_publish: Succeed(Stopped) (used_gas=115318): []
 
 // test of M::test_publish_t
 /* =======================================
@@ -914,6 +944,12 @@ object "test_A2_M_test_publish_t" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    /// @src 1:1584:1611
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t6 := 100
                     /// @src 1:1607:1610
                     $t6 := 100
@@ -921,8 +957,36 @@ object "test_A2_M_test_publish_t" {
                     /// @src 1:1584:1611
                     $Abort($t6)
                 }
-                case 3 {
-                    // label L0
+                case 4 {
+                    // $t1 := 0x3
+                    /// @src 1:1566:1568
+                    $t1 := 0x3
+                    // $t0 := Evm::sign($t1)
+                    /// @src 1:1561:1569
+                    mstore($locals, A2_Evm_sign($t1))
+                    // $t2 := borrow_local($t0)
+                    /// @src 1:1560:1569
+                    $t2 := $MakePtr(false, $locals)
+                    // $t3 := 22
+                    /// @src 1:1571:1573
+                    $t3 := 22
+                    // M::publish_t($t2, $t3)
+                    /// @src 1:1550:1574
+                    A2_M_publish_t($t2, $t3)
+                    // $t4 := 0x3
+                    /// @src 1:1602:1604
+                    $t4 := 0x3
+                    // $t5 := exists<M::T>($t4)
+                    /// @src 1:1592:1598
+                    $t5 := $AlignedStorageLoad($MakeTypeStorageBase(0, 0x3948ca0a, $t4))
+                    // if ($t5) goto L1 else goto L0
+                    /// @src 1:1584:1611
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
                     // $t7 := 0x3
                     /// @src 1:1646:1648
                     $t7 := 0x3
@@ -952,41 +1016,19 @@ object "test_A2_M_test_publish_t" {
                     // $t13 := ==($t11, $t12)
                     /// @src 1:1654:1656
                     $t13 := $Eq($t11, $t12)
-                    // if ($t13) goto L2 else goto L3
+                    // if ($t13) goto L4 else goto L3
                     /// @src 1:1621:1665
                     switch $t13
-                    case 0  { $block := 5 }
+                    case 0  { $block := 7 }
                     default { $block := 6 }
                 }
-                case 4 {
-                    // $t1 := 0x3
-                    /// @src 1:1566:1568
-                    $t1 := 0x3
-                    // $t0 := Evm::sign($t1)
-                    /// @src 1:1561:1569
-                    mstore($locals, A2_Evm_sign($t1))
-                    // $t2 := borrow_local($t0)
-                    /// @src 1:1560:1569
-                    $t2 := $MakePtr(false, $locals)
-                    // $t3 := 22
-                    /// @src 1:1571:1573
-                    $t3 := 22
-                    // M::publish_t($t2, $t3)
-                    /// @src 1:1550:1574
-                    A2_M_publish_t($t2, $t3)
-                    // $t4 := 0x3
-                    /// @src 1:1602:1604
-                    $t4 := 0x3
-                    // $t5 := exists<M::T>($t4)
-                    /// @src 1:1592:1598
-                    $t5 := $AlignedStorageLoad($MakeTypeStorageBase(0, 0x3948ca0a, $t4))
-                    // if ($t5) goto L0 else goto L1
-                    /// @src 1:1584:1611
-                    switch $t5
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    /// @src 1:1621:1665
+                    $block := 8
                 }
-                case 5 {
+                case 7 {
                     // label L3
                     // $t14 := 101
                     /// @src 1:1661:1664
@@ -995,8 +1037,8 @@ object "test_A2_M_test_publish_t" {
                     /// @src 1:1621:1665
                     $Abort($t14)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t15 := 0x3
                     /// @src 1:1700:1702
                     $t15 := 0x3
@@ -1026,14 +1068,20 @@ object "test_A2_M_test_publish_t" {
                     // $t21 := ==($t19, $t20)
                     /// @src 1:1708:1710
                     $t21 := $Eq($t19, $t20)
-                    // if ($t21) goto L4 else goto L5
+                    // if ($t21) goto L7 else goto L6
                     /// @src 1:1675:1719
                     switch $t21
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    /// @src 1:1675:1719
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t22 := 102
                     /// @src 1:1715:1718
                     $t22 := 102
@@ -1041,8 +1089,8 @@ object "test_A2_M_test_publish_t" {
                     /// @src 1:1675:1719
                     $Abort($t22)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t23 := 0x3
                     /// @src 1:1754:1756
                     $t23 := 0x3
@@ -1077,14 +1125,20 @@ object "test_A2_M_test_publish_t" {
                     // $t30 := ==($t28, $t29)
                     /// @src 1:1764:1766
                     $t30 := $Eq($t28, $t29)
-                    // if ($t30) goto L6 else goto L7
+                    // if ($t30) goto L10 else goto L9
                     /// @src 1:1729:1775
                     switch $t30
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    /// @src 1:1729:1775
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t31 := 103
                     /// @src 1:1771:1774
                     $t31 := 103
@@ -1092,8 +1146,8 @@ object "test_A2_M_test_publish_t" {
                     /// @src 1:1729:1775
                     $Abort($t31)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // return ()
                     /// @src 1:1775:1776
                     $Free($locals, 32)
@@ -1378,7 +1432,7 @@ object "test_A2_M_test_publish_t" {
         }
     }
 }
-===> Test result of M::test_publish_t: Succeed(Stopped) (used_gas=138059): []
+===> Test result of M::test_publish_t: Succeed(Stopped) (used_gas=138948): []
 
 // test of M::test_unpublish
 /* =======================================
@@ -1395,112 +1449,130 @@ object "test_A2_M_test_unpublish" {
         A2_M_test_unpublish()
         return (0, 0)
         function A2_M_test_unpublish() {
-            let a, b, x, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21
+            let b, x, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20
             let $locals := $Malloc(32)
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t15 := 101
-                    /// @src 1:970:973
-                    $t15 := 101
-                    // abort($t15)
+                    // goto L2
                     /// @src 1:953:974
-                    $Abort($t15)
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t16 := 16
-                    /// @src 1:996:998
-                    $t16 := 16
-                    // $t17 := ==($t10, $t16)
-                    /// @src 1:993:995
-                    $t17 := $Eq($t10, $t16)
-                    // if ($t17) goto L2 else goto L3
-                    /// @src 1:983:1004
-                    switch $t17
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
+                    // $t14 := 101
+                    /// @src 1:970:973
+                    $t14 := 101
+                    // abort($t14)
+                    /// @src 1:953:974
+                    $Abort($t14)
                 }
                 case 4 {
-                    // $t4 := 0x3
+                    // $t3 := 0x3
                     /// @src 1:890:892
-                    $t4 := 0x3
-                    // $t0 := Evm::sign($t4)
+                    $t3 := 0x3
+                    // $t0 := Evm::sign($t3)
                     /// @src 1:885:893
-                    mstore($locals, A2_Evm_sign($t4))
-                    // $t5 := borrow_local($t0)
+                    mstore($locals, A2_Evm_sign($t3))
+                    // $t4 := borrow_local($t0)
                     /// @src 1:884:893
-                    $t5 := $MakePtr(false, $locals)
-                    // $t6 := 33
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 33
                     /// @src 1:895:897
-                    $t6 := 33
-                    // M::publish($t5, $t6)
+                    $t5 := 33
+                    // M::publish($t4, $t5)
                     /// @src 1:876:898
-                    A2_M_publish($t5, $t6)
-                    // $t7 := 0x3
+                    A2_M_publish($t4, $t5)
+                    // $t6 := 0x3
                     /// @src 1:941:943
-                    $t7 := 0x3
-                    // $t8 := M::unpublish($t7)
+                    $t6 := 0x3
+                    // $t7 := M::unpublish($t6)
                     /// @src 1:931:944
-                    $t8 := A2_M_unpublish($t7)
-                    // ($t9, $t10, $t11) := unpack M::S($t8)
+                    $t7 := A2_M_unpublish($t6)
+                    // ($t8, $t9, $t10) := unpack M::S($t7)
                     /// @src 1:911:928
-                    $t9 := $MemoryLoadU64(add($t8, 32))
-                    $t10 := $MemoryLoadU8(add($t8, 40))
-                    $t11 := $MemoryLoadU256(add($t8, 0))
-                    $Free($t8, 41)
-                    // $t12 := unpack M::S2($t11)
+                    $t8 := $MemoryLoadU64(add($t7, 32))
+                    $t9 := $MemoryLoadU8(add($t7, 40))
+                    $t10 := $MemoryLoadU256(add($t7, 0))
+                    $Free($t7, 41)
+                    // $t11 := unpack M::S2($t10)
                     /// @src 1:922:927
-                    $t12 := $MemoryLoadU128(add($t11, 0))
-                    $Free($t11, 16)
-                    // $t13 := 33
+                    $t11 := $MemoryLoadU128(add($t10, 0))
+                    $Free($t10, 16)
+                    // $t12 := 33
                     /// @src 1:966:968
-                    $t13 := 33
-                    // $t14 := ==($t9, $t13)
+                    $t12 := 33
+                    // $t13 := ==($t8, $t12)
                     /// @src 1:963:965
-                    $t14 := $Eq($t9, $t13)
-                    // if ($t14) goto L0 else goto L1
+                    $t13 := $Eq($t8, $t12)
+                    // if ($t13) goto L1 else goto L0
                     /// @src 1:953:974
-                    switch $t14
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    switch $t13
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t15 := 16
+                    /// @src 1:996:998
+                    $t15 := 16
+                    // $t16 := ==($t9, $t15)
+                    /// @src 1:993:995
+                    $t16 := $Eq($t9, $t15)
+                    // if ($t16) goto L4 else goto L3
+                    /// @src 1:983:1004
+                    switch $t16
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    /// @src 1:983:1004
+                    $block := 8
+                }
+                case 7 {
                     // label L3
-                    // $t18 := 102
+                    // $t17 := 102
                     /// @src 1:1000:1003
-                    $t18 := 102
-                    // abort($t18)
+                    $t17 := 102
+                    // abort($t17)
                     /// @src 1:983:1004
-                    $Abort($t18)
+                    $Abort($t17)
                 }
-                case 6 {
-                    // label L2
-                    // $t19 := 66
+                case 8 {
+                    // label L5
+                    // $t18 := 66
                     /// @src 1:1026:1028
-                    $t19 := 66
-                    // $t20 := ==($t12, $t19)
+                    $t18 := 66
+                    // $t19 := ==($t11, $t18)
                     /// @src 1:1023:1025
-                    $t20 := $Eq($t12, $t19)
-                    // if ($t20) goto L4 else goto L5
+                    $t19 := $Eq($t11, $t18)
+                    // if ($t19) goto L7 else goto L6
                     /// @src 1:1013:1034
-                    switch $t20
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    switch $t19
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
-                    // $t21 := 103
+                case 9 {
+                    // label L7
+                    // goto L8
+                    /// @src 1:1013:1034
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
+                    // $t20 := 103
                     /// @src 1:1030:1033
-                    $t21 := 103
-                    // abort($t21)
+                    $t20 := 103
+                    // abort($t20)
                     /// @src 1:1013:1034
-                    $Abort($t21)
+                    $Abort($t20)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // return ()
                     /// @src 1:1034:1035
                     $Free($locals, 32)
@@ -1763,4 +1835,4 @@ object "test_A2_M_test_unpublish" {
         }
     }
 }
-===> Test result of M::test_unpublish: Succeed(Stopped) (used_gas=90786): []
+===> Test result of M::test_unpublish: Succeed(Stopped) (used_gas=91212): []
diff --git a/language/evm/move-to-yul/tests/Structs.exp b/language/evm/move-to-yul/tests/Structs.exp
index bd7953a5ec..f30ce71b26 100644
--- a/language/evm/move-to-yul/tests/Structs.exp
+++ b/language/evm/move-to-yul/tests/Structs.exp
@@ -47,29 +47,29 @@ object "test_A2_M_test_drop" {
         A2_M_test_drop()
         return (0, 0)
         function A2_M_test_drop() {
-            let _s3, $t1, $t2, $t3, $t4
-            // $t1 := 33
-            $t1 := 33
-            // $t2 := false
-            $t2 := false
-            // $t3 := M::pack_S($t1, $t2)
-            $t3 := A2_M_pack_S($t1, $t2)
-            // $t4 := pack M::S3($t3)
+            let $t0, $t1, $t2, $t3
+            // $t0 := 33
+            $t0 := 33
+            // $t1 := false
+            $t1 := false
+            // $t2 := M::pack_S($t0, $t1)
+            $t2 := A2_M_pack_S($t0, $t1)
+            // $t3 := pack M::S3($t2)
             {
                 let $mem := $Malloc(32)
-                $MemoryStoreU256(add($mem, 0), $t3)
-                $t4 := $mem
+                $MemoryStoreU256(add($mem, 0), $t2)
+                $t3 := $mem
             }
-            // destroy($t4)
+            // destroy($t3)
             {
-                let $field_ptr_1770153451 := $LoadU256(add($t4, 0))
+                let $field_ptr_1770153451 := $LoadU256(add($t3, 0))
                 {
                     let $field_ptr_1602512591 := $LoadU256(add($field_ptr_1770153451, 0))
                     $Free($field_ptr_1602512591, 16)
                 }
                 $Free($field_ptr_1770153451, 41)
             }
-            $Free($t4, 32)
+            $Free($t3, 32)
             // return ()
         }
 
@@ -238,20 +238,16 @@ object "test_A2_M_test_equality" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t13 := 101
                     $t13 := 101
                     // abort($t13)
                     $Abort($t13)
                 }
-                case 3 {
-                    // label L0
-                    // $t14 := !=($t5, $t11)
-                    $t14 := $LogicalNot($Eq_$A2_M_S$($t5, $t11))
-                    // if ($t14) goto L2 else goto L3
-                    switch $t14
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t3 := 23
                     $t3 := 23
@@ -273,36 +269,55 @@ object "test_A2_M_test_equality" {
                     $t11 := A2_M_pack_S($t9, $t10)
                     // $t12 := ==($t5, $t8)
                     $t12 := $Eq_$A2_M_S$($t5, $t8)
-                    // if ($t12) goto L0 else goto L1
+                    // if ($t12) goto L1 else goto L0
                     switch $t12
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t14 := !=($t5, $t11)
+                    $t14 := $LogicalNot($Eq_$A2_M_S$($t5, $t11))
+                    // if ($t14) goto L4 else goto L3
+                    switch $t14
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t15 := 102
                     $t15 := 102
                     // abort($t15)
                     $Abort($t15)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t16 := !=($t8, $t11)
                     $t16 := $LogicalNot($Eq_$A2_M_S$($t8, $t11))
-                    // if ($t16) goto L4 else goto L5
+                    // if ($t16) goto L7 else goto L6
                     switch $t16
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t17 := 103
                     $t17 := 103
                     // abort($t17)
                     $Abort($t17)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // return ()
                     leave
                 }
@@ -406,7 +421,7 @@ object "test_A2_M_test_equality" {
         }
     }
 }
-===> Test result of M::test_equality: Succeed(Stopped) (used_gas=1606): []
+===> Test result of M::test_equality: Succeed(Stopped) (used_gas=2137): []
 
 // test of M::test_pack_S
 /* =======================================
@@ -426,28 +441,16 @@ object "test_A2_M_test_pack_S" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t8 := 100
                     $t8 := 100
                     // abort($t8)
                     $Abort($t8)
                 }
-                case 3 {
-                    // label L0
-                    // $t9 := borrow_local($t0)
-                    $t9 := $MakePtr(false, s)
-                    // $t10 := borrow_field<M::S>.b($t9)
-                    $t10 := $IndexPtr($t9, 40)
-                    // $t11 := read_ref($t10)
-                    $t11 := $LoadU8($t10)
-                    // $t12 := true
-                    $t12 := true
-                    // $t13 := ==($t11, $t12)
-                    $t13 := $Eq($t11, $t12)
-                    // if ($t13) goto L2 else goto L3
-                    switch $t13
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t1 := 42
                     $t1 := 42
@@ -465,20 +468,42 @@ object "test_A2_M_test_pack_S" {
                     $t6 := 42
                     // $t7 := ==($t5, $t6)
                     $t7 := $Eq($t5, $t6)
-                    // if ($t7) goto L0 else goto L1
+                    // if ($t7) goto L1 else goto L0
                     switch $t7
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t9 := borrow_local($t0)
+                    $t9 := $MakePtr(false, s)
+                    // $t10 := borrow_field<M::S>.b($t9)
+                    $t10 := $IndexPtr($t9, 40)
+                    // $t11 := read_ref($t10)
+                    $t11 := $LoadU8($t10)
+                    // $t12 := true
+                    $t12 := true
+                    // $t13 := ==($t11, $t12)
+                    $t13 := $Eq($t11, $t12)
+                    // if ($t13) goto L4 else goto L3
+                    switch $t13
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t14 := 101
                     $t14 := 101
                     // abort($t14)
                     $Abort($t14)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t15 := borrow_local($t0)
                     $t15 := $MakePtr(false, s)
                     // $t16 := borrow_field<M::S>.c($t15)
@@ -493,20 +518,25 @@ object "test_A2_M_test_pack_S" {
                     $t19 := 42
                     // $t20 := ==($t18, $t19)
                     $t20 := $Eq($t18, $t19)
-                    // if ($t20) goto L4 else goto L5
+                    // if ($t20) goto L7 else goto L6
                     switch $t20
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t21 := 102
                     $t21 := 102
                     // abort($t21)
                     $Abort($t21)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // return ()
                     leave
                 }
@@ -713,7 +743,7 @@ object "test_A2_M_test_pack_S" {
         }
     }
 }
-===> Test result of M::test_pack_S: Succeed(Stopped) (used_gas=1244): []
+===> Test result of M::test_pack_S: Succeed(Stopped) (used_gas=1775): []
 
 // test of M::test_pack_S2
 /* =======================================
@@ -733,16 +763,16 @@ object "test_A2_M_test_pack_S2" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t7 := 100
                     $t7 := 100
                     // abort($t7)
                     $Abort($t7)
                 }
-                case 3 {
-                    // label L0
-                    // return ()
-                    leave
-                }
                 case 4 {
                     // $t1 := 42
                     $t1 := 42
@@ -758,10 +788,15 @@ object "test_A2_M_test_pack_S2" {
                     $t5 := 42
                     // $t6 := ==($t4, $t5)
                     $t6 := $Eq($t4, $t5)
-                    // if ($t6) goto L0 else goto L1
+                    // if ($t6) goto L1 else goto L0
                     switch $t6
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    leave
                 }
             }
         }
@@ -880,7 +915,7 @@ object "test_A2_M_test_pack_S2" {
         }
     }
 }
-===> Test result of M::test_pack_S2: Succeed(Stopped) (used_gas=382): []
+===> Test result of M::test_pack_S2: Succeed(Stopped) (used_gas=471): []
 
 // test of M::test_pack_S2_fail
 /* =======================================
@@ -900,16 +935,16 @@ object "test_A2_M_test_pack_S2_fail" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t7 := 100
                     $t7 := 100
                     // abort($t7)
                     $Abort($t7)
                 }
-                case 3 {
-                    // label L0
-                    // return ()
-                    leave
-                }
                 case 4 {
                     // $t1 := 42
                     $t1 := 42
@@ -925,10 +960,15 @@ object "test_A2_M_test_pack_S2_fail" {
                     $t5 := 41
                     // $t6 := ==($t4, $t5)
                     $t6 := $Eq($t4, $t5)
-                    // if ($t6) goto L0 else goto L1
+                    // if ($t6) goto L1 else goto L0
                     switch $t6
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    leave
                 }
             }
         }
@@ -1047,7 +1087,7 @@ object "test_A2_M_test_pack_S2_fail" {
         }
     }
 }
-===> Test result of M::test_pack_S2_fail: Revert(Reverted) (used_gas=369): [0, 0, 0, 0, 0, 0, 0, 100]
+===> Test result of M::test_pack_S2_fail: Revert(Reverted) (used_gas=396): [0, 0, 0, 0, 0, 0, 0, 100]
 
 // test of M::test_read_S
 /* =======================================
@@ -1067,16 +1107,16 @@ object "test_A2_M_test_read_S" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t7 := 100
                     $t7 := 100
                     // abort($t7)
                     $Abort($t7)
                 }
-                case 3 {
-                    // label L0
-                    // return ()
-                    leave
-                }
                 case 4 {
                     // $t1 := 42
                     $t1 := 42
@@ -1092,10 +1132,15 @@ object "test_A2_M_test_read_S" {
                     $t5 := 84
                     // $t6 := ==($t4, $t5)
                     $t6 := $Eq($t4, $t5)
-                    // if ($t6) goto L0 else goto L1
+                    // if ($t6) goto L1 else goto L0
                     switch $t6
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    leave
                 }
             }
         }
@@ -1314,7 +1359,7 @@ object "test_A2_M_test_read_S" {
         }
     }
 }
-===> Test result of M::test_read_S: Succeed(Stopped) (used_gas=836): []
+===> Test result of M::test_read_S: Succeed(Stopped) (used_gas=925): []
 
 // test of M::test_read_and_write_S
 /* =======================================
@@ -1334,13 +1379,36 @@ object "test_A2_M_test_read_and_write_S" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t6 := 100
                     $t6 := 100
                     // abort($t6)
                     $Abort($t6)
                 }
-                case 3 {
-                    // label L0
+                case 4 {
+                    // $t0 := M::read_and_write_S()
+                    s := A2_M_read_and_write_S()
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, s)
+                    // $t2 := borrow_field<M::S>.a($t1)
+                    $t2 := $IndexPtr($t1, 32)
+                    // $t3 := read_ref($t2)
+                    $t3 := $LoadU64($t2)
+                    // $t4 := 2
+                    $t4 := 2
+                    // $t5 := ==($t3, $t4)
+                    $t5 := $Eq($t3, $t4)
+                    // if ($t5) goto L1 else goto L0
+                    switch $t5
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
                     // $t7 := borrow_local($t0)
                     $t7 := $MakePtr(false, s)
                     // $t8 := borrow_field<M::S>.c($t7)
@@ -1355,38 +1423,25 @@ object "test_A2_M_test_read_and_write_S" {
                     $t11 := 2
                     // $t12 := ==($t10, $t11)
                     $t12 := $Eq($t10, $t11)
-                    // if ($t12) goto L2 else goto L3
+                    // if ($t12) goto L4 else goto L3
                     switch $t12
-                    case 0  { $block := 5 }
+                    case 0  { $block := 7 }
                     default { $block := 6 }
                 }
-                case 4 {
-                    // $t0 := M::read_and_write_S()
-                    s := A2_M_read_and_write_S()
-                    // $t1 := borrow_local($t0)
-                    $t1 := $MakePtr(false, s)
-                    // $t2 := borrow_field<M::S>.a($t1)
-                    $t2 := $IndexPtr($t1, 32)
-                    // $t3 := read_ref($t2)
-                    $t3 := $LoadU64($t2)
-                    // $t4 := 2
-                    $t4 := 2
-                    // $t5 := ==($t3, $t4)
-                    $t5 := $Eq($t3, $t4)
-                    // if ($t5) goto L0 else goto L1
-                    switch $t5
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
                 }
-                case 5 {
+                case 7 {
                     // label L3
                     // $t13 := 101
                     $t13 := 101
                     // abort($t13)
                     $Abort($t13)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // return ()
                     leave
                 }
@@ -1704,7 +1759,7 @@ object "test_A2_M_test_read_and_write_S" {
         }
     }
 }
-===> Test result of M::test_read_and_write_S: Succeed(Stopped) (used_gas=1794): []
+===> Test result of M::test_read_and_write_S: Succeed(Stopped) (used_gas=2055): []
 
 // test of M::test_unpack
 /* =======================================
@@ -1718,60 +1773,65 @@ object "test_A2_M_test_unpack" {
         A2_M_test_unpack()
         return (0, 0)
         function A2_M_test_unpack() {
-            let s, s1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10
+            let s1, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t10 := 101
-                    $t10 := 101
-                    // abort($t10)
-                    $Abort($t10)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // return ()
-                    leave
+                    // $t9 := 101
+                    $t9 := 101
+                    // abort($t9)
+                    $Abort($t9)
                 }
                 case 4 {
-                    // $t2 := 33
-                    $t2 := 33
-                    // $t3 := false
-                    $t3 := false
-                    // $t4 := M::pack_S($t2, $t3)
-                    $t4 := A2_M_pack_S($t2, $t3)
-                    // $t1 := M::unpack($t4)
-                    s1 := A2_M_unpack($t4)
-                    // $t5 := borrow_local($t1)
-                    $t5 := $MakePtr(false, s1)
-                    // $t6 := borrow_field<M::S2>.x($t5)
-                    $t6 := $t5
-                    // $t7 := read_ref($t6)
-                    $t7 := $LoadU128($t6)
-                    // $t8 := 33
-                    $t8 := 33
-                    // $t9 := ==($t7, $t8)
-                    $t9 := $Eq($t7, $t8)
-                    // if ($t9) goto L0 else goto L1
-                    switch $t9
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t1 := 33
+                    $t1 := 33
+                    // $t2 := false
+                    $t2 := false
+                    // $t3 := M::pack_S($t1, $t2)
+                    $t3 := A2_M_pack_S($t1, $t2)
+                    // $t0 := M::unpack($t3)
+                    s1 := A2_M_unpack($t3)
+                    // $t4 := borrow_local($t0)
+                    $t4 := $MakePtr(false, s1)
+                    // $t5 := borrow_field<M::S2>.x($t4)
+                    $t5 := $t4
+                    // $t6 := read_ref($t5)
+                    $t6 := $LoadU128($t5)
+                    // $t7 := 33
+                    $t7 := 33
+                    // $t8 := ==($t6, $t7)
+                    $t8 := $Eq($t6, $t7)
+                    // if ($t8) goto L1 else goto L0
+                    switch $t8
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    leave
                 }
             }
         }
 
         function A2_M_unpack(s) -> $result {
-            let _a, _b, c, $t4, $t5, $t6
-            // ($t4, $t5, $t6) := unpack M::S($t0)
-            $t4 := $MemoryLoadU64(add(s, 32))
-            $t5 := $MemoryLoadU8(add(s, 40))
-            $t6 := $MemoryLoadU256(add(s, 0))
+            let c, $t2, $t3, $t4
+            // ($t2, $t3, $t4) := unpack M::S($t0)
+            $t2 := $MemoryLoadU64(add(s, 32))
+            $t3 := $MemoryLoadU8(add(s, 40))
+            $t4 := $MemoryLoadU256(add(s, 0))
             $Free(s, 41)
-            // destroy($t5)
-            // destroy($t4)
-            // return $t6
-            $result := $t6
+            // destroy($t3)
+            // destroy($t2)
+            // return $t4
+            $result := $t4
         }
 
         function A2_M_pack_S(a, b) -> $result {
@@ -1934,7 +1994,7 @@ object "test_A2_M_test_unpack" {
         }
     }
 }
-===> Test result of M::test_unpack: Succeed(Stopped) (used_gas=502): []
+===> Test result of M::test_unpack: Succeed(Stopped) (used_gas=591): []
 
 // test of M::test_write_S
 /* =======================================
@@ -1954,32 +2014,16 @@ object "test_A2_M_test_write_S" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t10 := 100
                     $t10 := 100
                     // abort($t10)
                     $Abort($t10)
                 }
-                case 3 {
-                    // label L0
-                    // $t11 := borrow_local($t0)
-                    $t11 := $MakePtr(false, s)
-                    // $t12 := borrow_field<M::S>.c($t11)
-                    {
-                        $t12 := $MakePtr($IsStoragePtr($t11), $LoadU256($t11))
-                    }
-                    // $t13 := borrow_field<M::S2>.x($t12)
-                    $t13 := $t12
-                    // $t14 := read_ref($t13)
-                    $t14 := $LoadU128($t13)
-                    // $t15 := 43
-                    $t15 := 43
-                    // $t16 := ==($t14, $t15)
-                    $t16 := $Eq($t14, $t15)
-                    // if ($t16) goto L2 else goto L3
-                    switch $t16
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t1 := 42
                     $t1 := 42
@@ -2003,20 +2047,46 @@ object "test_A2_M_test_write_S" {
                     $t8 := 43
                     // $t9 := ==($t7, $t8)
                     $t9 := $Eq($t7, $t8)
-                    // if ($t9) goto L0 else goto L1
+                    // if ($t9) goto L1 else goto L0
                     switch $t9
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t11 := borrow_local($t0)
+                    $t11 := $MakePtr(false, s)
+                    // $t12 := borrow_field<M::S>.c($t11)
+                    {
+                        $t12 := $MakePtr($IsStoragePtr($t11), $LoadU256($t11))
+                    }
+                    // $t13 := borrow_field<M::S2>.x($t12)
+                    $t13 := $t12
+                    // $t14 := read_ref($t13)
+                    $t14 := $LoadU128($t13)
+                    // $t15 := 43
+                    $t15 := 43
+                    // $t16 := ==($t14, $t15)
+                    $t16 := $Eq($t14, $t15)
+                    // if ($t16) goto L4 else goto L3
+                    switch $t16
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t17 := 101
                     $t17 := 101
                     // abort($t17)
                     $Abort($t17)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // return ()
                     leave
                 }
@@ -2282,4 +2352,4 @@ object "test_A2_M_test_write_S" {
         }
     }
 }
-===> Test result of M::test_write_S: Succeed(Stopped) (used_gas=1371): []
+===> Test result of M::test_write_S: Succeed(Stopped) (used_gas=1637): []
diff --git a/language/evm/move-to-yul/tests/Tables.exp b/language/evm/move-to-yul/tests/Tables.exp
index 7d631d762a..b2a95d3261 100644
--- a/language/evm/move-to-yul/tests/Tables.exp
+++ b/language/evm/move-to-yul/tests/Tables.exp
@@ -54,13 +54,38 @@ object "test_A2_Tables_test_borrow_fail" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t12 := 100
                     $t12 := 100
                     // abort($t12)
                     $Abort($t12)
                 }
-                case 3 {
-                    // label L0
+                case 4 {
+                    // $t6 := Table::empty<u64, u128>()
+                    mstore($locals, A2_Table_empty$u64_u128$())
+                    // $t7 := borrow_local($t6)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := 42
+                    $t8 := 42
+                    // $t0 := $t8
+                    mstore(add($locals, 32), $t8)
+                    // $t9 := borrow_local($t0)
+                    $t9 := $MakePtr(false, add($locals, 56))
+                    // $t10 := Table::contains<u64, u128>($t7, $t9)
+                    $t10 := A2_Table_contains$u64_u128$($t7, $t9)
+                    // $t11 := !($t10)
+                    $t11 := $LogicalNot($t10)
+                    // if ($t11) goto L1 else goto L0
+                    switch $t11
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
                     // $t13 := borrow_local($t6)
                     $t13 := $MakePtr(false, $locals)
                     // $t14 := 42
@@ -107,39 +132,9 @@ object "test_A2_Tables_test_borrow_fail" {
                     $Free($locals, 128)
                     leave
                 }
-                case 4 {
-                    // $t6 := Table::empty<u64, u128>()
-                    mstore($locals, A2_Table_empty$u64_u128$())
-                    // $t7 := borrow_local($t6)
-                    $t7 := $MakePtr(false, $locals)
-                    // $t8 := 42
-                    $t8 := 42
-                    // $t0 := $t8
-                    mstore(add($locals, 32), $t8)
-                    // $t9 := borrow_local($t0)
-                    $t9 := $MakePtr(false, add($locals, 56))
-                    // $t10 := Table::contains<u64, u128>($t7, $t9)
-                    $t10 := A2_Table_contains$u64_u128$($t7, $t9)
-                    // $t11 := !($t10)
-                    $t11 := $LogicalNot($t10)
-                    // if ($t11) goto L0 else goto L1
-                    switch $t11
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
-                }
             }
         }
 
-        function A2_Table_contains$u64_u128$(table_ref, key_ref) -> res {
-            let key := $LoadU64(key_ref)
-            let table_handle := $LoadU256(table_ref)
-            let storage_key := $StorageKey(table_handle, key)
-            let word := sload(storage_key)
-            res := $LogicalNot(iszero(word))
-        }
-        function A2_Table_empty$u64_u128$() -> table {
-            table := $NewTableHandle()
-        }
         function A2_Evm_sign(addr) -> signer {
           signer := addr
         }
@@ -153,6 +148,16 @@ object "test_A2_Tables_test_borrow_fail" {
             }
             value_ref := $MakePtr(true, value_offs)
         }
+        function A2_Table_contains$u64_u128$(table_ref, key_ref) -> res {
+            let key := $LoadU64(key_ref)
+            let table_handle := $LoadU256(table_ref)
+            let storage_key := $StorageKey(table_handle, key)
+            let word := sload(storage_key)
+            res := $LogicalNot(iszero(word))
+        }
+        function A2_Table_empty$u64_u128$() -> table {
+            table := $NewTableHandle()
+        }
         function $Abort(code) {
             mstore(0, code)
             revert(24, 8) // TODO: store code as a string?
@@ -337,7 +342,7 @@ object "test_A2_Tables_test_borrow_fail" {
         }
     }
 }
-===> Test result of Tables::test_borrow_fail: Revert(Reverted) (used_gas=25325): [255, 255, 255, 255, 255, 255, 255, 255]
+===> Test result of Tables::test_borrow_fail: Revert(Reverted) (used_gas=25408): [255, 255, 255, 255, 255, 255, 255, 255]
 
 // test of Tables::test_insert_fail
 /* =======================================
@@ -358,13 +363,38 @@ object "test_A2_Tables_test_insert_fail" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t15 := 100
                     $t15 := 100
                     // abort($t15)
                     $Abort($t15)
                 }
-                case 3 {
-                    // label L0
+                case 4 {
+                    // $t9 := Table::empty<u64, u128>()
+                    mstore($locals, A2_Table_empty$u64_u128$())
+                    // $t10 := borrow_local($t9)
+                    $t10 := $MakePtr(false, $locals)
+                    // $t11 := 42
+                    $t11 := 42
+                    // $t0 := $t11
+                    mstore(add($locals, 32), $t11)
+                    // $t12 := borrow_local($t0)
+                    $t12 := $MakePtr(false, add($locals, 56))
+                    // $t13 := Table::contains<u64, u128>($t10, $t12)
+                    $t13 := A2_Table_contains$u64_u128$($t10, $t12)
+                    // $t14 := !($t13)
+                    $t14 := $LogicalNot($t13)
+                    // if ($t14) goto L1 else goto L0
+                    switch $t14
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
                     // $t16 := borrow_local($t9)
                     $t16 := $MakePtr(false, $locals)
                     // $t17 := 42
@@ -387,40 +417,25 @@ object "test_A2_Tables_test_insert_fail" {
                     $t22 := $MakePtr(false, add($locals, 120))
                     // $t23 := Table::contains<u64, u128>($t20, $t22)
                     $t23 := A2_Table_contains$u64_u128$($t20, $t22)
-                    // if ($t23) goto L2 else goto L3
+                    // if ($t23) goto L4 else goto L3
                     switch $t23
-                    case 0  { $block := 5 }
+                    case 0  { $block := 7 }
                     default { $block := 6 }
                 }
-                case 4 {
-                    // $t9 := Table::empty<u64, u128>()
-                    mstore($locals, A2_Table_empty$u64_u128$())
-                    // $t10 := borrow_local($t9)
-                    $t10 := $MakePtr(false, $locals)
-                    // $t11 := 42
-                    $t11 := 42
-                    // $t0 := $t11
-                    mstore(add($locals, 32), $t11)
-                    // $t12 := borrow_local($t0)
-                    $t12 := $MakePtr(false, add($locals, 56))
-                    // $t13 := Table::contains<u64, u128>($t10, $t12)
-                    $t13 := A2_Table_contains$u64_u128$($t10, $t12)
-                    // $t14 := !($t13)
-                    $t14 := $LogicalNot($t13)
-                    // if ($t14) goto L0 else goto L1
-                    switch $t14
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
                 }
-                case 5 {
+                case 7 {
                     // label L3
                     // $t24 := 101
                     $t24 := 101
                     // abort($t24)
                     $Abort($t24)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t25 := borrow_local($t9)
                     $t25 := $MakePtr(false, $locals)
                     // $t26 := 42
@@ -670,7 +685,7 @@ object "test_A2_Tables_test_insert_fail" {
         }
     }
 }
-===> Test result of Tables::test_insert_fail: Revert(Reverted) (used_gas=90854): [255, 255, 255, 255, 255, 255, 255, 255]
+===> Test result of Tables::test_insert_fail: Revert(Reverted) (used_gas=91120): [255, 255, 255, 255, 255, 255, 255, 255]
 
 // test of Tables::test_primitive
 /* =======================================
@@ -684,374 +699,429 @@ object "test_A2_Tables_test_primitive" {
         A2_Tables_test_primitive()
         return (0, 0)
         function A2_Tables_test_primitive() {
-            let tmp_$1, tmp_$3, tmp_$5, tmp_$7, tmp_$9, tmp_$11, tmp_$12, tmp_$14, tmp_$17, tmp_$19, tmp_$22, tmp_$24, tmp_$26, tmp_$28, t_ref, v, v_28, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96, $t97, $t98, $t99, $t100, $t101, $t102, $t103, $t104, $t105, $t106, $t107, $t108, $t109, $t110, $t111, $t112, $t113, $t114, $t115, $t116, $t117, $t118, $t119, $t120, $t121, $t122, $t123, $t124, $t125, $t126, $t127, $t128, $t129, $t130, $t131
+            let tmp_$1, tmp_$3, tmp_$5, tmp_$7, tmp_$9, tmp_$11, tmp_$12, tmp_$14, tmp_$17, tmp_$19, tmp_$22, tmp_$24, tmp_$26, tmp_$28, t_ref, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96, $t97, $t98, $t99, $t100, $t101, $t102, $t103, $t104, $t105, $t106, $t107, $t108, $t109, $t110, $t111, $t112, $t113, $t114, $t115, $t116, $t117, $t118, $t119, $t120, $t121, $t122, $t123, $t124, $t125, $t126, $t127, $t128, $t129
             let $locals := $Malloc(576)
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t40 := 100
-                    $t40 := 100
-                    // abort($t40)
-                    $Abort($t40)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t41 := borrow_local($t31)
-                    $t41 := $MakePtr(false, $locals)
-                    // $t42 := 42
-                    $t42 := 42
-                    // $t21 := $t42
-                    mstore(add($locals, 64), $t42)
-                    // $t43 := borrow_local($t21)
-                    $t43 := $MakePtr(false, add($locals, 88))
-                    // $t44 := 1012
-                    $t44 := 1012
-                    // Table::insert<u64, u128>($t41, $t43, $t44)
-                    A2_Table_insert$u64_u128$($t41, $t43, $t44)
-                    // $t45 := borrow_local($t31)
-                    $t45 := $MakePtr(false, $locals)
-                    // $t46 := 42
-                    $t46 := 42
-                    // $t25 := $t46
-                    mstore(add($locals, 96), $t46)
-                    // $t47 := borrow_local($t25)
-                    $t47 := $MakePtr(false, add($locals, 120))
-                    // $t48 := Table::contains<u64, u128>($t45, $t47)
-                    $t48 := A2_Table_contains$u64_u128$($t45, $t47)
-                    // if ($t48) goto L2 else goto L3
-                    switch $t48
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
+                    // $t38 := 100
+                    $t38 := 100
+                    // abort($t38)
+                    $Abort($t38)
                 }
                 case 4 {
                     // $t31 := Table::empty<u64, u128>()
                     mstore($locals, A2_Table_empty$u64_u128$())
-                    // $t35 := borrow_local($t31)
-                    $t35 := $MakePtr(false, $locals)
-                    // $t36 := 42
-                    $t36 := 42
-                    // $t0 := $t36
-                    mstore(add($locals, 32), $t36)
-                    // $t37 := borrow_local($t0)
-                    $t37 := $MakePtr(false, add($locals, 56))
-                    // $t38 := Table::contains<u64, u128>($t35, $t37)
-                    $t38 := A2_Table_contains$u64_u128$($t35, $t37)
-                    // $t39 := !($t38)
-                    $t39 := $LogicalNot($t38)
-                    // if ($t39) goto L0 else goto L1
-                    switch $t39
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t33 := borrow_local($t31)
+                    $t33 := $MakePtr(false, $locals)
+                    // $t34 := 42
+                    $t34 := 42
+                    // $t0 := $t34
+                    mstore(add($locals, 32), $t34)
+                    // $t35 := borrow_local($t0)
+                    $t35 := $MakePtr(false, add($locals, 56))
+                    // $t36 := Table::contains<u64, u128>($t33, $t35)
+                    $t36 := A2_Table_contains$u64_u128$($t33, $t35)
+                    // $t37 := !($t36)
+                    $t37 := $LogicalNot($t36)
+                    // if ($t37) goto L1 else goto L0
+                    switch $t37
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
-                    // $t49 := 101
-                    $t49 := 101
-                    // abort($t49)
-                    $Abort($t49)
-                }
-                case 6 {
                     // label L2
-                    // $t50 := borrow_local($t31)
-                    $t50 := $MakePtr(false, $locals)
-                    // $t51 := 0
-                    $t51 := 0
-                    // $t27 := $t51
-                    mstore(add($locals, 128), $t51)
-                    // $t52 := borrow_local($t27)
-                    $t52 := $MakePtr(false, add($locals, 152))
-                    // $t53 := Table::contains<u64, u128>($t50, $t52)
-                    $t53 := A2_Table_contains$u64_u128$($t50, $t52)
-                    // $t54 := !($t53)
-                    $t54 := $LogicalNot($t53)
-                    // if ($t54) goto L4 else goto L5
-                    switch $t54
+                    // $t39 := borrow_local($t31)
+                    $t39 := $MakePtr(false, $locals)
+                    // $t40 := 42
+                    $t40 := 42
+                    // $t21 := $t40
+                    mstore(add($locals, 64), $t40)
+                    // $t41 := borrow_local($t21)
+                    $t41 := $MakePtr(false, add($locals, 88))
+                    // $t42 := 1012
+                    $t42 := 1012
+                    // Table::insert<u64, u128>($t39, $t41, $t42)
+                    A2_Table_insert$u64_u128$($t39, $t41, $t42)
+                    // $t43 := borrow_local($t31)
+                    $t43 := $MakePtr(false, $locals)
+                    // $t44 := 42
+                    $t44 := 42
+                    // $t25 := $t44
+                    mstore(add($locals, 96), $t44)
+                    // $t45 := borrow_local($t25)
+                    $t45 := $MakePtr(false, add($locals, 120))
+                    // $t46 := Table::contains<u64, u128>($t43, $t45)
+                    $t46 := A2_Table_contains$u64_u128$($t43, $t45)
+                    // if ($t46) goto L4 else goto L3
+                    switch $t46
                     case 0  { $block := 7 }
-                    default { $block := 8 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
                 }
                 case 7 {
-                    // label L5
-                    // $t55 := 102
-                    $t55 := 102
-                    // abort($t55)
-                    $Abort($t55)
+                    // label L3
+                    // $t47 := 101
+                    $t47 := 101
+                    // abort($t47)
+                    $Abort($t47)
                 }
                 case 8 {
-                    // label L4
-                    // $t56 := borrow_local($t31)
-                    $t56 := $MakePtr(false, $locals)
-                    // $t57 := 42
-                    $t57 := 42
-                    // $t29 := $t57
-                    mstore(add($locals, 160), $t57)
-                    // $t58 := borrow_local($t29)
-                    $t58 := $MakePtr(false, add($locals, 184))
-                    // $t59 := Table::borrow<u64, u128>($t56, $t58)
-                    $t59 := A2_Table_borrow$u64_u128$($t56, $t58)
-                    // $t60 := read_ref($t59)
-                    $t60 := $LoadU128($t59)
-                    // $t61 := 1012
-                    $t61 := 1012
-                    // $t62 := ==($t60, $t61)
-                    $t62 := $Eq($t60, $t61)
-                    // if ($t62) goto L6 else goto L7
-                    switch $t62
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    // label L5
+                    // $t48 := borrow_local($t31)
+                    $t48 := $MakePtr(false, $locals)
+                    // $t49 := 0
+                    $t49 := 0
+                    // $t27 := $t49
+                    mstore(add($locals, 128), $t49)
+                    // $t50 := borrow_local($t27)
+                    $t50 := $MakePtr(false, add($locals, 152))
+                    // $t51 := Table::contains<u64, u128>($t48, $t50)
+                    $t51 := A2_Table_contains$u64_u128$($t48, $t50)
+                    // $t52 := !($t51)
+                    $t52 := $LogicalNot($t51)
+                    // if ($t52) goto L7 else goto L6
+                    switch $t52
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
                 case 9 {
                     // label L7
-                    // $t63 := 103
-                    $t63 := 103
-                    // abort($t63)
-                    $Abort($t63)
+                    // goto L8
+                    $block := 11
                 }
                 case 10 {
                     // label L6
-                    // $t64 := borrow_local($t31)
-                    $t64 := $MakePtr(false, $locals)
-                    // $t65 := 43
-                    $t65 := 43
-                    // $t2 := $t65
-                    mstore(add($locals, 192), $t65)
-                    // $t66 := borrow_local($t2)
-                    $t66 := $MakePtr(false, add($locals, 216))
-                    // $t67 := 1013
-                    $t67 := 1013
-                    // Table::insert<u64, u128>($t64, $t66, $t67)
-                    A2_Table_insert$u64_u128$($t64, $t66, $t67)
-                    // $t68 := borrow_local($t31)
-                    $t68 := $MakePtr(false, $locals)
-                    // $t69 := 42
-                    $t69 := 42
-                    // $t4 := $t69
-                    mstore(add($locals, 224), $t69)
-                    // $t70 := borrow_local($t4)
-                    $t70 := $MakePtr(false, add($locals, 248))
-                    // $t71 := Table::contains<u64, u128>($t68, $t70)
-                    $t71 := A2_Table_contains$u64_u128$($t68, $t70)
-                    // if ($t71) goto L8 else goto L9
-                    switch $t71
-                    case 0  { $block := 11 }
-                    default { $block := 12 }
+                    // $t53 := 102
+                    $t53 := 102
+                    // abort($t53)
+                    $Abort($t53)
                 }
                 case 11 {
-                    // label L9
-                    // $t72 := 104
-                    $t72 := 104
-                    // abort($t72)
-                    $Abort($t72)
-                }
-                case 12 {
                     // label L8
-                    // $t73 := borrow_local($t31)
-                    $t73 := $MakePtr(false, $locals)
-                    // $t74 := 0
-                    $t74 := 0
-                    // $t6 := $t74
-                    mstore(add($locals, 256), $t74)
-                    // $t75 := borrow_local($t6)
-                    $t75 := $MakePtr(false, add($locals, 280))
-                    // $t76 := Table::contains<u64, u128>($t73, $t75)
-                    $t76 := A2_Table_contains$u64_u128$($t73, $t75)
-                    // $t77 := !($t76)
-                    $t77 := $LogicalNot($t76)
-                    // if ($t77) goto L10 else goto L11
-                    switch $t77
+                    // $t54 := borrow_local($t31)
+                    $t54 := $MakePtr(false, $locals)
+                    // $t55 := 42
+                    $t55 := 42
+                    // $t29 := $t55
+                    mstore(add($locals, 160), $t55)
+                    // $t56 := borrow_local($t29)
+                    $t56 := $MakePtr(false, add($locals, 184))
+                    // $t57 := Table::borrow<u64, u128>($t54, $t56)
+                    $t57 := A2_Table_borrow$u64_u128$($t54, $t56)
+                    // $t58 := read_ref($t57)
+                    $t58 := $LoadU128($t57)
+                    // $t59 := 1012
+                    $t59 := 1012
+                    // $t60 := ==($t58, $t59)
+                    $t60 := $Eq($t58, $t59)
+                    // if ($t60) goto L10 else goto L9
+                    switch $t60
                     case 0  { $block := 13 }
-                    default { $block := 14 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
                 }
                 case 13 {
-                    // label L11
-                    // $t78 := 105
-                    $t78 := 105
-                    // abort($t78)
-                    $Abort($t78)
+                    // label L9
+                    // $t61 := 103
+                    $t61 := 103
+                    // abort($t61)
+                    $Abort($t61)
                 }
                 case 14 {
-                    // label L10
-                    // $t79 := borrow_local($t31)
-                    $t79 := $MakePtr(false, $locals)
-                    // $t80 := 43
-                    $t80 := 43
-                    // $t8 := $t80
-                    mstore(add($locals, 288), $t80)
-                    // $t81 := borrow_local($t8)
-                    $t81 := $MakePtr(false, add($locals, 312))
-                    // $t82 := Table::contains<u64, u128>($t79, $t81)
-                    $t82 := A2_Table_contains$u64_u128$($t79, $t81)
-                    // if ($t82) goto L12 else goto L13
-                    switch $t82
-                    case 0  { $block := 15 }
-                    default { $block := 16 }
+                    // label L11
+                    // $t62 := borrow_local($t31)
+                    $t62 := $MakePtr(false, $locals)
+                    // $t63 := 43
+                    $t63 := 43
+                    // $t2 := $t63
+                    mstore(add($locals, 192), $t63)
+                    // $t64 := borrow_local($t2)
+                    $t64 := $MakePtr(false, add($locals, 216))
+                    // $t65 := 1013
+                    $t65 := 1013
+                    // Table::insert<u64, u128>($t62, $t64, $t65)
+                    A2_Table_insert$u64_u128$($t62, $t64, $t65)
+                    // $t66 := borrow_local($t31)
+                    $t66 := $MakePtr(false, $locals)
+                    // $t67 := 42
+                    $t67 := 42
+                    // $t4 := $t67
+                    mstore(add($locals, 224), $t67)
+                    // $t68 := borrow_local($t4)
+                    $t68 := $MakePtr(false, add($locals, 248))
+                    // $t69 := Table::contains<u64, u128>($t66, $t68)
+                    $t69 := A2_Table_contains$u64_u128$($t66, $t68)
+                    // if ($t69) goto L13 else goto L12
+                    switch $t69
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
                 }
                 case 15 {
                     // label L13
-                    // $t83 := 106
-                    $t83 := 106
-                    // abort($t83)
-                    $Abort($t83)
+                    // goto L14
+                    $block := 17
                 }
                 case 16 {
                     // label L12
-                    // $t84 := borrow_local($t31)
-                    $t84 := $MakePtr(false, $locals)
-                    // $t85 := 43
-                    $t85 := 43
-                    // $t10 := $t85
-                    mstore(add($locals, 320), $t85)
-                    // $t86 := borrow_local($t10)
-                    $t86 := $MakePtr(false, add($locals, 344))
-                    // $t87 := Table::borrow<u64, u128>($t84, $t86)
-                    $t87 := A2_Table_borrow$u64_u128$($t84, $t86)
-                    // $t88 := read_ref($t87)
-                    $t88 := $LoadU128($t87)
-                    // $t89 := 1013
-                    $t89 := 1013
-                    // $t90 := ==($t88, $t89)
-                    $t90 := $Eq($t88, $t89)
-                    // if ($t90) goto L14 else goto L15
-                    switch $t90
-                    case 0  { $block := 17 }
-                    default { $block := 18 }
+                    // $t70 := 104
+                    $t70 := 104
+                    // abort($t70)
+                    $Abort($t70)
                 }
                 case 17 {
-                    // label L15
-                    // $t91 := 107
-                    $t91 := 107
-                    // abort($t91)
-                    $Abort($t91)
-                }
-                case 18 {
                     // label L14
-                    // $t92 := borrow_local($t31)
-                    $t92 := $MakePtr(false, $locals)
-                    // $t93 := 42
-                    $t93 := 42
-                    // $t13 := $t93
-                    mstore(add($locals, 352), $t93)
-                    // $t94 := borrow_local($t13)
-                    $t94 := $MakePtr(false, add($locals, 376))
-                    // $t95 := Table::remove<u64, u128>($t92, $t94)
-                    $t95 := A2_Table_remove$u64_u128$($t92, $t94)
-                    // $t96 := 1012
-                    $t96 := 1012
-                    // $t97 := ==($t95, $t96)
-                    $t97 := $Eq($t95, $t96)
-                    // if ($t97) goto L16 else goto L17
-                    switch $t97
+                    // $t71 := borrow_local($t31)
+                    $t71 := $MakePtr(false, $locals)
+                    // $t72 := 0
+                    $t72 := 0
+                    // $t6 := $t72
+                    mstore(add($locals, 256), $t72)
+                    // $t73 := borrow_local($t6)
+                    $t73 := $MakePtr(false, add($locals, 280))
+                    // $t74 := Table::contains<u64, u128>($t71, $t73)
+                    $t74 := A2_Table_contains$u64_u128$($t71, $t73)
+                    // $t75 := !($t74)
+                    $t75 := $LogicalNot($t74)
+                    // if ($t75) goto L16 else goto L15
+                    switch $t75
                     case 0  { $block := 19 }
-                    default { $block := 20 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
                 }
                 case 19 {
-                    // label L17
-                    // $t98 := 108
-                    $t98 := 108
-                    // abort($t98)
-                    $Abort($t98)
+                    // label L15
+                    // $t76 := 105
+                    $t76 := 105
+                    // abort($t76)
+                    $Abort($t76)
                 }
                 case 20 {
-                    // label L16
-                    // $t99 := 0x42
-                    $t99 := 0x42
-                    // $t15 := Evm::sign($t99)
-                    mstore(add($locals, 384), A2_Evm_sign($t99))
-                    // $t100 := borrow_local($t15)
-                    $t100 := $MakePtr(false, add($locals, 384))
-                    // $t101 := move($t31)
-                    $t101 := mload($locals)
-                    // $t102 := pack Tables::S<u64, u128>($t101)
+                    // label L17
+                    // $t77 := borrow_local($t31)
+                    $t77 := $MakePtr(false, $locals)
+                    // $t78 := 43
+                    $t78 := 43
+                    // $t8 := $t78
+                    mstore(add($locals, 288), $t78)
+                    // $t79 := borrow_local($t8)
+                    $t79 := $MakePtr(false, add($locals, 312))
+                    // $t80 := Table::contains<u64, u128>($t77, $t79)
+                    $t80 := A2_Table_contains$u64_u128$($t77, $t79)
+                    // if ($t80) goto L19 else goto L18
+                    switch $t80
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t81 := 106
+                    $t81 := 106
+                    // abort($t81)
+                    $Abort($t81)
+                }
+                case 23 {
+                    // label L20
+                    // $t82 := borrow_local($t31)
+                    $t82 := $MakePtr(false, $locals)
+                    // $t83 := 43
+                    $t83 := 43
+                    // $t10 := $t83
+                    mstore(add($locals, 320), $t83)
+                    // $t84 := borrow_local($t10)
+                    $t84 := $MakePtr(false, add($locals, 344))
+                    // $t85 := Table::borrow<u64, u128>($t82, $t84)
+                    $t85 := A2_Table_borrow$u64_u128$($t82, $t84)
+                    // $t86 := read_ref($t85)
+                    $t86 := $LoadU128($t85)
+                    // $t87 := 1013
+                    $t87 := 1013
+                    // $t88 := ==($t86, $t87)
+                    $t88 := $Eq($t86, $t87)
+                    // if ($t88) goto L22 else goto L21
+                    switch $t88
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
+                }
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
+                    // $t89 := 107
+                    $t89 := 107
+                    // abort($t89)
+                    $Abort($t89)
+                }
+                case 26 {
+                    // label L23
+                    // $t90 := borrow_local($t31)
+                    $t90 := $MakePtr(false, $locals)
+                    // $t91 := 42
+                    $t91 := 42
+                    // $t13 := $t91
+                    mstore(add($locals, 352), $t91)
+                    // $t92 := borrow_local($t13)
+                    $t92 := $MakePtr(false, add($locals, 376))
+                    // $t93 := Table::remove<u64, u128>($t90, $t92)
+                    $t93 := A2_Table_remove$u64_u128$($t90, $t92)
+                    // $t94 := 1012
+                    $t94 := 1012
+                    // $t95 := ==($t93, $t94)
+                    $t95 := $Eq($t93, $t94)
+                    // if ($t95) goto L25 else goto L24
+                    switch $t95
+                    case 0  { $block := 28 }
+                    default { $block := 27 }
+                }
+                case 27 {
+                    // label L25
+                    // goto L26
+                    $block := 29
+                }
+                case 28 {
+                    // label L24
+                    // $t96 := 108
+                    $t96 := 108
+                    // abort($t96)
+                    $Abort($t96)
+                }
+                case 29 {
+                    // label L26
+                    // $t97 := 0x42
+                    $t97 := 0x42
+                    // $t15 := Evm::sign($t97)
+                    mstore(add($locals, 384), A2_Evm_sign($t97))
+                    // $t98 := borrow_local($t15)
+                    $t98 := $MakePtr(false, add($locals, 384))
+                    // $t99 := move($t31)
+                    $t99 := mload($locals)
+                    // $t100 := pack Tables::S<u64, u128>($t99)
                     {
                         let $mem := $Malloc(32)
-                        $MemoryStoreU256(add($mem, 0), $t101)
-                        $t102 := $mem
+                        $MemoryStoreU256(add($mem, 0), $t99)
+                        $t100 := $mem
                     }
-                    // move_to<Tables::S<u64, u128>>($t102, $t100)
+                    // move_to<Tables::S<u64, u128>>($t100, $t98)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $LoadU256($t100))
+                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $LoadU256($t98))
                         if $AlignedStorageLoad($base_offset) {
                           $AbortBuiltin()
                         }
                         $AlignedStorageStore($base_offset, true)
                         {
                             let $dst := add($base_offset, 32)
-                            let $src := $t102
+                            let $src := $t100
                             $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
                             $Free($src, 32)
                         }
                     }
-                    // $t103 := 0x42
-                    $t103 := 0x42
-                    // $t104 := borrow_global<Tables::S<u64, u128>>($t103)
+                    // $t101 := 0x42
+                    $t101 := 0x42
+                    // $t102 := borrow_global<Tables::S<u64, u128>>($t101)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $t103)
+                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $t101)
                         if iszero($AlignedStorageLoad($base_offset)) {
                           $AbortBuiltin()
                         }
-                        $t104 := $MakePtr(true, add($base_offset, 32))
+                        $t102 := $MakePtr(true, add($base_offset, 32))
                     }
-                    // $t105 := borrow_field<Tables::S<u64, u128>>.t($t104)
-                    $t105 := $t104
-                    // $t106 := 42
-                    $t106 := 42
-                    // $t16 := $t106
-                    mstore(add($locals, 416), $t106)
-                    // $t107 := borrow_local($t16)
-                    $t107 := $MakePtr(false, add($locals, 440))
-                    // $t108 := Table::contains<u64, u128>($t105, $t107)
-                    $t108 := A2_Table_contains$u64_u128$($t105, $t107)
-                    // $t109 := !($t108)
-                    $t109 := $LogicalNot($t108)
-                    // if ($t109) goto L18 else goto L19
-                    switch $t109
-                    case 0  { $block := 21 }
-                    default { $block := 22 }
+                    // $t103 := borrow_field<Tables::S<u64, u128>>.t($t102)
+                    $t103 := $t102
+                    // $t104 := 42
+                    $t104 := 42
+                    // $t16 := $t104
+                    mstore(add($locals, 416), $t104)
+                    // $t105 := borrow_local($t16)
+                    $t105 := $MakePtr(false, add($locals, 440))
+                    // $t106 := Table::contains<u64, u128>($t103, $t105)
+                    $t106 := A2_Table_contains$u64_u128$($t103, $t105)
+                    // $t107 := !($t106)
+                    $t107 := $LogicalNot($t106)
+                    // if ($t107) goto L28 else goto L27
+                    switch $t107
+                    case 0  { $block := 31 }
+                    default { $block := 30 }
                 }
-                case 21 {
-                    // label L19
-                    // destroy($t105)
-                    // $t110 := 109
-                    $t110 := 109
-                    // abort($t110)
-                    $Abort($t110)
+                case 30 {
+                    // label L28
+                    // goto L29
+                    $block := 32
                 }
-                case 22 {
-                    // label L18
-                    // $t111 := 43
-                    $t111 := 43
-                    // $t18 := $t111
-                    mstore(add($locals, 448), $t111)
-                    // $t112 := borrow_local($t18)
-                    $t112 := $MakePtr(false, add($locals, 472))
-                    // $t113 := Table::borrow<u64, u128>($t105, $t112)
-                    $t113 := A2_Table_borrow$u64_u128$($t105, $t112)
-                    // $t114 := read_ref($t113)
-                    $t114 := $LoadU128($t113)
-                    // $t115 := 1013
-                    $t115 := 1013
-                    // $t116 := ==($t114, $t115)
-                    $t116 := $Eq($t114, $t115)
-                    // if ($t116) goto L20 else goto L21
-                    switch $t116
-                    case 0  { $block := 23 }
-                    default { $block := 24 }
+                case 31 {
+                    // label L27
+                    // destroy($t103)
+                    // $t108 := 109
+                    $t108 := 109
+                    // abort($t108)
+                    $Abort($t108)
                 }
-                case 23 {
-                    // label L21
-                    // $t117 := 110
-                    $t117 := 110
-                    // abort($t117)
-                    $Abort($t117)
+                case 32 {
+                    // label L29
+                    // $t109 := 43
+                    $t109 := 43
+                    // $t18 := $t109
+                    mstore(add($locals, 448), $t109)
+                    // $t110 := borrow_local($t18)
+                    $t110 := $MakePtr(false, add($locals, 472))
+                    // $t111 := Table::borrow<u64, u128>($t103, $t110)
+                    $t111 := A2_Table_borrow$u64_u128$($t103, $t110)
+                    // $t112 := read_ref($t111)
+                    $t112 := $LoadU128($t111)
+                    // $t113 := 1013
+                    $t113 := 1013
+                    // $t114 := ==($t112, $t113)
+                    $t114 := $Eq($t112, $t113)
+                    // if ($t114) goto L31 else goto L30
+                    switch $t114
+                    case 0  { $block := 34 }
+                    default { $block := 33 }
                 }
-                case 24 {
-                    // label L20
-                    // $t118 := 0x42
-                    $t118 := 0x42
-                    // $t119 := move_from<Tables::S<u64, u128>>($t118)
+                case 33 {
+                    // label L31
+                    // goto L32
+                    $block := 35
+                }
+                case 34 {
+                    // label L30
+                    // $t115 := 110
+                    $t115 := 110
+                    // abort($t115)
+                    $Abort($t115)
+                }
+                case 35 {
+                    // label L32
+                    // $t116 := 0x42
+                    $t116 := 0x42
+                    // $t117 := move_from<Tables::S<u64, u128>>($t116)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $t118)
+                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $t116)
                         if iszero($AlignedStorageLoad($base_offset)) {
                           $AbortBuiltin()
                         }
@@ -1062,66 +1132,71 @@ object "test_A2_Tables_test_primitive" {
                             $dst := $Malloc(32)
                             mstore(add($dst, 0), $AlignedStorageLoad(add($src, 0)))
                             $AlignedStorageStore(add($src, 0), 0)
-                            $t119 := $dst
+                            $t117 := $dst
                         }
                     }
-                    // $t30 := unpack Tables::S<u64, u128>($t119)
-                    mstore(add($locals, 480), $MemoryLoadU256(add($t119, 0)))
-                    $Free($t119, 32)
-                    // $t120 := borrow_local($t30)
-                    $t120 := $MakePtr(false, add($locals, 480))
-                    // $t121 := 43
-                    $t121 := 43
-                    // $t20 := $t121
-                    mstore(add($locals, 512), $t121)
-                    // $t122 := borrow_local($t20)
-                    $t122 := $MakePtr(false, add($locals, 536))
-                    // $t123 := Table::borrow<u64, u128>($t120, $t122)
-                    $t123 := A2_Table_borrow$u64_u128$($t120, $t122)
-                    // $t124 := read_ref($t123)
-                    $t124 := $LoadU128($t123)
-                    // $t125 := 1013
-                    $t125 := 1013
-                    // $t126 := ==($t124, $t125)
-                    $t126 := $Eq($t124, $t125)
-                    // if ($t126) goto L22 else goto L23
-                    switch $t126
-                    case 0  { $block := 25 }
-                    default { $block := 26 }
+                    // $t30 := unpack Tables::S<u64, u128>($t117)
+                    mstore(add($locals, 480), $MemoryLoadU256(add($t117, 0)))
+                    $Free($t117, 32)
+                    // $t118 := borrow_local($t30)
+                    $t118 := $MakePtr(false, add($locals, 480))
+                    // $t119 := 43
+                    $t119 := 43
+                    // $t20 := $t119
+                    mstore(add($locals, 512), $t119)
+                    // $t120 := borrow_local($t20)
+                    $t120 := $MakePtr(false, add($locals, 536))
+                    // $t121 := Table::borrow<u64, u128>($t118, $t120)
+                    $t121 := A2_Table_borrow$u64_u128$($t118, $t120)
+                    // $t122 := read_ref($t121)
+                    $t122 := $LoadU128($t121)
+                    // $t123 := 1013
+                    $t123 := 1013
+                    // $t124 := ==($t122, $t123)
+                    $t124 := $Eq($t122, $t123)
+                    // if ($t124) goto L34 else goto L33
+                    switch $t124
+                    case 0  { $block := 37 }
+                    default { $block := 36 }
                 }
-                case 25 {
-                    // label L23
-                    // $t127 := 111
-                    $t127 := 111
-                    // abort($t127)
-                    $Abort($t127)
+                case 36 {
+                    // label L34
+                    // goto L35
+                    $block := 38
                 }
-                case 26 {
-                    // label L22
-                    // $t128 := 0x43
-                    $t128 := 0x43
-                    // $t23 := Evm::sign($t128)
-                    mstore(add($locals, 544), A2_Evm_sign($t128))
-                    // $t129 := borrow_local($t23)
-                    $t129 := $MakePtr(false, add($locals, 544))
-                    // $t130 := move($t30)
-                    $t130 := mload(add($locals, 480))
-                    // $t131 := pack Tables::S<u64, u128>($t130)
+                case 37 {
+                    // label L33
+                    // $t125 := 111
+                    $t125 := 111
+                    // abort($t125)
+                    $Abort($t125)
+                }
+                case 38 {
+                    // label L35
+                    // $t126 := 0x43
+                    $t126 := 0x43
+                    // $t23 := Evm::sign($t126)
+                    mstore(add($locals, 544), A2_Evm_sign($t126))
+                    // $t127 := borrow_local($t23)
+                    $t127 := $MakePtr(false, add($locals, 544))
+                    // $t128 := move($t30)
+                    $t128 := mload(add($locals, 480))
+                    // $t129 := pack Tables::S<u64, u128>($t128)
                     {
                         let $mem := $Malloc(32)
-                        $MemoryStoreU256(add($mem, 0), $t130)
-                        $t131 := $mem
+                        $MemoryStoreU256(add($mem, 0), $t128)
+                        $t129 := $mem
                     }
-                    // move_to<Tables::S<u64, u128>>($t131, $t129)
+                    // move_to<Tables::S<u64, u128>>($t129, $t127)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $LoadU256($t129))
+                        let $base_offset := $MakeTypeStorageBase(0, 0x8a475b1c, $LoadU256($t127))
                         if $AlignedStorageLoad($base_offset) {
                           $AbortBuiltin()
                         }
                         $AlignedStorageStore($base_offset, true)
                         {
                             let $dst := add($base_offset, 32)
-                            let $src := $t131
+                            let $src := $t129
                             $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
                             $Free($src, 32)
                         }
@@ -1376,7 +1451,7 @@ object "test_A2_Tables_test_primitive" {
         }
     }
 }
-===> Test result of Tables::test_primitive: Succeed(Stopped) (used_gas=190947): []
+===> Test result of Tables::test_primitive: Succeed(Stopped) (used_gas=196448): []
 
 // test of Tables::test_remove_fail
 /* =======================================
@@ -1390,44 +1465,74 @@ object "test_A2_Tables_test_remove_fail" {
         A2_Tables_test_remove_fail()
         return (0, 0)
         function A2_Tables_test_remove_fail() {
-            let tmp_$1, value, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16
+            let tmp_$1, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15
             let $locals := $Malloc(96)
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t12 := 101
-                    $t12 := 101
-                    // abort($t12)
-                    $Abort($t12)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t13 := 0x42
-                    $t13 := 0x42
-                    // $t2 := Evm::sign($t13)
-                    mstore(add($locals, 64), A2_Evm_sign($t13))
-                    // $t14 := borrow_local($t2)
-                    $t14 := $MakePtr(false, add($locals, 64))
-                    // $t15 := move($t3)
-                    $t15 := mload($locals)
-                    // $t16 := pack Tables::S<u64, Tables::Balance>($t15)
+                    // $t11 := 101
+                    $t11 := 101
+                    // abort($t11)
+                    $Abort($t11)
+                }
+                case 4 {
+                    // $t3 := Table::empty<u64, Tables::Balance>()
+                    mstore($locals, A2_Table_empty$u64_A2_Tables_Balance$())
+                    // $t4 := borrow_local($t3)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 42
+                    $t5 := 42
+                    // $t0 := $t5
+                    mstore(add($locals, 32), $t5)
+                    // $t6 := borrow_local($t0)
+                    $t6 := $MakePtr(false, add($locals, 56))
+                    // $t7 := Table::remove<u64, Tables::Balance>($t4, $t6)
+                    $t7 := A2_Table_remove$u64_A2_Tables_Balance$($t4, $t6)
+                    // $t8 := unpack Tables::Balance($t7)
+                    $t8 := $MemoryLoadU256(add($t7, 0))
+                    $Free($t7, 32)
+                    // $t9 := U256::zero()
+                    $t9 := A2_U256_zero()
+                    // $t10 := ==($t8, $t9)
+                    $t10 := $Eq($t8, $t9)
+                    // if ($t10) goto L1 else goto L0
+                    switch $t10
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t12 := 0x42
+                    $t12 := 0x42
+                    // $t2 := Evm::sign($t12)
+                    mstore(add($locals, 64), A2_Evm_sign($t12))
+                    // $t13 := borrow_local($t2)
+                    $t13 := $MakePtr(false, add($locals, 64))
+                    // $t14 := move($t3)
+                    $t14 := mload($locals)
+                    // $t15 := pack Tables::S<u64, Tables::Balance>($t14)
                     {
                         let $mem := $Malloc(32)
-                        $MemoryStoreU256(add($mem, 0), $t15)
-                        $t16 := $mem
+                        $MemoryStoreU256(add($mem, 0), $t14)
+                        $t15 := $mem
                     }
-                    // move_to<Tables::S<u64, Tables::Balance>>($t16, $t14)
+                    // move_to<Tables::S<u64, Tables::Balance>>($t15, $t13)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x6f98bffd, $LoadU256($t14))
+                        let $base_offset := $MakeTypeStorageBase(0, 0x6f98bffd, $LoadU256($t13))
                         if $AlignedStorageLoad($base_offset) {
                           $AbortBuiltin()
                         }
                         $AlignedStorageStore($base_offset, true)
                         {
                             let $dst := add($base_offset, 32)
-                            let $src := $t16
+                            let $src := $t15
                             $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
                             $Free($src, 32)
                         }
@@ -1436,34 +1541,12 @@ object "test_A2_Tables_test_remove_fail" {
                     $Free($locals, 96)
                     leave
                 }
-                case 4 {
-                    // $t3 := Table::empty<u64, Tables::Balance>()
-                    mstore($locals, A2_Table_empty$u64_A2_Tables_Balance$())
-                    // $t5 := borrow_local($t3)
-                    $t5 := $MakePtr(false, $locals)
-                    // $t6 := 42
-                    $t6 := 42
-                    // $t0 := $t6
-                    mstore(add($locals, 32), $t6)
-                    // $t7 := borrow_local($t0)
-                    $t7 := $MakePtr(false, add($locals, 56))
-                    // $t8 := Table::remove<u64, Tables::Balance>($t5, $t7)
-                    $t8 := A2_Table_remove$u64_A2_Tables_Balance$($t5, $t7)
-                    // $t9 := unpack Tables::Balance($t8)
-                    $t9 := $MemoryLoadU256(add($t8, 0))
-                    $Free($t8, 32)
-                    // $t10 := U256::zero()
-                    $t10 := A2_U256_zero()
-                    // $t11 := ==($t9, $t10)
-                    $t11 := $Eq($t9, $t10)
-                    // if ($t11) goto L0 else goto L1
-                    switch $t11
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
-                }
             }
         }
 
+        function A2_Evm_sign(addr) -> signer {
+          signer := addr
+        }
         function A2_U256_zero() -> $result {
             let $t0
             // $t0 := 0
@@ -1489,9 +1572,6 @@ object "test_A2_Tables_test_remove_fail" {
         function A2_Table_empty$u64_A2_Tables_Balance$() -> table {
             table := $NewTableHandle()
         }
-        function A2_Evm_sign(addr) -> signer {
-          signer := addr
-        }
         function $Abort(code) {
             mstore(0, code)
             revert(24, 8) // TODO: store code as a string?
@@ -1637,7 +1717,7 @@ object "test_A2_Tables_test_remove_fail" {
         }
     }
 }
-===> Test result of Tables::test_remove_fail: Revert(Reverted) (used_gas=24809): [255, 255, 255, 255, 255, 255, 255, 255]
+===> Test result of Tables::test_remove_fail: Revert(Reverted) (used_gas=24811): [255, 255, 255, 255, 255, 255, 255, 255]
 
 // test of Tables::test_struct
 /* =======================================
@@ -1651,311 +1731,346 @@ object "test_A2_Tables_test_struct" {
         A2_Tables_test_struct()
         return (0, 0)
         function A2_Tables_test_struct() {
-            let tmp_$2, tmp_$3, tmp_$4, tmp_$6, tmp_$7, tmp_$8, tmp_$10, tmp_$11, tmp_$13, tmp_$14, tmp_$15, tmp_$17, tmp_$19, tmp_$20, tmp_$21, tmp_$23, tmp_$25, tmp_$28, entry_mut_ref, global_t, val_1, val_2, value, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96, $t97, $t98, $t99, $t100, $t101, $t102, $t103, $t104, $t105, $t106, $t107, $t108
+            let tmp_$2, tmp_$3, tmp_$5, tmp_$6, tmp_$8, tmp_$9, tmp_$11, tmp_$12, tmp_$14, tmp_$16, tmp_$17, tmp_$19, tmp_$21, tmp_$24, entry_mut_ref, global_t, val_1, val_2, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96, $t97, $t98, $t99, $t100, $t101, $t102, $t103
             let $locals := $Malloc(384)
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t45 := 101
-                    $t45 := 101
-                    // abort($t45)
-                    $Abort($t45)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t46 := borrow_local($t31)
-                    $t46 := $MakePtr(false, $locals)
-                    // $t47 := 0xab
-                    $t47 := 0xab
-                    // $t24 := $t47
-                    mstore(add($locals, 96), $t47)
-                    // $t48 := borrow_local($t24)
-                    $t48 := $MakePtr(false, add($locals, 96))
-                    // $t49 := Table::borrow<address, Tables::Balance>($t46, $t48)
-                    $t49 := A2_Table_borrow$address_A2_Tables_Balance$($t46, $t48)
-                    // $t50 := borrow_field<Tables::Balance>.value($t49)
-                    $t50 := $t49
-                    // $t51 := read_ref($t50)
-                    $t51 := $LoadU256($t50)
-                    // $t52 := ==($t51, $t35)
-                    $t52 := $Eq($t51, $t35)
-                    // if ($t52) goto L2 else goto L3
-                    switch $t52
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
+                    // $t40 := 101
+                    $t40 := 101
+                    // abort($t40)
+                    $Abort($t40)
                 }
                 case 4 {
-                    // $t31 := Table::empty<address, Tables::Balance>()
+                    // $t27 := Table::empty<address, Tables::Balance>()
                     mstore($locals, A2_Table_empty$address_A2_Tables_Balance$())
-                    // $t35 := 3743106036130323098097120681749450326028
-                    $t35 := 3743106036130323098097120681749450326028
-                    // $t36 := 15312706511442230855851857334429569515566
-                    $t36 := 15312706511442230855851857334429569515566
-                    // $t37 := borrow_local($t31)
-                    $t37 := $MakePtr(false, $locals)
-                    // $t38 := 0xab
-                    $t38 := 0xab
-                    // $t0 := $t38
-                    mstore(add($locals, 32), $t38)
-                    // $t39 := borrow_local($t0)
-                    $t39 := $MakePtr(false, add($locals, 32))
-                    // $t40 := pack Tables::Balance($t35)
+                    // $t30 := 3743106036130323098097120681749450326028
+                    $t30 := 3743106036130323098097120681749450326028
+                    // $t31 := 15312706511442230855851857334429569515566
+                    $t31 := 15312706511442230855851857334429569515566
+                    // $t32 := borrow_local($t27)
+                    $t32 := $MakePtr(false, $locals)
+                    // $t33 := 0xab
+                    $t33 := 0xab
+                    // $t0 := $t33
+                    mstore(add($locals, 32), $t33)
+                    // $t34 := borrow_local($t0)
+                    $t34 := $MakePtr(false, add($locals, 32))
+                    // $t35 := pack Tables::Balance($t30)
                     {
                         let $mem := $Malloc(32)
-                        $MemoryStoreU256(add($mem, 0), $t35)
-                        $t40 := $mem
+                        $MemoryStoreU256(add($mem, 0), $t30)
+                        $t35 := $mem
                     }
-                    // Table::insert<address, Tables::Balance>($t37, $t39, $t40)
-                    A2_Table_insert$address_A2_Tables_Balance$($t37, $t39, $t40)
-                    // $t41 := borrow_local($t31)
+                    // Table::insert<address, Tables::Balance>($t32, $t34, $t35)
+                    A2_Table_insert$address_A2_Tables_Balance$($t32, $t34, $t35)
+                    // $t36 := borrow_local($t27)
+                    $t36 := $MakePtr(false, $locals)
+                    // $t37 := 0xab
+                    $t37 := 0xab
+                    // $t18 := $t37
+                    mstore(add($locals, 64), $t37)
+                    // $t38 := borrow_local($t18)
+                    $t38 := $MakePtr(false, add($locals, 64))
+                    // $t39 := Table::contains<address, Tables::Balance>($t36, $t38)
+                    $t39 := A2_Table_contains$address_A2_Tables_Balance$($t36, $t38)
+                    // if ($t39) goto L1 else goto L0
+                    switch $t39
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t41 := borrow_local($t27)
                     $t41 := $MakePtr(false, $locals)
                     // $t42 := 0xab
                     $t42 := 0xab
-                    // $t22 := $t42
-                    mstore(add($locals, 64), $t42)
-                    // $t43 := borrow_local($t22)
-                    $t43 := $MakePtr(false, add($locals, 64))
-                    // $t44 := Table::contains<address, Tables::Balance>($t41, $t43)
-                    $t44 := A2_Table_contains$address_A2_Tables_Balance$($t41, $t43)
-                    // if ($t44) goto L0 else goto L1
-                    switch $t44
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
-                }
-                case 5 {
-                    // label L3
-                    // $t53 := 102
-                    $t53 := 102
-                    // abort($t53)
-                    $Abort($t53)
+                    // $t20 := $t42
+                    mstore(add($locals, 96), $t42)
+                    // $t43 := borrow_local($t20)
+                    $t43 := $MakePtr(false, add($locals, 96))
+                    // $t44 := Table::borrow<address, Tables::Balance>($t41, $t43)
+                    $t44 := A2_Table_borrow$address_A2_Tables_Balance$($t41, $t43)
+                    // $t45 := borrow_field<Tables::Balance>.value($t44)
+                    $t45 := $t44
+                    // $t46 := read_ref($t45)
+                    $t46 := $LoadU256($t45)
+                    // $t47 := ==($t46, $t30)
+                    $t47 := $Eq($t46, $t30)
+                    // if ($t47) goto L4 else goto L3
+                    switch $t47
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
                 }
                 case 6 {
-                    // label L2
-                    // $t54 := 0x42
-                    $t54 := 0x42
-                    // $t26 := Evm::sign($t54)
-                    mstore(add($locals, 128), A2_Evm_sign($t54))
-                    // $t55 := borrow_local($t26)
-                    $t55 := $MakePtr(false, add($locals, 128))
-                    // $t56 := move($t31)
-                    $t56 := mload($locals)
-                    // $t57 := pack Tables::S<address, Tables::Balance>($t56)
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t48 := 102
+                    $t48 := 102
+                    // abort($t48)
+                    $Abort($t48)
+                }
+                case 8 {
+                    // label L5
+                    // $t49 := 0x42
+                    $t49 := 0x42
+                    // $t22 := Evm::sign($t49)
+                    mstore(add($locals, 128), A2_Evm_sign($t49))
+                    // $t50 := borrow_local($t22)
+                    $t50 := $MakePtr(false, add($locals, 128))
+                    // $t51 := move($t27)
+                    $t51 := mload($locals)
+                    // $t52 := pack Tables::S<address, Tables::Balance>($t51)
                     {
                         let $mem := $Malloc(32)
-                        $MemoryStoreU256(add($mem, 0), $t56)
-                        $t57 := $mem
+                        $MemoryStoreU256(add($mem, 0), $t51)
+                        $t52 := $mem
                     }
-                    // move_to<Tables::S<address, Tables::Balance>>($t57, $t55)
+                    // move_to<Tables::S<address, Tables::Balance>>($t52, $t50)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x7dd56ec3, $LoadU256($t55))
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7dd56ec3, $LoadU256($t50))
                         if $AlignedStorageLoad($base_offset) {
                           $AbortBuiltin()
                         }
                         $AlignedStorageStore($base_offset, true)
                         {
                             let $dst := add($base_offset, 32)
-                            let $src := $t57
+                            let $src := $t52
                             $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
                             $Free($src, 32)
                         }
                     }
-                    // $t58 := 0x42
-                    $t58 := 0x42
-                    // $t59 := borrow_global<Tables::S<address, Tables::Balance>>($t58)
+                    // $t53 := 0x42
+                    $t53 := 0x42
+                    // $t54 := borrow_global<Tables::S<address, Tables::Balance>>($t53)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x7dd56ec3, $t58)
+                        let $base_offset := $MakeTypeStorageBase(0, 0x7dd56ec3, $t53)
                         if iszero($AlignedStorageLoad($base_offset)) {
                           $AbortBuiltin()
                         }
-                        $t59 := $MakePtr(true, add($base_offset, 32))
+                        $t54 := $MakePtr(true, add($base_offset, 32))
                     }
-                    // $t60 := borrow_field<Tables::S<address, Tables::Balance>>.t($t59)
-                    $t60 := $t59
-                    // $t61 := 0xcd
-                    $t61 := 0xcd
-                    // $t27 := $t61
-                    mstore(add($locals, 160), $t61)
-                    // $t62 := borrow_local($t27)
-                    $t62 := $MakePtr(false, add($locals, 160))
-                    // $t63 := pack Tables::Balance($t36)
+                    // $t55 := borrow_field<Tables::S<address, Tables::Balance>>.t($t54)
+                    $t55 := $t54
+                    // $t56 := 0xcd
+                    $t56 := 0xcd
+                    // $t23 := $t56
+                    mstore(add($locals, 160), $t56)
+                    // $t57 := borrow_local($t23)
+                    $t57 := $MakePtr(false, add($locals, 160))
+                    // $t58 := pack Tables::Balance($t31)
                     {
                         let $mem := $Malloc(32)
-                        $MemoryStoreU256(add($mem, 0), $t36)
-                        $t63 := $mem
+                        $MemoryStoreU256(add($mem, 0), $t31)
+                        $t58 := $mem
                     }
-                    // Table::insert<address, Tables::Balance>($t60, $t62, $t63)
-                    A2_Table_insert$address_A2_Tables_Balance$($t60, $t62, $t63)
-                    // $t64 := 0xab
-                    $t64 := 0xab
-                    // $t1 := $t64
-                    mstore(add($locals, 192), $t64)
-                    // $t65 := borrow_local($t1)
-                    $t65 := $MakePtr(false, add($locals, 192))
-                    // $t66 := freeze_ref($t60)
-                    $t66 := $t60
-                    // $t67 := Table::borrow<address, Tables::Balance>($t66, $t65)
-                    $t67 := A2_Table_borrow$address_A2_Tables_Balance$($t66, $t65)
-                    // $t68 := borrow_field<Tables::Balance>.value($t67)
-                    $t68 := $t67
-                    // $t69 := read_ref($t68)
-                    $t69 := $LoadU256($t68)
-                    // $t70 := ==($t69, $t35)
-                    $t70 := $Eq($t69, $t35)
-                    // if ($t70) goto L4 else goto L5
-                    switch $t70
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
-                }
-                case 7 {
-                    // label L5
-                    // destroy($t60)
-                    // $t71 := 103
-                    $t71 := 103
-                    // abort($t71)
-                    $Abort($t71)
-                }
-                case 8 {
-                    // label L4
-                    // $t72 := 0xcd
-                    $t72 := 0xcd
-                    // $t5 := $t72
-                    mstore(add($locals, 224), $t72)
-                    // $t73 := borrow_local($t5)
-                    $t73 := $MakePtr(false, add($locals, 224))
-                    // $t74 := freeze_ref($t60)
-                    $t74 := $t60
-                    // $t75 := Table::borrow<address, Tables::Balance>($t74, $t73)
-                    $t75 := A2_Table_borrow$address_A2_Tables_Balance$($t74, $t73)
-                    // $t76 := borrow_field<Tables::Balance>.value($t75)
-                    $t76 := $t75
-                    // $t77 := read_ref($t76)
-                    $t77 := $LoadU256($t76)
-                    // $t78 := ==($t77, $t36)
-                    $t78 := $Eq($t77, $t36)
-                    // if ($t78) goto L6 else goto L7
-                    switch $t78
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    // Table::insert<address, Tables::Balance>($t55, $t57, $t58)
+                    A2_Table_insert$address_A2_Tables_Balance$($t55, $t57, $t58)
+                    // $t59 := 0xab
+                    $t59 := 0xab
+                    // $t1 := $t59
+                    mstore(add($locals, 192), $t59)
+                    // $t60 := borrow_local($t1)
+                    $t60 := $MakePtr(false, add($locals, 192))
+                    // $t61 := freeze_ref($t55)
+                    $t61 := $t55
+                    // $t62 := Table::borrow<address, Tables::Balance>($t61, $t60)
+                    $t62 := A2_Table_borrow$address_A2_Tables_Balance$($t61, $t60)
+                    // $t63 := borrow_field<Tables::Balance>.value($t62)
+                    $t63 := $t62
+                    // $t64 := read_ref($t63)
+                    $t64 := $LoadU256($t63)
+                    // $t65 := ==($t64, $t30)
+                    $t65 := $Eq($t64, $t30)
+                    // if ($t65) goto L7 else goto L6
+                    switch $t65
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
                 case 9 {
                     // label L7
-                    // destroy($t60)
-                    // $t79 := 104
-                    $t79 := 104
-                    // abort($t79)
-                    $Abort($t79)
+                    // goto L8
+                    $block := 11
                 }
                 case 10 {
                     // label L6
-                    // $t80 := 0xcd
-                    $t80 := 0xcd
-                    // $t9 := $t80
-                    mstore(add($locals, 256), $t80)
-                    // $t81 := borrow_local($t9)
-                    $t81 := $MakePtr(false, add($locals, 256))
-                    // $t82 := Table::borrow_mut<address, Tables::Balance>($t60, $t81)
-                    $t82 := A2_Table_borrow_mut$address_A2_Tables_Balance$($t60, $t81)
-                    // $t83 := borrow_field<Tables::Balance>.value($t82)
-                    $t83 := $t82
-                    // $t84 := read_ref($t83)
-                    $t84 := $LoadU256($t83)
-                    // $t85 := U256::one()
-                    $t85 := A2_U256_one()
-                    // $t86 := -($t84, $t85)
-                    $t86 := $Sub($t84, $t85)
-                    // $t87 := borrow_field<Tables::Balance>.value($t82)
-                    $t87 := $t82
-                    // write_ref($t87, $t86)
-                    $StoreU256($t87, $t86)
-                    // $t88 := 0xcd
-                    $t88 := 0xcd
-                    // $t12 := $t88
-                    mstore(add($locals, 288), $t88)
-                    // $t89 := borrow_local($t12)
-                    $t89 := $MakePtr(false, add($locals, 288))
-                    // $t90 := freeze_ref($t60)
-                    $t90 := $t60
-                    // $t91 := Table::borrow<address, Tables::Balance>($t90, $t89)
-                    $t91 := A2_Table_borrow$address_A2_Tables_Balance$($t90, $t89)
-                    // $t92 := borrow_field<Tables::Balance>.value($t91)
-                    $t92 := $t91
-                    // $t93 := read_ref($t92)
-                    $t93 := $LoadU256($t92)
-                    // $t94 := 15312706511442230855851857334429569515565
-                    $t94 := 15312706511442230855851857334429569515565
-                    // $t95 := ==($t93, $t94)
-                    $t95 := $Eq($t93, $t94)
-                    // if ($t95) goto L8 else goto L9
-                    switch $t95
-                    case 0  { $block := 11 }
-                    default { $block := 12 }
+                    // destroy($t55)
+                    // $t66 := 103
+                    $t66 := 103
+                    // abort($t66)
+                    $Abort($t66)
                 }
                 case 11 {
-                    // label L9
-                    // destroy($t60)
-                    // $t96 := 105
-                    $t96 := 105
-                    // abort($t96)
-                    $Abort($t96)
-                }
-                case 12 {
                     // label L8
-                    // $t97 := 0xab
-                    $t97 := 0xab
-                    // $t16 := $t97
-                    mstore(add($locals, 320), $t97)
-                    // $t98 := borrow_local($t16)
-                    $t98 := $MakePtr(false, add($locals, 320))
-                    // $t99 := Table::remove<address, Tables::Balance>($t60, $t98)
-                    $t99 := A2_Table_remove$address_A2_Tables_Balance$($t60, $t98)
-                    // $t100 := unpack Tables::Balance($t99)
-                    $t100 := $MemoryLoadU256(add($t99, 0))
-                    $Free($t99, 32)
-                    // $t101 := ==($t100, $t35)
-                    $t101 := $Eq($t100, $t35)
-                    // if ($t101) goto L10 else goto L11
-                    switch $t101
+                    // $t67 := 0xcd
+                    $t67 := 0xcd
+                    // $t4 := $t67
+                    mstore(add($locals, 224), $t67)
+                    // $t68 := borrow_local($t4)
+                    $t68 := $MakePtr(false, add($locals, 224))
+                    // $t69 := freeze_ref($t55)
+                    $t69 := $t55
+                    // $t70 := Table::borrow<address, Tables::Balance>($t69, $t68)
+                    $t70 := A2_Table_borrow$address_A2_Tables_Balance$($t69, $t68)
+                    // $t71 := borrow_field<Tables::Balance>.value($t70)
+                    $t71 := $t70
+                    // $t72 := read_ref($t71)
+                    $t72 := $LoadU256($t71)
+                    // $t73 := ==($t72, $t31)
+                    $t73 := $Eq($t72, $t31)
+                    // if ($t73) goto L10 else goto L9
+                    switch $t73
                     case 0  { $block := 13 }
-                    default { $block := 14 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
                 }
                 case 13 {
-                    // label L11
-                    // destroy($t60)
-                    // $t102 := 106
-                    $t102 := 106
-                    // abort($t102)
-                    $Abort($t102)
+                    // label L9
+                    // destroy($t55)
+                    // $t74 := 104
+                    $t74 := 104
+                    // abort($t74)
+                    $Abort($t74)
                 }
                 case 14 {
-                    // label L10
-                    // $t103 := 0xab
-                    $t103 := 0xab
-                    // $t18 := $t103
-                    mstore(add($locals, 352), $t103)
-                    // $t104 := borrow_local($t18)
-                    $t104 := $MakePtr(false, add($locals, 352))
-                    // $t105 := freeze_ref($t60)
-                    $t105 := $t60
-                    // $t106 := Table::contains<address, Tables::Balance>($t105, $t104)
-                    $t106 := A2_Table_contains$address_A2_Tables_Balance$($t105, $t104)
-                    // $t107 := !($t106)
-                    $t107 := $LogicalNot($t106)
-                    // if ($t107) goto L12 else goto L13
-                    switch $t107
-                    case 0  { $block := 15 }
-                    default { $block := 16 }
+                    // label L11
+                    // $t75 := 0xcd
+                    $t75 := 0xcd
+                    // $t7 := $t75
+                    mstore(add($locals, 256), $t75)
+                    // $t76 := borrow_local($t7)
+                    $t76 := $MakePtr(false, add($locals, 256))
+                    // $t77 := Table::borrow_mut<address, Tables::Balance>($t55, $t76)
+                    $t77 := A2_Table_borrow_mut$address_A2_Tables_Balance$($t55, $t76)
+                    // $t78 := borrow_field<Tables::Balance>.value($t77)
+                    $t78 := $t77
+                    // $t79 := read_ref($t78)
+                    $t79 := $LoadU256($t78)
+                    // $t80 := U256::one()
+                    $t80 := A2_U256_one()
+                    // $t81 := -($t79, $t80)
+                    $t81 := $Sub($t79, $t80)
+                    // $t82 := borrow_field<Tables::Balance>.value($t77)
+                    $t82 := $t77
+                    // write_ref($t82, $t81)
+                    $StoreU256($t82, $t81)
+                    // $t83 := 0xcd
+                    $t83 := 0xcd
+                    // $t10 := $t83
+                    mstore(add($locals, 288), $t83)
+                    // $t84 := borrow_local($t10)
+                    $t84 := $MakePtr(false, add($locals, 288))
+                    // $t85 := freeze_ref($t55)
+                    $t85 := $t55
+                    // $t86 := Table::borrow<address, Tables::Balance>($t85, $t84)
+                    $t86 := A2_Table_borrow$address_A2_Tables_Balance$($t85, $t84)
+                    // $t87 := borrow_field<Tables::Balance>.value($t86)
+                    $t87 := $t86
+                    // $t88 := read_ref($t87)
+                    $t88 := $LoadU256($t87)
+                    // $t89 := 15312706511442230855851857334429569515565
+                    $t89 := 15312706511442230855851857334429569515565
+                    // $t90 := ==($t88, $t89)
+                    $t90 := $Eq($t88, $t89)
+                    // if ($t90) goto L13 else goto L12
+                    switch $t90
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
                 }
                 case 15 {
                     // label L13
-                    // $t108 := 107
-                    $t108 := 107
-                    // abort($t108)
-                    $Abort($t108)
+                    // goto L14
+                    $block := 17
                 }
                 case 16 {
                     // label L12
+                    // destroy($t55)
+                    // $t91 := 105
+                    $t91 := 105
+                    // abort($t91)
+                    $Abort($t91)
+                }
+                case 17 {
+                    // label L14
+                    // $t92 := 0xab
+                    $t92 := 0xab
+                    // $t13 := $t92
+                    mstore(add($locals, 320), $t92)
+                    // $t93 := borrow_local($t13)
+                    $t93 := $MakePtr(false, add($locals, 320))
+                    // $t94 := Table::remove<address, Tables::Balance>($t55, $t93)
+                    $t94 := A2_Table_remove$address_A2_Tables_Balance$($t55, $t93)
+                    // $t95 := unpack Tables::Balance($t94)
+                    $t95 := $MemoryLoadU256(add($t94, 0))
+                    $Free($t94, 32)
+                    // $t96 := ==($t95, $t30)
+                    $t96 := $Eq($t95, $t30)
+                    // if ($t96) goto L16 else goto L15
+                    switch $t96
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // destroy($t55)
+                    // $t97 := 106
+                    $t97 := 106
+                    // abort($t97)
+                    $Abort($t97)
+                }
+                case 20 {
+                    // label L17
+                    // $t98 := 0xab
+                    $t98 := 0xab
+                    // $t15 := $t98
+                    mstore(add($locals, 352), $t98)
+                    // $t99 := borrow_local($t15)
+                    $t99 := $MakePtr(false, add($locals, 352))
+                    // $t100 := freeze_ref($t55)
+                    $t100 := $t55
+                    // $t101 := Table::contains<address, Tables::Balance>($t100, $t99)
+                    $t101 := A2_Table_contains$address_A2_Tables_Balance$($t100, $t99)
+                    // $t102 := !($t101)
+                    $t102 := $LogicalNot($t101)
+                    // if ($t102) goto L19 else goto L18
+                    switch $t102
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t103 := 107
+                    $t103 := 107
+                    // abort($t103)
+                    $Abort($t103)
+                }
+                case 23 {
+                    // label L20
                     // return ()
                     $Free($locals, 384)
                     leave
@@ -2209,7 +2324,7 @@ object "test_A2_Tables_test_struct" {
         }
     }
 }
-===> Test result of Tables::test_struct: Succeed(Stopped) (used_gas=151439): []
+===> Test result of Tables::test_struct: Succeed(Stopped) (used_gas=153416): []
 
 // test of Tables::test_table_of_tables
 /* =======================================
@@ -2223,386 +2338,426 @@ object "test_A2_Tables_test_table_of_tables" {
         A2_Tables_test_table_of_tables()
         return (0, 0)
         function A2_Tables_test_table_of_tables() {
-            let tmp_$2, tmp_$3, tmp_$6, tmp_$7, tmp_$10, tmp_$11, tmp_$12, tmp_$15, tmp_$16, tmp_$19, tmp_$20, tmp_$24, tmp_$25, tmp_$28, tmp_$29, tmp_$32, tmp_$33, tmp_$34, tmp_$37, tmp_$38, tmp_$41, tmp_$43, val, val_1, val_2, val_3, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96, $t97, $t98, $t99, $t100, $t101, $t102, $t103, $t104, $t105, $t106, $t107, $t108, $t109, $t110, $t111, $t112, $t113, $t114, $t115, $t116, $t117, $t118, $t119, $t120, $t121, $t122, $t123, $t124, $t125, $t126, $t127, $t128, $t129, $t130, $t131, $t132, $t133, $t134, $t135, $t136, $t137, $t138, $t139, $t140, $t141, $t142, $t143, $t144, $t145, $t146, $t147, $t148, $t149, $t150, $t151, $t152
+            let tmp_$2, tmp_$3, tmp_$6, tmp_$7, tmp_$10, tmp_$11, tmp_$12, tmp_$15, tmp_$16, tmp_$19, tmp_$20, tmp_$24, tmp_$25, tmp_$28, tmp_$29, tmp_$32, tmp_$33, tmp_$34, tmp_$37, tmp_$38, tmp_$41, tmp_$43, val_1, val_2, val_3, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96, $t97, $t98, $t99, $t100, $t101, $t102, $t103, $t104, $t105, $t106, $t107, $t108, $t109, $t110, $t111, $t112, $t113, $t114, $t115, $t116, $t117, $t118, $t119, $t120, $t121, $t122, $t123, $t124, $t125, $t126, $t127, $t128, $t129, $t130, $t131, $t132, $t133, $t134, $t135, $t136, $t137, $t138, $t139, $t140, $t141, $t142, $t143, $t144, $t145, $t146, $t147, $t148, $t149, $t150, $t151
             let $locals := $Malloc(832)
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t76 := 101
-                    $t76 := 101
-                    // abort($t76)
-                    $Abort($t76)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t77 := borrow_local($t45)
-                    $t77 := $MakePtr(false, add($locals, 128))
-                    // $t78 := 0x34
-                    $t78 := 0x34
-                    // $t5 := $t78
-                    mstore(add($locals, 288), $t78)
-                    // $t79 := borrow_local($t5)
-                    $t79 := $MakePtr(false, add($locals, 288))
-                    // $t80 := Table::borrow<address, Table::Table<address, U256::U256>>($t77, $t79)
-                    $t80 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t77, $t79)
-                    // $t81 := 0xcd
-                    $t81 := 0xcd
-                    // $t4 := $t81
-                    mstore(add($locals, 320), $t81)
-                    // $t82 := borrow_local($t4)
-                    $t82 := $MakePtr(false, add($locals, 320))
-                    // $t83 := Table::contains<address, U256::U256>($t80, $t82)
-                    $t83 := A2_Table_contains$address_A2_U256_U256$($t80, $t82)
-                    // if ($t83) goto L2 else goto L3
-                    switch $t83
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
+                    // $t75 := 101
+                    $t75 := 101
+                    // abort($t75)
+                    $Abort($t75)
                 }
                 case 4 {
                     // $t45 := Table::empty<address, Table::Table<address, U256::U256>>()
                     mstore(add($locals, 128), A2_Table_empty$address_A2_Table_Table$address_A2_U256_U256$$())
-                    // $t52 := 3743106036130323098097120681749450326028
-                    $t52 := 3743106036130323098097120681749450326028
-                    // $t53 := 15312706511442230855851857334429569515566
-                    $t53 := 15312706511442230855851857334429569515566
-                    // $t54 := 26542024619833200150143219379677920493647
-                    $t54 := 26542024619833200150143219379677920493647
+                    // $t51 := 3743106036130323098097120681749450326028
+                    $t51 := 3743106036130323098097120681749450326028
+                    // $t52 := 15312706511442230855851857334429569515566
+                    $t52 := 15312706511442230855851857334429569515566
+                    // $t53 := 26542024619833200150143219379677920493647
+                    $t53 := 26542024619833200150143219379677920493647
                     // $t46 := Table::empty<address, U256::U256>()
                     mstore($locals, A2_Table_empty$address_A2_U256_U256$())
-                    // $t55 := borrow_local($t46)
-                    $t55 := $MakePtr(false, $locals)
-                    // $t56 := 0xab
-                    $t56 := 0xab
-                    // $t0 := $t56
-                    mstore(add($locals, 32), $t56)
-                    // $t57 := borrow_local($t0)
-                    $t57 := $MakePtr(false, add($locals, 32))
-                    // Table::insert<address, U256::U256>($t55, $t57, $t52)
-                    A2_Table_insert$address_A2_U256_U256$($t55, $t57, $t52)
+                    // $t54 := borrow_local($t46)
+                    $t54 := $MakePtr(false, $locals)
+                    // $t55 := 0xab
+                    $t55 := 0xab
+                    // $t0 := $t55
+                    mstore(add($locals, 32), $t55)
+                    // $t56 := borrow_local($t0)
+                    $t56 := $MakePtr(false, add($locals, 32))
+                    // Table::insert<address, U256::U256>($t54, $t56, $t51)
+                    A2_Table_insert$address_A2_U256_U256$($t54, $t56, $t51)
                     // $t47 := Table::empty<address, U256::U256>()
                     mstore(add($locals, 64), A2_Table_empty$address_A2_U256_U256$())
-                    // $t58 := borrow_local($t47)
-                    $t58 := $MakePtr(false, add($locals, 64))
-                    // $t59 := 0xcd
-                    $t59 := 0xcd
-                    // $t22 := $t59
-                    mstore(add($locals, 96), $t59)
-                    // $t60 := borrow_local($t22)
-                    $t60 := $MakePtr(false, add($locals, 96))
-                    // Table::insert<address, U256::U256>($t58, $t60, $t53)
-                    A2_Table_insert$address_A2_U256_U256$($t58, $t60, $t53)
-                    // $t61 := borrow_local($t45)
-                    $t61 := $MakePtr(false, add($locals, 128))
-                    // $t62 := 0x12
-                    $t62 := 0x12
-                    // $t40 := $t62
-                    mstore(add($locals, 160), $t62)
-                    // $t63 := borrow_local($t40)
-                    $t63 := $MakePtr(false, add($locals, 160))
-                    // $t64 := move($t46)
-                    $t64 := mload($locals)
-                    // Table::insert<address, Table::Table<address, U256::U256>>($t61, $t63, $t64)
-                    A2_Table_insert$address_A2_Table_Table$address_A2_U256_U256$$($t61, $t63, $t64)
-                    // $t65 := borrow_local($t45)
-                    $t65 := $MakePtr(false, add($locals, 128))
-                    // $t66 := 0x34
-                    $t66 := 0x34
-                    // $t42 := $t66
-                    mstore(add($locals, 192), $t66)
-                    // $t67 := borrow_local($t42)
-                    $t67 := $MakePtr(false, add($locals, 192))
-                    // $t68 := move($t47)
-                    $t68 := mload(add($locals, 64))
-                    // Table::insert<address, Table::Table<address, U256::U256>>($t65, $t67, $t68)
-                    A2_Table_insert$address_A2_Table_Table$address_A2_U256_U256$$($t65, $t67, $t68)
-                    // $t69 := borrow_local($t45)
-                    $t69 := $MakePtr(false, add($locals, 128))
-                    // $t70 := 0x12
-                    $t70 := 0x12
-                    // $t1 := $t70
-                    mstore(add($locals, 224), $t70)
-                    // $t71 := borrow_local($t1)
-                    $t71 := $MakePtr(false, add($locals, 224))
-                    // $t72 := Table::borrow<address, Table::Table<address, U256::U256>>($t69, $t71)
-                    $t72 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t69, $t71)
-                    // $t73 := 0xab
-                    $t73 := 0xab
-                    // $t44 := $t73
-                    mstore(add($locals, 256), $t73)
-                    // $t74 := borrow_local($t44)
-                    $t74 := $MakePtr(false, add($locals, 256))
-                    // $t75 := Table::contains<address, U256::U256>($t72, $t74)
-                    $t75 := A2_Table_contains$address_A2_U256_U256$($t72, $t74)
-                    // if ($t75) goto L0 else goto L1
-                    switch $t75
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t57 := borrow_local($t47)
+                    $t57 := $MakePtr(false, add($locals, 64))
+                    // $t58 := 0xcd
+                    $t58 := 0xcd
+                    // $t22 := $t58
+                    mstore(add($locals, 96), $t58)
+                    // $t59 := borrow_local($t22)
+                    $t59 := $MakePtr(false, add($locals, 96))
+                    // Table::insert<address, U256::U256>($t57, $t59, $t52)
+                    A2_Table_insert$address_A2_U256_U256$($t57, $t59, $t52)
+                    // $t60 := borrow_local($t45)
+                    $t60 := $MakePtr(false, add($locals, 128))
+                    // $t61 := 0x12
+                    $t61 := 0x12
+                    // $t40 := $t61
+                    mstore(add($locals, 160), $t61)
+                    // $t62 := borrow_local($t40)
+                    $t62 := $MakePtr(false, add($locals, 160))
+                    // $t63 := move($t46)
+                    $t63 := mload($locals)
+                    // Table::insert<address, Table::Table<address, U256::U256>>($t60, $t62, $t63)
+                    A2_Table_insert$address_A2_Table_Table$address_A2_U256_U256$$($t60, $t62, $t63)
+                    // $t64 := borrow_local($t45)
+                    $t64 := $MakePtr(false, add($locals, 128))
+                    // $t65 := 0x34
+                    $t65 := 0x34
+                    // $t42 := $t65
+                    mstore(add($locals, 192), $t65)
+                    // $t66 := borrow_local($t42)
+                    $t66 := $MakePtr(false, add($locals, 192))
+                    // $t67 := move($t47)
+                    $t67 := mload(add($locals, 64))
+                    // Table::insert<address, Table::Table<address, U256::U256>>($t64, $t66, $t67)
+                    A2_Table_insert$address_A2_Table_Table$address_A2_U256_U256$$($t64, $t66, $t67)
+                    // $t68 := borrow_local($t45)
+                    $t68 := $MakePtr(false, add($locals, 128))
+                    // $t69 := 0x12
+                    $t69 := 0x12
+                    // $t1 := $t69
+                    mstore(add($locals, 224), $t69)
+                    // $t70 := borrow_local($t1)
+                    $t70 := $MakePtr(false, add($locals, 224))
+                    // $t71 := Table::borrow<address, Table::Table<address, U256::U256>>($t68, $t70)
+                    $t71 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t68, $t70)
+                    // $t72 := 0xab
+                    $t72 := 0xab
+                    // $t44 := $t72
+                    mstore(add($locals, 256), $t72)
+                    // $t73 := borrow_local($t44)
+                    $t73 := $MakePtr(false, add($locals, 256))
+                    // $t74 := Table::contains<address, U256::U256>($t71, $t73)
+                    $t74 := A2_Table_contains$address_A2_U256_U256$($t71, $t73)
+                    // if ($t74) goto L1 else goto L0
+                    switch $t74
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
-                    // $t84 := 102
-                    $t84 := 102
-                    // abort($t84)
-                    $Abort($t84)
-                }
-                case 6 {
                     // label L2
-                    // $t85 := borrow_local($t45)
-                    $t85 := $MakePtr(false, add($locals, 128))
-                    // $t86 := 0x12
-                    $t86 := 0x12
-                    // $t9 := $t86
-                    mstore(add($locals, 352), $t86)
-                    // $t87 := borrow_local($t9)
-                    $t87 := $MakePtr(false, add($locals, 352))
-                    // $t88 := Table::borrow<address, Table::Table<address, U256::U256>>($t85, $t87)
-                    $t88 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t85, $t87)
-                    // $t89 := 0xab
-                    $t89 := 0xab
-                    // $t8 := $t89
-                    mstore(add($locals, 384), $t89)
-                    // $t90 := borrow_local($t8)
-                    $t90 := $MakePtr(false, add($locals, 384))
-                    // $t91 := Table::borrow<address, U256::U256>($t88, $t90)
-                    $t91 := A2_Table_borrow$address_A2_U256_U256$($t88, $t90)
-                    // $t92 := read_ref($t91)
-                    $t92 := $LoadU256($t91)
-                    // $t93 := ==($t92, $t52)
-                    $t93 := $Eq($t92, $t52)
-                    // if ($t93) goto L4 else goto L5
-                    switch $t93
+                    // $t76 := borrow_local($t45)
+                    $t76 := $MakePtr(false, add($locals, 128))
+                    // $t77 := 0x34
+                    $t77 := 0x34
+                    // $t5 := $t77
+                    mstore(add($locals, 288), $t77)
+                    // $t78 := borrow_local($t5)
+                    $t78 := $MakePtr(false, add($locals, 288))
+                    // $t79 := Table::borrow<address, Table::Table<address, U256::U256>>($t76, $t78)
+                    $t79 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t76, $t78)
+                    // $t80 := 0xcd
+                    $t80 := 0xcd
+                    // $t4 := $t80
+                    mstore(add($locals, 320), $t80)
+                    // $t81 := borrow_local($t4)
+                    $t81 := $MakePtr(false, add($locals, 320))
+                    // $t82 := Table::contains<address, U256::U256>($t79, $t81)
+                    $t82 := A2_Table_contains$address_A2_U256_U256$($t79, $t81)
+                    // if ($t82) goto L4 else goto L3
+                    switch $t82
                     case 0  { $block := 7 }
-                    default { $block := 8 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
                 }
                 case 7 {
-                    // label L5
-                    // $t94 := 103
-                    $t94 := 103
-                    // abort($t94)
-                    $Abort($t94)
+                    // label L3
+                    // $t83 := 102
+                    $t83 := 102
+                    // abort($t83)
+                    $Abort($t83)
                 }
                 case 8 {
-                    // label L4
-                    // $t95 := borrow_local($t45)
-                    $t95 := $MakePtr(false, add($locals, 128))
-                    // $t96 := 0x34
-                    $t96 := 0x34
-                    // $t14 := $t96
-                    mstore(add($locals, 416), $t96)
-                    // $t97 := borrow_local($t14)
-                    $t97 := $MakePtr(false, add($locals, 416))
-                    // $t98 := Table::borrow<address, Table::Table<address, U256::U256>>($t95, $t97)
-                    $t98 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t95, $t97)
-                    // $t99 := 0xcd
-                    $t99 := 0xcd
-                    // $t13 := $t99
-                    mstore(add($locals, 448), $t99)
-                    // $t100 := borrow_local($t13)
-                    $t100 := $MakePtr(false, add($locals, 448))
-                    // $t101 := Table::borrow<address, U256::U256>($t98, $t100)
-                    $t101 := A2_Table_borrow$address_A2_U256_U256$($t98, $t100)
-                    // $t102 := read_ref($t101)
-                    $t102 := $LoadU256($t101)
-                    // $t103 := ==($t102, $t53)
-                    $t103 := $Eq($t102, $t53)
-                    // if ($t103) goto L6 else goto L7
-                    switch $t103
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    // label L5
+                    // $t84 := borrow_local($t45)
+                    $t84 := $MakePtr(false, add($locals, 128))
+                    // $t85 := 0x12
+                    $t85 := 0x12
+                    // $t9 := $t85
+                    mstore(add($locals, 352), $t85)
+                    // $t86 := borrow_local($t9)
+                    $t86 := $MakePtr(false, add($locals, 352))
+                    // $t87 := Table::borrow<address, Table::Table<address, U256::U256>>($t84, $t86)
+                    $t87 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t84, $t86)
+                    // $t88 := 0xab
+                    $t88 := 0xab
+                    // $t8 := $t88
+                    mstore(add($locals, 384), $t88)
+                    // $t89 := borrow_local($t8)
+                    $t89 := $MakePtr(false, add($locals, 384))
+                    // $t90 := Table::borrow<address, U256::U256>($t87, $t89)
+                    $t90 := A2_Table_borrow$address_A2_U256_U256$($t87, $t89)
+                    // $t91 := read_ref($t90)
+                    $t91 := $LoadU256($t90)
+                    // $t92 := ==($t91, $t51)
+                    $t92 := $Eq($t91, $t51)
+                    // if ($t92) goto L7 else goto L6
+                    switch $t92
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
                 case 9 {
                     // label L7
-                    // $t104 := 104
-                    $t104 := 104
-                    // abort($t104)
-                    $Abort($t104)
+                    // goto L8
+                    $block := 11
                 }
                 case 10 {
                     // label L6
-                    // $t105 := borrow_local($t45)
-                    $t105 := $MakePtr(false, add($locals, 128))
-                    // $t106 := 0x12
-                    $t106 := 0x12
-                    // $t18 := $t106
-                    mstore(add($locals, 480), $t106)
-                    // $t107 := borrow_local($t18)
-                    $t107 := $MakePtr(false, add($locals, 480))
-                    // $t108 := Table::borrow_mut<address, Table::Table<address, U256::U256>>($t105, $t107)
-                    $t108 := A2_Table_borrow_mut$address_A2_Table_Table$address_A2_U256_U256$$($t105, $t107)
-                    // $t109 := 0xef
-                    $t109 := 0xef
-                    // $t17 := $t109
-                    mstore(add($locals, 512), $t109)
-                    // $t110 := borrow_local($t17)
-                    $t110 := $MakePtr(false, add($locals, 512))
-                    // Table::insert<address, U256::U256>($t108, $t110, $t54)
-                    A2_Table_insert$address_A2_U256_U256$($t108, $t110, $t54)
-                    // $t111 := borrow_local($t45)
-                    $t111 := $MakePtr(false, add($locals, 128))
-                    // $t112 := 0x12
-                    $t112 := 0x12
-                    // $t23 := $t112
-                    mstore(add($locals, 544), $t112)
-                    // $t113 := borrow_local($t23)
-                    $t113 := $MakePtr(false, add($locals, 544))
-                    // $t114 := Table::borrow<address, Table::Table<address, U256::U256>>($t111, $t113)
-                    $t114 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t111, $t113)
-                    // $t115 := 0xef
-                    $t115 := 0xef
-                    // $t21 := $t115
-                    mstore(add($locals, 576), $t115)
-                    // $t116 := borrow_local($t21)
-                    $t116 := $MakePtr(false, add($locals, 576))
-                    // $t117 := Table::borrow<address, U256::U256>($t114, $t116)
-                    $t117 := A2_Table_borrow$address_A2_U256_U256$($t114, $t116)
-                    // $t118 := read_ref($t117)
-                    $t118 := $LoadU256($t117)
-                    // $t119 := ==($t118, $t54)
-                    $t119 := $Eq($t118, $t54)
-                    // if ($t119) goto L8 else goto L9
-                    switch $t119
-                    case 0  { $block := 11 }
-                    default { $block := 12 }
+                    // $t93 := 103
+                    $t93 := 103
+                    // abort($t93)
+                    $Abort($t93)
                 }
                 case 11 {
-                    // label L9
-                    // $t120 := 105
-                    $t120 := 105
-                    // abort($t120)
-                    $Abort($t120)
-                }
-                case 12 {
                     // label L8
-                    // $t121 := borrow_local($t45)
-                    $t121 := $MakePtr(false, add($locals, 128))
-                    // $t122 := 0x12
-                    $t122 := 0x12
-                    // $t27 := $t122
-                    mstore(add($locals, 608), $t122)
-                    // $t123 := borrow_local($t27)
-                    $t123 := $MakePtr(false, add($locals, 608))
-                    // $t124 := Table::borrow<address, Table::Table<address, U256::U256>>($t121, $t123)
-                    $t124 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t121, $t123)
-                    // $t125 := 0xab
-                    $t125 := 0xab
-                    // $t26 := $t125
-                    mstore(add($locals, 640), $t125)
-                    // $t126 := borrow_local($t26)
-                    $t126 := $MakePtr(false, add($locals, 640))
-                    // $t127 := Table::borrow<address, U256::U256>($t124, $t126)
-                    $t127 := A2_Table_borrow$address_A2_U256_U256$($t124, $t126)
-                    // $t128 := read_ref($t127)
-                    $t128 := $LoadU256($t127)
-                    // $t129 := ==($t128, $t52)
-                    $t129 := $Eq($t128, $t52)
-                    // if ($t129) goto L10 else goto L11
-                    switch $t129
+                    // $t94 := borrow_local($t45)
+                    $t94 := $MakePtr(false, add($locals, 128))
+                    // $t95 := 0x34
+                    $t95 := 0x34
+                    // $t14 := $t95
+                    mstore(add($locals, 416), $t95)
+                    // $t96 := borrow_local($t14)
+                    $t96 := $MakePtr(false, add($locals, 416))
+                    // $t97 := Table::borrow<address, Table::Table<address, U256::U256>>($t94, $t96)
+                    $t97 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t94, $t96)
+                    // $t98 := 0xcd
+                    $t98 := 0xcd
+                    // $t13 := $t98
+                    mstore(add($locals, 448), $t98)
+                    // $t99 := borrow_local($t13)
+                    $t99 := $MakePtr(false, add($locals, 448))
+                    // $t100 := Table::borrow<address, U256::U256>($t97, $t99)
+                    $t100 := A2_Table_borrow$address_A2_U256_U256$($t97, $t99)
+                    // $t101 := read_ref($t100)
+                    $t101 := $LoadU256($t100)
+                    // $t102 := ==($t101, $t52)
+                    $t102 := $Eq($t101, $t52)
+                    // if ($t102) goto L10 else goto L9
+                    switch $t102
                     case 0  { $block := 13 }
-                    default { $block := 14 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
                 }
                 case 13 {
-                    // label L11
-                    // $t130 := 106
-                    $t130 := 106
-                    // abort($t130)
-                    $Abort($t130)
+                    // label L9
+                    // $t103 := 104
+                    $t103 := 104
+                    // abort($t103)
+                    $Abort($t103)
                 }
                 case 14 {
-                    // label L10
-                    // $t131 := borrow_local($t45)
-                    $t131 := $MakePtr(false, add($locals, 128))
-                    // $t132 := 0x34
-                    $t132 := 0x34
-                    // $t31 := $t132
-                    mstore(add($locals, 672), $t132)
-                    // $t133 := borrow_local($t31)
-                    $t133 := $MakePtr(false, add($locals, 672))
-                    // $t134 := Table::borrow_mut<address, Table::Table<address, U256::U256>>($t131, $t133)
-                    $t134 := A2_Table_borrow_mut$address_A2_Table_Table$address_A2_U256_U256$$($t131, $t133)
-                    // $t135 := 0xcd
-                    $t135 := 0xcd
-                    // $t30 := $t135
-                    mstore(add($locals, 704), $t135)
-                    // $t136 := borrow_local($t30)
-                    $t136 := $MakePtr(false, add($locals, 704))
-                    // $t137 := Table::remove<address, U256::U256>($t134, $t136)
-                    $t137 := A2_Table_remove$address_A2_U256_U256$($t134, $t136)
-                    // $t138 := ==($t137, $t53)
-                    $t138 := $Eq($t137, $t53)
-                    // if ($t138) goto L12 else goto L13
-                    switch $t138
-                    case 0  { $block := 15 }
-                    default { $block := 16 }
+                    // label L11
+                    // $t104 := borrow_local($t45)
+                    $t104 := $MakePtr(false, add($locals, 128))
+                    // $t105 := 0x12
+                    $t105 := 0x12
+                    // $t18 := $t105
+                    mstore(add($locals, 480), $t105)
+                    // $t106 := borrow_local($t18)
+                    $t106 := $MakePtr(false, add($locals, 480))
+                    // $t107 := Table::borrow_mut<address, Table::Table<address, U256::U256>>($t104, $t106)
+                    $t107 := A2_Table_borrow_mut$address_A2_Table_Table$address_A2_U256_U256$$($t104, $t106)
+                    // $t108 := 0xef
+                    $t108 := 0xef
+                    // $t17 := $t108
+                    mstore(add($locals, 512), $t108)
+                    // $t109 := borrow_local($t17)
+                    $t109 := $MakePtr(false, add($locals, 512))
+                    // Table::insert<address, U256::U256>($t107, $t109, $t53)
+                    A2_Table_insert$address_A2_U256_U256$($t107, $t109, $t53)
+                    // $t110 := borrow_local($t45)
+                    $t110 := $MakePtr(false, add($locals, 128))
+                    // $t111 := 0x12
+                    $t111 := 0x12
+                    // $t23 := $t111
+                    mstore(add($locals, 544), $t111)
+                    // $t112 := borrow_local($t23)
+                    $t112 := $MakePtr(false, add($locals, 544))
+                    // $t113 := Table::borrow<address, Table::Table<address, U256::U256>>($t110, $t112)
+                    $t113 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t110, $t112)
+                    // $t114 := 0xef
+                    $t114 := 0xef
+                    // $t21 := $t114
+                    mstore(add($locals, 576), $t114)
+                    // $t115 := borrow_local($t21)
+                    $t115 := $MakePtr(false, add($locals, 576))
+                    // $t116 := Table::borrow<address, U256::U256>($t113, $t115)
+                    $t116 := A2_Table_borrow$address_A2_U256_U256$($t113, $t115)
+                    // $t117 := read_ref($t116)
+                    $t117 := $LoadU256($t116)
+                    // $t118 := ==($t117, $t53)
+                    $t118 := $Eq($t117, $t53)
+                    // if ($t118) goto L13 else goto L12
+                    switch $t118
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
                 }
                 case 15 {
                     // label L13
-                    // $t139 := 107
-                    $t139 := 107
-                    // abort($t139)
-                    $Abort($t139)
+                    // goto L14
+                    $block := 17
                 }
                 case 16 {
                     // label L12
-                    // $t140 := borrow_local($t45)
-                    $t140 := $MakePtr(false, add($locals, 128))
-                    // $t141 := 0x34
-                    $t141 := 0x34
-                    // $t36 := $t141
-                    mstore(add($locals, 736), $t141)
-                    // $t142 := borrow_local($t36)
-                    $t142 := $MakePtr(false, add($locals, 736))
-                    // $t143 := Table::borrow<address, Table::Table<address, U256::U256>>($t140, $t142)
-                    $t143 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t140, $t142)
-                    // $t144 := 0xcd
-                    $t144 := 0xcd
-                    // $t35 := $t144
-                    mstore(add($locals, 768), $t144)
-                    // $t145 := borrow_local($t35)
-                    $t145 := $MakePtr(false, add($locals, 768))
-                    // $t146 := Table::contains<address, U256::U256>($t143, $t145)
-                    $t146 := A2_Table_contains$address_A2_U256_U256$($t143, $t145)
-                    // $t147 := !($t146)
-                    $t147 := $LogicalNot($t146)
-                    // if ($t147) goto L14 else goto L15
-                    switch $t147
-                    case 0  { $block := 17 }
-                    default { $block := 18 }
+                    // $t119 := 105
+                    $t119 := 105
+                    // abort($t119)
+                    $Abort($t119)
                 }
                 case 17 {
-                    // label L15
-                    // $t148 := 108
-                    $t148 := 108
-                    // abort($t148)
-                    $Abort($t148)
+                    // label L14
+                    // $t120 := borrow_local($t45)
+                    $t120 := $MakePtr(false, add($locals, 128))
+                    // $t121 := 0x12
+                    $t121 := 0x12
+                    // $t27 := $t121
+                    mstore(add($locals, 608), $t121)
+                    // $t122 := borrow_local($t27)
+                    $t122 := $MakePtr(false, add($locals, 608))
+                    // $t123 := Table::borrow<address, Table::Table<address, U256::U256>>($t120, $t122)
+                    $t123 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t120, $t122)
+                    // $t124 := 0xab
+                    $t124 := 0xab
+                    // $t26 := $t124
+                    mstore(add($locals, 640), $t124)
+                    // $t125 := borrow_local($t26)
+                    $t125 := $MakePtr(false, add($locals, 640))
+                    // $t126 := Table::borrow<address, U256::U256>($t123, $t125)
+                    $t126 := A2_Table_borrow$address_A2_U256_U256$($t123, $t125)
+                    // $t127 := read_ref($t126)
+                    $t127 := $LoadU256($t126)
+                    // $t128 := ==($t127, $t51)
+                    $t128 := $Eq($t127, $t51)
+                    // if ($t128) goto L16 else goto L15
+                    switch $t128
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
                 }
                 case 18 {
-                    // label L14
-                    // $t149 := 0x42
-                    $t149 := 0x42
-                    // $t39 := Evm::sign($t149)
-                    mstore(add($locals, 800), A2_Evm_sign($t149))
-                    // $t150 := borrow_local($t39)
-                    $t150 := $MakePtr(false, add($locals, 800))
-                    // $t151 := move($t45)
-                    $t151 := mload(add($locals, 128))
-                    // $t152 := pack Tables::S<address, Table::Table<address, U256::U256>>($t151)
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t129 := 106
+                    $t129 := 106
+                    // abort($t129)
+                    $Abort($t129)
+                }
+                case 20 {
+                    // label L17
+                    // $t130 := borrow_local($t45)
+                    $t130 := $MakePtr(false, add($locals, 128))
+                    // $t131 := 0x34
+                    $t131 := 0x34
+                    // $t31 := $t131
+                    mstore(add($locals, 672), $t131)
+                    // $t132 := borrow_local($t31)
+                    $t132 := $MakePtr(false, add($locals, 672))
+                    // $t133 := Table::borrow_mut<address, Table::Table<address, U256::U256>>($t130, $t132)
+                    $t133 := A2_Table_borrow_mut$address_A2_Table_Table$address_A2_U256_U256$$($t130, $t132)
+                    // $t134 := 0xcd
+                    $t134 := 0xcd
+                    // $t30 := $t134
+                    mstore(add($locals, 704), $t134)
+                    // $t135 := borrow_local($t30)
+                    $t135 := $MakePtr(false, add($locals, 704))
+                    // $t136 := Table::remove<address, U256::U256>($t133, $t135)
+                    $t136 := A2_Table_remove$address_A2_U256_U256$($t133, $t135)
+                    // $t137 := ==($t136, $t52)
+                    $t137 := $Eq($t136, $t52)
+                    // if ($t137) goto L19 else goto L18
+                    switch $t137
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t138 := 107
+                    $t138 := 107
+                    // abort($t138)
+                    $Abort($t138)
+                }
+                case 23 {
+                    // label L20
+                    // $t139 := borrow_local($t45)
+                    $t139 := $MakePtr(false, add($locals, 128))
+                    // $t140 := 0x34
+                    $t140 := 0x34
+                    // $t36 := $t140
+                    mstore(add($locals, 736), $t140)
+                    // $t141 := borrow_local($t36)
+                    $t141 := $MakePtr(false, add($locals, 736))
+                    // $t142 := Table::borrow<address, Table::Table<address, U256::U256>>($t139, $t141)
+                    $t142 := A2_Table_borrow$address_A2_Table_Table$address_A2_U256_U256$$($t139, $t141)
+                    // $t143 := 0xcd
+                    $t143 := 0xcd
+                    // $t35 := $t143
+                    mstore(add($locals, 768), $t143)
+                    // $t144 := borrow_local($t35)
+                    $t144 := $MakePtr(false, add($locals, 768))
+                    // $t145 := Table::contains<address, U256::U256>($t142, $t144)
+                    $t145 := A2_Table_contains$address_A2_U256_U256$($t142, $t144)
+                    // $t146 := !($t145)
+                    $t146 := $LogicalNot($t145)
+                    // if ($t146) goto L22 else goto L21
+                    switch $t146
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
+                }
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
+                    // $t147 := 108
+                    $t147 := 108
+                    // abort($t147)
+                    $Abort($t147)
+                }
+                case 26 {
+                    // label L23
+                    // $t148 := 0x42
+                    $t148 := 0x42
+                    // $t39 := Evm::sign($t148)
+                    mstore(add($locals, 800), A2_Evm_sign($t148))
+                    // $t149 := borrow_local($t39)
+                    $t149 := $MakePtr(false, add($locals, 800))
+                    // $t150 := move($t45)
+                    $t150 := mload(add($locals, 128))
+                    // $t151 := pack Tables::S<address, Table::Table<address, U256::U256>>($t150)
                     {
                         let $mem := $Malloc(32)
-                        $MemoryStoreU256(add($mem, 0), $t151)
-                        $t152 := $mem
+                        $MemoryStoreU256(add($mem, 0), $t150)
+                        $t151 := $mem
                     }
-                    // move_to<Tables::S<address, Table::Table<address, U256::U256>>>($t152, $t150)
+                    // move_to<Tables::S<address, Table::Table<address, U256::U256>>>($t151, $t149)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0xc5110c9a, $LoadU256($t150))
+                        let $base_offset := $MakeTypeStorageBase(0, 0xc5110c9a, $LoadU256($t149))
                         if $AlignedStorageLoad($base_offset) {
                           $AbortBuiltin()
                         }
                         $AlignedStorageStore($base_offset, true)
                         {
                             let $dst := add($base_offset, 32)
-                            let $src := $t152
+                            let $src := $t151
                             $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
                             $Free($src, 32)
                         }
@@ -2860,7 +3015,7 @@ object "test_A2_Tables_test_table_of_tables" {
         }
     }
 }
-===> Test result of Tables::test_table_of_tables: Succeed(Stopped) (used_gas=289488): []
+===> Test result of Tables::test_table_of_tables: Succeed(Stopped) (used_gas=292670): []
 
 // test of Tables::test_u256
 /* =======================================
@@ -2881,30 +3036,16 @@ object "test_A2_Tables_test_u256" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t14 := 101
                     $t14 := 101
                     // abort($t14)
                     $Abort($t14)
                 }
-                case 3 {
-                    // label L0
-                    // $t15 := borrow_local($t3)
-                    $t15 := $MakePtr(false, $locals)
-                    // $t16 := borrow_local($t2)
-                    $t16 := $MakePtr(false, add($locals, 32))
-                    // $t17 := Table::borrow<U256::U256, U256::U256>($t15, $t16)
-                    $t17 := A2_Table_borrow$A2_U256_U256_A2_U256_U256$($t15, $t16)
-                    // $t18 := read_ref($t17)
-                    $t18 := $LoadU256($t17)
-                    // $t19 := 3743106036130323098097120681749450326028
-                    $t19 := 3743106036130323098097120681749450326028
-                    // $t20 := ==($t18, $t19)
-                    $t20 := $Eq($t18, $t19)
-                    // if ($t20) goto L2 else goto L3
-                    switch $t20
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t3 := Table::empty<U256::U256, U256::U256>()
                     mstore($locals, A2_Table_empty$A2_U256_U256_A2_U256_U256$())
@@ -2928,20 +3069,44 @@ object "test_A2_Tables_test_u256" {
                     $t12 := $MakePtr(false, add($locals, 32))
                     // $t13 := Table::contains<U256::U256, U256::U256>($t11, $t12)
                     $t13 := A2_Table_contains$A2_U256_U256_A2_U256_U256$($t11, $t12)
-                    // if ($t13) goto L0 else goto L1
+                    // if ($t13) goto L1 else goto L0
                     switch $t13
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t15 := borrow_local($t3)
+                    $t15 := $MakePtr(false, $locals)
+                    // $t16 := borrow_local($t2)
+                    $t16 := $MakePtr(false, add($locals, 32))
+                    // $t17 := Table::borrow<U256::U256, U256::U256>($t15, $t16)
+                    $t17 := A2_Table_borrow$A2_U256_U256_A2_U256_U256$($t15, $t16)
+                    // $t18 := read_ref($t17)
+                    $t18 := $LoadU256($t17)
+                    // $t19 := 3743106036130323098097120681749450326028
+                    $t19 := 3743106036130323098097120681749450326028
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq($t18, $t19)
+                    // if ($t20) goto L4 else goto L3
+                    switch $t20
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t21 := 102
                     $t21 := 102
                     // abort($t21)
                     $Abort($t21)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t22 := borrow_local($t3)
                     $t22 := $MakePtr(false, $locals)
                     // $t23 := borrow_local($t2)
@@ -2960,20 +3125,25 @@ object "test_A2_Tables_test_u256" {
                     $t28 := $LoadU256($t27)
                     // $t29 := ==($t28, $t8)
                     $t29 := $Eq($t28, $t8)
-                    // if ($t29) goto L4 else goto L5
+                    // if ($t29) goto L7 else goto L6
                     switch $t29
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t30 := 103
                     $t30 := 103
                     // abort($t30)
                     $Abort($t30)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t31 := 0x42
                     $t31 := 0x42
                     // $t0 := Evm::sign($t31)
@@ -3228,7 +3398,7 @@ object "test_A2_Tables_test_u256" {
         }
     }
 }
-===> Test result of Tables::test_u256: Succeed(Stopped) (used_gas=137324): []
+===> Test result of Tables::test_u256: Succeed(Stopped) (used_gas=137855): []
 
 // test of Tables::test_vector
 /* =======================================
@@ -3242,373 +3412,423 @@ object "test_A2_Tables_test_vector" {
         A2_Tables_test_vector()
         return (0, 0)
         function A2_Tables_test_vector() {
-            let tmp_$1, tmp_$4, tmp_$6, tmp_$8, tmp_$10, tmp_$11, tmp_$13, tmp_$15, tmp_$17, tmp_$19, s, v_mut_ref, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96, $t97, $t98, $t99, $t100, $t101, $t102, $t103, $t104, $t105, $t106, $t107, $t108, $t109, $t110, $t111, $t112, $t113, $t114, $t115
+            let tmp_$1, tmp_$4, tmp_$6, tmp_$8, tmp_$10, tmp_$11, tmp_$13, tmp_$15, tmp_$17, tmp_$19, s, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77, $t78, $t79, $t80, $t81, $t82, $t83, $t84, $t85, $t86, $t87, $t88, $t89, $t90, $t91, $t92, $t93, $t94, $t95, $t96, $t97, $t98, $t99, $t100, $t101, $t102, $t103, $t104, $t105, $t106, $t107, $t108, $t109, $t110, $t111, $t112, $t113, $t114
             let $locals := $Malloc(416)
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t34 := 101
-                    $t34 := 101
-                    // abort($t34)
-                    $Abort($t34)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t35 := borrow_local($t22)
-                    $t35 := $MakePtr(false, $locals)
-                    // $t36 := 0
-                    $t36 := 0
-                    // $t16 := $t36
-                    mstore(add($locals, 96), $t36)
-                    // $t37 := borrow_local($t16)
-                    $t37 := $MakePtr(false, add($locals, 127))
-                    // $t38 := Table::contains<u8, vector<address>>($t35, $t37)
-                    $t38 := A2_Table_contains$u8_vec$address$$($t35, $t37)
-                    // $t39 := !($t38)
-                    $t39 := $LogicalNot($t38)
-                    // if ($t39) goto L2 else goto L3
-                    switch $t39
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
+                    // $t33 := 101
+                    $t33 := 101
+                    // abort($t33)
+                    $Abort($t33)
                 }
                 case 4 {
                     // $t22 := Table::empty<u8, vector<address>>()
                     mstore($locals, A2_Table_empty$u8_vec$address$$())
-                    // $t25 := borrow_local($t22)
-                    $t25 := $MakePtr(false, $locals)
-                    // $t26 := 42
-                    $t26 := 42
-                    // $t0 := $t26
-                    mstore(add($locals, 32), $t26)
-                    // $t27 := borrow_local($t0)
-                    $t27 := $MakePtr(false, add($locals, 63))
-                    // $t28 := 0x1012
-                    $t28 := 0x1012
-                    // $t29 := vector::singleton<address>($t28)
-                    $t29 := A1_vector_singleton$address$($t28)
-                    // Table::insert<u8, vector<address>>($t25, $t27, $t29)
-                    A2_Table_insert$u8_vec$address$$($t25, $t27, $t29)
-                    // $t30 := borrow_local($t22)
-                    $t30 := $MakePtr(false, $locals)
-                    // $t31 := 42
-                    $t31 := 42
-                    // $t14 := $t31
-                    mstore(add($locals, 64), $t31)
-                    // $t32 := borrow_local($t14)
-                    $t32 := $MakePtr(false, add($locals, 95))
-                    // $t33 := Table::contains<u8, vector<address>>($t30, $t32)
-                    $t33 := A2_Table_contains$u8_vec$address$$($t30, $t32)
-                    // if ($t33) goto L0 else goto L1
-                    switch $t33
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t24 := borrow_local($t22)
+                    $t24 := $MakePtr(false, $locals)
+                    // $t25 := 42
+                    $t25 := 42
+                    // $t0 := $t25
+                    mstore(add($locals, 32), $t25)
+                    // $t26 := borrow_local($t0)
+                    $t26 := $MakePtr(false, add($locals, 63))
+                    // $t27 := 0x1012
+                    $t27 := 0x1012
+                    // $t28 := vector::singleton<address>($t27)
+                    $t28 := A1_vector_singleton$address$($t27)
+                    // Table::insert<u8, vector<address>>($t24, $t26, $t28)
+                    A2_Table_insert$u8_vec$address$$($t24, $t26, $t28)
+                    // $t29 := borrow_local($t22)
+                    $t29 := $MakePtr(false, $locals)
+                    // $t30 := 42
+                    $t30 := 42
+                    // $t14 := $t30
+                    mstore(add($locals, 64), $t30)
+                    // $t31 := borrow_local($t14)
+                    $t31 := $MakePtr(false, add($locals, 95))
+                    // $t32 := Table::contains<u8, vector<address>>($t29, $t31)
+                    $t32 := A2_Table_contains$u8_vec$address$$($t29, $t31)
+                    // if ($t32) goto L1 else goto L0
+                    switch $t32
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
-                    // $t40 := 102
-                    $t40 := 102
-                    // abort($t40)
-                    $Abort($t40)
-                }
-                case 6 {
                     // label L2
-                    // $t41 := borrow_local($t22)
-                    $t41 := $MakePtr(false, $locals)
-                    // $t42 := 42
-                    $t42 := 42
-                    // $t18 := $t42
-                    mstore(add($locals, 128), $t42)
-                    // $t43 := borrow_local($t18)
-                    $t43 := $MakePtr(false, add($locals, 159))
-                    // $t44 := Table::borrow<u8, vector<address>>($t41, $t43)
-                    $t44 := A2_Table_borrow$u8_vec$address$$($t41, $t43)
-                    // $t45 := vector::length<address>($t44)
-                    $t45 := A1_vector_length$address$($t44)
-                    // $t46 := 1
-                    $t46 := 1
-                    // $t47 := ==($t45, $t46)
-                    $t47 := $Eq($t45, $t46)
-                    // if ($t47) goto L4 else goto L5
-                    switch $t47
+                    // $t34 := borrow_local($t22)
+                    $t34 := $MakePtr(false, $locals)
+                    // $t35 := 0
+                    $t35 := 0
+                    // $t16 := $t35
+                    mstore(add($locals, 96), $t35)
+                    // $t36 := borrow_local($t16)
+                    $t36 := $MakePtr(false, add($locals, 127))
+                    // $t37 := Table::contains<u8, vector<address>>($t34, $t36)
+                    $t37 := A2_Table_contains$u8_vec$address$$($t34, $t36)
+                    // $t38 := !($t37)
+                    $t38 := $LogicalNot($t37)
+                    // if ($t38) goto L4 else goto L3
+                    switch $t38
                     case 0  { $block := 7 }
-                    default { $block := 8 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
                 }
                 case 7 {
-                    // label L5
-                    // $t48 := 103
-                    $t48 := 103
-                    // abort($t48)
-                    $Abort($t48)
+                    // label L3
+                    // $t39 := 102
+                    $t39 := 102
+                    // abort($t39)
+                    $Abort($t39)
                 }
                 case 8 {
-                    // label L4
-                    // $t49 := borrow_local($t22)
-                    $t49 := $MakePtr(false, $locals)
-                    // $t50 := 42
-                    $t50 := 42
-                    // $t20 := $t50
-                    mstore(add($locals, 160), $t50)
-                    // $t51 := borrow_local($t20)
-                    $t51 := $MakePtr(false, add($locals, 191))
-                    // $t52 := Table::borrow<u8, vector<address>>($t49, $t51)
-                    $t52 := A2_Table_borrow$u8_vec$address$$($t49, $t51)
-                    // $t53 := 0
-                    $t53 := 0
-                    // $t54 := vector::borrow<address>($t52, $t53)
-                    $t54 := A1_vector_borrow$address$($t52, $t53)
-                    // $t55 := read_ref($t54)
-                    $t55 := $LoadU256($t54)
-                    // $t56 := 0x1012
-                    $t56 := 0x1012
-                    // $t57 := ==($t55, $t56)
-                    $t57 := $Eq($t55, $t56)
-                    // if ($t57) goto L6 else goto L7
-                    switch $t57
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    // label L5
+                    // $t40 := borrow_local($t22)
+                    $t40 := $MakePtr(false, $locals)
+                    // $t41 := 42
+                    $t41 := 42
+                    // $t18 := $t41
+                    mstore(add($locals, 128), $t41)
+                    // $t42 := borrow_local($t18)
+                    $t42 := $MakePtr(false, add($locals, 159))
+                    // $t43 := Table::borrow<u8, vector<address>>($t40, $t42)
+                    $t43 := A2_Table_borrow$u8_vec$address$$($t40, $t42)
+                    // $t44 := vector::length<address>($t43)
+                    $t44 := A1_vector_length$address$($t43)
+                    // $t45 := 1
+                    $t45 := 1
+                    // $t46 := ==($t44, $t45)
+                    $t46 := $Eq($t44, $t45)
+                    // if ($t46) goto L7 else goto L6
+                    switch $t46
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
                 case 9 {
                     // label L7
-                    // $t58 := 104
-                    $t58 := 104
-                    // abort($t58)
-                    $Abort($t58)
+                    // goto L8
+                    $block := 11
                 }
                 case 10 {
                     // label L6
-                    // $t59 := 0x42
-                    $t59 := 0x42
-                    // $t2 := Evm::sign($t59)
-                    mstore(add($locals, 192), A2_Evm_sign($t59))
-                    // $t60 := borrow_local($t2)
-                    $t60 := $MakePtr(false, add($locals, 192))
-                    // $t61 := move($t22)
-                    $t61 := mload($locals)
-                    // $t62 := pack Tables::S<u8, vector<address>>($t61)
+                    // $t47 := 103
+                    $t47 := 103
+                    // abort($t47)
+                    $Abort($t47)
+                }
+                case 11 {
+                    // label L8
+                    // $t48 := borrow_local($t22)
+                    $t48 := $MakePtr(false, $locals)
+                    // $t49 := 42
+                    $t49 := 42
+                    // $t20 := $t49
+                    mstore(add($locals, 160), $t49)
+                    // $t50 := borrow_local($t20)
+                    $t50 := $MakePtr(false, add($locals, 191))
+                    // $t51 := Table::borrow<u8, vector<address>>($t48, $t50)
+                    $t51 := A2_Table_borrow$u8_vec$address$$($t48, $t50)
+                    // $t52 := 0
+                    $t52 := 0
+                    // $t53 := vector::borrow<address>($t51, $t52)
+                    $t53 := A1_vector_borrow$address$($t51, $t52)
+                    // $t54 := read_ref($t53)
+                    $t54 := $LoadU256($t53)
+                    // $t55 := 0x1012
+                    $t55 := 0x1012
+                    // $t56 := ==($t54, $t55)
+                    $t56 := $Eq($t54, $t55)
+                    // if ($t56) goto L10 else goto L9
+                    switch $t56
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t57 := 104
+                    $t57 := 104
+                    // abort($t57)
+                    $Abort($t57)
+                }
+                case 14 {
+                    // label L11
+                    // $t58 := 0x42
+                    $t58 := 0x42
+                    // $t2 := Evm::sign($t58)
+                    mstore(add($locals, 192), A2_Evm_sign($t58))
+                    // $t59 := borrow_local($t2)
+                    $t59 := $MakePtr(false, add($locals, 192))
+                    // $t60 := move($t22)
+                    $t60 := mload($locals)
+                    // $t61 := pack Tables::S<u8, vector<address>>($t60)
                     {
                         let $mem := $Malloc(32)
-                        $MemoryStoreU256(add($mem, 0), $t61)
-                        $t62 := $mem
+                        $MemoryStoreU256(add($mem, 0), $t60)
+                        $t61 := $mem
                     }
-                    // move_to<Tables::S<u8, vector<address>>>($t62, $t60)
+                    // move_to<Tables::S<u8, vector<address>>>($t61, $t59)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0xa0362133, $LoadU256($t60))
+                        let $base_offset := $MakeTypeStorageBase(0, 0xa0362133, $LoadU256($t59))
                         if $AlignedStorageLoad($base_offset) {
                           $AbortBuiltin()
                         }
                         $AlignedStorageStore($base_offset, true)
                         {
                             let $dst := add($base_offset, 32)
-                            let $src := $t62
+                            let $src := $t61
                             $AlignedStorageStore(add($dst, 0), mload(add($src, 0)))
                             $Free($src, 32)
                         }
                     }
-                    // $t63 := 0x42
-                    $t63 := 0x42
-                    // $t64 := borrow_global<Tables::S<u8, vector<address>>>($t63)
+                    // $t62 := 0x42
+                    $t62 := 0x42
+                    // $t63 := borrow_global<Tables::S<u8, vector<address>>>($t62)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0xa0362133, $t63)
+                        let $base_offset := $MakeTypeStorageBase(0, 0xa0362133, $t62)
                         if iszero($AlignedStorageLoad($base_offset)) {
                           $AbortBuiltin()
                         }
-                        $t64 := $MakePtr(true, add($base_offset, 32))
+                        $t63 := $MakePtr(true, add($base_offset, 32))
                     }
-                    // $t65 := borrow_field<Tables::S<u8, vector<address>>>.t($t64)
-                    $t65 := $t64
-                    // $t66 := 42
-                    $t66 := 42
-                    // $t3 := $t66
-                    mstore(add($locals, 224), $t66)
-                    // $t67 := borrow_local($t3)
-                    $t67 := $MakePtr(false, add($locals, 255))
-                    // $t68 := Table::borrow_mut<u8, vector<address>>($t65, $t67)
-                    $t68 := A2_Table_borrow_mut$u8_vec$address$$($t65, $t67)
-                    // $t69 := 0x1013
-                    $t69 := 0x1013
-                    // vector::push_back<address>($t68, $t69)
-                    A1_vector_push_back$address$($t68, $t69)
-                    // $t70 := borrow_field<Tables::S<u8, vector<address>>>.t($t64)
-                    $t70 := $t64
-                    // $t71 := 42
-                    $t71 := 42
-                    // $t5 := $t71
-                    mstore(add($locals, 256), $t71)
-                    // $t72 := borrow_local($t5)
-                    $t72 := $MakePtr(false, add($locals, 287))
-                    // $t73 := Table::borrow<u8, vector<address>>($t70, $t72)
-                    $t73 := A2_Table_borrow$u8_vec$address$$($t70, $t72)
-                    // $t74 := vector::length<address>($t73)
-                    $t74 := A1_vector_length$address$($t73)
-                    // $t75 := 2
-                    $t75 := 2
-                    // $t76 := ==($t74, $t75)
-                    $t76 := $Eq($t74, $t75)
-                    // if ($t76) goto L8 else goto L9
-                    switch $t76
-                    case 0  { $block := 11 }
-                    default { $block := 12 }
-                }
-                case 11 {
-                    // label L9
-                    // destroy($t64)
-                    // $t77 := 105
-                    $t77 := 105
-                    // abort($t77)
-                    $Abort($t77)
-                }
-                case 12 {
-                    // label L8
-                    // $t78 := borrow_field<Tables::S<u8, vector<address>>>.t($t64)
-                    $t78 := $t64
-                    // $t79 := 42
-                    $t79 := 42
-                    // $t7 := $t79
-                    mstore(add($locals, 288), $t79)
-                    // $t80 := borrow_local($t7)
-                    $t80 := $MakePtr(false, add($locals, 319))
-                    // $t81 := Table::borrow<u8, vector<address>>($t78, $t80)
-                    $t81 := A2_Table_borrow$u8_vec$address$$($t78, $t80)
-                    // $t82 := 1
-                    $t82 := 1
-                    // $t83 := vector::borrow<address>($t81, $t82)
-                    $t83 := A1_vector_borrow$address$($t81, $t82)
-                    // $t84 := read_ref($t83)
-                    $t84 := $LoadU256($t83)
-                    // $t85 := 0x1013
-                    $t85 := 0x1013
-                    // $t86 := ==($t84, $t85)
-                    $t86 := $Eq($t84, $t85)
-                    // if ($t86) goto L10 else goto L11
-                    switch $t86
-                    case 0  { $block := 13 }
-                    default { $block := 14 }
-                }
-                case 13 {
-                    // label L11
-                    // destroy($t64)
-                    // $t87 := 106
-                    $t87 := 106
-                    // abort($t87)
-                    $Abort($t87)
-                }
-                case 14 {
-                    // label L10
-                    // $t88 := borrow_field<Tables::S<u8, vector<address>>>.t($t64)
-                    $t88 := $t64
-                    // $t89 := 42
-                    $t89 := 42
-                    // $t9 := $t89
-                    mstore(add($locals, 320), $t89)
-                    // $t90 := borrow_local($t9)
-                    $t90 := $MakePtr(false, add($locals, 351))
-                    // $t23 := Table::remove<u8, vector<address>>($t88, $t90)
-                    mstore(add($locals, 352), A2_Table_remove$u8_vec$address$$($t88, $t90))
-                    // $t91 := borrow_local($t23)
-                    $t91 := $MakePtr(false, add($locals, 352))
-                    // $t92 := vector::length<address>($t91)
-                    $t92 := A1_vector_length$address$($t91)
-                    // $t93 := 2
-                    $t93 := 2
-                    // $t94 := ==($t92, $t93)
-                    $t94 := $Eq($t92, $t93)
-                    // if ($t94) goto L12 else goto L13
-                    switch $t94
-                    case 0  { $block := 15 }
-                    default { $block := 16 }
+                    // $t64 := borrow_field<Tables::S<u8, vector<address>>>.t($t63)
+                    $t64 := $t63
+                    // $t65 := 42
+                    $t65 := 42
+                    // $t3 := $t65
+                    mstore(add($locals, 224), $t65)
+                    // $t66 := borrow_local($t3)
+                    $t66 := $MakePtr(false, add($locals, 255))
+                    // $t67 := Table::borrow_mut<u8, vector<address>>($t64, $t66)
+                    $t67 := A2_Table_borrow_mut$u8_vec$address$$($t64, $t66)
+                    // $t68 := 0x1013
+                    $t68 := 0x1013
+                    // vector::push_back<address>($t67, $t68)
+                    A1_vector_push_back$address$($t67, $t68)
+                    // $t69 := borrow_field<Tables::S<u8, vector<address>>>.t($t63)
+                    $t69 := $t63
+                    // $t70 := 42
+                    $t70 := 42
+                    // $t5 := $t70
+                    mstore(add($locals, 256), $t70)
+                    // $t71 := borrow_local($t5)
+                    $t71 := $MakePtr(false, add($locals, 287))
+                    // $t72 := Table::borrow<u8, vector<address>>($t69, $t71)
+                    $t72 := A2_Table_borrow$u8_vec$address$$($t69, $t71)
+                    // $t73 := vector::length<address>($t72)
+                    $t73 := A1_vector_length$address$($t72)
+                    // $t74 := 2
+                    $t74 := 2
+                    // $t75 := ==($t73, $t74)
+                    $t75 := $Eq($t73, $t74)
+                    // if ($t75) goto L13 else goto L12
+                    switch $t75
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
                 }
                 case 15 {
                     // label L13
-                    // destroy($t64)
-                    // $t95 := 107
-                    $t95 := 107
-                    // abort($t95)
-                    $Abort($t95)
+                    // goto L14
+                    $block := 17
                 }
                 case 16 {
                     // label L12
-                    // $t96 := borrow_local($t23)
-                    $t96 := $MakePtr(false, add($locals, 352))
-                    // $t97 := 0
-                    $t97 := 0
-                    // $t98 := vector::borrow<address>($t96, $t97)
-                    $t98 := A1_vector_borrow$address$($t96, $t97)
-                    // $t99 := read_ref($t98)
-                    $t99 := $LoadU256($t98)
-                    // $t100 := 0x1012
-                    $t100 := 0x1012
-                    // $t101 := ==($t99, $t100)
-                    $t101 := $Eq($t99, $t100)
-                    // if ($t101) goto L14 else goto L15
-                    switch $t101
-                    case 0  { $block := 17 }
-                    default { $block := 18 }
+                    // destroy($t63)
+                    // $t76 := 105
+                    $t76 := 105
+                    // abort($t76)
+                    $Abort($t76)
                 }
                 case 17 {
-                    // label L15
-                    // destroy($t64)
-                    // $t102 := 108
-                    $t102 := 108
-                    // abort($t102)
-                    $Abort($t102)
-                }
-                case 18 {
                     // label L14
-                    // $t103 := borrow_local($t23)
-                    $t103 := $MakePtr(false, add($locals, 352))
-                    // $t104 := 1
-                    $t104 := 1
-                    // $t105 := vector::borrow<address>($t103, $t104)
-                    $t105 := A1_vector_borrow$address$($t103, $t104)
-                    // $t106 := read_ref($t105)
-                    $t106 := $LoadU256($t105)
-                    // $t107 := 0x1013
-                    $t107 := 0x1013
-                    // $t108 := ==($t106, $t107)
-                    $t108 := $Eq($t106, $t107)
-                    // if ($t108) goto L16 else goto L17
-                    switch $t108
+                    // $t77 := borrow_field<Tables::S<u8, vector<address>>>.t($t63)
+                    $t77 := $t63
+                    // $t78 := 42
+                    $t78 := 42
+                    // $t7 := $t78
+                    mstore(add($locals, 288), $t78)
+                    // $t79 := borrow_local($t7)
+                    $t79 := $MakePtr(false, add($locals, 319))
+                    // $t80 := Table::borrow<u8, vector<address>>($t77, $t79)
+                    $t80 := A2_Table_borrow$u8_vec$address$$($t77, $t79)
+                    // $t81 := 1
+                    $t81 := 1
+                    // $t82 := vector::borrow<address>($t80, $t81)
+                    $t82 := A1_vector_borrow$address$($t80, $t81)
+                    // $t83 := read_ref($t82)
+                    $t83 := $LoadU256($t82)
+                    // $t84 := 0x1013
+                    $t84 := 0x1013
+                    // $t85 := ==($t83, $t84)
+                    $t85 := $Eq($t83, $t84)
+                    // if ($t85) goto L16 else goto L15
+                    switch $t85
                     case 0  { $block := 19 }
-                    default { $block := 20 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
                 }
                 case 19 {
-                    // label L17
-                    // destroy($t64)
-                    // $t109 := 109
-                    $t109 := 109
-                    // abort($t109)
-                    $Abort($t109)
+                    // label L15
+                    // destroy($t63)
+                    // $t86 := 106
+                    $t86 := 106
+                    // abort($t86)
+                    $Abort($t86)
                 }
                 case 20 {
-                    // label L16
-                    // $t110 := borrow_field<Tables::S<u8, vector<address>>>.t($t64)
-                    $t110 := $t64
-                    // $t111 := 42
-                    $t111 := 42
-                    // $t12 := $t111
-                    mstore(add($locals, 384), $t111)
-                    // $t112 := borrow_local($t12)
-                    $t112 := $MakePtr(false, add($locals, 415))
-                    // $t113 := Table::contains<u8, vector<address>>($t110, $t112)
-                    $t113 := A2_Table_contains$u8_vec$address$$($t110, $t112)
-                    // $t114 := !($t113)
-                    $t114 := $LogicalNot($t113)
-                    // if ($t114) goto L18 else goto L19
-                    switch $t114
-                    case 0  { $block := 21 }
-                    default { $block := 22 }
+                    // label L17
+                    // $t87 := borrow_field<Tables::S<u8, vector<address>>>.t($t63)
+                    $t87 := $t63
+                    // $t88 := 42
+                    $t88 := 42
+                    // $t9 := $t88
+                    mstore(add($locals, 320), $t88)
+                    // $t89 := borrow_local($t9)
+                    $t89 := $MakePtr(false, add($locals, 351))
+                    // $t23 := Table::remove<u8, vector<address>>($t87, $t89)
+                    mstore(add($locals, 352), A2_Table_remove$u8_vec$address$$($t87, $t89))
+                    // $t90 := borrow_local($t23)
+                    $t90 := $MakePtr(false, add($locals, 352))
+                    // $t91 := vector::length<address>($t90)
+                    $t91 := A1_vector_length$address$($t90)
+                    // $t92 := 2
+                    $t92 := 2
+                    // $t93 := ==($t91, $t92)
+                    $t93 := $Eq($t91, $t92)
+                    // if ($t93) goto L19 else goto L18
+                    switch $t93
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
                 }
                 case 21 {
                     // label L19
-                    // $t115 := 110
-                    $t115 := 110
-                    // abort($t115)
-                    $Abort($t115)
+                    // goto L20
+                    $block := 23
                 }
                 case 22 {
                     // label L18
+                    // destroy($t63)
+                    // $t94 := 107
+                    $t94 := 107
+                    // abort($t94)
+                    $Abort($t94)
+                }
+                case 23 {
+                    // label L20
+                    // $t95 := borrow_local($t23)
+                    $t95 := $MakePtr(false, add($locals, 352))
+                    // $t96 := 0
+                    $t96 := 0
+                    // $t97 := vector::borrow<address>($t95, $t96)
+                    $t97 := A1_vector_borrow$address$($t95, $t96)
+                    // $t98 := read_ref($t97)
+                    $t98 := $LoadU256($t97)
+                    // $t99 := 0x1012
+                    $t99 := 0x1012
+                    // $t100 := ==($t98, $t99)
+                    $t100 := $Eq($t98, $t99)
+                    // if ($t100) goto L22 else goto L21
+                    switch $t100
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
+                }
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
+                    // destroy($t63)
+                    // $t101 := 108
+                    $t101 := 108
+                    // abort($t101)
+                    $Abort($t101)
+                }
+                case 26 {
+                    // label L23
+                    // $t102 := borrow_local($t23)
+                    $t102 := $MakePtr(false, add($locals, 352))
+                    // $t103 := 1
+                    $t103 := 1
+                    // $t104 := vector::borrow<address>($t102, $t103)
+                    $t104 := A1_vector_borrow$address$($t102, $t103)
+                    // $t105 := read_ref($t104)
+                    $t105 := $LoadU256($t104)
+                    // $t106 := 0x1013
+                    $t106 := 0x1013
+                    // $t107 := ==($t105, $t106)
+                    $t107 := $Eq($t105, $t106)
+                    // if ($t107) goto L25 else goto L24
+                    switch $t107
+                    case 0  { $block := 28 }
+                    default { $block := 27 }
+                }
+                case 27 {
+                    // label L25
+                    // goto L26
+                    $block := 29
+                }
+                case 28 {
+                    // label L24
+                    // destroy($t63)
+                    // $t108 := 109
+                    $t108 := 109
+                    // abort($t108)
+                    $Abort($t108)
+                }
+                case 29 {
+                    // label L26
+                    // $t109 := borrow_field<Tables::S<u8, vector<address>>>.t($t63)
+                    $t109 := $t63
+                    // $t110 := 42
+                    $t110 := 42
+                    // $t12 := $t110
+                    mstore(add($locals, 384), $t110)
+                    // $t111 := borrow_local($t12)
+                    $t111 := $MakePtr(false, add($locals, 415))
+                    // $t112 := Table::contains<u8, vector<address>>($t109, $t111)
+                    $t112 := A2_Table_contains$u8_vec$address$$($t109, $t111)
+                    // $t113 := !($t112)
+                    $t113 := $LogicalNot($t112)
+                    // if ($t113) goto L28 else goto L27
+                    switch $t113
+                    case 0  { $block := 31 }
+                    default { $block := 30 }
+                }
+                case 30 {
+                    // label L28
+                    // goto L29
+                    $block := 32
+                }
+                case 31 {
+                    // label L27
+                    // $t114 := 110
+                    $t114 := 110
+                    // abort($t114)
+                    $Abort($t114)
+                }
+                case 32 {
+                    // label L29
                     // return ()
                     $Free($locals, 416)
                     leave
@@ -4004,4 +4224,4 @@ object "test_A2_Tables_test_vector" {
         }
     }
 }
-===> Test result of Tables::test_vector: Succeed(Stopped) (used_gas=177564): []
+===> Test result of Tables::test_vector: Succeed(Stopped) (used_gas=181444): []
diff --git a/language/evm/move-to-yul/tests/TestABINative.exp b/language/evm/move-to-yul/tests/TestABINative.exp
index e38fd0bc67..262139247a 100644
--- a/language/evm/move-to-yul/tests/TestABINative.exp
+++ b/language/evm/move-to-yul/tests/TestABINative.exp
@@ -58,7 +58,7 @@ object "test_A2_M_test_decode_two_bytes1" {
                     $t8 := 31
                     // $t9 := <=($t0, $t8)
                     $t9 := $LtEq(i, $t8)
-                    // if ($t9) goto L0 else goto L2
+                    // if ($t9) goto L1 else goto L0
                     switch $t9
                     case 0  { $block := 5 }
                     default { $block := 4 }
@@ -80,22 +80,12 @@ object "test_A2_M_test_decode_two_bytes1" {
                     $block := 2
                 }
                 case 4 {
-                    // label L0
-                    // $t10 := borrow_local($t2)
-                    $t10 := $MakePtr(false, $locals)
-                    // $t11 := 0
-                    $t11 := 0
-                    // vector::push_back<u8>($t10, $t11)
-                    A1_vector_push_back$u8$($t10, $t11)
-                    // $t12 := 1
-                    $t12 := 1
-                    // $t0 := +($t0, $t12)
-                    i := $AddU64(i, $t12)
-                    // goto L3
-                    $block := 2
+                    // label L1
+                    // goto L2
+                    $block := 6
                 }
                 case 5 {
-                    // label L2
+                    // label L0
                     // $t13 := borrow_local($t2)
                     $t13 := $MakePtr(false, $locals)
                     // $t14 := 43
@@ -107,36 +97,41 @@ object "test_A2_M_test_decode_two_bytes1" {
                     // $t1 := $t15
                     i_1 := $t15
                     // goto L7
-                    $block := 6
+                    $block := 7
                 }
                 case 6 {
+                    // label L2
+                    // $t10 := borrow_local($t2)
+                    $t10 := $MakePtr(false, $locals)
+                    // $t11 := 0
+                    $t11 := 0
+                    // vector::push_back<u8>($t10, $t11)
+                    A1_vector_push_back$u8$($t10, $t11)
+                    // $t12 := 1
+                    $t12 := 1
+                    // $t0 := +($t0, $t12)
+                    i := $AddU64(i, $t12)
+                    // goto L3
+                    $block := 2
+                }
+                case 7 {
                     // label L7
                     // $t16 := 31
                     $t16 := 31
                     // $t17 := <=($t1, $t16)
                     $t17 := $LtEq(i_1, $t16)
-                    // if ($t17) goto L4 else goto L6
+                    // if ($t17) goto L5 else goto L4
                     switch $t17
-                    case 0  { $block := 8 }
-                    default { $block := 7 }
-                }
-                case 7 {
-                    // label L4
-                    // $t18 := borrow_local($t2)
-                    $t18 := $MakePtr(false, $locals)
-                    // $t19 := 0
-                    $t19 := 0
-                    // vector::push_back<u8>($t18, $t19)
-                    A1_vector_push_back$u8$($t18, $t19)
-                    // $t20 := 1
-                    $t20 := 1
-                    // $t1 := +($t1, $t20)
-                    i_1 := $AddU64(i_1, $t20)
-                    // goto L7
-                    $block := 6
+                    case 0  { $block := 9 }
+                    default { $block := 8 }
                 }
                 case 8 {
-                    // label L6
+                    // label L5
+                    // goto L6
+                    $block := 10
+                }
+                case 9 {
+                    // label L4
                     // $t21 := move($t2)
                     $t21 := mload($locals)
                     // ($t22, $t23) := M::decode_two_bytes1($t21)
@@ -153,25 +148,40 @@ object "test_A2_M_test_decode_two_bytes1" {
                     $t26 := 1
                     // $t27 := ==($t25, $t26)
                     $t27 := $Eq($t25, $t26)
-                    // if ($t27) goto L8 else goto L10
+                    // if ($t27) goto L9 else goto L8
                     switch $t27
-                    case 0  { $block := 10 }
-                    default { $block := 9 }
-                }
-                case 9 {
-                    // label L8
-                    // goto L11
-                    $block := 11
+                    case 0  { $block := 12 }
+                    default { $block := 11 }
                 }
                 case 10 {
-                    // label L10
+                    // label L6
+                    // $t18 := borrow_local($t2)
+                    $t18 := $MakePtr(false, $locals)
+                    // $t19 := 0
+                    $t19 := 0
+                    // vector::push_back<u8>($t18, $t19)
+                    A1_vector_push_back$u8$($t18, $t19)
+                    // $t20 := 1
+                    $t20 := 1
+                    // $t1 := +($t1, $t20)
+                    i_1 := $AddU64(i_1, $t20)
+                    // goto L7
+                    $block := 7
+                }
+                case 11 {
+                    // label L9
+                    // goto L10
+                    $block := 13
+                }
+                case 12 {
+                    // label L8
                     // $t28 := 101
                     $t28 := 101
                     // abort($t28)
                     $Abort($t28)
                 }
-                case 11 {
-                    // label L11
+                case 13 {
+                    // label L10
                     // $t29 := borrow_local($t4)
                     $t29 := $MakePtr(false, add($locals, 64))
                     // $t30 := vector::length<u8>($t29)
@@ -180,25 +190,25 @@ object "test_A2_M_test_decode_two_bytes1" {
                     $t31 := 1
                     // $t32 := ==($t30, $t31)
                     $t32 := $Eq($t30, $t31)
-                    // if ($t32) goto L12 else goto L14
+                    // if ($t32) goto L12 else goto L11
                     switch $t32
-                    case 0  { $block := 13 }
-                    default { $block := 12 }
+                    case 0  { $block := 15 }
+                    default { $block := 14 }
                 }
-                case 12 {
+                case 14 {
                     // label L12
-                    // goto L15
-                    $block := 14
+                    // goto L13
+                    $block := 16
                 }
-                case 13 {
-                    // label L14
+                case 15 {
+                    // label L11
                     // $t33 := 102
                     $t33 := 102
                     // abort($t33)
                     $Abort($t33)
                 }
-                case 14 {
-                    // label L15
+                case 16 {
+                    // label L13
                     // $t34 := borrow_local($t3)
                     $t34 := $MakePtr(false, add($locals, 32))
                     // $t35 := 0
@@ -211,25 +221,25 @@ object "test_A2_M_test_decode_two_bytes1" {
                     $t38 := 42
                     // $t39 := ==($t37, $t38)
                     $t39 := $Eq($t37, $t38)
-                    // if ($t39) goto L16 else goto L18
+                    // if ($t39) goto L15 else goto L14
                     switch $t39
-                    case 0  { $block := 16 }
-                    default { $block := 15 }
+                    case 0  { $block := 18 }
+                    default { $block := 17 }
                 }
-                case 15 {
-                    // label L16
-                    // goto L19
-                    $block := 17
+                case 17 {
+                    // label L15
+                    // goto L16
+                    $block := 19
                 }
-                case 16 {
-                    // label L18
+                case 18 {
+                    // label L14
                     // $t40 := 103
                     $t40 := 103
                     // abort($t40)
                     $Abort($t40)
                 }
-                case 17 {
-                    // label L19
+                case 19 {
+                    // label L16
                     // $t41 := borrow_local($t4)
                     $t41 := $MakePtr(false, add($locals, 64))
                     // $t42 := 0
@@ -242,25 +252,25 @@ object "test_A2_M_test_decode_two_bytes1" {
                     $t45 := 43
                     // $t46 := ==($t44, $t45)
                     $t46 := $Eq($t44, $t45)
-                    // if ($t46) goto L20 else goto L22
+                    // if ($t46) goto L18 else goto L17
                     switch $t46
-                    case 0  { $block := 19 }
-                    default { $block := 18 }
+                    case 0  { $block := 21 }
+                    default { $block := 20 }
                 }
-                case 18 {
-                    // label L20
-                    // goto L23
-                    $block := 20
+                case 20 {
+                    // label L18
+                    // goto L19
+                    $block := 22
                 }
-                case 19 {
-                    // label L22
+                case 21 {
+                    // label L17
                     // $t47 := 104
                     $t47 := 104
                     // abort($t47)
                     $Abort($t47)
                 }
-                case 20 {
-                    // label L23
+                case 22 {
+                    // label L19
                     // return ()
                     $Free($locals, 96)
                     leave
@@ -280,14 +290,6 @@ object "test_A2_M_test_decode_two_bytes1" {
             let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
             len := $LoadU64(v_ptr)
         }
-        function A2_M_decode_two_bytes1(input) -> $result0, $result1  {
-            let $t1 := add(input, 32)
-            let $t2 := $MemoryLoadU64(input)
-            let $t3 := add($t1, $t2)
-            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
-            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
-            $result0, $result1 := abi_decode_tuple_$bytes1_bytes1$_$vec$u8$_vec$u8$$_from_memory($t1, $t3)
-        }
         function A1_vector_push_back$u8$(v_ref, e) {
             let v_offs := $LoadU256(v_ref)
             let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
@@ -302,6 +304,14 @@ object "test_A2_M_test_decode_two_bytes1" {
                 $StoreU256(v_ref, new_v_offs)
             }
         }
+        function A2_M_decode_two_bytes1(input) -> $result0, $result1  {
+            let $t1 := add(input, 32)
+            let $t2 := $MemoryLoadU64(input)
+            let $t3 := add($t1, $t2)
+            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            $result0, $result1 := abi_decode_tuple_$bytes1_bytes1$_$vec$u8$_vec$u8$$_from_memory($t1, $t3)
+        }
         function A1_vector_empty$u8$() -> vector {
             vector := $Malloc(34)
             $MemoryStoreU64(add(vector, 8), 2)
@@ -604,7 +614,7 @@ object "test_A2_M_test_decode_two_bytes1" {
         }
     }
 }
-===> Test result of M::test_decode_two_bytes1: Succeed(Stopped) (used_gas=66864): []
+===> Test result of M::test_decode_two_bytes1: Succeed(Stopped) (used_gas=79598): []
 
 // test of M::test_decode_two_u8
 /* =======================================
@@ -618,146 +628,156 @@ object "test_A2_M_test_decode_two_u8" {
         A2_M_test_decode_two_u8()
         return (0, 0)
         function A2_M_test_decode_two_u8() {
-            let i, i_1, v1, v2, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29
+            let i, i_1, v2, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28
             let $locals := $Malloc(32)
             let $block := 3
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L3
-                    // $t6 := 31
-                    $t6 := 31
-                    // $t7 := <=($t0, $t6)
-                    $t7 := $LtEq(i, $t6)
-                    // if ($t7) goto L0 else goto L2
-                    switch $t7
+                    // $t5 := 31
+                    $t5 := 31
+                    // $t6 := <=($t0, $t5)
+                    $t6 := $LtEq(i, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
                     case 0  { $block := 5 }
                     default { $block := 4 }
                 }
                 case 3 {
                     // $t2 := vector::empty<u8>()
                     mstore($locals, A1_vector_empty$u8$())
-                    // $t5 := 1
-                    $t5 := 1
-                    // $t0 := $t5
-                    i := $t5
+                    // $t4 := 1
+                    $t4 := 1
+                    // $t0 := $t4
+                    i := $t4
                     // goto L3
                     $block := 2
                 }
                 case 4 {
-                    // label L0
-                    // $t8 := borrow_local($t2)
-                    $t8 := $MakePtr(false, $locals)
-                    // $t9 := 0
-                    $t9 := 0
-                    // vector::push_back<u8>($t8, $t9)
-                    A1_vector_push_back$u8$($t8, $t9)
-                    // $t10 := 1
-                    $t10 := 1
-                    // $t0 := +($t0, $t10)
-                    i := $AddU64(i, $t10)
-                    // goto L3
-                    $block := 2
+                    // label L1
+                    // goto L2
+                    $block := 6
                 }
                 case 5 {
-                    // label L2
-                    // $t11 := borrow_local($t2)
-                    $t11 := $MakePtr(false, $locals)
-                    // $t12 := 42
-                    $t12 := 42
-                    // vector::push_back<u8>($t11, $t12)
-                    A1_vector_push_back$u8$($t11, $t12)
-                    // $t13 := 1
-                    $t13 := 1
-                    // $t1 := $t13
-                    i_1 := $t13
+                    // label L0
+                    // $t10 := borrow_local($t2)
+                    $t10 := $MakePtr(false, $locals)
+                    // $t11 := 42
+                    $t11 := 42
+                    // vector::push_back<u8>($t10, $t11)
+                    A1_vector_push_back$u8$($t10, $t11)
+                    // $t12 := 1
+                    $t12 := 1
+                    // $t1 := $t12
+                    i_1 := $t12
                     // goto L7
-                    $block := 6
+                    $block := 7
                 }
                 case 6 {
-                    // label L7
-                    // $t14 := 31
-                    $t14 := 31
-                    // $t15 := <=($t1, $t14)
-                    $t15 := $LtEq(i_1, $t14)
-                    // if ($t15) goto L4 else goto L6
-                    switch $t15
-                    case 0  { $block := 8 }
-                    default { $block := 7 }
+                    // label L2
+                    // $t7 := borrow_local($t2)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := 0
+                    $t8 := 0
+                    // vector::push_back<u8>($t7, $t8)
+                    A1_vector_push_back$u8$($t7, $t8)
+                    // $t9 := 1
+                    $t9 := 1
+                    // $t0 := +($t0, $t9)
+                    i := $AddU64(i, $t9)
+                    // goto L3
+                    $block := 2
                 }
                 case 7 {
-                    // label L4
-                    // $t16 := borrow_local($t2)
-                    $t16 := $MakePtr(false, $locals)
-                    // $t17 := 0
-                    $t17 := 0
-                    // vector::push_back<u8>($t16, $t17)
-                    A1_vector_push_back$u8$($t16, $t17)
-                    // $t18 := 1
-                    $t18 := 1
-                    // $t1 := +($t1, $t18)
-                    i_1 := $AddU64(i_1, $t18)
-                    // goto L7
-                    $block := 6
+                    // label L7
+                    // $t13 := 31
+                    $t13 := 31
+                    // $t14 := <=($t1, $t13)
+                    $t14 := $LtEq(i_1, $t13)
+                    // if ($t14) goto L5 else goto L4
+                    switch $t14
+                    case 0  { $block := 9 }
+                    default { $block := 8 }
                 }
                 case 8 {
-                    // label L6
-                    // $t19 := borrow_local($t2)
-                    $t19 := $MakePtr(false, $locals)
-                    // $t20 := 43
-                    $t20 := 43
-                    // vector::push_back<u8>($t19, $t20)
-                    A1_vector_push_back$u8$($t19, $t20)
-                    // $t21 := move($t2)
-                    $t21 := mload($locals)
-                    // ($t22, $t23) := M::decode_two_u8($t21)
-                    $t22, $t23 := A2_M_decode_two_u8($t21)
-                    // $t24 := 42
-                    $t24 := 42
-                    // $t25 := ==($t22, $t24)
-                    $t25 := $Eq($t22, $t24)
-                    // if ($t25) goto L8 else goto L10
-                    switch $t25
-                    case 0  { $block := 10 }
-                    default { $block := 9 }
+                    // label L5
+                    // goto L6
+                    $block := 10
                 }
                 case 9 {
-                    // label L8
-                    // goto L11
-                    $block := 11
+                    // label L4
+                    // $t18 := borrow_local($t2)
+                    $t18 := $MakePtr(false, $locals)
+                    // $t19 := 43
+                    $t19 := 43
+                    // vector::push_back<u8>($t18, $t19)
+                    A1_vector_push_back$u8$($t18, $t19)
+                    // $t20 := move($t2)
+                    $t20 := mload($locals)
+                    // ($t21, $t22) := M::decode_two_u8($t20)
+                    $t21, $t22 := A2_M_decode_two_u8($t20)
+                    // $t23 := 42
+                    $t23 := 42
+                    // $t24 := ==($t21, $t23)
+                    $t24 := $Eq($t21, $t23)
+                    // if ($t24) goto L9 else goto L8
+                    switch $t24
+                    case 0  { $block := 12 }
+                    default { $block := 11 }
                 }
                 case 10 {
-                    // label L10
-                    // $t26 := 101
-                    $t26 := 101
-                    // abort($t26)
-                    $Abort($t26)
+                    // label L6
+                    // $t15 := borrow_local($t2)
+                    $t15 := $MakePtr(false, $locals)
+                    // $t16 := 0
+                    $t16 := 0
+                    // vector::push_back<u8>($t15, $t16)
+                    A1_vector_push_back$u8$($t15, $t16)
+                    // $t17 := 1
+                    $t17 := 1
+                    // $t1 := +($t1, $t17)
+                    i_1 := $AddU64(i_1, $t17)
+                    // goto L7
+                    $block := 7
                 }
                 case 11 {
-                    // label L11
-                    // $t27 := 43
-                    $t27 := 43
-                    // $t28 := ==($t23, $t27)
-                    $t28 := $Eq($t23, $t27)
-                    // if ($t28) goto L12 else goto L14
-                    switch $t28
-                    case 0  { $block := 13 }
-                    default { $block := 12 }
+                    // label L9
+                    // goto L10
+                    $block := 13
                 }
                 case 12 {
-                    // label L12
-                    // goto L15
-                    $block := 14
+                    // label L8
+                    // $t25 := 101
+                    $t25 := 101
+                    // abort($t25)
+                    $Abort($t25)
                 }
                 case 13 {
-                    // label L14
-                    // $t29 := 102
-                    $t29 := 102
-                    // abort($t29)
-                    $Abort($t29)
+                    // label L10
+                    // $t26 := 43
+                    $t26 := 43
+                    // $t27 := ==($t22, $t26)
+                    $t27 := $Eq($t22, $t26)
+                    // if ($t27) goto L12 else goto L11
+                    switch $t27
+                    case 0  { $block := 15 }
+                    default { $block := 14 }
                 }
                 case 14 {
-                    // label L15
+                    // label L12
+                    // goto L13
+                    $block := 16
+                }
+                case 15 {
+                    // label L11
+                    // $t28 := 102
+                    $t28 := 102
+                    // abort($t28)
+                    $Abort($t28)
+                }
+                case 16 {
+                    // label L13
                     // return ()
                     $Free($locals, 32)
                     leave
@@ -765,14 +785,6 @@ object "test_A2_M_test_decode_two_u8" {
             }
         }
 
-        function A2_M_decode_two_u8(input) -> $result0, $result1  {
-            let $t1 := add(input, 32)
-            let $t2 := $MemoryLoadU64(input)
-            let $t3 := add($t1, $t2)
-            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
-            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
-            $result0, $result1 := abi_decode_tuple_$uint8_uint8$_$u8_u8$_from_memory($t1, $t3)
-        }
         function A1_vector_push_back$u8$(v_ref, e) {
             let v_offs := $LoadU256(v_ref)
             let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
@@ -787,6 +799,14 @@ object "test_A2_M_test_decode_two_u8" {
                 $StoreU256(v_ref, new_v_offs)
             }
         }
+        function A2_M_decode_two_u8(input) -> $result0, $result1  {
+            let $t1 := add(input, 32)
+            let $t2 := $MemoryLoadU64(input)
+            let $t3 := add($t1, $t2)
+            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            $result0, $result1 := abi_decode_tuple_$uint8_uint8$_$u8_u8$_from_memory($t1, $t3)
+        }
         function A1_vector_empty$u8$() -> vector {
             vector := $Malloc(34)
             $MemoryStoreU64(add(vector, 8), 2)
@@ -1041,7 +1061,7 @@ object "test_A2_M_test_decode_two_u8" {
         }
     }
 }
-===> Test result of M::test_decode_two_u8: Succeed(Stopped) (used_gas=64646): []
+===> Test result of M::test_decode_two_u8: Succeed(Stopped) (used_gas=77393): []
 
 // test of M::test_encode_packed_string
 /* =======================================
@@ -1060,12 +1080,12 @@ object "test_A2_M_test_encode_packed_string" {
             for {} true {} {
                 switch $block
                 case 2 {
-                    // label L0
-                    // goto L3
+                    // label L1
+                    // goto L2
                     $block := 5
                 }
                 case 3 {
-                    // label L2
+                    // label L0
                     // $t5 := 100
                     $t5 := 100
                     // abort($t5)
@@ -1091,13 +1111,13 @@ object "test_A2_M_test_encode_packed_string" {
                     copy_literal_string_to_memory_21418693(add($t3, 32))
                     // $t4 := ==($t2, $t3)
                     $t4 := $Eq_$vec$u8$$($t2, $t3)
-                    // if ($t4) goto L0 else goto L2
+                    // if ($t4) goto L1 else goto L0
                     switch $t4
                     case 0  { $block := 3 }
                     default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
+                    // label L2
                     // $t6 := [49]
                     $t6 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
                     $MemoryStoreU64($t6, 1)
@@ -1117,25 +1137,25 @@ object "test_A2_M_test_encode_packed_string" {
                     copy_literal_string_to_memory_141265791(add($t9, 32))
                     // $t10 := ==($t8, $t9)
                     $t10 := $Eq_$vec$u8$$($t8, $t9)
-                    // if ($t10) goto L4 else goto L6
+                    // if ($t10) goto L4 else goto L3
                     switch $t10
                     case 0  { $block := 7 }
                     default { $block := 6 }
                 }
                 case 6 {
                     // label L4
-                    // goto L7
+                    // goto L5
                     $block := 8
                 }
                 case 7 {
-                    // label L6
+                    // label L3
                     // $t11 := 101
                     $t11 := 101
                     // abort($t11)
                     $Abort($t11)
                 }
                 case 8 {
-                    // label L7
+                    // label L5
                     // $t12 := []
                     $t12 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(0)))
                     $MemoryStoreU64($t12, 0)
@@ -1155,25 +1175,25 @@ object "test_A2_M_test_encode_packed_string" {
                     copy_literal_string_to_memory_2053440334(add($t15, 32))
                     // $t16 := ==($t14, $t15)
                     $t16 := $Eq_$vec$u8$$($t14, $t15)
-                    // if ($t16) goto L8 else goto L10
+                    // if ($t16) goto L7 else goto L6
                     switch $t16
                     case 0  { $block := 10 }
                     default { $block := 9 }
                 }
                 case 9 {
-                    // label L8
-                    // goto L11
+                    // label L7
+                    // goto L8
                     $block := 11
                 }
                 case 10 {
-                    // label L10
+                    // label L6
                     // $t17 := 102
                     $t17 := 102
                     // abort($t17)
                     $Abort($t17)
                 }
                 case 11 {
-                    // label L11
+                    // label L8
                     // $t18 := [97]
                     $t18 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(1)))
                     $MemoryStoreU64($t18, 1)
@@ -1200,25 +1220,25 @@ object "test_A2_M_test_encode_packed_string" {
                     copy_literal_string_to_memory_3871831907(add($t23, 32))
                     // $t24 := ==($t22, $t23)
                     $t24 := $Eq_$vec$u8$$($t22, $t23)
-                    // if ($t24) goto L12 else goto L14
+                    // if ($t24) goto L10 else goto L9
                     switch $t24
                     case 0  { $block := 13 }
                     default { $block := 12 }
                 }
                 case 12 {
-                    // label L12
-                    // goto L15
+                    // label L10
+                    // goto L11
                     $block := 14
                 }
                 case 13 {
-                    // label L14
+                    // label L9
                     // $t25 := 103
                     $t25 := 103
                     // abort($t25)
                     $Abort($t25)
                 }
                 case 14 {
-                    // label L15
+                    // label L11
                     // $t26 := [116, 101, 115, 116]
                     $t26 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
                     $MemoryStoreU64($t26, 4)
@@ -1238,25 +1258,25 @@ object "test_A2_M_test_encode_packed_string" {
                     copy_literal_string_to_memory_1610556060(add($t29, 32))
                     // $t30 := ==($t28, $t29)
                     $t30 := $Eq_$vec$u8$$($t28, $t29)
-                    // if ($t30) goto L16 else goto L18
+                    // if ($t30) goto L13 else goto L12
                     switch $t30
                     case 0  { $block := 16 }
                     default { $block := 15 }
                 }
                 case 15 {
-                    // label L16
-                    // goto L19
+                    // label L13
+                    // goto L14
                     $block := 17
                 }
                 case 16 {
-                    // label L18
+                    // label L12
                     // $t31 := 104
                     $t31 := 104
                     // abort($t31)
                     $Abort($t31)
                 }
                 case 17 {
-                    // label L19
+                    // label L14
                     // return ()
                     leave
                 }
@@ -1457,45 +1477,45 @@ object "test_A2_M_test_encode_packed_uint16" {
         A2_M_test_encode_packed_uint16()
         return (0, 0)
         function A2_M_test_encode_packed_uint16() {
-            let v1, v2, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            let $t1, $t2, $t3, $t4, $t5, $t6, $t7
             let $locals := $Malloc(32)
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
-                    // label L0
-                    // goto L3
+                    // label L1
+                    // goto L2
                     $block := 5
                 }
                 case 3 {
-                    // label L2
-                    // $t9 := 101
-                    $t9 := 101
-                    // abort($t9)
-                    $Abort($t9)
+                    // label L0
+                    // $t7 := 101
+                    $t7 := 101
+                    // abort($t7)
+                    $Abort($t7)
                 }
                 case 4 {
-                    // $t3 := 41
-                    $t3 := 41
-                    // $t4 := 42
-                    $t4 := 42
-                    // $t0 := M::encode_packed($t3, $t4)
-                    mstore($locals, A2_M_encode_packed($t3, $t4))
-                    // $t5 := borrow_local($t0)
-                    $t5 := $MakePtr(false, $locals)
-                    // $t6 := vector::length<u8>($t5)
-                    $t6 := A1_vector_length$u8$($t5)
-                    // $t7 := 4
-                    $t7 := 4
-                    // $t8 := ==($t6, $t7)
-                    $t8 := $Eq($t6, $t7)
-                    // if ($t8) goto L0 else goto L2
-                    switch $t8
+                    // $t1 := 41
+                    $t1 := 41
+                    // $t2 := 42
+                    $t2 := 42
+                    // $t0 := M::encode_packed($t1, $t2)
+                    mstore($locals, A2_M_encode_packed($t1, $t2))
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := vector::length<u8>($t3)
+                    $t4 := A1_vector_length$u8$($t3)
+                    // $t5 := 4
+                    $t5 := 4
+                    // $t6 := ==($t4, $t5)
+                    $t6 := $Eq($t4, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
                     case 0  { $block := 3 }
                     default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
+                    // label L2
                     // return ()
                     $Free($locals, 32)
                     leave
@@ -1682,125 +1702,135 @@ object "test_A2_M_test_marshalling_two_bytes1" {
         A2_M_test_marshalling_two_bytes1()
         return (0, 0)
         function A2_M_test_marshalling_two_bytes1() {
-            let i, i_1, v1, v2, v_, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28
+            let i, i_1, v_, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26
             let $locals := $Malloc(32)
             let $block := 3
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L3
-                    // $t9 := 31
-                    $t9 := 31
-                    // $t10 := <=($t0, $t9)
-                    $t10 := $LtEq(i, $t9)
-                    // if ($t10) goto L0 else goto L2
-                    switch $t10
+                    // $t7 := 31
+                    $t7 := 31
+                    // $t8 := <=($t0, $t7)
+                    $t8 := $LtEq(i, $t7)
+                    // if ($t8) goto L1 else goto L0
+                    switch $t8
                     case 0  { $block := 5 }
                     default { $block := 4 }
                 }
                 case 3 {
                     // $t2 := vector::empty<u8>()
                     mstore($locals, A1_vector_empty$u8$())
-                    // $t6 := borrow_local($t2)
-                    $t6 := $MakePtr(false, $locals)
-                    // $t7 := 42
-                    $t7 := 42
-                    // vector::push_back<u8>($t6, $t7)
-                    A1_vector_push_back$u8$($t6, $t7)
-                    // $t8 := 1
-                    $t8 := 1
-                    // $t0 := $t8
-                    i := $t8
+                    // $t4 := borrow_local($t2)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := 42
+                    $t5 := 42
+                    // vector::push_back<u8>($t4, $t5)
+                    A1_vector_push_back$u8$($t4, $t5)
+                    // $t6 := 1
+                    $t6 := 1
+                    // $t0 := $t6
+                    i := $t6
                     // goto L3
                     $block := 2
                 }
                 case 4 {
-                    // label L0
-                    // $t11 := borrow_local($t2)
-                    $t11 := $MakePtr(false, $locals)
-                    // $t12 := 0
-                    $t12 := 0
-                    // vector::push_back<u8>($t11, $t12)
-                    A1_vector_push_back$u8$($t11, $t12)
-                    // $t13 := 1
-                    $t13 := 1
-                    // $t0 := +($t0, $t13)
-                    i := $AddU64(i, $t13)
-                    // goto L3
-                    $block := 2
+                    // label L1
+                    // goto L2
+                    $block := 6
                 }
                 case 5 {
-                    // label L2
-                    // $t14 := borrow_local($t2)
-                    $t14 := $MakePtr(false, $locals)
-                    // $t15 := 43
-                    $t15 := 43
-                    // vector::push_back<u8>($t14, $t15)
-                    A1_vector_push_back$u8$($t14, $t15)
-                    // $t16 := 1
-                    $t16 := 1
-                    // $t1 := $t16
-                    i_1 := $t16
+                    // label L0
+                    // $t12 := borrow_local($t2)
+                    $t12 := $MakePtr(false, $locals)
+                    // $t13 := 43
+                    $t13 := 43
+                    // vector::push_back<u8>($t12, $t13)
+                    A1_vector_push_back$u8$($t12, $t13)
+                    // $t14 := 1
+                    $t14 := 1
+                    // $t1 := $t14
+                    i_1 := $t14
                     // goto L7
-                    $block := 6
+                    $block := 7
                 }
                 case 6 {
-                    // label L7
-                    // $t17 := 31
-                    $t17 := 31
-                    // $t18 := <=($t1, $t17)
-                    $t18 := $LtEq(i_1, $t17)
-                    // if ($t18) goto L4 else goto L6
-                    switch $t18
-                    case 0  { $block := 8 }
-                    default { $block := 7 }
+                    // label L2
+                    // $t9 := borrow_local($t2)
+                    $t9 := $MakePtr(false, $locals)
+                    // $t10 := 0
+                    $t10 := 0
+                    // vector::push_back<u8>($t9, $t10)
+                    A1_vector_push_back$u8$($t9, $t10)
+                    // $t11 := 1
+                    $t11 := 1
+                    // $t0 := +($t0, $t11)
+                    i := $AddU64(i, $t11)
+                    // goto L3
+                    $block := 2
                 }
                 case 7 {
-                    // label L4
-                    // $t19 := borrow_local($t2)
-                    $t19 := $MakePtr(false, $locals)
-                    // $t20 := 0
-                    $t20 := 0
-                    // vector::push_back<u8>($t19, $t20)
-                    A1_vector_push_back$u8$($t19, $t20)
-                    // $t21 := 1
-                    $t21 := 1
-                    // $t1 := +($t1, $t21)
-                    i_1 := $AddU64(i_1, $t21)
-                    // goto L7
-                    $block := 6
+                    // label L7
+                    // $t15 := 31
+                    $t15 := 31
+                    // $t16 := <=($t1, $t15)
+                    $t16 := $LtEq(i_1, $t15)
+                    // if ($t16) goto L5 else goto L4
+                    switch $t16
+                    case 0  { $block := 9 }
+                    default { $block := 8 }
                 }
                 case 8 {
-                    // label L6
-                    // $t22 := copy($t2)
-                    $t22 := mload($locals)
-                    // ($t23, $t24) := M::decode_two_bytes1($t22)
-                    $t23, $t24 := A2_M_decode_two_bytes1($t22)
-                    // $t25 := M::encode_two_bytes1($t23, $t24)
-                    $t25 := A2_M_encode_two_bytes1($t23, $t24)
-                    // $t26 := move($t2)
-                    $t26 := mload($locals)
-                    // $t27 := ==($t26, $t25)
-                    $t27 := $Eq_$vec$u8$$($t26, $t25)
-                    // if ($t27) goto L8 else goto L10
-                    switch $t27
-                    case 0  { $block := 10 }
-                    default { $block := 9 }
+                    // label L5
+                    // goto L6
+                    $block := 10
                 }
                 case 9 {
-                    // label L8
-                    // goto L11
-                    $block := 11
+                    // label L4
+                    // $t20 := copy($t2)
+                    $t20 := mload($locals)
+                    // ($t21, $t22) := M::decode_two_bytes1($t20)
+                    $t21, $t22 := A2_M_decode_two_bytes1($t20)
+                    // $t23 := M::encode_two_bytes1($t21, $t22)
+                    $t23 := A2_M_encode_two_bytes1($t21, $t22)
+                    // $t24 := move($t2)
+                    $t24 := mload($locals)
+                    // $t25 := ==($t24, $t23)
+                    $t25 := $Eq_$vec$u8$$($t24, $t23)
+                    // if ($t25) goto L9 else goto L8
+                    switch $t25
+                    case 0  { $block := 12 }
+                    default { $block := 11 }
                 }
                 case 10 {
-                    // label L10
-                    // $t28 := 101
-                    $t28 := 101
-                    // abort($t28)
-                    $Abort($t28)
+                    // label L6
+                    // $t17 := borrow_local($t2)
+                    $t17 := $MakePtr(false, $locals)
+                    // $t18 := 0
+                    $t18 := 0
+                    // vector::push_back<u8>($t17, $t18)
+                    A1_vector_push_back$u8$($t17, $t18)
+                    // $t19 := 1
+                    $t19 := 1
+                    // $t1 := +($t1, $t19)
+                    i_1 := $AddU64(i_1, $t19)
+                    // goto L7
+                    $block := 7
                 }
                 case 11 {
-                    // label L11
+                    // label L9
+                    // goto L10
+                    $block := 13
+                }
+                case 12 {
+                    // label L8
+                    // $t26 := 101
+                    $t26 := 101
+                    // abort($t26)
+                    $Abort($t26)
+                }
+                case 13 {
+                    // label L10
                     // return ()
                     $Free($locals, 32)
                     leave
@@ -1808,6 +1838,20 @@ object "test_A2_M_test_marshalling_two_bytes1" {
             }
         }
 
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
         function A2_M_encode_two_bytes1(input_1,input_2) -> $result  {
             $result := mload(0)
             let $t2 := add($result, 32)
@@ -1828,20 +1872,6 @@ object "test_A2_M_test_marshalling_two_bytes1" {
             if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
             $result0, $result1 := abi_decode_tuple_$bytes1_bytes1$_$vec$u8$_vec$u8$$_from_memory($t1, $t3)
         }
-        function A1_vector_push_back$u8$(v_ref, e) {
-            let v_offs := $LoadU256(v_ref)
-            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
-            let size := $LoadU64(v_ptr)
-            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
-            $StoreU8(e_ptr, e)
-            size := add(size, 1)
-            $StoreU64(v_ptr, size)
-            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
-            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
-                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
-                $StoreU256(v_ref, new_v_offs)
-            }
-        }
         function A1_vector_empty$u8$() -> vector {
             vector := $Malloc(34)
             $MemoryStoreU64(add(vector, 8), 2)
@@ -2161,7 +2191,7 @@ object "test_A2_M_test_marshalling_two_bytes1" {
         }
     }
 }
-===> Test result of M::test_marshalling_two_bytes1: Succeed(Stopped) (used_gas=66247): []
+===> Test result of M::test_marshalling_two_bytes1: Succeed(Stopped) (used_gas=78906): []
 
 // test of M::test_marshalling_two_u8
 /* =======================================
@@ -2186,7 +2216,7 @@ object "test_A2_M_test_marshalling_two_u8" {
                     $t7 := 31
                     // $t8 := <=($t0, $t7)
                     $t8 := $LtEq(i, $t7)
-                    // if ($t8) goto L0 else goto L2
+                    // if ($t8) goto L1 else goto L0
                     switch $t8
                     case 0  { $block := 5 }
                     default { $block := 4 }
@@ -2202,22 +2232,12 @@ object "test_A2_M_test_marshalling_two_u8" {
                     $block := 2
                 }
                 case 4 {
-                    // label L0
-                    // $t9 := borrow_local($t2)
-                    $t9 := $MakePtr(false, $locals)
-                    // $t10 := 0
-                    $t10 := 0
-                    // vector::push_back<u8>($t9, $t10)
-                    A1_vector_push_back$u8$($t9, $t10)
-                    // $t11 := 1
-                    $t11 := 1
-                    // $t0 := +($t0, $t11)
-                    i := $AddU64(i, $t11)
-                    // goto L3
-                    $block := 2
+                    // label L1
+                    // goto L2
+                    $block := 6
                 }
                 case 5 {
-                    // label L2
+                    // label L0
                     // $t12 := borrow_local($t2)
                     $t12 := $MakePtr(false, $locals)
                     // $t13 := 42
@@ -2229,36 +2249,41 @@ object "test_A2_M_test_marshalling_two_u8" {
                     // $t1 := $t14
                     i_1 := $t14
                     // goto L7
-                    $block := 6
+                    $block := 7
                 }
                 case 6 {
+                    // label L2
+                    // $t9 := borrow_local($t2)
+                    $t9 := $MakePtr(false, $locals)
+                    // $t10 := 0
+                    $t10 := 0
+                    // vector::push_back<u8>($t9, $t10)
+                    A1_vector_push_back$u8$($t9, $t10)
+                    // $t11 := 1
+                    $t11 := 1
+                    // $t0 := +($t0, $t11)
+                    i := $AddU64(i, $t11)
+                    // goto L3
+                    $block := 2
+                }
+                case 7 {
                     // label L7
                     // $t15 := 31
                     $t15 := 31
                     // $t16 := <=($t1, $t15)
                     $t16 := $LtEq(i_1, $t15)
-                    // if ($t16) goto L4 else goto L6
+                    // if ($t16) goto L5 else goto L4
                     switch $t16
-                    case 0  { $block := 8 }
-                    default { $block := 7 }
-                }
-                case 7 {
-                    // label L4
-                    // $t17 := borrow_local($t2)
-                    $t17 := $MakePtr(false, $locals)
-                    // $t18 := 0
-                    $t18 := 0
-                    // vector::push_back<u8>($t17, $t18)
-                    A1_vector_push_back$u8$($t17, $t18)
-                    // $t19 := 1
-                    $t19 := 1
-                    // $t1 := +($t1, $t19)
-                    i_1 := $AddU64(i_1, $t19)
-                    // goto L7
-                    $block := 6
+                    case 0  { $block := 9 }
+                    default { $block := 8 }
                 }
                 case 8 {
-                    // label L6
+                    // label L5
+                    // goto L6
+                    $block := 10
+                }
+                case 9 {
+                    // label L4
                     // $t20 := borrow_local($t2)
                     $t20 := $MakePtr(false, $locals)
                     // $t21 := 43
@@ -2273,73 +2298,88 @@ object "test_A2_M_test_marshalling_two_u8" {
                     $t25 := 42
                     // $t26 := ==($t23, $t25)
                     $t26 := $Eq($t23, $t25)
-                    // if ($t26) goto L8 else goto L10
+                    // if ($t26) goto L9 else goto L8
                     switch $t26
-                    case 0  { $block := 10 }
-                    default { $block := 9 }
-                }
-                case 9 {
-                    // label L8
-                    // goto L11
-                    $block := 11
+                    case 0  { $block := 12 }
+                    default { $block := 11 }
                 }
                 case 10 {
-                    // label L10
+                    // label L6
+                    // $t17 := borrow_local($t2)
+                    $t17 := $MakePtr(false, $locals)
+                    // $t18 := 0
+                    $t18 := 0
+                    // vector::push_back<u8>($t17, $t18)
+                    A1_vector_push_back$u8$($t17, $t18)
+                    // $t19 := 1
+                    $t19 := 1
+                    // $t1 := +($t1, $t19)
+                    i_1 := $AddU64(i_1, $t19)
+                    // goto L7
+                    $block := 7
+                }
+                case 11 {
+                    // label L9
+                    // goto L10
+                    $block := 13
+                }
+                case 12 {
+                    // label L8
                     // $t27 := 101
                     $t27 := 101
                     // abort($t27)
                     $Abort($t27)
                 }
-                case 11 {
-                    // label L11
+                case 13 {
+                    // label L10
                     // $t28 := 43
                     $t28 := 43
                     // $t29 := ==($t24, $t28)
                     $t29 := $Eq($t24, $t28)
-                    // if ($t29) goto L12 else goto L14
+                    // if ($t29) goto L12 else goto L11
                     switch $t29
-                    case 0  { $block := 13 }
-                    default { $block := 12 }
+                    case 0  { $block := 15 }
+                    default { $block := 14 }
                 }
-                case 12 {
+                case 14 {
                     // label L12
-                    // goto L15
-                    $block := 14
+                    // goto L13
+                    $block := 16
                 }
-                case 13 {
-                    // label L14
+                case 15 {
+                    // label L11
                     // $t30 := 102
                     $t30 := 102
                     // abort($t30)
                     $Abort($t30)
                 }
-                case 14 {
-                    // label L15
+                case 16 {
+                    // label L13
                     // $t31 := M::encode_two_u8($t23, $t24)
                     $t31 := A2_M_encode_two_u8($t23, $t24)
                     // $t32 := move($t2)
                     $t32 := mload($locals)
                     // $t33 := ==($t32, $t31)
                     $t33 := $Eq_$vec$u8$$($t32, $t31)
-                    // if ($t33) goto L16 else goto L18
+                    // if ($t33) goto L15 else goto L14
                     switch $t33
-                    case 0  { $block := 16 }
-                    default { $block := 15 }
+                    case 0  { $block := 18 }
+                    default { $block := 17 }
                 }
-                case 15 {
-                    // label L16
-                    // goto L19
-                    $block := 17
+                case 17 {
+                    // label L15
+                    // goto L16
+                    $block := 19
                 }
-                case 16 {
-                    // label L18
+                case 18 {
+                    // label L14
                     // $t34 := 103
                     $t34 := 103
                     // abort($t34)
                     $Abort($t34)
                 }
-                case 17 {
-                    // label L19
+                case 19 {
+                    // label L16
                     // return ()
                     $Free($locals, 32)
                     leave
@@ -2359,14 +2399,6 @@ object "test_A2_M_test_marshalling_two_u8" {
             $MemoryStoreU64(add($result, 8), $t5)
             mstore(0, $t3)
         }
-        function A2_M_decode_two_u8(input) -> $result0, $result1  {
-            let $t1 := add(input, 32)
-            let $t2 := $MemoryLoadU64(input)
-            let $t3 := add($t1, $t2)
-            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
-            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
-            $result0, $result1 := abi_decode_tuple_$uint8_uint8$_$u8_u8$_from_memory($t1, $t3)
-        }
         function A1_vector_push_back$u8$(v_ref, e) {
             let v_offs := $LoadU256(v_ref)
             let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
@@ -2381,6 +2413,14 @@ object "test_A2_M_test_marshalling_two_u8" {
                 $StoreU256(v_ref, new_v_offs)
             }
         }
+        function A2_M_decode_two_u8(input) -> $result0, $result1  {
+            let $t1 := add(input, 32)
+            let $t2 := $MemoryLoadU64(input)
+            let $t3 := add($t1, $t2)
+            if gt($t1, 0xffffffffffffffff) { $AbortBuiltin() }
+            if gt($t3, 0xffffffffffffffff) { $AbortBuiltin() }
+            $result0, $result1 := abi_decode_tuple_$uint8_uint8$_$u8_u8$_from_memory($t1, $t3)
+        }
         function A1_vector_empty$u8$() -> vector {
             vector := $Malloc(34)
             $MemoryStoreU64(add(vector, 8), 2)
@@ -2681,7 +2721,7 @@ object "test_A2_M_test_marshalling_two_u8" {
         }
     }
 }
-===> Test result of M::test_marshalling_two_u8: Succeed(Stopped) (used_gas=66157): []
+===> Test result of M::test_marshalling_two_u8: Succeed(Stopped) (used_gas=78803): []
 
 
 
diff --git a/language/evm/move-to-yul/tests/TestABIStructs.exp b/language/evm/move-to-yul/tests/TestABIStructs.exp
index e511f092fc..af572c9561 100644
--- a/language/evm/move-to-yul/tests/TestABIStructs.exp
+++ b/language/evm/move-to-yul/tests/TestABIStructs.exp
@@ -94,21 +94,21 @@ object "A2_M" {
             }
             $Abort(97)
             function A2_M_do_transfer() {
-                let s, $t1, $t2, $t3, $t4
-                // $t1 := 42
-                $t1 := 42
-                // $t2 := true
-                $t2 := true
-                // $t3 := M::pack_S($t1, $t2)
-                $t3 := A2_M_pack_S($t1, $t2)
-                // $t4 := pack M::Event_S($t3)
+                let $t0, $t1, $t2, $t3
+                // $t0 := 42
+                $t0 := 42
+                // $t1 := true
+                $t1 := true
+                // $t2 := M::pack_S($t0, $t1)
+                $t2 := A2_M_pack_S($t0, $t1)
+                // $t3 := pack M::Event_S($t2)
                 {
                     let $mem := $Malloc(32)
-                    $MemoryStoreU256(add($mem, 0), $t3)
-                    $t4 := $mem
+                    $MemoryStoreU256(add($mem, 0), $t2)
+                    $t3 := $mem
                 }
-                // Evm::emit<M::Event_S>($t4)
-                A2_Evm_emit$A2_M_Event_S$($t4)
+                // Evm::emit<M::Event_S>($t3)
+                A2_Evm_emit$A2_M_Event_S$($t3)
                 // return ()
             }
 
@@ -210,19 +210,19 @@ object "A2_M" {
             }
 
             function A2_M_test_safe_transfer_from() -> $result {
-                let contract_addr, s, $t2, $t3, $t4, $t5, $t6
-                // $t2 := 42
-                $t2 := 42
-                // $t3 := true
-                $t3 := true
-                // $t4 := M::pack_S($t2, $t3)
-                $t4 := A2_M_pack_S($t2, $t3)
-                // $t5 := 0x3
-                $t5 := 0x3
-                // $t6 := M::safe_transfer_form($t5, $t4)
-                $t6 := A2_M_safe_transfer_form($t5, $t4)
-                // return $t6
-                $result := $t6
+                let s, $t1, $t2, $t3, $t4, $t5
+                // $t1 := 42
+                $t1 := 42
+                // $t2 := true
+                $t2 := true
+                // $t3 := M::pack_S($t1, $t2)
+                $t3 := A2_M_pack_S($t1, $t2)
+                // $t4 := 0x3
+                $t4 := 0x3
+                // $t5 := M::safe_transfer_form($t4, $t3)
+                $t5 := A2_M_safe_transfer_form($t4, $t3)
+                // return $t5
+                $result := $t5
             }
 
             function A2_M_safe_transfer_form(contract, s) -> $result  {
@@ -1036,135 +1036,155 @@ object "test_A2_M_test_abi_S" {
         A2_M_test_abi_S()
         return (0, 0)
         function A2_M_test_abi_S() {
-            let _s, _s2x, s, v, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61
+            let _s, s, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59
             let $locals := $Malloc(64)
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t17 := 100
-                    $t17 := 100
-                    // abort($t17)
-                    $Abort($t17)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t18 := borrow_local($t0)
-                    $t18 := $MakePtr(false, _s)
-                    // $t19 := borrow_field<M::S>.a($t18)
-                    $t19 := $IndexPtr($t18, 32)
-                    // $t20 := read_ref($t19)
-                    $t20 := $LoadU64($t19)
-                    // $t21 := 42
-                    $t21 := 42
-                    // $t22 := ==($t20, $t21)
-                    $t22 := $Eq($t20, $t21)
-                    // if ($t22) goto L2 else goto L3
-                    switch $t22
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
+                    // $t15 := 100
+                    $t15 := 100
+                    // abort($t15)
+                    $Abort($t15)
                 }
                 case 4 {
-                    // $t6 := 42
-                    $t6 := 42
-                    // $t7 := true
-                    $t7 := true
-                    // $t3 := M::pack_S($t6, $t7)
-                    s := A2_M_pack_S($t6, $t7)
-                    // $t8 := copy($t3)
-                    $t8 := s
-                    // $t9 := M::encode_S($t8)
-                    $t9 := A2_M_encode_S($t8)
-                    // $t0 := M::decode_S($t9)
-                    _s := A2_M_decode_S($t9)
-                    // $t10 := borrow_local($t3)
-                    $t10 := $MakePtr(false, s)
-                    // $t11 := borrow_field<M::S>.a($t10)
-                    $t11 := $IndexPtr($t10, 32)
-                    // $t12 := read_ref($t11)
-                    $t12 := $LoadU64($t11)
-                    // $t13 := borrow_local($t0)
-                    $t13 := $MakePtr(false, _s)
-                    // $t14 := borrow_field<M::S>.a($t13)
-                    $t14 := $IndexPtr($t13, 32)
-                    // $t15 := read_ref($t14)
-                    $t15 := $LoadU64($t14)
-                    // $t16 := ==($t12, $t15)
-                    $t16 := $Eq($t12, $t15)
-                    // if ($t16) goto L0 else goto L1
-                    switch $t16
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t4 := 42
+                    $t4 := 42
+                    // $t5 := true
+                    $t5 := true
+                    // $t2 := M::pack_S($t4, $t5)
+                    s := A2_M_pack_S($t4, $t5)
+                    // $t6 := copy($t2)
+                    $t6 := s
+                    // $t7 := M::encode_S($t6)
+                    $t7 := A2_M_encode_S($t6)
+                    // $t0 := M::decode_S($t7)
+                    _s := A2_M_decode_S($t7)
+                    // $t8 := borrow_local($t2)
+                    $t8 := $MakePtr(false, s)
+                    // $t9 := borrow_field<M::S>.a($t8)
+                    $t9 := $IndexPtr($t8, 32)
+                    // $t10 := read_ref($t9)
+                    $t10 := $LoadU64($t9)
+                    // $t11 := borrow_local($t0)
+                    $t11 := $MakePtr(false, _s)
+                    // $t12 := borrow_field<M::S>.a($t11)
+                    $t12 := $IndexPtr($t11, 32)
+                    // $t13 := read_ref($t12)
+                    $t13 := $LoadU64($t12)
+                    // $t14 := ==($t10, $t13)
+                    $t14 := $Eq($t10, $t13)
+                    // if ($t14) goto L1 else goto L0
+                    switch $t14
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
-                    // $t23 := 101
-                    $t23 := 101
-                    // abort($t23)
-                    $Abort($t23)
-                }
-                case 6 {
                     // label L2
-                    // $t24 := borrow_local($t3)
-                    $t24 := $MakePtr(false, s)
-                    // $t25 := borrow_field<M::S>.b($t24)
-                    $t25 := $IndexPtr($t24, 40)
-                    // $t26 := read_ref($t25)
-                    $t26 := $LoadU8($t25)
-                    // $t27 := borrow_local($t0)
-                    $t27 := $MakePtr(false, _s)
-                    // $t28 := borrow_field<M::S>.b($t27)
-                    $t28 := $IndexPtr($t27, 40)
-                    // $t29 := read_ref($t28)
-                    $t29 := $LoadU8($t28)
-                    // $t30 := ==($t26, $t29)
-                    $t30 := $Eq($t26, $t29)
-                    // if ($t30) goto L4 else goto L5
-                    switch $t30
+                    // $t16 := borrow_local($t0)
+                    $t16 := $MakePtr(false, _s)
+                    // $t17 := borrow_field<M::S>.a($t16)
+                    $t17 := $IndexPtr($t16, 32)
+                    // $t18 := read_ref($t17)
+                    $t18 := $LoadU64($t17)
+                    // $t19 := 42
+                    $t19 := 42
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq($t18, $t19)
+                    // if ($t20) goto L4 else goto L3
+                    switch $t20
                     case 0  { $block := 7 }
-                    default { $block := 8 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
                 }
                 case 7 {
-                    // label L5
-                    // $t31 := 102
-                    $t31 := 102
-                    // abort($t31)
-                    $Abort($t31)
+                    // label L3
+                    // $t21 := 101
+                    $t21 := 101
+                    // abort($t21)
+                    $Abort($t21)
                 }
                 case 8 {
-                    // label L4
-                    // $t32 := borrow_local($t0)
-                    $t32 := $MakePtr(false, _s)
-                    // $t33 := borrow_field<M::S>.b($t32)
-                    $t33 := $IndexPtr($t32, 40)
-                    // $t34 := read_ref($t33)
-                    $t34 := $LoadU8($t33)
-                    // $t35 := true
-                    $t35 := true
-                    // $t36 := ==($t34, $t35)
-                    $t36 := $Eq($t34, $t35)
-                    // if ($t36) goto L6 else goto L7
-                    switch $t36
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    // label L5
+                    // $t22 := borrow_local($t2)
+                    $t22 := $MakePtr(false, s)
+                    // $t23 := borrow_field<M::S>.b($t22)
+                    $t23 := $IndexPtr($t22, 40)
+                    // $t24 := read_ref($t23)
+                    $t24 := $LoadU8($t23)
+                    // $t25 := borrow_local($t0)
+                    $t25 := $MakePtr(false, _s)
+                    // $t26 := borrow_field<M::S>.b($t25)
+                    $t26 := $IndexPtr($t25, 40)
+                    // $t27 := read_ref($t26)
+                    $t27 := $LoadU8($t26)
+                    // $t28 := ==($t24, $t27)
+                    $t28 := $Eq($t24, $t27)
+                    // if ($t28) goto L7 else goto L6
+                    switch $t28
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
                 case 9 {
                     // label L7
-                    // $t37 := 103
-                    $t37 := 103
-                    // abort($t37)
-                    $Abort($t37)
+                    // goto L8
+                    $block := 11
                 }
                 case 10 {
                     // label L6
-                    // $t38 := borrow_local($t3)
-                    $t38 := $MakePtr(false, s)
-                    // $t39 := borrow_field<M::S>.c($t38)
-                    $t39 := $t38
-                    // $t4 := read_ref($t39)
-                    mstore($locals, $LoadU256($t39))
-                    if $IsStoragePtr($t39){
+                    // $t29 := 102
+                    $t29 := 102
+                    // abort($t29)
+                    $Abort($t29)
+                }
+                case 11 {
+                    // label L8
+                    // $t30 := borrow_local($t0)
+                    $t30 := $MakePtr(false, _s)
+                    // $t31 := borrow_field<M::S>.b($t30)
+                    $t31 := $IndexPtr($t30, 40)
+                    // $t32 := read_ref($t31)
+                    $t32 := $LoadU8($t31)
+                    // $t33 := true
+                    $t33 := true
+                    // $t34 := ==($t32, $t33)
+                    $t34 := $Eq($t32, $t33)
+                    // if ($t34) goto L10 else goto L9
+                    switch $t34
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t35 := 103
+                    $t35 := 103
+                    // abort($t35)
+                    $Abort($t35)
+                }
+                case 14 {
+                    // label L11
+                    // $t36 := borrow_local($t2)
+                    $t36 := $MakePtr(false, s)
+                    // $t37 := borrow_field<M::S>.c($t36)
+                    $t37 := $t36
+                    // $t3 := read_ref($t37)
+                    mstore($locals, $LoadU256($t37))
+                    if $IsStoragePtr($t37){
                         let $storage_ptr_894856441
                         let $size_894856441 := $StorageLoadU64(mload($locals))
                         let $capacity_894856441 := $ClosestGreaterPowerOfTwo($size_894856441)
@@ -1200,13 +1220,13 @@ object "test_A2_M_test_abi_S" {
                         }
                         mstore($locals, $storage_ptr_894856441)
                     }
-                    // $t40 := borrow_local($t0)
-                    $t40 := $MakePtr(false, _s)
-                    // $t41 := borrow_field<M::S>.c($t40)
-                    $t41 := $t40
-                    // $t1 := read_ref($t41)
-                    mstore(add($locals, 32), $LoadU256($t41))
-                    if $IsStoragePtr($t41){
+                    // $t38 := borrow_local($t0)
+                    $t38 := $MakePtr(false, _s)
+                    // $t39 := borrow_field<M::S>.c($t38)
+                    $t39 := $t38
+                    // $t1 := read_ref($t39)
+                    mstore(add($locals, 32), $LoadU256($t39))
+                    if $IsStoragePtr($t39){
                         let $storage_ptr_894856441
                         let $size_894856441 := $StorageLoadU64(mload(add($locals, 32)))
                         let $capacity_894856441 := $ClosestGreaterPowerOfTwo($size_894856441)
@@ -1242,82 +1262,97 @@ object "test_A2_M_test_abi_S" {
                         }
                         mstore(add($locals, 32), $storage_ptr_894856441)
                     }
-                    // $t42 := borrow_local($t4)
-                    $t42 := $MakePtr(false, $locals)
-                    // $t43 := vector::length<M::S2>($t42)
-                    $t43 := A1_vector_length$A2_M_S2$($t42)
-                    // $t44 := 1
-                    $t44 := 1
-                    // $t45 := ==($t43, $t44)
-                    $t45 := $Eq($t43, $t44)
-                    // if ($t45) goto L8 else goto L9
-                    switch $t45
-                    case 0  { $block := 11 }
-                    default { $block := 12 }
-                }
-                case 11 {
-                    // label L9
-                    // $t46 := 104
-                    $t46 := 104
-                    // abort($t46)
-                    $Abort($t46)
-                }
-                case 12 {
-                    // label L8
-                    // $t47 := borrow_local($t1)
-                    $t47 := $MakePtr(false, add($locals, 32))
-                    // $t48 := vector::length<M::S2>($t47)
-                    $t48 := A1_vector_length$A2_M_S2$($t47)
-                    // $t49 := 1
-                    $t49 := 1
-                    // $t50 := ==($t48, $t49)
-                    $t50 := $Eq($t48, $t49)
-                    // if ($t50) goto L10 else goto L11
-                    switch $t50
-                    case 0  { $block := 13 }
-                    default { $block := 14 }
-                }
-                case 13 {
-                    // label L11
-                    // $t51 := 105
-                    $t51 := 105
-                    // abort($t51)
-                    $Abort($t51)
-                }
-                case 14 {
-                    // label L10
-                    // $t52 := borrow_local($t1)
-                    $t52 := $MakePtr(false, add($locals, 32))
-                    // $t53 := 0
-                    $t53 := 0
-                    // $t54 := vector::borrow<M::S2>($t52, $t53)
-                    $t54 := A1_vector_borrow$A2_M_S2$($t52, $t53)
-                    // $t55 := borrow_field<M::S2>.x($t54)
-                    $t55 := $t54
-                    // $t56 := 0
-                    $t56 := 0
-                    // $t57 := vector::borrow<u128>($t55, $t56)
-                    $t57 := A1_vector_borrow$u128$($t55, $t56)
-                    // $t58 := read_ref($t57)
-                    $t58 := $LoadU128($t57)
-                    // $t59 := 42
-                    $t59 := 42
-                    // $t60 := ==($t58, $t59)
-                    $t60 := $Eq($t58, $t59)
-                    // if ($t60) goto L12 else goto L13
-                    switch $t60
-                    case 0  { $block := 15 }
-                    default { $block := 16 }
+                    // $t40 := borrow_local($t3)
+                    $t40 := $MakePtr(false, $locals)
+                    // $t41 := vector::length<M::S2>($t40)
+                    $t41 := A1_vector_length$A2_M_S2$($t40)
+                    // $t42 := 1
+                    $t42 := 1
+                    // $t43 := ==($t41, $t42)
+                    $t43 := $Eq($t41, $t42)
+                    // if ($t43) goto L13 else goto L12
+                    switch $t43
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
                 }
                 case 15 {
                     // label L13
-                    // $t61 := 106
-                    $t61 := 106
-                    // abort($t61)
-                    $Abort($t61)
+                    // goto L14
+                    $block := 17
                 }
                 case 16 {
                     // label L12
+                    // $t44 := 104
+                    $t44 := 104
+                    // abort($t44)
+                    $Abort($t44)
+                }
+                case 17 {
+                    // label L14
+                    // $t45 := borrow_local($t1)
+                    $t45 := $MakePtr(false, add($locals, 32))
+                    // $t46 := vector::length<M::S2>($t45)
+                    $t46 := A1_vector_length$A2_M_S2$($t45)
+                    // $t47 := 1
+                    $t47 := 1
+                    // $t48 := ==($t46, $t47)
+                    $t48 := $Eq($t46, $t47)
+                    // if ($t48) goto L16 else goto L15
+                    switch $t48
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
+                    // $t49 := 105
+                    $t49 := 105
+                    // abort($t49)
+                    $Abort($t49)
+                }
+                case 20 {
+                    // label L17
+                    // $t50 := borrow_local($t1)
+                    $t50 := $MakePtr(false, add($locals, 32))
+                    // $t51 := 0
+                    $t51 := 0
+                    // $t52 := vector::borrow<M::S2>($t50, $t51)
+                    $t52 := A1_vector_borrow$A2_M_S2$($t50, $t51)
+                    // $t53 := borrow_field<M::S2>.x($t52)
+                    $t53 := $t52
+                    // $t54 := 0
+                    $t54 := 0
+                    // $t55 := vector::borrow<u128>($t53, $t54)
+                    $t55 := A1_vector_borrow$u128$($t53, $t54)
+                    // $t56 := read_ref($t55)
+                    $t56 := $LoadU128($t55)
+                    // $t57 := 42
+                    $t57 := 42
+                    // $t58 := ==($t56, $t57)
+                    $t58 := $Eq($t56, $t57)
+                    // if ($t58) goto L19 else goto L18
+                    switch $t58
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
+                }
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
+                    // $t59 := 106
+                    $t59 := 106
+                    // abort($t59)
+                    $Abort($t59)
+                }
+                case 23 {
+                    // label L20
                     // return ()
                     $Free($locals, 64)
                     leave
@@ -1950,7 +1985,7 @@ object "test_A2_M_test_abi_S" {
         }
     }
 }
-===> Test result of M::test_abi_S: Succeed(Stopped) (used_gas=8318): []
+===> Test result of M::test_abi_S: Succeed(Stopped) (used_gas=10789): []
 
 // test of M::test_abi_String
 /* =======================================
@@ -1964,175 +1999,205 @@ object "test_A2_M_test_abi_String" {
         A2_M_test_abi_String()
         return (0, 0)
         function A2_M_test_abi_String() {
-            let _str, end, i, str, v, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37
+            let _str, end, i, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35
             let $locals := $Malloc(64)
             let $block := 3
             for {} true {} {
                 switch $block
                 case 2 {
-                    // label L5
-                    // $t9 := <($t3, $t8)
-                    $t9 := $Lt(i, $t8)
-                    // if ($t9) goto L0 else goto L2
-                    switch $t9
+                    // label L6
+                    // $t7 := <($t3, $t6)
+                    $t7 := $Lt(i, $t6)
+                    // if ($t7) goto L1 else goto L0
+                    switch $t7
                     case 0  { $block := 5 }
                     default { $block := 4 }
                 }
                 case 3 {
-                    // $t7 := 0
-                    $t7 := 0
-                    // $t3 := $t7
-                    i := $t7
-                    // $t8 := 128
-                    $t8 := 128
-                    // $t6 := vector::empty<u8>()
+                    // $t5 := 0
+                    $t5 := 0
+                    // $t3 := $t5
+                    i := $t5
+                    // $t6 := 128
+                    $t6 := 128
+                    // $t4 := vector::empty<u8>()
                     mstore($locals, A1_vector_empty$u8$())
-                    // goto L5
+                    // goto L6
                     $block := 2
                 }
                 case 4 {
-                    // label L0
-                    // $t10 := ascii::is_valid_char($t3)
-                    $t10 := A1_ascii_is_valid_char(i)
-                    // if ($t10) goto L3 else goto L4
-                    switch $t10
-                    case 0  { $block := 6 }
-                    default { $block := 7 }
+                    // label L1
+                    // goto L2
+                    $block := 6
                 }
                 case 5 {
-                    // label L2
-                    // $t14 := move($t6)
-                    $t14 := mload($locals)
-                    // $t15 := ascii::string($t14)
-                    $t15 := A1_ascii_string($t14)
-                    // $t16 := M::encode_String($t15)
-                    $t16 := A2_M_encode_String($t15)
-                    // $t0 := M::decode_String($t16)
-                    _str := A2_M_decode_String($t16)
-                    // $t17 := borrow_local($t0)
-                    $t17 := $MakePtr(false, _str)
-                    // $t18 := ascii::as_bytes($t17)
-                    $t18 := A1_ascii_as_bytes($t17)
-                    // $t19 := vector::length<u8>($t18)
-                    $t19 := A1_vector_length$u8$($t18)
-                    // $t20 := 128
-                    $t20 := 128
-                    // $t21 := ==($t19, $t20)
-                    $t21 := $Eq($t19, $t20)
-                    // if ($t21) goto L6 else goto L7
-                    switch $t21
-                    case 0  { $block := 8 }
-                    default { $block := 9 }
+                    // label L0
+                    // $t12 := move($t4)
+                    $t12 := mload($locals)
+                    // $t13 := ascii::string($t12)
+                    $t13 := A1_ascii_string($t12)
+                    // $t14 := M::encode_String($t13)
+                    $t14 := A2_M_encode_String($t13)
+                    // $t0 := M::decode_String($t14)
+                    _str := A2_M_decode_String($t14)
+                    // $t15 := borrow_local($t0)
+                    $t15 := $MakePtr(false, _str)
+                    // $t16 := ascii::as_bytes($t15)
+                    $t16 := A1_ascii_as_bytes($t15)
+                    // $t17 := vector::length<u8>($t16)
+                    $t17 := A1_vector_length$u8$($t16)
+                    // $t18 := 128
+                    $t18 := 128
+                    // $t19 := ==($t17, $t18)
+                    $t19 := $Eq($t17, $t18)
+                    // if ($t19) goto L8 else goto L7
+                    switch $t19
+                    case 0  { $block := 11 }
+                    default { $block := 10 }
                 }
                 case 6 {
-                    // label L4
-                    // $t11 := 0
-                    $t11 := 0
-                    // abort($t11)
-                    $Abort($t11)
+                    // label L2
+                    // $t8 := ascii::is_valid_char($t3)
+                    $t8 := A1_ascii_is_valid_char(i)
+                    // if ($t8) goto L4 else goto L3
+                    switch $t8
+                    case 0  { $block := 8 }
+                    default { $block := 7 }
                 }
                 case 7 {
-                    // label L3
-                    // $t12 := borrow_local($t6)
-                    $t12 := $MakePtr(false, $locals)
-                    // vector::push_back<u8>($t12, $t3)
-                    A1_vector_push_back$u8$($t12, i)
-                    // $t13 := 1
-                    $t13 := 1
-                    // $t3 := +($t3, $t13)
-                    i := $AddU8(i, $t13)
+                    // label L4
                     // goto L5
-                    $block := 2
+                    $block := 9
                 }
                 case 8 {
-                    // label L7
-                    // $t22 := 100
-                    $t22 := 100
-                    // abort($t22)
-                    $Abort($t22)
+                    // label L3
+                    // $t9 := 0
+                    $t9 := 0
+                    // abort($t9)
+                    $Abort($t9)
                 }
                 case 9 {
-                    // label L6
-                    // $t23 := move($t0)
-                    $t23 := _str
-                    // $t1 := ascii::into_bytes($t23)
-                    mstore(add($locals, 32), A1_ascii_into_bytes($t23))
-                    // $t24 := borrow_local($t1)
-                    $t24 := $MakePtr(false, add($locals, 32))
-                    // $t25 := vector::length<u8>($t24)
-                    $t25 := A1_vector_length$u8$($t24)
-                    // $t26 := 128
-                    $t26 := 128
-                    // $t27 := ==($t25, $t26)
-                    $t27 := $Eq($t25, $t26)
-                    // if ($t27) goto L8 else goto L9
-                    switch $t27
-                    case 0  { $block := 10 }
-                    default { $block := 11 }
+                    // label L5
+                    // $t10 := borrow_local($t4)
+                    $t10 := $MakePtr(false, $locals)
+                    // vector::push_back<u8>($t10, $t3)
+                    A1_vector_push_back$u8$($t10, i)
+                    // $t11 := 1
+                    $t11 := 1
+                    // $t3 := +($t3, $t11)
+                    i := $AddU8(i, $t11)
+                    // goto L6
+                    $block := 2
                 }
                 case 10 {
-                    // label L9
-                    // $t28 := 99
-                    $t28 := 99
-                    // abort($t28)
-                    $Abort($t28)
-                }
-                case 11 {
                     // label L8
-                    // $t29 := 0
-                    $t29 := 0
-                    // $t3 := $t29
-                    i := $t29
-                    // goto L15
+                    // goto L9
                     $block := 12
                 }
+                case 11 {
+                    // label L7
+                    // $t20 := 100
+                    $t20 := 100
+                    // abort($t20)
+                    $Abort($t20)
+                }
                 case 12 {
-                    // label L15
-                    // $t30 := <($t3, $t8)
-                    $t30 := $Lt(i, $t8)
-                    // if ($t30) goto L10 else goto L12
-                    switch $t30
+                    // label L9
+                    // $t21 := move($t0)
+                    $t21 := _str
+                    // $t1 := ascii::into_bytes($t21)
+                    mstore(add($locals, 32), A1_ascii_into_bytes($t21))
+                    // $t22 := borrow_local($t1)
+                    $t22 := $MakePtr(false, add($locals, 32))
+                    // $t23 := vector::length<u8>($t22)
+                    $t23 := A1_vector_length$u8$($t22)
+                    // $t24 := 128
+                    $t24 := 128
+                    // $t25 := ==($t23, $t24)
+                    $t25 := $Eq($t23, $t24)
+                    // if ($t25) goto L11 else goto L10
+                    switch $t25
                     case 0  { $block := 14 }
                     default { $block := 13 }
                 }
                 case 13 {
-                    // label L10
-                    // $t31 := borrow_local($t1)
-                    $t31 := $MakePtr(false, add($locals, 32))
-                    // $t32 := (u64)($t3)
-                    $t32 := $CastU64(i)
-                    // $t33 := vector::borrow<u8>($t31, $t32)
-                    $t33 := A1_vector_borrow$u8$($t31, $t32)
-                    // $t34 := read_ref($t33)
-                    $t34 := $LoadU8($t33)
-                    // $t35 := ==($t34, $t3)
-                    $t35 := $Eq($t34, i)
-                    // if ($t35) goto L13 else goto L14
-                    switch $t35
-                    case 0  { $block := 15 }
-                    default { $block := 16 }
+                    // label L11
+                    // goto L12
+                    $block := 15
                 }
                 case 14 {
-                    // label L12
-                    // return ()
-                    $Free($locals, 64)
-                    leave
+                    // label L10
+                    // $t26 := 99
+                    $t26 := 99
+                    // abort($t26)
+                    $Abort($t26)
                 }
                 case 15 {
-                    // label L14
-                    // $t36 := (u64)($t3)
-                    $t36 := $CastU64(i)
-                    // abort($t36)
-                    $Abort($t36)
+                    // label L12
+                    // $t27 := 0
+                    $t27 := 0
+                    // $t3 := $t27
+                    i := $t27
+                    // goto L19
+                    $block := 16
                 }
                 case 16 {
-                    // label L13
-                    // $t37 := 1
-                    $t37 := 1
-                    // $t3 := +($t3, $t37)
-                    i := $AddU8(i, $t37)
+                    // label L19
+                    // $t28 := <($t3, $t6)
+                    $t28 := $Lt(i, $t6)
+                    // if ($t28) goto L14 else goto L13
+                    switch $t28
+                    case 0  { $block := 18 }
+                    default { $block := 17 }
+                }
+                case 17 {
+                    // label L14
                     // goto L15
-                    $block := 12
+                    $block := 19
+                }
+                case 18 {
+                    // label L13
+                    // return ()
+                    $Free($locals, 64)
+                    leave
+                }
+                case 19 {
+                    // label L15
+                    // $t29 := borrow_local($t1)
+                    $t29 := $MakePtr(false, add($locals, 32))
+                    // $t30 := (u64)($t3)
+                    $t30 := $CastU64(i)
+                    // $t31 := vector::borrow<u8>($t29, $t30)
+                    $t31 := A1_vector_borrow$u8$($t29, $t30)
+                    // $t32 := read_ref($t31)
+                    $t32 := $LoadU8($t31)
+                    // $t33 := ==($t32, $t3)
+                    $t33 := $Eq($t32, i)
+                    // if ($t33) goto L17 else goto L16
+                    switch $t33
+                    case 0  { $block := 21 }
+                    default { $block := 20 }
+                }
+                case 20 {
+                    // label L17
+                    // goto L18
+                    $block := 22
+                }
+                case 21 {
+                    // label L16
+                    // $t34 := (u64)($t3)
+                    $t34 := $CastU64(i)
+                    // abort($t34)
+                    $Abort($t34)
+                }
+                case 22 {
+                    // label L18
+                    // $t35 := 1
+                    $t35 := 1
+                    // $t3 := +($t3, $t35)
+                    i := $AddU8(i, $t35)
+                    // goto L19
+                    $block := 16
                 }
             }
         }
@@ -2150,12 +2215,12 @@ object "test_A2_M_test_abi_String" {
             len := $LoadU64(v_ptr)
         }
         function A1_ascii_into_bytes(string) -> $result {
-            let bytes, $t2
-            // $t2 := unpack ascii::String($t0)
-            $t2 := $MemoryLoadU256(add(string, 0))
+            let $t1
+            // $t1 := unpack ascii::String($t0)
+            $t1 := $MemoryLoadU256(add(string, 0))
             $Free(string, 32)
-            // return $t2
-            $result := $t2
+            // return $t1
+            $result := $t1
         }
 
         function A1_vector_push_back$u8$(v_ref, e) {
@@ -2172,6 +2237,16 @@ object "test_A2_M_test_abi_String" {
                 $StoreU256(v_ref, new_v_offs)
             }
         }
+        function A1_ascii_is_valid_char(b) -> $result {
+            let $t1, $t2
+            // $t1 := 127
+            $t1 := 127
+            // $t2 := <=($t0, $t1)
+            $t2 := $LtEq(b, $t1)
+            // return $t2
+            $result := $t2
+        }
+
         function A1_ascii_as_bytes(string) -> $result {
             let $t1
             // $t1 := borrow_field<ascii::String>.bytes($t0)
@@ -2207,20 +2282,15 @@ object "test_A2_M_test_abi_String" {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t4 := 0
-                    $t4 := 0
-                    // abort($t4)
-                    $Abort($t4)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t5 := move($t1)
-                    $t5 := x
-                    // $t6 := option::destroy_some<ascii::String>($t5)
-                    $t6 := A1_option_destroy_some$A1_ascii_String$($t5)
-                    // return $t6
-                    $result := $t6
-                    leave
+                    // $t4 := 65536
+                    $t4 := 65536
+                    // abort($t4)
+                    $Abort($t4)
                 }
                 case 4 {
                     // $t1 := ascii::try_string($t0)
@@ -2229,14 +2299,114 @@ object "test_A2_M_test_abi_String" {
                     $t2 := $MakePtr(false, x)
                     // $t3 := option::is_some<ascii::String>($t2)
                     $t3 := A1_option_is_some$A1_ascii_String$($t2)
-                    // if ($t3) goto L0 else goto L1
+                    // if ($t3) goto L1 else goto L0
                     switch $t3
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t5 := move($t1)
+                    $t5 := x
+                    // $t6 := option::destroy_some<ascii::String>($t5)
+                    $t6 := A1_option_destroy_some$A1_ascii_String$($t5)
+                    // return $t6
+                    $result := $t6
+                    leave
+                }
+            }
+        }
+
+        function A1_option_destroy_some$A1_ascii_String$(t) -> $result {
+            let elem, $t3, $t4, $t5, $t6, $t7, $t8, $t9
+            let $locals := $Malloc(32)
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 262145
+                    $t5 := 262145
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, t)
+                    // $t4 := option::is_some<#0>($t3)
+                    $t4 := A1_option_is_some$A1_ascii_String$($t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := move($t0)
+                    $t6 := t
+                    // $t2 := unpack option::Option<#0>($t6)
+                    mstore($locals, $MemoryLoadU256(add($t6, 0)))
+                    $Free($t6, 32)
+                    // $t7 := borrow_local($t2)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := vector::pop_back<#0>($t7)
+                    $t8 := A1_vector_pop_back$A1_ascii_String$($t7)
+                    // $t9 := move($t2)
+                    $t9 := mload($locals)
+                    // vector::destroy_empty<#0>($t9)
+                    A1_vector_destroy_empty$A1_ascii_String$($t9)
+                    // return $t8
+                    $result := $t8
+                    $Free($locals, 32)
+                    leave
                 }
             }
         }
 
+        function A1_vector_destroy_empty$A1_ascii_String$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
+        function A1_vector_pop_back$A1_ascii_String$(v_ref) -> e {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if iszero(size) { $AbortBuiltin() }
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
+            e := $LoadU256(e_ptr)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let linked_src := $AlignedStorageLoad(e_offs)
+                e := $Malloc(32)
+                {
+                    let $linked_src_2300595445 := $AlignedStorageLoad(add(linked_src, 0))
+                    let $linked_dst_2300595445
+                    let $size_2300595445 := $StorageLoadU64($linked_src_2300595445)
+                    let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
+                    $linked_dst_2300595445 := $Malloc(add(32, mul($capacity_2300595445, 1)))
+                    let $data_size_2300595445 := mul($size_2300595445, 1)
+                    mstore($linked_dst_2300595445, $AlignedStorageLoad($linked_src_2300595445))
+                    $MemoryStoreU64(add($linked_dst_2300595445, 8), $capacity_2300595445)
+                    let $data_src_2300595445 := add($linked_src_2300595445, 32)
+                    let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                    for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                        mstore(add($data_dst_2300595445, $offs_2300595445), $AlignedStorageLoad(add($data_src_2300595445, $offs_2300595445)))
+                        $AlignedStorageStore(add($data_src_2300595445, $offs_2300595445), 0)
+                    }
+                    mstore(add(e, 0), $linked_dst_2300595445)
+                    $AlignedStorageStore(add(linked_src, 0), 0)
+                }
+                $AlignedStorageStore(e_offs, 0)
+            }
+            $StoreU64(v_ptr, sub(size, 1))
+        }
         function A1_option_is_some$A1_ascii_String$(t) -> $result {
             let $t1, $t2, $t3
             // $t1 := borrow_field<option::Option<#0>>.vec($t0)
@@ -2267,87 +2437,92 @@ object "test_A2_M_test_abi_String" {
             len := $LoadU64(v_ptr)
         }
         function A1_ascii_try_string(bytes) -> $result {
-            let i, len, possible_byte, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17
+            let i, len, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16
             let $locals := $Malloc(32)
             mstore($locals, bytes)
             let $block := 3
             for {} true {} {
                 switch $block
                 case 2 {
-                    // label L6
-                    // assert Le($t1, $t5)
+                    // label L5
+                    // assert Le($t1, $t4)
                     // assert forall j: Range(0, $t1): ascii::$is_valid_char(Index($t0, j))
-                    // $t7 := <($t1, $t5)
-                    $t7 := $Lt(i, $t5)
-                    // if ($t7) goto L0 else goto L2
-                    switch $t7
+                    // $t6 := <($t1, $t4)
+                    $t6 := $Lt(i, $t4)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
                     case 0  { $block := 5 }
                     default { $block := 4 }
                 }
                 case 3 {
-                    // $t4 := borrow_local($t0)
-                    $t4 := $MakePtr(false, $locals)
-                    // $t5 := vector::length<u8>($t4)
-                    $t5 := A1_vector_length$u8$($t4)
-                    // $t6 := 0
-                    $t6 := 0
-                    // $t1 := $t6
-                    i := $t6
-                    // goto L6
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, $locals)
+                    // $t4 := vector::length<u8>($t3)
+                    $t4 := A1_vector_length$u8$($t3)
+                    // $t5 := 0
+                    $t5 := 0
+                    // $t1 := $t5
+                    i := $t5
+                    // goto L5
                     $block := 2
                 }
                 case 4 {
-                    // label L0
-                    // $t8 := borrow_local($t0)
-                    $t8 := $MakePtr(false, $locals)
-                    // $t9 := vector::borrow<u8>($t8, $t1)
-                    $t9 := A1_vector_borrow$u8$($t8, i)
-                    // $t10 := read_ref($t9)
-                    $t10 := $LoadU8($t9)
-                    // $t11 := ascii::is_valid_char($t10)
-                    $t11 := A1_ascii_is_valid_char($t10)
-                    // $t12 := !($t11)
-                    $t12 := $LogicalNot($t11)
-                    // if ($t12) goto L3 else goto L5
-                    switch $t12
-                    case 0  { $block := 7 }
-                    default { $block := 6 }
+                    // label L1
+                    // goto L2
+                    $block := 6
                 }
                 case 5 {
-                    // label L2
-                    // assert Eq<u64>($t1, $t5)
-                    // assert forall j: Range(0, $t5): ascii::$is_valid_char(Index($t0, j))
-                    // $t15 := move($t0)
-                    $t15 := mload($locals)
-                    // $t16 := pack ascii::String($t15)
+                    // label L0
+                    // assert Eq<u64>($t1, $t4)
+                    // assert forall j: Range(0, $t4): ascii::$is_valid_char(Index($t0, j))
+                    // $t14 := move($t0)
+                    $t14 := mload($locals)
+                    // $t15 := pack ascii::String($t14)
                     {
                         let $mem := $Malloc(32)
-                        $MemoryStoreU256(add($mem, 0), $t15)
-                        $t16 := $mem
+                        $MemoryStoreU256(add($mem, 0), $t14)
+                        $t15 := $mem
                     }
-                    // $t17 := option::some<ascii::String>($t16)
-                    $t17 := A1_option_some$A1_ascii_String$($t16)
-                    // return $t17
-                    $result := $t17
+                    // $t16 := option::some<ascii::String>($t15)
+                    $t16 := A1_option_some$A1_ascii_String$($t15)
+                    // return $t16
+                    $result := $t16
                     $Free($locals, 32)
                     leave
                 }
                 case 6 {
-                    // label L3
-                    // $t13 := option::none<ascii::String>()
-                    $t13 := A1_option_none$A1_ascii_String$()
-                    // return $t13
-                    $result := $t13
+                    // label L2
+                    // $t7 := borrow_local($t0)
+                    $t7 := $MakePtr(false, $locals)
+                    // $t8 := vector::borrow<u8>($t7, $t1)
+                    $t8 := A1_vector_borrow$u8$($t7, i)
+                    // $t9 := read_ref($t8)
+                    $t9 := $LoadU8($t8)
+                    // $t10 := ascii::is_valid_char($t9)
+                    $t10 := A1_ascii_is_valid_char($t9)
+                    // $t11 := !($t10)
+                    $t11 := $LogicalNot($t10)
+                    // if ($t11) goto L4 else goto L3
+                    switch $t11
+                    case 0  { $block := 8 }
+                    default { $block := 7 }
+                }
+                case 7 {
+                    // label L4
+                    // $t12 := option::none<ascii::String>()
+                    $t12 := A1_option_none$A1_ascii_String$()
+                    // return $t12
+                    $result := $t12
                     $Free($locals, 32)
                     leave
                 }
-                case 7 {
-                    // label L5
-                    // $t14 := 1
-                    $t14 := 1
-                    // $t1 := +($t1, $t14)
-                    i := $AddU64(i, $t14)
-                    // goto L6
+                case 8 {
+                    // label L3
+                    // $t13 := 1
+                    $t13 := 1
+                    // $t1 := +($t1, $t13)
+                    i := $AddU64(i, $t13)
+                    // goto L5
                     $block := 2
                 }
             }
@@ -2435,101 +2610,6 @@ object "test_A2_M_test_abi_String" {
                 $StoreU256(v_ref, new_v_offs)
             }
         }
-        function A1_ascii_is_valid_char(b) -> $result {
-            let $t1, $t2
-            // $t1 := 127
-            $t1 := 127
-            // $t2 := <=($t0, $t1)
-            $t2 := $LtEq(b, $t1)
-            // return $t2
-            $result := $t2
-        }
-
-        function A1_option_destroy_some$A1_ascii_String$(t) -> $result {
-            let elem, $t3, $t4, $t5, $t6, $t7, $t8, $t9
-            let $locals := $Malloc(32)
-            let $block := 4
-            for {} true {} {
-                switch $block
-                case 2 {
-                    // label L1
-                    // $t5 := 1
-                    $t5 := 1
-                    // abort($t5)
-                    $Abort($t5)
-                }
-                case 3 {
-                    // label L0
-                    // $t6 := move($t0)
-                    $t6 := t
-                    // $t2 := unpack option::Option<#0>($t6)
-                    mstore($locals, $MemoryLoadU256(add($t6, 0)))
-                    $Free($t6, 32)
-                    // $t7 := borrow_local($t2)
-                    $t7 := $MakePtr(false, $locals)
-                    // $t8 := vector::pop_back<#0>($t7)
-                    $t8 := A1_vector_pop_back$A1_ascii_String$($t7)
-                    // $t9 := move($t2)
-                    $t9 := mload($locals)
-                    // vector::destroy_empty<#0>($t9)
-                    A1_vector_destroy_empty$A1_ascii_String$($t9)
-                    // return $t8
-                    $result := $t8
-                    $Free($locals, 32)
-                    leave
-                }
-                case 4 {
-                    // $t3 := borrow_local($t0)
-                    $t3 := $MakePtr(false, t)
-                    // $t4 := option::is_some<#0>($t3)
-                    $t4 := A1_option_is_some$A1_ascii_String$($t3)
-                    // if ($t4) goto L0 else goto L1
-                    switch $t4
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
-                }
-            }
-        }
-
-        function A1_vector_destroy_empty$A1_ascii_String$(v) {
-            let size := $MemoryLoadU64(v)
-            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
-            let capacity := $MemoryLoadU64(add(v, 8))
-            $Free(v, add(32, mul(capacity, 32)))
-        }
-        function A1_vector_pop_back$A1_ascii_String$(v_ref) -> e {
-            let v_offs := $LoadU256(v_ref)
-            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
-            let size := $LoadU64(v_ptr)
-            if iszero(size) { $AbortBuiltin() }
-            let e_ptr := $IndexPtr(v_ptr, add(32, mul(sub(size, 1), 32)))
-            e := $LoadU256(e_ptr)
-            if $IsStoragePtr(e_ptr) {
-                let e_offs := $OffsetPtr(e_ptr)
-                let linked_src := $AlignedStorageLoad(e_offs)
-                e := $Malloc(32)
-                {
-                    let $linked_src_2300595445 := $AlignedStorageLoad(add(linked_src, 0))
-                    let $linked_dst_2300595445
-                    let $size_2300595445 := $StorageLoadU64($linked_src_2300595445)
-                    let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
-                    $linked_dst_2300595445 := $Malloc(add(32, mul($capacity_2300595445, 1)))
-                    let $data_size_2300595445 := mul($size_2300595445, 1)
-                    mstore($linked_dst_2300595445, $AlignedStorageLoad($linked_src_2300595445))
-                    $MemoryStoreU64(add($linked_dst_2300595445, 8), $capacity_2300595445)
-                    let $data_src_2300595445 := add($linked_src_2300595445, 32)
-                    let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
-                    for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
-                        mstore(add($data_dst_2300595445, $offs_2300595445), $AlignedStorageLoad(add($data_src_2300595445, $offs_2300595445)))
-                        $AlignedStorageStore(add($data_src_2300595445, $offs_2300595445), 0)
-                    }
-                    mstore(add(e, 0), $linked_dst_2300595445)
-                    $AlignedStorageStore(add(linked_src, 0), 0)
-                }
-                $AlignedStorageStore(e_offs, 0)
-            }
-            $StoreU64(v_ptr, sub(size, 1))
-        }
         function A1_vector_empty$u8$() -> vector {
             vector := $Malloc(34)
             $MemoryStoreU64(add(vector, 8), 2)
@@ -2891,4 +2971,4 @@ object "test_A2_M_test_abi_String" {
         }
     }
 }
-===> Test result of M::test_abi_String: Succeed(Stopped) (used_gas=435789): []
+===> Test result of M::test_abi_String: Succeed(Stopped) (used_gas=646767): []
diff --git a/language/evm/move-to-yul/tests/TestExternalResult.exp b/language/evm/move-to-yul/tests/TestExternalResult.exp
index f1b5be79cc..0efdfd0066 100644
--- a/language/evm/move-to-yul/tests/TestExternalResult.exp
+++ b/language/evm/move-to-yul/tests/TestExternalResult.exp
@@ -54,30 +54,16 @@ object "test_A2_M_extract_err_data" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t8 := 102
                     $t8 := 102
                     // abort($t8)
                     $Abort($t8)
                 }
-                case 3 {
-                    // label L0
-                    // $t9 := move($t1)
-                    $t9 := v2
-                    // $t2 := ExternalResult::unwrap_err_data<u64>($t9)
-                    mstore(add($locals, 32), A2_ExternalResult_unwrap_err_data$u64$($t9))
-                    // $t10 := borrow_local($t2)
-                    $t10 := $MakePtr(false, add($locals, 32))
-                    // $t11 := vector::length<u8>($t10)
-                    $t11 := A1_vector_length$u8$($t10)
-                    // $t12 := 1
-                    $t12 := 1
-                    // $t13 := ==($t11, $t12)
-                    $t13 := $Eq($t11, $t12)
-                    // if ($t13) goto L2 else goto L3
-                    switch $t13
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t0 := vector::empty<u8>()
                     mstore($locals, A1_vector_empty$u8$())
@@ -95,20 +81,44 @@ object "test_A2_M_extract_err_data" {
                     $t6 := $MakePtr(false, v2)
                     // $t7 := ExternalResult::is_err_data<u64>($t6)
                     $t7 := A2_ExternalResult_is_err_data$u64$($t6)
-                    // if ($t7) goto L0 else goto L1
+                    // if ($t7) goto L1 else goto L0
                     switch $t7
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t9 := move($t1)
+                    $t9 := v2
+                    // $t2 := ExternalResult::unwrap_err_data<u64>($t9)
+                    mstore(add($locals, 32), A2_ExternalResult_unwrap_err_data$u64$($t9))
+                    // $t10 := borrow_local($t2)
+                    $t10 := $MakePtr(false, add($locals, 32))
+                    // $t11 := vector::length<u8>($t10)
+                    $t11 := A1_vector_length$u8$($t10)
+                    // $t12 := 1
+                    $t12 := 1
+                    // $t13 := ==($t11, $t12)
+                    $t13 := $Eq($t11, $t12)
+                    // if ($t13) goto L4 else goto L3
+                    switch $t13
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t14 := 103
                     $t14 := 103
                     // abort($t14)
                     $Abort($t14)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t15 := borrow_local($t2)
                     $t15 := $MakePtr(false, add($locals, 32))
                     // $t16 := 0
@@ -121,20 +131,25 @@ object "test_A2_M_extract_err_data" {
                     $t19 := 42
                     // $t20 := ==($t18, $t19)
                     $t20 := $Eq($t18, $t19)
-                    // if ($t20) goto L4 else goto L5
+                    // if ($t20) goto L7 else goto L6
                     switch $t20
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t21 := 104
                     $t21 := 104
                     // abort($t21)
                     $Abort($t21)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // return ()
                     $Free($locals, 64)
                     leave
@@ -149,232 +164,29 @@ object "test_A2_M_extract_err_data" {
             if $GtEq(i, size) { $AbortBuiltin() }
             e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
         }
-        function A2_ExternalResult_is_err_data$u64$(result) -> $result {
-            let $t1, $t2
-            // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.err_data($t0)
-            {
-                let $field_ptr := $IndexPtr(result, 32)
-                $t1 := $MakePtr($IsStoragePtr($field_ptr), $LoadU256($field_ptr))
-            }
-            // $t2 := option::is_some<vector<u8>>($t1)
-            $t2 := A1_option_is_some$vec$u8$$($t1)
-            // return $t2
-            $result := $t2
-        }
-
-        function A1_option_is_some$vec$u8$$(t) -> $result {
-            let $t1, $t2, $t3
-            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
-            $t1 := t
-            // $t2 := vector::is_empty<#0>($t1)
-            $t2 := A1_vector_is_empty$vec$u8$$($t1)
-            // $t3 := !($t2)
-            $t3 := $LogicalNot($t2)
-            // return $t3
-            $result := $t3
-        }
-
-        function A1_vector_is_empty$vec$u8$$(v) -> $result {
-            let $t1, $t2, $t3
-            // $t1 := vector::length<#0>($t0)
-            $t1 := A1_vector_length$vec$u8$$(v)
-            // $t2 := 0
-            $t2 := 0
-            // $t3 := ==($t1, $t2)
-            $t3 := $Eq($t1, $t2)
-            // return $t3
-            $result := $t3
-        }
-
-        function A1_vector_length$vec$u8$$(v_ref) -> len {
-            let v_offs := $LoadU256(v_ref)
-            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
-            len := $LoadU64(v_ptr)
-        }
-        function A2_M_pack_err_data$u64$(v) -> $result {
-            let $t1
-            // $t1 := ExternalResult::err_data<#0>($t0)
-            $t1 := A2_ExternalResult_err_data$u64$(v)
-            // return $t1
-            $result := $t1
-        }
-
-        function A2_ExternalResult_err_data$u64$(error) -> $result {
-            let $t1, $t2, $t3, $t4, $t5
-            // $t1 := option::none<#0>()
-            $t1 := A1_option_none$u64$()
-            // $t2 := option::some<vector<u8>>($t0)
-            $t2 := A1_option_some$vec$u8$$(error)
-            // $t3 := option::none<vector<u8>>()
-            $t3 := A1_option_none$vec$u8$$()
-            // $t4 := option::none<U256::U256>()
-            $t4 := A1_option_none$A2_U256_U256$()
-            // $t5 := pack ExternalResult::ExternalResult<#0>($t1, $t2, $t3, $t4)
-            {
-                let $mem := $Malloc(128)
-                $MemoryStoreU256(add($mem, 0), $t1)
-                $MemoryStoreU256(add($mem, 32), $t2)
-                $MemoryStoreU256(add($mem, 64), $t3)
-                $MemoryStoreU256(add($mem, 96), $t4)
-                $t5 := $mem
-            }
-            // return $t5
-            $result := $t5
-        }
-
-        function A1_option_none$A2_U256_U256$() -> $result {
-            let $t0, $t1
-            // $t0 := vector::empty<#0>()
-            $t0 := A1_vector_empty$A2_U256_U256$()
-            // $t1 := pack option::Option<#0>($t0)
-            {
-                let $mem := $Malloc(32)
-                $MemoryStoreU256(add($mem, 0), $t0)
-                $t1 := $mem
-            }
-            // return $t1
-            $result := $t1
-        }
-
-        function A1_vector_empty$A2_U256_U256$() -> vector {
-            vector := $Malloc(96)
-            $MemoryStoreU64(add(vector, 8), 2)
-        }
-        function A1_option_none$vec$u8$$() -> $result {
-            let $t0, $t1
-            // $t0 := vector::empty<#0>()
-            $t0 := A1_vector_empty$vec$u8$$()
-            // $t1 := pack option::Option<#0>($t0)
-            {
-                let $mem := $Malloc(32)
-                $MemoryStoreU256(add($mem, 0), $t0)
-                $t1 := $mem
-            }
-            // return $t1
-            $result := $t1
-        }
-
-        function A1_vector_empty$vec$u8$$() -> vector {
-            vector := $Malloc(96)
-            $MemoryStoreU64(add(vector, 8), 2)
-        }
-        function A1_option_some$vec$u8$$(e) -> $result {
-            let $t1, $t2
-            // $t1 := vector::singleton<#0>($t0)
-            $t1 := A1_vector_singleton$vec$u8$$(e)
-            // $t2 := pack option::Option<#0>($t1)
-            {
-                let $mem := $Malloc(32)
-                $MemoryStoreU256(add($mem, 0), $t1)
-                $t2 := $mem
-            }
-            // return $t2
-            $result := $t2
-        }
-
-        function A1_vector_singleton$vec$u8$$(e) -> $result {
-            let $t2, $t3
-            let $locals := $Malloc(32)
-            // $t1 := vector::empty<#0>()
-            mstore($locals, A1_vector_empty$vec$u8$$())
-            // $t2 := borrow_local($t1)
-            $t2 := $MakePtr(false, $locals)
-            // vector::push_back<#0>($t2, $t0)
-            A1_vector_push_back$vec$u8$$($t2, e)
-            // $t3 := move($t1)
-            $t3 := mload($locals)
-            // return $t3
-            $result := $t3
-            $Free($locals, 32)
-        }
-
-        function A1_vector_push_back$vec$u8$$(v_ref, e) {
-            let v_offs := $LoadU256(v_ref)
-            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
-            let size := $LoadU64(v_ptr)
-            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
-            $StoreU256(e_ptr, e)
-            if $IsStoragePtr(e_ptr) {
-                let e_offs := $OffsetPtr(e_ptr)
-                let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
-                let $size_2300595445 := $MemoryLoadU64(e)
-                let $data_size_2300595445 := mul($size_2300595445, 1)
-                $AlignedStorageStore($linked_dst_2300595445, mload(e))
-                let $data_src_2300595445 := add(e, 32)
-                let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
-                for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
-                    $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
-                    $Free(e, add($data_size_2300595445, 32))
-                }
-                $AlignedStorageStore(e_offs, $linked_dst_2300595445)
-            }
-            size := add(size, 1)
-            $StoreU64(v_ptr, size)
-            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
-            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
-                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
-                $StoreU256(v_ref, new_v_offs)
-            }
-        }
-        function A1_option_none$u64$() -> $result {
-            let $t0, $t1
-            // $t0 := vector::empty<#0>()
-            $t0 := A1_vector_empty$u64$()
-            // $t1 := pack option::Option<#0>($t0)
-            {
-                let $mem := $Malloc(32)
-                $MemoryStoreU256(add($mem, 0), $t0)
-                $t1 := $mem
-            }
-            // return $t1
-            $result := $t1
-        }
-
-        function A1_vector_empty$u64$() -> vector {
-            vector := $Malloc(48)
-            $MemoryStoreU64(add(vector, 8), 2)
-        }
-        function A1_vector_push_back$u8$(v_ref, e) {
-            let v_offs := $LoadU256(v_ref)
-            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
-            let size := $LoadU64(v_ptr)
-            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
-            $StoreU8(e_ptr, e)
-            size := add(size, 1)
-            $StoreU64(v_ptr, size)
-            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
-            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
-                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
-                $StoreU256(v_ref, new_v_offs)
-            }
-        }
-        function A1_vector_empty$u8$() -> vector {
-            vector := $Malloc(34)
-            $MemoryStoreU64(add(vector, 8), 2)
-        }
         function A1_vector_length$u8$(v_ref) -> len {
             let v_offs := $LoadU256(v_ref)
             let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
             len := $LoadU64(v_ptr)
         }
         function A2_ExternalResult_unwrap_err_data$u64$(result) -> $result {
-            let err_data, err_reason, panic_code, value, $t5, $t6, $t7, $t8, $t9
-            // ($t5, $t6, $t7, $t8) := unpack ExternalResult::ExternalResult<#0>($t0)
-            $t5 := $MemoryLoadU256(add(result, 0))
-            $t6 := $MemoryLoadU256(add(result, 32))
-            $t7 := $MemoryLoadU256(add(result, 64))
-            $t8 := $MemoryLoadU256(add(result, 96))
+            let err_data, err_reason, panic_code, $t4, $t5, $t6, $t7, $t8
+            // ($t4, $t5, $t6, $t7) := unpack ExternalResult::ExternalResult<#0>($t0)
+            $t4 := $MemoryLoadU256(add(result, 0))
+            $t5 := $MemoryLoadU256(add(result, 32))
+            $t6 := $MemoryLoadU256(add(result, 64))
+            $t7 := $MemoryLoadU256(add(result, 96))
             $Free(result, 128)
-            // option::destroy_none<#0>($t5)
-            A1_option_destroy_none$u64$($t5)
-            // option::destroy_none<vector<u8>>($t7)
-            A1_option_destroy_none$vec$u8$$($t7)
-            // option::destroy_none<U256::U256>($t8)
-            A1_option_destroy_none$A2_U256_U256$($t8)
-            // $t9 := option::destroy_some<vector<u8>>($t6)
-            $t9 := A1_option_destroy_some$vec$u8$$($t6)
-            // return $t9
-            $result := $t9
+            // option::destroy_none<#0>($t4)
+            A1_option_destroy_none$u64$($t4)
+            // option::destroy_none<vector<u8>>($t6)
+            A1_option_destroy_none$vec$u8$$($t6)
+            // option::destroy_none<U256::U256>($t7)
+            A1_option_destroy_none$A2_U256_U256$($t7)
+            // $t8 := option::destroy_some<vector<u8>>($t5)
+            $t8 := A1_option_destroy_some$vec$u8$$($t5)
+            // return $t8
+            $result := $t8
         }
 
         function A1_option_destroy_some$vec$u8$$(t) -> $result {
@@ -385,13 +197,28 @@ object "test_A2_M_extract_err_data" {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t5 := 1
-                    $t5 := 1
-                    // abort($t5)
-                    $Abort($t5)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
+                    // $t5 := 262145
+                    $t5 := 262145
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, t)
+                    // $t4 := option::is_some<#0>($t3)
+                    $t4 := A1_option_is_some$vec$u8$$($t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
                     // $t6 := move($t0)
                     $t6 := t
                     // $t2 := unpack option::Option<#0>($t6)
@@ -410,16 +237,6 @@ object "test_A2_M_extract_err_data" {
                     $Free($locals, 32)
                     leave
                 }
-                case 4 {
-                    // $t3 := borrow_local($t0)
-                    $t3 := $MakePtr(false, t)
-                    // $t4 := option::is_some<#0>($t3)
-                    $t4 := A1_option_is_some$vec$u8$$($t3)
-                    // if ($t4) goto L0 else goto L1
-                    switch $t4
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
-                }
             }
         }
 
@@ -455,43 +272,83 @@ object "test_A2_M_extract_err_data" {
             }
             $StoreU64(v_ptr, sub(size, 1))
         }
+        function A1_option_is_some$vec$u8$$(t) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$vec$u8$$($t1)
+            // $t3 := !($t2)
+            $t3 := $LogicalNot($t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_is_empty$vec$u8$$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$vec$u8$$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$vec$u8$$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
         function A1_option_destroy_none$A2_U256_U256$(t) {
-            let vec, $t2, $t3, $t4, $t5, $t6
+            let $t1, $t2, $t3, $t4, $t5
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t4 := 0
-                    $t4 := 0
-                    // abort($t4)
-                    $Abort($t4)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t5 := move($t0)
-                    $t5 := t
-                    // $t6 := unpack option::Option<#0>($t5)
-                    $t6 := $MemoryLoadU256(add($t5, 0))
-                    $Free($t5, 32)
-                    // vector::destroy_empty<#0>($t6)
-                    A1_vector_destroy_empty$A2_U256_U256$($t6)
-                    // return ()
-                    leave
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
                 }
                 case 4 {
-                    // $t2 := borrow_local($t0)
-                    $t2 := $MakePtr(false, t)
-                    // $t3 := option::is_none<#0>($t2)
-                    $t3 := A1_option_is_none$A2_U256_U256$($t2)
-                    // if ($t3) goto L0 else goto L1
-                    switch $t3
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$A2_U256_U256$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$A2_U256_U256$($t5)
+                    // return ()
+                    leave
                 }
             }
         }
 
+        function A1_vector_destroy_empty$A2_U256_U256$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
         function A1_option_is_none$A2_U256_U256$(t) -> $result {
             let $t1, $t2
             // $t1 := borrow_field<option::Option<#0>>.vec($t0)
@@ -519,45 +376,44 @@ object "test_A2_M_extract_err_data" {
             let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
             len := $LoadU64(v_ptr)
         }
-        function A1_vector_destroy_empty$A2_U256_U256$(v) {
-            let size := $MemoryLoadU64(v)
-            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
-            let capacity := $MemoryLoadU64(add(v, 8))
-            $Free(v, add(32, mul(capacity, 32)))
-        }
         function A1_option_destroy_none$vec$u8$$(t) {
-            let vec, $t2, $t3, $t4, $t5, $t6
+            let $t1, $t2, $t3, $t4, $t5
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t4 := 0
-                    $t4 := 0
-                    // abort($t4)
-                    $Abort($t4)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t5 := move($t0)
-                    $t5 := t
-                    // $t6 := unpack option::Option<#0>($t5)
-                    $t6 := $MemoryLoadU256(add($t5, 0))
-                    $Free($t5, 32)
-                    // vector::destroy_empty<#0>($t6)
-                    A1_vector_destroy_empty$vec$u8$$($t6)
-                    // return ()
-                    leave
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
                 }
                 case 4 {
-                    // $t2 := borrow_local($t0)
-                    $t2 := $MakePtr(false, t)
-                    // $t3 := option::is_none<#0>($t2)
-                    $t3 := A1_option_is_none$vec$u8$$($t2)
-                    // if ($t3) goto L0 else goto L1
-                    switch $t3
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$vec$u8$$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$vec$u8$$($t5)
+                    // return ()
+                    leave
                 }
             }
         }
@@ -573,42 +429,53 @@ object "test_A2_M_extract_err_data" {
         }
 
         function A1_option_destroy_none$u64$(t) {
-            let vec, $t2, $t3, $t4, $t5, $t6
+            let $t1, $t2, $t3, $t4, $t5
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t4 := 0
-                    $t4 := 0
-                    // abort($t4)
-                    $Abort($t4)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t5 := move($t0)
-                    $t5 := t
-                    // $t6 := unpack option::Option<#0>($t5)
-                    $t6 := $MemoryLoadU256(add($t5, 0))
-                    $Free($t5, 32)
-                    // vector::destroy_empty<#0>($t6)
-                    A1_vector_destroy_empty$u64$($t6)
-                    // return ()
-                    leave
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
                 }
                 case 4 {
-                    // $t2 := borrow_local($t0)
-                    $t2 := $MakePtr(false, t)
-                    // $t3 := option::is_none<#0>($t2)
-                    $t3 := A1_option_is_none$u64$($t2)
-                    // if ($t3) goto L0 else goto L1
-                    switch $t3
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$u64$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$u64$($t5)
+                    // return ()
+                    leave
                 }
             }
         }
 
+        function A1_vector_destroy_empty$u64$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 8)))
+        }
         function A1_option_is_none$u64$(t) -> $result {
             let $t1, $t2
             // $t1 := borrow_field<option::Option<#0>>.vec($t0)
@@ -636,11 +503,179 @@ object "test_A2_M_extract_err_data" {
             let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
             len := $LoadU64(v_ptr)
         }
-        function A1_vector_destroy_empty$u64$(v) {
-            let size := $MemoryLoadU64(v)
-            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
-            let capacity := $MemoryLoadU64(add(v, 8))
-            $Free(v, add(32, mul(capacity, 8)))
+        function A2_ExternalResult_is_err_data$u64$(result) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.err_data($t0)
+            {
+                let $field_ptr := $IndexPtr(result, 32)
+                $t1 := $MakePtr($IsStoragePtr($field_ptr), $LoadU256($field_ptr))
+            }
+            // $t2 := option::is_some<vector<u8>>($t1)
+            $t2 := A1_option_is_some$vec$u8$$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A2_M_pack_err_data$u64$(v) -> $result {
+            let $t1
+            // $t1 := ExternalResult::err_data<#0>($t0)
+            $t1 := A2_ExternalResult_err_data$u64$(v)
+            // return $t1
+            $result := $t1
+        }
+
+        function A2_ExternalResult_err_data$u64$(error) -> $result {
+            let $t1, $t2, $t3, $t4, $t5
+            // $t1 := option::none<#0>()
+            $t1 := A1_option_none$u64$()
+            // $t2 := option::some<vector<u8>>($t0)
+            $t2 := A1_option_some$vec$u8$$(error)
+            // $t3 := option::none<vector<u8>>()
+            $t3 := A1_option_none$vec$u8$$()
+            // $t4 := option::none<U256::U256>()
+            $t4 := A1_option_none$A2_U256_U256$()
+            // $t5 := pack ExternalResult::ExternalResult<#0>($t1, $t2, $t3, $t4)
+            {
+                let $mem := $Malloc(128)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $MemoryStoreU256(add($mem, 32), $t2)
+                $MemoryStoreU256(add($mem, 64), $t3)
+                $MemoryStoreU256(add($mem, 96), $t4)
+                $t5 := $mem
+            }
+            // return $t5
+            $result := $t5
+        }
+
+        function A1_option_none$A2_U256_U256$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$A2_U256_U256$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$A2_U256_U256$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_none$vec$u8$$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$vec$u8$$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$vec$u8$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_some$vec$u8$$(e) -> $result {
+            let $t1, $t2
+            // $t1 := vector::singleton<#0>($t0)
+            $t1 := A1_vector_singleton$vec$u8$$(e)
+            // $t2 := pack option::Option<#0>($t1)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $t2 := $mem
+            }
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_singleton$vec$u8$$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$vec$u8$$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$vec$u8$$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$vec$u8$$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                let $size_2300595445 := $MemoryLoadU64(e)
+                let $data_size_2300595445 := mul($size_2300595445, 1)
+                $AlignedStorageStore($linked_dst_2300595445, mload(e))
+                let $data_src_2300595445 := add(e, 32)
+                let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                    $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                    $Free(e, add($data_size_2300595445, 32))
+                }
+                $AlignedStorageStore(e_offs, $linked_dst_2300595445)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_option_none$u64$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$u64$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
         }
         function $Abort(code) {
             mstore(0, code)
@@ -909,7 +944,7 @@ object "test_A2_M_extract_err_data" {
         }
     }
 }
-===> Test result of M::extract_err_data: Succeed(Stopped) (used_gas=6011): []
+===> Test result of M::extract_err_data: Succeed(Stopped) (used_gas=6994): []
 
 // test of M::extract_err_reason
 /* =======================================
@@ -930,30 +965,16 @@ object "test_A2_M_extract_err_reason" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t8 := 105
                     $t8 := 105
                     // abort($t8)
                     $Abort($t8)
                 }
-                case 3 {
-                    // label L0
-                    // $t9 := move($t1)
-                    $t9 := v2
-                    // $t2 := ExternalResult::unwrap_err_reason<u64>($t9)
-                    mstore(add($locals, 32), A2_ExternalResult_unwrap_err_reason$u64$($t9))
-                    // $t10 := borrow_local($t2)
-                    $t10 := $MakePtr(false, add($locals, 32))
-                    // $t11 := vector::length<u8>($t10)
-                    $t11 := A1_vector_length$u8$($t10)
-                    // $t12 := 1
-                    $t12 := 1
-                    // $t13 := ==($t11, $t12)
-                    $t13 := $Eq($t11, $t12)
-                    // if ($t13) goto L2 else goto L3
-                    switch $t13
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t0 := vector::empty<u8>()
                     mstore($locals, A1_vector_empty$u8$())
@@ -971,20 +992,44 @@ object "test_A2_M_extract_err_reason" {
                     $t6 := $MakePtr(false, v2)
                     // $t7 := ExternalResult::is_err_reason<u64>($t6)
                     $t7 := A2_ExternalResult_is_err_reason$u64$($t6)
-                    // if ($t7) goto L0 else goto L1
+                    // if ($t7) goto L1 else goto L0
                     switch $t7
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t9 := move($t1)
+                    $t9 := v2
+                    // $t2 := ExternalResult::unwrap_err_reason<u64>($t9)
+                    mstore(add($locals, 32), A2_ExternalResult_unwrap_err_reason$u64$($t9))
+                    // $t10 := borrow_local($t2)
+                    $t10 := $MakePtr(false, add($locals, 32))
+                    // $t11 := vector::length<u8>($t10)
+                    $t11 := A1_vector_length$u8$($t10)
+                    // $t12 := 1
+                    $t12 := 1
+                    // $t13 := ==($t11, $t12)
+                    $t13 := $Eq($t11, $t12)
+                    // if ($t13) goto L4 else goto L3
+                    switch $t13
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t14 := 106
                     $t14 := 106
                     // abort($t14)
                     $Abort($t14)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t15 := borrow_local($t2)
                     $t15 := $MakePtr(false, add($locals, 32))
                     // $t16 := 0
@@ -997,236 +1042,38 @@ object "test_A2_M_extract_err_reason" {
                     $t19 := 42
                     // $t20 := ==($t18, $t19)
                     $t20 := $Eq($t18, $t19)
-                    // if ($t20) goto L4 else goto L5
+                    // if ($t20) goto L7 else goto L6
                     switch $t20
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t21 := 107
                     $t21 := 107
                     // abort($t21)
                     $Abort($t21)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // return ()
-                    $Free($locals, 64)
-                    leave
-                }
-            }
-        }
-
-        function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
-            let v_offs := $LoadU256(v_ref)
-            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
-            let size := $LoadU64(v_ptr)
-            if $GtEq(i, size) { $AbortBuiltin() }
-            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
-        }
-        function A2_ExternalResult_is_err_reason$u64$(result) -> $result {
-            let $t1, $t2
-            // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.err_reason($t0)
-            {
-                let $field_ptr := $IndexPtr(result, 64)
-                $t1 := $MakePtr($IsStoragePtr($field_ptr), $LoadU256($field_ptr))
-            }
-            // $t2 := option::is_some<vector<u8>>($t1)
-            $t2 := A1_option_is_some$vec$u8$$($t1)
-            // return $t2
-            $result := $t2
-        }
-
-        function A1_option_is_some$vec$u8$$(t) -> $result {
-            let $t1, $t2, $t3
-            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
-            $t1 := t
-            // $t2 := vector::is_empty<#0>($t1)
-            $t2 := A1_vector_is_empty$vec$u8$$($t1)
-            // $t3 := !($t2)
-            $t3 := $LogicalNot($t2)
-            // return $t3
-            $result := $t3
-        }
-
-        function A1_vector_is_empty$vec$u8$$(v) -> $result {
-            let $t1, $t2, $t3
-            // $t1 := vector::length<#0>($t0)
-            $t1 := A1_vector_length$vec$u8$$(v)
-            // $t2 := 0
-            $t2 := 0
-            // $t3 := ==($t1, $t2)
-            $t3 := $Eq($t1, $t2)
-            // return $t3
-            $result := $t3
-        }
-
-        function A1_vector_length$vec$u8$$(v_ref) -> len {
-            let v_offs := $LoadU256(v_ref)
-            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
-            len := $LoadU64(v_ptr)
-        }
-        function A2_M_pack_err_reason$u64$(v) -> $result {
-            let $t1
-            // $t1 := ExternalResult::err_reason<#0>($t0)
-            $t1 := A2_ExternalResult_err_reason$u64$(v)
-            // return $t1
-            $result := $t1
-        }
-
-        function A2_ExternalResult_err_reason$u64$(error) -> $result {
-            let tmp_$1, tmp_$2, tmp_$3, tmp_$4, $t5, $t6, $t7, $t8, $t9
-            // $t5 := option::none<#0>()
-            $t5 := A1_option_none$u64$()
-            // $t6 := option::some<vector<u8>>($t0)
-            $t6 := A1_option_some$vec$u8$$(error)
-            // $t7 := option::none<vector<u8>>()
-            $t7 := A1_option_none$vec$u8$$()
-            // $t8 := option::none<U256::U256>()
-            $t8 := A1_option_none$A2_U256_U256$()
-            // $t9 := pack ExternalResult::ExternalResult<#0>($t5, $t7, $t6, $t8)
-            {
-                let $mem := $Malloc(128)
-                $MemoryStoreU256(add($mem, 0), $t5)
-                $MemoryStoreU256(add($mem, 32), $t7)
-                $MemoryStoreU256(add($mem, 64), $t6)
-                $MemoryStoreU256(add($mem, 96), $t8)
-                $t9 := $mem
-            }
-            // return $t9
-            $result := $t9
-        }
-
-        function A1_option_none$A2_U256_U256$() -> $result {
-            let $t0, $t1
-            // $t0 := vector::empty<#0>()
-            $t0 := A1_vector_empty$A2_U256_U256$()
-            // $t1 := pack option::Option<#0>($t0)
-            {
-                let $mem := $Malloc(32)
-                $MemoryStoreU256(add($mem, 0), $t0)
-                $t1 := $mem
-            }
-            // return $t1
-            $result := $t1
-        }
-
-        function A1_vector_empty$A2_U256_U256$() -> vector {
-            vector := $Malloc(96)
-            $MemoryStoreU64(add(vector, 8), 2)
-        }
-        function A1_option_none$vec$u8$$() -> $result {
-            let $t0, $t1
-            // $t0 := vector::empty<#0>()
-            $t0 := A1_vector_empty$vec$u8$$()
-            // $t1 := pack option::Option<#0>($t0)
-            {
-                let $mem := $Malloc(32)
-                $MemoryStoreU256(add($mem, 0), $t0)
-                $t1 := $mem
-            }
-            // return $t1
-            $result := $t1
-        }
-
-        function A1_vector_empty$vec$u8$$() -> vector {
-            vector := $Malloc(96)
-            $MemoryStoreU64(add(vector, 8), 2)
-        }
-        function A1_option_some$vec$u8$$(e) -> $result {
-            let $t1, $t2
-            // $t1 := vector::singleton<#0>($t0)
-            $t1 := A1_vector_singleton$vec$u8$$(e)
-            // $t2 := pack option::Option<#0>($t1)
-            {
-                let $mem := $Malloc(32)
-                $MemoryStoreU256(add($mem, 0), $t1)
-                $t2 := $mem
-            }
-            // return $t2
-            $result := $t2
-        }
-
-        function A1_vector_singleton$vec$u8$$(e) -> $result {
-            let $t2, $t3
-            let $locals := $Malloc(32)
-            // $t1 := vector::empty<#0>()
-            mstore($locals, A1_vector_empty$vec$u8$$())
-            // $t2 := borrow_local($t1)
-            $t2 := $MakePtr(false, $locals)
-            // vector::push_back<#0>($t2, $t0)
-            A1_vector_push_back$vec$u8$$($t2, e)
-            // $t3 := move($t1)
-            $t3 := mload($locals)
-            // return $t3
-            $result := $t3
-            $Free($locals, 32)
-        }
-
-        function A1_vector_push_back$vec$u8$$(v_ref, e) {
-            let v_offs := $LoadU256(v_ref)
-            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
-            let size := $LoadU64(v_ptr)
-            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
-            $StoreU256(e_ptr, e)
-            if $IsStoragePtr(e_ptr) {
-                let e_offs := $OffsetPtr(e_ptr)
-                let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
-                let $size_2300595445 := $MemoryLoadU64(e)
-                let $data_size_2300595445 := mul($size_2300595445, 1)
-                $AlignedStorageStore($linked_dst_2300595445, mload(e))
-                let $data_src_2300595445 := add(e, 32)
-                let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
-                for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
-                    $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
-                    $Free(e, add($data_size_2300595445, 32))
-                }
-                $AlignedStorageStore(e_offs, $linked_dst_2300595445)
-            }
-            size := add(size, 1)
-            $StoreU64(v_ptr, size)
-            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
-            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
-                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
-                $StoreU256(v_ref, new_v_offs)
-            }
-        }
-        function A1_option_none$u64$() -> $result {
-            let $t0, $t1
-            // $t0 := vector::empty<#0>()
-            $t0 := A1_vector_empty$u64$()
-            // $t1 := pack option::Option<#0>($t0)
-            {
-                let $mem := $Malloc(32)
-                $MemoryStoreU256(add($mem, 0), $t0)
-                $t1 := $mem
+                    $Free($locals, 64)
+                    leave
+                }
             }
-            // return $t1
-            $result := $t1
         }
 
-        function A1_vector_empty$u64$() -> vector {
-            vector := $Malloc(48)
-            $MemoryStoreU64(add(vector, 8), 2)
-        }
-        function A1_vector_push_back$u8$(v_ref, e) {
+        function A1_vector_borrow$u8$(v_ref, i) -> e_ptr {
             let v_offs := $LoadU256(v_ref)
             let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
             let size := $LoadU64(v_ptr)
-            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
-            $StoreU8(e_ptr, e)
-            size := add(size, 1)
-            $StoreU64(v_ptr, size)
-            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
-            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
-                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
-                $StoreU256(v_ref, new_v_offs)
-            }
-        }
-        function A1_vector_empty$u8$() -> vector {
-            vector := $Malloc(34)
-            $MemoryStoreU64(add(vector, 8), 2)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 1)))
         }
         function A1_vector_length$u8$(v_ref) -> len {
             let v_offs := $LoadU256(v_ref)
@@ -1234,23 +1081,23 @@ object "test_A2_M_extract_err_reason" {
             len := $LoadU64(v_ptr)
         }
         function A2_ExternalResult_unwrap_err_reason$u64$(result) -> $result {
-            let err_data, err_reason, panic_code, value, $t5, $t6, $t7, $t8, $t9
-            // ($t5, $t6, $t7, $t8) := unpack ExternalResult::ExternalResult<#0>($t0)
-            $t5 := $MemoryLoadU256(add(result, 0))
-            $t6 := $MemoryLoadU256(add(result, 32))
-            $t7 := $MemoryLoadU256(add(result, 64))
-            $t8 := $MemoryLoadU256(add(result, 96))
+            let err_data, err_reason, panic_code, $t4, $t5, $t6, $t7, $t8
+            // ($t4, $t5, $t6, $t7) := unpack ExternalResult::ExternalResult<#0>($t0)
+            $t4 := $MemoryLoadU256(add(result, 0))
+            $t5 := $MemoryLoadU256(add(result, 32))
+            $t6 := $MemoryLoadU256(add(result, 64))
+            $t7 := $MemoryLoadU256(add(result, 96))
             $Free(result, 128)
-            // option::destroy_none<#0>($t5)
-            A1_option_destroy_none$u64$($t5)
-            // option::destroy_none<vector<u8>>($t6)
-            A1_option_destroy_none$vec$u8$$($t6)
-            // option::destroy_none<U256::U256>($t8)
-            A1_option_destroy_none$A2_U256_U256$($t8)
-            // $t9 := option::destroy_some<vector<u8>>($t7)
-            $t9 := A1_option_destroy_some$vec$u8$$($t7)
-            // return $t9
-            $result := $t9
+            // option::destroy_none<#0>($t4)
+            A1_option_destroy_none$u64$($t4)
+            // option::destroy_none<vector<u8>>($t5)
+            A1_option_destroy_none$vec$u8$$($t5)
+            // option::destroy_none<U256::U256>($t7)
+            A1_option_destroy_none$A2_U256_U256$($t7)
+            // $t8 := option::destroy_some<vector<u8>>($t6)
+            $t8 := A1_option_destroy_some$vec$u8$$($t6)
+            // return $t8
+            $result := $t8
         }
 
         function A1_option_destroy_some$vec$u8$$(t) -> $result {
@@ -1261,13 +1108,28 @@ object "test_A2_M_extract_err_reason" {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t5 := 1
-                    $t5 := 1
-                    // abort($t5)
-                    $Abort($t5)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
+                    // $t5 := 262145
+                    $t5 := 262145
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, t)
+                    // $t4 := option::is_some<#0>($t3)
+                    $t4 := A1_option_is_some$vec$u8$$($t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
                     // $t6 := move($t0)
                     $t6 := t
                     // $t2 := unpack option::Option<#0>($t6)
@@ -1286,16 +1148,6 @@ object "test_A2_M_extract_err_reason" {
                     $Free($locals, 32)
                     leave
                 }
-                case 4 {
-                    // $t3 := borrow_local($t0)
-                    $t3 := $MakePtr(false, t)
-                    // $t4 := option::is_some<#0>($t3)
-                    $t4 := A1_option_is_some$vec$u8$$($t3)
-                    // if ($t4) goto L0 else goto L1
-                    switch $t4
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
-                }
             }
         }
 
@@ -1331,43 +1183,83 @@ object "test_A2_M_extract_err_reason" {
             }
             $StoreU64(v_ptr, sub(size, 1))
         }
+        function A1_option_is_some$vec$u8$$(t) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$vec$u8$$($t1)
+            // $t3 := !($t2)
+            $t3 := $LogicalNot($t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_is_empty$vec$u8$$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$vec$u8$$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$vec$u8$$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
         function A1_option_destroy_none$A2_U256_U256$(t) {
-            let vec, $t2, $t3, $t4, $t5, $t6
+            let $t1, $t2, $t3, $t4, $t5
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t4 := 0
-                    $t4 := 0
-                    // abort($t4)
-                    $Abort($t4)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t5 := move($t0)
-                    $t5 := t
-                    // $t6 := unpack option::Option<#0>($t5)
-                    $t6 := $MemoryLoadU256(add($t5, 0))
-                    $Free($t5, 32)
-                    // vector::destroy_empty<#0>($t6)
-                    A1_vector_destroy_empty$A2_U256_U256$($t6)
-                    // return ()
-                    leave
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
                 }
                 case 4 {
-                    // $t2 := borrow_local($t0)
-                    $t2 := $MakePtr(false, t)
-                    // $t3 := option::is_none<#0>($t2)
-                    $t3 := A1_option_is_none$A2_U256_U256$($t2)
-                    // if ($t3) goto L0 else goto L1
-                    switch $t3
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$A2_U256_U256$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$A2_U256_U256$($t5)
+                    // return ()
+                    leave
                 }
             }
         }
 
+        function A1_vector_destroy_empty$A2_U256_U256$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
         function A1_option_is_none$A2_U256_U256$(t) -> $result {
             let $t1, $t2
             // $t1 := borrow_field<option::Option<#0>>.vec($t0)
@@ -1395,45 +1287,44 @@ object "test_A2_M_extract_err_reason" {
             let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
             len := $LoadU64(v_ptr)
         }
-        function A1_vector_destroy_empty$A2_U256_U256$(v) {
-            let size := $MemoryLoadU64(v)
-            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
-            let capacity := $MemoryLoadU64(add(v, 8))
-            $Free(v, add(32, mul(capacity, 32)))
-        }
         function A1_option_destroy_none$vec$u8$$(t) {
-            let vec, $t2, $t3, $t4, $t5, $t6
+            let $t1, $t2, $t3, $t4, $t5
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t4 := 0
-                    $t4 := 0
-                    // abort($t4)
-                    $Abort($t4)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t5 := move($t0)
-                    $t5 := t
-                    // $t6 := unpack option::Option<#0>($t5)
-                    $t6 := $MemoryLoadU256(add($t5, 0))
-                    $Free($t5, 32)
-                    // vector::destroy_empty<#0>($t6)
-                    A1_vector_destroy_empty$vec$u8$$($t6)
-                    // return ()
-                    leave
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
                 }
                 case 4 {
-                    // $t2 := borrow_local($t0)
-                    $t2 := $MakePtr(false, t)
-                    // $t3 := option::is_none<#0>($t2)
-                    $t3 := A1_option_is_none$vec$u8$$($t2)
-                    // if ($t3) goto L0 else goto L1
-                    switch $t3
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$vec$u8$$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$vec$u8$$($t5)
+                    // return ()
+                    leave
                 }
             }
         }
@@ -1449,42 +1340,53 @@ object "test_A2_M_extract_err_reason" {
         }
 
         function A1_option_destroy_none$u64$(t) {
-            let vec, $t2, $t3, $t4, $t5, $t6
+            let $t1, $t2, $t3, $t4, $t5
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t4 := 0
-                    $t4 := 0
-                    // abort($t4)
-                    $Abort($t4)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t5 := move($t0)
-                    $t5 := t
-                    // $t6 := unpack option::Option<#0>($t5)
-                    $t6 := $MemoryLoadU256(add($t5, 0))
-                    $Free($t5, 32)
-                    // vector::destroy_empty<#0>($t6)
-                    A1_vector_destroy_empty$u64$($t6)
-                    // return ()
-                    leave
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
                 }
                 case 4 {
-                    // $t2 := borrow_local($t0)
-                    $t2 := $MakePtr(false, t)
-                    // $t3 := option::is_none<#0>($t2)
-                    $t3 := A1_option_is_none$u64$($t2)
-                    // if ($t3) goto L0 else goto L1
-                    switch $t3
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$u64$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$u64$($t5)
+                    // return ()
+                    leave
                 }
             }
         }
 
+        function A1_vector_destroy_empty$u64$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 8)))
+        }
         function A1_option_is_none$u64$(t) -> $result {
             let $t1, $t2
             // $t1 := borrow_field<option::Option<#0>>.vec($t0)
@@ -1495,28 +1397,196 @@ object "test_A2_M_extract_err_reason" {
             $result := $t2
         }
 
-        function A1_vector_is_empty$u64$(v) -> $result {
-            let $t1, $t2, $t3
-            // $t1 := vector::length<#0>($t0)
-            $t1 := A1_vector_length$u64$(v)
-            // $t2 := 0
-            $t2 := 0
-            // $t3 := ==($t1, $t2)
-            $t3 := $Eq($t1, $t2)
+        function A1_vector_is_empty$u64$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$u64$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_ExternalResult_is_err_reason$u64$(result) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.err_reason($t0)
+            {
+                let $field_ptr := $IndexPtr(result, 64)
+                $t1 := $MakePtr($IsStoragePtr($field_ptr), $LoadU256($field_ptr))
+            }
+            // $t2 := option::is_some<vector<u8>>($t1)
+            $t2 := A1_option_is_some$vec$u8$$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A2_M_pack_err_reason$u64$(v) -> $result {
+            let $t1
+            // $t1 := ExternalResult::err_reason<#0>($t0)
+            $t1 := A2_ExternalResult_err_reason$u64$(v)
+            // return $t1
+            $result := $t1
+        }
+
+        function A2_ExternalResult_err_reason$u64$(error) -> $result {
+            let tmp_$1, tmp_$2, tmp_$3, tmp_$4, $t5, $t6, $t7, $t8, $t9
+            // $t5 := option::none<#0>()
+            $t5 := A1_option_none$u64$()
+            // $t6 := option::some<vector<u8>>($t0)
+            $t6 := A1_option_some$vec$u8$$(error)
+            // $t7 := option::none<vector<u8>>()
+            $t7 := A1_option_none$vec$u8$$()
+            // $t8 := option::none<U256::U256>()
+            $t8 := A1_option_none$A2_U256_U256$()
+            // $t9 := pack ExternalResult::ExternalResult<#0>($t5, $t7, $t6, $t8)
+            {
+                let $mem := $Malloc(128)
+                $MemoryStoreU256(add($mem, 0), $t5)
+                $MemoryStoreU256(add($mem, 32), $t7)
+                $MemoryStoreU256(add($mem, 64), $t6)
+                $MemoryStoreU256(add($mem, 96), $t8)
+                $t9 := $mem
+            }
+            // return $t9
+            $result := $t9
+        }
+
+        function A1_option_none$A2_U256_U256$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$A2_U256_U256$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$A2_U256_U256$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_none$vec$u8$$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$vec$u8$$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$vec$u8$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_some$vec$u8$$(e) -> $result {
+            let $t1, $t2
+            // $t1 := vector::singleton<#0>($t0)
+            $t1 := A1_vector_singleton$vec$u8$$(e)
+            // $t2 := pack option::Option<#0>($t1)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $t2 := $mem
+            }
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_singleton$vec$u8$$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$vec$u8$$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$vec$u8$$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
             // return $t3
             $result := $t3
+            $Free($locals, 32)
         }
 
-        function A1_vector_length$u64$(v_ref) -> len {
+        function A1_vector_push_back$vec$u8$$(v_ref, e) {
             let v_offs := $LoadU256(v_ref)
             let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
-            len := $LoadU64(v_ptr)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            if $IsStoragePtr(e_ptr) {
+                let e_offs := $OffsetPtr(e_ptr)
+                let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
+                let $size_2300595445 := $MemoryLoadU64(e)
+                let $data_size_2300595445 := mul($size_2300595445, 1)
+                $AlignedStorageStore($linked_dst_2300595445, mload(e))
+                let $data_src_2300595445 := add(e, 32)
+                let $data_dst_2300595445 := add($linked_dst_2300595445, 32)
+                for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
+                    $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
+                    $Free(e, add($data_size_2300595445, 32))
+                }
+                $AlignedStorageStore(e_offs, $linked_dst_2300595445)
+            }
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
         }
-        function A1_vector_destroy_empty$u64$(v) {
-            let size := $MemoryLoadU64(v)
-            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
-            let capacity := $MemoryLoadU64(add(v, 8))
-            $Free(v, add(32, mul(capacity, 8)))
+        function A1_option_none$u64$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$u64$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_vector_push_back$u8$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 1)))
+            $StoreU8(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 1)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u8$() -> vector {
+            vector := $Malloc(34)
+            $MemoryStoreU64(add(vector, 8), 2)
         }
         function $Abort(code) {
             mstore(0, code)
@@ -1768,253 +1838,106 @@ object "test_A2_M_extract_err_reason" {
         function $GtEq(x, y) -> r {
             r := or(gt(x, y), eq(x, y))
         }
-        function $Eq(x, y) -> r {
-            r := eq(x, y)
-        }
-        function $LogicalNot(x) -> r {
-            r := iszero(x)
-        }
-        function $ClosestGreaterPowerOfTwo(x) -> r {
-            r := or(r, shr(1, x))
-            r := or(r, shr(2, r))
-            r := or(r, shr(4, r))
-            r := or(r, shr(8, r))
-            r := or(r, shr(16, r))
-            r := or(r, shr(32, r))
-            r := add(x, 1)
-        }
-    }
-}
-===> Test result of M::extract_err_reason: Succeed(Stopped) (used_gas=6005): []
-
-// test of M::extract_panic_code
-/* =======================================
- * Generated by Move-To-Yul compiler v0.0
- * ======================================= */
-
-
-object "test_A2_M_extract_panic_code" {
-    code {
-        mstore(0, memoryguard(160))
-        A2_M_extract_panic_code()
-        return (0, 0)
-        function A2_M_extract_panic_code() {
-            let v, v2, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12
-            let $block := 4
-            for {} true {} {
-                switch $block
-                case 2 {
-                    // label L1
-                    // $t6 := 108
-                    $t6 := 108
-                    // abort($t6)
-                    $Abort($t6)
-                }
-                case 3 {
-                    // label L0
-                    // $t7 := move($t1)
-                    $t7 := v2
-                    // $t8 := ExternalResult::unwrap_panic<u64>($t7)
-                    $t8 := A2_ExternalResult_unwrap_panic$u64$($t7)
-                    // $t9 := 42
-                    $t9 := 42
-                    // $t10 := U256::u256_from_u128($t9)
-                    $t10 := A2_U256_u256_from_u128($t9)
-                    // $t11 := ==($t8, $t10)
-                    $t11 := $Eq($t8, $t10)
-                    // if ($t11) goto L2 else goto L3
-                    switch $t11
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
-                case 4 {
-                    // $t2 := 42
-                    $t2 := 42
-                    // $t3 := U256::u256_from_u128($t2)
-                    $t3 := A2_U256_u256_from_u128($t2)
-                    // $t1 := M::pack_panic_code<u64>($t3)
-                    v2 := A2_M_pack_panic_code$u64$($t3)
-                    // $t4 := borrow_local($t1)
-                    $t4 := $MakePtr(false, v2)
-                    // $t5 := ExternalResult::is_panic<u64>($t4)
-                    $t5 := A2_ExternalResult_is_panic$u64$($t4)
-                    // if ($t5) goto L0 else goto L1
-                    switch $t5
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
-                }
-                case 5 {
-                    // label L3
-                    // $t12 := 109
-                    $t12 := 109
-                    // abort($t12)
-                    $Abort($t12)
-                }
-                case 6 {
-                    // label L2
-                    // return ()
-                    leave
-                }
-            }
-        }
-
-        function A2_ExternalResult_is_panic$u64$(result) -> $result {
-            let $t1, $t2
-            // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.panic_code($t0)
-            {
-                let $field_ptr := $IndexPtr(result, 96)
-                $t1 := $MakePtr($IsStoragePtr($field_ptr), $LoadU256($field_ptr))
-            }
-            // $t2 := option::is_some<U256::U256>($t1)
-            $t2 := A1_option_is_some$A2_U256_U256$($t1)
-            // return $t2
-            $result := $t2
-        }
-
-        function A1_option_is_some$A2_U256_U256$(t) -> $result {
-            let $t1, $t2, $t3
-            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
-            $t1 := t
-            // $t2 := vector::is_empty<#0>($t1)
-            $t2 := A1_vector_is_empty$A2_U256_U256$($t1)
-            // $t3 := !($t2)
-            $t3 := $LogicalNot($t2)
-            // return $t3
-            $result := $t3
-        }
-
-        function A1_vector_is_empty$A2_U256_U256$(v) -> $result {
-            let $t1, $t2, $t3
-            // $t1 := vector::length<#0>($t0)
-            $t1 := A1_vector_length$A2_U256_U256$(v)
-            // $t2 := 0
-            $t2 := 0
-            // $t3 := ==($t1, $t2)
-            $t3 := $Eq($t1, $t2)
-            // return $t3
-            $result := $t3
-        }
-
-        function A1_vector_length$A2_U256_U256$(v_ref) -> len {
-            let v_offs := $LoadU256(v_ref)
-            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
-            len := $LoadU64(v_ptr)
-        }
-        function A2_M_pack_panic_code$u64$(v) -> $result {
-            let $t1
-            // $t1 := ExternalResult::panic<#0>($t0)
-            $t1 := A2_ExternalResult_panic$u64$(v)
-            // return $t1
-            $result := $t1
-        }
-
-        function A2_ExternalResult_panic$u64$(panic_code) -> $result {
-            let tmp_$1, tmp_$2, tmp_$3, tmp_$4, $t5, $t6, $t7, $t8, $t9
-            // $t5 := option::none<#0>()
-            $t5 := A1_option_none$u64$()
-            // $t6 := option::none<vector<u8>>()
-            $t6 := A1_option_none$vec$u8$$()
-            // $t7 := option::none<vector<u8>>()
-            $t7 := A1_option_none$vec$u8$$()
-            // $t8 := option::some<U256::U256>($t0)
-            $t8 := A1_option_some$A2_U256_U256$(panic_code)
-            // $t9 := pack ExternalResult::ExternalResult<#0>($t5, $t7, $t6, $t8)
-            {
-                let $mem := $Malloc(128)
-                $MemoryStoreU256(add($mem, 0), $t5)
-                $MemoryStoreU256(add($mem, 32), $t7)
-                $MemoryStoreU256(add($mem, 64), $t6)
-                $MemoryStoreU256(add($mem, 96), $t8)
-                $t9 := $mem
-            }
-            // return $t9
-            $result := $t9
-        }
-
-        function A1_option_some$A2_U256_U256$(e) -> $result {
-            let $t1, $t2
-            // $t1 := vector::singleton<#0>($t0)
-            $t1 := A1_vector_singleton$A2_U256_U256$(e)
-            // $t2 := pack option::Option<#0>($t1)
-            {
-                let $mem := $Malloc(32)
-                $MemoryStoreU256(add($mem, 0), $t1)
-                $t2 := $mem
-            }
-            // return $t2
-            $result := $t2
-        }
-
-        function A1_vector_singleton$A2_U256_U256$(e) -> $result {
-            let $t2, $t3
-            let $locals := $Malloc(32)
-            // $t1 := vector::empty<#0>()
-            mstore($locals, A1_vector_empty$A2_U256_U256$())
-            // $t2 := borrow_local($t1)
-            $t2 := $MakePtr(false, $locals)
-            // vector::push_back<#0>($t2, $t0)
-            A1_vector_push_back$A2_U256_U256$($t2, e)
-            // $t3 := move($t1)
-            $t3 := mload($locals)
-            // return $t3
-            $result := $t3
-            $Free($locals, 32)
-        }
-
-        function A1_vector_push_back$A2_U256_U256$(v_ref, e) {
-            let v_offs := $LoadU256(v_ref)
-            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
-            let size := $LoadU64(v_ptr)
-            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
-            $StoreU256(e_ptr, e)
-            size := add(size, 1)
-            $StoreU64(v_ptr, size)
-            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
-            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
-                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
-                $StoreU256(v_ref, new_v_offs)
-            }
+        function $Eq(x, y) -> r {
+            r := eq(x, y)
         }
-        function A1_vector_empty$A2_U256_U256$() -> vector {
-            vector := $Malloc(96)
-            $MemoryStoreU64(add(vector, 8), 2)
+        function $LogicalNot(x) -> r {
+            r := iszero(x)
         }
-        function A1_option_none$vec$u8$$() -> $result {
-            let $t0, $t1
-            // $t0 := vector::empty<#0>()
-            $t0 := A1_vector_empty$vec$u8$$()
-            // $t1 := pack option::Option<#0>($t0)
-            {
-                let $mem := $Malloc(32)
-                $MemoryStoreU256(add($mem, 0), $t0)
-                $t1 := $mem
-            }
-            // return $t1
-            $result := $t1
+        function $ClosestGreaterPowerOfTwo(x) -> r {
+            r := or(r, shr(1, x))
+            r := or(r, shr(2, r))
+            r := or(r, shr(4, r))
+            r := or(r, shr(8, r))
+            r := or(r, shr(16, r))
+            r := or(r, shr(32, r))
+            r := add(x, 1)
         }
+    }
+}
+===> Test result of M::extract_err_reason: Succeed(Stopped) (used_gas=6988): []
 
-        function A1_vector_empty$vec$u8$$() -> vector {
-            vector := $Malloc(96)
-            $MemoryStoreU64(add(vector, 8), 2)
-        }
-        function A1_option_none$u64$() -> $result {
-            let $t0, $t1
-            // $t0 := vector::empty<#0>()
-            $t0 := A1_vector_empty$u64$()
-            // $t1 := pack option::Option<#0>($t0)
-            {
-                let $mem := $Malloc(32)
-                $MemoryStoreU256(add($mem, 0), $t0)
-                $t1 := $mem
+// test of M::extract_panic_code
+/* =======================================
+ * Generated by Move-To-Yul compiler v0.0
+ * ======================================= */
+
+
+object "test_A2_M_extract_panic_code" {
+    code {
+        mstore(0, memoryguard(160))
+        A2_M_extract_panic_code()
+        return (0, 0)
+        function A2_M_extract_panic_code() {
+            let v2, $t1, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11
+            let $block := 4
+            for {} true {} {
+                switch $block
+                case 2 {
+                    // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
+                    // $t5 := 108
+                    $t5 := 108
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t1 := 42
+                    $t1 := 42
+                    // $t2 := U256::u256_from_u128($t1)
+                    $t2 := A2_U256_u256_from_u128($t1)
+                    // $t0 := M::pack_panic_code<u64>($t2)
+                    v2 := A2_M_pack_panic_code$u64$($t2)
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, v2)
+                    // $t4 := ExternalResult::is_panic<u64>($t3)
+                    $t4 := A2_ExternalResult_is_panic$u64$($t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t6 := move($t0)
+                    $t6 := v2
+                    // $t7 := ExternalResult::unwrap_panic<u64>($t6)
+                    $t7 := A2_ExternalResult_unwrap_panic$u64$($t6)
+                    // $t8 := 42
+                    $t8 := 42
+                    // $t9 := U256::u256_from_u128($t8)
+                    $t9 := A2_U256_u256_from_u128($t8)
+                    // $t10 := ==($t7, $t9)
+                    $t10 := $Eq($t7, $t9)
+                    // if ($t10) goto L4 else goto L3
+                    switch $t10
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t11 := 109
+                    $t11 := 109
+                    // abort($t11)
+                    $Abort($t11)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
             }
-            // return $t1
-            $result := $t1
         }
 
-        function A1_vector_empty$u64$() -> vector {
-            vector := $Malloc(48)
-            $MemoryStoreU64(add(vector, 8), 2)
-        }
         function A2_U256_u256_from_u128(lo) -> $result {
             let $t1, $t2
             // $t1 := 0
@@ -2026,23 +1949,23 @@ object "test_A2_M_extract_panic_code" {
         }
 
         function A2_ExternalResult_unwrap_panic$u64$(result) -> $result {
-            let err_data, err_reason, panic_code, value, $t5, $t6, $t7, $t8, $t9
-            // ($t5, $t6, $t7, $t8) := unpack ExternalResult::ExternalResult<#0>($t0)
-            $t5 := $MemoryLoadU256(add(result, 0))
-            $t6 := $MemoryLoadU256(add(result, 32))
-            $t7 := $MemoryLoadU256(add(result, 64))
-            $t8 := $MemoryLoadU256(add(result, 96))
+            let err_data, err_reason, panic_code, $t4, $t5, $t6, $t7, $t8
+            // ($t4, $t5, $t6, $t7) := unpack ExternalResult::ExternalResult<#0>($t0)
+            $t4 := $MemoryLoadU256(add(result, 0))
+            $t5 := $MemoryLoadU256(add(result, 32))
+            $t6 := $MemoryLoadU256(add(result, 64))
+            $t7 := $MemoryLoadU256(add(result, 96))
             $Free(result, 128)
-            // option::destroy_none<#0>($t5)
-            A1_option_destroy_none$u64$($t5)
-            // option::destroy_none<vector<u8>>($t7)
-            A1_option_destroy_none$vec$u8$$($t7)
+            // option::destroy_none<#0>($t4)
+            A1_option_destroy_none$u64$($t4)
             // option::destroy_none<vector<u8>>($t6)
             A1_option_destroy_none$vec$u8$$($t6)
-            // $t9 := option::destroy_some<U256::U256>($t8)
-            $t9 := A1_option_destroy_some$A2_U256_U256$($t8)
-            // return $t9
-            $result := $t9
+            // option::destroy_none<vector<u8>>($t5)
+            A1_option_destroy_none$vec$u8$$($t5)
+            // $t8 := option::destroy_some<U256::U256>($t7)
+            $t8 := A1_option_destroy_some$A2_U256_U256$($t7)
+            // return $t8
+            $result := $t8
         }
 
         function A1_option_destroy_some$A2_U256_U256$(t) -> $result {
@@ -2053,13 +1976,28 @@ object "test_A2_M_extract_panic_code" {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t5 := 1
-                    $t5 := 1
-                    // abort($t5)
-                    $Abort($t5)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
+                    // $t5 := 262145
+                    $t5 := 262145
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, t)
+                    // $t4 := option::is_some<#0>($t3)
+                    $t4 := A1_option_is_some$A2_U256_U256$($t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
                     // $t6 := move($t0)
                     $t6 := t
                     // $t2 := unpack option::Option<#0>($t6)
@@ -2078,16 +2016,6 @@ object "test_A2_M_extract_panic_code" {
                     $Free($locals, 32)
                     leave
                 }
-                case 4 {
-                    // $t3 := borrow_local($t0)
-                    $t3 := $MakePtr(false, t)
-                    // $t4 := option::is_some<#0>($t3)
-                    $t4 := A1_option_is_some$A2_U256_U256$($t3)
-                    // if ($t4) goto L0 else goto L1
-                    switch $t4
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
-                }
             }
         }
 
@@ -2106,43 +2034,83 @@ object "test_A2_M_extract_panic_code" {
             e := $LoadU256(e_ptr)
             $StoreU64(v_ptr, sub(size, 1))
         }
+        function A1_option_is_some$A2_U256_U256$(t) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$A2_U256_U256$($t1)
+            // $t3 := !($t2)
+            $t3 := $LogicalNot($t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_is_empty$A2_U256_U256$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$A2_U256_U256$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$A2_U256_U256$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
         function A1_option_destroy_none$vec$u8$$(t) {
-            let vec, $t2, $t3, $t4, $t5, $t6
+            let $t1, $t2, $t3, $t4, $t5
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t4 := 0
-                    $t4 := 0
-                    // abort($t4)
-                    $Abort($t4)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t5 := move($t0)
-                    $t5 := t
-                    // $t6 := unpack option::Option<#0>($t5)
-                    $t6 := $MemoryLoadU256(add($t5, 0))
-                    $Free($t5, 32)
-                    // vector::destroy_empty<#0>($t6)
-                    A1_vector_destroy_empty$vec$u8$$($t6)
-                    // return ()
-                    leave
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
                 }
                 case 4 {
-                    // $t2 := borrow_local($t0)
-                    $t2 := $MakePtr(false, t)
-                    // $t3 := option::is_none<#0>($t2)
-                    $t3 := A1_option_is_none$vec$u8$$($t2)
-                    // if ($t3) goto L0 else goto L1
-                    switch $t3
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$vec$u8$$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$vec$u8$$($t5)
+                    // return ()
+                    leave
                 }
             }
         }
 
+        function A1_vector_destroy_empty$vec$u8$$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
         function A1_option_is_none$vec$u8$$(t) -> $result {
             let $t1, $t2
             // $t1 := borrow_field<option::Option<#0>>.vec($t0)
@@ -2170,49 +2138,54 @@ object "test_A2_M_extract_panic_code" {
             let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
             len := $LoadU64(v_ptr)
         }
-        function A1_vector_destroy_empty$vec$u8$$(v) {
-            let size := $MemoryLoadU64(v)
-            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
-            let capacity := $MemoryLoadU64(add(v, 8))
-            $Free(v, add(32, mul(capacity, 32)))
-        }
         function A1_option_destroy_none$u64$(t) {
-            let vec, $t2, $t3, $t4, $t5, $t6
+            let $t1, $t2, $t3, $t4, $t5
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t4 := 0
-                    $t4 := 0
-                    // abort($t4)
-                    $Abort($t4)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t5 := move($t0)
-                    $t5 := t
-                    // $t6 := unpack option::Option<#0>($t5)
-                    $t6 := $MemoryLoadU256(add($t5, 0))
-                    $Free($t5, 32)
-                    // vector::destroy_empty<#0>($t6)
-                    A1_vector_destroy_empty$u64$($t6)
-                    // return ()
-                    leave
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
                 }
                 case 4 {
-                    // $t2 := borrow_local($t0)
-                    $t2 := $MakePtr(false, t)
-                    // $t3 := option::is_none<#0>($t2)
-                    $t3 := A1_option_is_none$u64$($t2)
-                    // if ($t3) goto L0 else goto L1
-                    switch $t3
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$u64$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$u64$($t5)
+                    // return ()
+                    leave
                 }
             }
         }
 
+        function A1_vector_destroy_empty$u64$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 8)))
+        }
         function A1_option_is_none$u64$(t) -> $result {
             let $t1, $t2
             // $t1 := borrow_field<option::Option<#0>>.vec($t0)
@@ -2235,16 +2208,138 @@ object "test_A2_M_extract_panic_code" {
             $result := $t3
         }
 
-        function A1_vector_length$u64$(v_ref) -> len {
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
+        function A2_ExternalResult_is_panic$u64$(result) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.panic_code($t0)
+            {
+                let $field_ptr := $IndexPtr(result, 96)
+                $t1 := $MakePtr($IsStoragePtr($field_ptr), $LoadU256($field_ptr))
+            }
+            // $t2 := option::is_some<U256::U256>($t1)
+            $t2 := A1_option_is_some$A2_U256_U256$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A2_M_pack_panic_code$u64$(v) -> $result {
+            let $t1
+            // $t1 := ExternalResult::panic<#0>($t0)
+            $t1 := A2_ExternalResult_panic$u64$(v)
+            // return $t1
+            $result := $t1
+        }
+
+        function A2_ExternalResult_panic$u64$(panic_code) -> $result {
+            let tmp_$1, tmp_$2, tmp_$3, tmp_$4, $t5, $t6, $t7, $t8, $t9
+            // $t5 := option::none<#0>()
+            $t5 := A1_option_none$u64$()
+            // $t6 := option::none<vector<u8>>()
+            $t6 := A1_option_none$vec$u8$$()
+            // $t7 := option::none<vector<u8>>()
+            $t7 := A1_option_none$vec$u8$$()
+            // $t8 := option::some<U256::U256>($t0)
+            $t8 := A1_option_some$A2_U256_U256$(panic_code)
+            // $t9 := pack ExternalResult::ExternalResult<#0>($t5, $t7, $t6, $t8)
+            {
+                let $mem := $Malloc(128)
+                $MemoryStoreU256(add($mem, 0), $t5)
+                $MemoryStoreU256(add($mem, 32), $t7)
+                $MemoryStoreU256(add($mem, 64), $t6)
+                $MemoryStoreU256(add($mem, 96), $t8)
+                $t9 := $mem
+            }
+            // return $t9
+            $result := $t9
+        }
+
+        function A1_option_some$A2_U256_U256$(e) -> $result {
+            let $t1, $t2
+            // $t1 := vector::singleton<#0>($t0)
+            $t1 := A1_vector_singleton$A2_U256_U256$(e)
+            // $t2 := pack option::Option<#0>($t1)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $t2 := $mem
+            }
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_singleton$A2_U256_U256$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$A2_U256_U256$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$A2_U256_U256$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$A2_U256_U256$(v_ref, e) {
             let v_offs := $LoadU256(v_ref)
             let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
-            len := $LoadU64(v_ptr)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 32)))
+            $StoreU256(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 32)
+                $StoreU256(v_ref, new_v_offs)
+            }
         }
-        function A1_vector_destroy_empty$u64$(v) {
-            let size := $MemoryLoadU64(v)
-            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
-            let capacity := $MemoryLoadU64(add(v, 8))
-            $Free(v, add(32, mul(capacity, 8)))
+        function A1_vector_empty$A2_U256_U256$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_none$vec$u8$$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$vec$u8$$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$vec$u8$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_none$u64$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$u64$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
         }
         function $Abort(code) {
             mstore(0, code)
@@ -2456,7 +2551,7 @@ object "test_A2_M_extract_panic_code" {
         }
     }
 }
-===> Test result of M::extract_panic_code: Succeed(Stopped) (used_gas=4470): []
+===> Test result of M::extract_panic_code: Succeed(Stopped) (used_gas=5168): []
 
 // test of M::extract_value
 /* =======================================
@@ -2476,26 +2571,16 @@ object "test_A2_M_extract_value" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t4 := 100
                     $t4 := 100
                     // abort($t4)
                     $Abort($t4)
                 }
-                case 3 {
-                    // label L0
-                    // $t5 := move($t0)
-                    $t5 := v2
-                    // $t6 := ExternalResult::unwrap<u64>($t5)
-                    $t6 := A2_ExternalResult_unwrap$u64$($t5)
-                    // $t7 := 100
-                    $t7 := 100
-                    // $t8 := ==($t6, $t7)
-                    $t8 := $Eq($t6, $t7)
-                    // if ($t8) goto L2 else goto L3
-                    switch $t8
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t1 := 100
                     $t1 := 100
@@ -2505,182 +2590,46 @@ object "test_A2_M_extract_value" {
                     $t2 := $MakePtr(false, v2)
                     // $t3 := ExternalResult::is_ok<u64>($t2)
                     $t3 := A2_ExternalResult_is_ok$u64$($t2)
-                    // if ($t3) goto L0 else goto L1
+                    // if ($t3) goto L1 else goto L0
                     switch $t3
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
-                    // $t9 := 101
-                    $t9 := 101
-                    // abort($t9)
-                    $Abort($t9)
-                }
-                case 6 {
                     // label L2
-                    // return ()
-                    leave
-                }
-            }
-        }
-
-        function A2_ExternalResult_is_ok$u64$(result) -> $result {
-            let $t1, $t2
-            // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.value($t0)
-            {
-                $t1 := $MakePtr($IsStoragePtr(result), $LoadU256(result))
-            }
-            // $t2 := option::is_some<#0>($t1)
-            $t2 := A1_option_is_some$u64$($t1)
-            // return $t2
-            $result := $t2
-        }
-
-        function A1_option_is_some$u64$(t) -> $result {
-            let $t1, $t2, $t3
-            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
-            $t1 := t
-            // $t2 := vector::is_empty<#0>($t1)
-            $t2 := A1_vector_is_empty$u64$($t1)
-            // $t3 := !($t2)
-            $t3 := $LogicalNot($t2)
-            // return $t3
-            $result := $t3
-        }
-
-        function A1_vector_is_empty$u64$(v) -> $result {
-            let $t1, $t2, $t3
-            // $t1 := vector::length<#0>($t0)
-            $t1 := A1_vector_length$u64$(v)
-            // $t2 := 0
-            $t2 := 0
-            // $t3 := ==($t1, $t2)
-            $t3 := $Eq($t1, $t2)
-            // return $t3
-            $result := $t3
-        }
-
-        function A1_vector_length$u64$(v_ref) -> len {
-            let v_offs := $LoadU256(v_ref)
-            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
-            len := $LoadU64(v_ptr)
-        }
-        function A2_M_pack_value$u64$(v) -> $result {
-            let $t1
-            // $t1 := ExternalResult::ok<#0>($t0)
-            $t1 := A2_ExternalResult_ok$u64$(v)
-            // return $t1
-            $result := $t1
-        }
-
-        function A2_ExternalResult_ok$u64$(value) -> $result {
-            let $t1, $t2, $t3, $t4, $t5
-            // $t1 := option::some<#0>($t0)
-            $t1 := A1_option_some$u64$(value)
-            // $t2 := option::none<vector<u8>>()
-            $t2 := A1_option_none$vec$u8$$()
-            // $t3 := option::none<vector<u8>>()
-            $t3 := A1_option_none$vec$u8$$()
-            // $t4 := option::none<U256::U256>()
-            $t4 := A1_option_none$A2_U256_U256$()
-            // $t5 := pack ExternalResult::ExternalResult<#0>($t1, $t2, $t3, $t4)
-            {
-                let $mem := $Malloc(128)
-                $MemoryStoreU256(add($mem, 0), $t1)
-                $MemoryStoreU256(add($mem, 32), $t2)
-                $MemoryStoreU256(add($mem, 64), $t3)
-                $MemoryStoreU256(add($mem, 96), $t4)
-                $t5 := $mem
-            }
-            // return $t5
-            $result := $t5
-        }
-
-        function A1_option_none$A2_U256_U256$() -> $result {
-            let $t0, $t1
-            // $t0 := vector::empty<#0>()
-            $t0 := A1_vector_empty$A2_U256_U256$()
-            // $t1 := pack option::Option<#0>($t0)
-            {
-                let $mem := $Malloc(32)
-                $MemoryStoreU256(add($mem, 0), $t0)
-                $t1 := $mem
-            }
-            // return $t1
-            $result := $t1
-        }
-
-        function A1_vector_empty$A2_U256_U256$() -> vector {
-            vector := $Malloc(96)
-            $MemoryStoreU64(add(vector, 8), 2)
-        }
-        function A1_option_none$vec$u8$$() -> $result {
-            let $t0, $t1
-            // $t0 := vector::empty<#0>()
-            $t0 := A1_vector_empty$vec$u8$$()
-            // $t1 := pack option::Option<#0>($t0)
-            {
-                let $mem := $Malloc(32)
-                $MemoryStoreU256(add($mem, 0), $t0)
-                $t1 := $mem
-            }
-            // return $t1
-            $result := $t1
-        }
-
-        function A1_vector_empty$vec$u8$$() -> vector {
-            vector := $Malloc(96)
-            $MemoryStoreU64(add(vector, 8), 2)
-        }
-        function A1_option_some$u64$(e) -> $result {
-            let $t1, $t2
-            // $t1 := vector::singleton<#0>($t0)
-            $t1 := A1_vector_singleton$u64$(e)
-            // $t2 := pack option::Option<#0>($t1)
-            {
-                let $mem := $Malloc(32)
-                $MemoryStoreU256(add($mem, 0), $t1)
-                $t2 := $mem
-            }
-            // return $t2
-            $result := $t2
-        }
-
-        function A1_vector_singleton$u64$(e) -> $result {
-            let $t2, $t3
-            let $locals := $Malloc(32)
-            // $t1 := vector::empty<#0>()
-            mstore($locals, A1_vector_empty$u64$())
-            // $t2 := borrow_local($t1)
-            $t2 := $MakePtr(false, $locals)
-            // vector::push_back<#0>($t2, $t0)
-            A1_vector_push_back$u64$($t2, e)
-            // $t3 := move($t1)
-            $t3 := mload($locals)
-            // return $t3
-            $result := $t3
-            $Free($locals, 32)
-        }
-
-        function A1_vector_push_back$u64$(v_ref, e) {
-            let v_offs := $LoadU256(v_ref)
-            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
-            let size := $LoadU64(v_ptr)
-            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
-            $StoreU64(e_ptr, e)
-            size := add(size, 1)
-            $StoreU64(v_ptr, size)
-            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
-            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
-                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
-                $StoreU256(v_ref, new_v_offs)
+                    // $t5 := move($t0)
+                    $t5 := v2
+                    // $t6 := ExternalResult::unwrap<u64>($t5)
+                    $t6 := A2_ExternalResult_unwrap$u64$($t5)
+                    // $t7 := 100
+                    $t7 := 100
+                    // $t8 := ==($t6, $t7)
+                    $t8 := $Eq($t6, $t7)
+                    // if ($t8) goto L4 else goto L3
+                    switch $t8
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
+                    // label L3
+                    // $t9 := 101
+                    $t9 := 101
+                    // abort($t9)
+                    $Abort($t9)
+                }
+                case 8 {
+                    // label L5
+                    // return ()
+                    leave
+                }
             }
         }
-        function A1_vector_empty$u64$() -> vector {
-            vector := $Malloc(48)
-            $MemoryStoreU64(add(vector, 8), 2)
-        }
+
         function A2_ExternalResult_unwrap$u64$(result) -> $result {
             let err_data, err_reason, panic_code, value, $t5, $t6, $t7, $t8, $t9
             // ($t5, $t6, $t7, $t8) := unpack ExternalResult::ExternalResult<#0>($t0)
@@ -2709,13 +2658,28 @@ object "test_A2_M_extract_value" {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t5 := 1
-                    $t5 := 1
-                    // abort($t5)
-                    $Abort($t5)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
+                    // $t5 := 262145
+                    $t5 := 262145
+                    // abort($t5)
+                    $Abort($t5)
+                }
+                case 4 {
+                    // $t3 := borrow_local($t0)
+                    $t3 := $MakePtr(false, t)
+                    // $t4 := option::is_some<#0>($t3)
+                    $t4 := A1_option_is_some$u64$($t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
                     // $t6 := move($t0)
                     $t6 := t
                     // $t2 := unpack option::Option<#0>($t6)
@@ -2734,16 +2698,6 @@ object "test_A2_M_extract_value" {
                     $Free($locals, 32)
                     leave
                 }
-                case 4 {
-                    // $t3 := borrow_local($t0)
-                    $t3 := $MakePtr(false, t)
-                    // $t4 := option::is_some<#0>($t3)
-                    $t4 := A1_option_is_some$u64$($t3)
-                    // if ($t4) goto L0 else goto L1
-                    switch $t4
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
-                }
             }
         }
 
@@ -2762,43 +2716,83 @@ object "test_A2_M_extract_value" {
             e := $LoadU64(e_ptr)
             $StoreU64(v_ptr, sub(size, 1))
         }
+        function A1_option_is_some$u64$(t) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := borrow_field<option::Option<#0>>.vec($t0)
+            $t1 := t
+            // $t2 := vector::is_empty<#0>($t1)
+            $t2 := A1_vector_is_empty$u64$($t1)
+            // $t3 := !($t2)
+            $t3 := $LogicalNot($t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_is_empty$u64$(v) -> $result {
+            let $t1, $t2, $t3
+            // $t1 := vector::length<#0>($t0)
+            $t1 := A1_vector_length$u64$(v)
+            // $t2 := 0
+            $t2 := 0
+            // $t3 := ==($t1, $t2)
+            $t3 := $Eq($t1, $t2)
+            // return $t3
+            $result := $t3
+        }
+
+        function A1_vector_length$u64$(v_ref) -> len {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            len := $LoadU64(v_ptr)
+        }
         function A1_option_destroy_none$A2_U256_U256$(t) {
-            let vec, $t2, $t3, $t4, $t5, $t6
+            let $t1, $t2, $t3, $t4, $t5
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t4 := 0
-                    $t4 := 0
-                    // abort($t4)
-                    $Abort($t4)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t5 := move($t0)
-                    $t5 := t
-                    // $t6 := unpack option::Option<#0>($t5)
-                    $t6 := $MemoryLoadU256(add($t5, 0))
-                    $Free($t5, 32)
-                    // vector::destroy_empty<#0>($t6)
-                    A1_vector_destroy_empty$A2_U256_U256$($t6)
-                    // return ()
-                    leave
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
                 }
                 case 4 {
-                    // $t2 := borrow_local($t0)
-                    $t2 := $MakePtr(false, t)
-                    // $t3 := option::is_none<#0>($t2)
-                    $t3 := A1_option_is_none$A2_U256_U256$($t2)
-                    // if ($t3) goto L0 else goto L1
-                    switch $t3
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$A2_U256_U256$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$A2_U256_U256$($t5)
+                    // return ()
+                    leave
                 }
             }
         }
 
+        function A1_vector_destroy_empty$A2_U256_U256$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
         function A1_option_is_none$A2_U256_U256$(t) -> $result {
             let $t1, $t2
             // $t1 := borrow_field<option::Option<#0>>.vec($t0)
@@ -2826,49 +2820,54 @@ object "test_A2_M_extract_value" {
             let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
             len := $LoadU64(v_ptr)
         }
-        function A1_vector_destroy_empty$A2_U256_U256$(v) {
-            let size := $MemoryLoadU64(v)
-            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
-            let capacity := $MemoryLoadU64(add(v, 8))
-            $Free(v, add(32, mul(capacity, 32)))
-        }
         function A1_option_destroy_none$vec$u8$$(t) {
-            let vec, $t2, $t3, $t4, $t5, $t6
+            let $t1, $t2, $t3, $t4, $t5
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t4 := 0
-                    $t4 := 0
-                    // abort($t4)
-                    $Abort($t4)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t5 := move($t0)
-                    $t5 := t
-                    // $t6 := unpack option::Option<#0>($t5)
-                    $t6 := $MemoryLoadU256(add($t5, 0))
-                    $Free($t5, 32)
-                    // vector::destroy_empty<#0>($t6)
-                    A1_vector_destroy_empty$vec$u8$$($t6)
-                    // return ()
-                    leave
+                    // $t3 := 262144
+                    $t3 := 262144
+                    // abort($t3)
+                    $Abort($t3)
                 }
                 case 4 {
-                    // $t2 := borrow_local($t0)
-                    $t2 := $MakePtr(false, t)
-                    // $t3 := option::is_none<#0>($t2)
-                    $t3 := A1_option_is_none$vec$u8$$($t2)
-                    // if ($t3) goto L0 else goto L1
-                    switch $t3
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, t)
+                    // $t2 := option::is_none<#0>($t1)
+                    $t2 := A1_option_is_none$vec$u8$$($t1)
+                    // if ($t2) goto L1 else goto L0
+                    switch $t2
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // $t4 := move($t0)
+                    $t4 := t
+                    // $t5 := unpack option::Option<#0>($t4)
+                    $t5 := $MemoryLoadU256(add($t4, 0))
+                    $Free($t4, 32)
+                    // vector::destroy_empty<#0>($t5)
+                    A1_vector_destroy_empty$vec$u8$$($t5)
+                    // return ()
+                    leave
                 }
             }
         }
 
+        function A1_vector_destroy_empty$vec$u8$$(v) {
+            let size := $MemoryLoadU64(v)
+            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+            let capacity := $MemoryLoadU64(add(v, 8))
+            $Free(v, add(32, mul(capacity, 32)))
+        }
         function A1_option_is_none$vec$u8$$(t) -> $result {
             let $t1, $t2
             // $t1 := borrow_field<option::Option<#0>>.vec($t0)
@@ -2896,11 +2895,132 @@ object "test_A2_M_extract_value" {
             let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
             len := $LoadU64(v_ptr)
         }
-        function A1_vector_destroy_empty$vec$u8$$(v) {
-            let size := $MemoryLoadU64(v)
-            if $LogicalNot(iszero(size)) { $AbortBuiltin() }
-            let capacity := $MemoryLoadU64(add(v, 8))
-            $Free(v, add(32, mul(capacity, 32)))
+        function A2_ExternalResult_is_ok$u64$(result) -> $result {
+            let $t1, $t2
+            // $t1 := borrow_field<ExternalResult::ExternalResult<#0>>.value($t0)
+            {
+                $t1 := $MakePtr($IsStoragePtr(result), $LoadU256(result))
+            }
+            // $t2 := option::is_some<#0>($t1)
+            $t2 := A1_option_is_some$u64$($t1)
+            // return $t2
+            $result := $t2
+        }
+
+        function A2_M_pack_value$u64$(v) -> $result {
+            let $t1
+            // $t1 := ExternalResult::ok<#0>($t0)
+            $t1 := A2_ExternalResult_ok$u64$(v)
+            // return $t1
+            $result := $t1
+        }
+
+        function A2_ExternalResult_ok$u64$(value) -> $result {
+            let $t1, $t2, $t3, $t4, $t5
+            // $t1 := option::some<#0>($t0)
+            $t1 := A1_option_some$u64$(value)
+            // $t2 := option::none<vector<u8>>()
+            $t2 := A1_option_none$vec$u8$$()
+            // $t3 := option::none<vector<u8>>()
+            $t3 := A1_option_none$vec$u8$$()
+            // $t4 := option::none<U256::U256>()
+            $t4 := A1_option_none$A2_U256_U256$()
+            // $t5 := pack ExternalResult::ExternalResult<#0>($t1, $t2, $t3, $t4)
+            {
+                let $mem := $Malloc(128)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $MemoryStoreU256(add($mem, 32), $t2)
+                $MemoryStoreU256(add($mem, 64), $t3)
+                $MemoryStoreU256(add($mem, 96), $t4)
+                $t5 := $mem
+            }
+            // return $t5
+            $result := $t5
+        }
+
+        function A1_option_none$A2_U256_U256$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$A2_U256_U256$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$A2_U256_U256$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_none$vec$u8$$() -> $result {
+            let $t0, $t1
+            // $t0 := vector::empty<#0>()
+            $t0 := A1_vector_empty$vec$u8$$()
+            // $t1 := pack option::Option<#0>($t0)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t0)
+                $t1 := $mem
+            }
+            // return $t1
+            $result := $t1
+        }
+
+        function A1_vector_empty$vec$u8$$() -> vector {
+            vector := $Malloc(96)
+            $MemoryStoreU64(add(vector, 8), 2)
+        }
+        function A1_option_some$u64$(e) -> $result {
+            let $t1, $t2
+            // $t1 := vector::singleton<#0>($t0)
+            $t1 := A1_vector_singleton$u64$(e)
+            // $t2 := pack option::Option<#0>($t1)
+            {
+                let $mem := $Malloc(32)
+                $MemoryStoreU256(add($mem, 0), $t1)
+                $t2 := $mem
+            }
+            // return $t2
+            $result := $t2
+        }
+
+        function A1_vector_singleton$u64$(e) -> $result {
+            let $t2, $t3
+            let $locals := $Malloc(32)
+            // $t1 := vector::empty<#0>()
+            mstore($locals, A1_vector_empty$u64$())
+            // $t2 := borrow_local($t1)
+            $t2 := $MakePtr(false, $locals)
+            // vector::push_back<#0>($t2, $t0)
+            A1_vector_push_back$u64$($t2, e)
+            // $t3 := move($t1)
+            $t3 := mload($locals)
+            // return $t3
+            $result := $t3
+            $Free($locals, 32)
+        }
+
+        function A1_vector_push_back$u64$(v_ref, e) {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            let e_ptr := $IndexPtr(v_ptr, add(32, mul(size, 8)))
+            $StoreU64(e_ptr, e)
+            size := add(size, 1)
+            $StoreU64(v_ptr, size)
+            let capacity := $LoadU64($IndexPtr(v_ptr, 8))
+            if and(iszero($IsStoragePtr(v_ptr)), eq(size, capacity)) {
+                let new_v_offs := $ResizeVector(v_offs, capacity, 8)
+                $StoreU256(v_ref, new_v_offs)
+            }
+        }
+        function A1_vector_empty$u64$() -> vector {
+            vector := $Malloc(48)
+            $MemoryStoreU64(add(vector, 8), 2)
         }
         function $Abort(code) {
             mstore(0, code)
@@ -3107,4 +3227,4 @@ object "test_A2_M_extract_value" {
         }
     }
 }
-===> Test result of M::extract_value: Succeed(Stopped) (used_gas=4408): []
+===> Test result of M::extract_value: Succeed(Stopped) (used_gas=5103): []
diff --git a/language/evm/move-to-yul/tests/TestStringLiteral.exp b/language/evm/move-to-yul/tests/TestStringLiteral.exp
index 78d191c3b8..7ff6ff55a5 100644
--- a/language/evm/move-to-yul/tests/TestStringLiteral.exp
+++ b/language/evm/move-to-yul/tests/TestStringLiteral.exp
@@ -47,65 +47,51 @@ object "test_A2_M_h1" {
         A2_M_h1()
         return (0, 0)
         function A2_M_h1() {
-            let t, x, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75, $t76, $t77
+            let $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14, $t15, $t16, $t17, $t18, $t19, $t20, $t21, $t22, $t23, $t24, $t25, $t26, $t27, $t28, $t29, $t30, $t31, $t32, $t33, $t34, $t35, $t36, $t37, $t38, $t39, $t40, $t41, $t42, $t43, $t44, $t45, $t46, $t47, $t48, $t49, $t50, $t51, $t52, $t53, $t54, $t55, $t56, $t57, $t58, $t59, $t60, $t61, $t62, $t63, $t64, $t65, $t66, $t67, $t68, $t69, $t70, $t71, $t72, $t73, $t74, $t75
             let $locals := $Malloc(96)
             let $block := 4
             for {} true {} {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t16 := 96
-                    $t16 := 96
-                    // abort($t16)
-                    $Abort($t16)
+                    // goto L2
+                    $block := 5
                 }
                 case 3 {
                     // label L0
-                    // $t17 := borrow_local($t2)
-                    $t17 := $MakePtr(false, add($locals, 32))
-                    // $t18 := 0
-                    $t18 := 0
-                    // $t19 := vector::borrow<u8>($t17, $t18)
-                    $t19 := A1_vector_borrow$u8$($t17, $t18)
-                    // $t20 := read_ref($t19)
-                    $t20 := $LoadU8($t19)
-                    // $t21 := 97
-                    $t21 := 97
-                    // $t22 := ==($t20, $t21)
-                    $t22 := $Eq($t20, $t21)
-                    // if ($t22) goto L2 else goto L3
-                    switch $t22
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
+                    // $t14 := 96
+                    $t14 := 96
+                    // abort($t14)
+                    $Abort($t14)
                 }
                 case 4 {
-                    // $t5 := 0x3
-                    $t5 := 0x3
-                    // $t0 := Evm::sign($t5)
-                    mstore($locals, A2_Evm_sign($t5))
-                    // $t6 := borrow_local($t0)
-                    $t6 := $MakePtr(false, $locals)
-                    // $t7 := [97, 98, 99]
-                    $t7 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
-                    $MemoryStoreU64($t7, 3)
-                    $MemoryStoreU64(add($t7, 8), $ClosestGreaterPowerOfTwo(3))
-                    copy_literal_string_to_memory_2053440334(add($t7, 32))
-                    // $t8 := pack M::T($t7)
+                    // $t3 := 0x3
+                    $t3 := 0x3
+                    // $t0 := Evm::sign($t3)
+                    mstore($locals, A2_Evm_sign($t3))
+                    // $t4 := borrow_local($t0)
+                    $t4 := $MakePtr(false, $locals)
+                    // $t5 := [97, 98, 99]
+                    $t5 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(3)))
+                    $MemoryStoreU64($t5, 3)
+                    $MemoryStoreU64(add($t5, 8), $ClosestGreaterPowerOfTwo(3))
+                    copy_literal_string_to_memory_2053440334(add($t5, 32))
+                    // $t6 := pack M::T($t5)
                     {
                         let $mem := $Malloc(32)
-                        $MemoryStoreU256(add($mem, 0), $t7)
-                        $t8 := $mem
+                        $MemoryStoreU256(add($mem, 0), $t5)
+                        $t6 := $mem
                     }
-                    // move_to<M::T>($t8, $t6)
+                    // move_to<M::T>($t6, $t4)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $LoadU256($t6))
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $LoadU256($t4))
                         if $AlignedStorageLoad($base_offset) {
                           $AbortBuiltin()
                         }
                         $AlignedStorageStore($base_offset, true)
                         {
                             let $dst := add($base_offset, 32)
-                            let $src := $t8
+                            let $src := $t6
                             {
                                 let $linked_src_2300595445 := mload(add($src, 0))
                                 let $linked_dst_2300595445 := $NewLinkedStorageBase(0x89204cf5)
@@ -123,21 +109,21 @@ object "test_A2_M_h1" {
                             $Free($src, 32)
                         }
                     }
-                    // $t9 := 0x3
-                    $t9 := 0x3
-                    // $t10 := borrow_global<M::T>($t9)
+                    // $t7 := 0x3
+                    $t7 := 0x3
+                    // $t8 := borrow_global<M::T>($t7)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t9)
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t7)
                         if iszero($AlignedStorageLoad($base_offset)) {
                           $AbortBuiltin()
                         }
-                        $t10 := $MakePtr(true, add($base_offset, 32))
+                        $t8 := $MakePtr(true, add($base_offset, 32))
                     }
-                    // $t11 := borrow_field<M::T>.s($t10)
-                    $t11 := $t10
-                    // $t2 := read_ref($t11)
-                    mstore(add($locals, 32), $LoadU256($t11))
-                    if $IsStoragePtr($t11){
+                    // $t9 := borrow_field<M::T>.s($t8)
+                    $t9 := $t8
+                    // $t1 := read_ref($t9)
+                    mstore(add($locals, 32), $LoadU256($t9))
+                    if $IsStoragePtr($t9){
                         let $storage_ptr_2300595445
                         let $size_2300595445 := $StorageLoadU64(mload(add($locals, 32)))
                         let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
@@ -152,126 +138,160 @@ object "test_A2_M_h1" {
                         }
                         mstore(add($locals, 32), $storage_ptr_2300595445)
                     }
-                    // $t12 := borrow_local($t2)
-                    $t12 := $MakePtr(false, add($locals, 32))
-                    // $t13 := vector::length<u8>($t12)
-                    $t13 := A1_vector_length$u8$($t12)
-                    // $t14 := 3
-                    $t14 := 3
-                    // $t15 := ==($t13, $t14)
-                    $t15 := $Eq($t13, $t14)
-                    // if ($t15) goto L0 else goto L1
-                    switch $t15
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    // $t10 := borrow_local($t1)
+                    $t10 := $MakePtr(false, add($locals, 32))
+                    // $t11 := vector::length<u8>($t10)
+                    $t11 := A1_vector_length$u8$($t10)
+                    // $t12 := 3
+                    $t12 := 3
+                    // $t13 := ==($t11, $t12)
+                    $t13 := $Eq($t11, $t12)
+                    // if ($t13) goto L1 else goto L0
+                    switch $t13
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
-                    // label L3
-                    // $t23 := 97
-                    $t23 := 97
-                    // abort($t23)
-                    $Abort($t23)
-                }
-                case 6 {
                     // label L2
-                    // $t24 := borrow_local($t2)
-                    $t24 := $MakePtr(false, add($locals, 32))
-                    // $t25 := 1
-                    $t25 := 1
-                    // $t26 := vector::borrow<u8>($t24, $t25)
-                    $t26 := A1_vector_borrow$u8$($t24, $t25)
-                    // $t27 := read_ref($t26)
-                    $t27 := $LoadU8($t26)
-                    // $t28 := 98
-                    $t28 := 98
-                    // $t29 := ==($t27, $t28)
-                    $t29 := $Eq($t27, $t28)
-                    // if ($t29) goto L4 else goto L5
-                    switch $t29
+                    // $t15 := borrow_local($t1)
+                    $t15 := $MakePtr(false, add($locals, 32))
+                    // $t16 := 0
+                    $t16 := 0
+                    // $t17 := vector::borrow<u8>($t15, $t16)
+                    $t17 := A1_vector_borrow$u8$($t15, $t16)
+                    // $t18 := read_ref($t17)
+                    $t18 := $LoadU8($t17)
+                    // $t19 := 97
+                    $t19 := 97
+                    // $t20 := ==($t18, $t19)
+                    $t20 := $Eq($t18, $t19)
+                    // if ($t20) goto L4 else goto L3
+                    switch $t20
                     case 0  { $block := 7 }
-                    default { $block := 8 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
                 }
                 case 7 {
-                    // label L5
-                    // $t30 := 98
-                    $t30 := 98
-                    // abort($t30)
-                    $Abort($t30)
+                    // label L3
+                    // $t21 := 97
+                    $t21 := 97
+                    // abort($t21)
+                    $Abort($t21)
                 }
                 case 8 {
-                    // label L4
-                    // $t31 := borrow_local($t2)
-                    $t31 := $MakePtr(false, add($locals, 32))
-                    // $t32 := 2
-                    $t32 := 2
-                    // $t33 := vector::borrow<u8>($t31, $t32)
-                    $t33 := A1_vector_borrow$u8$($t31, $t32)
-                    // $t34 := read_ref($t33)
-                    $t34 := $LoadU8($t33)
-                    // $t35 := 99
-                    $t35 := 99
-                    // $t36 := ==($t34, $t35)
-                    $t36 := $Eq($t34, $t35)
-                    // if ($t36) goto L6 else goto L7
-                    switch $t36
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    // label L5
+                    // $t22 := borrow_local($t1)
+                    $t22 := $MakePtr(false, add($locals, 32))
+                    // $t23 := 1
+                    $t23 := 1
+                    // $t24 := vector::borrow<u8>($t22, $t23)
+                    $t24 := A1_vector_borrow$u8$($t22, $t23)
+                    // $t25 := read_ref($t24)
+                    $t25 := $LoadU8($t24)
+                    // $t26 := 98
+                    $t26 := 98
+                    // $t27 := ==($t25, $t26)
+                    $t27 := $Eq($t25, $t26)
+                    // if ($t27) goto L7 else goto L6
+                    switch $t27
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
                 case 9 {
                     // label L7
-                    // $t37 := 99
-                    $t37 := 99
-                    // abort($t37)
-                    $Abort($t37)
+                    // goto L8
+                    $block := 11
                 }
                 case 10 {
                     // label L6
-                    // $t38 := [101, 102, 103, 104]
-                    $t38 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
-                    $MemoryStoreU64($t38, 4)
-                    $MemoryStoreU64(add($t38, 8), $ClosestGreaterPowerOfTwo(4))
-                    copy_literal_string_to_memory_2788570470(add($t38, 32))
-                    // $t39 := 0x3
-                    $t39 := 0x3
-                    // $t40 := borrow_global<M::T>($t39)
+                    // $t28 := 98
+                    $t28 := 98
+                    // abort($t28)
+                    $Abort($t28)
+                }
+                case 11 {
+                    // label L8
+                    // $t29 := borrow_local($t1)
+                    $t29 := $MakePtr(false, add($locals, 32))
+                    // $t30 := 2
+                    $t30 := 2
+                    // $t31 := vector::borrow<u8>($t29, $t30)
+                    $t31 := A1_vector_borrow$u8$($t29, $t30)
+                    // $t32 := read_ref($t31)
+                    $t32 := $LoadU8($t31)
+                    // $t33 := 99
+                    $t33 := 99
+                    // $t34 := ==($t32, $t33)
+                    $t34 := $Eq($t32, $t33)
+                    // if ($t34) goto L10 else goto L9
+                    switch $t34
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
+                }
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
+                    // $t35 := 99
+                    $t35 := 99
+                    // abort($t35)
+                    $Abort($t35)
+                }
+                case 14 {
+                    // label L11
+                    // $t36 := [101, 102, 103, 104]
+                    $t36 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t36, 4)
+                    $MemoryStoreU64(add($t36, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_2788570470(add($t36, 32))
+                    // $t37 := 0x3
+                    $t37 := 0x3
+                    // $t38 := borrow_global<M::T>($t37)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t39)
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t37)
                         if iszero($AlignedStorageLoad($base_offset)) {
                           $AbortBuiltin()
                         }
-                        $t40 := $MakePtr(true, add($base_offset, 32))
+                        $t38 := $MakePtr(true, add($base_offset, 32))
                     }
-                    // $t41 := borrow_field<M::T>.s($t40)
-                    $t41 := $t40
-                    // write_ref($t41, $t38)
-                    if $IsStoragePtr($t41){
+                    // $t39 := borrow_field<M::T>.s($t38)
+                    $t39 := $t38
+                    // write_ref($t39, $t36)
+                    if $IsStoragePtr($t39){
                         let $storage_ptr_2300595445 := $NewLinkedStorageBase(0x89204cf5)
-                        let $size_2300595445 := $MemoryLoadU64($t38)
+                        let $size_2300595445 := $MemoryLoadU64($t36)
                         let $data_size_2300595445 := mul($size_2300595445, 1)
-                        $AlignedStorageStore($storage_ptr_2300595445, mload($t38))
-                        let $data_src_2300595445 := add($t38, 32)
+                        $AlignedStorageStore($storage_ptr_2300595445, mload($t36))
+                        let $data_src_2300595445 := add($t36, 32)
                         let $data_dst_2300595445 := add($storage_ptr_2300595445, 32)
                         for { let $offs_2300595445 := 0 } lt($offs_2300595445, $data_size_2300595445) { $offs_2300595445 := add($offs_2300595445, 32)} {
                             $AlignedStorageStore(add($data_dst_2300595445, $offs_2300595445), mload(add($data_src_2300595445, $offs_2300595445)))
                         }
-                        $t38 := $storage_ptr_2300595445
+                        $t36 := $storage_ptr_2300595445
                     }
-                    $StoreU256($t41, $t38)
-                    // $t42 := 0x3
-                    $t42 := 0x3
-                    // $t43 := borrow_global<M::T>($t42)
+                    $StoreU256($t39, $t36)
+                    // $t40 := 0x3
+                    $t40 := 0x3
+                    // $t41 := borrow_global<M::T>($t40)
                     {
-                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t42)
+                        let $base_offset := $MakeTypeStorageBase(0, 0x3948ca0a, $t40)
                         if iszero($AlignedStorageLoad($base_offset)) {
                           $AbortBuiltin()
                         }
-                        $t43 := $MakePtr(true, add($base_offset, 32))
+                        $t41 := $MakePtr(true, add($base_offset, 32))
                     }
-                    // $t44 := borrow_field<M::T>.s($t43)
-                    $t44 := $t43
-                    // $t3 := read_ref($t44)
-                    mstore(add($locals, 64), $LoadU256($t44))
-                    if $IsStoragePtr($t44){
+                    // $t42 := borrow_field<M::T>.s($t41)
+                    $t42 := $t41
+                    // $t2 := read_ref($t42)
+                    mstore(add($locals, 64), $LoadU256($t42))
+                    if $IsStoragePtr($t42){
                         let $storage_ptr_2300595445
                         let $size_2300595445 := $StorageLoadU64(mload(add($locals, 64)))
                         let $capacity_2300595445 := $ClosestGreaterPowerOfTwo($size_2300595445)
@@ -286,132 +306,157 @@ object "test_A2_M_h1" {
                         }
                         mstore(add($locals, 64), $storage_ptr_2300595445)
                     }
-                    // $t45 := borrow_local($t3)
-                    $t45 := $MakePtr(false, add($locals, 64))
-                    // $t46 := vector::length<u8>($t45)
-                    $t46 := A1_vector_length$u8$($t45)
-                    // $t47 := 4
-                    $t47 := 4
-                    // $t48 := ==($t46, $t47)
-                    $t48 := $Eq($t46, $t47)
-                    // if ($t48) goto L8 else goto L9
-                    switch $t48
-                    case 0  { $block := 11 }
-                    default { $block := 12 }
+                    // $t43 := borrow_local($t2)
+                    $t43 := $MakePtr(false, add($locals, 64))
+                    // $t44 := vector::length<u8>($t43)
+                    $t44 := A1_vector_length$u8$($t43)
+                    // $t45 := 4
+                    $t45 := 4
+                    // $t46 := ==($t44, $t45)
+                    $t46 := $Eq($t44, $t45)
+                    // if ($t46) goto L13 else goto L12
+                    switch $t46
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
                 }
-                case 11 {
-                    // label L9
-                    // $t49 := 100
-                    $t49 := 100
-                    // abort($t49)
-                    $Abort($t49)
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
                 }
-                case 12 {
-                    // label L8
-                    // $t50 := borrow_local($t3)
-                    $t50 := $MakePtr(false, add($locals, 64))
-                    // $t51 := 0
-                    $t51 := 0
-                    // $t52 := vector::borrow<u8>($t50, $t51)
-                    $t52 := A1_vector_borrow$u8$($t50, $t51)
-                    // $t53 := read_ref($t52)
-                    $t53 := $LoadU8($t52)
+                case 16 {
+                    // label L12
+                    // $t47 := 100
+                    $t47 := 100
+                    // abort($t47)
+                    $Abort($t47)
+                }
+                case 17 {
+                    // label L14
+                    // $t48 := borrow_local($t2)
+                    $t48 := $MakePtr(false, add($locals, 64))
+                    // $t49 := 0
+                    $t49 := 0
+                    // $t50 := vector::borrow<u8>($t48, $t49)
+                    $t50 := A1_vector_borrow$u8$($t48, $t49)
+                    // $t51 := read_ref($t50)
+                    $t51 := $LoadU8($t50)
+                    // $t52 := 101
+                    $t52 := 101
+                    // $t53 := ==($t51, $t52)
+                    $t53 := $Eq($t51, $t52)
+                    // if ($t53) goto L16 else goto L15
+                    switch $t53
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
+                }
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
                     // $t54 := 101
                     $t54 := 101
-                    // $t55 := ==($t53, $t54)
-                    $t55 := $Eq($t53, $t54)
-                    // if ($t55) goto L10 else goto L11
-                    switch $t55
-                    case 0  { $block := 13 }
-                    default { $block := 14 }
+                    // abort($t54)
+                    $Abort($t54)
                 }
-                case 13 {
-                    // label L11
-                    // $t56 := 101
-                    $t56 := 101
-                    // abort($t56)
-                    $Abort($t56)
+                case 20 {
+                    // label L17
+                    // $t55 := borrow_local($t2)
+                    $t55 := $MakePtr(false, add($locals, 64))
+                    // $t56 := 1
+                    $t56 := 1
+                    // $t57 := vector::borrow<u8>($t55, $t56)
+                    $t57 := A1_vector_borrow$u8$($t55, $t56)
+                    // $t58 := read_ref($t57)
+                    $t58 := $LoadU8($t57)
+                    // $t59 := 102
+                    $t59 := 102
+                    // $t60 := ==($t58, $t59)
+                    $t60 := $Eq($t58, $t59)
+                    // if ($t60) goto L19 else goto L18
+                    switch $t60
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
                 }
-                case 14 {
-                    // label L10
-                    // $t57 := borrow_local($t3)
-                    $t57 := $MakePtr(false, add($locals, 64))
-                    // $t58 := 1
-                    $t58 := 1
-                    // $t59 := vector::borrow<u8>($t57, $t58)
-                    $t59 := A1_vector_borrow$u8$($t57, $t58)
-                    // $t60 := read_ref($t59)
-                    $t60 := $LoadU8($t59)
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
                     // $t61 := 102
                     $t61 := 102
-                    // $t62 := ==($t60, $t61)
-                    $t62 := $Eq($t60, $t61)
-                    // if ($t62) goto L12 else goto L13
-                    switch $t62
-                    case 0  { $block := 15 }
-                    default { $block := 16 }
+                    // abort($t61)
+                    $Abort($t61)
                 }
-                case 15 {
-                    // label L13
-                    // $t63 := 102
-                    $t63 := 102
-                    // abort($t63)
-                    $Abort($t63)
+                case 23 {
+                    // label L20
+                    // $t62 := borrow_local($t2)
+                    $t62 := $MakePtr(false, add($locals, 64))
+                    // $t63 := 2
+                    $t63 := 2
+                    // $t64 := vector::borrow<u8>($t62, $t63)
+                    $t64 := A1_vector_borrow$u8$($t62, $t63)
+                    // $t65 := read_ref($t64)
+                    $t65 := $LoadU8($t64)
+                    // $t66 := 103
+                    $t66 := 103
+                    // $t67 := ==($t65, $t66)
+                    $t67 := $Eq($t65, $t66)
+                    // if ($t67) goto L22 else goto L21
+                    switch $t67
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
                 }
-                case 16 {
-                    // label L12
-                    // $t64 := borrow_local($t3)
-                    $t64 := $MakePtr(false, add($locals, 64))
-                    // $t65 := 2
-                    $t65 := 2
-                    // $t66 := vector::borrow<u8>($t64, $t65)
-                    $t66 := A1_vector_borrow$u8$($t64, $t65)
-                    // $t67 := read_ref($t66)
-                    $t67 := $LoadU8($t66)
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
                     // $t68 := 103
                     $t68 := 103
-                    // $t69 := ==($t67, $t68)
-                    $t69 := $Eq($t67, $t68)
-                    // if ($t69) goto L14 else goto L15
-                    switch $t69
-                    case 0  { $block := 17 }
-                    default { $block := 18 }
+                    // abort($t68)
+                    $Abort($t68)
                 }
-                case 17 {
-                    // label L15
-                    // $t70 := 103
-                    $t70 := 103
-                    // abort($t70)
-                    $Abort($t70)
+                case 26 {
+                    // label L23
+                    // $t69 := borrow_local($t2)
+                    $t69 := $MakePtr(false, add($locals, 64))
+                    // $t70 := 3
+                    $t70 := 3
+                    // $t71 := vector::borrow<u8>($t69, $t70)
+                    $t71 := A1_vector_borrow$u8$($t69, $t70)
+                    // $t72 := read_ref($t71)
+                    $t72 := $LoadU8($t71)
+                    // $t73 := 104
+                    $t73 := 104
+                    // $t74 := ==($t72, $t73)
+                    $t74 := $Eq($t72, $t73)
+                    // if ($t74) goto L25 else goto L24
+                    switch $t74
+                    case 0  { $block := 28 }
+                    default { $block := 27 }
                 }
-                case 18 {
-                    // label L14
-                    // $t71 := borrow_local($t3)
-                    $t71 := $MakePtr(false, add($locals, 64))
-                    // $t72 := 3
-                    $t72 := 3
-                    // $t73 := vector::borrow<u8>($t71, $t72)
-                    $t73 := A1_vector_borrow$u8$($t71, $t72)
-                    // $t74 := read_ref($t73)
-                    $t74 := $LoadU8($t73)
+                case 27 {
+                    // label L25
+                    // goto L26
+                    $block := 29
+                }
+                case 28 {
+                    // label L24
                     // $t75 := 104
                     $t75 := 104
-                    // $t76 := ==($t74, $t75)
-                    $t76 := $Eq($t74, $t75)
-                    // if ($t76) goto L16 else goto L17
-                    switch $t76
-                    case 0  { $block := 19 }
-                    default { $block := 20 }
-                }
-                case 19 {
-                    // label L17
-                    // $t77 := 104
-                    $t77 := 104
-                    // abort($t77)
-                    $Abort($t77)
+                    // abort($t75)
+                    $Abort($t75)
                 }
-                case 20 {
-                    // label L16
+                case 29 {
+                    // label L26
                     // return ()
                     $Free($locals, 96)
                     leave
@@ -669,7 +714,7 @@ object "test_A2_M_h1" {
         }
     }
 }
-===> Test result of M::h1: Succeed(Stopped) (used_gas=166469): []
+===> Test result of M::h1: Succeed(Stopped) (used_gas=170443): []
 
 // test of M::test_same_literals
 /* =======================================
@@ -711,21 +756,21 @@ object "test_A2_M_test_same_literals" {
             for {} true {} {
                 switch $block
                 case 2 {
-                    // label L0
+                    // label L1
                     // Evm::abort_with($t1)
                     A2_Evm_abort_with(message)
-                    // goto L2
+                    // goto L0
                     $block := 3
                 }
                 case 3 {
-                    // label L2
+                    // label L0
                     // return ()
                     leave
                 }
                 case 4 {
                     // $t2 := !($t0)
                     $t2 := $LogicalNot(cond)
-                    // if ($t2) goto L0 else goto L2
+                    // if ($t2) goto L1 else goto L0
                     switch $t2
                     case 0  { $block := 3 }
                     default { $block := 2 }
diff --git a/language/evm/move-to-yul/tests/U256Arith.exp b/language/evm/move-to-yul/tests/U256Arith.exp
index b1bdfef100..1a2b2270f1 100644
--- a/language/evm/move-to-yul/tests/U256Arith.exp
+++ b/language/evm/move-to-yul/tests/U256Arith.exp
@@ -308,27 +308,27 @@ object "A2_U256Arith" {
             }
 
             function A2_U256Arith_shl() -> $result {
-                let x, $t1, $t2, $t3
-                // $t1 := 2041694201525630780780247644590609268738
-                $t1 := 2041694201525630780780247644590609268738
-                // $t2 := 127
-                $t2 := 127
-                // $t3 := <<($t1, $t2)
-                $t3 := $ShlU256($t1, $t2)
-                // return $t3
-                $result := $t3
+                let $t0, $t1, $t2
+                // $t0 := 2041694201525630780780247644590609268738
+                $t0 := 2041694201525630780780247644590609268738
+                // $t1 := 127
+                $t1 := 127
+                // $t2 := <<($t0, $t1)
+                $t2 := $ShlU256($t0, $t1)
+                // return $t2
+                $result := $t2
             }
 
             function A2_U256Arith_shr() -> $result {
-                let x, $t1, $t2, $t3
-                // $t1 := 2041694201525630780780247644590609268738
-                $t1 := 2041694201525630780780247644590609268738
-                // $t2 := 127
-                $t2 := 127
-                // $t3 := >>($t1, $t2)
-                $t3 := $Shr($t1, $t2)
-                // return $t3
-                $result := $t3
+                let $t0, $t1, $t2
+                // $t0 := 2041694201525630780780247644590609268738
+                $t0 := 2041694201525630780780247644590609268738
+                // $t1 := 127
+                $t1 := 127
+                // $t2 := >>($t0, $t1)
+                $t2 := $Shr($t0, $t1)
+                // return $t2
+                $result := $t2
             }
 
             function A2_U256Arith_sub() -> $result {
diff --git a/language/evm/move-to-yul/tests/Vectors.exp b/language/evm/move-to-yul/tests/Vectors.exp
index ed194e1cc6..6bca84ca77 100644
--- a/language/evm/move-to-yul/tests/Vectors.exp
+++ b/language/evm/move-to-yul/tests/Vectors.exp
@@ -38,13 +38,34 @@ object "A2_Vectors" {
                     switch $block
                     case 2 {
                         // label L1
+                        // goto L2
+                        $block := 5
+                    }
+                    case 3 {
+                        // label L0
                         // $t5 := 101
                         $t5 := 101
                         // abort($t5)
                         $Abort($t5)
                     }
-                    case 3 {
-                        // label L0
+                    case 4 {
+                        // $t0 := Vectors::one_elem_u64()
+                        mstore($locals, A2_Vectors_one_elem_u64())
+                        // $t1 := borrow_local($t0)
+                        $t1 := $MakePtr(false, $locals)
+                        // $t2 := vector::length<u64>($t1)
+                        $t2 := A1_vector_length$u64$($t1)
+                        // $t3 := 1
+                        $t3 := 1
+                        // $t4 := ==($t2, $t3)
+                        $t4 := $Eq($t2, $t3)
+                        // if ($t4) goto L1 else goto L0
+                        switch $t4
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
                         // $t6 := borrow_local($t0)
                         $t6 := $MakePtr(false, $locals)
                         // $t7 := 0
@@ -57,36 +78,25 @@ object "A2_Vectors" {
                         $t10 := 42
                         // $t11 := ==($t9, $t10)
                         $t11 := $Eq($t9, $t10)
-                        // if ($t11) goto L2 else goto L3
+                        // if ($t11) goto L4 else goto L3
                         switch $t11
-                        case 0  { $block := 5 }
+                        case 0  { $block := 7 }
                         default { $block := 6 }
                     }
-                    case 4 {
-                        // $t0 := Vectors::one_elem_u64()
-                        mstore($locals, A2_Vectors_one_elem_u64())
-                        // $t1 := borrow_local($t0)
-                        $t1 := $MakePtr(false, $locals)
-                        // $t2 := vector::length<u64>($t1)
-                        $t2 := A1_vector_length$u64$($t1)
-                        // $t3 := 1
-                        $t3 := 1
-                        // $t4 := ==($t2, $t3)
-                        $t4 := $Eq($t2, $t3)
-                        // if ($t4) goto L0 else goto L1
-                        switch $t4
-                        case 0  { $block := 2 }
-                        default { $block := 3 }
+                    case 6 {
+                        // label L4
+                        // goto L5
+                        $block := 8
                     }
-                    case 5 {
+                    case 7 {
                         // label L3
                         // $t12 := 102
                         $t12 := 102
                         // abort($t12)
                         $Abort($t12)
                     }
-                    case 6 {
-                        // label L2
+                    case 8 {
+                        // label L5
                         // return ()
                         $Free($locals, 32)
                         leave
@@ -94,6 +104,13 @@ object "A2_Vectors" {
                 }
             }
 
+            function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+                let v_offs := $LoadU256(v_ref)
+                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+                let size := $LoadU64(v_ptr)
+                if $GtEq(i, size) { $AbortBuiltin() }
+                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+            }
             function A1_vector_length$u64$(v_ref) -> len {
                 let v_offs := $LoadU256(v_ref)
                 let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
@@ -135,13 +152,6 @@ object "A2_Vectors" {
                 vector := $Malloc(48)
                 $MemoryStoreU64(add(vector, 8), 2)
             }
-            function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
-                let v_offs := $LoadU256(v_ref)
-                let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
-                let size := $LoadU64(v_ptr)
-                if $GtEq(i, size) { $AbortBuiltin() }
-                e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
-            }
             function abi_encode_tuple__(headStart ) -> tail {
                 tail := add(headStart, 0)
             }
@@ -383,17 +393,16 @@ object "test_A2_Vectors_test_borrow_fail" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t7 := 101
                     $t7 := 101
                     // abort($t7)
                     $Abort($t7)
                 }
-                case 3 {
-                    // label L0
-                    // return ()
-                    $Free($locals, 32)
-                    leave
-                }
                 case 4 {
                     // $t0 := Vectors::empty_vector()
                     mstore($locals, A2_Vectors_empty_vector())
@@ -409,10 +418,16 @@ object "test_A2_Vectors_test_borrow_fail" {
                     $t5 := 0
                     // $t6 := ==($t4, $t5)
                     $t6 := $Eq($t4, $t5)
-                    // if ($t6) goto L0 else goto L1
+                    // if ($t6) goto L1 else goto L0
                     switch $t6
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
                 }
             }
         }
@@ -565,7 +580,7 @@ object "test_A2_Vectors_test_borrow_fail" {
         }
     }
 }
-===> Test result of Vectors::test_borrow_fail: Revert(Reverted) (used_gas=468): [255, 255, 255, 255, 255, 255, 255, 255]
+===> Test result of Vectors::test_borrow_fail: Revert(Reverted) (used_gas=470): [255, 255, 255, 255, 255, 255, 255, 255]
 
 // test of Vectors::test_borrow_mut
 /* =======================================
@@ -586,32 +601,16 @@ object "test_A2_Vectors_test_borrow_mut" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t24 := 101
                     $t24 := 101
                     // abort($t24)
                     $Abort($t24)
                 }
-                case 3 {
-                    // label L0
-                    // $t25 := borrow_local($t2)
-                    $t25 := $MakePtr(false, $locals)
-                    // $t26 := 0
-                    $t26 := 0
-                    // $t27 := vector::borrow<Vectors::S>($t25, $t26)
-                    $t27 := A1_vector_borrow$A2_Vectors_S$($t25, $t26)
-                    // $t28 := borrow_field<Vectors::S>.y($t27)
-                    $t28 := $IndexPtr($t27, 24)
-                    // $t29 := read_ref($t28)
-                    $t29 := $LoadU8($t28)
-                    // $t30 := false
-                    $t30 := false
-                    // $t31 := ==($t29, $t30)
-                    $t31 := $Eq($t29, $t30)
-                    // if ($t31) goto L2 else goto L3
-                    switch $t31
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t2 := Vectors::one_elem_struct()
                     mstore($locals, A2_Vectors_one_elem_struct())
@@ -671,20 +670,46 @@ object "test_A2_Vectors_test_borrow_mut" {
                     $t22 := 90
                     // $t23 := ==($t21, $t22)
                     $t23 := $Eq($t21, $t22)
-                    // if ($t23) goto L0 else goto L1
+                    // if ($t23) goto L1 else goto L0
                     switch $t23
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t25 := borrow_local($t2)
+                    $t25 := $MakePtr(false, $locals)
+                    // $t26 := 0
+                    $t26 := 0
+                    // $t27 := vector::borrow<Vectors::S>($t25, $t26)
+                    $t27 := A1_vector_borrow$A2_Vectors_S$($t25, $t26)
+                    // $t28 := borrow_field<Vectors::S>.y($t27)
+                    $t28 := $IndexPtr($t27, 24)
+                    // $t29 := read_ref($t28)
+                    $t29 := $LoadU8($t28)
+                    // $t30 := false
+                    $t30 := false
+                    // $t31 := ==($t29, $t30)
+                    $t31 := $Eq($t29, $t30)
+                    // if ($t31) goto L4 else goto L3
+                    switch $t31
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t32 := 102
                     $t32 := 102
                     // abort($t32)
                     $Abort($t32)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t33 := borrow_local($t2)
                     $t33 := $MakePtr(false, $locals)
                     // $t34 := 0
@@ -699,20 +724,25 @@ object "test_A2_Vectors_test_borrow_mut" {
                     $t38 := 1028
                     // $t39 := ==($t37, $t38)
                     $t39 := $Eq($t37, $t38)
-                    // if ($t39) goto L4 else goto L5
+                    // if ($t39) goto L7 else goto L6
                     switch $t39
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t40 := 103
                     $t40 := 103
                     // abort($t40)
                     $Abort($t40)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t41 := borrow_local($t2)
                     $t41 := $MakePtr(false, $locals)
                     // $t42 := 1
@@ -727,20 +757,25 @@ object "test_A2_Vectors_test_borrow_mut" {
                     $t46 := 45
                     // $t47 := ==($t45, $t46)
                     $t47 := $Eq($t45, $t46)
-                    // if ($t47) goto L6 else goto L7
+                    // if ($t47) goto L10 else goto L9
                     switch $t47
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t48 := 104
                     $t48 := 104
                     // abort($t48)
                     $Abort($t48)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // $t49 := borrow_local($t2)
                     $t49 := $MakePtr(false, $locals)
                     // $t50 := 1
@@ -755,20 +790,25 @@ object "test_A2_Vectors_test_borrow_mut" {
                     $t54 := false
                     // $t55 := ==($t53, $t54)
                     $t55 := $Eq($t53, $t54)
-                    // if ($t55) goto L8 else goto L9
+                    // if ($t55) goto L13 else goto L12
                     switch $t55
-                    case 0  { $block := 11 }
-                    default { $block := 12 }
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
                 }
-                case 11 {
-                    // label L9
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
                     // $t56 := 105
                     $t56 := 105
                     // abort($t56)
                     $Abort($t56)
                 }
-                case 12 {
-                    // label L8
+                case 17 {
+                    // label L14
                     // $t57 := borrow_local($t2)
                     $t57 := $MakePtr(false, $locals)
                     // $t58 := 1
@@ -783,20 +823,25 @@ object "test_A2_Vectors_test_borrow_mut" {
                     $t62 := 123
                     // $t63 := ==($t61, $t62)
                     $t63 := $Eq($t61, $t62)
-                    // if ($t63) goto L10 else goto L11
+                    // if ($t63) goto L16 else goto L15
                     switch $t63
-                    case 0  { $block := 13 }
-                    default { $block := 14 }
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
                 }
-                case 13 {
-                    // label L11
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
                     // $t64 := 106
                     $t64 := 106
                     // abort($t64)
                     $Abort($t64)
                 }
-                case 14 {
-                    // label L10
+                case 20 {
+                    // label L17
                     // $t65 := borrow_local($t2)
                     $t65 := $MakePtr(false, $locals)
                     // $t66 := 1
@@ -835,20 +880,25 @@ object "test_A2_Vectors_test_borrow_mut" {
                     $t79 := 10
                     // $t80 := ==($t78, $t79)
                     $t80 := $Eq($t78, $t79)
-                    // if ($t80) goto L12 else goto L13
+                    // if ($t80) goto L19 else goto L18
                     switch $t80
-                    case 0  { $block := 15 }
-                    default { $block := 16 }
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
                 }
-                case 15 {
-                    // label L13
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
                     // $t81 := 107
                     $t81 := 107
                     // abort($t81)
                     $Abort($t81)
                 }
-                case 16 {
-                    // label L12
+                case 23 {
+                    // label L20
                     // $t82 := borrow_local($t2)
                     $t82 := $MakePtr(false, $locals)
                     // $t83 := 1
@@ -863,20 +913,25 @@ object "test_A2_Vectors_test_borrow_mut" {
                     $t87 := true
                     // $t88 := ==($t86, $t87)
                     $t88 := $Eq($t86, $t87)
-                    // if ($t88) goto L14 else goto L15
+                    // if ($t88) goto L22 else goto L21
                     switch $t88
-                    case 0  { $block := 17 }
-                    default { $block := 18 }
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
                 }
-                case 17 {
-                    // label L15
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
                     // $t89 := 108
                     $t89 := 108
                     // abort($t89)
                     $Abort($t89)
                 }
-                case 18 {
-                    // label L14
+                case 26 {
+                    // label L23
                     // $t90 := borrow_local($t2)
                     $t90 := $MakePtr(false, $locals)
                     // $t91 := 1
@@ -891,20 +946,25 @@ object "test_A2_Vectors_test_borrow_mut" {
                     $t95 := 456
                     // $t96 := ==($t94, $t95)
                     $t96 := $Eq($t94, $t95)
-                    // if ($t96) goto L16 else goto L17
+                    // if ($t96) goto L25 else goto L24
                     switch $t96
-                    case 0  { $block := 19 }
-                    default { $block := 20 }
+                    case 0  { $block := 28 }
+                    default { $block := 27 }
                 }
-                case 19 {
-                    // label L17
+                case 27 {
+                    // label L25
+                    // goto L26
+                    $block := 29
+                }
+                case 28 {
+                    // label L24
                     // $t97 := 109
                     $t97 := 109
                     // abort($t97)
                     $Abort($t97)
                 }
-                case 20 {
-                    // label L16
+                case 29 {
+                    // label L26
                     // return ()
                     $Free($locals, 32)
                     leave
@@ -1271,7 +1331,7 @@ object "test_A2_Vectors_test_borrow_mut" {
         }
     }
 }
-===> Test result of Vectors::test_borrow_mut: Succeed(Stopped) (used_gas=10908): []
+===> Test result of Vectors::test_borrow_mut: Succeed(Stopped) (used_gas=14880): []
 
 // test of Vectors::test_destroy_empty
 /* =======================================
@@ -1285,11 +1345,11 @@ object "test_A2_Vectors_test_destroy_empty" {
         A2_Vectors_test_destroy_empty()
         return (0, 0)
         function A2_Vectors_test_destroy_empty() {
-            let v, $t1
-            // $t1 := vector::empty<address>()
-            $t1 := A1_vector_empty$address$()
-            // vector::destroy_empty<address>($t1)
-            A1_vector_destroy_empty$address$($t1)
+            let $t0
+            // $t0 := vector::empty<address>()
+            $t0 := A1_vector_empty$address$()
+            // vector::destroy_empty<address>($t0)
+            A1_vector_destroy_empty$address$($t0)
             // return ()
         }
 
@@ -1355,11 +1415,11 @@ object "test_A2_Vectors_test_destroy_non_empty_fail" {
         A2_Vectors_test_destroy_non_empty_fail()
         return (0, 0)
         function A2_Vectors_test_destroy_non_empty_fail() {
-            let v, $t1
-            // $t1 := Vectors::one_elem_struct()
-            $t1 := A2_Vectors_one_elem_struct()
-            // vector::destroy_empty<Vectors::S>($t1)
-            A1_vector_destroy_empty$A2_Vectors_S$($t1)
+            let $t0
+            // $t0 := Vectors::one_elem_struct()
+            $t0 := A2_Vectors_one_elem_struct()
+            // vector::destroy_empty<Vectors::S>($t0)
+            A1_vector_destroy_empty$A2_Vectors_S$($t0)
             // return ()
         }
 
@@ -1667,17 +1727,16 @@ object "test_A2_Vectors_test_empty" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t5 := 101
                     $t5 := 101
                     // abort($t5)
                     $Abort($t5)
                 }
-                case 3 {
-                    // label L0
-                    // return ()
-                    $Free($locals, 32)
-                    leave
-                }
                 case 4 {
                     // $t0 := Vectors::empty_vector()
                     mstore($locals, A2_Vectors_empty_vector())
@@ -1689,10 +1748,16 @@ object "test_A2_Vectors_test_empty" {
                     $t3 := 0
                     // $t4 := ==($t2, $t3)
                     $t4 := $Eq($t2, $t3)
-                    // if ($t4) goto L0 else goto L1
+                    // if ($t4) goto L1 else goto L0
                     switch $t4
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
+                    // return ()
+                    $Free($locals, 32)
+                    leave
                 }
             }
         }
@@ -1834,7 +1899,7 @@ object "test_A2_Vectors_test_empty" {
         }
     }
 }
-===> Test result of Vectors::test_empty: Succeed(Stopped) (used_gas=522): []
+===> Test result of Vectors::test_empty: Succeed(Stopped) (used_gas=605): []
 
 // test of Vectors::test_nested_vector_equality
 /* =======================================
@@ -1855,13 +1920,34 @@ object "test_A2_Vectors_test_nested_vector_equality" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t5 := 101
                     $t5 := 101
                     // abort($t5)
                     $Abort($t5)
                 }
-                case 3 {
-                    // label L0
+                case 4 {
+                    // $t0 := vector::empty<vector<u8>>()
+                    mstore($locals, A1_vector_empty$vec$u8$$())
+                    // $t1 := vector::empty<vector<u8>>()
+                    mstore(add($locals, 32), A1_vector_empty$vec$u8$$())
+                    // $t2 := copy($t0)
+                    $t2 := mload($locals)
+                    // $t3 := copy($t1)
+                    $t3 := mload(add($locals, 32))
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq_$vec$vec$u8$$$($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
                     // $t6 := borrow_local($t0)
                     $t6 := $MakePtr(false, $locals)
                     // $t7 := [97, 98, 99]
@@ -1886,36 +1972,25 @@ object "test_A2_Vectors_test_nested_vector_equality" {
                     $t11 := mload(add($locals, 32))
                     // $t12 := ==($t10, $t11)
                     $t12 := $Eq_$vec$vec$u8$$$($t10, $t11)
-                    // if ($t12) goto L2 else goto L3
+                    // if ($t12) goto L4 else goto L3
                     switch $t12
-                    case 0  { $block := 5 }
+                    case 0  { $block := 7 }
                     default { $block := 6 }
                 }
-                case 4 {
-                    // $t0 := vector::empty<vector<u8>>()
-                    mstore($locals, A1_vector_empty$vec$u8$$())
-                    // $t1 := vector::empty<vector<u8>>()
-                    mstore(add($locals, 32), A1_vector_empty$vec$u8$$())
-                    // $t2 := copy($t0)
-                    $t2 := mload($locals)
-                    // $t3 := copy($t1)
-                    $t3 := mload(add($locals, 32))
-                    // $t4 := ==($t2, $t3)
-                    $t4 := $Eq_$vec$vec$u8$$$($t2, $t3)
-                    // if ($t4) goto L0 else goto L1
-                    switch $t4
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
                 }
-                case 5 {
+                case 7 {
                     // label L3
                     // $t13 := 102
                     $t13 := 102
                     // abort($t13)
                     $Abort($t13)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t14 := borrow_local($t0)
                     $t14 := $MakePtr(false, $locals)
                     // $t15 := [100, 101, 102]
@@ -1940,20 +2015,25 @@ object "test_A2_Vectors_test_nested_vector_equality" {
                     $t19 := mload(add($locals, 32))
                     // $t20 := ==($t18, $t19)
                     $t20 := $Eq_$vec$vec$u8$$$($t18, $t19)
-                    // if ($t20) goto L4 else goto L5
+                    // if ($t20) goto L7 else goto L6
                     switch $t20
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t21 := 103
                     $t21 := 103
                     // abort($t21)
                     $Abort($t21)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t22 := borrow_local($t0)
                     $t22 := $MakePtr(false, $locals)
                     // $t23 := [103, 104, 105]
@@ -1978,20 +2058,25 @@ object "test_A2_Vectors_test_nested_vector_equality" {
                     $t27 := mload(add($locals, 32))
                     // $t28 := !=($t26, $t27)
                     $t28 := $LogicalNot($Eq_$vec$vec$u8$$$($t26, $t27))
-                    // if ($t28) goto L6 else goto L7
+                    // if ($t28) goto L10 else goto L9
                     switch $t28
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t29 := 104
                     $t29 := 104
                     // abort($t29)
                     $Abort($t29)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // return ()
                     $Free($locals, 64)
                     leave
@@ -2338,7 +2423,7 @@ object "test_A2_Vectors_test_nested_vector_equality" {
         }
     }
 }
-===> Test result of Vectors::test_nested_vector_equality: Succeed(Stopped) (used_gas=10145): []
+===> Test result of Vectors::test_nested_vector_equality: Succeed(Stopped) (used_gas=11041): []
 
 // test of Vectors::test_nested_vectors
 /* =======================================
@@ -2359,30 +2444,16 @@ object "test_A2_Vectors_test_nested_vectors" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t32 := 101
                     $t32 := 101
                     // abort($t32)
                     $Abort($t32)
                 }
-                case 3 {
-                    // label L0
-                    // $t33 := borrow_local($t0)
-                    $t33 := $MakePtr(false, add($locals, 96))
-                    // $t34 := 0
-                    $t34 := 0
-                    // $t35 := vector::borrow<vector<u64>>($t33, $t34)
-                    $t35 := A1_vector_borrow$vec$u64$$($t33, $t34)
-                    // $t36 := vector::length<u64>($t35)
-                    $t36 := A1_vector_length$u64$($t35)
-                    // $t37 := 2
-                    $t37 := 2
-                    // $t38 := ==($t36, $t37)
-                    $t38 := $Eq($t36, $t37)
-                    // if ($t38) goto L2 else goto L3
-                    switch $t38
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t1 := vector::empty<u64>()
                     mstore($locals, A1_vector_empty$u64$())
@@ -2472,20 +2543,44 @@ object "test_A2_Vectors_test_nested_vectors" {
                     $t30 := 3
                     // $t31 := ==($t29, $t30)
                     $t31 := $Eq($t29, $t30)
-                    // if ($t31) goto L0 else goto L1
+                    // if ($t31) goto L1 else goto L0
                     switch $t31
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t33 := borrow_local($t0)
+                    $t33 := $MakePtr(false, add($locals, 96))
+                    // $t34 := 0
+                    $t34 := 0
+                    // $t35 := vector::borrow<vector<u64>>($t33, $t34)
+                    $t35 := A1_vector_borrow$vec$u64$$($t33, $t34)
+                    // $t36 := vector::length<u64>($t35)
+                    $t36 := A1_vector_length$u64$($t35)
+                    // $t37 := 2
+                    $t37 := 2
+                    // $t38 := ==($t36, $t37)
+                    $t38 := $Eq($t36, $t37)
+                    // if ($t38) goto L4 else goto L3
+                    switch $t38
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t39 := 102
                     $t39 := 102
                     // abort($t39)
                     $Abort($t39)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t40 := borrow_local($t0)
                     $t40 := $MakePtr(false, add($locals, 96))
                     // $t41 := 1
@@ -2498,20 +2593,25 @@ object "test_A2_Vectors_test_nested_vectors" {
                     $t44 := 3
                     // $t45 := ==($t43, $t44)
                     $t45 := $Eq($t43, $t44)
-                    // if ($t45) goto L4 else goto L5
+                    // if ($t45) goto L7 else goto L6
                     switch $t45
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t46 := 103
                     $t46 := 103
                     // abort($t46)
                     $Abort($t46)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t47 := borrow_local($t0)
                     $t47 := $MakePtr(false, add($locals, 96))
                     // $t48 := 2
@@ -2524,20 +2624,25 @@ object "test_A2_Vectors_test_nested_vectors" {
                     $t51 := 4
                     // $t52 := ==($t50, $t51)
                     $t52 := $Eq($t50, $t51)
-                    // if ($t52) goto L6 else goto L7
+                    // if ($t52) goto L10 else goto L9
                     switch $t52
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t53 := 104
                     $t53 := 104
                     // abort($t53)
                     $Abort($t53)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // $t54 := borrow_local($t0)
                     $t54 := $MakePtr(false, add($locals, 96))
                     // $t55 := 0
@@ -2554,20 +2659,25 @@ object "test_A2_Vectors_test_nested_vectors" {
                     $t60 := 10
                     // $t61 := ==($t59, $t60)
                     $t61 := $Eq($t59, $t60)
-                    // if ($t61) goto L8 else goto L9
+                    // if ($t61) goto L13 else goto L12
                     switch $t61
-                    case 0  { $block := 11 }
-                    default { $block := 12 }
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
                 }
-                case 11 {
-                    // label L9
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
                     // $t62 := 105
                     $t62 := 105
                     // abort($t62)
                     $Abort($t62)
                 }
-                case 12 {
-                    // label L8
+                case 17 {
+                    // label L14
                     // $t63 := borrow_local($t0)
                     $t63 := $MakePtr(false, add($locals, 96))
                     // $t64 := 1
@@ -2584,20 +2694,25 @@ object "test_A2_Vectors_test_nested_vectors" {
                     $t69 := 13
                     // $t70 := ==($t68, $t69)
                     $t70 := $Eq($t68, $t69)
-                    // if ($t70) goto L10 else goto L11
+                    // if ($t70) goto L16 else goto L15
                     switch $t70
-                    case 0  { $block := 13 }
-                    default { $block := 14 }
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
                 }
-                case 13 {
-                    // label L11
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
                     // $t71 := 105
                     $t71 := 105
                     // abort($t71)
                     $Abort($t71)
                 }
-                case 14 {
-                    // label L10
+                case 20 {
+                    // label L17
                     // $t72 := borrow_local($t0)
                     $t72 := $MakePtr(false, add($locals, 96))
                     // $t73 := 2
@@ -2614,20 +2729,25 @@ object "test_A2_Vectors_test_nested_vectors" {
                     $t78 := 17
                     // $t79 := ==($t77, $t78)
                     $t79 := $Eq($t77, $t78)
-                    // if ($t79) goto L12 else goto L13
+                    // if ($t79) goto L19 else goto L18
                     switch $t79
-                    case 0  { $block := 15 }
-                    default { $block := 16 }
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
                 }
-                case 15 {
-                    // label L13
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
                     // $t80 := 105
                     $t80 := 105
                     // abort($t80)
                     $Abort($t80)
                 }
-                case 16 {
-                    // label L12
+                case 23 {
+                    // label L20
                     // $t81 := borrow_local($t0)
                     $t81 := $MakePtr(false, add($locals, 96))
                     // $t82 := 2
@@ -2644,20 +2764,25 @@ object "test_A2_Vectors_test_nested_vectors" {
                     $t87 := 18
                     // $t88 := ==($t86, $t87)
                     $t88 := $Eq($t86, $t87)
-                    // if ($t88) goto L14 else goto L15
+                    // if ($t88) goto L22 else goto L21
                     switch $t88
-                    case 0  { $block := 17 }
-                    default { $block := 18 }
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
                 }
-                case 17 {
-                    // label L15
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
                     // $t89 := 105
                     $t89 := 105
                     // abort($t89)
                     $Abort($t89)
                 }
-                case 18 {
-                    // label L14
+                case 26 {
+                    // label L23
                     // return ()
                     $Free($locals, 128)
                     leave
@@ -2960,7 +3085,7 @@ object "test_A2_Vectors_test_nested_vectors" {
         }
     }
 }
-===> Test result of Vectors::test_nested_vectors: Succeed(Stopped) (used_gas=17759): []
+===> Test result of Vectors::test_nested_vectors: Succeed(Stopped) (used_gas=20935): []
 
 // test of Vectors::test_one_elem_struct
 /* =======================================
@@ -2981,13 +3106,34 @@ object "test_A2_Vectors_test_one_elem_struct" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t5 := 101
                     $t5 := 101
                     // abort($t5)
                     $Abort($t5)
                 }
-                case 3 {
-                    // label L0
+                case 4 {
+                    // $t0 := Vectors::one_elem_struct()
+                    mstore($locals, A2_Vectors_one_elem_struct())
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, $locals)
+                    // $t2 := vector::length<Vectors::S>($t1)
+                    $t2 := A1_vector_length$A2_Vectors_S$($t1)
+                    // $t3 := 1
+                    $t3 := 1
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
                     // $t6 := borrow_local($t0)
                     $t6 := $MakePtr(false, $locals)
                     // $t7 := 0
@@ -3002,36 +3148,25 @@ object "test_A2_Vectors_test_one_elem_struct" {
                     $t11 := 42
                     // $t12 := ==($t10, $t11)
                     $t12 := $Eq($t10, $t11)
-                    // if ($t12) goto L2 else goto L3
+                    // if ($t12) goto L4 else goto L3
                     switch $t12
-                    case 0  { $block := 5 }
+                    case 0  { $block := 7 }
                     default { $block := 6 }
                 }
-                case 4 {
-                    // $t0 := Vectors::one_elem_struct()
-                    mstore($locals, A2_Vectors_one_elem_struct())
-                    // $t1 := borrow_local($t0)
-                    $t1 := $MakePtr(false, $locals)
-                    // $t2 := vector::length<Vectors::S>($t1)
-                    $t2 := A1_vector_length$A2_Vectors_S$($t1)
-                    // $t3 := 1
-                    $t3 := 1
-                    // $t4 := ==($t2, $t3)
-                    $t4 := $Eq($t2, $t3)
-                    // if ($t4) goto L0 else goto L1
-                    switch $t4
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
                 }
-                case 5 {
+                case 7 {
                     // label L3
                     // $t13 := 102
                     $t13 := 102
                     // abort($t13)
                     $Abort($t13)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t14 := borrow_local($t0)
                     $t14 := $MakePtr(false, $locals)
                     // $t15 := 0
@@ -3046,20 +3181,25 @@ object "test_A2_Vectors_test_one_elem_struct" {
                     $t19 := true
                     // $t20 := ==($t18, $t19)
                     $t20 := $Eq($t18, $t19)
-                    // if ($t20) goto L4 else goto L5
+                    // if ($t20) goto L7 else goto L6
                     switch $t20
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t21 := 103
                     $t21 := 103
                     // abort($t21)
                     $Abort($t21)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t22 := borrow_local($t0)
                     $t22 := $MakePtr(false, $locals)
                     // $t23 := 0
@@ -3074,20 +3214,25 @@ object "test_A2_Vectors_test_one_elem_struct" {
                     $t27 := 789
                     // $t28 := ==($t26, $t27)
                     $t28 := $Eq($t26, $t27)
-                    // if ($t28) goto L6 else goto L7
+                    // if ($t28) goto L10 else goto L9
                     switch $t28
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t29 := 104
                     $t29 := 104
                     // abort($t29)
                     $Abort($t29)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // return ()
                     $Free($locals, 32)
                     leave
@@ -3424,7 +3569,7 @@ object "test_A2_Vectors_test_one_elem_struct" {
         }
     }
 }
-===> Test result of Vectors::test_one_elem_struct: Succeed(Stopped) (used_gas=3407): []
+===> Test result of Vectors::test_one_elem_struct: Succeed(Stopped) (used_gas=4291): []
 
 // test of Vectors::test_one_elem_u64
 /* =======================================
@@ -3445,13 +3590,34 @@ object "test_A2_Vectors_test_one_elem_u64" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t5 := 101
                     $t5 := 101
                     // abort($t5)
                     $Abort($t5)
                 }
-                case 3 {
-                    // label L0
+                case 4 {
+                    // $t0 := Vectors::one_elem_u64()
+                    mstore($locals, A2_Vectors_one_elem_u64())
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, $locals)
+                    // $t2 := vector::length<u64>($t1)
+                    $t2 := A1_vector_length$u64$($t1)
+                    // $t3 := 1
+                    $t3 := 1
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
                     // $t6 := borrow_local($t0)
                     $t6 := $MakePtr(false, $locals)
                     // $t7 := 0
@@ -3464,36 +3630,25 @@ object "test_A2_Vectors_test_one_elem_u64" {
                     $t10 := 42
                     // $t11 := ==($t9, $t10)
                     $t11 := $Eq($t9, $t10)
-                    // if ($t11) goto L2 else goto L3
+                    // if ($t11) goto L4 else goto L3
                     switch $t11
-                    case 0  { $block := 5 }
+                    case 0  { $block := 7 }
                     default { $block := 6 }
                 }
-                case 4 {
-                    // $t0 := Vectors::one_elem_u64()
-                    mstore($locals, A2_Vectors_one_elem_u64())
-                    // $t1 := borrow_local($t0)
-                    $t1 := $MakePtr(false, $locals)
-                    // $t2 := vector::length<u64>($t1)
-                    $t2 := A1_vector_length$u64$($t1)
-                    // $t3 := 1
-                    $t3 := 1
-                    // $t4 := ==($t2, $t3)
-                    $t4 := $Eq($t2, $t3)
-                    // if ($t4) goto L0 else goto L1
-                    switch $t4
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
                 }
-                case 5 {
+                case 7 {
                     // label L3
                     // $t12 := 102
                     $t12 := 102
                     // abort($t12)
                     $Abort($t12)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // return ()
                     $Free($locals, 32)
                     leave
@@ -3501,6 +3656,13 @@ object "test_A2_Vectors_test_one_elem_u64" {
             }
         }
 
+        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
+            let v_offs := $LoadU256(v_ref)
+            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
+            let size := $LoadU64(v_ptr)
+            if $GtEq(i, size) { $AbortBuiltin() }
+            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
+        }
         function A1_vector_length$u64$(v_ref) -> len {
             let v_offs := $LoadU256(v_ref)
             let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
@@ -3542,13 +3704,6 @@ object "test_A2_Vectors_test_one_elem_u64" {
             vector := $Malloc(48)
             $MemoryStoreU64(add(vector, 8), 2)
         }
-        function A1_vector_borrow$u64$(v_ref, i) -> e_ptr {
-            let v_offs := $LoadU256(v_ref)
-            let v_ptr := $MakePtr($IsStoragePtr(v_ref), v_offs)
-            let size := $LoadU64(v_ptr)
-            if $GtEq(i, size) { $AbortBuiltin() }
-            e_ptr := $IndexPtr(v_ptr, add(32, mul(i, 8)))
-        }
         function $Abort(code) {
             mstore(0, code)
             revert(24, 8) // TODO: store code as a string?
@@ -3757,7 +3912,7 @@ object "test_A2_Vectors_test_one_elem_u64" {
         }
     }
 }
-===> Test result of Vectors::test_one_elem_u64: Succeed(Stopped) (used_gas=1746): []
+===> Test result of Vectors::test_one_elem_u64: Succeed(Stopped) (used_gas=2012): []
 
 // test of Vectors::test_pop_back
 /* =======================================
@@ -3778,30 +3933,16 @@ object "test_A2_Vectors_test_pop_back" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t9 := 101
                     $t9 := 101
                     // abort($t9)
                     $Abort($t9)
                 }
-                case 3 {
-                    // label L0
-                    // $t10 := borrow_local($t2)
-                    $t10 := $MakePtr(false, $locals)
-                    // $t11 := 0
-                    $t11 := 0
-                    // $t12 := vector::borrow<u64>($t10, $t11)
-                    $t12 := A1_vector_borrow$u64$($t10, $t11)
-                    // $t13 := read_ref($t12)
-                    $t13 := $LoadU64($t12)
-                    // $t14 := 42
-                    $t14 := 42
-                    // $t15 := ==($t13, $t14)
-                    $t15 := $Eq($t13, $t14)
-                    // if ($t15) goto L2 else goto L3
-                    switch $t15
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t2 := Vectors::one_elem_u64()
                     mstore($locals, A2_Vectors_one_elem_u64())
@@ -3819,20 +3960,44 @@ object "test_A2_Vectors_test_pop_back" {
                     $t7 := 2
                     // $t8 := ==($t6, $t7)
                     $t8 := $Eq($t6, $t7)
-                    // if ($t8) goto L0 else goto L1
+                    // if ($t8) goto L1 else goto L0
                     switch $t8
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t10 := borrow_local($t2)
+                    $t10 := $MakePtr(false, $locals)
+                    // $t11 := 0
+                    $t11 := 0
+                    // $t12 := vector::borrow<u64>($t10, $t11)
+                    $t12 := A1_vector_borrow$u64$($t10, $t11)
+                    // $t13 := read_ref($t12)
+                    $t13 := $LoadU64($t12)
+                    // $t14 := 42
+                    $t14 := 42
+                    // $t15 := ==($t13, $t14)
+                    $t15 := $Eq($t13, $t14)
+                    // if ($t15) goto L4 else goto L3
+                    switch $t15
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t16 := 102
                     $t16 := 102
                     // abort($t16)
                     $Abort($t16)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t17 := borrow_local($t2)
                     $t17 := $MakePtr(false, $locals)
                     // $t18 := 1
@@ -3845,20 +4010,25 @@ object "test_A2_Vectors_test_pop_back" {
                     $t21 := 43
                     // $t22 := ==($t20, $t21)
                     $t22 := $Eq($t20, $t21)
-                    // if ($t22) goto L4 else goto L5
+                    // if ($t22) goto L7 else goto L6
                     switch $t22
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t23 := 103
                     $t23 := 103
                     // abort($t23)
                     $Abort($t23)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t24 := borrow_local($t2)
                     $t24 := $MakePtr(false, $locals)
                     // $t25 := vector::pop_back<u64>($t24)
@@ -3871,38 +4041,48 @@ object "test_A2_Vectors_test_pop_back" {
                     $t28 := 1
                     // $t29 := ==($t27, $t28)
                     $t29 := $Eq($t27, $t28)
-                    // if ($t29) goto L6 else goto L7
+                    // if ($t29) goto L10 else goto L9
                     switch $t29
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t30 := 104
                     $t30 := 104
                     // abort($t30)
                     $Abort($t30)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // $t31 := 43
                     $t31 := 43
                     // $t32 := ==($t25, $t31)
                     $t32 := $Eq($t25, $t31)
-                    // if ($t32) goto L8 else goto L9
+                    // if ($t32) goto L13 else goto L12
                     switch $t32
-                    case 0  { $block := 11 }
-                    default { $block := 12 }
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
                 }
-                case 11 {
-                    // label L9
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
                     // $t33 := 105
                     $t33 := 105
                     // abort($t33)
                     $Abort($t33)
                 }
-                case 12 {
-                    // label L8
+                case 17 {
+                    // label L14
                     // $t34 := borrow_local($t2)
                     $t34 := $MakePtr(false, $locals)
                     // $t35 := vector::pop_back<u64>($t34)
@@ -3915,38 +4095,48 @@ object "test_A2_Vectors_test_pop_back" {
                     $t38 := 0
                     // $t39 := ==($t37, $t38)
                     $t39 := $Eq($t37, $t38)
-                    // if ($t39) goto L10 else goto L11
+                    // if ($t39) goto L16 else goto L15
                     switch $t39
-                    case 0  { $block := 13 }
-                    default { $block := 14 }
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
                 }
-                case 13 {
-                    // label L11
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
                     // $t40 := 106
                     $t40 := 106
                     // abort($t40)
                     $Abort($t40)
                 }
-                case 14 {
-                    // label L10
+                case 20 {
+                    // label L17
                     // $t41 := 42
                     $t41 := 42
                     // $t42 := ==($t35, $t41)
                     $t42 := $Eq($t35, $t41)
-                    // if ($t42) goto L12 else goto L13
+                    // if ($t42) goto L19 else goto L18
                     switch $t42
-                    case 0  { $block := 15 }
-                    default { $block := 16 }
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
                 }
-                case 15 {
-                    // label L13
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
                     // $t43 := 107
                     $t43 := 107
                     // abort($t43)
                     $Abort($t43)
                 }
-                case 16 {
-                    // label L12
+                case 23 {
+                    // label L20
                     // $t44 := move($t2)
                     $t44 := mload($locals)
                     // vector::destroy_empty<u64>($t44)
@@ -4229,7 +4419,7 @@ object "test_A2_Vectors_test_pop_back" {
         }
     }
 }
-===> Test result of Vectors::test_pop_back: Succeed(Stopped) (used_gas=6263): []
+===> Test result of Vectors::test_pop_back: Succeed(Stopped) (used_gas=8729): []
 
 // test of Vectors::test_pop_back_empty_fail
 /* =======================================
@@ -4452,13 +4642,34 @@ object "test_A2_Vectors_test_push_back" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t5 := 101
                     $t5 := 101
                     // abort($t5)
                     $Abort($t5)
                 }
-                case 3 {
-                    // label L0
+                case 4 {
+                    // $t0 := Vectors::one_elem_u64()
+                    mstore($locals, A2_Vectors_one_elem_u64())
+                    // $t1 := borrow_local($t0)
+                    $t1 := $MakePtr(false, $locals)
+                    // $t2 := vector::length<u64>($t1)
+                    $t2 := A1_vector_length$u64$($t1)
+                    // $t3 := 1
+                    $t3 := 1
+                    // $t4 := ==($t2, $t3)
+                    $t4 := $Eq($t2, $t3)
+                    // if ($t4) goto L1 else goto L0
+                    switch $t4
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
                     // $t6 := borrow_local($t0)
                     $t6 := $MakePtr(false, $locals)
                     // $t7 := 0
@@ -4471,36 +4682,25 @@ object "test_A2_Vectors_test_push_back" {
                     $t10 := 42
                     // $t11 := ==($t9, $t10)
                     $t11 := $Eq($t9, $t10)
-                    // if ($t11) goto L2 else goto L3
+                    // if ($t11) goto L4 else goto L3
                     switch $t11
-                    case 0  { $block := 5 }
+                    case 0  { $block := 7 }
                     default { $block := 6 }
                 }
-                case 4 {
-                    // $t0 := Vectors::one_elem_u64()
-                    mstore($locals, A2_Vectors_one_elem_u64())
-                    // $t1 := borrow_local($t0)
-                    $t1 := $MakePtr(false, $locals)
-                    // $t2 := vector::length<u64>($t1)
-                    $t2 := A1_vector_length$u64$($t1)
-                    // $t3 := 1
-                    $t3 := 1
-                    // $t4 := ==($t2, $t3)
-                    $t4 := $Eq($t2, $t3)
-                    // if ($t4) goto L0 else goto L1
-                    switch $t4
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
                 }
-                case 5 {
+                case 7 {
                     // label L3
                     // $t12 := 102
                     $t12 := 102
                     // abort($t12)
                     $Abort($t12)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t13 := borrow_local($t0)
                     $t13 := $MakePtr(false, $locals)
                     // $t14 := 43
@@ -4515,20 +4715,25 @@ object "test_A2_Vectors_test_push_back" {
                     $t17 := 2
                     // $t18 := ==($t16, $t17)
                     $t18 := $Eq($t16, $t17)
-                    // if ($t18) goto L4 else goto L5
+                    // if ($t18) goto L7 else goto L6
                     switch $t18
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t19 := 103
                     $t19 := 103
                     // abort($t19)
                     $Abort($t19)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t20 := borrow_local($t0)
                     $t20 := $MakePtr(false, $locals)
                     // $t21 := 0
@@ -4541,20 +4746,25 @@ object "test_A2_Vectors_test_push_back" {
                     $t24 := 42
                     // $t25 := ==($t23, $t24)
                     $t25 := $Eq($t23, $t24)
-                    // if ($t25) goto L6 else goto L7
+                    // if ($t25) goto L10 else goto L9
                     switch $t25
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t26 := 104
                     $t26 := 104
                     // abort($t26)
                     $Abort($t26)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // $t27 := borrow_local($t0)
                     $t27 := $MakePtr(false, $locals)
                     // $t28 := 1
@@ -4567,20 +4777,25 @@ object "test_A2_Vectors_test_push_back" {
                     $t31 := 43
                     // $t32 := ==($t30, $t31)
                     $t32 := $Eq($t30, $t31)
-                    // if ($t32) goto L8 else goto L9
+                    // if ($t32) goto L13 else goto L12
                     switch $t32
-                    case 0  { $block := 11 }
-                    default { $block := 12 }
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
                 }
-                case 11 {
-                    // label L9
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
                     // $t33 := 105
                     $t33 := 105
                     // abort($t33)
                     $Abort($t33)
                 }
-                case 12 {
-                    // label L8
+                case 17 {
+                    // label L14
                     // $t34 := borrow_local($t0)
                     $t34 := $MakePtr(false, $locals)
                     // $t35 := 44
@@ -4595,20 +4810,25 @@ object "test_A2_Vectors_test_push_back" {
                     $t38 := 3
                     // $t39 := ==($t37, $t38)
                     $t39 := $Eq($t37, $t38)
-                    // if ($t39) goto L10 else goto L11
+                    // if ($t39) goto L16 else goto L15
                     switch $t39
-                    case 0  { $block := 13 }
-                    default { $block := 14 }
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
                 }
-                case 13 {
-                    // label L11
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
                     // $t40 := 106
                     $t40 := 106
                     // abort($t40)
                     $Abort($t40)
                 }
-                case 14 {
-                    // label L10
+                case 20 {
+                    // label L17
                     // $t41 := borrow_local($t0)
                     $t41 := $MakePtr(false, $locals)
                     // $t42 := 0
@@ -4621,20 +4841,25 @@ object "test_A2_Vectors_test_push_back" {
                     $t45 := 42
                     // $t46 := ==($t44, $t45)
                     $t46 := $Eq($t44, $t45)
-                    // if ($t46) goto L12 else goto L13
+                    // if ($t46) goto L19 else goto L18
                     switch $t46
-                    case 0  { $block := 15 }
-                    default { $block := 16 }
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
                 }
-                case 15 {
-                    // label L13
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
                     // $t47 := 107
                     $t47 := 107
                     // abort($t47)
                     $Abort($t47)
                 }
-                case 16 {
-                    // label L12
+                case 23 {
+                    // label L20
                     // $t48 := borrow_local($t0)
                     $t48 := $MakePtr(false, $locals)
                     // $t49 := 1
@@ -4647,20 +4872,25 @@ object "test_A2_Vectors_test_push_back" {
                     $t52 := 43
                     // $t53 := ==($t51, $t52)
                     $t53 := $Eq($t51, $t52)
-                    // if ($t53) goto L14 else goto L15
+                    // if ($t53) goto L22 else goto L21
                     switch $t53
-                    case 0  { $block := 17 }
-                    default { $block := 18 }
+                    case 0  { $block := 25 }
+                    default { $block := 24 }
                 }
-                case 17 {
-                    // label L15
+                case 24 {
+                    // label L22
+                    // goto L23
+                    $block := 26
+                }
+                case 25 {
+                    // label L21
                     // $t54 := 108
                     $t54 := 108
                     // abort($t54)
                     $Abort($t54)
                 }
-                case 18 {
-                    // label L14
+                case 26 {
+                    // label L23
                     // $t55 := borrow_local($t0)
                     $t55 := $MakePtr(false, $locals)
                     // $t56 := 2
@@ -4673,20 +4903,25 @@ object "test_A2_Vectors_test_push_back" {
                     $t59 := 44
                     // $t60 := ==($t58, $t59)
                     $t60 := $Eq($t58, $t59)
-                    // if ($t60) goto L16 else goto L17
+                    // if ($t60) goto L25 else goto L24
                     switch $t60
-                    case 0  { $block := 19 }
-                    default { $block := 20 }
+                    case 0  { $block := 28 }
+                    default { $block := 27 }
                 }
-                case 19 {
-                    // label L17
+                case 27 {
+                    // label L25
+                    // goto L26
+                    $block := 29
+                }
+                case 28 {
+                    // label L24
                     // $t61 := 109
                     $t61 := 109
                     // abort($t61)
                     $Abort($t61)
                 }
-                case 20 {
-                    // label L16
+                case 29 {
+                    // label L26
                     // $t62 := borrow_local($t0)
                     $t62 := $MakePtr(false, $locals)
                     // $t63 := 45
@@ -4701,20 +4936,25 @@ object "test_A2_Vectors_test_push_back" {
                     $t66 := 4
                     // $t67 := ==($t65, $t66)
                     $t67 := $Eq($t65, $t66)
-                    // if ($t67) goto L18 else goto L19
+                    // if ($t67) goto L28 else goto L27
                     switch $t67
-                    case 0  { $block := 21 }
-                    default { $block := 22 }
+                    case 0  { $block := 31 }
+                    default { $block := 30 }
                 }
-                case 21 {
-                    // label L19
+                case 30 {
+                    // label L28
+                    // goto L29
+                    $block := 32
+                }
+                case 31 {
+                    // label L27
                     // $t68 := 110
                     $t68 := 110
                     // abort($t68)
                     $Abort($t68)
                 }
-                case 22 {
-                    // label L18
+                case 32 {
+                    // label L29
                     // $t69 := borrow_local($t0)
                     $t69 := $MakePtr(false, $locals)
                     // $t70 := 0
@@ -4727,20 +4967,25 @@ object "test_A2_Vectors_test_push_back" {
                     $t73 := 42
                     // $t74 := ==($t72, $t73)
                     $t74 := $Eq($t72, $t73)
-                    // if ($t74) goto L20 else goto L21
+                    // if ($t74) goto L31 else goto L30
                     switch $t74
-                    case 0  { $block := 23 }
-                    default { $block := 24 }
+                    case 0  { $block := 34 }
+                    default { $block := 33 }
                 }
-                case 23 {
-                    // label L21
+                case 33 {
+                    // label L31
+                    // goto L32
+                    $block := 35
+                }
+                case 34 {
+                    // label L30
                     // $t75 := 111
                     $t75 := 111
                     // abort($t75)
                     $Abort($t75)
                 }
-                case 24 {
-                    // label L20
+                case 35 {
+                    // label L32
                     // $t76 := borrow_local($t0)
                     $t76 := $MakePtr(false, $locals)
                     // $t77 := 1
@@ -4753,20 +4998,25 @@ object "test_A2_Vectors_test_push_back" {
                     $t80 := 43
                     // $t81 := ==($t79, $t80)
                     $t81 := $Eq($t79, $t80)
-                    // if ($t81) goto L22 else goto L23
+                    // if ($t81) goto L34 else goto L33
                     switch $t81
-                    case 0  { $block := 25 }
-                    default { $block := 26 }
+                    case 0  { $block := 37 }
+                    default { $block := 36 }
                 }
-                case 25 {
-                    // label L23
+                case 36 {
+                    // label L34
+                    // goto L35
+                    $block := 38
+                }
+                case 37 {
+                    // label L33
                     // $t82 := 112
                     $t82 := 112
                     // abort($t82)
                     $Abort($t82)
                 }
-                case 26 {
-                    // label L22
+                case 38 {
+                    // label L35
                     // $t83 := borrow_local($t0)
                     $t83 := $MakePtr(false, $locals)
                     // $t84 := 2
@@ -4779,20 +5029,25 @@ object "test_A2_Vectors_test_push_back" {
                     $t87 := 44
                     // $t88 := ==($t86, $t87)
                     $t88 := $Eq($t86, $t87)
-                    // if ($t88) goto L24 else goto L25
+                    // if ($t88) goto L37 else goto L36
                     switch $t88
-                    case 0  { $block := 27 }
-                    default { $block := 28 }
+                    case 0  { $block := 40 }
+                    default { $block := 39 }
                 }
-                case 27 {
-                    // label L25
+                case 39 {
+                    // label L37
+                    // goto L38
+                    $block := 41
+                }
+                case 40 {
+                    // label L36
                     // $t89 := 113
                     $t89 := 113
                     // abort($t89)
                     $Abort($t89)
                 }
-                case 28 {
-                    // label L24
+                case 41 {
+                    // label L38
                     // $t90 := borrow_local($t0)
                     $t90 := $MakePtr(false, $locals)
                     // $t91 := 3
@@ -4805,20 +5060,25 @@ object "test_A2_Vectors_test_push_back" {
                     $t94 := 45
                     // $t95 := ==($t93, $t94)
                     $t95 := $Eq($t93, $t94)
-                    // if ($t95) goto L26 else goto L27
+                    // if ($t95) goto L40 else goto L39
                     switch $t95
-                    case 0  { $block := 29 }
-                    default { $block := 30 }
+                    case 0  { $block := 43 }
+                    default { $block := 42 }
                 }
-                case 29 {
-                    // label L27
+                case 42 {
+                    // label L40
+                    // goto L41
+                    $block := 44
+                }
+                case 43 {
+                    // label L39
                     // $t96 := 114
                     $t96 := 114
                     // abort($t96)
                     $Abort($t96)
                 }
-                case 30 {
-                    // label L26
+                case 44 {
+                    // label L41
                     // return ()
                     $Free($locals, 32)
                     leave
@@ -5082,7 +5342,7 @@ object "test_A2_Vectors_test_push_back" {
         }
     }
 }
-===> Test result of Vectors::test_push_back: Succeed(Stopped) (used_gas=14029): []
+===> Test result of Vectors::test_push_back: Succeed(Stopped) (used_gas=23283): []
 
 // test of Vectors::test_swap
 /* =======================================
@@ -5103,30 +5363,16 @@ object "test_A2_Vectors_test_swap" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t11 := 101
                     $t11 := 101
                     // abort($t11)
                     $Abort($t11)
                 }
-                case 3 {
-                    // label L0
-                    // $t12 := borrow_local($t0)
-                    $t12 := $MakePtr(false, $locals)
-                    // $t13 := 1
-                    $t13 := 1
-                    // $t14 := vector::borrow<u64>($t12, $t13)
-                    $t14 := A1_vector_borrow$u64$($t12, $t13)
-                    // $t15 := read_ref($t14)
-                    $t15 := $LoadU64($t14)
-                    // $t16 := 43
-                    $t16 := 43
-                    // $t17 := ==($t15, $t16)
-                    $t17 := $Eq($t15, $t16)
-                    // if ($t17) goto L2 else goto L3
-                    switch $t17
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t0 := Vectors::one_elem_u64()
                     mstore($locals, A2_Vectors_one_elem_u64())
@@ -5154,20 +5400,44 @@ object "test_A2_Vectors_test_swap" {
                     $t9 := 42
                     // $t10 := ==($t8, $t9)
                     $t10 := $Eq($t8, $t9)
-                    // if ($t10) goto L0 else goto L1
+                    // if ($t10) goto L1 else goto L0
                     switch $t10
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t12 := borrow_local($t0)
+                    $t12 := $MakePtr(false, $locals)
+                    // $t13 := 1
+                    $t13 := 1
+                    // $t14 := vector::borrow<u64>($t12, $t13)
+                    $t14 := A1_vector_borrow$u64$($t12, $t13)
+                    // $t15 := read_ref($t14)
+                    $t15 := $LoadU64($t14)
+                    // $t16 := 43
+                    $t16 := 43
+                    // $t17 := ==($t15, $t16)
+                    $t17 := $Eq($t15, $t16)
+                    // if ($t17) goto L4 else goto L3
+                    switch $t17
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t18 := 102
                     $t18 := 102
                     // abort($t18)
                     $Abort($t18)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t19 := borrow_local($t0)
                     $t19 := $MakePtr(false, $locals)
                     // $t20 := 2
@@ -5180,20 +5450,25 @@ object "test_A2_Vectors_test_swap" {
                     $t23 := 44
                     // $t24 := ==($t22, $t23)
                     $t24 := $Eq($t22, $t23)
-                    // if ($t24) goto L4 else goto L5
+                    // if ($t24) goto L7 else goto L6
                     switch $t24
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t25 := 103
                     $t25 := 103
                     // abort($t25)
                     $Abort($t25)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t26 := borrow_local($t0)
                     $t26 := $MakePtr(false, $locals)
                     // $t27 := 0
@@ -5214,20 +5489,25 @@ object "test_A2_Vectors_test_swap" {
                     $t33 := 44
                     // $t34 := ==($t32, $t33)
                     $t34 := $Eq($t32, $t33)
-                    // if ($t34) goto L6 else goto L7
+                    // if ($t34) goto L10 else goto L9
                     switch $t34
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t35 := 104
                     $t35 := 104
                     // abort($t35)
                     $Abort($t35)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // $t36 := borrow_local($t0)
                     $t36 := $MakePtr(false, $locals)
                     // $t37 := 1
@@ -5240,20 +5520,25 @@ object "test_A2_Vectors_test_swap" {
                     $t40 := 43
                     // $t41 := ==($t39, $t40)
                     $t41 := $Eq($t39, $t40)
-                    // if ($t41) goto L8 else goto L9
+                    // if ($t41) goto L13 else goto L12
                     switch $t41
-                    case 0  { $block := 11 }
-                    default { $block := 12 }
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
                 }
-                case 11 {
-                    // label L9
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
                     // $t42 := 105
                     $t42 := 105
                     // abort($t42)
                     $Abort($t42)
                 }
-                case 12 {
-                    // label L8
+                case 17 {
+                    // label L14
                     // $t43 := borrow_local($t0)
                     $t43 := $MakePtr(false, $locals)
                     // $t44 := 2
@@ -5266,20 +5551,25 @@ object "test_A2_Vectors_test_swap" {
                     $t47 := 42
                     // $t48 := ==($t46, $t47)
                     $t48 := $Eq($t46, $t47)
-                    // if ($t48) goto L10 else goto L11
+                    // if ($t48) goto L16 else goto L15
                     switch $t48
-                    case 0  { $block := 13 }
-                    default { $block := 14 }
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
                 }
-                case 13 {
-                    // label L11
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
                     // $t49 := 106
                     $t49 := 106
                     // abort($t49)
                     $Abort($t49)
                 }
-                case 14 {
-                    // label L10
+                case 20 {
+                    // label L17
                     // return ()
                     $Free($locals, 32)
                     leave
@@ -5550,7 +5840,7 @@ object "test_A2_Vectors_test_swap" {
         }
     }
 }
-===> Test result of Vectors::test_swap: Succeed(Stopped) (used_gas=7087): []
+===> Test result of Vectors::test_swap: Succeed(Stopped) (used_gas=8941): []
 
 // test of Vectors::test_swap_fail
 /* =======================================
@@ -5860,28 +6150,15 @@ object "test_A2_Vectors_test_vector_equality" {
                 switch $block
                 case 2 {
                     // label L1
-                    // $t12 := 101
-                    $t12 := 101
-                    // abort($t12)
-                    $Abort($t12)
+                    // goto L2
+                    $block := 5
                 }
-                case 3 {
-                    // label L0
-                    // $t13 := copy($t0)
-                    $t13 := mload($locals)
-                    // $t14 := [10, 11, 12, 13]
-                    $t14 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
-                    $MemoryStoreU64($t14, 4)
-                    $MemoryStoreU64(add($t14, 8), $ClosestGreaterPowerOfTwo(4))
-                    copy_literal_string_to_memory_512532313(add($t14, 32))
-                    // $t15 := !=($t13, $t14)
-                    $t15 := $LogicalNot($Eq_$vec$u8$$($t13, $t14))
-                    // $t16 := !($t15)
-                    $t16 := $LogicalNot($t15)
-                    // if ($t16) goto L2 else goto L3
-                    switch $t16
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
+                case 3 {
+                    // label L0
+                    // $t12 := 101
+                    $t12 := 101
+                    // abort($t12)
+                    $Abort($t12)
                 }
                 case 4 {
                     // $t0 := vector::empty<u8>()
@@ -5919,20 +6196,43 @@ object "test_A2_Vectors_test_vector_equality" {
                     copy_literal_string_to_memory_512532313(add($t10, 32))
                     // $t11 := ==($t9, $t10)
                     $t11 := $Eq_$vec$u8$$($t9, $t10)
-                    // if ($t11) goto L0 else goto L1
+                    // if ($t11) goto L1 else goto L0
                     switch $t11
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t13 := copy($t0)
+                    $t13 := mload($locals)
+                    // $t14 := [10, 11, 12, 13]
+                    $t14 := $Malloc(add(32, $ClosestGreaterPowerOfTwo(4)))
+                    $MemoryStoreU64($t14, 4)
+                    $MemoryStoreU64(add($t14, 8), $ClosestGreaterPowerOfTwo(4))
+                    copy_literal_string_to_memory_512532313(add($t14, 32))
+                    // $t15 := !=($t13, $t14)
+                    $t15 := $LogicalNot($Eq_$vec$u8$$($t13, $t14))
+                    // $t16 := !($t15)
+                    $t16 := $LogicalNot($t15)
+                    // if ($t16) goto L4 else goto L3
+                    switch $t16
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t17 := 102
                     $t17 := 102
                     // abort($t17)
                     $Abort($t17)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t18 := copy($t0)
                     $t18 := mload($locals)
                     // $t19 := [10, 11, 12]
@@ -5942,20 +6242,25 @@ object "test_A2_Vectors_test_vector_equality" {
                     copy_literal_string_to_memory_2815201339(add($t19, 32))
                     // $t20 := !=($t18, $t19)
                     $t20 := $LogicalNot($Eq_$vec$u8$$($t18, $t19))
-                    // if ($t20) goto L4 else goto L5
+                    // if ($t20) goto L7 else goto L6
                     switch $t20
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t21 := 103
                     $t21 := 103
                     // abort($t21)
                     $Abort($t21)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t22 := copy($t0)
                     $t22 := mload($locals)
                     // $t23 := [10, 11, 12]
@@ -5967,20 +6272,25 @@ object "test_A2_Vectors_test_vector_equality" {
                     $t24 := $Eq_$vec$u8$$($t22, $t23)
                     // $t25 := !($t24)
                     $t25 := $LogicalNot($t24)
-                    // if ($t25) goto L6 else goto L7
+                    // if ($t25) goto L10 else goto L9
                     switch $t25
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t26 := 104
                     $t26 := 104
                     // abort($t26)
                     $Abort($t26)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // $t27 := borrow_local($t0)
                     $t27 := $MakePtr(false, $locals)
                     // $t28 := 14
@@ -5996,20 +6306,25 @@ object "test_A2_Vectors_test_vector_equality" {
                     copy_literal_string_to_memory_337779769(add($t30, 32))
                     // $t31 := ==($t29, $t30)
                     $t31 := $Eq_$vec$u8$$($t29, $t30)
-                    // if ($t31) goto L8 else goto L9
+                    // if ($t31) goto L13 else goto L12
                     switch $t31
-                    case 0  { $block := 11 }
-                    default { $block := 12 }
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
                 }
-                case 11 {
-                    // label L9
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
                     // $t32 := 105
                     $t32 := 105
                     // abort($t32)
                     $Abort($t32)
                 }
-                case 12 {
-                    // label L8
+                case 17 {
+                    // label L14
                     // return ()
                     $Free($locals, 32)
                     leave
@@ -6319,7 +6634,7 @@ object "test_A2_Vectors_test_vector_equality" {
         }
     }
 }
-===> Test result of Vectors::test_vector_equality: Succeed(Stopped) (used_gas=7346): []
+===> Test result of Vectors::test_vector_equality: Succeed(Stopped) (used_gas=8658): []
 
 // test of Vectors::test_vector_equality_struct
 /* =======================================
@@ -6340,13 +6655,34 @@ object "test_A2_Vectors_test_vector_equality_struct" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t7 := 101
                     $t7 := 101
                     // abort($t7)
                     $Abort($t7)
                 }
-                case 3 {
-                    // label L0
+                case 4 {
+                    // $t2 := vector::empty<Vectors::R>()
+                    mstore($locals, A1_vector_empty$A2_Vectors_R$())
+                    // $t3 := vector::empty<Vectors::R>()
+                    mstore(add($locals, 32), A1_vector_empty$A2_Vectors_R$())
+                    // $t4 := copy($t2)
+                    $t4 := mload($locals)
+                    // $t5 := copy($t3)
+                    $t5 := mload(add($locals, 32))
+                    // $t6 := ==($t4, $t5)
+                    $t6 := $Eq_$vec$A2_Vectors_R$$($t4, $t5)
+                    // if ($t6) goto L1 else goto L0
+                    switch $t6
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
+                }
+                case 5 {
+                    // label L2
                     // $t8 := 42
                     $t8 := 42
                     // $t9 := true
@@ -6380,36 +6716,25 @@ object "test_A2_Vectors_test_vector_equality_struct" {
                     $t16 := mload(add($locals, 32))
                     // $t17 := !=($t15, $t16)
                     $t17 := $LogicalNot($Eq_$vec$A2_Vectors_R$$($t15, $t16))
-                    // if ($t17) goto L2 else goto L3
+                    // if ($t17) goto L4 else goto L3
                     switch $t17
-                    case 0  { $block := 5 }
+                    case 0  { $block := 7 }
                     default { $block := 6 }
                 }
-                case 4 {
-                    // $t2 := vector::empty<Vectors::R>()
-                    mstore($locals, A1_vector_empty$A2_Vectors_R$())
-                    // $t3 := vector::empty<Vectors::R>()
-                    mstore(add($locals, 32), A1_vector_empty$A2_Vectors_R$())
-                    // $t4 := copy($t2)
-                    $t4 := mload($locals)
-                    // $t5 := copy($t3)
-                    $t5 := mload(add($locals, 32))
-                    // $t6 := ==($t4, $t5)
-                    $t6 := $Eq_$vec$A2_Vectors_R$$($t4, $t5)
-                    // if ($t6) goto L0 else goto L1
-                    switch $t6
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
                 }
-                case 5 {
+                case 7 {
                     // label L3
                     // $t18 := 102
                     $t18 := 102
                     // abort($t18)
                     $Abort($t18)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t19 := borrow_local($t3)
                     $t19 := $MakePtr(false, add($locals, 32))
                     // vector::push_back<Vectors::R>($t19, $t13)
@@ -6420,20 +6745,25 @@ object "test_A2_Vectors_test_vector_equality_struct" {
                     $t21 := mload(add($locals, 32))
                     // $t22 := ==($t20, $t21)
                     $t22 := $Eq_$vec$A2_Vectors_R$$($t20, $t21)
-                    // if ($t22) goto L4 else goto L5
+                    // if ($t22) goto L7 else goto L6
                     switch $t22
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t23 := 103
                     $t23 := 103
                     // abort($t23)
                     $Abort($t23)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t24 := 42
                     $t24 := 42
                     // $t25 := false
@@ -6467,20 +6797,25 @@ object "test_A2_Vectors_test_vector_equality_struct" {
                     $t32 := mload(add($locals, 32))
                     // $t33 := !=($t31, $t32)
                     $t33 := $LogicalNot($Eq_$vec$A2_Vectors_R$$($t31, $t32))
-                    // if ($t33) goto L6 else goto L7
+                    // if ($t33) goto L10 else goto L9
                     switch $t33
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t34 := 104
                     $t34 := 104
                     // abort($t34)
                     $Abort($t34)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // $t35 := borrow_local($t3)
                     $t35 := $MakePtr(false, add($locals, 32))
                     // vector::push_back<Vectors::R>($t35, $t29)
@@ -6491,20 +6826,25 @@ object "test_A2_Vectors_test_vector_equality_struct" {
                     $t37 := mload(add($locals, 32))
                     // $t38 := !=($t36, $t37)
                     $t38 := $LogicalNot($Eq_$vec$A2_Vectors_R$$($t36, $t37))
-                    // if ($t38) goto L8 else goto L9
+                    // if ($t38) goto L13 else goto L12
                     switch $t38
-                    case 0  { $block := 11 }
-                    default { $block := 12 }
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
                 }
-                case 11 {
-                    // label L9
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
                     // $t39 := 105
                     $t39 := 105
                     // abort($t39)
                     $Abort($t39)
                 }
-                case 12 {
-                    // label L8
+                case 17 {
+                    // label L14
                     // return ()
                     $Free($locals, 64)
                     leave
@@ -6884,7 +7224,7 @@ object "test_A2_Vectors_test_vector_equality_struct" {
         }
     }
 }
-===> Test result of Vectors::test_vector_equality_struct: Succeed(Stopped) (used_gas=9065): []
+===> Test result of Vectors::test_vector_equality_struct: Succeed(Stopped) (used_gas=10390): []
 
 // test of Vectors::test_vectors_in_structs
 /* =======================================
@@ -6905,32 +7245,16 @@ object "test_A2_Vectors_test_vectors_in_structs" {
                 switch $block
                 case 2 {
                     // label L1
+                    // goto L2
+                    $block := 5
+                }
+                case 3 {
+                    // label L0
                     // $t18 := 101
                     $t18 := 101
                     // abort($t18)
                     $Abort($t18)
                 }
-                case 3 {
-                    // label L0
-                    // $t19 := borrow_local($t0)
-                    $t19 := $MakePtr(false, r)
-                    // $t20 := borrow_field<Vectors::R>.v($t19)
-                    $t20 := $IndexPtr($t19, 32)
-                    // $t21 := 0
-                    $t21 := 0
-                    // $t22 := vector::borrow<u64>($t20, $t21)
-                    $t22 := A1_vector_borrow$u64$($t20, $t21)
-                    // $t23 := read_ref($t22)
-                    $t23 := $LoadU64($t22)
-                    // $t24 := 10
-                    $t24 := 10
-                    // $t25 := ==($t23, $t24)
-                    $t25 := $Eq($t23, $t24)
-                    // if ($t25) goto L2 else goto L3
-                    switch $t25
-                    case 0  { $block := 5 }
-                    default { $block := 6 }
-                }
                 case 4 {
                     // $t1 := vector::empty<u64>()
                     mstore($locals, A1_vector_empty$u64$())
@@ -6985,20 +7309,46 @@ object "test_A2_Vectors_test_vectors_in_structs" {
                     $t16 := 3
                     // $t17 := ==($t15, $t16)
                     $t17 := $Eq($t15, $t16)
-                    // if ($t17) goto L0 else goto L1
+                    // if ($t17) goto L1 else goto L0
                     switch $t17
-                    case 0  { $block := 2 }
-                    default { $block := 3 }
+                    case 0  { $block := 3 }
+                    default { $block := 2 }
                 }
                 case 5 {
+                    // label L2
+                    // $t19 := borrow_local($t0)
+                    $t19 := $MakePtr(false, r)
+                    // $t20 := borrow_field<Vectors::R>.v($t19)
+                    $t20 := $IndexPtr($t19, 32)
+                    // $t21 := 0
+                    $t21 := 0
+                    // $t22 := vector::borrow<u64>($t20, $t21)
+                    $t22 := A1_vector_borrow$u64$($t20, $t21)
+                    // $t23 := read_ref($t22)
+                    $t23 := $LoadU64($t22)
+                    // $t24 := 10
+                    $t24 := 10
+                    // $t25 := ==($t23, $t24)
+                    $t25 := $Eq($t23, $t24)
+                    // if ($t25) goto L4 else goto L3
+                    switch $t25
+                    case 0  { $block := 7 }
+                    default { $block := 6 }
+                }
+                case 6 {
+                    // label L4
+                    // goto L5
+                    $block := 8
+                }
+                case 7 {
                     // label L3
                     // $t26 := 102
                     $t26 := 102
                     // abort($t26)
                     $Abort($t26)
                 }
-                case 6 {
-                    // label L2
+                case 8 {
+                    // label L5
                     // $t27 := borrow_local($t0)
                     $t27 := $MakePtr(false, r)
                     // $t28 := borrow_field<Vectors::R>.v($t27)
@@ -7013,20 +7363,25 @@ object "test_A2_Vectors_test_vectors_in_structs" {
                     $t32 := 11
                     // $t33 := ==($t31, $t32)
                     $t33 := $Eq($t31, $t32)
-                    // if ($t33) goto L4 else goto L5
+                    // if ($t33) goto L7 else goto L6
                     switch $t33
-                    case 0  { $block := 7 }
-                    default { $block := 8 }
+                    case 0  { $block := 10 }
+                    default { $block := 9 }
                 }
-                case 7 {
-                    // label L5
+                case 9 {
+                    // label L7
+                    // goto L8
+                    $block := 11
+                }
+                case 10 {
+                    // label L6
                     // $t34 := 103
                     $t34 := 103
                     // abort($t34)
                     $Abort($t34)
                 }
-                case 8 {
-                    // label L4
+                case 11 {
+                    // label L8
                     // $t35 := borrow_local($t0)
                     $t35 := $MakePtr(false, r)
                     // $t36 := borrow_field<Vectors::R>.v($t35)
@@ -7041,20 +7396,25 @@ object "test_A2_Vectors_test_vectors_in_structs" {
                     $t40 := 12
                     // $t41 := ==($t39, $t40)
                     $t41 := $Eq($t39, $t40)
-                    // if ($t41) goto L6 else goto L7
+                    // if ($t41) goto L10 else goto L9
                     switch $t41
-                    case 0  { $block := 9 }
-                    default { $block := 10 }
+                    case 0  { $block := 13 }
+                    default { $block := 12 }
                 }
-                case 9 {
-                    // label L7
+                case 12 {
+                    // label L10
+                    // goto L11
+                    $block := 14
+                }
+                case 13 {
+                    // label L9
                     // $t42 := 104
                     $t42 := 104
                     // abort($t42)
                     $Abort($t42)
                 }
-                case 10 {
-                    // label L6
+                case 14 {
+                    // label L11
                     // $t43 := 41
                     $t43 := 41
                     // $t44 := borrow_local($t0)
@@ -7081,20 +7441,25 @@ object "test_A2_Vectors_test_vectors_in_structs" {
                     $t53 := 41
                     // $t54 := ==($t52, $t53)
                     $t54 := $Eq($t52, $t53)
-                    // if ($t54) goto L8 else goto L9
+                    // if ($t54) goto L13 else goto L12
                     switch $t54
-                    case 0  { $block := 11 }
-                    default { $block := 12 }
+                    case 0  { $block := 16 }
+                    default { $block := 15 }
                 }
-                case 11 {
-                    // label L9
+                case 15 {
+                    // label L13
+                    // goto L14
+                    $block := 17
+                }
+                case 16 {
+                    // label L12
                     // $t55 := 105
                     $t55 := 105
                     // abort($t55)
                     $Abort($t55)
                 }
-                case 12 {
-                    // label L8
+                case 17 {
+                    // label L14
                     // $t56 := Vectors::one_elem_u64()
                     $t56 := A2_Vectors_one_elem_u64()
                     // $t57 := borrow_local($t0)
@@ -7125,20 +7490,25 @@ object "test_A2_Vectors_test_vectors_in_structs" {
                     $t62 := 1
                     // $t63 := ==($t61, $t62)
                     $t63 := $Eq($t61, $t62)
-                    // if ($t63) goto L10 else goto L11
+                    // if ($t63) goto L16 else goto L15
                     switch $t63
-                    case 0  { $block := 13 }
-                    default { $block := 14 }
+                    case 0  { $block := 19 }
+                    default { $block := 18 }
                 }
-                case 13 {
-                    // label L11
+                case 18 {
+                    // label L16
+                    // goto L17
+                    $block := 20
+                }
+                case 19 {
+                    // label L15
                     // $t64 := 106
                     $t64 := 106
                     // abort($t64)
                     $Abort($t64)
                 }
-                case 14 {
-                    // label L10
+                case 20 {
+                    // label L17
                     // $t65 := borrow_local($t0)
                     $t65 := $MakePtr(false, r)
                     // $t66 := borrow_field<Vectors::R>.v($t65)
@@ -7153,20 +7523,25 @@ object "test_A2_Vectors_test_vectors_in_structs" {
                     $t70 := 42
                     // $t71 := ==($t69, $t70)
                     $t71 := $Eq($t69, $t70)
-                    // if ($t71) goto L12 else goto L13
+                    // if ($t71) goto L19 else goto L18
                     switch $t71
-                    case 0  { $block := 15 }
-                    default { $block := 16 }
+                    case 0  { $block := 22 }
+                    default { $block := 21 }
                 }
-                case 15 {
-                    // label L13
+                case 21 {
+                    // label L19
+                    // goto L20
+                    $block := 23
+                }
+                case 22 {
+                    // label L18
                     // $t72 := 107
                     $t72 := 107
                     // abort($t72)
                     $Abort($t72)
                 }
-                case 16 {
-                    // label L12
+                case 23 {
+                    // label L20
                     // return ()
                     $Free($locals, 32)
                     leave
@@ -7457,4 +7832,4 @@ object "test_A2_Vectors_test_vectors_in_structs" {
         }
     }
 }
-===> Test result of Vectors::test_vectors_in_structs: Succeed(Stopped) (used_gas=8586): []
+===> Test result of Vectors::test_vectors_in_structs: Succeed(Stopped) (used_gas=11062): []
diff --git a/language/evm/move-to-yul/tests/dispatcher_testsuite.rs b/language/evm/move-to-yul/tests/dispatcher_testsuite.rs
index 26cba3b798..2e0e1c73c9 100644
--- a/language/evm/move-to-yul/tests/dispatcher_testsuite.rs
+++ b/language/evm/move-to-yul/tests/dispatcher_testsuite.rs
@@ -46,6 +46,7 @@ fn compile_yul_to_bytecode_bytes(filename: &str) -> Result<Vec<u8>> {
     let deps = vec![
         path_from_crate_root("../stdlib/sources"),
         path_from_crate_root("../../move-stdlib/sources"),
+        path_from_crate_root("../../extensions/async/move-async-lib/sources"),
     ];
     let mut named_address_map = move_stdlib_named_addresses();
     named_address_map.insert(
@@ -56,6 +57,10 @@ fn compile_yul_to_bytecode_bytes(filename: &str) -> Result<Vec<u8>> {
         "Evm".to_string(),
         NumericalAddress::parse_str("0x2").unwrap(),
     );
+    named_address_map.insert(
+        "Async".to_string(),
+        NumericalAddress::parse_str("0x1").unwrap(),
+    );
     let env = run_model_builder_with_options(
         vec![PackagePaths {
             name: None,
diff --git a/language/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayDecoding.exp b/language/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayDecoding.exp
index 935dbc898a..d53fac7861 100644
--- a/language/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayDecoding.exp
+++ b/language/evm/move-to-yul/tests/test-dispatcher/DispatcherArrayDecoding.exp
@@ -278,7 +278,7 @@ object "A2_M" {
                         // label L3
                         // $t11 := <($t1, $t8)
                         $t11 := $Lt(i, $t8)
-                        // if ($t11) goto L0 else goto L2
+                        // if ($t11) goto L1 else goto L0
                         switch $t11
                         case 0  { $block := 5 }
                         default { $block := 4 }
@@ -300,7 +300,19 @@ object "A2_M" {
                         $block := 2
                     }
                     case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
                         // label L0
+                        // return $t3
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
                         // $t12 := borrow_local($t0)
                         $t12 := $MakePtr(false, $locals)
                         // $t13 := vector::borrow<vector<u64>>($t12, $t1)
@@ -328,13 +340,6 @@ object "A2_M" {
                         // goto L3
                         $block := 2
                     }
-                    case 5 {
-                        // label L2
-                        // return $t3
-                        $result := sum
-                        $Free($locals, 32)
-                        leave
-                    }
                 }
             }
 
@@ -351,7 +356,7 @@ object "A2_M" {
                         $t9 := 2
                         // $t10 := <($t1, $t9)
                         $t10 := $Lt(i, $t9)
-                        // if ($t10) goto L0 else goto L2
+                        // if ($t10) goto L1 else goto L0
                         switch $t10
                         case 0  { $block := 5 }
                         default { $block := 4 }
@@ -369,7 +374,19 @@ object "A2_M" {
                         $block := 2
                     }
                     case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
                         // label L0
+                        // return $t4
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
                         // $t11 := borrow_local($t0)
                         $t11 := $MakePtr(false, $locals)
                         // $t12 := vector::borrow<vector<u128>>($t11, $t1)
@@ -381,26 +398,34 @@ object "A2_M" {
                         // $t2 := $t14
                         j := $t14
                         // goto L6
-                        $block := 6
+                        $block := 7
                     }
-                    case 5 {
-                        // label L2
-                        // return $t4
-                        $result := sum
-                        $Free($locals, 32)
-                        leave
-                    }
-                    case 6 {
+                    case 7 {
                         // label L6
                         // $t15 := <($t2, $t13)
                         $t15 := $Lt(j, $t13)
-                        // if ($t15) goto L3 else goto L5
+                        // if ($t15) goto L4 else goto L3
                         switch $t15
-                        case 0  { $block := 8 }
-                        default { $block := 7 }
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
                     }
-                    case 7 {
+                    case 8 {
+                        // label L4
+                        // goto L5
+                        $block := 10
+                    }
+                    case 9 {
                         // label L3
+                        // destroy($t12)
+                        // $t19 := 1
+                        $t19 := 1
+                        // $t1 := +($t1, $t19)
+                        i := $AddU64(i, $t19)
+                        // goto L7
+                        $block := 2
+                    }
+                    case 10 {
+                        // label L5
                         // $t16 := vector::borrow<u128>($t12, $t2)
                         $t16 := A1_vector_borrow$u128$($t12, j)
                         // $t17 := read_ref($t16)
@@ -412,17 +437,7 @@ object "A2_M" {
                         // $t2 := +($t2, $t18)
                         j := $AddU64(j, $t18)
                         // goto L6
-                        $block := 6
-                    }
-                    case 8 {
-                        // label L5
-                        // destroy($t12)
-                        // $t19 := 1
-                        $t19 := 1
-                        // $t1 := +($t1, $t19)
-                        i := $AddU64(i, $t19)
-                        // goto L7
-                        $block := 2
+                        $block := 7
                     }
                 }
             }
@@ -438,7 +453,7 @@ object "A2_M" {
                         // label L3
                         // $t10 := <($t1, $t8)
                         $t10 := $Lt(i, $t8)
-                        // if ($t10) goto L0 else goto L2
+                        // if ($t10) goto L1 else goto L0
                         switch $t10
                         case 0  { $block := 5 }
                         default { $block := 4 }
@@ -458,7 +473,19 @@ object "A2_M" {
                         $block := 2
                     }
                     case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
                         // label L0
+                        // return $t3
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
                         // $t11 := borrow_local($t0)
                         $t11 := $MakePtr(false, $locals)
                         // $t12 := vector::borrow<vector<U256::U256>>($t11, $t1)
@@ -486,13 +513,6 @@ object "A2_M" {
                         // goto L3
                         $block := 2
                     }
-                    case 5 {
-                        // label L2
-                        // return $t3
-                        $result := sum
-                        $Free($locals, 32)
-                        leave
-                    }
                 }
             }
 
@@ -638,7 +658,7 @@ object "A2_M" {
                         $t8 := 2
                         // $t9 := <($t1, $t8)
                         $t9 := $Lt(i, $t8)
-                        // if ($t9) goto L0 else goto L2
+                        // if ($t9) goto L1 else goto L0
                         switch $t9
                         case 0  { $block := 5 }
                         default { $block := 4 }
@@ -654,7 +674,19 @@ object "A2_M" {
                         $block := 2
                     }
                     case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
                         // label L0
+                        // return $t4
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
                         // $t10 := borrow_local($t0)
                         $t10 := $MakePtr(false, $locals)
                         // $t11 := vector::borrow<vector<U256::U256>>($t10, $t1)
@@ -666,26 +698,34 @@ object "A2_M" {
                         // $t2 := $t13
                         j := $t13
                         // goto L6
-                        $block := 6
-                    }
-                    case 5 {
-                        // label L2
-                        // return $t4
-                        $result := sum
-                        $Free($locals, 32)
-                        leave
+                        $block := 7
                     }
-                    case 6 {
+                    case 7 {
                         // label L6
                         // $t14 := <($t2, $t12)
                         $t14 := $Lt(j, $t12)
-                        // if ($t14) goto L3 else goto L5
+                        // if ($t14) goto L4 else goto L3
                         switch $t14
-                        case 0  { $block := 8 }
-                        default { $block := 7 }
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
                     }
-                    case 7 {
+                    case 8 {
+                        // label L4
+                        // goto L5
+                        $block := 10
+                    }
+                    case 9 {
                         // label L3
+                        // destroy($t11)
+                        // $t18 := 1
+                        $t18 := 1
+                        // $t1 := +($t1, $t18)
+                        i := $AddU64(i, $t18)
+                        // goto L7
+                        $block := 2
+                    }
+                    case 10 {
+                        // label L5
                         // $t15 := vector::borrow<U256::U256>($t11, $t2)
                         $t15 := A1_vector_borrow$A2_U256_U256$($t11, j)
                         // $t16 := read_ref($t15)
@@ -697,17 +737,7 @@ object "A2_M" {
                         // $t2 := +($t2, $t17)
                         j := $AddU64(j, $t17)
                         // goto L6
-                        $block := 6
-                    }
-                    case 8 {
-                        // label L5
-                        // destroy($t11)
-                        // $t18 := 1
-                        $t18 := 1
-                        // $t1 := +($t1, $t18)
-                        i := $AddU64(i, $t18)
-                        // goto L7
-                        $block := 2
+                        $block := 7
                     }
                 }
             }
@@ -725,7 +755,7 @@ object "A2_M" {
                         $t9 := 2
                         // $t10 := <($t1, $t9)
                         $t10 := $Lt(i, $t9)
-                        // if ($t10) goto L0 else goto L2
+                        // if ($t10) goto L1 else goto L0
                         switch $t10
                         case 0  { $block := 5 }
                         default { $block := 4 }
@@ -743,7 +773,19 @@ object "A2_M" {
                         $block := 2
                     }
                     case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
                         // label L0
+                        // return $t4
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
                         // $t11 := borrow_local($t0)
                         $t11 := $MakePtr(false, $locals)
                         // $t12 := vector::borrow<vector<u64>>($t11, $t1)
@@ -755,26 +797,34 @@ object "A2_M" {
                         // $t2 := $t14
                         j := $t14
                         // goto L6
-                        $block := 6
+                        $block := 7
                     }
-                    case 5 {
-                        // label L2
-                        // return $t4
-                        $result := sum
-                        $Free($locals, 32)
-                        leave
-                    }
-                    case 6 {
+                    case 7 {
                         // label L6
                         // $t15 := <($t2, $t13)
                         $t15 := $Lt(j, $t13)
-                        // if ($t15) goto L3 else goto L5
+                        // if ($t15) goto L4 else goto L3
                         switch $t15
-                        case 0  { $block := 8 }
-                        default { $block := 7 }
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
                     }
-                    case 7 {
+                    case 8 {
+                        // label L4
+                        // goto L5
+                        $block := 10
+                    }
+                    case 9 {
                         // label L3
+                        // destroy($t12)
+                        // $t19 := 1
+                        $t19 := 1
+                        // $t1 := +($t1, $t19)
+                        i := $AddU64(i, $t19)
+                        // goto L7
+                        $block := 2
+                    }
+                    case 10 {
+                        // label L5
                         // $t16 := vector::borrow<u64>($t12, $t2)
                         $t16 := A1_vector_borrow$u64$($t12, j)
                         // $t17 := read_ref($t16)
@@ -786,17 +836,7 @@ object "A2_M" {
                         // $t2 := +($t2, $t18)
                         j := $AddU64(j, $t18)
                         // goto L6
-                        $block := 6
-                    }
-                    case 8 {
-                        // label L5
-                        // destroy($t12)
-                        // $t19 := 1
-                        $t19 := 1
-                        // $t1 := +($t1, $t19)
-                        i := $AddU64(i, $t19)
-                        // goto L7
-                        $block := 2
+                        $block := 7
                     }
                 }
             }
@@ -814,7 +854,7 @@ object "A2_M" {
                         $t9 := 2
                         // $t10 := <($t1, $t9)
                         $t10 := $Lt(i, $t9)
-                        // if ($t10) goto L0 else goto L2
+                        // if ($t10) goto L1 else goto L0
                         switch $t10
                         case 0  { $block := 5 }
                         default { $block := 4 }
@@ -832,7 +872,19 @@ object "A2_M" {
                         $block := 2
                     }
                     case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
                         // label L0
+                        // return $t4
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
                         // $t11 := borrow_local($t0)
                         $t11 := $MakePtr(false, $locals)
                         // $t12 := vector::borrow<vector<u8>>($t11, $t1)
@@ -844,26 +896,34 @@ object "A2_M" {
                         // $t2 := $t14
                         j := $t14
                         // goto L6
-                        $block := 6
+                        $block := 7
                     }
-                    case 5 {
-                        // label L2
-                        // return $t4
-                        $result := sum
-                        $Free($locals, 32)
-                        leave
-                    }
-                    case 6 {
+                    case 7 {
                         // label L6
                         // $t15 := <($t2, $t13)
                         $t15 := $Lt(j, $t13)
-                        // if ($t15) goto L3 else goto L5
+                        // if ($t15) goto L4 else goto L3
                         switch $t15
-                        case 0  { $block := 8 }
-                        default { $block := 7 }
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
                     }
-                    case 7 {
+                    case 8 {
+                        // label L4
+                        // goto L5
+                        $block := 10
+                    }
+                    case 9 {
                         // label L3
+                        // destroy($t12)
+                        // $t19 := 1
+                        $t19 := 1
+                        // $t1 := +($t1, $t19)
+                        i := $AddU64(i, $t19)
+                        // goto L7
+                        $block := 2
+                    }
+                    case 10 {
+                        // label L5
                         // $t16 := vector::borrow<u8>($t12, $t2)
                         $t16 := A1_vector_borrow$u8$($t12, j)
                         // $t17 := read_ref($t16)
@@ -875,17 +935,7 @@ object "A2_M" {
                         // $t2 := +($t2, $t18)
                         j := $AddU64(j, $t18)
                         // goto L6
-                        $block := 6
-                    }
-                    case 8 {
-                        // label L5
-                        // destroy($t12)
-                        // $t19 := 1
-                        $t19 := 1
-                        // $t1 := +($t1, $t19)
-                        i := $AddU64(i, $t19)
-                        // goto L7
-                        $block := 2
+                        $block := 7
                     }
                 }
             }
@@ -901,7 +951,7 @@ object "A2_M" {
                         // label L3
                         // $t10 := <($t1, $t8)
                         $t10 := $Lt(i, $t8)
-                        // if ($t10) goto L0 else goto L2
+                        // if ($t10) goto L1 else goto L0
                         switch $t10
                         case 0  { $block := 5 }
                         default { $block := 4 }
@@ -921,7 +971,19 @@ object "A2_M" {
                         $block := 2
                     }
                     case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
                         // label L0
+                        // return $t3
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
                         // $t11 := borrow_local($t0)
                         $t11 := $MakePtr(false, $locals)
                         // $t12 := vector::borrow<vector<U256::U256>>($t11, $t1)
@@ -949,13 +1011,6 @@ object "A2_M" {
                         // goto L3
                         $block := 2
                     }
-                    case 5 {
-                        // label L2
-                        // return $t3
-                        $result := sum
-                        $Free($locals, 32)
-                        leave
-                    }
                 }
             }
 
@@ -970,7 +1025,7 @@ object "A2_M" {
                         // label L3
                         // $t11 := <($t1, $t8)
                         $t11 := $Lt(i, $t8)
-                        // if ($t11) goto L0 else goto L2
+                        // if ($t11) goto L1 else goto L0
                         switch $t11
                         case 0  { $block := 5 }
                         default { $block := 4 }
@@ -992,7 +1047,19 @@ object "A2_M" {
                         $block := 2
                     }
                     case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
                         // label L0
+                        // return $t3
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
                         // $t12 := borrow_local($t0)
                         $t12 := $MakePtr(false, $locals)
                         // $t13 := vector::borrow<vector<u64>>($t12, $t1)
@@ -1020,13 +1087,6 @@ object "A2_M" {
                         // goto L3
                         $block := 2
                     }
-                    case 5 {
-                        // label L2
-                        // return $t3
-                        $result := sum
-                        $Free($locals, 32)
-                        leave
-                    }
                 }
             }
 
@@ -1041,7 +1101,7 @@ object "A2_M" {
                         // label L3
                         // $t11 := <($t1, $t8)
                         $t11 := $Lt(i, $t8)
-                        // if ($t11) goto L0 else goto L2
+                        // if ($t11) goto L1 else goto L0
                         switch $t11
                         case 0  { $block := 5 }
                         default { $block := 4 }
@@ -1063,7 +1123,19 @@ object "A2_M" {
                         $block := 2
                     }
                     case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
                         // label L0
+                        // return $t3
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
                         // $t12 := borrow_local($t0)
                         $t12 := $MakePtr(false, $locals)
                         // $t13 := vector::borrow<vector<u8>>($t12, $t1)
@@ -1091,13 +1163,6 @@ object "A2_M" {
                         // goto L3
                         $block := 2
                     }
-                    case 5 {
-                        // label L2
-                        // return $t3
-                        $result := sum
-                        $Free($locals, 32)
-                        leave
-                    }
                 }
             }
 
@@ -1112,7 +1177,7 @@ object "A2_M" {
                         // label L7
                         // $t10 := <($t1, $t7)
                         $t10 := $Lt(i, $t7)
-                        // if ($t10) goto L0 else goto L2
+                        // if ($t10) goto L1 else goto L0
                         switch $t10
                         case 0  { $block := 5 }
                         default { $block := 4 }
@@ -1134,7 +1199,19 @@ object "A2_M" {
                         $block := 2
                     }
                     case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
                         // label L0
+                        // return $t4
+                        $result := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
                         // $t11 := borrow_local($t0)
                         $t11 := $MakePtr(false, $locals)
                         // $t12 := vector::borrow<vector<u128>>($t11, $t1)
@@ -1144,28 +1221,36 @@ object "A2_M" {
                         // $t2 := $t13
                         j := $t13
                         // goto L6
-                        $block := 6
+                        $block := 7
                     }
-                    case 5 {
-                        // label L2
-                        // return $t4
-                        $result := sum
-                        $Free($locals, 32)
-                        leave
-                    }
-                    case 6 {
+                    case 7 {
                         // label L6
                         // $t14 := vector::length<u128>($t12)
                         $t14 := A1_vector_length$u128$($t12)
                         // $t15 := <($t2, $t14)
                         $t15 := $Lt(j, $t14)
-                        // if ($t15) goto L3 else goto L5
+                        // if ($t15) goto L4 else goto L3
                         switch $t15
-                        case 0  { $block := 8 }
-                        default { $block := 7 }
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
                     }
-                    case 7 {
+                    case 8 {
+                        // label L4
+                        // goto L5
+                        $block := 10
+                    }
+                    case 9 {
                         // label L3
+                        // destroy($t12)
+                        // $t19 := 1
+                        $t19 := 1
+                        // $t1 := +($t1, $t19)
+                        i := $AddU64(i, $t19)
+                        // goto L7
+                        $block := 2
+                    }
+                    case 10 {
+                        // label L5
                         // $t16 := vector::borrow<u128>($t12, $t2)
                         $t16 := A1_vector_borrow$u128$($t12, j)
                         // $t17 := read_ref($t16)
@@ -1177,17 +1262,7 @@ object "A2_M" {
                         // $t2 := +($t2, $t18)
                         j := $AddU64(j, $t18)
                         // goto L6
-                        $block := 6
-                    }
-                    case 8 {
-                        // label L5
-                        // destroy($t12)
-                        // $t19 := 1
-                        $t19 := 1
-                        // $t1 := +($t1, $t19)
-                        i := $AddU64(i, $t19)
-                        // goto L7
-                        $block := 2
+                        $block := 7
                     }
                 }
             }
diff --git a/language/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesDecoding.exp b/language/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesDecoding.exp
index 663ce183a0..37d2fe3220 100644
--- a/language/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesDecoding.exp
+++ b/language/evm/move-to-yul/tests/test-dispatcher/DispatcherBytesDecoding.exp
@@ -107,7 +107,7 @@ object "A2_M" {
                         // label L7
                         // $t16 := <($t1, $t12)
                         $t16 := $Lt(i, $t12)
-                        // if ($t16) goto L0 else goto L2
+                        // if ($t16) goto L1 else goto L0
                         switch $t16
                         case 0  { $block := 5 }
                         default { $block := 4 }
@@ -133,7 +133,20 @@ object "A2_M" {
                         $block := 2
                     }
                     case 4 {
+                        // label L1
+                        // goto L2
+                        $block := 6
+                    }
+                    case 5 {
                         // label L0
+                        // return ($t7, $t6)
+                        $result0 := sum_len
+                        $result1 := sum
+                        $Free($locals, 32)
+                        leave
+                    }
+                    case 6 {
+                        // label L2
                         // $t17 := borrow_local($t0)
                         $t17 := $MakePtr(false, $locals)
                         // $t18 := vector::borrow<vector<vector<u8>>>($t17, $t1)
@@ -145,27 +158,34 @@ object "A2_M" {
                         // $t2 := $t20
                         j := $t20
                         // goto L6
-                        $block := 6
+                        $block := 7
                     }
-                    case 5 {
-                        // label L2
-                        // return ($t7, $t6)
-                        $result0 := sum_len
-                        $result1 := sum
-                        $Free($locals, 32)
-                        leave
-                    }
-                    case 6 {
+                    case 7 {
                         // label L6
                         // $t21 := <($t2, $t19)
                         $t21 := $Lt(j, $t19)
-                        // if ($t21) goto L3 else goto L5
+                        // if ($t21) goto L4 else goto L3
                         switch $t21
-                        case 0  { $block := 8 }
-                        default { $block := 7 }
+                        case 0  { $block := 9 }
+                        default { $block := 8 }
                     }
-                    case 7 {
+                    case 8 {
+                        // label L4
+                        // goto L5
+                        $block := 10
+                    }
+                    case 9 {
                         // label L3
+                        // destroy($t18)
+                        // $t29 := 1
+                        $t29 := 1
+                        // $t1 := +($t1, $t29)
+                        i := $AddU64(i, $t29)
+                        // goto L7
+                        $block := 2
+                    }
+                    case 10 {
+                        // label L5
                         // $t22 := vector::borrow<vector<u8>>($t18, $t2)
                         $t22 := A1_vector_borrow$vec$u8$$($t18, j)
                         // $t23 := vector::length<u8>($t22)
@@ -187,17 +207,7 @@ object "A2_M" {
                         // $t2 := +($t2, $t28)
                         j := $AddU64(j, $t28)
                         // goto L6
-                        $block := 6
-                    }
-                    case 8 {
-                        // label L5
-                        // destroy($t18)
-                        // $t29 := 1
-                        $t29 := 1
-                        // $t1 := +($t1, $t29)
-                        i := $AddU64(i, $t29)
-                        // goto L7
-                        $block := 2
+                        $block := 7
                     }
                 }
             }
diff --git a/language/evm/move-to-yul/tests/test-dispatcher/ExternalCall.exp b/language/evm/move-to-yul/tests/test-dispatcher/ExternalCall.exp
index 593070f0f4..37e207b622 100644
--- a/language/evm/move-to-yul/tests/test-dispatcher/ExternalCall.exp
+++ b/language/evm/move-to-yul/tests/test-dispatcher/ExternalCall.exp
@@ -111,7 +111,7 @@ object "A2_M" {
                 for {} true {} {
                     switch $block
                     case 2 {
-                        // label L0
+                        // label L1
                         // $t4 := move($t1)
                         $t4 := v
                         // $t5 := ExternalResult::unwrap<U256::U256>($t4)
@@ -121,7 +121,7 @@ object "A2_M" {
                         leave
                     }
                     case 3 {
-                        // label L2
+                        // label L0
                         // $t6 := U256::one()
                         $t6 := A2_U256_one()
                         // return $t6
@@ -135,7 +135,7 @@ object "A2_M" {
                         $t2 := $MakePtr(false, v)
                         // $t3 := ExternalResult::is_ok<U256::U256>($t2)
                         $t3 := A2_ExternalResult_is_ok$A2_U256_U256$($t2)
-                        // if ($t3) goto L0 else goto L2
+                        // if ($t3) goto L1 else goto L0
                         switch $t3
                         case 0  { $block := 3 }
                         default { $block := 2 }
@@ -144,35 +144,35 @@ object "A2_M" {
             }
 
             function A2_M_call_unit(addr) {
-                let _u, v, $t3, $t4, $t5, $t6
+                let v, $t2, $t3, $t4, $t5
                 let $block := 4
                 for {} true {} {
                     switch $block
                     case 2 {
-                        // label L0
-                        // $t5 := move($t2)
-                        $t5 := v
-                        // $t6 := ExternalResult::unwrap<Evm::Unit>($t5)
-                        $t6 := A2_ExternalResult_unwrap$A2_Evm_Unit$($t5)
-                        // destroy($t6)
-                        $Free($t6, 1)
-                        // goto L2
+                        // label L1
+                        // $t4 := move($t1)
+                        $t4 := v
+                        // $t5 := ExternalResult::unwrap<Evm::Unit>($t4)
+                        $t5 := A2_ExternalResult_unwrap$A2_Evm_Unit$($t4)
+                        // destroy($t5)
+                        $Free($t5, 1)
+                        // goto L0
                         $block := 3
                     }
                     case 3 {
-                        // label L2
+                        // label L0
                         // return ()
                         leave
                     }
                     case 4 {
-                        // $t2 := M::test_unit($t0)
+                        // $t1 := M::test_unit($t0)
                         v := A2_M_test_unit(addr)
-                        // $t3 := borrow_local($t2)
-                        $t3 := $MakePtr(false, v)
-                        // $t4 := ExternalResult::is_ok<Evm::Unit>($t3)
-                        $t4 := A2_ExternalResult_is_ok$A2_Evm_Unit$($t3)
-                        // if ($t4) goto L0 else goto L2
-                        switch $t4
+                        // $t2 := borrow_local($t1)
+                        $t2 := $MakePtr(false, v)
+                        // $t3 := ExternalResult::is_ok<Evm::Unit>($t2)
+                        $t3 := A2_ExternalResult_is_ok$A2_Evm_Unit$($t2)
+                        // if ($t3) goto L1 else goto L0
+                        switch $t3
                         case 0  { $block := 3 }
                         default { $block := 2 }
                     }
@@ -180,133 +180,133 @@ object "A2_M" {
             }
 
             function A2_M_test_is_approved_for_all() -> $result {
-                let account, contract_addr, operator, $t3, $t4, $t5, $t6
-                // $t3 := 0x3
-                $t3 := 0x3
-                // $t4 := 0x4
-                $t4 := 0x4
-                // $t5 := 0x5
-                $t5 := 0x5
-                // $t6 := M::is_approved_for_all($t3, $t4, $t5)
-                $t6 := A2_M_is_approved_for_all($t3, $t4, $t5)
-                // return $t6
-                $result := $t6
+                let $t0, $t1, $t2, $t3
+                // $t0 := 0x3
+                $t0 := 0x3
+                // $t1 := 0x4
+                $t1 := 0x4
+                // $t2 := 0x5
+                $t2 := 0x5
+                // $t3 := M::is_approved_for_all($t0, $t1, $t2)
+                $t3 := A2_M_is_approved_for_all($t0, $t1, $t2)
+                // return $t3
+                $result := $t3
             }
 
             function A2_M_test_multi_ret() -> $result0, $result1 {
-                let contract_addr, data, v, $t3, $t4, $t5, $t6, $t7
-                // $t3 := 0
-                $t3 := 0
-                // $t4 := vector::empty<U256::U256>()
-                $t4 := A1_vector_empty$A2_U256_U256$()
-                // $t5 := 0x3
-                $t5 := 0x3
-                // ($t6, $t7) := M::multi_ret($t5, $t3, $t4)
-                $t6, $t7 := A2_M_multi_ret($t5, $t3, $t4)
-                // return ($t6, $t7)
-                $result0 := $t6
-                $result1 := $t7
+                let data, v, $t2, $t3, $t4, $t5, $t6
+                // $t2 := 0
+                $t2 := 0
+                // $t3 := vector::empty<U256::U256>()
+                $t3 := A1_vector_empty$A2_U256_U256$()
+                // $t4 := 0x3
+                $t4 := 0x3
+                // ($t5, $t6) := M::multi_ret($t4, $t2, $t3)
+                $t5, $t6 := A2_M_multi_ret($t4, $t2, $t3)
+                // return ($t5, $t6)
+                $result0 := $t5
+                $result1 := $t6
             }
 
             function A2_M_test_no_para() {
-                let contract_addr, $t1
-                // $t1 := 0x3
-                $t1 := 0x3
-                // M::no_para($t1)
-                A2_M_no_para($t1)
+                let $t0
+                // $t0 := 0x3
+                $t0 := 0x3
+                // M::no_para($t0)
+                A2_M_no_para($t0)
                 // return ()
             }
 
             function A2_M_test_safe_transfer_from(x, y) {
-                let contract_addr, data, from_addr, to_addr, token_id, $t7, $t8, $t9, $t10, $t11
-                // $t7 := (u256)($t0, $t1)
-                $t7 := $CastU256(x, y)
-                // $t8 := vector::empty<u8>()
-                $t8 := A1_vector_empty$u8$()
-                // $t9 := 0x3
-                $t9 := 0x3
-                // $t10 := 0x4
-                $t10 := 0x4
-                // $t11 := 0x5
-                $t11 := 0x5
-                // M::safe_transfer_form($t9, $t10, $t11, $t7, $t8)
-                A2_M_safe_transfer_form($t9, $t10, $t11, $t7, $t8)
+                let data, token_id, $t4, $t5, $t6, $t7, $t8
+                // $t4 := (u256)($t0, $t1)
+                $t4 := $CastU256(x, y)
+                // $t5 := vector::empty<u8>()
+                $t5 := A1_vector_empty$u8$()
+                // $t6 := 0x3
+                $t6 := 0x3
+                // $t7 := 0x4
+                $t7 := 0x4
+                // $t8 := 0x5
+                $t8 := 0x5
+                // M::safe_transfer_form($t6, $t7, $t8, $t4, $t5)
+                A2_M_safe_transfer_form($t6, $t7, $t8, $t4, $t5)
                 // return ()
             }
 
             function A2_M_test_try() -> $result {
-                let contract_addr, v, value, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13, $t14
+                let v, value, $t2, $t3, $t4, $t5, $t6, $t7, $t8, $t9, $t10, $t11, $t12, $t13
                 let $block := 4
                 for {} true {} {
                     switch $block
                     case 2 {
-                        // label L0
-                        // $t7 := 0
-                        $t7 := 0
-                        // return $t7
-                        $result := $t7
+                        // label L1
+                        // $t6 := 0
+                        $t6 := 0
+                        // return $t6
+                        $result := $t6
                         leave
                     }
                     case 3 {
-                        // label L2
-                        // $t8 := borrow_local($t2)
-                        $t8 := $MakePtr(false, value)
-                        // $t9 := ExternalResult::is_err_reason<U256::U256>($t8)
-                        $t9 := A2_ExternalResult_is_err_reason$A2_U256_U256$($t8)
-                        // if ($t9) goto L3 else goto L5
-                        switch $t9
+                        // label L0
+                        // $t7 := borrow_local($t1)
+                        $t7 := $MakePtr(false, value)
+                        // $t8 := ExternalResult::is_err_reason<U256::U256>($t7)
+                        $t8 := A2_ExternalResult_is_err_reason$A2_U256_U256$($t7)
+                        // if ($t8) goto L3 else goto L2
+                        switch $t8
                         case 0  { $block := 6 }
                         default { $block := 5 }
                     }
                     case 4 {
-                        // $t3 := 340282366920938463463374607431768211458
-                        $t3 := 340282366920938463463374607431768211458
-                        // $t4 := 0x3
-                        $t4 := 0x3
-                        // $t2 := M::test_try_call($t4, $t3)
-                        value := A2_M_test_try_call($t4, $t3)
-                        // $t5 := borrow_local($t2)
-                        $t5 := $MakePtr(false, value)
-                        // $t6 := ExternalResult::is_ok<U256::U256>($t5)
-                        $t6 := A2_ExternalResult_is_ok$A2_U256_U256$($t5)
-                        // if ($t6) goto L0 else goto L2
-                        switch $t6
+                        // $t2 := 340282366920938463463374607431768211458
+                        $t2 := 340282366920938463463374607431768211458
+                        // $t3 := 0x3
+                        $t3 := 0x3
+                        // $t1 := M::test_try_call($t3, $t2)
+                        value := A2_M_test_try_call($t3, $t2)
+                        // $t4 := borrow_local($t1)
+                        $t4 := $MakePtr(false, value)
+                        // $t5 := ExternalResult::is_ok<U256::U256>($t4)
+                        $t5 := A2_ExternalResult_is_ok$A2_U256_U256$($t4)
+                        // if ($t5) goto L1 else goto L0
+                        switch $t5
                         case 0  { $block := 3 }
                         default { $block := 2 }
                     }
                     case 5 {
                         // label L3
-                        // $t10 := 1
-                        $t10 := 1
-                        // return $t10
-                        $result := $t10
+                        // $t9 := 1
+                        $t9 := 1
+                        // return $t9
+                        $result := $t9
                         leave
                     }
                     case 6 {
-                        // label L5
-                        // $t11 := borrow_local($t2)
-                        $t11 := $MakePtr(false, value)
-                        // $t12 := ExternalResult::is_panic<U256::U256>($t11)
-                        $t12 := A2_ExternalResult_is_panic$A2_U256_U256$($t11)
-                        // if ($t12) goto L6 else goto L8
-                        switch $t12
+                        // label L2
+                        // $t10 := borrow_local($t1)
+                        $t10 := $MakePtr(false, value)
+                        // $t11 := ExternalResult::is_panic<U256::U256>($t10)
+                        $t11 := A2_ExternalResult_is_panic$A2_U256_U256$($t10)
+                        // if ($t11) goto L5 else goto L4
+                        switch $t11
                         case 0  { $block := 8 }
                         default { $block := 7 }
                     }
                     case 7 {
-                        // label L6
-                        // $t13 := 2
-                        $t13 := 2
-                        // return $t13
-                        $result := $t13
+                        // label L5
+                        // $t12 := 2
+                        $t12 := 2
+                        // return $t12
+                        $result := $t12
                         leave
                     }
                     case 8 {
-                        // label L8
-                        // $t14 := 3
-                        $t14 := 3
-                        // return $t14
-                        $result := $t14
+                        // label L4
+                        // $t13 := 3
+                        $t13 := 3
+                        // return $t13
+                        $result := $t13
                         leave
                     }
                 }
@@ -934,13 +934,28 @@ object "A2_M" {
                     switch $block
                     case 2 {
                         // label L1
-                        // $t5 := 1
-                        $t5 := 1
-                        // abort($t5)
-                        $Abort($t5)
+                        // goto L2
+                        $block := 5
                     }
                     case 3 {
                         // label L0
+                        // $t5 := 262145
+                        $t5 := 262145
+                        // abort($t5)
+                        $Abort($t5)
+                    }
+                    case 4 {
+                        // $t3 := borrow_local($t0)
+                        $t3 := $MakePtr(false, t)
+                        // $t4 := option::is_some<#0>($t3)
+                        $t4 := A1_option_is_some$A2_Evm_Unit$($t3)
+                        // if ($t4) goto L1 else goto L0
+                        switch $t4
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
                         // $t6 := move($t0)
                         $t6 := t
                         // $t2 := unpack option::Option<#0>($t6)
@@ -959,16 +974,6 @@ object "A2_M" {
                         $Free($locals, 32)
                         leave
                     }
-                    case 4 {
-                        // $t3 := borrow_local($t0)
-                        $t3 := $MakePtr(false, t)
-                        // $t4 := option::is_some<#0>($t3)
-                        $t4 := A1_option_is_some$A2_Evm_Unit$($t3)
-                        // if ($t4) goto L0 else goto L1
-                        switch $t4
-                        case 0  { $block := 2 }
-                        default { $block := 3 }
-                    }
                 }
             }
 
@@ -996,42 +1001,53 @@ object "A2_M" {
                 $StoreU64(v_ptr, sub(size, 1))
             }
             function A1_option_destroy_none$A2_U256_U256$(t) {
-                let vec, $t2, $t3, $t4, $t5, $t6
+                let $t1, $t2, $t3, $t4, $t5
                 let $block := 4
                 for {} true {} {
                     switch $block
                     case 2 {
                         // label L1
-                        // $t4 := 0
-                        $t4 := 0
-                        // abort($t4)
-                        $Abort($t4)
+                        // goto L2
+                        $block := 5
                     }
                     case 3 {
                         // label L0
-                        // $t5 := move($t0)
-                        $t5 := t
-                        // $t6 := unpack option::Option<#0>($t5)
-                        $t6 := $MemoryLoadU256(add($t5, 0))
-                        $Free($t5, 32)
-                        // vector::destroy_empty<#0>($t6)
-                        A1_vector_destroy_empty$A2_U256_U256$($t6)
-                        // return ()
-                        leave
+                        // $t3 := 262144
+                        $t3 := 262144
+                        // abort($t3)
+                        $Abort($t3)
                     }
                     case 4 {
-                        // $t2 := borrow_local($t0)
-                        $t2 := $MakePtr(false, t)
-                        // $t3 := option::is_none<#0>($t2)
-                        $t3 := A1_option_is_none$A2_U256_U256$($t2)
-                        // if ($t3) goto L0 else goto L1
-                        switch $t3
-                        case 0  { $block := 2 }
-                        default { $block := 3 }
+                        // $t1 := borrow_local($t0)
+                        $t1 := $MakePtr(false, t)
+                        // $t2 := option::is_none<#0>($t1)
+                        $t2 := A1_option_is_none$A2_U256_U256$($t1)
+                        // if ($t2) goto L1 else goto L0
+                        switch $t2
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t4 := move($t0)
+                        $t4 := t
+                        // $t5 := unpack option::Option<#0>($t4)
+                        $t5 := $MemoryLoadU256(add($t4, 0))
+                        $Free($t4, 32)
+                        // vector::destroy_empty<#0>($t5)
+                        A1_vector_destroy_empty$A2_U256_U256$($t5)
+                        // return ()
+                        leave
                     }
                 }
             }
 
+            function A1_vector_destroy_empty$A2_U256_U256$(v) {
+                let size := $MemoryLoadU64(v)
+                if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+                let capacity := $MemoryLoadU64(add(v, 8))
+                $Free(v, add(32, mul(capacity, 32)))
+            }
             function A1_option_is_none$A2_U256_U256$(t) -> $result {
                 let $t1, $t2
                 // $t1 := borrow_field<option::Option<#0>>.vec($t0)
@@ -1042,49 +1058,54 @@ object "A2_M" {
                 $result := $t2
             }
 
-            function A1_vector_destroy_empty$A2_U256_U256$(v) {
-                let size := $MemoryLoadU64(v)
-                if $LogicalNot(iszero(size)) { $AbortBuiltin() }
-                let capacity := $MemoryLoadU64(add(v, 8))
-                $Free(v, add(32, mul(capacity, 32)))
-            }
             function A1_option_destroy_none$vec$u8$$(t) {
-                let vec, $t2, $t3, $t4, $t5, $t6
+                let $t1, $t2, $t3, $t4, $t5
                 let $block := 4
                 for {} true {} {
                     switch $block
                     case 2 {
                         // label L1
-                        // $t4 := 0
-                        $t4 := 0
-                        // abort($t4)
-                        $Abort($t4)
+                        // goto L2
+                        $block := 5
                     }
                     case 3 {
                         // label L0
-                        // $t5 := move($t0)
-                        $t5 := t
-                        // $t6 := unpack option::Option<#0>($t5)
-                        $t6 := $MemoryLoadU256(add($t5, 0))
-                        $Free($t5, 32)
-                        // vector::destroy_empty<#0>($t6)
-                        A1_vector_destroy_empty$vec$u8$$($t6)
-                        // return ()
-                        leave
+                        // $t3 := 262144
+                        $t3 := 262144
+                        // abort($t3)
+                        $Abort($t3)
                     }
                     case 4 {
-                        // $t2 := borrow_local($t0)
-                        $t2 := $MakePtr(false, t)
-                        // $t3 := option::is_none<#0>($t2)
-                        $t3 := A1_option_is_none$vec$u8$$($t2)
-                        // if ($t3) goto L0 else goto L1
-                        switch $t3
-                        case 0  { $block := 2 }
-                        default { $block := 3 }
+                        // $t1 := borrow_local($t0)
+                        $t1 := $MakePtr(false, t)
+                        // $t2 := option::is_none<#0>($t1)
+                        $t2 := A1_option_is_none$vec$u8$$($t1)
+                        // if ($t2) goto L1 else goto L0
+                        switch $t2
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
+                        // $t4 := move($t0)
+                        $t4 := t
+                        // $t5 := unpack option::Option<#0>($t4)
+                        $t5 := $MemoryLoadU256(add($t4, 0))
+                        $Free($t4, 32)
+                        // vector::destroy_empty<#0>($t5)
+                        A1_vector_destroy_empty$vec$u8$$($t5)
+                        // return ()
+                        leave
                     }
                 }
             }
 
+            function A1_vector_destroy_empty$vec$u8$$(v) {
+                let size := $MemoryLoadU64(v)
+                if $LogicalNot(iszero(size)) { $AbortBuiltin() }
+                let capacity := $MemoryLoadU64(add(v, 8))
+                $Free(v, add(32, mul(capacity, 32)))
+            }
             function A1_option_is_none$vec$u8$$(t) -> $result {
                 let $t1, $t2
                 // $t1 := borrow_field<option::Option<#0>>.vec($t0)
@@ -1095,12 +1116,6 @@ object "A2_M" {
                 $result := $t2
             }
 
-            function A1_vector_destroy_empty$vec$u8$$(v) {
-                let size := $MemoryLoadU64(v)
-                if $LogicalNot(iszero(size)) { $AbortBuiltin() }
-                let capacity := $MemoryLoadU64(add(v, 8))
-                $Free(v, add(32, mul(capacity, 32)))
-            }
             function A2_M_success(contract) -> $result  {
                 // storage for arguments and returned data
                 let $t1 := mload(0)
@@ -1175,13 +1190,28 @@ object "A2_M" {
                     switch $block
                     case 2 {
                         // label L1
-                        // $t5 := 1
-                        $t5 := 1
-                        // abort($t5)
-                        $Abort($t5)
+                        // goto L2
+                        $block := 5
                     }
                     case 3 {
                         // label L0
+                        // $t5 := 262145
+                        $t5 := 262145
+                        // abort($t5)
+                        $Abort($t5)
+                    }
+                    case 4 {
+                        // $t3 := borrow_local($t0)
+                        $t3 := $MakePtr(false, t)
+                        // $t4 := option::is_some<#0>($t3)
+                        $t4 := A1_option_is_some$A2_U256_U256$($t3)
+                        // if ($t4) goto L1 else goto L0
+                        switch $t4
+                        case 0  { $block := 3 }
+                        default { $block := 2 }
+                    }
+                    case 5 {
+                        // label L2
                         // $t6 := move($t0)
                         $t6 := t
                         // $t2 := unpack option::Option<#0>($t6)
@@ -1200,16 +1230,6 @@ object "A2_M" {
                         $Free($locals, 32)
                         leave
                     }
-                    case 4 {
-                        // $t3 := borrow_local($t0)
-                        $t3 := $MakePtr(false, t)
-                        // $t4 := option::is_some<#0>($t3)
-                        $t4 := A1_option_is_some$A2_U256_U256$($t3)
-                        // if ($t4) goto L0 else goto L1
-                        switch $t4
-                        case 0  { $block := 2 }
-                        default { $block := 3 }
-                    }
                 }
             }
 
diff --git a/language/evm/move-to-yul/tests/testsuite.rs b/language/evm/move-to-yul/tests/testsuite.rs
index 81966cb4a5..f782f09153 100644
--- a/language/evm/move-to-yul/tests/testsuite.rs
+++ b/language/evm/move-to-yul/tests/testsuite.rs
@@ -19,6 +19,7 @@ use move_to_yul::{generator::Generator, options::Options};
 use primitive_types::{H160, U256};
 use std::{
     collections::BTreeMap,
+    fmt::Write,
     path::{Path, PathBuf},
 };
 
@@ -30,6 +31,7 @@ fn test_runner(path: &Path) -> datatest_stable::Result<()> {
     let deps = vec![
         path_from_crate_root("../stdlib/sources"),
         path_from_crate_root("../../move-stdlib/sources"),
+        path_from_crate_root("../../extensions/async/move-async-lib/sources"),
     ];
     let mut named_address_map = move_stdlib_named_addresses();
     named_address_map.insert(
@@ -40,6 +42,10 @@ fn test_runner(path: &Path) -> datatest_stable::Result<()> {
         "Evm".to_string(),
         NumericalAddress::parse_str("0x2").unwrap(),
     );
+    named_address_map.insert(
+        "Async".to_string(),
+        NumericalAddress::parse_str("0x1").unwrap(),
+    );
     let env = run_model_builder_with_options_and_compilation_flags(
         vec![PackagePaths {
             name: None,
@@ -52,7 +58,9 @@ fn test_runner(path: &Path) -> datatest_stable::Result<()> {
             named_address_map,
         }],
         ModelBuilderOptions::default(),
-        move_compiler::Flags::empty().set_sources_shadow_deps(true),
+        move_compiler::Flags::empty()
+            .set_sources_shadow_deps(true)
+            .set_flavor("async"),
     )?;
     for exp in std::iter::once(String::new()).chain(experiments.into_iter()) {
         let mut options = Options {
@@ -109,16 +117,19 @@ fn run_tests(
     let mut res = String::new();
     res.push_str("!! Unit tests\n\n");
     for (fun, source) in test_cases {
-        res.push_str(&format!(
-            "// test of {}\n",
+        writeln!(
+            &mut res,
+            "// test of {}",
             env.get_function(*fun).get_full_name_str()
-        ));
+        )
+        .unwrap();
         res.push_str(source);
-        res.push_str(&format!(
-            "===> Test result of {}: {}\n\n",
+        writeln!(
+            &mut res,
+            "===> Test result of {}: {}\n",
             env.get_function(*fun).get_full_name_str(),
             execute_test(env, source)?
-        ));
+        )?;
     }
     Ok(res)
 }
diff --git a/language/extensions/async/examples/account/sources/AccountStateMachine.move b/language/extensions/async/examples/account/sources/AccountStateMachine.move
index 62ed5af4ab..0b8581496c 100644
--- a/language/extensions/async/examples/account/sources/AccountStateMachine.move
+++ b/language/extensions/async/examples/account/sources/AccountStateMachine.move
@@ -7,7 +7,7 @@
 /// pending transactions over a certain age.
 module This::AccountStateMachine {
 
-    use Async::Actor::{self, epoch_time};
+    use Async::Actor::{self, virtual_time};
     use std::vector;
 
     const MAX: u64 = 43;
@@ -48,7 +48,7 @@ module This::AccountStateMachine {
         // Do not initiate the transfer if there are not enough funds.
         assert!(this.value >= v, 1);
         let xfer_id = new_xfer_id(this);
-        vector::push_back(&mut this.pending, PendingTransfer{xfer_id, amount: v, initiated_at: epoch_time()});
+        vector::push_back(&mut this.pending, PendingTransfer{xfer_id, amount: v, initiated_at: virtual_time()});
         // Call into a special version of deposit which calls us back once done.
         send_xfer_deposit(dest, v, self(), xfer_id);
     }
diff --git a/language/extensions/async/move-async-vm/Cargo.toml b/language/extensions/async/move-async-vm/Cargo.toml
index 812745d9d4..998e73da46 100644
--- a/language/extensions/async/move-async-vm/Cargo.toml
+++ b/language/extensions/async/move-async-vm/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Diem Association <opensource@diem.com>"]
 description = "Wrapper for the Move VM for the asynchronous execution flavor"
 repository = "https://github.com/diem/move"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
@@ -14,15 +14,17 @@ better_any = "0.1.1"
 walkdir = "2.3.1"
 itertools = "0.10.0"
 smallvec = "1.6.1"
-bcs = "0.1.2"
 sha3 = "0.9.1"
 move-command-line-common = { path = "../../../move-command-line-common" }
 move-core-types = { path = "../../../move-core/types" }
 move-compiler = { path = "../../../move-compiler" }
 move-vm-types = { path = "../../../move-vm/types" }
 move-vm-runtime = { path = "../../../move-vm/runtime", features = ["debugging"] }
+move-vm-test-utils = { path = "../../../move-vm/test-utils" }
 move-binary-format = { path = "../../../move-binary-format" }
 
+bcs.workspace = true
+
 [dev-dependencies]
 datatest-stable = "0.1.1"
 move-prover-test-utils = { path = "../../../move-prover/test-utils" }
diff --git a/language/extensions/async/move-async-vm/src/async_vm.rs b/language/extensions/async/move-async-vm/src/async_vm.rs
index 6b6cce61fb..a09740767a 100644
--- a/language/extensions/async/move-async-vm/src/async_vm.rs
+++ b/language/extensions/async/move-async-vm/src/async_vm.rs
@@ -11,8 +11,7 @@ use std::{
 use move_binary_format::errors::{Location, PartialVMError, PartialVMResult, VMError, VMResult};
 use move_core_types::{
     account_address::AccountAddress,
-    effects::{ChangeSet, Event},
-    gas_schedule::GasAlgebra,
+    effects::{ChangeSet, Event, Op},
     identifier::Identifier,
     language_storage::{ModuleId, StructTag, TypeTag},
     resolver::MoveResolver,
@@ -24,13 +23,16 @@ use move_vm_runtime::{
     native_functions::NativeFunction,
     session::{SerializedReturnValues, Session},
 };
-use move_vm_types::{
-    gas_schedule::GasStatus,
-    values::{Reference, Value},
+use move_vm_test_utils::gas_schedule::{Gas, GasStatus};
+use move_vm_types::values::{Reference, Value};
+
+use crate::{
+    actor_metadata,
+    actor_metadata::ActorMetadata,
+    natives,
+    natives::{AsyncExtension, GasParameters as ActorGasParameters},
 };
 
-use crate::{actor_metadata, actor_metadata::ActorMetadata, natives, natives::AsyncExtension};
-
 /// Represents an instance of an async VM.
 pub struct AsyncVM {
     move_vm: MoveVM,
@@ -40,7 +42,12 @@ pub struct AsyncVM {
 
 impl AsyncVM {
     /// Creates a new VM, registering the given natives and actors.
-    pub fn new<I, A>(async_lib_addr: AccountAddress, natives: I, actors: A) -> VMResult<Self>
+    pub fn new<I, A>(
+        async_lib_addr: AccountAddress,
+        natives: I,
+        actors: A,
+        actor_gas_parameters: ActorGasParameters,
+    ) -> VMResult<Self>
     where
         I: IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
         A: IntoIterator<Item = ActorMetadata>,
@@ -62,9 +69,9 @@ impl AsyncVM {
             .collect();
         Ok(AsyncVM {
             move_vm: MoveVM::new(
-                natives
-                    .into_iter()
-                    .chain(natives::actor_natives(async_lib_addr).into_iter()),
+                natives.into_iter().chain(
+                    natives::actor_natives(async_lib_addr, actor_gas_parameters).into_iter(),
+                ),
             )?,
             actor_metadata,
             message_table,
@@ -138,7 +145,7 @@ pub struct AsyncSuccess<'r> {
     pub change_set: ChangeSet,
     pub events: Vec<Event>,
     pub messages: Vec<Message>,
-    pub gas_used: u64,
+    pub gas_used: Gas,
     pub ext: NativeContextExtensions<'r>,
 }
 
@@ -146,7 +153,7 @@ pub struct AsyncSuccess<'r> {
 #[derive(Debug, Clone)]
 pub struct AsyncError {
     pub error: VMError,
-    pub gas_used: u64,
+    pub gas_used: Gas,
 }
 
 /// Result type for operations of an AsyncSession.
@@ -172,7 +179,7 @@ impl<'r, 'l, S: MoveResolver> AsyncSession<'r, 'l, S> {
             .actor_metadata
             .get(module_id)
             .ok_or_else(|| async_extension_error(format!("actor `{}` unknown", module_id)))?;
-        let state_type_tag = TypeTag::Struct(actor.state_tag.clone());
+        let state_type_tag = TypeTag::Struct(Box::new(actor.state_tag.clone()));
         let state_type = self
             .vm_session
             .load_type(&state_type_tag)
@@ -183,6 +190,7 @@ impl<'r, 'l, S: MoveResolver> AsyncSession<'r, 'l, S> {
             .vm_session
             .get_data_store()
             .load_resource(actor_addr, &state_type)
+            .map(|(gv, _)| gv)
             .map_err(partial_vm_error_to_async)?;
         if state.exists().map_err(partial_vm_error_to_async)? {
             return Err(async_extension_error(format!(
@@ -193,7 +201,7 @@ impl<'r, 'l, S: MoveResolver> AsyncSession<'r, 'l, S> {
         }
 
         // Execute the initializer.
-        let gas_before = gas_status.remaining_gas().get();
+        let gas_before = gas_status.remaining_gas();
         let result = self
             .vm_session
             .execute_function_bypass_visibility(
@@ -204,7 +212,7 @@ impl<'r, 'l, S: MoveResolver> AsyncSession<'r, 'l, S> {
                 gas_status,
             )
             .and_then(|ret| Ok((ret, self.vm_session.finish_with_extensions()?)));
-        let gas_used = gas_status.remaining_gas().get() - gas_before;
+        let gas_used = gas_before.checked_sub(gas_status.remaining_gas()).unwrap();
 
         // Process the result, moving the return value of the initializer function into the
         // changeset.
@@ -227,6 +235,7 @@ impl<'r, 'l, S: MoveResolver> AsyncSession<'r, 'l, S> {
                         actor_addr,
                         actor.state_tag.clone(),
                         return_values.remove(0).0,
+                        false,
                     )
                     .map_err(partial_vm_error_to_async)?;
                     let async_ext = native_extensions.remove::<AsyncExtension>();
@@ -266,7 +275,7 @@ impl<'r, 'l, S: MoveResolver> AsyncSession<'r, 'l, S> {
         })?;
 
         // Load the resource representing the actor state and add to arguments.
-        let state_type_tag = TypeTag::Struct(actor.state_tag.clone());
+        let state_type_tag = TypeTag::Struct(Box::new(actor.state_tag.clone()));
         let state_type = self
             .vm_session
             .load_type(&state_type_tag)
@@ -276,6 +285,7 @@ impl<'r, 'l, S: MoveResolver> AsyncSession<'r, 'l, S> {
             .vm_session
             .get_data_store()
             .load_resource(actor_addr, &state_type)
+            .map(|(gv, _)| gv)
             .map_err(partial_vm_error_to_async)?;
         let actor_state = actor_state_global
             .borrow_global()
@@ -289,13 +299,13 @@ impl<'r, 'l, S: MoveResolver> AsyncSession<'r, 'l, S> {
         );
 
         // Execute the handler.
-        let gas_before = gas_status.remaining_gas().get();
+        let gas_before = gas_status.remaining_gas();
         let result = self
             .vm_session
             .execute_function_bypass_visibility(module_id, handler_id, vec![], args, gas_status)
             .and_then(|ret| Ok((ret, self.vm_session.finish_with_extensions()?)));
 
-        let gas_used = gas_status.remaining_gas().get() - gas_before;
+        let gas_used = gas_before.checked_sub(gas_status.remaining_gas()).unwrap();
 
         // Process the result, moving the mutated value of the handlers first parameter
         // into the changeset.
@@ -319,6 +329,7 @@ impl<'r, 'l, S: MoveResolver> AsyncSession<'r, 'l, S> {
                             actor_addr,
                             actor.state_tag.clone(),
                             mutable_reference_outputs.remove(0).1,
+                            true,
                         )
                         .map_err(partial_vm_error_to_async)?;
                     }
@@ -367,9 +378,18 @@ fn publish_actor_state(
     actor_addr: AccountAddress,
     state_tag: StructTag,
     state: Vec<u8>,
+    is_modify: bool,
 ) -> PartialVMResult<()> {
     change_set
-        .publish_resource(actor_addr, state_tag, state)
+        .add_resource_op(
+            actor_addr,
+            state_tag,
+            if is_modify {
+                Op::Modify(state)
+            } else {
+                Op::New(state)
+            },
+        )
         .map_err(|err| partial_extension_error(format!("cannot publish actor state: {}", err)))
 }
 
@@ -384,12 +404,15 @@ pub(crate) fn extension_error(msg: impl ToString) -> VMError {
 fn async_extension_error(msg: impl ToString) -> AsyncError {
     AsyncError {
         error: extension_error(msg),
-        gas_used: 0,
+        gas_used: 0.into(),
     }
 }
 
 fn vm_error_to_async(error: VMError) -> AsyncError {
-    AsyncError { error, gas_used: 0 }
+    AsyncError {
+        error,
+        gas_used: 0.into(),
+    }
 }
 
 fn partial_vm_error_to_async(error: PartialVMError) -> AsyncError {
diff --git a/language/extensions/async/move-async-vm/src/natives.rs b/language/extensions/async/move-async-vm/src/natives.rs
index 5b78f372f4..a9a9f4f967 100644
--- a/language/extensions/async/move-async-vm/src/natives.rs
+++ b/language/extensions/async/move-async-vm/src/natives.rs
@@ -5,26 +5,23 @@
 use crate::async_vm::Message;
 use better_any::{Tid, TidAble};
 use move_binary_format::errors::PartialVMResult;
-use move_core_types::{account_address::AccountAddress, identifier::Identifier};
+use move_core_types::{
+    account_address::AccountAddress,
+    gas_algebra::{InternalGas, InternalGasPerByte, NumBytes},
+    identifier::Identifier,
+};
 use move_vm_runtime::{
     native_functions,
     native_functions::{NativeContext, NativeFunction},
 };
 use move_vm_types::{
-    gas_schedule::NativeCostIndex,
     loaded_data::runtime_types::Type,
-    natives::function::{native_gas, NativeResult},
+    natives::function::NativeResult,
     pop_arg,
     values::{Value, Vector},
 };
 use smallvec::smallvec;
-use std::collections::VecDeque;
-
-// TODO: make cost tables extensible; right now we forward to one of the predefined cost indices
-// as an approximation.
-const SELF_COST_INDEX: NativeCostIndex = NativeCostIndex::LENGTH;
-const SEND_COST_INDEX: NativeCostIndex = NativeCostIndex::EMIT_EVENT;
-const EPOCH_TIME_INDEX: NativeCostIndex = NativeCostIndex::LENGTH;
+use std::{collections::VecDeque, sync::Arc};
 
 /// Environment extension for the Move VM which we pass down to native functions,
 /// to implement message sending and retrieval of actor address.
@@ -36,39 +33,116 @@ pub struct AsyncExtension {
     pub in_initializer: bool,
 }
 
+#[derive(Clone, Debug)]
+pub struct GasParameters {
+    pub self_: SelfGasParameters,
+    pub send: SendGasParameters,
+    pub virtual_time: VirtualTimeGasParameters,
+}
+
+impl GasParameters {
+    pub fn zeros() -> Self {
+        Self {
+            self_: SelfGasParameters {
+                base_cost: 0.into(),
+            },
+            send: SendGasParameters {
+                base_cost: 0.into(),
+                unit_cost: 0.into(),
+            },
+            virtual_time: VirtualTimeGasParameters {
+                base_cost: 0.into(),
+            },
+        }
+    }
+}
+
 pub fn actor_natives(
     async_addr: AccountAddress,
+    gas_params: GasParameters,
 ) -> Vec<(AccountAddress, Identifier, Identifier, NativeFunction)> {
-    const NATIVES: &[(&str, &str, NativeFunction)] = &[
-        ("Actor", "self", native_self),
-        ("Actor", "virtual_time", native_virtual_time),
-        ("Runtime", "send__0", native_send),
-        ("Runtime", "send__1", native_send),
-        ("Runtime", "send__2", native_send),
-        ("Runtime", "send__3", native_send),
-        ("Runtime", "send__4", native_send),
-        ("Runtime", "send__5", native_send),
-        ("Runtime", "send__6", native_send),
-        ("Runtime", "send__7", native_send),
-        ("Runtime", "send__8", native_send),
+    let natives = [
+        ("Actor", "self", make_native_self(gas_params.self_)),
+        (
+            "Actor",
+            "virtual_time",
+            make_native_virtual_time(gas_params.virtual_time),
+        ),
+        (
+            "Runtime",
+            "send__0",
+            make_native_send(gas_params.send.clone()),
+        ),
+        (
+            "Runtime",
+            "send__1",
+            make_native_send(gas_params.send.clone()),
+        ),
+        (
+            "Runtime",
+            "send__2",
+            make_native_send(gas_params.send.clone()),
+        ),
+        (
+            "Runtime",
+            "send__3",
+            make_native_send(gas_params.send.clone()),
+        ),
+        (
+            "Runtime",
+            "send__4",
+            make_native_send(gas_params.send.clone()),
+        ),
+        (
+            "Runtime",
+            "send__5",
+            make_native_send(gas_params.send.clone()),
+        ),
+        (
+            "Runtime",
+            "send__6",
+            make_native_send(gas_params.send.clone()),
+        ),
+        (
+            "Runtime",
+            "send__7",
+            make_native_send(gas_params.send.clone()),
+        ),
+        ("Runtime", "send__8", make_native_send(gas_params.send)),
     ];
-    native_functions::make_table(async_addr, NATIVES)
+    native_functions::make_table_from_iter(async_addr, natives)
+}
+
+#[derive(Clone, Debug)]
+pub struct SelfGasParameters {
+    base_cost: InternalGas,
 }
 
 fn native_self(
+    gas_params: &SelfGasParameters,
     context: &mut NativeContext,
     mut _ty_args: Vec<Type>,
     mut _args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
-    let cost = native_gas(context.cost_table(), SELF_COST_INDEX, 1);
     let ext = context.extensions().get::<AsyncExtension>();
     Ok(NativeResult::ok(
-        cost,
+        gas_params.base_cost,
         smallvec![Value::address(ext.current_actor)],
     ))
 }
 
+fn make_native_self(gas_params: SelfGasParameters) -> NativeFunction {
+    Arc::new(move |context, ty_args, args| native_self(&gas_params, context, ty_args, args))
+}
+
+#[derive(Clone, Debug)]
+pub struct SendGasParameters {
+    base_cost: InternalGas,
+    unit_cost: InternalGasPerByte,
+}
+
 fn native_send(
+    gas_params: &SendGasParameters,
     context: &mut NativeContext,
     mut _ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
@@ -82,19 +156,34 @@ fn native_send(
     let message_hash = pop_arg!(args, u64);
     let target = pop_arg!(args, AccountAddress);
     ext.sent.push((target, message_hash, bcs_args));
-    let cost = native_gas(context.cost_table(), SEND_COST_INDEX, args.len());
+
+    let cost = gas_params.base_cost + gas_params.unit_cost * NumBytes::new(args.len() as u64);
+
     Ok(NativeResult::ok(cost, smallvec![]))
 }
 
+fn make_native_send(gas_params: SendGasParameters) -> NativeFunction {
+    Arc::new(move |context, ty_args, args| native_send(&gas_params, context, ty_args, args))
+}
+
+#[derive(Clone, Debug)]
+pub struct VirtualTimeGasParameters {
+    base_cost: InternalGas,
+}
+
 fn native_virtual_time(
+    gas_params: &VirtualTimeGasParameters,
     context: &mut NativeContext,
     mut _ty_args: Vec<Type>,
     mut _args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
-    let cost = native_gas(context.cost_table(), EPOCH_TIME_INDEX, 1);
     let ext = context.extensions().get::<AsyncExtension>();
     Ok(NativeResult::ok(
-        cost,
+        gas_params.base_cost,
         smallvec![Value::u128(ext.virtual_time)],
     ))
 }
+
+fn make_native_virtual_time(gas_params: VirtualTimeGasParameters) -> NativeFunction {
+    Arc::new(move |context, ty_args, args| native_virtual_time(&gas_params, context, ty_args, args))
+}
diff --git a/language/extensions/async/move-async-vm/tests/sources/AccountStateMachine.exp b/language/extensions/async/move-async-vm/tests/sources/AccountStateMachine.exp
index da5160c13f..aa288bfed9 100644
--- a/language/extensions/async/move-async-vm/tests/sources/AccountStateMachine.exp
+++ b/language/extensions/async/move-async-vm/tests/sources/AccountStateMachine.exp
@@ -5,10 +5,10 @@ publishing vector
 publishing AccountStateMachine
 actor 0x4 created from 0x3::AccountStateMachine
   SUCCESS
-  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := [00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := New("[00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]")
 actor 0x5 created from 0x3::AccountStateMachine
   SUCCESS
-  commit 0x3::AccountStateMachine::AccountStateMachine[0x5] := [00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x5] := New("[00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]")
 actor 0x4 handling 0x3::AccountStateMachine::start (hash=0x5438F379BC9E3BCB)
   SUCCESS
   sent 0x4 <- 0x4C40DD3C3521A146 argc=1
@@ -20,28 +20,28 @@ actor 0x5 handling 0x3::AccountStateMachine::start (hash=0x5438F379BC9E3BCB)
   SUCCESS
 actor 0x4 handling 0x3::AccountStateMachine::deposit (hash=0x4C40DD3C3521A146)
   SUCCESS
-  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := [64, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := Modify("[64, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]")
 actor 0x5 handling 0x3::AccountStateMachine::deposit (hash=0x4C40DD3C3521A146)
   SUCCESS
-  commit 0x3::AccountStateMachine::AccountStateMachine[0x5] := [64, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x5] := Modify("[64, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]")
 actor 0x4 handling 0x3::AccountStateMachine::xfer (hash=0xF8ECAD16D8E182BB)
   SUCCESS
   sent 0x5 <- 0xB32E0FAF108F638 argc=3
-  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := [64, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, 00, 00, 00, 00, 00, 00, 14, 00, 00, 00, 00, 00, 00, 00, A0, 69, 62, 02, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := Modify("[64, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, 00, 00, 00, 00, 00, 00, 14, 00, 00, 00, 00, 00, 00, 00, A0, 69, 62, 02, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]")
 actor 0x4 handling 0x3::AccountStateMachine::cleanup (hash=0xDD840198DA7DE13E)
   SUCCESS
-  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := [64, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, 00, 00, 00, 00, 00, 00, 14, 00, 00, 00, 00, 00, 00, 00, A0, 69, 62, 02, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := Modify("[64, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, 00, 00, 00, 00, 00, 00, 14, 00, 00, 00, 00, 00, 00, 00, A0, 69, 62, 02, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]")
 actor 0x5 handling 0x3::AccountStateMachine::cleanup (hash=0xDD840198DA7DE13E)
   SUCCESS
-  commit 0x3::AccountStateMachine::AccountStateMachine[0x5] := [64, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x5] := Modify("[64, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]")
 actor 0x5 handling 0x3::AccountStateMachine::xfer_deposit (hash=0xB32E0FAF108F638)
   SUCCESS
   sent 0x4 <- 0xB8229D65C5B58BBA argc=1
-  commit 0x3::AccountStateMachine::AccountStateMachine[0x5] := [78, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x5] := Modify("[78, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00]")
 actor 0x4 handling 0x3::AccountStateMachine::xfer_finish (hash=0xB8229D65C5B58BBA)
   SUCCESS
   sent 0x4 <- 0x22801C54EE790BE3 argc=0
-  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := [50, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, 00, 00, 00, 00, 00, 00]
+  commit 0x3::AccountStateMachine::AccountStateMachine[0x4] := Modify("[50, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, 00, 00, 00, 00, 00, 00]")
 actor 0x4 handling 0x3::AccountStateMachine::end (hash=0x22801C54EE790BE3)
   SUCCESS
   sent 0x4 <- 0x3450A8717C6383FF argc=1
@@ -52,4 +52,4 @@ actor 0x4 handling 0x3::AccountStateMachine::verify (hash=0x3450A8717C6383FF)
 actor 0x5 handling 0x3::AccountStateMachine::verify (hash=0x3450A8717C6383FF)
   SUCCESS
 actor 0x5 handling 0x3::AccountStateMachine::verify (hash=0x3450A8717C6383FF)
-  FAIL  VMError with status ABORTED with sub status 2 at location Module ModuleId { address: 00000000000000000000000000000003, name: Identifier("AccountStateMachine") } and message 0x00000000000000000000000000000003::AccountStateMachine::verify at offset 9 at code offset 9 in function definition 16
+  FAIL  VMError with status ABORTED with sub status 2 at location Module ModuleId { address: 00000000000000000000000000000003, name: Identifier("AccountStateMachine") } and message 0x00000000000000000000000000000003::AccountStateMachine::verify at offset 8 at code offset 8 in function definition 16
diff --git a/language/extensions/async/move-async-vm/tests/sources/Basic.exp b/language/extensions/async/move-async-vm/tests/sources/Basic.exp
index f0b1741af0..fc83136899 100644
--- a/language/extensions/async/move-async-vm/tests/sources/Basic.exp
+++ b/language/extensions/async/move-async-vm/tests/sources/Basic.exp
@@ -3,30 +3,30 @@ publishing bcs
 publishing Basic
 actor 0x4 created from 0x3::Basic
   SUCCESS
-  commit 0x3::Basic::Basic[0x4] := [00, 00, 00, 00, 00, 00, 00, 00]
+  commit 0x3::Basic::Basic[0x4] := New("[00, 00, 00, 00, 00, 00, 00, 00]")
 actor 0x4 handling 0x3::Basic::start (hash=0xA9C2CD33311F2015)
   SUCCESS
   sent 0x4 <- 0x45F84510862E6905 argc=1
 actor 0x4 handling 0x3::Basic::count_down (hash=0x45F84510862E6905)
   SUCCESS
   sent 0x4 <- 0x45F84510862E6905 argc=1
-  commit 0x3::Basic::Basic[0x4] := [01, 00, 00, 00, 00, 00, 00, 00]
+  commit 0x3::Basic::Basic[0x4] := Modify("[01, 00, 00, 00, 00, 00, 00, 00]")
 actor 0x4 handling 0x3::Basic::count_down (hash=0x45F84510862E6905)
   SUCCESS
   sent 0x4 <- 0x45F84510862E6905 argc=1
-  commit 0x3::Basic::Basic[0x4] := [02, 00, 00, 00, 00, 00, 00, 00]
+  commit 0x3::Basic::Basic[0x4] := Modify("[02, 00, 00, 00, 00, 00, 00, 00]")
 actor 0x4 handling 0x3::Basic::count_down (hash=0x45F84510862E6905)
   SUCCESS
   sent 0x4 <- 0x45F84510862E6905 argc=1
-  commit 0x3::Basic::Basic[0x4] := [03, 00, 00, 00, 00, 00, 00, 00]
+  commit 0x3::Basic::Basic[0x4] := Modify("[03, 00, 00, 00, 00, 00, 00, 00]")
 actor 0x4 handling 0x3::Basic::count_down (hash=0x45F84510862E6905)
   SUCCESS
   sent 0x4 <- 0x45F84510862E6905 argc=1
-  commit 0x3::Basic::Basic[0x4] := [04, 00, 00, 00, 00, 00, 00, 00]
+  commit 0x3::Basic::Basic[0x4] := Modify("[04, 00, 00, 00, 00, 00, 00, 00]")
 actor 0x4 handling 0x3::Basic::count_down (hash=0x45F84510862E6905)
   SUCCESS
   sent 0x4 <- 0x45F84510862E6905 argc=1
-  commit 0x3::Basic::Basic[0x4] := [05, 00, 00, 00, 00, 00, 00, 00]
+  commit 0x3::Basic::Basic[0x4] := Modify("[05, 00, 00, 00, 00, 00, 00, 00]")
 actor 0x4 handling 0x3::Basic::count_down (hash=0x45F84510862E6905)
   SUCCESS
-  commit 0x3::Basic::Basic[0x4] := [05, 00, 00, 00, 00, 00, 00, 00]
+  commit 0x3::Basic::Basic[0x4] := Modify("[05, 00, 00, 00, 00, 00, 00, 00]")
diff --git a/language/extensions/async/move-async-vm/tests/testsuite.rs b/language/extensions/async/move-async-vm/tests/testsuite.rs
index f986693e25..a5fbc03a53 100644
--- a/language/extensions/async/move-async-vm/tests/testsuite.rs
+++ b/language/extensions/async/move-async-vm/tests/testsuite.rs
@@ -8,6 +8,7 @@ use move_async_vm::{
     actor_metadata,
     actor_metadata::ActorMetadata,
     async_vm::{AsyncResult, AsyncSession, AsyncVM, Message},
+    natives::GasParameters as ActorGasParameters,
 };
 use move_binary_format::access::ModuleAccess;
 use move_command_line_common::testing::EXP_EXT;
@@ -17,13 +18,13 @@ use move_compiler::{
 };
 use move_core_types::{
     account_address::AccountAddress,
-    effects::ChangeSet,
+    effects::{ChangeSet, Op},
     identifier::{IdentStr, Identifier},
     language_storage::{ModuleId, StructTag},
     resolver::{ModuleResolver, ResourceResolver},
 };
 use move_prover_test_utils::{baseline_test::verify_or_update_baseline, extract_test_directives};
-use move_vm_types::gas_schedule::GasStatus;
+use move_vm_test_utils::gas_schedule::GasStatus;
 use std::{
     cell::RefCell,
     collections::{BTreeMap, BTreeSet, VecDeque},
@@ -182,25 +183,34 @@ impl Harness {
 
     fn commit_changeset(&self, changeset: ChangeSet) {
         for (addr, change) in changeset.into_inner() {
-            for (struct_tag, val) in change.into_inner().1 {
+            for (struct_tag, op) in change.into_inner().1 {
                 self.log(format!(
-                    "  commit 0x{}::{}::{}[0x{}] := {}",
+                    "  commit 0x{}::{}::{}[0x{}] := {:?}",
                     struct_tag.address.short_str_lossless(),
                     struct_tag.module,
                     struct_tag.module,
                     addr.short_str_lossless(),
-                    val.as_ref()
-                        .map(|b| format!("{:02X?}", b))
-                        .unwrap_or_else(|| "None".to_string())
+                    op.as_ref().map(|b| format!("{:02X?}", b))
                 ));
-                match val {
-                    Some(v) => {
+                match op {
+                    Op::New(v) => {
+                        assert!(self
+                            .resource_store
+                            .borrow_mut()
+                            .insert((addr, struct_tag), v)
+                            .is_none());
+                    }
+                    Op::Modify(v) => {
                         self.resource_store
                             .borrow_mut()
-                            .insert((addr, struct_tag), v);
+                            .insert((addr, struct_tag), v)
+                            .unwrap();
                     }
-                    None => {
-                        self.resource_store.borrow_mut().remove(&(addr, struct_tag));
+                    Op::Delete => {
+                        self.resource_store
+                            .borrow_mut()
+                            .remove(&(addr, struct_tag))
+                            .unwrap();
                     }
                 }
             }
@@ -237,8 +247,14 @@ impl Harness {
             resource_store: Default::default(),
             vm: AsyncVM::new(
                 test_account(),
-                move_stdlib::natives::all_natives(test_account()),
+                move_stdlib::natives::all_natives(
+                    test_account(),
+                    // We may want to switch to a different gas schedule in the future, but for now,
+                    // the all-zero one should be enough.
+                    move_stdlib::natives::GasParameters::zeros(),
+                ),
                 actor_metadata,
+                ActorGasParameters::zeros(),
             )?,
             actor_instances,
         };
diff --git a/language/extensions/move-table-extension/Cargo.toml b/language/extensions/move-table-extension/Cargo.toml
index 36e01fd7ab..1dc6384986 100644
--- a/language/extensions/move-table-extension/Cargo.toml
+++ b/language/extensions/move-table-extension/Cargo.toml
@@ -5,14 +5,13 @@ authors = ["Diem Association <opensource@diem.com>"]
 description = "Wrapper for the Move VM which coordinates multiple extensions"
 repository = "https://github.com/diem/move"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
 anyhow = "1.0.52"
 better_any = "0.1.1"
 smallvec = "1.6.1"
-bcs = "0.1.2"
 sha3 = "0.9.1"
 once_cell = "1.7.2"
 move-core-types = { path = "../../move-core/types" }
@@ -20,6 +19,8 @@ move-vm-types = { path = "../../move-vm/types" }
 move-vm-runtime = { path = "../../move-vm/runtime", features = ["debugging"] }
 move-binary-format = { path = "../../move-binary-format" }
 
+bcs.workspace = true
+
 [dev-dependencies]
 move-stdlib = { path = "../../move-stdlib", features = ["testing"] }
 move-unit-test = { path = "../../tools/move-unit-test", features = ["table-extension"] }
diff --git a/language/extensions/move-table-extension/Move.toml b/language/extensions/move-table-extension/Move.toml
index 6c2aa20b6e..d44e94143a 100644
--- a/language/extensions/move-table-extension/Move.toml
+++ b/language/extensions/move-table-extension/Move.toml
@@ -3,12 +3,11 @@ name = "MoveTableExtension"
 version = "1.0.0"
 
 [addresses]
-std = "_"
-Extensions = "_"
+extensions = "_"
 
 [dev-addresses]
 std = "0x1"
-Extensions = "0x2"
+extensions = "0x2"
 
 [dependencies]
 MoveStdlib = { local = "../../move-stdlib" }
diff --git a/language/extensions/move-table-extension/README.md b/language/extensions/move-table-extension/README.md
index 36280c0971..cda2f1bd87 100644
--- a/language/extensions/move-table-extension/README.md
+++ b/language/extensions/move-table-extension/README.md
@@ -15,7 +15,7 @@ use move_vm_runtime::native_functions::NativeContextExtensions;
 fn run() {
     let resource_resolver = unimplemented!(); // a resource resolver the adapter provides
     let txn_hash = unimplemented!(); // a unique hash for table creation for this transaction
-    let table_resolver = unimplemented!(); // a remote table resover the adapter provides
+    let table_resolver = unimplemented!(); // a remote table resolver the adapter provides
     let std_addr = unimplemented!(); // address where to deploy the std lib
     let extension_addr = unimplemented!(); // address where to deploy the table extension
 
diff --git a/language/extensions/move-table-extension/sources/Table.move b/language/extensions/move-table-extension/sources/Table.move
index fe8bc180f2..8241264370 100644
--- a/language/extensions/move-table-extension/sources/Table.move
+++ b/language/extensions/move-table-extension/sources/Table.move
@@ -1,5 +1,5 @@
 /// Type of large-scale storage tables.
-module Extensions::Table {
+module extensions::table {
     use std::errors;
 
     // TODO: native code should not use reasons to signal logical type of error. Instead,
@@ -11,14 +11,14 @@ module Extensions::Table {
 
     /// Type of tables
     struct Table<phantom K: copy + drop, phantom V> has store {
-        handle: u128,
+        handle: address,
         length: u64,
     }
 
     /// Create a new Table.
     public fun new<K: copy + drop, V: store>(): Table<K, V> {
         Table{
-            handle: new_table_handle(),
+            handle: new_table_handle<K, V>(),
             length: 0,
         }
     }
@@ -98,7 +98,7 @@ module Extensions::Table {
 
     // Primitives which take as an additional type parameter `Box<V>`, so the implementation
     // can use this to determine serialization layout.
-    native fun new_table_handle(): u128;
+    native fun new_table_handle<K, V>(): address;
     native fun add_box<K: copy + drop, V, B>(table: &mut Table<K, V>, key: K, val: Box<V>);
     native fun borrow_box<K: copy + drop, V, B>(table: &Table<K, V>, key: K): &Box<V>;
     native fun borrow_box_mut<K: copy + drop, V, B>(table: &mut Table<K, V>, key: K): &mut Box<V>;
diff --git a/language/extensions/move-table-extension/sources/Table.spec.move b/language/extensions/move-table-extension/sources/Table.spec.move
index 645ba5a284..bfdd72f2cb 100644
--- a/language/extensions/move-table-extension/sources/Table.spec.move
+++ b/language/extensions/move-table-extension/sources/Table.spec.move
@@ -1,54 +1,31 @@
 /// Specifications of the `Table` module.
-spec Extensions::Table {
+spec extensions::table {
 
     // Make most of the public API intrinsic. Those functions have custom specifications in the prover.
 
     spec Table {
-        pragma intrinsic;
-    }
-
-    spec new {
-        pragma intrinsic;
-    }
-
-    spec destroy_empty {
-        pragma intrinsic;
-    }
-
-    spec add {
-        pragma intrinsic;
-    }
-
-    spec borrow {
-        pragma intrinsic;
-    }
-
-    spec borrow_mut {
-        pragma intrinsic;
-    }
-
-    spec length {
-        pragma intrinsic;
-    }
-
-    spec empty {
-        pragma intrinsic;
-    }
-
-    spec remove {
-        pragma intrinsic;
-    }
-
-    spec contains {
-        pragma intrinsic;
+        pragma intrinsic = map,
+            map_new = new,
+            map_destroy_empty = destroy_empty,
+            map_len = length,
+            map_is_empty = empty,
+            map_has_key = contains,
+            map_add_no_override = add,
+            map_del_must_exist = remove,
+            map_borrow = borrow,
+            map_borrow_mut = borrow_mut,
+            map_spec_get = spec_get,
+            map_spec_set = spec_set,
+            map_spec_del = spec_remove,
+            map_spec_len = spec_len,
+            map_spec_has_key = spec_contains;
     }
 
     // Specification functions for tables
 
-    spec native fun spec_table<K, V>(): Table<K, V>;
     spec native fun spec_len<K, V>(t: Table<K, V>): num;
     spec native fun spec_contains<K, V>(t: Table<K, V>, k: K): bool;
-    spec native fun spec_add<K, V>(t: Table<K, V>, k: K, v: V): Table<K, V>;
+    spec native fun spec_set<K, V>(t: Table<K, V>, k: K, v: V): Table<K, V>;
     spec native fun spec_remove<K, V>(t: Table<K, V>, k: K): Table<K, V>;
     spec native fun spec_get<K, V>(t: Table<K, V>, k: K): V;
 }
diff --git a/language/extensions/move-table-extension/src/lib.rs b/language/extensions/move-table-extension/src/lib.rs
index 42c5c189ee..7a2b6fc5ac 100644
--- a/language/extensions/move-table-extension/src/lib.rs
+++ b/language/extensions/move-table-extension/src/lib.rs
@@ -11,27 +11,29 @@ use better_any::{Tid, TidAble};
 use move_binary_format::errors::{PartialVMError, PartialVMResult};
 use move_core_types::{
     account_address::AccountAddress,
-    gas_schedule::{GasAlgebra, GasCarrier, InternalGasUnits},
+    effects::Op,
+    gas_algebra::{InternalGas, InternalGasPerByte, NumBytes},
+    language_storage::TypeTag,
     value::MoveTypeLayout,
     vm_status::StatusCode,
 };
 use move_vm_runtime::{
     native_functions,
-    native_functions::{NativeContext, NativeFunctionTable},
+    native_functions::{NativeContext, NativeFunction, NativeFunctionTable},
 };
 use move_vm_types::{
     loaded_data::runtime_types::Type,
     natives::function::NativeResult,
     pop_arg,
-    values::{GlobalValue, GlobalValueEffect, Reference, StructRef, Value},
+    values::{GlobalValue, Reference, StructRef, Value},
 };
 use sha3::{Digest, Sha3_256};
 use smallvec::smallvec;
 use std::{
     cell::RefCell,
     collections::{btree_map::Entry, BTreeMap, BTreeSet, VecDeque},
-    convert::TryInto,
     fmt::Display,
+    sync::Arc,
 };
 
 // ===========================================================================================
@@ -41,7 +43,7 @@ use std::{
 /// hash over a transaction hash provided by the environment and a table creation counter
 /// local to the transaction.
 #[derive(Copy, Clone, Debug, PartialOrd, Ord, PartialEq, Eq)]
-pub struct TableHandle(pub u128);
+pub struct TableHandle(pub AccountAddress);
 
 impl Display for TableHandle {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -49,17 +51,38 @@ impl Display for TableHandle {
     }
 }
 
+#[derive(Clone, Debug)]
+pub struct TableInfo {
+    pub key_type: TypeTag,
+    pub value_type: TypeTag,
+}
+
+impl TableInfo {
+    pub fn new(key_type: TypeTag, value_type: TypeTag) -> Self {
+        Self {
+            key_type,
+            value_type,
+        }
+    }
+}
+
+impl Display for TableInfo {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        writeln!(f, "Table<{}, {}>", self.key_type, self.value_type)
+    }
+}
+
 /// A table change set.
 #[derive(Default)]
 pub struct TableChangeSet {
-    pub new_tables: BTreeSet<TableHandle>,
+    pub new_tables: BTreeMap<TableHandle, TableInfo>,
     pub removed_tables: BTreeSet<TableHandle>,
     pub changes: BTreeMap<TableHandle, TableChange>,
 }
 
 /// A change of a single table.
 pub struct TableChange {
-    pub entries: BTreeMap<Vec<u8>, Option<Vec<u8>>>,
+    pub entries: BTreeMap<Vec<u8>, Op<Vec<u8>>>,
 }
 
 /// A table resolver which needs to be provided by the environment. This allows to lookup
@@ -70,24 +93,6 @@ pub trait TableResolver {
         handle: &TableHandle,
         key: &[u8],
     ) -> Result<Option<Vec<u8>>, anyhow::Error>;
-
-    fn operation_cost(
-        &self,
-        op: TableOperation,
-        key_size: usize,
-        val_size: usize,
-    ) -> InternalGasUnits<GasCarrier>;
-}
-
-/// A table operation, for supporting cost calculation.
-pub enum TableOperation {
-    NewHandle,
-    Destroy,
-    Insert,
-    Borrow,
-    Length,
-    Remove,
-    Contains,
 }
 
 /// The native table context extension. This needs to be attached to the NativeContextExtensions
@@ -96,7 +101,7 @@ pub enum TableOperation {
 #[derive(Tid)]
 pub struct NativeTableContext<'a> {
     resolver: &'a dyn TableResolver,
-    txn_hash: u128,
+    txn_hash: [u8; 32],
     table_data: RefCell<TableData>,
 }
 
@@ -116,7 +121,7 @@ const _NOT_EMPTY: u64 = (102 << 8) + _ECATEGORY_INVALID_STATE as u64;
 /// of the overall context so we can mutate while still accessing the overall context.
 #[derive(Default)]
 struct TableData {
-    new_tables: BTreeSet<TableHandle>,
+    new_tables: BTreeMap<TableHandle, TableInfo>,
     removed_tables: BTreeSet<TableHandle>,
     tables: BTreeMap<TableHandle, Table>,
 }
@@ -138,7 +143,7 @@ const HANDLE_FIELD_INDEX: usize = 0;
 impl<'a> NativeTableContext<'a> {
     /// Create a new instance of a native table context. This must be passed in via an
     /// extension into VM session functions.
-    pub fn new(txn_hash: u128, resolver: &'a dyn TableResolver) -> Self {
+    pub fn new(txn_hash: [u8; 32], resolver: &'a dyn TableResolver) -> Self {
         Self {
             resolver,
             txn_hash,
@@ -163,15 +168,23 @@ impl<'a> NativeTableContext<'a> {
             } = table;
             let mut entries = BTreeMap::new();
             for (key, gv) in content {
-                match gv.into_effect()? {
-                    GlobalValueEffect::Deleted => {
-                        entries.insert(key, None);
+                let op = match gv.into_effect() {
+                    Some(op) => op,
+                    None => continue,
+                };
+
+                match op {
+                    Op::New(val) => {
+                        let bytes = serialize(&value_layout, &val)?;
+                        entries.insert(key, Op::New(bytes));
+                    }
+                    Op::Modify(val) => {
+                        let bytes = serialize(&value_layout, &val)?;
+                        entries.insert(key, Op::Modify(bytes));
                     }
-                    GlobalValueEffect::Changed(new_val) => {
-                        let new_bytes = serialize(&value_layout, &new_val)?;
-                        entries.insert(key, Some(new_bytes));
+                    Op::Delete => {
+                        entries.insert(key, Op::Delete);
                     }
-                    _ => {}
                 }
             }
             if !entries.is_empty() {
@@ -196,173 +209,179 @@ impl TableData {
         key_ty: &Type,
         value_ty: &Type,
     ) -> PartialVMResult<&mut Table> {
-        if let Entry::Vacant(e) = self.tables.entry(handle) {
-            let key_layout = get_type_layout(context, key_ty)?;
-            let value_layout = get_type_layout(context, value_ty)?;
-            let table = Table {
-                handle,
-                key_layout,
-                value_layout,
-                content: Default::default(),
-            };
-            e.insert(table);
-        }
-        Ok(self.tables.get_mut(&handle).unwrap())
+        Ok(match self.tables.entry(handle) {
+            Entry::Vacant(e) => {
+                let key_layout = get_type_layout(context, key_ty)?;
+                let value_layout = get_type_layout(context, value_ty)?;
+                let table = Table {
+                    handle,
+                    key_layout,
+                    value_layout,
+                    content: Default::default(),
+                };
+                e.insert(table)
+            }
+            Entry::Occupied(e) => e.into_mut(),
+        })
     }
 }
 
 impl Table {
-    /// Inserts a value into a table.
-    fn insert(
+    fn get_or_create_global_value(
         &mut self,
         context: &NativeTableContext,
-        key: &Value,
-        val: Value,
-    ) -> PartialVMResult<(usize, usize)> {
-        let (gv_opt, _, _) = self.global_value_if_exists(context, key)?;
-        if gv_opt.is_some() {
-            return Err(partial_abort_error(
-                "table entry already occupied",
-                ALREADY_EXISTS,
-            ));
-        }
-        let key_bytes = serialize(&self.key_layout, key)?;
-        let key_size = key_bytes.len();
-        // Need to serialize for cost computation
-        let val_size = serialize(&self.value_layout, &val)?.len();
-        self.content
-            .entry(key_bytes)
-            .or_insert_with(GlobalValue::none)
-            .move_to(val)?;
-        Ok((key_size, val_size))
-    }
-
-    /// Borrows a reference to a table (mutable or immutable).
-    fn borrow_global(
-        &mut self,
-        context: &NativeTableContext,
-        key: &Value,
-    ) -> PartialVMResult<(Value, usize, usize)> {
-        let (gv_opt, key_size, val_size) = self.global_value_if_exists(context, key)?;
-        let gv = gv_opt.ok_or_else(|| partial_abort_error("undefined table entry", NOT_FOUND))?;
-        let val = gv.borrow_global()?;
-        Ok((val, key_size, val_size))
-    }
-
-    /// Removes an entry from a table.
-    fn remove(
-        &mut self,
-        context: &NativeTableContext,
-        key: &Value,
-    ) -> PartialVMResult<(Value, usize, usize)> {
-        let (gv_opt, key_size, val_size) = self.global_value_if_exists(context, key)?;
-        let gv = gv_opt.ok_or_else(|| partial_abort_error("undefined table entry", NOT_FOUND))?;
-        let val = gv.move_from()?;
-        Ok((val, key_size, val_size))
+        key: Vec<u8>,
+    ) -> PartialVMResult<(&mut GlobalValue, Option<Option<NumBytes>>)> {
+        Ok(match self.content.entry(key) {
+            Entry::Vacant(entry) => {
+                let (gv, loaded) = match context
+                    .resolver
+                    .resolve_table_entry(&self.handle, entry.key())
+                    .map_err(|err| {
+                        partial_extension_error(format!("remote table resolver failure: {}", err))
+                    })? {
+                    Some(val_bytes) => {
+                        let val = deserialize(&self.value_layout, &val_bytes)?;
+                        (
+                            GlobalValue::cached(val)?,
+                            Some(NumBytes::new(val_bytes.len() as u64)),
+                        )
+                    }
+                    None => (GlobalValue::none(), None),
+                };
+                (entry.insert(gv), Some(loaded))
+            }
+            Entry::Occupied(entry) => (entry.into_mut(), None),
+        })
     }
+}
 
-    /// Checks whether a key is in the table.
-    fn contains(
-        &mut self,
-        context: &NativeTableContext,
-        key: &Value,
-    ) -> PartialVMResult<(Value, usize, usize)> {
-        let (gv_opt, key_size, val_size) = self.global_value_if_exists(context, key)?;
-        Ok((Value::bool(gv_opt.is_some()), key_size, val_size))
-    }
+// =========================================================================================
+// Native Function Implementations
 
-    /// Destroys a table.
-    fn destroy_empty(&mut self, _context: &NativeTableContext) -> PartialVMResult<(usize, usize)> {
-        Ok((0, 0))
-    }
+/// Returns all natives for tables.
+pub fn table_natives(table_addr: AccountAddress, gas_params: GasParameters) -> NativeFunctionTable {
+    let natives: [(&str, &str, NativeFunction); 8] = [
+        (
+            "table",
+            "new_table_handle",
+            make_native_new_table_handle(gas_params.new_table_handle),
+        ),
+        (
+            "table",
+            "add_box",
+            make_native_add_box(gas_params.common.clone(), gas_params.add_box),
+        ),
+        (
+            "table",
+            "borrow_box",
+            make_native_borrow_box(gas_params.common.clone(), gas_params.borrow_box.clone()),
+        ),
+        (
+            "table",
+            "borrow_box_mut",
+            make_native_borrow_box(gas_params.common.clone(), gas_params.borrow_box),
+        ),
+        (
+            "table",
+            "remove_box",
+            make_native_remove_box(gas_params.common.clone(), gas_params.remove_box),
+        ),
+        (
+            "table",
+            "contains_box",
+            make_native_contains_box(gas_params.common, gas_params.contains_box),
+        ),
+        (
+            "table",
+            "destroy_empty_box",
+            make_native_destroy_empty_box(gas_params.destroy_empty_box),
+        ),
+        (
+            "table",
+            "drop_unchecked_box",
+            make_native_drop_unchecked_box(gas_params.drop_unchecked_box),
+        ),
+    ];
+
+    native_functions::make_table_from_iter(table_addr, natives)
+}
 
-    /// Gets the global value of an entry in the table. Attempts to retrieve a value from
-    /// the resolver if needed. Aborts if the value does not exists. Also returns the size
-    /// of the key and value (if a value needs to be fetched from remote) for cost computation.
-    fn global_value_if_exists(
-        &mut self,
-        context: &NativeTableContext,
-        key: &Value,
-    ) -> PartialVMResult<(Option<&mut GlobalValue>, usize, usize)> {
-        let key_bytes = serialize(&self.key_layout, key)?;
-        let key_size = key_bytes.len();
-        let mut val_size = 0;
-        if !self.content.contains_key(&key_bytes) {
-            // Try to retrieve a value from the remote resolver.
-            let gv = match context
-                .resolver
-                .resolve_table_entry(&self.handle, &key_bytes)
-                .map_err(|err| {
-                    partial_extension_error(format!("remote table resolver failure: {}", err))
-                })? {
-                Some(val_bytes) => {
-                    val_size = val_bytes.len();
-                    let val = deserialize(&self.value_layout, &val_bytes)?;
-                    GlobalValue::cached(val)?
-                }
-                None => GlobalValue::none(),
-            };
-            self.content.insert(key_bytes.clone(), gv);
-        }
+#[derive(Debug, Clone)]
+pub struct CommonGasParameters {
+    pub load_base: InternalGas,
+    pub load_per_byte: InternalGasPerByte,
+    pub load_failure: InternalGas,
+}
 
-        let gv = self.content.get_mut(&key_bytes).unwrap();
-        if gv.exists()? {
-            Ok((Some(gv), key_size, val_size))
-        } else {
-            Ok((None, key_size, val_size))
-        }
+impl CommonGasParameters {
+    fn calculate_load_cost(&self, loaded: Option<Option<NumBytes>>) -> InternalGas {
+        self.load_base
+            + match loaded {
+                Some(Some(num_bytes)) => self.load_per_byte * num_bytes,
+                Some(None) => self.load_failure,
+                None => 0.into(),
+            }
     }
 }
 
-// =========================================================================================
-// Native Function Implementations
-
-/// Returns all natives for tables.
-pub fn table_natives(table_addr: AccountAddress) -> NativeFunctionTable {
-    native_functions::make_table(
-        table_addr,
-        &[
-            ("Table", "new_table_handle", native_new_table_handle),
-            ("Table", "add_box", native_add_box),
-            ("Table", "borrow_box", native_borrow_box),
-            ("Table", "borrow_box_mut", native_borrow_box),
-            ("Table", "remove_box", native_remove_box),
-            ("Table", "contains_box", native_contains_box),
-            ("Table", "destroy_empty_box", native_destroy_empty_box),
-            ("Table", "drop_unchecked_box", native_drop_unchecked_box),
-        ],
-    )
+#[derive(Debug, Clone)]
+pub struct NewTableHandleGasParameters {
+    pub base: InternalGas,
 }
 
 fn native_new_table_handle(
+    gas_params: &NewTableHandleGasParameters,
     context: &mut NativeContext,
-    mut _ty_args: Vec<Type>,
+    ty_args: Vec<Type>,
     args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
+    assert_eq!(ty_args.len(), 2);
     assert!(args.is_empty());
 
     let table_context = context.extensions().get::<NativeTableContext>();
     let mut table_data = table_context.table_data.borrow_mut();
 
     // Take the transaction hash provided by the environment, combine it with the # of tables
-    // produced so far, sha256 this and select 16 bytes from the result. Given the txn hash
+    // produced so far, sha256 this to produce a unique handle. Given the txn hash
     // is unique, this should create a unique and deterministic global id.
     let mut digest = Sha3_256::new();
-    Digest::update(&mut digest, table_context.txn_hash.to_be_bytes());
-    Digest::update(&mut digest, table_data.new_tables.len().to_be_bytes());
-    let bytes: [u8; 16] = digest.finalize()[0..16].try_into().unwrap();
-    let id = u128::from_be_bytes(bytes);
-    assert!(table_data.new_tables.insert(TableHandle(id)));
+    let table_len = table_data.new_tables.len() as u32; // cast usize to u32 to ensure same length
+    Digest::update(&mut digest, table_context.txn_hash);
+    Digest::update(&mut digest, table_len.to_be_bytes());
+    let bytes = digest.finalize().to_vec();
+    let handle = AccountAddress::from_bytes(&bytes[0..AccountAddress::LENGTH])
+        .map_err(|_| partial_extension_error("Unable to create table handle"))?;
+    let key_type = context.type_to_type_tag(&ty_args[0])?;
+    let value_type = context.type_to_type_tag(&ty_args[1])?;
+    assert!(table_data
+        .new_tables
+        .insert(TableHandle(handle), TableInfo::new(key_type, value_type))
+        .is_none());
 
     Ok(NativeResult::ok(
-        table_context
-            .resolver
-            .operation_cost(TableOperation::NewHandle, 0, 0),
-        smallvec![Value::u128(id)],
+        gas_params.base,
+        smallvec![Value::address(handle)],
     ))
 }
 
+pub fn make_native_new_table_handle(gas_params: NewTableHandleGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_new_table_handle(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+#[derive(Debug, Clone)]
+pub struct AddBoxGasParameters {
+    pub base: InternalGas,
+    pub per_byte_serialized: InternalGasPerByte,
+}
+
 fn native_add_box(
+    common_gas_params: &CommonGasParameters,
+    gas_params: &AddBoxGasParameters,
     context: &mut NativeContext,
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
@@ -377,19 +396,42 @@ fn native_add_box(
     let key = args.pop_back().unwrap();
     let handle = get_table_handle(&pop_arg!(args, StructRef))?;
 
+    let mut cost = gas_params.base;
+
     let table = table_data.get_or_create_table(context, handle, &ty_args[0], &ty_args[2])?;
-    let status = table.insert(table_context, &key, val);
-    let (key_size, val_size) = status?;
 
-    Ok(NativeResult::ok(
-        table_context
-            .resolver
-            .operation_cost(TableOperation::Insert, key_size, val_size),
-        smallvec![],
-    ))
+    let key_bytes = serialize(&table.key_layout, &key)?;
+    cost += gas_params.per_byte_serialized * NumBytes::new(key_bytes.len() as u64);
+
+    let (gv, loaded) = table.get_or_create_global_value(table_context, key_bytes)?;
+    cost += common_gas_params.calculate_load_cost(loaded);
+
+    match gv.move_to(val) {
+        Ok(_) => Ok(NativeResult::ok(cost, smallvec![])),
+        Err(_) => Ok(NativeResult::err(cost, ALREADY_EXISTS)),
+    }
+}
+
+pub fn make_native_add_box(
+    common_gas_params: CommonGasParameters,
+    gas_params: AddBoxGasParameters,
+) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_add_box(&common_gas_params, &gas_params, context, ty_args, args)
+        },
+    )
+}
+
+#[derive(Debug, Clone)]
+pub struct BorrowBoxGasParameters {
+    pub base: InternalGas,
+    pub per_byte_serialized: InternalGasPerByte,
 }
 
 fn native_borrow_box(
+    common_gas_params: &CommonGasParameters,
+    gas_params: &BorrowBoxGasParameters,
     context: &mut NativeContext,
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
@@ -404,17 +446,41 @@ fn native_borrow_box(
     let handle = get_table_handle(&pop_arg!(args, StructRef))?;
 
     let table = table_data.get_or_create_table(context, handle, &ty_args[0], &ty_args[2])?;
-    let (val, key_size, val_size) = table.borrow_global(table_context, &key)?;
 
-    Ok(NativeResult::ok(
-        table_context
-            .resolver
-            .operation_cost(TableOperation::Borrow, key_size, val_size),
-        smallvec![val],
-    ))
+    let mut cost = gas_params.base;
+
+    let key_bytes = serialize(&table.key_layout, &key)?;
+    cost += gas_params.per_byte_serialized * NumBytes::new(key_bytes.len() as u64);
+
+    let (gv, loaded) = table.get_or_create_global_value(table_context, key_bytes)?;
+    cost += common_gas_params.calculate_load_cost(loaded);
+
+    match gv.borrow_global() {
+        Ok(ref_val) => Ok(NativeResult::ok(cost, smallvec![ref_val])),
+        Err(_) => Ok(NativeResult::err(cost, NOT_FOUND)),
+    }
+}
+
+pub fn make_native_borrow_box(
+    common_gas_params: CommonGasParameters,
+    gas_params: BorrowBoxGasParameters,
+) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_borrow_box(&common_gas_params, &gas_params, context, ty_args, args)
+        },
+    )
+}
+
+#[derive(Debug, Clone)]
+pub struct ContainsBoxGasParameters {
+    pub base: InternalGas,
+    pub per_byte_serialized: InternalGasPerByte,
 }
 
 fn native_contains_box(
+    common_gas_params: &CommonGasParameters,
+    gas_params: &ContainsBoxGasParameters,
     context: &mut NativeContext,
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
@@ -429,17 +495,40 @@ fn native_contains_box(
     let handle = get_table_handle(&pop_arg!(args, StructRef))?;
 
     let table = table_data.get_or_create_table(context, handle, &ty_args[0], &ty_args[2])?;
-    let (val, key_size, val_size) = table.contains(table_context, &key)?;
 
-    Ok(NativeResult::ok(
-        table_context
-            .resolver
-            .operation_cost(TableOperation::Contains, key_size, val_size),
-        smallvec![val],
-    ))
+    let mut cost = gas_params.base;
+
+    let key_bytes = serialize(&table.key_layout, &key)?;
+    cost += gas_params.per_byte_serialized * NumBytes::new(key_bytes.len() as u64);
+
+    let (gv, loaded) = table.get_or_create_global_value(table_context, key_bytes)?;
+    cost += common_gas_params.calculate_load_cost(loaded);
+
+    let exists = Value::bool(gv.exists()?);
+
+    Ok(NativeResult::ok(cost, smallvec![exists]))
+}
+
+pub fn make_native_contains_box(
+    common_gas_params: CommonGasParameters,
+    gas_params: ContainsBoxGasParameters,
+) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_contains_box(&common_gas_params, &gas_params, context, ty_args, args)
+        },
+    )
+}
+
+#[derive(Debug, Clone)]
+pub struct RemoveGasParameters {
+    pub base: InternalGas,
+    pub per_byte_serialized: InternalGasPerByte,
 }
 
 fn native_remove_box(
+    common_gas_params: &CommonGasParameters,
+    gas_params: &RemoveGasParameters,
     context: &mut NativeContext,
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
@@ -452,18 +541,41 @@ fn native_remove_box(
 
     let key = args.pop_back().unwrap();
     let handle = get_table_handle(&pop_arg!(args, StructRef))?;
+
     let table = table_data.get_or_create_table(context, handle, &ty_args[0], &ty_args[2])?;
-    let (val, key_size, val_size) = table.remove(table_context, &key)?;
 
-    Ok(NativeResult::ok(
-        table_context
-            .resolver
-            .operation_cost(TableOperation::Remove, key_size, val_size),
-        smallvec![val],
-    ))
+    let mut cost = gas_params.base;
+
+    let key_bytes = serialize(&table.key_layout, &key)?;
+    cost += gas_params.per_byte_serialized * NumBytes::new(key_bytes.len() as u64);
+
+    let (gv, loaded) = table.get_or_create_global_value(table_context, key_bytes)?;
+    cost += common_gas_params.calculate_load_cost(loaded);
+
+    match gv.move_from() {
+        Ok(val) => Ok(NativeResult::ok(cost, smallvec![val])),
+        Err(_) => Ok(NativeResult::err(cost, NOT_FOUND)),
+    }
+}
+
+pub fn make_native_remove_box(
+    common_gas_params: CommonGasParameters,
+    gas_params: RemoveGasParameters,
+) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_remove_box(&common_gas_params, &gas_params, context, ty_args, args)
+        },
+    )
+}
+
+#[derive(Debug, Clone)]
+pub struct DestroyEmptyBoxGasParameters {
+    pub base: InternalGas,
 }
 
 fn native_destroy_empty_box(
+    gas_params: &DestroyEmptyBoxGasParameters,
     context: &mut NativeContext,
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
@@ -475,20 +587,29 @@ fn native_destroy_empty_box(
     let mut table_data = table_context.table_data.borrow_mut();
 
     let handle = get_table_handle(&pop_arg!(args, StructRef))?;
-    let table = table_data.get_or_create_table(context, handle, &ty_args[0], &ty_args[2])?;
-    let (key_size, val_size) = table.destroy_empty(table_context)?;
+    // TODO: Can the following line be removed?
+    table_data.get_or_create_table(context, handle, &ty_args[0], &ty_args[2])?;
 
     assert!(table_data.removed_tables.insert(handle));
 
-    Ok(NativeResult::ok(
-        table_context
-            .resolver
-            .operation_cost(TableOperation::Destroy, key_size, val_size),
-        smallvec![],
-    ))
+    Ok(NativeResult::ok(gas_params.base, smallvec![]))
+}
+
+pub fn make_native_destroy_empty_box(gas_params: DestroyEmptyBoxGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_destroy_empty_box(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+#[derive(Debug, Clone)]
+pub struct DropUncheckedBoxGasParameters {
+    pub base: InternalGas,
 }
 
 fn native_drop_unchecked_box(
+    gas_params: &DropUncheckedBoxGasParameters,
     _context: &mut NativeContext,
     ty_args: Vec<Type>,
     args: VecDeque<Value>,
@@ -496,17 +617,70 @@ fn native_drop_unchecked_box(
     assert_eq!(ty_args.len(), 3);
     assert_eq!(args.len(), 1);
 
-    Ok(NativeResult::ok(InternalGasUnits::new(0_u64), smallvec![]))
+    Ok(NativeResult::ok(gas_params.base, smallvec![]))
+}
+
+pub fn make_native_drop_unchecked_box(gas_params: DropUncheckedBoxGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_drop_unchecked_box(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub common: CommonGasParameters,
+    pub new_table_handle: NewTableHandleGasParameters,
+    pub add_box: AddBoxGasParameters,
+    pub borrow_box: BorrowBoxGasParameters,
+    pub contains_box: ContainsBoxGasParameters,
+    pub remove_box: RemoveGasParameters,
+    pub destroy_empty_box: DestroyEmptyBoxGasParameters,
+    pub drop_unchecked_box: DropUncheckedBoxGasParameters,
+}
+
+impl GasParameters {
+    pub fn zeros() -> Self {
+        Self {
+            common: CommonGasParameters {
+                load_base: 0.into(),
+                load_per_byte: 0.into(),
+                load_failure: 0.into(),
+            },
+            new_table_handle: NewTableHandleGasParameters { base: 0.into() },
+            add_box: AddBoxGasParameters {
+                base: 0.into(),
+                per_byte_serialized: 0.into(),
+            },
+            borrow_box: BorrowBoxGasParameters {
+                base: 0.into(),
+                per_byte_serialized: 0.into(),
+            },
+            contains_box: ContainsBoxGasParameters {
+                base: 0.into(),
+                per_byte_serialized: 0.into(),
+            },
+            remove_box: RemoveGasParameters {
+                base: 0.into(),
+                per_byte_serialized: 0.into(),
+            },
+            destroy_empty_box: DestroyEmptyBoxGasParameters { base: 0.into() },
+            drop_unchecked_box: DropUncheckedBoxGasParameters { base: 0.into() },
+        }
+    }
 }
 
 // =========================================================================================
 // Helpers
 
 fn get_table_handle(table: &StructRef) -> PartialVMResult<TableHandle> {
-    let field_ref = table
+    let handle = table
         .borrow_field(HANDLE_FIELD_INDEX)?
-        .value_as::<Reference>()?;
-    field_ref.read_ref()?.value_as::<u128>().map(TableHandle)
+        .value_as::<Reference>()?
+        .read_ref()?
+        .value_as::<AccountAddress>()?;
+    Ok(TableHandle(handle))
 }
 
 fn serialize(layout: &MoveTypeLayout, val: &Value) -> PartialVMResult<Vec<u8>> {
@@ -523,12 +697,6 @@ fn partial_extension_error(msg: impl ToString) -> PartialVMError {
     PartialVMError::new(StatusCode::VM_EXTENSION_ERROR).with_message(msg.to_string())
 }
 
-fn partial_abort_error(msg: impl ToString, code: u64) -> PartialVMError {
-    PartialVMError::new(StatusCode::ABORTED)
-        .with_message(msg.to_string())
-        .with_sub_status(code)
-}
-
 fn get_type_layout(context: &NativeContext, ty: &Type) -> PartialVMResult<MoveTypeLayout> {
     context
         .type_to_type_layout(ty)?
diff --git a/language/extensions/move-table-extension/tests/move_unit_tests.rs b/language/extensions/move-table-extension/tests/move_unit_tests.rs
index df7b40ec61..9bc3c7205a 100644
--- a/language/extensions/move-table-extension/tests/move_unit_tests.rs
+++ b/language/extensions/move-table-extension/tests/move_unit_tests.rs
@@ -2,21 +2,24 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use move_cli::package::{cli, cli::UnitTestResult};
+use move_cli::base::test::{run_move_unit_tests, UnitTestResult};
 use move_core_types::account_address::AccountAddress;
-use move_table_extension::table_natives;
+use move_table_extension::{table_natives, GasParameters};
 use move_unit_test::UnitTestingConfig;
 use std::path::PathBuf;
 use tempfile::tempdir;
 
 fn run_tests_for_pkg(path_to_pkg: impl Into<String>) {
     let pkg_path = path_in_crate(path_to_pkg);
-    let mut natives =
-        move_stdlib::natives::all_natives(AccountAddress::from_hex_literal("0x1").unwrap());
+    let mut natives = move_stdlib::natives::all_natives(
+        AccountAddress::from_hex_literal("0x1").unwrap(),
+        move_stdlib::natives::GasParameters::zeros(),
+    );
     natives.append(&mut table_natives(
         AccountAddress::from_hex_literal("0x2").unwrap(),
+        GasParameters::zeros(),
     ));
-    let res = cli::run_move_unit_tests(
+    let res = run_move_unit_tests(
         &pkg_path,
         move_package::BuildConfig {
             test_mode: true,
@@ -25,7 +28,9 @@ fn run_tests_for_pkg(path_to_pkg: impl Into<String>) {
         },
         UnitTestingConfig::default_with_bound(Some(100_000)),
         natives,
+        None,
         /* compute_coverage */ false,
+        &mut std::io::stdout(),
     )
     .unwrap();
     if res != UnitTestResult::Success {
diff --git a/language/extensions/move-table-extension/tests/TableTests.move b/language/extensions/move-table-extension/tests/table_tests.move
similarity index 93%
rename from language/extensions/move-table-extension/tests/TableTests.move
rename to language/extensions/move-table-extension/tests/table_tests.move
index feeff3d5cf..c61fda43f3 100644
--- a/language/extensions/move-table-extension/tests/TableTests.move
+++ b/language/extensions/move-table-extension/tests/table_tests.move
@@ -1,7 +1,7 @@
 #[test_only]
-module Extensions::TableTests {
+module extensions::table_tests {
     use std::vector;
-    use Extensions::Table as T;
+    use extensions::table as T;
 
     struct S<phantom K: copy + drop, phantom V> has key {
         t: T::Table<K, V>
@@ -41,7 +41,7 @@ module Extensions::TableTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 26113)]
+    #[expected_failure(abort_code = 26113, location = extensions::table)]
     fun test_destroy_fails() {
         let t = T::new<u64, u64>();
         T::add(&mut t, 1, 2);
@@ -180,7 +180,7 @@ module Extensions::TableTests {
     }
 
     #[test(s = @0x42)]
-    #[expected_failure(abort_code = 25607)]
+    #[expected_failure(abort_code = 25607, location = extensions::table)]
     fun test_insert_fail(s: signer) {
         let t = T::new<u64, u128>();
         assert!(!T::contains(&t, 42), 100);
@@ -193,7 +193,7 @@ module Extensions::TableTests {
     }
 
     #[test(s = @0x42)]
-    #[expected_failure(abort_code = 25863)]
+    #[expected_failure(abort_code = 25863, location = extensions::table)]
     fun test_borrow_fail(s: signer) {
         let t = T::new<u64, u128>();
         assert!(!T::contains(&t, 42), 100);
@@ -205,7 +205,7 @@ module Extensions::TableTests {
     }
 
     #[test(s = @0x42)]
-    #[expected_failure(abort_code = 25863)]
+    #[expected_failure(abort_code = 25863, location = extensions::table)]
     fun test_remove_fail(s: signer) {
         let t = T::new<u64, Balance>();
         let Balance { value } = T::remove(&mut t, 42); // should fail here since key 42 doesn't exist
@@ -228,7 +228,7 @@ module Extensions::TableTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 25863)]
+    #[expected_failure(abort_code = 25863, location = extensions::table)]
     fun test_remove_removed() {
         let t = T::new<u64, u64>();
         T::add(&mut t, 42, 42);
@@ -242,7 +242,7 @@ module Extensions::TableTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 25863)]
+    #[expected_failure(abort_code = 25863, location = extensions::table)]
     fun test_borrow_removed() {
         let t = T::new<u64, u64>();
         T::add(&mut t, 42, 42);
diff --git a/language/move-analyzer/Cargo.toml b/language/move-analyzer/Cargo.toml
index a454f24521..20b6f8ca0c 100644
--- a/language/move-analyzer/Cargo.toml
+++ b/language/move-analyzer/Cargo.toml
@@ -1,21 +1,23 @@
 [package]
 name = "move-analyzer"
-version = "0.0.0"
+version = "1.0.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "A language server for Move"
-repository = "https://github.com/diem/diem"
-homepage = "https://diem.com"
+repository = "https://github.com/move-language/move"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
 codespan-reporting = "0.11.1"
+derivative = "2.2.0"
+dunce = "1.0.2"
 im = "15.1.0"
 lsp-server = "0.5.1"
 lsp-types = "0.90.1"
 petgraph = "0.5.1"
+serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.64"
 tempfile = "3.2.0"
 url = "2.2.2"
@@ -26,3 +28,7 @@ move-compiler = { path = "../move-compiler" }
 move-ir-types = { path = "../move-ir/types" }
 move-package = { path = "../tools/move-package" }
 move-symbol-pool = { path = "../move-symbol-pool" }
+
+[features]
+address20 = ["move-compiler/address20"]
+address32 = ["move-compiler/address32"]
diff --git a/language/move-analyzer/editors/code/.eslintrc.json b/language/move-analyzer/editors/code/.eslintrc.json
index 084af02eea..a6a2d7351c 100644
--- a/language/move-analyzer/editors/code/.eslintrc.json
+++ b/language/move-analyzer/editors/code/.eslintrc.json
@@ -106,11 +106,11 @@
         "function-call-argument-newline": ["warn", "consistent"],
         "function-paren-newline": ["warn", "consistent"],
         "key-spacing": "warn",
-        "linebreak-style": "warn",
+        "linebreak-style": "off", // We use different linebreak styles. ref https://eslint.org/docs/latest/rules/linebreak-style
         "max-len": [
             "warn",
             {
-                "code": 100,
+                "code": 120,
                 "ignoreUrls": true
             }
         ],
@@ -139,7 +139,6 @@
         // * All @typescript-eslint rules: https://github.com/typescript-eslint/typescript-eslint/tree/v4.31.1/packages/eslint-plugin/docs/rules
         // * The rules included in @typescript-eslint/recommended: https://github.com/typescript-eslint/typescript-eslint/blob/v4.31.1/packages/eslint-plugin/src/configs/recommended.ts
         // * The rules included in @typescript-eslint/recommended-requiring-type-checking: https://github.com/typescript-eslint/typescript-eslint/blob/v4.31.1/packages/eslint-plugin/src/configs/recommended-requiring-type-checking.ts
-        "@typescript-eslint/array-type": ["warn", { "default": "generic" }],
         "@typescript-eslint/ban-tslint-comment": "warn",
         "@typescript-eslint/brace-style": "warn",
         "@typescript-eslint/comma-dangle": [
@@ -158,7 +157,7 @@
         "@typescript-eslint/keyword-spacing": "warn",
         "@typescript-eslint/lines-between-class-members": "warn",
         "@typescript-eslint/member-delimiter-style": "warn",
-        "@typescript-eslint/naming-convention": "warn",
+        "@typescript-eslint/naming-convention": "off",
         "@typescript-eslint/no-base-to-string": "warn",
         "@typescript-eslint/no-confusing-non-null-assertion": "warn",
         "@typescript-eslint/no-duplicate-imports": "warn",
@@ -206,10 +205,16 @@
         ],
         "@typescript-eslint/strict-boolean-expressions": "warn",
         "@typescript-eslint/switch-exhaustiveness-check": "warn",
-        "@typescript-eslint/type-annotation-spacing": "warn",
         "@typescript-eslint/unified-signatures": "warn",
 
         // The following are eslint-plugin-tsdoc rules:
-        "tsdoc/syntax": "warn"
+        "tsdoc/syntax": "warn",
+
+        "@typescript-eslint/no-unsafe-return": "off",
+        "@typescript-eslint/type-annotation-spacing": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-unsafe-assignment": "off",
+        "@typescript-eslint/restrict-template-expressions": "off",
+        "@typescript-eslint/array-type": "off"
     }
 }
diff --git a/language/move-analyzer/editors/code/.gitignore b/language/move-analyzer/editors/code/.gitignore
index 036b79d9db..8174e373d7 100644
--- a/language/move-analyzer/editors/code/.gitignore
+++ b/language/move-analyzer/editors/code/.gitignore
@@ -7,3 +7,5 @@ out
 .vscode-test
 # VS Code extension package (VSIX) archive
 *.vsix
+# Yarn cache directory
+yarn.lock
diff --git a/language/move-analyzer/editors/code/.vscodeignore b/language/move-analyzer/editors/code/.vscodeignore
index b622950d4c..ddd5d59296 100644
--- a/language/move-analyzer/editors/code/.vscodeignore
+++ b/language/move-analyzer/editors/code/.vscodeignore
@@ -4,7 +4,8 @@
 # https://code.visualstudio.com/api/working-with-extensions/publishing-extension#.vscodeignore
 
 **/*
-!out/src/*
+!images/move.png
+!out/src/**/*
 !node_modules/**/*
 !language-configuration.json
 !move.tmLanguage.json
diff --git a/language/move-analyzer/editors/code/README.md b/language/move-analyzer/editors/code/README.md
index cc4e44b4d7..a6891393e3 100644
--- a/language/move-analyzer/editors/code/README.md
+++ b/language/move-analyzer/editors/code/README.md
@@ -10,25 +10,30 @@ For information about Move visit [the Move repository](https://github.com/move-l
 
 ## How to Install
 
-The move-analyzer Visual Studio Code extension works via two components: the extension itself, and
+The move-analyzer Visual Studio Code extension works via two components: the extension itself and
 the `move-analyzer` language server.
 
 ### 1. Installing the `move-analyzer` language server<span id="Step1">
 
-The `move-analyzer` language server is a Rust program that is part of
-[the Move repository](https://github.com/move-language/move). It may be installed in one of two ways:
+The `move-analyzer` language server is a Rust program that is part of the
+[Move repository](https://github.com/move-language/move). It may be installed in one of two ways:
 
-1. You may clone [the Move repository](https://github.com/move-language/move) yourself and build
-   `move-analyzer` from its source code. To do so, follow the instructions in the Move tutorial's
+* Clone [the Move repository](https://github.com/move-language/move) yourself and build
+   `move-analyzer` from its source code, which is especially useful if you will work on core Move.
+   To do so, follow the instructions in the Move tutorial's
    [Step 0: Installation](https://github.com/move-language/move/tree/main/language/documentation/tutorial#step-0-installation).
-2. You may use Rust's package manager `cargo` to install `move-analyzer` in your user's PATH. This
-   is recommended for people who do not work on Move core.
+* Use Rust's package manager `cargo` to install `move-analyzer` in your user's PATH. This
+   is recommended for people who do not work on core Move.
    1. If you don't already have a Rust toolchain installed, you should install
       [Rustup](https://rustup.rs/), which will install the latest stable Rust toolchain.
    2. Invoke `cargo install --git https://github.com/move-language/move move-analyzer` to install the
-      `move-analyzer` language server in your Cargo binary directory. On macOS and Linux this is
+      `move-analyzer` language server in your Cargo binary directory. On macOS and Linux, this is
       usually `~/.cargo/bin`. You'll want to make sure this location is in your `PATH` environment
-      variable.
+      variable. If you plan to use the language server with Move language flavors different from core Move,
+      you should specify an additional option to `cargo install` command as different Move flavors
+      may enforce different max length of the Move address type: `--features "address20"` option for Move
+      flavors requiring 20-byte long addresses (e.g., Sui Move) and `--features "address32"` option
+      for Move flavors requiring 32-byte long addresses (e.g., Aptos Move).
 
 To confirm that you've installed the language server program successfully, execute
 `move-analyzer --version` on the command line. You should see the output `move-analyzer 1.0.0`.
@@ -36,28 +41,28 @@ To confirm that you've installed the language server program successfully, execu
 ### 2. Installing the move-analyzer Visual Studio Code extension
 
 1. Open a new window in any Visual Studio Code application version 1.55.2 or greater.
-2. Open the command palette (`⇧⌘P` on macOS, or use the menu item "View > Command Palette...") and
-   type in `"Extensions: Install Extensions"`. This will open a panel named "Extensions" in the
+2. Open the command palette (`⇧⌘P` on macOS, or use the menu item *View > Command Palette...*) and
+   type **Extensions: Install Extensions**. This will open a panel named *Extensions* in the
    sidebar of your Visual Studio Code window.
-3. In the search bar labeled "Search Extensions in Marketplace," type in "move-analyzer". The
-   move-analyzer extension should appear in the list below the search bar. Click "Install".
-4. Open any file that ends in `.move` (or, create a new file, click on "Select a language," and
-   choose the "Move" language). As you type, you should see that keywords and types appear in
+3. In the search bar labeled *Search Extensions in Marketplace*, type **move-analyzer**. The
+   move-analyzer extension should appear in the list below the search bar. Click **Install**.
+4. Open any file that ends in `.move`. Or to create a new file, click **Select a language**, and
+   choose the **Move** language. As you type, you should see that keywords and types appear in
    different colors.
 
 ### Troubleshooting
 
-If you see an error message "language server executable 'move-analyzer' could not be found" in the
+If you see an error message *language server executable 'move-analyzer' could not be found* in the
 bottom-right of your Visual Studio Code screen when opening a Move file, it means that the
 `move-analyzer` executable could not be found in your `PATH`. You may try the following:
 
-1. Confirm that invoking `move-analyzer --version` in a command-line terminal prints out
+1. Confirm that invoking `move-analyzer --version` in a command line terminal prints out
    `move-analyzer 1.0.0`. If it doesn't, then retry the instructions in [step 1](./Step1). If it
-   does successfully print this text out, try closing and re-opening the Visual Studio Code
-   application, as it may not have picked up the udpates to your `PATH`.
+   does successfully print this output, try closing and re-opening the Visual Studio Code
+   application, as it may not have picked up the update to your `PATH`.
 2. If you installed the `move-analyzer` executable to a different location that is outside of your
    `PATH`, then you may have the extension look at this location by using the the Visual Studio Code
-   settings (`⌘,` on macOS, or use the menu item "Code > Preferences > Settings"). Search for the
+   settings (`⌘,` on macOS, or use the menu item *Code > Preferences > Settings*). Search for the
    `move-analyzer.server.path` setting, and set it to the location of the `move-analyzer` language
    server you installed.
 3. If the above steps don't work, then report
@@ -65,19 +70,20 @@ bottom-right of your Visual Studio Code screen when opening a Move file, it mean
 
 ## Features
 
-Here are some of the features of the move-analyzer Visual Studio Code extension. Open a Move source
-file (a file with a `.move` file extension), and:
+Here are some of the features of the move-analyzer Visual Studio Code extension. To see them, open a
+Move source file (a file with a `.move` file extension) and:
 
 - See Move keywords and types highlighted in appropriate colors.
-- Comment and un-comment lines of code using the `⌘/` shortcut on macOS (or the menu command "Edit >
-  Toggle Line Comment").
+- Comment and un-comment lines of code using the `⌘/` shortcut on macOS (or the menu command *Edit >
+  Toggle Line Comment*).
 - Place your cursor on a delimiter, such as `<`, `(`, or `{`, and its corresponding delimiter --
   `>`, `)`, or `}` -- will be highlighted.
 - As you type, Move keywords will appear as completion suggestions.
 - If the opened Move source file is located within a buildable project (a `Move.toml` file can be
-  found in one of its parent directories), the following advanced features will be available:
+  found in one of its parent directories), the following advanced features will also be available:
   - compiler diagnostics
   - go to definition
   - go to type definition
   - go to references
   - type on hover
+  - outline view showing symbol tree for Move source files
diff --git a/language/move-analyzer/editors/code/images/move.png b/language/move-analyzer/editors/code/images/move.png
new file mode 100644
index 0000000000..c6bfb341ae
Binary files /dev/null and b/language/move-analyzer/editors/code/images/move.png differ
diff --git a/language/move-analyzer/editors/code/package-lock.json b/language/move-analyzer/editors/code/package-lock.json
index 7be9879524..b4126498af 100644
--- a/language/move-analyzer/editors/code/package-lock.json
+++ b/language/move-analyzer/editors/code/package-lock.json
@@ -1,7063 +1,7444 @@
 {
-    "name": "move-analyzer",
-    "version": "0.0.7",
-    "lockfileVersion": 2,
-    "requires": true,
-    "packages": {
-        "": {
-            "name": "move-analyzer",
-            "version": "0.0.7",
-            "license": "Apache-2.0",
-            "dependencies": {
-                "command-exists": "^1.2.9",
-                "vscode-languageclient": "6.1.4"
-            },
-            "devDependencies": {
-                "@types/command-exists": "^1.2.0",
-                "@types/glob": "^7.1.4",
-                "@types/mocha": "^9.0.0",
-                "@types/node": "^14.17.22",
-                "@types/vscode": "^1.58.2",
-                "@typescript-eslint/eslint-plugin": "^4.33.0",
-                "@typescript-eslint/parser": "^4.33.0",
-                "@vscode/test-electron": "^1.6.1",
-                "eslint": "^7.32.0",
-                "eslint-plugin-tsdoc": "^0.2.14",
-                "glob": "^7.1.7",
-                "mocha": "^9.1.1",
-                "typescript": "^4.4.4",
-                "typescript-formatter": "^7.2.2",
-                "vsce": "^2.5.1",
-                "vscode-test": "^1.6.1"
-            },
-            "engines": {
-                "vscode": "^1.58.2"
-            }
-        },
-        "node_modules/@babel/code-frame": {
-            "version": "7.12.11",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-            "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-            "dev": true,
-            "dependencies": {
-                "@babel/highlight": "^7.10.4"
-            }
-        },
-        "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.15.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
-            "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
-            "dev": true,
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@babel/highlight": {
-            "version": "7.14.5",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-            "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
-            "dev": true,
-            "dependencies": {
-                "@babel/helper-validator-identifier": "^7.14.5",
-                "chalk": "^2.0.0",
-                "js-tokens": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@babel/highlight/node_modules/chalk": {
-            "version": "2.4.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-            "dev": true,
-            "engines": {
-                "node": ">=0.8.0"
-            }
-        },
-        "node_modules/@eslint/eslintrc": {
-            "version": "0.4.3",
-            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
-            "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
-            "dev": true,
-            "dependencies": {
-                "ajv": "^6.12.4",
-                "debug": "^4.1.1",
-                "espree": "^7.3.0",
-                "globals": "^13.9.0",
-                "ignore": "^4.0.6",
-                "import-fresh": "^3.2.1",
-                "js-yaml": "^3.13.1",
-                "minimatch": "^3.0.4",
-                "strip-json-comments": "^3.1.1"
-            },
-            "engines": {
-                "node": "^10.12.0 || >=12.0.0"
-            }
-        },
-        "node_modules/@eslint/eslintrc/node_modules/ignore": {
-            "version": "4.0.6",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-            "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 4"
-            }
-        },
-        "node_modules/@humanwhocodes/config-array": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
-            "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
-            "dev": true,
-            "dependencies": {
-                "@humanwhocodes/object-schema": "^1.2.0",
-                "debug": "^4.1.1",
-                "minimatch": "^3.0.4"
-            },
-            "engines": {
-                "node": ">=10.10.0"
-            }
-        },
-        "node_modules/@humanwhocodes/object-schema": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
-            "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
-            "dev": true
-        },
-        "node_modules/@microsoft/tsdoc": {
-            "version": "0.13.2",
-            "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.13.2.tgz",
-            "integrity": "sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==",
-            "dev": true
-        },
-        "node_modules/@microsoft/tsdoc-config": {
-            "version": "0.15.2",
-            "resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.15.2.tgz",
-            "integrity": "sha512-mK19b2wJHSdNf8znXSMYVShAHktVr/ib0Ck2FA3lsVBSEhSI/TfXT7DJQkAYgcztTuwazGcg58ZjYdk0hTCVrA==",
-            "dev": true,
-            "dependencies": {
-                "@microsoft/tsdoc": "0.13.2",
-                "ajv": "~6.12.6",
-                "jju": "~1.4.0",
-                "resolve": "~1.19.0"
-            }
-        },
-        "node_modules/@nodelib/fs.scandir": {
-            "version": "2.1.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-            "dev": true,
-            "dependencies": {
-                "@nodelib/fs.stat": "2.0.5",
-                "run-parallel": "^1.1.9"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/@nodelib/fs.stat": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-            "dev": true,
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/@nodelib/fs.walk": {
-            "version": "1.2.8",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-            "dev": true,
-            "dependencies": {
-                "@nodelib/fs.scandir": "2.1.5",
-                "fastq": "^1.6.0"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/@tootallnate/once": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-            "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
-            "dev": true,
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/@types/command-exists": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/@types/command-exists/-/command-exists-1.2.0.tgz",
-            "integrity": "sha512-ugsxEJfsCuqMLSuCD4PIJkp5Uk2z6TCMRCgYVuhRo5cYQY3+1xXTQkSlPtkpGHuvWMjS2KTeVQXxkXRACMbM6A==",
-            "dev": true
-        },
-        "node_modules/@types/glob": {
-            "version": "7.1.4",
-            "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz",
-            "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==",
-            "dev": true,
-            "dependencies": {
-                "@types/minimatch": "*",
-                "@types/node": "*"
-            }
-        },
-        "node_modules/@types/json-schema": {
-            "version": "7.0.9",
-            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-            "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
-            "dev": true
-        },
-        "node_modules/@types/minimatch": {
-            "version": "3.0.5",
-            "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-            "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
-            "dev": true
-        },
-        "node_modules/@types/mocha": {
-            "version": "9.0.0",
-            "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.0.0.tgz",
-            "integrity": "sha512-scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA==",
-            "dev": true
-        },
-        "node_modules/@types/node": {
-            "version": "14.17.27",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.27.tgz",
-            "integrity": "sha512-94+Ahf9IcaDuJTle/2b+wzvjmutxXAEXU6O81JHblYXUg2BDG+dnBy7VxIPHKAyEEDHzCMQydTJuWvrE+Aanzw==",
-            "dev": true
-        },
-        "node_modules/@types/vscode": {
-            "version": "1.61.0",
-            "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.61.0.tgz",
-            "integrity": "sha512-9k5Nwq45hkRwdfCFY+eKXeQQSbPoA114mF7U/4uJXRBJeGIO7MuJdhF1PnaDN+lllL9iKGQtd6FFXShBXMNaFg==",
-            "dev": true
-        },
-        "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "4.33.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz",
-            "integrity": "sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==",
-            "dev": true,
-            "dependencies": {
-                "@typescript-eslint/experimental-utils": "4.33.0",
-                "@typescript-eslint/scope-manager": "4.33.0",
-                "debug": "^4.3.1",
-                "functional-red-black-tree": "^1.0.1",
-                "ignore": "^5.1.8",
-                "regexpp": "^3.1.0",
-                "semver": "^7.3.5",
-                "tsutils": "^3.21.0"
-            },
-            "engines": {
-                "node": "^10.12.0 || >=12.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            },
-            "peerDependencies": {
-                "@typescript-eslint/parser": "^4.0.0",
-                "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
-            "version": "7.3.5",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-            "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-            "dev": true,
-            "dependencies": {
-                "lru-cache": "^6.0.0"
-            },
-            "bin": {
-                "semver": "bin/semver.js"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/@typescript-eslint/experimental-utils": {
-            "version": "4.33.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz",
-            "integrity": "sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==",
-            "dev": true,
-            "dependencies": {
-                "@types/json-schema": "^7.0.7",
-                "@typescript-eslint/scope-manager": "4.33.0",
-                "@typescript-eslint/types": "4.33.0",
-                "@typescript-eslint/typescript-estree": "4.33.0",
-                "eslint-scope": "^5.1.1",
-                "eslint-utils": "^3.0.0"
-            },
-            "engines": {
-                "node": "^10.12.0 || >=12.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            },
-            "peerDependencies": {
-                "eslint": "*"
-            }
-        },
-        "node_modules/@typescript-eslint/parser": {
-            "version": "4.33.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz",
-            "integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==",
-            "dev": true,
-            "dependencies": {
-                "@typescript-eslint/scope-manager": "4.33.0",
-                "@typescript-eslint/types": "4.33.0",
-                "@typescript-eslint/typescript-estree": "4.33.0",
-                "debug": "^4.3.1"
-            },
-            "engines": {
-                "node": "^10.12.0 || >=12.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            },
-            "peerDependencies": {
-                "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@typescript-eslint/scope-manager": {
-            "version": "4.33.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz",
-            "integrity": "sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==",
-            "dev": true,
-            "dependencies": {
-                "@typescript-eslint/types": "4.33.0",
-                "@typescript-eslint/visitor-keys": "4.33.0"
-            },
-            "engines": {
-                "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            }
-        },
-        "node_modules/@typescript-eslint/types": {
-            "version": "4.33.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz",
-            "integrity": "sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==",
-            "dev": true,
-            "engines": {
-                "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            }
-        },
-        "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "4.33.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz",
-            "integrity": "sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==",
-            "dev": true,
-            "dependencies": {
-                "@typescript-eslint/types": "4.33.0",
-                "@typescript-eslint/visitor-keys": "4.33.0",
-                "debug": "^4.3.1",
-                "globby": "^11.0.3",
-                "is-glob": "^4.0.1",
-                "semver": "^7.3.5",
-                "tsutils": "^3.21.0"
-            },
-            "engines": {
-                "node": "^10.12.0 || >=12.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-            "version": "7.3.5",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-            "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-            "dev": true,
-            "dependencies": {
-                "lru-cache": "^6.0.0"
-            },
-            "bin": {
-                "semver": "bin/semver.js"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "4.33.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz",
-            "integrity": "sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==",
-            "dev": true,
-            "dependencies": {
-                "@typescript-eslint/types": "4.33.0",
-                "eslint-visitor-keys": "^2.0.0"
-            },
-            "engines": {
-                "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            }
-        },
-        "node_modules/@ungap/promise-all-settled": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
-            "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
-            "dev": true
-        },
-        "node_modules/@vscode/test-electron": {
-            "version": "1.6.2",
-            "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-1.6.2.tgz",
-            "integrity": "sha512-W01ajJEMx6223Y7J5yaajGjVs1QfW3YGkkOJHVKfAMEqNB1ZHN9wCcViehv5ZwVSSJnjhu6lYEYgwBdHtCxqhQ==",
-            "dev": true,
-            "dependencies": {
-                "http-proxy-agent": "^4.0.1",
-                "https-proxy-agent": "^5.0.0",
-                "rimraf": "^3.0.2",
-                "unzipper": "^0.10.11"
-            },
-            "engines": {
-                "node": ">=8.9.3"
-            }
-        },
-        "node_modules/acorn": {
-            "version": "7.4.1",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-            "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-            "dev": true,
-            "bin": {
-                "acorn": "bin/acorn"
-            },
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
-        "node_modules/acorn-jsx": {
-            "version": "5.3.2",
-            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-            "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-            "dev": true,
-            "peerDependencies": {
-                "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-            }
-        },
-        "node_modules/agent-base": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-            "dev": true,
-            "dependencies": {
-                "debug": "4"
-            },
-            "engines": {
-                "node": ">= 6.0.0"
-            }
-        },
-        "node_modules/ajv": {
-            "version": "6.12.6",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-            "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-            "dev": true,
-            "dependencies": {
-                "fast-deep-equal": "^3.1.1",
-                "fast-json-stable-stringify": "^2.0.0",
-                "json-schema-traverse": "^0.4.1",
-                "uri-js": "^4.2.2"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/ansi-colors": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-            "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/ansi-styles": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-            "dev": true,
-            "dependencies": {
-                "color-convert": "^1.9.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/anymatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-            "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-            "dev": true,
-            "dependencies": {
-                "normalize-path": "^3.0.0",
-                "picomatch": "^2.0.4"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/aproba": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-            "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-            "dev": true
-        },
-        "node_modules/are-we-there-yet": {
-            "version": "1.1.7",
-            "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
-            "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
-            "dev": true,
-            "dependencies": {
-                "delegates": "^1.0.0",
-                "readable-stream": "^2.0.6"
-            }
-        },
-        "node_modules/argparse": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-            "dev": true,
-            "dependencies": {
-                "sprintf-js": "~1.0.2"
-            }
-        },
-        "node_modules/array-union": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-            "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/astral-regex": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-            "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/azure-devops-node-api": {
-            "version": "11.1.0",
-            "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.1.0.tgz",
-            "integrity": "sha512-6/2YZuf+lJzJLrjXNYEA5RXAkMCb8j/4VcHD0qJQRsgG/KsRMYo0HgDh0by1FGHyZkQWY5LmQyJqCwRVUB3Y7Q==",
-            "dev": true,
-            "dependencies": {
-                "tunnel": "0.0.6",
-                "typed-rest-client": "^1.8.4"
-            }
-        },
-        "node_modules/balanced-match": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-            "dev": true
-        },
-        "node_modules/base64-js": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
-        "node_modules/big-integer": {
-            "version": "1.6.50",
-            "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.50.tgz",
-            "integrity": "sha512-+O2uoQWFRo8ysZNo/rjtri2jIwjr3XfeAgRjAUADRqGG+ZITvyn8J1kvXLTaKVr3hhGXk+f23tKfdzmklVM9vQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.6"
-            }
-        },
-        "node_modules/binary": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-            "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
-            "dev": true,
-            "dependencies": {
-                "buffers": "~0.1.1",
-                "chainsaw": "~0.1.0"
-            },
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/binary-extensions": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-            "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/bl": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-            "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-            "dev": true,
-            "dependencies": {
-                "buffer": "^5.5.0",
-                "inherits": "^2.0.4",
-                "readable-stream": "^3.4.0"
-            }
-        },
-        "node_modules/bl/node_modules/readable-stream": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-            "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-            "dev": true,
-            "dependencies": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/bluebird": {
-            "version": "3.4.7",
-            "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
-            "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=",
-            "dev": true
-        },
-        "node_modules/boolbase": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-            "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-            "dev": true
-        },
-        "node_modules/brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-            "dev": true,
-            "dependencies": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-            }
-        },
-        "node_modules/braces": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-            "dev": true,
-            "dependencies": {
-                "fill-range": "^7.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/browser-stdout": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-            "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-            "dev": true
-        },
-        "node_modules/buffer": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-            "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "dependencies": {
-                "base64-js": "^1.3.1",
-                "ieee754": "^1.1.13"
-            }
-        },
-        "node_modules/buffer-crc32": {
-            "version": "0.2.13",
-            "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-            "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-            "dev": true,
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/buffer-indexof-polyfill": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",
-            "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10"
-            }
-        },
-        "node_modules/buffers": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
-            "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
-            "dev": true,
-            "engines": {
-                "node": ">=0.2.0"
-            }
-        },
-        "node_modules/call-bind": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-            "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-            "dev": true,
-            "dependencies": {
-                "function-bind": "^1.1.1",
-                "get-intrinsic": "^1.0.2"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/callsites": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/camelcase": {
-            "version": "6.2.0",
-            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-            "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/chainsaw": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-            "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
-            "dev": true,
-            "dependencies": {
-                "traverse": ">=0.3.0 <0.4"
-            },
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/chalk": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/chalk?sponsor=1"
-            }
-        },
-        "node_modules/chalk/node_modules/ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dev": true,
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/chalk/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/chalk/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
-        "node_modules/chalk/node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/chalk/node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/cheerio": {
-            "version": "1.0.0-rc.10",
-            "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz",
-            "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==",
-            "dev": true,
-            "dependencies": {
-                "cheerio-select": "^1.5.0",
-                "dom-serializer": "^1.3.2",
-                "domhandler": "^4.2.0",
-                "htmlparser2": "^6.1.0",
-                "parse5": "^6.0.1",
-                "parse5-htmlparser2-tree-adapter": "^6.0.1",
-                "tslib": "^2.2.0"
-            },
-            "engines": {
-                "node": ">= 6"
-            },
-            "funding": {
-                "url": "https://github.com/cheeriojs/cheerio?sponsor=1"
-            }
-        },
-        "node_modules/cheerio-select": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz",
-            "integrity": "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==",
-            "dev": true,
-            "dependencies": {
-                "css-select": "^4.1.3",
-                "css-what": "^5.0.1",
-                "domelementtype": "^2.2.0",
-                "domhandler": "^4.2.0",
-                "domutils": "^2.7.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/fb55"
-            }
-        },
-        "node_modules/cheerio/node_modules/tslib": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-            "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
-            "dev": true
-        },
-        "node_modules/chokidar": {
-            "version": "3.5.2",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-            "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
-            "dev": true,
-            "dependencies": {
-                "anymatch": "~3.1.2",
-                "braces": "~3.0.2",
-                "glob-parent": "~5.1.2",
-                "is-binary-path": "~2.1.0",
-                "is-glob": "~4.0.1",
-                "normalize-path": "~3.0.0",
-                "readdirp": "~3.6.0"
-            },
-            "engines": {
-                "node": ">= 8.10.0"
-            },
-            "optionalDependencies": {
-                "fsevents": "~2.3.2"
-            }
-        },
-        "node_modules/chownr": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-            "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-            "dev": true
-        },
-        "node_modules/cliui": {
-            "version": "7.0.4",
-            "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-            "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-            "dev": true,
-            "dependencies": {
-                "string-width": "^4.2.0",
-                "strip-ansi": "^6.0.0",
-                "wrap-ansi": "^7.0.0"
-            }
-        },
-        "node_modules/code-point-at": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-            "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/color-convert": {
-            "version": "1.9.3",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "1.1.3"
-            }
-        },
-        "node_modules/color-name": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-            "dev": true
-        },
-        "node_modules/command-exists": {
-            "version": "1.2.9",
-            "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
-            "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="
-        },
-        "node_modules/commander": {
-            "version": "2.20.3",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-            "dev": true
-        },
-        "node_modules/commandpost": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/commandpost/-/commandpost-1.4.0.tgz",
-            "integrity": "sha512-aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ==",
-            "dev": true
-        },
-        "node_modules/concat-map": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-            "dev": true
-        },
-        "node_modules/console-control-strings": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-            "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-            "dev": true
-        },
-        "node_modules/core-util-is": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-            "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-            "dev": true
-        },
-        "node_modules/cross-spawn": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-            "dev": true,
-            "dependencies": {
-                "path-key": "^3.1.0",
-                "shebang-command": "^2.0.0",
-                "which": "^2.0.1"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/css-select": {
-            "version": "4.1.3",
-            "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
-            "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
-            "dev": true,
-            "dependencies": {
-                "boolbase": "^1.0.0",
-                "css-what": "^5.0.0",
-                "domhandler": "^4.2.0",
-                "domutils": "^2.6.0",
-                "nth-check": "^2.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/fb55"
-            }
-        },
-        "node_modules/css-what": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
-            "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
-            "dev": true,
-            "engines": {
-                "node": ">= 6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/fb55"
-            }
-        },
-        "node_modules/debug": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-            "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-            "dev": true,
-            "dependencies": {
-                "ms": "2.1.2"
-            },
-            "engines": {
-                "node": ">=6.0"
-            },
-            "peerDependenciesMeta": {
-                "supports-color": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/decamelize": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
-            "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/decompress-response": {
-            "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
-            "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
-            "dev": true,
-            "dependencies": {
-                "mimic-response": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/deep-extend": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-            "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-            "dev": true,
-            "engines": {
-                "node": ">=4.0.0"
-            }
-        },
-        "node_modules/deep-is": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-            "dev": true
-        },
-        "node_modules/delegates": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-            "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-            "dev": true
-        },
-        "node_modules/detect-libc": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-            "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
-            "dev": true,
-            "bin": {
-                "detect-libc": "bin/detect-libc.js"
-            },
-            "engines": {
-                "node": ">=0.10"
-            }
-        },
-        "node_modules/diff": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-            "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.3.1"
-            }
-        },
-        "node_modules/dir-glob": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-            "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-            "dev": true,
-            "dependencies": {
-                "path-type": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/doctrine": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-            "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-            "dev": true,
-            "dependencies": {
-                "esutils": "^2.0.2"
-            },
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
-        "node_modules/dom-serializer": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
-            "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
-            "dev": true,
-            "dependencies": {
-                "domelementtype": "^2.0.1",
-                "domhandler": "^4.2.0",
-                "entities": "^2.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-            }
-        },
-        "node_modules/domelementtype": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-            "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/fb55"
-                }
-            ]
-        },
-        "node_modules/domhandler": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz",
-            "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==",
-            "dev": true,
-            "dependencies": {
-                "domelementtype": "^2.2.0"
-            },
-            "engines": {
-                "node": ">= 4"
-            },
-            "funding": {
-                "url": "https://github.com/fb55/domhandler?sponsor=1"
-            }
-        },
-        "node_modules/domutils": {
-            "version": "2.8.0",
-            "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-            "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-            "dev": true,
-            "dependencies": {
-                "dom-serializer": "^1.0.1",
-                "domelementtype": "^2.2.0",
-                "domhandler": "^4.2.0"
-            },
-            "funding": {
-                "url": "https://github.com/fb55/domutils?sponsor=1"
-            }
-        },
-        "node_modules/duplexer2": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-            "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-            "dev": true,
-            "dependencies": {
-                "readable-stream": "^2.0.2"
-            }
-        },
-        "node_modules/editorconfig": {
-            "version": "0.15.3",
-            "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz",
-            "integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==",
-            "dev": true,
-            "dependencies": {
-                "commander": "^2.19.0",
-                "lru-cache": "^4.1.5",
-                "semver": "^5.6.0",
-                "sigmund": "^1.0.1"
-            },
-            "bin": {
-                "editorconfig": "bin/editorconfig"
-            }
-        },
-        "node_modules/editorconfig/node_modules/lru-cache": {
-            "version": "4.1.5",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-            "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-            "dev": true,
-            "dependencies": {
-                "pseudomap": "^1.0.2",
-                "yallist": "^2.1.2"
-            }
-        },
-        "node_modules/editorconfig/node_modules/semver": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-            "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver"
-            }
-        },
-        "node_modules/editorconfig/node_modules/yallist": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-            "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-            "dev": true
-        },
-        "node_modules/emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "dev": true
-        },
-        "node_modules/end-of-stream": {
-            "version": "1.4.4",
-            "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-            "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-            "dev": true,
-            "dependencies": {
-                "once": "^1.4.0"
-            }
-        },
-        "node_modules/enquirer": {
-            "version": "2.3.6",
-            "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-            "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-            "dev": true,
-            "dependencies": {
-                "ansi-colors": "^4.1.1"
-            },
-            "engines": {
-                "node": ">=8.6"
-            }
-        },
-        "node_modules/entities": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-            "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-            "dev": true,
-            "funding": {
-                "url": "https://github.com/fb55/entities?sponsor=1"
-            }
-        },
-        "node_modules/escalade": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-            "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/escape-string-regexp": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-            "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/eslint": {
-            "version": "7.32.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
-            "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
-            "dev": true,
-            "dependencies": {
-                "@babel/code-frame": "7.12.11",
-                "@eslint/eslintrc": "^0.4.3",
-                "@humanwhocodes/config-array": "^0.5.0",
-                "ajv": "^6.10.0",
-                "chalk": "^4.0.0",
-                "cross-spawn": "^7.0.2",
-                "debug": "^4.0.1",
-                "doctrine": "^3.0.0",
-                "enquirer": "^2.3.5",
-                "escape-string-regexp": "^4.0.0",
-                "eslint-scope": "^5.1.1",
-                "eslint-utils": "^2.1.0",
-                "eslint-visitor-keys": "^2.0.0",
-                "espree": "^7.3.1",
-                "esquery": "^1.4.0",
-                "esutils": "^2.0.2",
-                "fast-deep-equal": "^3.1.3",
-                "file-entry-cache": "^6.0.1",
-                "functional-red-black-tree": "^1.0.1",
-                "glob-parent": "^5.1.2",
-                "globals": "^13.6.0",
-                "ignore": "^4.0.6",
-                "import-fresh": "^3.0.0",
-                "imurmurhash": "^0.1.4",
-                "is-glob": "^4.0.0",
-                "js-yaml": "^3.13.1",
-                "json-stable-stringify-without-jsonify": "^1.0.1",
-                "levn": "^0.4.1",
-                "lodash.merge": "^4.6.2",
-                "minimatch": "^3.0.4",
-                "natural-compare": "^1.4.0",
-                "optionator": "^0.9.1",
-                "progress": "^2.0.0",
-                "regexpp": "^3.1.0",
-                "semver": "^7.2.1",
-                "strip-ansi": "^6.0.0",
-                "strip-json-comments": "^3.1.0",
-                "table": "^6.0.9",
-                "text-table": "^0.2.0",
-                "v8-compile-cache": "^2.0.3"
-            },
-            "bin": {
-                "eslint": "bin/eslint.js"
-            },
-            "engines": {
-                "node": "^10.12.0 || >=12.0.0"
-            },
-            "funding": {
-                "url": "https://opencollective.com/eslint"
-            }
-        },
-        "node_modules/eslint-plugin-tsdoc": {
-            "version": "0.2.14",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-tsdoc/-/eslint-plugin-tsdoc-0.2.14.tgz",
-            "integrity": "sha512-fJ3fnZRsdIoBZgzkQjv8vAj6NeeOoFkTfgosj6mKsFjX70QV256sA/wq+y/R2+OL4L8E79VVaVWrPeZnKNe8Ng==",
-            "dev": true,
-            "dependencies": {
-                "@microsoft/tsdoc": "0.13.2",
-                "@microsoft/tsdoc-config": "0.15.2"
-            }
-        },
-        "node_modules/eslint-scope": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-            "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-            "dev": true,
-            "dependencies": {
-                "esrecurse": "^4.3.0",
-                "estraverse": "^4.1.1"
-            },
-            "engines": {
-                "node": ">=8.0.0"
-            }
-        },
-        "node_modules/eslint-utils": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-            "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-            "dev": true,
-            "dependencies": {
-                "eslint-visitor-keys": "^2.0.0"
-            },
-            "engines": {
-                "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/mysticatea"
-            },
-            "peerDependencies": {
-                "eslint": ">=5"
-            }
-        },
-        "node_modules/eslint-visitor-keys": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-            "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/eslint/node_modules/eslint-utils": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-            "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-            "dev": true,
-            "dependencies": {
-                "eslint-visitor-keys": "^1.1.0"
-            },
-            "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/mysticatea"
-            }
-        },
-        "node_modules/eslint/node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-            "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/eslint/node_modules/ignore": {
-            "version": "4.0.6",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-            "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 4"
-            }
-        },
-        "node_modules/eslint/node_modules/semver": {
-            "version": "7.3.5",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-            "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-            "dev": true,
-            "dependencies": {
-                "lru-cache": "^6.0.0"
-            },
-            "bin": {
-                "semver": "bin/semver.js"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/espree": {
-            "version": "7.3.1",
-            "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
-            "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
-            "dev": true,
-            "dependencies": {
-                "acorn": "^7.4.0",
-                "acorn-jsx": "^5.3.1",
-                "eslint-visitor-keys": "^1.3.0"
-            },
-            "engines": {
-                "node": "^10.12.0 || >=12.0.0"
-            }
-        },
-        "node_modules/espree/node_modules/eslint-visitor-keys": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-            "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/esprima": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-            "dev": true,
-            "bin": {
-                "esparse": "bin/esparse.js",
-                "esvalidate": "bin/esvalidate.js"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/esquery": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-            "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-            "dev": true,
-            "dependencies": {
-                "estraverse": "^5.1.0"
-            },
-            "engines": {
-                "node": ">=0.10"
-            }
-        },
-        "node_modules/esquery/node_modules/estraverse": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-            "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=4.0"
-            }
-        },
-        "node_modules/esrecurse": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-            "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-            "dev": true,
-            "dependencies": {
-                "estraverse": "^5.2.0"
-            },
-            "engines": {
-                "node": ">=4.0"
-            }
-        },
-        "node_modules/esrecurse/node_modules/estraverse": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-            "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=4.0"
-            }
-        },
-        "node_modules/estraverse": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-            "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-            "dev": true,
-            "engines": {
-                "node": ">=4.0"
-            }
-        },
-        "node_modules/esutils": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/expand-template": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
-            "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/fast-deep-equal": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-            "dev": true
-        },
-        "node_modules/fast-glob": {
-            "version": "3.2.7",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-            "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
-            "dev": true,
-            "dependencies": {
-                "@nodelib/fs.stat": "^2.0.2",
-                "@nodelib/fs.walk": "^1.2.3",
-                "glob-parent": "^5.1.2",
-                "merge2": "^1.3.0",
-                "micromatch": "^4.0.4"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/fast-json-stable-stringify": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-            "dev": true
-        },
-        "node_modules/fast-levenshtein": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-            "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-            "dev": true
-        },
-        "node_modules/fastq": {
-            "version": "1.13.0",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-            "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-            "dev": true,
-            "dependencies": {
-                "reusify": "^1.0.4"
-            }
-        },
-        "node_modules/fd-slicer": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-            "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
-            "dev": true,
-            "dependencies": {
-                "pend": "~1.2.0"
-            }
-        },
-        "node_modules/file-entry-cache": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-            "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-            "dev": true,
-            "dependencies": {
-                "flat-cache": "^3.0.4"
-            },
-            "engines": {
-                "node": "^10.12.0 || >=12.0.0"
-            }
-        },
-        "node_modules/fill-range": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-            "dev": true,
-            "dependencies": {
-                "to-regex-range": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/find-up": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-            "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-            "dev": true,
-            "dependencies": {
-                "locate-path": "^6.0.0",
-                "path-exists": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/flat": {
-            "version": "5.0.2",
-            "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-            "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-            "dev": true,
-            "bin": {
-                "flat": "cli.js"
-            }
-        },
-        "node_modules/flat-cache": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-            "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-            "dev": true,
-            "dependencies": {
-                "flatted": "^3.1.0",
-                "rimraf": "^3.0.2"
-            },
-            "engines": {
-                "node": "^10.12.0 || >=12.0.0"
-            }
-        },
-        "node_modules/flatted": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
-            "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
-            "dev": true
-        },
-        "node_modules/fs-constants": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-            "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-            "dev": true
-        },
-        "node_modules/fs.realpath": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-            "dev": true
-        },
-        "node_modules/fsevents": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-            "dev": true,
-            "hasInstallScript": true,
-            "optional": true,
-            "os": [
-                "darwin"
-            ],
-            "engines": {
-                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-            }
-        },
-        "node_modules/fstream": {
-            "version": "1.0.12",
-            "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-            "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
-            "dev": true,
-            "dependencies": {
-                "graceful-fs": "^4.1.2",
-                "inherits": "~2.0.0",
-                "mkdirp": ">=0.5 0",
-                "rimraf": "2"
-            },
-            "engines": {
-                "node": ">=0.6"
-            }
-        },
-        "node_modules/fstream/node_modules/rimraf": {
-            "version": "2.7.1",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-            "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-            "dev": true,
-            "dependencies": {
-                "glob": "^7.1.3"
-            },
-            "bin": {
-                "rimraf": "bin.js"
-            }
-        },
-        "node_modules/function-bind": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-            "dev": true
-        },
-        "node_modules/functional-red-black-tree": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-            "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-            "dev": true
-        },
-        "node_modules/gauge": {
-            "version": "2.7.4",
-            "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-            "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-            "dev": true,
-            "dependencies": {
-                "aproba": "^1.0.3",
-                "console-control-strings": "^1.0.0",
-                "has-unicode": "^2.0.0",
-                "object-assign": "^4.1.0",
-                "signal-exit": "^3.0.0",
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1",
-                "wide-align": "^1.1.0"
-            }
-        },
-        "node_modules/gauge/node_modules/ansi-regex": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-            "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/gauge/node_modules/is-fullwidth-code-point": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-            "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-            "dev": true,
-            "dependencies": {
-                "number-is-nan": "^1.0.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/gauge/node_modules/string-width": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-            "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-            "dev": true,
-            "dependencies": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/gauge/node_modules/strip-ansi": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-            "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-            "dev": true,
-            "dependencies": {
-                "ansi-regex": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/get-caller-file": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-            "dev": true,
-            "engines": {
-                "node": "6.* || 8.* || >= 10.*"
-            }
-        },
-        "node_modules/get-intrinsic": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-            "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-            "dev": true,
-            "dependencies": {
-                "function-bind": "^1.1.1",
-                "has": "^1.0.3",
-                "has-symbols": "^1.0.1"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/github-from-package": {
-            "version": "0.0.0",
-            "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-            "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=",
-            "dev": true
-        },
-        "node_modules/glob": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-            "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-            "dev": true,
-            "dependencies": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-            },
-            "engines": {
-                "node": "*"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/glob-parent": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-            "dev": true,
-            "dependencies": {
-                "is-glob": "^4.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/globals": {
-            "version": "13.11.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
-            "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
-            "dev": true,
-            "dependencies": {
-                "type-fest": "^0.20.2"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/globby": {
-            "version": "11.0.4",
-            "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-            "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
-            "dev": true,
-            "dependencies": {
-                "array-union": "^2.1.0",
-                "dir-glob": "^3.0.1",
-                "fast-glob": "^3.1.1",
-                "ignore": "^5.1.4",
-                "merge2": "^1.3.0",
-                "slash": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/graceful-fs": {
-            "version": "4.2.8",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-            "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
-            "dev": true
-        },
-        "node_modules/growl": {
-            "version": "1.10.5",
-            "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-            "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-            "dev": true,
-            "engines": {
-                "node": ">=4.x"
-            }
-        },
-        "node_modules/has": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-            "dev": true,
-            "dependencies": {
-                "function-bind": "^1.1.1"
-            },
-            "engines": {
-                "node": ">= 0.4.0"
-            }
-        },
-        "node_modules/has-flag": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-            "dev": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/has-symbols": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-            "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/has-unicode": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-            "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-            "dev": true
-        },
-        "node_modules/he": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-            "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-            "dev": true,
-            "bin": {
-                "he": "bin/he"
-            }
-        },
-        "node_modules/hosted-git-info": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-            "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
-            "dev": true,
-            "dependencies": {
-                "lru-cache": "^6.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/htmlparser2": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-            "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-            "dev": true,
-            "funding": [
-                "https://github.com/fb55/htmlparser2?sponsor=1",
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/fb55"
-                }
-            ],
-            "dependencies": {
-                "domelementtype": "^2.0.1",
-                "domhandler": "^4.0.0",
-                "domutils": "^2.5.2",
-                "entities": "^2.0.0"
-            }
-        },
-        "node_modules/http-proxy-agent": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-            "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-            "dev": true,
-            "dependencies": {
-                "@tootallnate/once": "1",
-                "agent-base": "6",
-                "debug": "4"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/https-proxy-agent": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-            "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-            "dev": true,
-            "dependencies": {
-                "agent-base": "6",
-                "debug": "4"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/ieee754": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
-        "node_modules/ignore": {
-            "version": "5.1.8",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-            "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-            "dev": true,
-            "engines": {
-                "node": ">= 4"
-            }
-        },
-        "node_modules/import-fresh": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-            "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-            "dev": true,
-            "dependencies": {
-                "parent-module": "^1.0.0",
-                "resolve-from": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/imurmurhash": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-            "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-            "dev": true,
-            "engines": {
-                "node": ">=0.8.19"
-            }
-        },
-        "node_modules/inflight": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-            "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-            "dev": true,
-            "dependencies": {
-                "once": "^1.3.0",
-                "wrappy": "1"
-            }
-        },
-        "node_modules/inherits": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-            "dev": true
-        },
-        "node_modules/ini": {
-            "version": "1.3.8",
-            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-            "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-            "dev": true
-        },
-        "node_modules/is-binary-path": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-            "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-            "dev": true,
-            "dependencies": {
-                "binary-extensions": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/is-core-module": {
-            "version": "2.8.0",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
-            "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
-            "dev": true,
-            "dependencies": {
-                "has": "^1.0.3"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/is-extglob": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-            "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-fullwidth-code-point": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/is-glob": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-            "dev": true,
-            "dependencies": {
-                "is-extglob": "^2.1.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-number": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.12.0"
-            }
-        },
-        "node_modules/is-plain-obj": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-            "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/is-unicode-supported": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-            "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/isarray": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-            "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-            "dev": true
-        },
-        "node_modules/isexe": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-            "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-            "dev": true
-        },
-        "node_modules/jju": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
-            "integrity": "sha1-o6vicYryQaKykE+EpiWXDzia4yo=",
-            "dev": true
-        },
-        "node_modules/js-tokens": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-            "dev": true
-        },
-        "node_modules/js-yaml": {
-            "version": "3.14.1",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-            "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-            "dev": true,
-            "dependencies": {
-                "argparse": "^1.0.7",
-                "esprima": "^4.0.0"
-            },
-            "bin": {
-                "js-yaml": "bin/js-yaml.js"
-            }
-        },
-        "node_modules/json-schema-traverse": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-            "dev": true
-        },
-        "node_modules/json-stable-stringify-without-jsonify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-            "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-            "dev": true
-        },
-        "node_modules/keytar": {
-            "version": "7.7.0",
-            "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz",
-            "integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==",
-            "dev": true,
-            "hasInstallScript": true,
-            "dependencies": {
-                "node-addon-api": "^3.0.0",
-                "prebuild-install": "^6.0.0"
-            }
-        },
-        "node_modules/leven": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-            "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/levn": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-            "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-            "dev": true,
-            "dependencies": {
-                "prelude-ls": "^1.2.1",
-                "type-check": "~0.4.0"
-            },
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/linkify-it": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
-            "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
-            "dev": true,
-            "dependencies": {
-                "uc.micro": "^1.0.1"
-            }
-        },
-        "node_modules/listenercount": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
-            "integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=",
-            "dev": true
-        },
-        "node_modules/locate-path": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-            "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-            "dev": true,
-            "dependencies": {
-                "p-locate": "^5.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/lodash.clonedeep": {
-            "version": "4.5.0",
-            "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-            "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-            "dev": true
-        },
-        "node_modules/lodash.merge": {
-            "version": "4.6.2",
-            "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-            "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-            "dev": true
-        },
-        "node_modules/lodash.truncate": {
-            "version": "4.4.2",
-            "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-            "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-            "dev": true
-        },
-        "node_modules/log-symbols": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-            "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-            "dev": true,
-            "dependencies": {
-                "chalk": "^4.1.0",
-                "is-unicode-supported": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/lru-cache": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-            "dev": true,
-            "dependencies": {
-                "yallist": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/markdown-it": {
-            "version": "10.0.0",
-            "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
-            "integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
-            "dev": true,
-            "dependencies": {
-                "argparse": "^1.0.7",
-                "entities": "~2.0.0",
-                "linkify-it": "^2.0.0",
-                "mdurl": "^1.0.1",
-                "uc.micro": "^1.0.5"
-            },
-            "bin": {
-                "markdown-it": "bin/markdown-it.js"
-            }
-        },
-        "node_modules/markdown-it/node_modules/entities": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
-            "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
-            "dev": true
-        },
-        "node_modules/mdurl": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-            "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-            "dev": true
-        },
-        "node_modules/merge2": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/micromatch": {
-            "version": "4.0.4",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-            "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-            "dev": true,
-            "dependencies": {
-                "braces": "^3.0.1",
-                "picomatch": "^2.2.3"
-            },
-            "engines": {
-                "node": ">=8.6"
-            }
-        },
-        "node_modules/mime": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-            "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-            "dev": true,
-            "bin": {
-                "mime": "cli.js"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/mimic-response": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
-            "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/minimatch": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-            "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-            "dev": true,
-            "dependencies": {
-                "brace-expansion": "^1.1.7"
-            },
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/minimist": {
-            "version": "1.2.5",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-            "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-            "dev": true
-        },
-        "node_modules/mkdirp": {
-            "version": "0.5.5",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-            "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-            "dev": true,
-            "dependencies": {
-                "minimist": "^1.2.5"
-            },
-            "bin": {
-                "mkdirp": "bin/cmd.js"
-            }
-        },
-        "node_modules/mkdirp-classic": {
-            "version": "0.5.3",
-            "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-            "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-            "dev": true
-        },
-        "node_modules/mocha": {
-            "version": "9.1.3",
-            "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz",
-            "integrity": "sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw==",
-            "dev": true,
-            "dependencies": {
-                "@ungap/promise-all-settled": "1.1.2",
-                "ansi-colors": "4.1.1",
-                "browser-stdout": "1.3.1",
-                "chokidar": "3.5.2",
-                "debug": "4.3.2",
-                "diff": "5.0.0",
-                "escape-string-regexp": "4.0.0",
-                "find-up": "5.0.0",
-                "glob": "7.1.7",
-                "growl": "1.10.5",
-                "he": "1.2.0",
-                "js-yaml": "4.1.0",
-                "log-symbols": "4.1.0",
-                "minimatch": "3.0.4",
-                "ms": "2.1.3",
-                "nanoid": "3.1.25",
-                "serialize-javascript": "6.0.0",
-                "strip-json-comments": "3.1.1",
-                "supports-color": "8.1.1",
-                "which": "2.0.2",
-                "workerpool": "6.1.5",
-                "yargs": "16.2.0",
-                "yargs-parser": "20.2.4",
-                "yargs-unparser": "2.0.0"
-            },
-            "bin": {
-                "_mocha": "bin/_mocha",
-                "mocha": "bin/mocha"
-            },
-            "engines": {
-                "node": ">= 12.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/mochajs"
-            }
-        },
-        "node_modules/mocha/node_modules/argparse": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-            "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-            "dev": true
-        },
-        "node_modules/mocha/node_modules/glob": {
-            "version": "7.1.7",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-            "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
-            "dev": true,
-            "dependencies": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-            },
-            "engines": {
-                "node": "*"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/mocha/node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/mocha/node_modules/js-yaml": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-            "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-            "dev": true,
-            "dependencies": {
-                "argparse": "^2.0.1"
-            },
-            "bin": {
-                "js-yaml": "bin/js-yaml.js"
-            }
-        },
-        "node_modules/mocha/node_modules/ms": {
-            "version": "2.1.3",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-            "dev": true
-        },
-        "node_modules/mocha/node_modules/supports-color": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/supports-color?sponsor=1"
-            }
-        },
-        "node_modules/ms": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-            "dev": true
-        },
-        "node_modules/mute-stream": {
-            "version": "0.0.8",
-            "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-            "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-            "dev": true
-        },
-        "node_modules/nanoid": {
-            "version": "3.1.25",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
-            "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==",
-            "dev": true,
-            "bin": {
-                "nanoid": "bin/nanoid.cjs"
-            },
-            "engines": {
-                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-            }
-        },
-        "node_modules/napi-build-utils": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
-            "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
-            "dev": true
-        },
-        "node_modules/natural-compare": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-            "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-            "dev": true
-        },
-        "node_modules/node-abi": {
-            "version": "2.30.1",
-            "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz",
-            "integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==",
-            "dev": true,
-            "dependencies": {
-                "semver": "^5.4.1"
-            }
-        },
-        "node_modules/node-abi/node_modules/semver": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-            "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver"
-            }
-        },
-        "node_modules/node-addon-api": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-            "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
-            "dev": true
-        },
-        "node_modules/normalize-path": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/npmlog": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-            "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-            "dev": true,
-            "dependencies": {
-                "are-we-there-yet": "~1.1.2",
-                "console-control-strings": "~1.1.0",
-                "gauge": "~2.7.3",
-                "set-blocking": "~2.0.0"
-            }
-        },
-        "node_modules/nth-check": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
-            "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
-            "dev": true,
-            "dependencies": {
-                "boolbase": "^1.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/fb55/nth-check?sponsor=1"
-            }
-        },
-        "node_modules/number-is-nan": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-            "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/object-assign": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-            "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/object-inspect": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
-            "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==",
-            "dev": true,
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/once": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-            "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-            "dev": true,
-            "dependencies": {
-                "wrappy": "1"
-            }
-        },
-        "node_modules/optionator": {
-            "version": "0.9.1",
-            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-            "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-            "dev": true,
-            "dependencies": {
-                "deep-is": "^0.1.3",
-                "fast-levenshtein": "^2.0.6",
-                "levn": "^0.4.1",
-                "prelude-ls": "^1.2.1",
-                "type-check": "^0.4.0",
-                "word-wrap": "^1.2.3"
-            },
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/p-limit": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-            "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-            "dev": true,
-            "dependencies": {
-                "yocto-queue": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/p-locate": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-            "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-            "dev": true,
-            "dependencies": {
-                "p-limit": "^3.0.2"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/parent-module": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-            "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-            "dev": true,
-            "dependencies": {
-                "callsites": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/parse-semver": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/parse-semver/-/parse-semver-1.1.1.tgz",
-            "integrity": "sha1-mkr9bfBj3Egm+T+6SpnPIj9mbLg=",
-            "dev": true,
-            "dependencies": {
-                "semver": "^5.1.0"
-            }
-        },
-        "node_modules/parse-semver/node_modules/semver": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-            "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver"
-            }
-        },
-        "node_modules/parse5": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-            "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-            "dev": true
-        },
-        "node_modules/parse5-htmlparser2-tree-adapter": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
-            "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
-            "dev": true,
-            "dependencies": {
-                "parse5": "^6.0.1"
-            }
-        },
-        "node_modules/path-exists": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-            "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/path-is-absolute": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/path-key": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/path-parse": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-            "dev": true
-        },
-        "node_modules/path-type": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-            "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/pend": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-            "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-            "dev": true
-        },
-        "node_modules/picomatch": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-            "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
-            "dev": true,
-            "engines": {
-                "node": ">=8.6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/jonschlinkert"
-            }
-        },
-        "node_modules/prebuild-install": {
-            "version": "6.1.4",
-            "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz",
-            "integrity": "sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ==",
-            "dev": true,
-            "dependencies": {
-                "detect-libc": "^1.0.3",
-                "expand-template": "^2.0.3",
-                "github-from-package": "0.0.0",
-                "minimist": "^1.2.3",
-                "mkdirp-classic": "^0.5.3",
-                "napi-build-utils": "^1.0.1",
-                "node-abi": "^2.21.0",
-                "npmlog": "^4.0.1",
-                "pump": "^3.0.0",
-                "rc": "^1.2.7",
-                "simple-get": "^3.0.3",
-                "tar-fs": "^2.0.0",
-                "tunnel-agent": "^0.6.0"
-            },
-            "bin": {
-                "prebuild-install": "bin.js"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/prelude-ls": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-            "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/process-nextick-args": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-            "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-            "dev": true
-        },
-        "node_modules/progress": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-            "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
-        "node_modules/pseudomap": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-            "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-            "dev": true
-        },
-        "node_modules/pump": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-            "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-            "dev": true,
-            "dependencies": {
-                "end-of-stream": "^1.1.0",
-                "once": "^1.3.1"
-            }
-        },
-        "node_modules/punycode": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-            "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/qs": {
-            "version": "6.10.2",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.2.tgz",
-            "integrity": "sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw==",
-            "dev": true,
-            "dependencies": {
-                "side-channel": "^1.0.4"
-            },
-            "engines": {
-                "node": ">=0.6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/queue-microtask": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
-        "node_modules/randombytes": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-            "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-            "dev": true,
-            "dependencies": {
-                "safe-buffer": "^5.1.0"
-            }
-        },
-        "node_modules/rc": {
-            "version": "1.2.8",
-            "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-            "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-            "dev": true,
-            "dependencies": {
-                "deep-extend": "^0.6.0",
-                "ini": "~1.3.0",
-                "minimist": "^1.2.0",
-                "strip-json-comments": "~2.0.1"
-            },
-            "bin": {
-                "rc": "cli.js"
-            }
-        },
-        "node_modules/rc/node_modules/strip-json-comments": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-            "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/read": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-            "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
-            "dev": true,
-            "dependencies": {
-                "mute-stream": "~0.0.4"
-            },
-            "engines": {
-                "node": ">=0.8"
-            }
-        },
-        "node_modules/readable-stream": {
-            "version": "2.3.7",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-            "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-            "dev": true,
-            "dependencies": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-            }
-        },
-        "node_modules/readdirp": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-            "dev": true,
-            "dependencies": {
-                "picomatch": "^2.2.1"
-            },
-            "engines": {
-                "node": ">=8.10.0"
-            }
-        },
-        "node_modules/regexpp": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-            "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/mysticatea"
-            }
-        },
-        "node_modules/require-directory": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-            "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/require-from-string": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-            "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/resolve": {
-            "version": "1.19.0",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
-            "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
-            "dev": true,
-            "dependencies": {
-                "is-core-module": "^2.1.0",
-                "path-parse": "^1.0.6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/resolve-from": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-            "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-            "dev": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/reusify": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-            "dev": true,
-            "engines": {
-                "iojs": ">=1.0.0",
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/rimraf": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-            "dev": true,
-            "dependencies": {
-                "glob": "^7.1.3"
-            },
-            "bin": {
-                "rimraf": "bin.js"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/run-parallel": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "dependencies": {
-                "queue-microtask": "^1.2.2"
-            }
-        },
-        "node_modules/safe-buffer": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-            "dev": true
-        },
-        "node_modules/sax": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-            "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-            "dev": true
-        },
-        "node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-            "bin": {
-                "semver": "bin/semver.js"
-            }
-        },
-        "node_modules/serialize-javascript": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-            "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-            "dev": true,
-            "dependencies": {
-                "randombytes": "^2.1.0"
-            }
-        },
-        "node_modules/set-blocking": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-            "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-            "dev": true
-        },
-        "node_modules/setimmediate": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-            "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-            "dev": true
-        },
-        "node_modules/shebang-command": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-            "dev": true,
-            "dependencies": {
-                "shebang-regex": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/shebang-regex": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/side-channel": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-            "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.0",
-                "get-intrinsic": "^1.0.2",
-                "object-inspect": "^1.9.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/sigmund": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-            "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
-            "dev": true
-        },
-        "node_modules/signal-exit": {
-            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
-            "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==",
-            "dev": true
-        },
-        "node_modules/simple-concat": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-            "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
-        "node_modules/simple-get": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
-            "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
-            "dev": true,
-            "dependencies": {
-                "decompress-response": "^4.2.0",
-                "once": "^1.3.1",
-                "simple-concat": "^1.0.0"
-            }
-        },
-        "node_modules/slash": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/slice-ansi": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-            "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "astral-regex": "^2.0.0",
-                "is-fullwidth-code-point": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-            }
-        },
-        "node_modules/slice-ansi/node_modules/ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dev": true,
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/slice-ansi/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/slice-ansi/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
-        "node_modules/sprintf-js": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-            "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-            "dev": true
-        },
-        "node_modules/string_decoder": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-            "dev": true,
-            "dependencies": {
-                "safe-buffer": "~5.1.0"
-            }
-        },
-        "node_modules/string-width": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "dev": true,
-            "dependencies": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "dev": true,
-            "dependencies": {
-                "ansi-regex": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/strip-json-comments": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-            "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/supports-color": {
-            "version": "5.5.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/table": {
-            "version": "6.7.2",
-            "resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz",
-            "integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==",
-            "dev": true,
-            "dependencies": {
-                "ajv": "^8.0.1",
-                "lodash.clonedeep": "^4.5.0",
-                "lodash.truncate": "^4.4.2",
-                "slice-ansi": "^4.0.0",
-                "string-width": "^4.2.3",
-                "strip-ansi": "^6.0.1"
-            },
-            "engines": {
-                "node": ">=10.0.0"
-            }
-        },
-        "node_modules/table/node_modules/ajv": {
-            "version": "8.6.3",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
-            "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
-            "dev": true,
-            "dependencies": {
-                "fast-deep-equal": "^3.1.1",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2",
-                "uri-js": "^4.2.2"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/table/node_modules/json-schema-traverse": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "dev": true
-        },
-        "node_modules/tar-fs": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-            "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-            "dev": true,
-            "dependencies": {
-                "chownr": "^1.1.1",
-                "mkdirp-classic": "^0.5.2",
-                "pump": "^3.0.0",
-                "tar-stream": "^2.1.4"
-            }
-        },
-        "node_modules/tar-stream": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-            "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-            "dev": true,
-            "dependencies": {
-                "bl": "^4.0.3",
-                "end-of-stream": "^1.4.1",
-                "fs-constants": "^1.0.0",
-                "inherits": "^2.0.3",
-                "readable-stream": "^3.1.1"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/tar-stream/node_modules/readable-stream": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-            "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-            "dev": true,
-            "dependencies": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/text-table": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-            "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-            "dev": true
-        },
-        "node_modules/tmp": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-            "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-            "dev": true,
-            "dependencies": {
-                "rimraf": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8.17.0"
-            }
-        },
-        "node_modules/to-regex-range": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-            "dev": true,
-            "dependencies": {
-                "is-number": "^7.0.0"
-            },
-            "engines": {
-                "node": ">=8.0"
-            }
-        },
-        "node_modules/traverse": {
-            "version": "0.3.9",
-            "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
-            "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
-            "dev": true,
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/tslib": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-            "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-            "dev": true
-        },
-        "node_modules/tsutils": {
-            "version": "3.21.0",
-            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-            "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-            "dev": true,
-            "dependencies": {
-                "tslib": "^1.8.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            },
-            "peerDependencies": {
-                "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-            }
-        },
-        "node_modules/tunnel": {
-            "version": "0.0.6",
-            "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
-            "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
-            }
-        },
-        "node_modules/tunnel-agent": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-            "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-            "dev": true,
-            "dependencies": {
-                "safe-buffer": "^5.0.1"
-            },
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/type-check": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-            "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-            "dev": true,
-            "dependencies": {
-                "prelude-ls": "^1.2.1"
-            },
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/type-fest": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-            "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/typed-rest-client": {
-            "version": "1.8.6",
-            "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.6.tgz",
-            "integrity": "sha512-xcQpTEAJw2DP7GqVNECh4dD+riS+C1qndXLfBCJ3xk0kqprtGN491P5KlmrDbKdtuW8NEcP/5ChxiJI3S9WYTA==",
-            "dev": true,
-            "dependencies": {
-                "qs": "^6.9.1",
-                "tunnel": "0.0.6",
-                "underscore": "^1.12.1"
-            }
-        },
-        "node_modules/typescript": {
-            "version": "4.4.4",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
-            "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
-            "dev": true,
-            "bin": {
-                "tsc": "bin/tsc",
-                "tsserver": "bin/tsserver"
-            },
-            "engines": {
-                "node": ">=4.2.0"
-            }
-        },
-        "node_modules/typescript-formatter": {
-            "version": "7.2.2",
-            "resolved": "https://registry.npmjs.org/typescript-formatter/-/typescript-formatter-7.2.2.tgz",
-            "integrity": "sha512-V7vfI9XArVhriOTYHPzMU2WUnm5IMdu9X/CPxs8mIMGxmTBFpDABlbkBka64PZJ9/xgQeRpK8KzzAG4MPzxBDQ==",
-            "dev": true,
-            "dependencies": {
-                "commandpost": "^1.0.0",
-                "editorconfig": "^0.15.0"
-            },
-            "bin": {
-                "tsfmt": "bin/tsfmt"
-            },
-            "engines": {
-                "node": ">= 4.2.0"
-            },
-            "peerDependencies": {
-                "typescript": "^2.1.6 || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev"
-            }
-        },
-        "node_modules/uc.micro": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-            "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
-            "dev": true
-        },
-        "node_modules/underscore": {
-            "version": "1.13.1",
-            "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-            "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
-            "dev": true
-        },
-        "node_modules/unzipper": {
-            "version": "0.10.11",
-            "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz",
-            "integrity": "sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==",
-            "dev": true,
-            "dependencies": {
-                "big-integer": "^1.6.17",
-                "binary": "~0.3.0",
-                "bluebird": "~3.4.1",
-                "buffer-indexof-polyfill": "~1.0.0",
-                "duplexer2": "~0.1.4",
-                "fstream": "^1.0.12",
-                "graceful-fs": "^4.2.2",
-                "listenercount": "~1.0.1",
-                "readable-stream": "~2.3.6",
-                "setimmediate": "~1.0.4"
-            }
-        },
-        "node_modules/uri-js": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-            "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-            "dev": true,
-            "dependencies": {
-                "punycode": "^2.1.0"
-            }
-        },
-        "node_modules/url-join": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
-            "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==",
-            "dev": true
-        },
-        "node_modules/util-deprecate": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-            "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-            "dev": true
-        },
-        "node_modules/v8-compile-cache": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-            "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-            "dev": true
-        },
-        "node_modules/vsce": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/vsce/-/vsce-2.5.1.tgz",
-            "integrity": "sha512-vJ+xY93Wv3NhgeriMyIC2oMA+niifOI9XGIqEToIq/rFRoQnXlmO4PSyis/OxBl9hw8OKKC/VcI9CijfFufEkw==",
-            "dev": true,
-            "dependencies": {
-                "azure-devops-node-api": "^11.0.1",
-                "chalk": "^2.4.2",
-                "cheerio": "^1.0.0-rc.9",
-                "commander": "^6.1.0",
-                "glob": "^7.0.6",
-                "hosted-git-info": "^4.0.2",
-                "keytar": "^7.7.0",
-                "leven": "^3.1.0",
-                "markdown-it": "^10.0.0",
-                "mime": "^1.3.4",
-                "minimatch": "^3.0.3",
-                "parse-semver": "^1.1.1",
-                "read": "^1.0.7",
-                "semver": "^5.1.0",
-                "tmp": "^0.2.1",
-                "typed-rest-client": "^1.8.4",
-                "url-join": "^4.0.1",
-                "xml2js": "^0.4.23",
-                "yauzl": "^2.3.1",
-                "yazl": "^2.2.2"
-            },
-            "bin": {
-                "vsce": "vsce"
-            },
-            "engines": {
-                "node": ">= 14"
-            }
-        },
-        "node_modules/vsce/node_modules/chalk": {
-            "version": "2.4.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/vsce/node_modules/commander": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-            "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
-            "dev": true,
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/vsce/node_modules/escape-string-regexp": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-            "dev": true,
-            "engines": {
-                "node": ">=0.8.0"
-            }
-        },
-        "node_modules/vsce/node_modules/semver": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-            "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver"
-            }
-        },
-        "node_modules/vscode-jsonrpc": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz",
-            "integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==",
-            "engines": {
-                "node": ">=8.0.0 || >=10.0.0"
-            }
-        },
-        "node_modules/vscode-languageclient": {
-            "version": "6.1.4",
-            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.4.tgz",
-            "integrity": "sha512-EUOU+bJu6axmt0RFNo3nrglQLPXMfanbYViJee3Fbn2VuQoX0ZOI4uTYhSRvYLP2vfwTP/juV62P/mksCdTZMA==",
-            "dependencies": {
-                "semver": "^6.3.0",
-                "vscode-languageserver-protocol": "3.15.3"
-            },
-            "engines": {
-                "vscode": "^1.41.0"
-            }
-        },
-        "node_modules/vscode-languageserver-protocol": {
-            "version": "3.15.3",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz",
-            "integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==",
-            "dependencies": {
-                "vscode-jsonrpc": "^5.0.1",
-                "vscode-languageserver-types": "3.15.1"
-            }
-        },
-        "node_modules/vscode-languageserver-types": {
-            "version": "3.15.1",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
-            "integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="
-        },
-        "node_modules/vscode-test": {
-            "version": "1.6.1",
-            "resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-1.6.1.tgz",
-            "integrity": "sha512-086q88T2ca1k95mUzffvbzb7esqQNvJgiwY4h29ukPhFo8u+vXOOmelUoU5EQUHs3Of8+JuQ3oGdbVCqaxuTXA==",
-            "deprecated": "This package has been renamed to @vscode/test-electron, please update to the new name",
-            "dev": true,
-            "dependencies": {
-                "http-proxy-agent": "^4.0.1",
-                "https-proxy-agent": "^5.0.0",
-                "rimraf": "^3.0.2",
-                "unzipper": "^0.10.11"
-            },
-            "engines": {
-                "node": ">=8.9.3"
-            }
-        },
-        "node_modules/which": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-            "dev": true,
-            "dependencies": {
-                "isexe": "^2.0.0"
-            },
-            "bin": {
-                "node-which": "bin/node-which"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/wide-align": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-            "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-            "dev": true,
-            "dependencies": {
-                "string-width": "^1.0.2 || 2 || 3 || 4"
-            }
-        },
-        "node_modules/word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/workerpool": {
-            "version": "6.1.5",
-            "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
-            "integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
-            "dev": true
-        },
-        "node_modules/wrap-ansi": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "string-width": "^4.1.0",
-                "strip-ansi": "^6.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-            }
-        },
-        "node_modules/wrap-ansi/node_modules/ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dev": true,
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/wrap-ansi/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/wrap-ansi/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
-        "node_modules/wrappy": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-            "dev": true
-        },
-        "node_modules/xml2js": {
-            "version": "0.4.23",
-            "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-            "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
-            "dev": true,
-            "dependencies": {
-                "sax": ">=0.6.0",
-                "xmlbuilder": "~11.0.0"
-            },
-            "engines": {
-                "node": ">=4.0.0"
-            }
-        },
-        "node_modules/xmlbuilder": {
-            "version": "11.0.1",
-            "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-            "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
-            "dev": true,
-            "engines": {
-                "node": ">=4.0"
-            }
-        },
-        "node_modules/y18n": {
-            "version": "5.0.8",
-            "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/yallist": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-            "dev": true
-        },
-        "node_modules/yargs": {
-            "version": "16.2.0",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-            "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-            "dev": true,
-            "dependencies": {
-                "cliui": "^7.0.2",
-                "escalade": "^3.1.1",
-                "get-caller-file": "^2.0.5",
-                "require-directory": "^2.1.1",
-                "string-width": "^4.2.0",
-                "y18n": "^5.0.5",
-                "yargs-parser": "^20.2.2"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/yargs-parser": {
-            "version": "20.2.4",
-            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-            "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/yargs-unparser": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
-            "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
-            "dev": true,
-            "dependencies": {
-                "camelcase": "^6.0.0",
-                "decamelize": "^4.0.0",
-                "flat": "^5.0.2",
-                "is-plain-obj": "^2.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/yauzl": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-            "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
-            "dev": true,
-            "dependencies": {
-                "buffer-crc32": "~0.2.3",
-                "fd-slicer": "~1.1.0"
-            }
-        },
-        "node_modules/yazl": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
-            "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
-            "dev": true,
-            "dependencies": {
-                "buffer-crc32": "~0.2.3"
-            }
-        },
-        "node_modules/yocto-queue": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-            "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        }
-    },
-    "dependencies": {
-        "@babel/code-frame": {
-            "version": "7.12.11",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-            "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-            "dev": true,
-            "requires": {
-                "@babel/highlight": "^7.10.4"
-            }
-        },
-        "@babel/helper-validator-identifier": {
-            "version": "7.15.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
-            "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
-            "dev": true
-        },
-        "@babel/highlight": {
-            "version": "7.14.5",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-            "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-validator-identifier": "^7.14.5",
-                "chalk": "^2.0.0",
-                "js-tokens": "^4.0.0"
-            },
-            "dependencies": {
-                "chalk": {
-                    "version": "2.4.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-                    "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^3.2.1",
-                        "escape-string-regexp": "^1.0.5",
-                        "supports-color": "^5.3.0"
-                    }
-                },
-                "escape-string-regexp": {
-                    "version": "1.0.5",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-                    "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-                    "dev": true
-                }
-            }
-        },
-        "@eslint/eslintrc": {
-            "version": "0.4.3",
-            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
-            "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
-            "dev": true,
-            "requires": {
-                "ajv": "^6.12.4",
-                "debug": "^4.1.1",
-                "espree": "^7.3.0",
-                "globals": "^13.9.0",
-                "ignore": "^4.0.6",
-                "import-fresh": "^3.2.1",
-                "js-yaml": "^3.13.1",
-                "minimatch": "^3.0.4",
-                "strip-json-comments": "^3.1.1"
-            },
-            "dependencies": {
-                "ignore": {
-                    "version": "4.0.6",
-                    "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-                    "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-                    "dev": true
-                }
-            }
-        },
-        "@humanwhocodes/config-array": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
-            "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
-            "dev": true,
-            "requires": {
-                "@humanwhocodes/object-schema": "^1.2.0",
-                "debug": "^4.1.1",
-                "minimatch": "^3.0.4"
-            }
-        },
-        "@humanwhocodes/object-schema": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
-            "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
-            "dev": true
-        },
-        "@microsoft/tsdoc": {
-            "version": "0.13.2",
-            "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.13.2.tgz",
-            "integrity": "sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==",
-            "dev": true
-        },
-        "@microsoft/tsdoc-config": {
-            "version": "0.15.2",
-            "resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.15.2.tgz",
-            "integrity": "sha512-mK19b2wJHSdNf8znXSMYVShAHktVr/ib0Ck2FA3lsVBSEhSI/TfXT7DJQkAYgcztTuwazGcg58ZjYdk0hTCVrA==",
-            "dev": true,
-            "requires": {
-                "@microsoft/tsdoc": "0.13.2",
-                "ajv": "~6.12.6",
-                "jju": "~1.4.0",
-                "resolve": "~1.19.0"
-            }
-        },
-        "@nodelib/fs.scandir": {
-            "version": "2.1.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-            "dev": true,
-            "requires": {
-                "@nodelib/fs.stat": "2.0.5",
-                "run-parallel": "^1.1.9"
-            }
-        },
-        "@nodelib/fs.stat": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-            "dev": true
-        },
-        "@nodelib/fs.walk": {
-            "version": "1.2.8",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-            "dev": true,
-            "requires": {
-                "@nodelib/fs.scandir": "2.1.5",
-                "fastq": "^1.6.0"
-            }
-        },
-        "@tootallnate/once": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-            "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
-            "dev": true
-        },
-        "@types/command-exists": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/@types/command-exists/-/command-exists-1.2.0.tgz",
-            "integrity": "sha512-ugsxEJfsCuqMLSuCD4PIJkp5Uk2z6TCMRCgYVuhRo5cYQY3+1xXTQkSlPtkpGHuvWMjS2KTeVQXxkXRACMbM6A==",
-            "dev": true
-        },
-        "@types/glob": {
-            "version": "7.1.4",
-            "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz",
-            "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==",
-            "dev": true,
-            "requires": {
-                "@types/minimatch": "*",
-                "@types/node": "*"
-            }
-        },
-        "@types/json-schema": {
-            "version": "7.0.9",
-            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-            "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
-            "dev": true
-        },
-        "@types/minimatch": {
-            "version": "3.0.5",
-            "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-            "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
-            "dev": true
-        },
-        "@types/mocha": {
-            "version": "9.0.0",
-            "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.0.0.tgz",
-            "integrity": "sha512-scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA==",
-            "dev": true
-        },
-        "@types/node": {
-            "version": "14.17.27",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.27.tgz",
-            "integrity": "sha512-94+Ahf9IcaDuJTle/2b+wzvjmutxXAEXU6O81JHblYXUg2BDG+dnBy7VxIPHKAyEEDHzCMQydTJuWvrE+Aanzw==",
-            "dev": true
-        },
-        "@types/vscode": {
-            "version": "1.61.0",
-            "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.61.0.tgz",
-            "integrity": "sha512-9k5Nwq45hkRwdfCFY+eKXeQQSbPoA114mF7U/4uJXRBJeGIO7MuJdhF1PnaDN+lllL9iKGQtd6FFXShBXMNaFg==",
-            "dev": true
-        },
-        "@typescript-eslint/eslint-plugin": {
-            "version": "4.33.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz",
-            "integrity": "sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==",
-            "dev": true,
-            "requires": {
-                "@typescript-eslint/experimental-utils": "4.33.0",
-                "@typescript-eslint/scope-manager": "4.33.0",
-                "debug": "^4.3.1",
-                "functional-red-black-tree": "^1.0.1",
-                "ignore": "^5.1.8",
-                "regexpp": "^3.1.0",
-                "semver": "^7.3.5",
-                "tsutils": "^3.21.0"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "7.3.5",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-                    "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-                    "dev": true,
-                    "requires": {
-                        "lru-cache": "^6.0.0"
-                    }
-                }
-            }
-        },
-        "@typescript-eslint/experimental-utils": {
-            "version": "4.33.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz",
-            "integrity": "sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==",
-            "dev": true,
-            "requires": {
-                "@types/json-schema": "^7.0.7",
-                "@typescript-eslint/scope-manager": "4.33.0",
-                "@typescript-eslint/types": "4.33.0",
-                "@typescript-eslint/typescript-estree": "4.33.0",
-                "eslint-scope": "^5.1.1",
-                "eslint-utils": "^3.0.0"
-            }
-        },
-        "@typescript-eslint/parser": {
-            "version": "4.33.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz",
-            "integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==",
-            "dev": true,
-            "requires": {
-                "@typescript-eslint/scope-manager": "4.33.0",
-                "@typescript-eslint/types": "4.33.0",
-                "@typescript-eslint/typescript-estree": "4.33.0",
-                "debug": "^4.3.1"
-            }
-        },
-        "@typescript-eslint/scope-manager": {
-            "version": "4.33.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz",
-            "integrity": "sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==",
-            "dev": true,
-            "requires": {
-                "@typescript-eslint/types": "4.33.0",
-                "@typescript-eslint/visitor-keys": "4.33.0"
-            }
-        },
-        "@typescript-eslint/types": {
-            "version": "4.33.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz",
-            "integrity": "sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==",
-            "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-            "version": "4.33.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz",
-            "integrity": "sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==",
-            "dev": true,
-            "requires": {
-                "@typescript-eslint/types": "4.33.0",
-                "@typescript-eslint/visitor-keys": "4.33.0",
-                "debug": "^4.3.1",
-                "globby": "^11.0.3",
-                "is-glob": "^4.0.1",
-                "semver": "^7.3.5",
-                "tsutils": "^3.21.0"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "7.3.5",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-                    "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-                    "dev": true,
-                    "requires": {
-                        "lru-cache": "^6.0.0"
-                    }
-                }
-            }
-        },
-        "@typescript-eslint/visitor-keys": {
-            "version": "4.33.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz",
-            "integrity": "sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==",
-            "dev": true,
-            "requires": {
-                "@typescript-eslint/types": "4.33.0",
-                "eslint-visitor-keys": "^2.0.0"
-            }
-        },
-        "@ungap/promise-all-settled": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
-            "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
-            "dev": true
-        },
-        "@vscode/test-electron": {
-            "version": "1.6.2",
-            "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-1.6.2.tgz",
-            "integrity": "sha512-W01ajJEMx6223Y7J5yaajGjVs1QfW3YGkkOJHVKfAMEqNB1ZHN9wCcViehv5ZwVSSJnjhu6lYEYgwBdHtCxqhQ==",
-            "dev": true,
-            "requires": {
-                "http-proxy-agent": "^4.0.1",
-                "https-proxy-agent": "^5.0.0",
-                "rimraf": "^3.0.2",
-                "unzipper": "^0.10.11"
-            }
-        },
-        "acorn": {
-            "version": "7.4.1",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-            "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-            "dev": true
-        },
-        "acorn-jsx": {
-            "version": "5.3.2",
-            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-            "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-            "dev": true,
-            "requires": {}
-        },
-        "agent-base": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-            "dev": true,
-            "requires": {
-                "debug": "4"
-            }
-        },
-        "ajv": {
-            "version": "6.12.6",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-            "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-            "dev": true,
-            "requires": {
-                "fast-deep-equal": "^3.1.1",
-                "fast-json-stable-stringify": "^2.0.0",
-                "json-schema-traverse": "^0.4.1",
-                "uri-js": "^4.2.2"
-            }
-        },
-        "ansi-colors": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-            "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-            "dev": true
-        },
-        "ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true
-        },
-        "ansi-styles": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-            "dev": true,
-            "requires": {
-                "color-convert": "^1.9.0"
-            }
-        },
-        "anymatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-            "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-            "dev": true,
-            "requires": {
-                "normalize-path": "^3.0.0",
-                "picomatch": "^2.0.4"
-            }
-        },
-        "aproba": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-            "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-            "dev": true
-        },
-        "are-we-there-yet": {
-            "version": "1.1.7",
-            "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
-            "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
-            "dev": true,
-            "requires": {
-                "delegates": "^1.0.0",
-                "readable-stream": "^2.0.6"
-            }
-        },
-        "argparse": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-            "dev": true,
-            "requires": {
-                "sprintf-js": "~1.0.2"
-            }
-        },
-        "array-union": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-            "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-            "dev": true
-        },
-        "astral-regex": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-            "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-            "dev": true
-        },
-        "azure-devops-node-api": {
-            "version": "11.1.0",
-            "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.1.0.tgz",
-            "integrity": "sha512-6/2YZuf+lJzJLrjXNYEA5RXAkMCb8j/4VcHD0qJQRsgG/KsRMYo0HgDh0by1FGHyZkQWY5LmQyJqCwRVUB3Y7Q==",
-            "dev": true,
-            "requires": {
-                "tunnel": "0.0.6",
-                "typed-rest-client": "^1.8.4"
-            }
-        },
-        "balanced-match": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-            "dev": true
-        },
-        "base64-js": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-            "dev": true
-        },
-        "big-integer": {
-            "version": "1.6.50",
-            "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.50.tgz",
-            "integrity": "sha512-+O2uoQWFRo8ysZNo/rjtri2jIwjr3XfeAgRjAUADRqGG+ZITvyn8J1kvXLTaKVr3hhGXk+f23tKfdzmklVM9vQ==",
-            "dev": true
-        },
-        "binary": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-            "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
-            "dev": true,
-            "requires": {
-                "buffers": "~0.1.1",
-                "chainsaw": "~0.1.0"
-            }
-        },
-        "binary-extensions": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-            "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-            "dev": true
-        },
-        "bl": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-            "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-            "dev": true,
-            "requires": {
-                "buffer": "^5.5.0",
-                "inherits": "^2.0.4",
-                "readable-stream": "^3.4.0"
-            },
-            "dependencies": {
-                "readable-stream": {
-                    "version": "3.6.0",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-                    "dev": true,
-                    "requires": {
-                        "inherits": "^2.0.3",
-                        "string_decoder": "^1.1.1",
-                        "util-deprecate": "^1.0.1"
-                    }
-                }
-            }
-        },
-        "bluebird": {
-            "version": "3.4.7",
-            "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
-            "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=",
-            "dev": true
-        },
-        "boolbase": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-            "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-            "dev": true
-        },
-        "brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-            "dev": true,
-            "requires": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-            }
-        },
-        "braces": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-            "dev": true,
-            "requires": {
-                "fill-range": "^7.0.1"
-            }
-        },
-        "browser-stdout": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-            "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-            "dev": true
-        },
-        "buffer": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-            "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-            "dev": true,
-            "requires": {
-                "base64-js": "^1.3.1",
-                "ieee754": "^1.1.13"
-            }
-        },
-        "buffer-crc32": {
-            "version": "0.2.13",
-            "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-            "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-            "dev": true
-        },
-        "buffer-indexof-polyfill": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",
-            "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==",
-            "dev": true
-        },
-        "buffers": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
-            "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
-            "dev": true
-        },
-        "call-bind": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-            "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-            "dev": true,
-            "requires": {
-                "function-bind": "^1.1.1",
-                "get-intrinsic": "^1.0.2"
-            }
-        },
-        "callsites": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-            "dev": true
-        },
-        "camelcase": {
-            "version": "6.2.0",
-            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-            "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-            "dev": true
-        },
-        "chainsaw": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-            "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
-            "dev": true,
-            "requires": {
-                "traverse": ">=0.3.0 <0.4"
-            }
-        },
-        "chalk": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-            "dev": true,
-            "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "cheerio": {
-            "version": "1.0.0-rc.10",
-            "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz",
-            "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==",
-            "dev": true,
-            "requires": {
-                "cheerio-select": "^1.5.0",
-                "dom-serializer": "^1.3.2",
-                "domhandler": "^4.2.0",
-                "htmlparser2": "^6.1.0",
-                "parse5": "^6.0.1",
-                "parse5-htmlparser2-tree-adapter": "^6.0.1",
-                "tslib": "^2.2.0"
-            },
-            "dependencies": {
-                "tslib": {
-                    "version": "2.3.1",
-                    "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-                    "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
-                    "dev": true
-                }
-            }
-        },
-        "cheerio-select": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz",
-            "integrity": "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==",
-            "dev": true,
-            "requires": {
-                "css-select": "^4.1.3",
-                "css-what": "^5.0.1",
-                "domelementtype": "^2.2.0",
-                "domhandler": "^4.2.0",
-                "domutils": "^2.7.0"
-            }
-        },
-        "chokidar": {
-            "version": "3.5.2",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-            "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
-            "dev": true,
-            "requires": {
-                "anymatch": "~3.1.2",
-                "braces": "~3.0.2",
-                "fsevents": "~2.3.2",
-                "glob-parent": "~5.1.2",
-                "is-binary-path": "~2.1.0",
-                "is-glob": "~4.0.1",
-                "normalize-path": "~3.0.0",
-                "readdirp": "~3.6.0"
-            }
-        },
-        "chownr": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-            "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-            "dev": true
-        },
-        "cliui": {
-            "version": "7.0.4",
-            "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-            "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-            "dev": true,
-            "requires": {
-                "string-width": "^4.2.0",
-                "strip-ansi": "^6.0.0",
-                "wrap-ansi": "^7.0.0"
-            }
-        },
-        "code-point-at": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-            "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-            "dev": true
-        },
-        "color-convert": {
-            "version": "1.9.3",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-            "dev": true,
-            "requires": {
-                "color-name": "1.1.3"
-            }
-        },
-        "color-name": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-            "dev": true
-        },
-        "command-exists": {
-            "version": "1.2.9",
-            "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
-            "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="
-        },
-        "commander": {
-            "version": "2.20.3",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-            "dev": true
-        },
-        "commandpost": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/commandpost/-/commandpost-1.4.0.tgz",
-            "integrity": "sha512-aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ==",
-            "dev": true
-        },
-        "concat-map": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-            "dev": true
-        },
-        "console-control-strings": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-            "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-            "dev": true
-        },
-        "core-util-is": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-            "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-            "dev": true
-        },
-        "cross-spawn": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-            "dev": true,
-            "requires": {
-                "path-key": "^3.1.0",
-                "shebang-command": "^2.0.0",
-                "which": "^2.0.1"
-            }
-        },
-        "css-select": {
-            "version": "4.1.3",
-            "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
-            "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
-            "dev": true,
-            "requires": {
-                "boolbase": "^1.0.0",
-                "css-what": "^5.0.0",
-                "domhandler": "^4.2.0",
-                "domutils": "^2.6.0",
-                "nth-check": "^2.0.0"
-            }
-        },
-        "css-what": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
-            "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
-            "dev": true
-        },
-        "debug": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-            "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-            "dev": true,
-            "requires": {
-                "ms": "2.1.2"
-            }
-        },
-        "decamelize": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
-            "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
-            "dev": true
-        },
-        "decompress-response": {
-            "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
-            "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
-            "dev": true,
-            "requires": {
-                "mimic-response": "^2.0.0"
-            }
-        },
-        "deep-extend": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-            "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-            "dev": true
-        },
-        "deep-is": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-            "dev": true
-        },
-        "delegates": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-            "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-            "dev": true
-        },
-        "detect-libc": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-            "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
-            "dev": true
-        },
-        "diff": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-            "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
-            "dev": true
-        },
-        "dir-glob": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-            "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-            "dev": true,
-            "requires": {
-                "path-type": "^4.0.0"
-            }
-        },
-        "doctrine": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-            "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-            "dev": true,
-            "requires": {
-                "esutils": "^2.0.2"
-            }
-        },
-        "dom-serializer": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
-            "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
-            "dev": true,
-            "requires": {
-                "domelementtype": "^2.0.1",
-                "domhandler": "^4.2.0",
-                "entities": "^2.0.0"
-            }
-        },
-        "domelementtype": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-            "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
-            "dev": true
-        },
-        "domhandler": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz",
-            "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==",
-            "dev": true,
-            "requires": {
-                "domelementtype": "^2.2.0"
-            }
-        },
-        "domutils": {
-            "version": "2.8.0",
-            "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-            "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-            "dev": true,
-            "requires": {
-                "dom-serializer": "^1.0.1",
-                "domelementtype": "^2.2.0",
-                "domhandler": "^4.2.0"
-            }
-        },
-        "duplexer2": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-            "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-            "dev": true,
-            "requires": {
-                "readable-stream": "^2.0.2"
-            }
-        },
-        "editorconfig": {
-            "version": "0.15.3",
-            "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz",
-            "integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==",
-            "dev": true,
-            "requires": {
-                "commander": "^2.19.0",
-                "lru-cache": "^4.1.5",
-                "semver": "^5.6.0",
-                "sigmund": "^1.0.1"
-            },
-            "dependencies": {
-                "lru-cache": {
-                    "version": "4.1.5",
-                    "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-                    "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-                    "dev": true,
-                    "requires": {
-                        "pseudomap": "^1.0.2",
-                        "yallist": "^2.1.2"
-                    }
-                },
-                "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-                    "dev": true
-                },
-                "yallist": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-                    "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-                    "dev": true
-                }
-            }
-        },
-        "emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "dev": true
-        },
-        "end-of-stream": {
-            "version": "1.4.4",
-            "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-            "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-            "dev": true,
-            "requires": {
-                "once": "^1.4.0"
-            }
-        },
-        "enquirer": {
-            "version": "2.3.6",
-            "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-            "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-            "dev": true,
-            "requires": {
-                "ansi-colors": "^4.1.1"
-            }
-        },
-        "entities": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-            "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-            "dev": true
-        },
-        "escalade": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-            "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-            "dev": true
-        },
-        "escape-string-regexp": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-            "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-            "dev": true
-        },
-        "eslint": {
-            "version": "7.32.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
-            "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "7.12.11",
-                "@eslint/eslintrc": "^0.4.3",
-                "@humanwhocodes/config-array": "^0.5.0",
-                "ajv": "^6.10.0",
-                "chalk": "^4.0.0",
-                "cross-spawn": "^7.0.2",
-                "debug": "^4.0.1",
-                "doctrine": "^3.0.0",
-                "enquirer": "^2.3.5",
-                "escape-string-regexp": "^4.0.0",
-                "eslint-scope": "^5.1.1",
-                "eslint-utils": "^2.1.0",
-                "eslint-visitor-keys": "^2.0.0",
-                "espree": "^7.3.1",
-                "esquery": "^1.4.0",
-                "esutils": "^2.0.2",
-                "fast-deep-equal": "^3.1.3",
-                "file-entry-cache": "^6.0.1",
-                "functional-red-black-tree": "^1.0.1",
-                "glob-parent": "^5.1.2",
-                "globals": "^13.6.0",
-                "ignore": "^4.0.6",
-                "import-fresh": "^3.0.0",
-                "imurmurhash": "^0.1.4",
-                "is-glob": "^4.0.0",
-                "js-yaml": "^3.13.1",
-                "json-stable-stringify-without-jsonify": "^1.0.1",
-                "levn": "^0.4.1",
-                "lodash.merge": "^4.6.2",
-                "minimatch": "^3.0.4",
-                "natural-compare": "^1.4.0",
-                "optionator": "^0.9.1",
-                "progress": "^2.0.0",
-                "regexpp": "^3.1.0",
-                "semver": "^7.2.1",
-                "strip-ansi": "^6.0.0",
-                "strip-json-comments": "^3.1.0",
-                "table": "^6.0.9",
-                "text-table": "^0.2.0",
-                "v8-compile-cache": "^2.0.3"
-            },
-            "dependencies": {
-                "eslint-utils": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-                    "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-                    "dev": true,
-                    "requires": {
-                        "eslint-visitor-keys": "^1.1.0"
-                    },
-                    "dependencies": {
-                        "eslint-visitor-keys": {
-                            "version": "1.3.0",
-                            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-                            "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-                            "dev": true
-                        }
-                    }
-                },
-                "ignore": {
-                    "version": "4.0.6",
-                    "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-                    "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-                    "dev": true
-                },
-                "semver": {
-                    "version": "7.3.5",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-                    "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-                    "dev": true,
-                    "requires": {
-                        "lru-cache": "^6.0.0"
-                    }
-                }
-            }
-        },
-        "eslint-plugin-tsdoc": {
-            "version": "0.2.14",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-tsdoc/-/eslint-plugin-tsdoc-0.2.14.tgz",
-            "integrity": "sha512-fJ3fnZRsdIoBZgzkQjv8vAj6NeeOoFkTfgosj6mKsFjX70QV256sA/wq+y/R2+OL4L8E79VVaVWrPeZnKNe8Ng==",
-            "dev": true,
-            "requires": {
-                "@microsoft/tsdoc": "0.13.2",
-                "@microsoft/tsdoc-config": "0.15.2"
-            }
-        },
-        "eslint-scope": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-            "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-            "dev": true,
-            "requires": {
-                "esrecurse": "^4.3.0",
-                "estraverse": "^4.1.1"
-            }
-        },
-        "eslint-utils": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-            "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-            "dev": true,
-            "requires": {
-                "eslint-visitor-keys": "^2.0.0"
-            }
-        },
-        "eslint-visitor-keys": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-            "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-            "dev": true
-        },
-        "espree": {
-            "version": "7.3.1",
-            "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
-            "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
-            "dev": true,
-            "requires": {
-                "acorn": "^7.4.0",
-                "acorn-jsx": "^5.3.1",
-                "eslint-visitor-keys": "^1.3.0"
-            },
-            "dependencies": {
-                "eslint-visitor-keys": {
-                    "version": "1.3.0",
-                    "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-                    "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-                    "dev": true
-                }
-            }
-        },
-        "esprima": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-            "dev": true
-        },
-        "esquery": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-            "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-            "dev": true,
-            "requires": {
-                "estraverse": "^5.1.0"
-            },
-            "dependencies": {
-                "estraverse": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-                    "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-                    "dev": true
-                }
-            }
-        },
-        "esrecurse": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-            "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-            "dev": true,
-            "requires": {
-                "estraverse": "^5.2.0"
-            },
-            "dependencies": {
-                "estraverse": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-                    "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-                    "dev": true
-                }
-            }
-        },
-        "estraverse": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-            "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-            "dev": true
-        },
-        "esutils": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-            "dev": true
-        },
-        "expand-template": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
-            "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
-            "dev": true
-        },
-        "fast-deep-equal": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-            "dev": true
-        },
-        "fast-glob": {
-            "version": "3.2.7",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-            "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
-            "dev": true,
-            "requires": {
-                "@nodelib/fs.stat": "^2.0.2",
-                "@nodelib/fs.walk": "^1.2.3",
-                "glob-parent": "^5.1.2",
-                "merge2": "^1.3.0",
-                "micromatch": "^4.0.4"
-            }
-        },
-        "fast-json-stable-stringify": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-            "dev": true
-        },
-        "fast-levenshtein": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-            "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-            "dev": true
-        },
-        "fastq": {
-            "version": "1.13.0",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-            "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-            "dev": true,
-            "requires": {
-                "reusify": "^1.0.4"
-            }
-        },
-        "fd-slicer": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-            "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
-            "dev": true,
-            "requires": {
-                "pend": "~1.2.0"
-            }
-        },
-        "file-entry-cache": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-            "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-            "dev": true,
-            "requires": {
-                "flat-cache": "^3.0.4"
-            }
-        },
-        "fill-range": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-            "dev": true,
-            "requires": {
-                "to-regex-range": "^5.0.1"
-            }
-        },
-        "find-up": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-            "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-            "dev": true,
-            "requires": {
-                "locate-path": "^6.0.0",
-                "path-exists": "^4.0.0"
-            }
-        },
-        "flat": {
-            "version": "5.0.2",
-            "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-            "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-            "dev": true
-        },
-        "flat-cache": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-            "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-            "dev": true,
-            "requires": {
-                "flatted": "^3.1.0",
-                "rimraf": "^3.0.2"
-            }
-        },
-        "flatted": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
-            "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
-            "dev": true
-        },
-        "fs-constants": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-            "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-            "dev": true
-        },
-        "fs.realpath": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-            "dev": true
-        },
-        "fsevents": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-            "dev": true,
-            "optional": true
-        },
-        "fstream": {
-            "version": "1.0.12",
-            "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-            "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
-            "dev": true,
-            "requires": {
-                "graceful-fs": "^4.1.2",
-                "inherits": "~2.0.0",
-                "mkdirp": ">=0.5 0",
-                "rimraf": "2"
-            },
-            "dependencies": {
-                "rimraf": {
-                    "version": "2.7.1",
-                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-                    "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-                    "dev": true,
-                    "requires": {
-                        "glob": "^7.1.3"
-                    }
-                }
-            }
-        },
-        "function-bind": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-            "dev": true
-        },
-        "functional-red-black-tree": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-            "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-            "dev": true
-        },
-        "gauge": {
-            "version": "2.7.4",
-            "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-            "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-            "dev": true,
-            "requires": {
-                "aproba": "^1.0.3",
-                "console-control-strings": "^1.0.0",
-                "has-unicode": "^2.0.0",
-                "object-assign": "^4.1.0",
-                "signal-exit": "^3.0.0",
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1",
-                "wide-align": "^1.1.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-                    "dev": true
-                },
-                "is-fullwidth-code-point": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-                    "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-                    "dev": true,
-                    "requires": {
-                        "number-is-nan": "^1.0.0"
-                    }
-                },
-                "string-width": {
-                    "version": "1.0.2",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-                    "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-                    "dev": true,
-                    "requires": {
-                        "code-point-at": "^1.0.0",
-                        "is-fullwidth-code-point": "^1.0.0",
-                        "strip-ansi": "^3.0.0"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-                    "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^2.0.0"
-                    }
-                }
-            }
-        },
-        "get-caller-file": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-            "dev": true
-        },
-        "get-intrinsic": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-            "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-            "dev": true,
-            "requires": {
-                "function-bind": "^1.1.1",
-                "has": "^1.0.3",
-                "has-symbols": "^1.0.1"
-            }
-        },
-        "github-from-package": {
-            "version": "0.0.0",
-            "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-            "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=",
-            "dev": true
-        },
-        "glob": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-            "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-            "dev": true,
-            "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-            }
-        },
-        "glob-parent": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-            "dev": true,
-            "requires": {
-                "is-glob": "^4.0.1"
-            }
-        },
-        "globals": {
-            "version": "13.11.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
-            "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
-            "dev": true,
-            "requires": {
-                "type-fest": "^0.20.2"
-            }
-        },
-        "globby": {
-            "version": "11.0.4",
-            "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-            "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
-            "dev": true,
-            "requires": {
-                "array-union": "^2.1.0",
-                "dir-glob": "^3.0.1",
-                "fast-glob": "^3.1.1",
-                "ignore": "^5.1.4",
-                "merge2": "^1.3.0",
-                "slash": "^3.0.0"
-            }
-        },
-        "graceful-fs": {
-            "version": "4.2.8",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-            "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
-            "dev": true
-        },
-        "growl": {
-            "version": "1.10.5",
-            "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-            "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-            "dev": true
-        },
-        "has": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-            "dev": true,
-            "requires": {
-                "function-bind": "^1.1.1"
-            }
-        },
-        "has-flag": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-            "dev": true
-        },
-        "has-symbols": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-            "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-            "dev": true
-        },
-        "has-unicode": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-            "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-            "dev": true
-        },
-        "he": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-            "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-            "dev": true
-        },
-        "hosted-git-info": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-            "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
-            "dev": true,
-            "requires": {
-                "lru-cache": "^6.0.0"
-            }
-        },
-        "htmlparser2": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-            "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-            "dev": true,
-            "requires": {
-                "domelementtype": "^2.0.1",
-                "domhandler": "^4.0.0",
-                "domutils": "^2.5.2",
-                "entities": "^2.0.0"
-            }
-        },
-        "http-proxy-agent": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-            "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-            "dev": true,
-            "requires": {
-                "@tootallnate/once": "1",
-                "agent-base": "6",
-                "debug": "4"
-            }
-        },
-        "https-proxy-agent": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-            "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-            "dev": true,
-            "requires": {
-                "agent-base": "6",
-                "debug": "4"
-            }
-        },
-        "ieee754": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-            "dev": true
-        },
-        "ignore": {
-            "version": "5.1.8",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-            "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-            "dev": true
-        },
-        "import-fresh": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-            "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-            "dev": true,
-            "requires": {
-                "parent-module": "^1.0.0",
-                "resolve-from": "^4.0.0"
-            }
-        },
-        "imurmurhash": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-            "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-            "dev": true
-        },
-        "inflight": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-            "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-            "dev": true,
-            "requires": {
-                "once": "^1.3.0",
-                "wrappy": "1"
-            }
-        },
-        "inherits": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-            "dev": true
-        },
-        "ini": {
-            "version": "1.3.8",
-            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-            "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-            "dev": true
-        },
-        "is-binary-path": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-            "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-            "dev": true,
-            "requires": {
-                "binary-extensions": "^2.0.0"
-            }
-        },
-        "is-core-module": {
-            "version": "2.8.0",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
-            "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
-            "dev": true,
-            "requires": {
-                "has": "^1.0.3"
-            }
-        },
-        "is-extglob": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-            "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-            "dev": true
-        },
-        "is-fullwidth-code-point": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-            "dev": true
-        },
-        "is-glob": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-            "dev": true,
-            "requires": {
-                "is-extglob": "^2.1.1"
-            }
-        },
-        "is-number": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-            "dev": true
-        },
-        "is-plain-obj": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-            "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-            "dev": true
-        },
-        "is-unicode-supported": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-            "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-            "dev": true
-        },
-        "isarray": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-            "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-            "dev": true
-        },
-        "isexe": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-            "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-            "dev": true
-        },
-        "jju": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
-            "integrity": "sha1-o6vicYryQaKykE+EpiWXDzia4yo=",
-            "dev": true
-        },
-        "js-tokens": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-            "dev": true
-        },
-        "js-yaml": {
-            "version": "3.14.1",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-            "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-            "dev": true,
-            "requires": {
-                "argparse": "^1.0.7",
-                "esprima": "^4.0.0"
-            }
-        },
-        "json-schema-traverse": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-            "dev": true
-        },
-        "json-stable-stringify-without-jsonify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-            "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-            "dev": true
-        },
-        "keytar": {
-            "version": "7.7.0",
-            "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz",
-            "integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==",
-            "dev": true,
-            "requires": {
-                "node-addon-api": "^3.0.0",
-                "prebuild-install": "^6.0.0"
-            }
-        },
-        "leven": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-            "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-            "dev": true
-        },
-        "levn": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-            "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-            "dev": true,
-            "requires": {
-                "prelude-ls": "^1.2.1",
-                "type-check": "~0.4.0"
-            }
-        },
-        "linkify-it": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
-            "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
-            "dev": true,
-            "requires": {
-                "uc.micro": "^1.0.1"
-            }
-        },
-        "listenercount": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
-            "integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=",
-            "dev": true
-        },
-        "locate-path": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-            "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-            "dev": true,
-            "requires": {
-                "p-locate": "^5.0.0"
-            }
-        },
-        "lodash.clonedeep": {
-            "version": "4.5.0",
-            "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-            "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-            "dev": true
-        },
-        "lodash.merge": {
-            "version": "4.6.2",
-            "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-            "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-            "dev": true
-        },
-        "lodash.truncate": {
-            "version": "4.4.2",
-            "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-            "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-            "dev": true
-        },
-        "log-symbols": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-            "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-            "dev": true,
-            "requires": {
-                "chalk": "^4.1.0",
-                "is-unicode-supported": "^0.1.0"
-            }
-        },
-        "lru-cache": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-            "dev": true,
-            "requires": {
-                "yallist": "^4.0.0"
-            }
-        },
-        "markdown-it": {
-            "version": "10.0.0",
-            "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
-            "integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
-            "dev": true,
-            "requires": {
-                "argparse": "^1.0.7",
-                "entities": "~2.0.0",
-                "linkify-it": "^2.0.0",
-                "mdurl": "^1.0.1",
-                "uc.micro": "^1.0.5"
-            },
-            "dependencies": {
-                "entities": {
-                    "version": "2.0.3",
-                    "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
-                    "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
-                    "dev": true
-                }
-            }
-        },
-        "mdurl": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-            "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-            "dev": true
-        },
-        "merge2": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-            "dev": true
-        },
-        "micromatch": {
-            "version": "4.0.4",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-            "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-            "dev": true,
-            "requires": {
-                "braces": "^3.0.1",
-                "picomatch": "^2.2.3"
-            }
-        },
-        "mime": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-            "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-            "dev": true
-        },
-        "mimic-response": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
-            "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
-            "dev": true
-        },
-        "minimatch": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-            "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-            "dev": true,
-            "requires": {
-                "brace-expansion": "^1.1.7"
-            }
-        },
-        "minimist": {
-            "version": "1.2.5",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-            "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-            "dev": true
-        },
-        "mkdirp": {
-            "version": "0.5.5",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-            "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-            "dev": true,
-            "requires": {
-                "minimist": "^1.2.5"
-            }
-        },
-        "mkdirp-classic": {
-            "version": "0.5.3",
-            "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-            "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-            "dev": true
-        },
-        "mocha": {
-            "version": "9.1.3",
-            "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz",
-            "integrity": "sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw==",
-            "dev": true,
-            "requires": {
-                "@ungap/promise-all-settled": "1.1.2",
-                "ansi-colors": "4.1.1",
-                "browser-stdout": "1.3.1",
-                "chokidar": "3.5.2",
-                "debug": "4.3.2",
-                "diff": "5.0.0",
-                "escape-string-regexp": "4.0.0",
-                "find-up": "5.0.0",
-                "glob": "7.1.7",
-                "growl": "1.10.5",
-                "he": "1.2.0",
-                "js-yaml": "4.1.0",
-                "log-symbols": "4.1.0",
-                "minimatch": "3.0.4",
-                "ms": "2.1.3",
-                "nanoid": "3.1.25",
-                "serialize-javascript": "6.0.0",
-                "strip-json-comments": "3.1.1",
-                "supports-color": "8.1.1",
-                "which": "2.0.2",
-                "workerpool": "6.1.5",
-                "yargs": "16.2.0",
-                "yargs-parser": "20.2.4",
-                "yargs-unparser": "2.0.0"
-            },
-            "dependencies": {
-                "argparse": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-                    "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-                    "dev": true
-                },
-                "glob": {
-                    "version": "7.1.7",
-                    "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-                    "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
-                    "dev": true,
-                    "requires": {
-                        "fs.realpath": "^1.0.0",
-                        "inflight": "^1.0.4",
-                        "inherits": "2",
-                        "minimatch": "^3.0.4",
-                        "once": "^1.3.0",
-                        "path-is-absolute": "^1.0.0"
-                    }
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "js-yaml": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-                    "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-                    "dev": true,
-                    "requires": {
-                        "argparse": "^2.0.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.3",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-                    "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "8.1.1",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-                    "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "ms": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-            "dev": true
-        },
-        "mute-stream": {
-            "version": "0.0.8",
-            "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-            "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-            "dev": true
-        },
-        "nanoid": {
-            "version": "3.1.25",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
-            "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==",
-            "dev": true
-        },
-        "napi-build-utils": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
-            "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
-            "dev": true
-        },
-        "natural-compare": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-            "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-            "dev": true
-        },
-        "node-abi": {
-            "version": "2.30.1",
-            "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz",
-            "integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==",
-            "dev": true,
-            "requires": {
-                "semver": "^5.4.1"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-                    "dev": true
-                }
-            }
-        },
-        "node-addon-api": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-            "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
-            "dev": true
-        },
-        "normalize-path": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-            "dev": true
-        },
-        "npmlog": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-            "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-            "dev": true,
-            "requires": {
-                "are-we-there-yet": "~1.1.2",
-                "console-control-strings": "~1.1.0",
-                "gauge": "~2.7.3",
-                "set-blocking": "~2.0.0"
-            }
-        },
-        "nth-check": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
-            "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
-            "dev": true,
-            "requires": {
-                "boolbase": "^1.0.0"
-            }
-        },
-        "number-is-nan": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-            "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-            "dev": true
-        },
-        "object-assign": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-            "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-            "dev": true
-        },
-        "object-inspect": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
-            "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==",
-            "dev": true
-        },
-        "once": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-            "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-            "dev": true,
-            "requires": {
-                "wrappy": "1"
-            }
-        },
-        "optionator": {
-            "version": "0.9.1",
-            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-            "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-            "dev": true,
-            "requires": {
-                "deep-is": "^0.1.3",
-                "fast-levenshtein": "^2.0.6",
-                "levn": "^0.4.1",
-                "prelude-ls": "^1.2.1",
-                "type-check": "^0.4.0",
-                "word-wrap": "^1.2.3"
-            }
-        },
-        "p-limit": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-            "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-            "dev": true,
-            "requires": {
-                "yocto-queue": "^0.1.0"
-            }
-        },
-        "p-locate": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-            "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-            "dev": true,
-            "requires": {
-                "p-limit": "^3.0.2"
-            }
-        },
-        "parent-module": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-            "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-            "dev": true,
-            "requires": {
-                "callsites": "^3.0.0"
-            }
-        },
-        "parse-semver": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/parse-semver/-/parse-semver-1.1.1.tgz",
-            "integrity": "sha1-mkr9bfBj3Egm+T+6SpnPIj9mbLg=",
-            "dev": true,
-            "requires": {
-                "semver": "^5.1.0"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-                    "dev": true
-                }
-            }
-        },
-        "parse5": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-            "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-            "dev": true
-        },
-        "parse5-htmlparser2-tree-adapter": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
-            "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
-            "dev": true,
-            "requires": {
-                "parse5": "^6.0.1"
-            }
-        },
-        "path-exists": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-            "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-            "dev": true
-        },
-        "path-is-absolute": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-            "dev": true
-        },
-        "path-key": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-            "dev": true
-        },
-        "path-parse": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-            "dev": true
-        },
-        "path-type": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-            "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-            "dev": true
-        },
-        "pend": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-            "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-            "dev": true
-        },
-        "picomatch": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-            "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
-            "dev": true
-        },
-        "prebuild-install": {
-            "version": "6.1.4",
-            "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz",
-            "integrity": "sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ==",
-            "dev": true,
-            "requires": {
-                "detect-libc": "^1.0.3",
-                "expand-template": "^2.0.3",
-                "github-from-package": "0.0.0",
-                "minimist": "^1.2.3",
-                "mkdirp-classic": "^0.5.3",
-                "napi-build-utils": "^1.0.1",
-                "node-abi": "^2.21.0",
-                "npmlog": "^4.0.1",
-                "pump": "^3.0.0",
-                "rc": "^1.2.7",
-                "simple-get": "^3.0.3",
-                "tar-fs": "^2.0.0",
-                "tunnel-agent": "^0.6.0"
-            }
-        },
-        "prelude-ls": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-            "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-            "dev": true
-        },
-        "process-nextick-args": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-            "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-            "dev": true
-        },
-        "progress": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-            "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-            "dev": true
-        },
-        "pseudomap": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-            "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-            "dev": true
-        },
-        "pump": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-            "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-            "dev": true,
-            "requires": {
-                "end-of-stream": "^1.1.0",
-                "once": "^1.3.1"
-            }
-        },
-        "punycode": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-            "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-            "dev": true
-        },
-        "qs": {
-            "version": "6.10.2",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.2.tgz",
-            "integrity": "sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw==",
-            "dev": true,
-            "requires": {
-                "side-channel": "^1.0.4"
-            }
-        },
-        "queue-microtask": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-            "dev": true
-        },
-        "randombytes": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-            "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-            "dev": true,
-            "requires": {
-                "safe-buffer": "^5.1.0"
-            }
-        },
-        "rc": {
-            "version": "1.2.8",
-            "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-            "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-            "dev": true,
-            "requires": {
-                "deep-extend": "^0.6.0",
-                "ini": "~1.3.0",
-                "minimist": "^1.2.0",
-                "strip-json-comments": "~2.0.1"
-            },
-            "dependencies": {
-                "strip-json-comments": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-                    "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-                    "dev": true
-                }
-            }
-        },
-        "read": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-            "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
-            "dev": true,
-            "requires": {
-                "mute-stream": "~0.0.4"
-            }
-        },
-        "readable-stream": {
-            "version": "2.3.7",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-            "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-            "dev": true,
-            "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-            }
-        },
-        "readdirp": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-            "dev": true,
-            "requires": {
-                "picomatch": "^2.2.1"
-            }
-        },
-        "regexpp": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-            "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-            "dev": true
-        },
-        "require-directory": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-            "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-            "dev": true
-        },
-        "require-from-string": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-            "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-            "dev": true
-        },
-        "resolve": {
-            "version": "1.19.0",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
-            "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
-            "dev": true,
-            "requires": {
-                "is-core-module": "^2.1.0",
-                "path-parse": "^1.0.6"
-            }
-        },
-        "resolve-from": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-            "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-            "dev": true
-        },
-        "reusify": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-            "dev": true
-        },
-        "rimraf": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-            "dev": true,
-            "requires": {
-                "glob": "^7.1.3"
-            }
-        },
-        "run-parallel": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-            "dev": true,
-            "requires": {
-                "queue-microtask": "^1.2.2"
-            }
-        },
-        "safe-buffer": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-            "dev": true
-        },
-        "sax": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-            "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-            "dev": true
-        },
-        "semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        },
-        "serialize-javascript": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-            "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-            "dev": true,
-            "requires": {
-                "randombytes": "^2.1.0"
-            }
-        },
-        "set-blocking": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-            "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-            "dev": true
-        },
-        "setimmediate": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-            "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-            "dev": true
-        },
-        "shebang-command": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-            "dev": true,
-            "requires": {
-                "shebang-regex": "^3.0.0"
-            }
-        },
-        "shebang-regex": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-            "dev": true
-        },
-        "side-channel": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-            "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-            "dev": true,
-            "requires": {
-                "call-bind": "^1.0.0",
-                "get-intrinsic": "^1.0.2",
-                "object-inspect": "^1.9.0"
-            }
-        },
-        "sigmund": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-            "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
-            "dev": true
-        },
-        "signal-exit": {
-            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
-            "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==",
-            "dev": true
-        },
-        "simple-concat": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-            "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-            "dev": true
-        },
-        "simple-get": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
-            "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
-            "dev": true,
-            "requires": {
-                "decompress-response": "^4.2.0",
-                "once": "^1.3.1",
-                "simple-concat": "^1.0.0"
-            }
-        },
-        "slash": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-            "dev": true
-        },
-        "slice-ansi": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-            "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-            "dev": true,
-            "requires": {
-                "ansi-styles": "^4.0.0",
-                "astral-regex": "^2.0.0",
-                "is-fullwidth-code-point": "^3.0.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                }
-            }
-        },
-        "sprintf-js": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-            "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-            "dev": true
-        },
-        "string_decoder": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-            "dev": true,
-            "requires": {
-                "safe-buffer": "~5.1.0"
-            }
-        },
-        "string-width": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "dev": true,
-            "requires": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
-            }
-        },
-        "strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "dev": true,
-            "requires": {
-                "ansi-regex": "^5.0.1"
-            }
-        },
-        "strip-json-comments": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-            "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-            "dev": true
-        },
-        "supports-color": {
-            "version": "5.5.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-            "dev": true,
-            "requires": {
-                "has-flag": "^3.0.0"
-            }
-        },
-        "table": {
-            "version": "6.7.2",
-            "resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz",
-            "integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==",
-            "dev": true,
-            "requires": {
-                "ajv": "^8.0.1",
-                "lodash.clonedeep": "^4.5.0",
-                "lodash.truncate": "^4.4.2",
-                "slice-ansi": "^4.0.0",
-                "string-width": "^4.2.3",
-                "strip-ansi": "^6.0.1"
-            },
-            "dependencies": {
-                "ajv": {
-                    "version": "8.6.3",
-                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
-                    "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
-                    "dev": true,
-                    "requires": {
-                        "fast-deep-equal": "^3.1.1",
-                        "json-schema-traverse": "^1.0.0",
-                        "require-from-string": "^2.0.2",
-                        "uri-js": "^4.2.2"
-                    }
-                },
-                "json-schema-traverse": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-                    "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-                    "dev": true
-                }
-            }
-        },
-        "tar-fs": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-            "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-            "dev": true,
-            "requires": {
-                "chownr": "^1.1.1",
-                "mkdirp-classic": "^0.5.2",
-                "pump": "^3.0.0",
-                "tar-stream": "^2.1.4"
-            }
-        },
-        "tar-stream": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-            "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-            "dev": true,
-            "requires": {
-                "bl": "^4.0.3",
-                "end-of-stream": "^1.4.1",
-                "fs-constants": "^1.0.0",
-                "inherits": "^2.0.3",
-                "readable-stream": "^3.1.1"
-            },
-            "dependencies": {
-                "readable-stream": {
-                    "version": "3.6.0",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-                    "dev": true,
-                    "requires": {
-                        "inherits": "^2.0.3",
-                        "string_decoder": "^1.1.1",
-                        "util-deprecate": "^1.0.1"
-                    }
-                }
-            }
-        },
-        "text-table": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-            "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-            "dev": true
-        },
-        "tmp": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-            "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-            "dev": true,
-            "requires": {
-                "rimraf": "^3.0.0"
-            }
-        },
-        "to-regex-range": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-            "dev": true,
-            "requires": {
-                "is-number": "^7.0.0"
-            }
-        },
-        "traverse": {
-            "version": "0.3.9",
-            "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
-            "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
-            "dev": true
-        },
-        "tslib": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-            "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-            "dev": true
-        },
-        "tsutils": {
-            "version": "3.21.0",
-            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-            "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-            "dev": true,
-            "requires": {
-                "tslib": "^1.8.1"
-            }
-        },
-        "tunnel": {
-            "version": "0.0.6",
-            "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
-            "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
-            "dev": true
-        },
-        "tunnel-agent": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-            "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-            "dev": true,
-            "requires": {
-                "safe-buffer": "^5.0.1"
-            }
-        },
-        "type-check": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-            "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-            "dev": true,
-            "requires": {
-                "prelude-ls": "^1.2.1"
-            }
-        },
-        "type-fest": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-            "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-            "dev": true
-        },
-        "typed-rest-client": {
-            "version": "1.8.6",
-            "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.6.tgz",
-            "integrity": "sha512-xcQpTEAJw2DP7GqVNECh4dD+riS+C1qndXLfBCJ3xk0kqprtGN491P5KlmrDbKdtuW8NEcP/5ChxiJI3S9WYTA==",
-            "dev": true,
-            "requires": {
-                "qs": "^6.9.1",
-                "tunnel": "0.0.6",
-                "underscore": "^1.12.1"
-            }
-        },
-        "typescript": {
-            "version": "4.4.4",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
-            "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
-            "dev": true
-        },
-        "typescript-formatter": {
-            "version": "7.2.2",
-            "resolved": "https://registry.npmjs.org/typescript-formatter/-/typescript-formatter-7.2.2.tgz",
-            "integrity": "sha512-V7vfI9XArVhriOTYHPzMU2WUnm5IMdu9X/CPxs8mIMGxmTBFpDABlbkBka64PZJ9/xgQeRpK8KzzAG4MPzxBDQ==",
-            "dev": true,
-            "requires": {
-                "commandpost": "^1.0.0",
-                "editorconfig": "^0.15.0"
-            }
-        },
-        "uc.micro": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-            "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
-            "dev": true
-        },
-        "underscore": {
-            "version": "1.13.1",
-            "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-            "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
-            "dev": true
-        },
-        "unzipper": {
-            "version": "0.10.11",
-            "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz",
-            "integrity": "sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==",
-            "dev": true,
-            "requires": {
-                "big-integer": "^1.6.17",
-                "binary": "~0.3.0",
-                "bluebird": "~3.4.1",
-                "buffer-indexof-polyfill": "~1.0.0",
-                "duplexer2": "~0.1.4",
-                "fstream": "^1.0.12",
-                "graceful-fs": "^4.2.2",
-                "listenercount": "~1.0.1",
-                "readable-stream": "~2.3.6",
-                "setimmediate": "~1.0.4"
-            }
-        },
-        "uri-js": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-            "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-            "dev": true,
-            "requires": {
-                "punycode": "^2.1.0"
-            }
-        },
-        "url-join": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
-            "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==",
-            "dev": true
-        },
-        "util-deprecate": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-            "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-            "dev": true
-        },
-        "v8-compile-cache": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-            "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-            "dev": true
-        },
-        "vsce": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/vsce/-/vsce-2.5.1.tgz",
-            "integrity": "sha512-vJ+xY93Wv3NhgeriMyIC2oMA+niifOI9XGIqEToIq/rFRoQnXlmO4PSyis/OxBl9hw8OKKC/VcI9CijfFufEkw==",
-            "dev": true,
-            "requires": {
-                "azure-devops-node-api": "^11.0.1",
-                "chalk": "^2.4.2",
-                "cheerio": "^1.0.0-rc.9",
-                "commander": "^6.1.0",
-                "glob": "^7.0.6",
-                "hosted-git-info": "^4.0.2",
-                "keytar": "^7.7.0",
-                "leven": "^3.1.0",
-                "markdown-it": "^10.0.0",
-                "mime": "^1.3.4",
-                "minimatch": "^3.0.3",
-                "parse-semver": "^1.1.1",
-                "read": "^1.0.7",
-                "semver": "^5.1.0",
-                "tmp": "^0.2.1",
-                "typed-rest-client": "^1.8.4",
-                "url-join": "^4.0.1",
-                "xml2js": "^0.4.23",
-                "yauzl": "^2.3.1",
-                "yazl": "^2.2.2"
-            },
-            "dependencies": {
-                "chalk": {
-                    "version": "2.4.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-                    "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^3.2.1",
-                        "escape-string-regexp": "^1.0.5",
-                        "supports-color": "^5.3.0"
-                    }
-                },
-                "commander": {
-                    "version": "6.2.1",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-                    "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "1.0.5",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-                    "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-                    "dev": true
-                },
-                "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-                    "dev": true
-                }
-            }
-        },
-        "vscode-jsonrpc": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz",
-            "integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="
-        },
-        "vscode-languageclient": {
-            "version": "6.1.4",
-            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.4.tgz",
-            "integrity": "sha512-EUOU+bJu6axmt0RFNo3nrglQLPXMfanbYViJee3Fbn2VuQoX0ZOI4uTYhSRvYLP2vfwTP/juV62P/mksCdTZMA==",
-            "requires": {
-                "semver": "^6.3.0",
-                "vscode-languageserver-protocol": "3.15.3"
-            }
-        },
-        "vscode-languageserver-protocol": {
-            "version": "3.15.3",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz",
-            "integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==",
-            "requires": {
-                "vscode-jsonrpc": "^5.0.1",
-                "vscode-languageserver-types": "3.15.1"
-            }
-        },
-        "vscode-languageserver-types": {
-            "version": "3.15.1",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
-            "integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="
-        },
-        "vscode-test": {
-            "version": "1.6.1",
-            "resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-1.6.1.tgz",
-            "integrity": "sha512-086q88T2ca1k95mUzffvbzb7esqQNvJgiwY4h29ukPhFo8u+vXOOmelUoU5EQUHs3Of8+JuQ3oGdbVCqaxuTXA==",
-            "dev": true,
-            "requires": {
-                "http-proxy-agent": "^4.0.1",
-                "https-proxy-agent": "^5.0.0",
-                "rimraf": "^3.0.2",
-                "unzipper": "^0.10.11"
-            }
-        },
-        "which": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-            "dev": true,
-            "requires": {
-                "isexe": "^2.0.0"
-            }
-        },
-        "wide-align": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-            "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-            "dev": true,
-            "requires": {
-                "string-width": "^1.0.2 || 2 || 3 || 4"
-            }
-        },
-        "word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-            "dev": true
-        },
-        "workerpool": {
-            "version": "6.1.5",
-            "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
-            "integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
-            "dev": true
-        },
-        "wrap-ansi": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-            "dev": true,
-            "requires": {
-                "ansi-styles": "^4.0.0",
-                "string-width": "^4.1.0",
-                "strip-ansi": "^6.0.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                }
-            }
-        },
-        "wrappy": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-            "dev": true
-        },
-        "xml2js": {
-            "version": "0.4.23",
-            "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-            "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
-            "dev": true,
-            "requires": {
-                "sax": ">=0.6.0",
-                "xmlbuilder": "~11.0.0"
-            }
-        },
-        "xmlbuilder": {
-            "version": "11.0.1",
-            "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-            "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
-            "dev": true
-        },
-        "y18n": {
-            "version": "5.0.8",
-            "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-            "dev": true
-        },
-        "yallist": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-            "dev": true
-        },
-        "yargs": {
-            "version": "16.2.0",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-            "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-            "dev": true,
-            "requires": {
-                "cliui": "^7.0.2",
-                "escalade": "^3.1.1",
-                "get-caller-file": "^2.0.5",
-                "require-directory": "^2.1.1",
-                "string-width": "^4.2.0",
-                "y18n": "^5.0.5",
-                "yargs-parser": "^20.2.2"
-            }
-        },
-        "yargs-parser": {
-            "version": "20.2.4",
-            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-            "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
-            "dev": true
-        },
-        "yargs-unparser": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
-            "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
-            "dev": true,
-            "requires": {
-                "camelcase": "^6.0.0",
-                "decamelize": "^4.0.0",
-                "flat": "^5.0.2",
-                "is-plain-obj": "^2.1.0"
-            }
-        },
-        "yauzl": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-            "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
-            "dev": true,
-            "requires": {
-                "buffer-crc32": "~0.2.3",
-                "fd-slicer": "~1.1.0"
-            }
-        },
-        "yazl": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
-            "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
-            "dev": true,
-            "requires": {
-                "buffer-crc32": "~0.2.3"
-            }
-        },
-        "yocto-queue": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-            "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-            "dev": true
-        }
-    }
+	"name": "move-analyzer",
+	"version": "0.0.10",
+	"lockfileVersion": 2,
+	"requires": true,
+	"packages": {
+		"": {
+			"name": "move-analyzer",
+			"version": "0.0.10",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"command-exists": "^1.2.9",
+				"lru-cache": "^4.1.3",
+				"vscode-languageclient": "6.1.4"
+			},
+			"devDependencies": {
+				"@types/command-exists": "^1.2.0",
+				"@types/fs-extra": "^9.0.13",
+				"@types/glob": "^7.1.4",
+				"@types/mocha": "^9.0.0",
+				"@types/node": "^14.17.22",
+				"@types/vscode": "^1.58.2",
+				"@typescript-eslint/eslint-plugin": "^4.33.0",
+				"@typescript-eslint/parser": "^4.33.0",
+				"@vscode/test-electron": "^2.0.0",
+				"copyfiles": "2.4.1",
+				"cross-env": "^7.0.3",
+				"eslint": "^7.32.0",
+				"eslint-plugin-tsdoc": "^0.2.14",
+				"fs-extra": "10.0.1",
+				"glob": "^7.1.7",
+				"mocha": "^9.1.1",
+				"typescript": "^4.4.4",
+				"typescript-formatter": "^7.2.2",
+				"vsce": "^2.5.1",
+				"vscode-test": "^1.6.1"
+			},
+			"engines": {
+				"vscode": "^1.58.2"
+			}
+		},
+		"node_modules/@babel/code-frame": {
+			"version": "7.12.11",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+			"integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/highlight": "^7.10.4"
+			}
+		},
+		"node_modules/@babel/helper-validator-identifier": {
+			"version": "7.15.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
+			"integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/highlight": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+			"integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-validator-identifier": "^7.14.5",
+				"chalk": "^2.0.0",
+				"js-tokens": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/chalk": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/@eslint/eslintrc": {
+			"version": "0.4.3",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+			"integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+			"dev": true,
+			"dependencies": {
+				"ajv": "^6.12.4",
+				"debug": "^4.1.1",
+				"espree": "^7.3.0",
+				"globals": "^13.9.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.2.1",
+				"js-yaml": "^3.13.1",
+				"minimatch": "^3.0.4",
+				"strip-json-comments": "^3.1.1"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/@eslint/eslintrc/node_modules/ignore": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+			"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/@humanwhocodes/config-array": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+			"integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+			"dev": true,
+			"dependencies": {
+				"@humanwhocodes/object-schema": "^1.2.0",
+				"debug": "^4.1.1",
+				"minimatch": "^3.0.4"
+			},
+			"engines": {
+				"node": ">=10.10.0"
+			}
+		},
+		"node_modules/@humanwhocodes/object-schema": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
+			"integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
+			"dev": true
+		},
+		"node_modules/@microsoft/tsdoc": {
+			"version": "0.13.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.13.2.tgz",
+			"integrity": "sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==",
+			"dev": true
+		},
+		"node_modules/@microsoft/tsdoc-config": {
+			"version": "0.15.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.15.2.tgz",
+			"integrity": "sha512-mK19b2wJHSdNf8znXSMYVShAHktVr/ib0Ck2FA3lsVBSEhSI/TfXT7DJQkAYgcztTuwazGcg58ZjYdk0hTCVrA==",
+			"dev": true,
+			"dependencies": {
+				"@microsoft/tsdoc": "0.13.2",
+				"ajv": "~6.12.6",
+				"jju": "~1.4.0",
+				"resolve": "~1.19.0"
+			}
+		},
+		"node_modules/@nodelib/fs.scandir": {
+			"version": "2.1.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+			"dev": true,
+			"dependencies": {
+				"@nodelib/fs.stat": "2.0.5",
+				"run-parallel": "^1.1.9"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@nodelib/fs.stat": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@nodelib/fs.walk": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+			"dev": true,
+			"dependencies": {
+				"@nodelib/fs.scandir": "2.1.5",
+				"fastq": "^1.6.0"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@tootallnate/once": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+			"integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/@types/command-exists": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@types/command-exists/-/command-exists-1.2.0.tgz",
+			"integrity": "sha512-ugsxEJfsCuqMLSuCD4PIJkp5Uk2z6TCMRCgYVuhRo5cYQY3+1xXTQkSlPtkpGHuvWMjS2KTeVQXxkXRACMbM6A==",
+			"dev": true
+		},
+		"node_modules/@types/fs-extra": {
+			"version": "9.0.13",
+			"resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
+			"integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/glob": {
+			"version": "7.1.4",
+			"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz",
+			"integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==",
+			"dev": true,
+			"dependencies": {
+				"@types/minimatch": "*",
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/json-schema": {
+			"version": "7.0.9",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+			"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+			"dev": true
+		},
+		"node_modules/@types/minimatch": {
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
+			"integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
+			"dev": true
+		},
+		"node_modules/@types/mocha": {
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.0.0.tgz",
+			"integrity": "sha512-scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA==",
+			"dev": true
+		},
+		"node_modules/@types/node": {
+			"version": "14.17.27",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.27.tgz",
+			"integrity": "sha512-94+Ahf9IcaDuJTle/2b+wzvjmutxXAEXU6O81JHblYXUg2BDG+dnBy7VxIPHKAyEEDHzCMQydTJuWvrE+Aanzw==",
+			"dev": true
+		},
+		"node_modules/@types/vscode": {
+			"version": "1.61.0",
+			"resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.61.0.tgz",
+			"integrity": "sha512-9k5Nwq45hkRwdfCFY+eKXeQQSbPoA114mF7U/4uJXRBJeGIO7MuJdhF1PnaDN+lllL9iKGQtd6FFXShBXMNaFg==",
+			"dev": true
+		},
+		"node_modules/@typescript-eslint/eslint-plugin": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz",
+			"integrity": "sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/experimental-utils": "4.33.0",
+				"@typescript-eslint/scope-manager": "4.33.0",
+				"debug": "^4.3.1",
+				"functional-red-black-tree": "^1.0.1",
+				"ignore": "^5.1.8",
+				"regexpp": "^3.1.0",
+				"semver": "^7.3.5",
+				"tsutils": "^3.21.0"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"@typescript-eslint/parser": "^4.0.0",
+				"eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"dev": true,
+			"dependencies": {
+				"yallist": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
+			"version": "7.3.5",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+			"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+			"dev": true,
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+			"dev": true
+		},
+		"node_modules/@typescript-eslint/experimental-utils": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz",
+			"integrity": "sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.7",
+				"@typescript-eslint/scope-manager": "4.33.0",
+				"@typescript-eslint/types": "4.33.0",
+				"@typescript-eslint/typescript-estree": "4.33.0",
+				"eslint-scope": "^5.1.1",
+				"eslint-utils": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "*"
+			}
+		},
+		"node_modules/@typescript-eslint/parser": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz",
+			"integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/scope-manager": "4.33.0",
+				"@typescript-eslint/types": "4.33.0",
+				"@typescript-eslint/typescript-estree": "4.33.0",
+				"debug": "^4.3.1"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/scope-manager": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz",
+			"integrity": "sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "4.33.0",
+				"@typescript-eslint/visitor-keys": "4.33.0"
+			},
+			"engines": {
+				"node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@typescript-eslint/types": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz",
+			"integrity": "sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==",
+			"dev": true,
+			"engines": {
+				"node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@typescript-eslint/typescript-estree": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz",
+			"integrity": "sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "4.33.0",
+				"@typescript-eslint/visitor-keys": "4.33.0",
+				"debug": "^4.3.1",
+				"globby": "^11.0.3",
+				"is-glob": "^4.0.1",
+				"semver": "^7.3.5",
+				"tsutils": "^3.21.0"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"dev": true,
+			"dependencies": {
+				"yallist": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
+			"version": "7.3.5",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+			"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+			"dev": true,
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+			"dev": true
+		},
+		"node_modules/@typescript-eslint/visitor-keys": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz",
+			"integrity": "sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "4.33.0",
+				"eslint-visitor-keys": "^2.0.0"
+			},
+			"engines": {
+				"node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@ungap/promise-all-settled": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
+			"integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
+			"dev": true
+		},
+		"node_modules/@vscode/test-electron": {
+			"version": "2.1.5",
+			"resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.1.5.tgz",
+			"integrity": "sha512-O/ioqFpV+RvKbRykX2ItYPnbcZ4Hk5V0rY4uhQjQTLhGL9WZUvS7exzuYQCCI+ilSqJpctvxq2llTfGXf9UnnA==",
+			"dev": true,
+			"dependencies": {
+				"http-proxy-agent": "^4.0.1",
+				"https-proxy-agent": "^5.0.0",
+				"rimraf": "^3.0.2",
+				"unzipper": "^0.10.11"
+			},
+			"engines": {
+				"node": ">=8.9.3"
+			}
+		},
+		"node_modules/acorn": {
+			"version": "7.4.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+			"dev": true,
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/acorn-jsx": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+			"dev": true,
+			"peerDependencies": {
+				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+			}
+		},
+		"node_modules/agent-base": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+			"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+			"dev": true,
+			"dependencies": {
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 6.0.0"
+			}
+		},
+		"node_modules/ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/ansi-colors": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/ansi-styles": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^1.9.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/anymatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+			"integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+			"dev": true,
+			"dependencies": {
+				"normalize-path": "^3.0.0",
+				"picomatch": "^2.0.4"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/aproba": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+			"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+			"dev": true
+		},
+		"node_modules/are-we-there-yet": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
+			"integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
+			"dev": true,
+			"dependencies": {
+				"delegates": "^1.0.0",
+				"readable-stream": "^2.0.6"
+			}
+		},
+		"node_modules/argparse": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+			"dev": true,
+			"dependencies": {
+				"sprintf-js": "~1.0.2"
+			}
+		},
+		"node_modules/array-union": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/astral-regex": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+			"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/azure-devops-node-api": {
+			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.1.0.tgz",
+			"integrity": "sha512-6/2YZuf+lJzJLrjXNYEA5RXAkMCb8j/4VcHD0qJQRsgG/KsRMYo0HgDh0by1FGHyZkQWY5LmQyJqCwRVUB3Y7Q==",
+			"dev": true,
+			"dependencies": {
+				"tunnel": "0.0.6",
+				"typed-rest-client": "^1.8.4"
+			}
+		},
+		"node_modules/balanced-match": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+			"dev": true
+		},
+		"node_modules/base64-js": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+			"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
+		},
+		"node_modules/big-integer": {
+			"version": "1.6.50",
+			"resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.50.tgz",
+			"integrity": "sha512-+O2uoQWFRo8ysZNo/rjtri2jIwjr3XfeAgRjAUADRqGG+ZITvyn8J1kvXLTaKVr3hhGXk+f23tKfdzmklVM9vQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.6"
+			}
+		},
+		"node_modules/binary": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+			"integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
+			"dev": true,
+			"dependencies": {
+				"buffers": "~0.1.1",
+				"chainsaw": "~0.1.0"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/binary-extensions": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/bl": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+			"integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+			"dev": true,
+			"dependencies": {
+				"buffer": "^5.5.0",
+				"inherits": "^2.0.4",
+				"readable-stream": "^3.4.0"
+			}
+		},
+		"node_modules/bl/node_modules/readable-stream": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+			"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+			"dev": true,
+			"dependencies": {
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/bluebird": {
+			"version": "3.4.7",
+			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
+			"integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=",
+			"dev": true
+		},
+		"node_modules/boolbase": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+			"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+			"dev": true
+		},
+		"node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
+			"dependencies": {
+				"fill-range": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/browser-stdout": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+			"integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+			"dev": true
+		},
+		"node_modules/buffer": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+			"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"dependencies": {
+				"base64-js": "^1.3.1",
+				"ieee754": "^1.1.13"
+			}
+		},
+		"node_modules/buffer-crc32": {
+			"version": "0.2.13",
+			"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+			"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+			"dev": true,
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/buffer-indexof-polyfill": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",
+			"integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/buffers": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+			"integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.2.0"
+			}
+		},
+		"node_modules/call-bind": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+			"dev": true,
+			"dependencies": {
+				"function-bind": "^1.1.1",
+				"get-intrinsic": "^1.0.2"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/callsites": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/camelcase": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+			"integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/chainsaw": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+			"integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
+			"dev": true,
+			"dependencies": {
+				"traverse": ">=0.3.0 <0.4"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/chalk/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/chalk/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/chalk/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/chalk/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/chalk/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/cheerio": {
+			"version": "1.0.0-rc.10",
+			"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz",
+			"integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==",
+			"dev": true,
+			"dependencies": {
+				"cheerio-select": "^1.5.0",
+				"dom-serializer": "^1.3.2",
+				"domhandler": "^4.2.0",
+				"htmlparser2": "^6.1.0",
+				"parse5": "^6.0.1",
+				"parse5-htmlparser2-tree-adapter": "^6.0.1",
+				"tslib": "^2.2.0"
+			},
+			"engines": {
+				"node": ">= 6"
+			},
+			"funding": {
+				"url": "https://github.com/cheeriojs/cheerio?sponsor=1"
+			}
+		},
+		"node_modules/cheerio-select": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz",
+			"integrity": "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==",
+			"dev": true,
+			"dependencies": {
+				"css-select": "^4.1.3",
+				"css-what": "^5.0.1",
+				"domelementtype": "^2.2.0",
+				"domhandler": "^4.2.0",
+				"domutils": "^2.7.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
+			}
+		},
+		"node_modules/cheerio/node_modules/tslib": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+			"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+			"dev": true
+		},
+		"node_modules/chokidar": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+			"integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+			"dev": true,
+			"dependencies": {
+				"anymatch": "~3.1.2",
+				"braces": "~3.0.2",
+				"glob-parent": "~5.1.2",
+				"is-binary-path": "~2.1.0",
+				"is-glob": "~4.0.1",
+				"normalize-path": "~3.0.0",
+				"readdirp": "~3.6.0"
+			},
+			"engines": {
+				"node": ">= 8.10.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "~2.3.2"
+			}
+		},
+		"node_modules/chownr": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+			"integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+			"dev": true
+		},
+		"node_modules/cliui": {
+			"version": "7.0.4",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+			"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+			"dev": true,
+			"dependencies": {
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.0",
+				"wrap-ansi": "^7.0.0"
+			}
+		},
+		"node_modules/code-point-at": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/color-convert": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "1.1.3"
+			}
+		},
+		"node_modules/color-name": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+			"dev": true
+		},
+		"node_modules/command-exists": {
+			"version": "1.2.9",
+			"resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
+			"integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="
+		},
+		"node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"dev": true
+		},
+		"node_modules/commandpost": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/commandpost/-/commandpost-1.4.0.tgz",
+			"integrity": "sha512-aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ==",
+			"dev": true
+		},
+		"node_modules/concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+			"dev": true
+		},
+		"node_modules/console-control-strings": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+			"dev": true
+		},
+		"node_modules/copyfiles": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/copyfiles/-/copyfiles-2.4.1.tgz",
+			"integrity": "sha512-fereAvAvxDrQDOXybk3Qu3dPbOoKoysFMWtkY3mv5BsL8//OSZVL5DCLYqgRfY5cWirgRzlC+WSrxp6Bo3eNZg==",
+			"dev": true,
+			"dependencies": {
+				"glob": "^7.0.5",
+				"minimatch": "^3.0.3",
+				"mkdirp": "^1.0.4",
+				"noms": "0.0.0",
+				"through2": "^2.0.1",
+				"untildify": "^4.0.0",
+				"yargs": "^16.1.0"
+			},
+			"bin": {
+				"copyfiles": "copyfiles",
+				"copyup": "copyfiles"
+			}
+		},
+		"node_modules/copyfiles/node_modules/mkdirp": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+			"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+			"dev": true,
+			"bin": {
+				"mkdirp": "bin/cmd.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/core-util-is": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+			"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+			"dev": true
+		},
+		"node_modules/cross-env": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+			"integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+			"dev": true,
+			"dependencies": {
+				"cross-spawn": "^7.0.1"
+			},
+			"bin": {
+				"cross-env": "src/bin/cross-env.js",
+				"cross-env-shell": "src/bin/cross-env-shell.js"
+			},
+			"engines": {
+				"node": ">=10.14",
+				"npm": ">=6",
+				"yarn": ">=1"
+			}
+		},
+		"node_modules/cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dev": true,
+			"dependencies": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/css-select": {
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
+			"integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
+			"dev": true,
+			"dependencies": {
+				"boolbase": "^1.0.0",
+				"css-what": "^5.0.0",
+				"domhandler": "^4.2.0",
+				"domutils": "^2.6.0",
+				"nth-check": "^2.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
+			}
+		},
+		"node_modules/css-what": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
+			"integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
+			}
+		},
+		"node_modules/debug": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+			"integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+			"dev": true,
+			"dependencies": {
+				"ms": "2.1.2"
+			},
+			"engines": {
+				"node": ">=6.0"
+			},
+			"peerDependenciesMeta": {
+				"supports-color": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/decamelize": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+			"integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/decompress-response": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+			"integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+			"dev": true,
+			"dependencies": {
+				"mimic-response": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/deep-extend": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+			"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/deep-is": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+			"dev": true
+		},
+		"node_modules/delegates": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+			"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+			"dev": true
+		},
+		"node_modules/detect-libc": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+			"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+			"dev": true,
+			"bin": {
+				"detect-libc": "bin/detect-libc.js"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/diff": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+			"integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.3.1"
+			}
+		},
+		"node_modules/dir-glob": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+			"dev": true,
+			"dependencies": {
+				"path-type": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/doctrine": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+			"dev": true,
+			"dependencies": {
+				"esutils": "^2.0.2"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/dom-serializer": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
+			"integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
+			"dev": true,
+			"dependencies": {
+				"domelementtype": "^2.0.1",
+				"domhandler": "^4.2.0",
+				"entities": "^2.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+			}
+		},
+		"node_modules/domelementtype": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
+			"integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fb55"
+				}
+			]
+		},
+		"node_modules/domhandler": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz",
+			"integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==",
+			"dev": true,
+			"dependencies": {
+				"domelementtype": "^2.2.0"
+			},
+			"engines": {
+				"node": ">= 4"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domhandler?sponsor=1"
+			}
+		},
+		"node_modules/domutils": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+			"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+			"dev": true,
+			"dependencies": {
+				"dom-serializer": "^1.0.1",
+				"domelementtype": "^2.2.0",
+				"domhandler": "^4.2.0"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domutils?sponsor=1"
+			}
+		},
+		"node_modules/duplexer2": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+			"integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
+			"dev": true,
+			"dependencies": {
+				"readable-stream": "^2.0.2"
+			}
+		},
+		"node_modules/editorconfig": {
+			"version": "0.15.3",
+			"resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz",
+			"integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==",
+			"dev": true,
+			"dependencies": {
+				"commander": "^2.19.0",
+				"lru-cache": "^4.1.5",
+				"semver": "^5.6.0",
+				"sigmund": "^1.0.1"
+			},
+			"bin": {
+				"editorconfig": "bin/editorconfig"
+			}
+		},
+		"node_modules/editorconfig/node_modules/semver": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"dev": true
+		},
+		"node_modules/end-of-stream": {
+			"version": "1.4.4",
+			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+			"dev": true,
+			"dependencies": {
+				"once": "^1.4.0"
+			}
+		},
+		"node_modules/enquirer": {
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+			"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+			"dev": true,
+			"dependencies": {
+				"ansi-colors": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=8.6"
+			}
+		},
+		"node_modules/entities": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+			"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+			"dev": true,
+			"funding": {
+				"url": "https://github.com/fb55/entities?sponsor=1"
+			}
+		},
+		"node_modules/escalade": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint": {
+			"version": "7.32.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+			"integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "7.12.11",
+				"@eslint/eslintrc": "^0.4.3",
+				"@humanwhocodes/config-array": "^0.5.0",
+				"ajv": "^6.10.0",
+				"chalk": "^4.0.0",
+				"cross-spawn": "^7.0.2",
+				"debug": "^4.0.1",
+				"doctrine": "^3.0.0",
+				"enquirer": "^2.3.5",
+				"escape-string-regexp": "^4.0.0",
+				"eslint-scope": "^5.1.1",
+				"eslint-utils": "^2.1.0",
+				"eslint-visitor-keys": "^2.0.0",
+				"espree": "^7.3.1",
+				"esquery": "^1.4.0",
+				"esutils": "^2.0.2",
+				"fast-deep-equal": "^3.1.3",
+				"file-entry-cache": "^6.0.1",
+				"functional-red-black-tree": "^1.0.1",
+				"glob-parent": "^5.1.2",
+				"globals": "^13.6.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.0.0",
+				"imurmurhash": "^0.1.4",
+				"is-glob": "^4.0.0",
+				"js-yaml": "^3.13.1",
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"levn": "^0.4.1",
+				"lodash.merge": "^4.6.2",
+				"minimatch": "^3.0.4",
+				"natural-compare": "^1.4.0",
+				"optionator": "^0.9.1",
+				"progress": "^2.0.0",
+				"regexpp": "^3.1.0",
+				"semver": "^7.2.1",
+				"strip-ansi": "^6.0.0",
+				"strip-json-comments": "^3.1.0",
+				"table": "^6.0.9",
+				"text-table": "^0.2.0",
+				"v8-compile-cache": "^2.0.3"
+			},
+			"bin": {
+				"eslint": "bin/eslint.js"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/eslint-plugin-tsdoc": {
+			"version": "0.2.14",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-tsdoc/-/eslint-plugin-tsdoc-0.2.14.tgz",
+			"integrity": "sha512-fJ3fnZRsdIoBZgzkQjv8vAj6NeeOoFkTfgosj6mKsFjX70QV256sA/wq+y/R2+OL4L8E79VVaVWrPeZnKNe8Ng==",
+			"dev": true,
+			"dependencies": {
+				"@microsoft/tsdoc": "0.13.2",
+				"@microsoft/tsdoc-config": "0.15.2"
+			}
+		},
+		"node_modules/eslint-scope": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+			"dev": true,
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/eslint-utils": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+			"dev": true,
+			"dependencies": {
+				"eslint-visitor-keys": "^2.0.0"
+			},
+			"engines": {
+				"node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
+			},
+			"peerDependencies": {
+				"eslint": ">=5"
+			}
+		},
+		"node_modules/eslint-visitor-keys": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+			"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/eslint/node_modules/eslint-utils": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+			"integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+			"dev": true,
+			"dependencies": {
+				"eslint-visitor-keys": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
+			}
+		},
+		"node_modules/eslint/node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+			"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/eslint/node_modules/ignore": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+			"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/eslint/node_modules/lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"dev": true,
+			"dependencies": {
+				"yallist": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/eslint/node_modules/semver": {
+			"version": "7.3.5",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+			"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+			"dev": true,
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/eslint/node_modules/yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+			"dev": true
+		},
+		"node_modules/espree": {
+			"version": "7.3.1",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+			"integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+			"dev": true,
+			"dependencies": {
+				"acorn": "^7.4.0",
+				"acorn-jsx": "^5.3.1",
+				"eslint-visitor-keys": "^1.3.0"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/espree/node_modules/eslint-visitor-keys": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+			"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"dev": true,
+			"bin": {
+				"esparse": "bin/esparse.js",
+				"esvalidate": "bin/esvalidate.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/esquery": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+			"dev": true,
+			"dependencies": {
+				"estraverse": "^5.1.0"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/esquery/node_modules/estraverse": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+			"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esrecurse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+			"dev": true,
+			"dependencies": {
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esrecurse/node_modules/estraverse": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+			"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/estraverse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esutils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/expand-template": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+			"integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/fast-deep-equal": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+			"dev": true
+		},
+		"node_modules/fast-glob": {
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
+			"integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
+			"dev": true,
+			"dependencies": {
+				"@nodelib/fs.stat": "^2.0.2",
+				"@nodelib/fs.walk": "^1.2.3",
+				"glob-parent": "^5.1.2",
+				"merge2": "^1.3.0",
+				"micromatch": "^4.0.4"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/fast-json-stable-stringify": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+			"dev": true
+		},
+		"node_modules/fast-levenshtein": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+			"dev": true
+		},
+		"node_modules/fastq": {
+			"version": "1.13.0",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+			"integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+			"dev": true,
+			"dependencies": {
+				"reusify": "^1.0.4"
+			}
+		},
+		"node_modules/fd-slicer": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+			"integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+			"dev": true,
+			"dependencies": {
+				"pend": "~1.2.0"
+			}
+		},
+		"node_modules/file-entry-cache": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+			"dev": true,
+			"dependencies": {
+				"flat-cache": "^3.0.4"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"dev": true,
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/find-up": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+			"dev": true,
+			"dependencies": {
+				"locate-path": "^6.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/flat": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+			"dev": true,
+			"bin": {
+				"flat": "cli.js"
+			}
+		},
+		"node_modules/flat-cache": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+			"dev": true,
+			"dependencies": {
+				"flatted": "^3.1.0",
+				"rimraf": "^3.0.2"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/flatted": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
+			"integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
+			"dev": true
+		},
+		"node_modules/fs-constants": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+			"integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+			"dev": true
+		},
+		"node_modules/fs-extra": {
+			"version": "10.0.1",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
+			"integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
+			"dev": true,
+			"dependencies": {
+				"graceful-fs": "^4.2.0",
+				"jsonfile": "^6.0.1",
+				"universalify": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/fs.realpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+			"dev": true
+		},
+		"node_modules/fsevents": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+			"dev": true,
+			"hasInstallScript": true,
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+			}
+		},
+		"node_modules/fstream": {
+			"version": "1.0.12",
+			"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+			"integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+			"dev": true,
+			"dependencies": {
+				"graceful-fs": "^4.1.2",
+				"inherits": "~2.0.0",
+				"mkdirp": ">=0.5 0",
+				"rimraf": "2"
+			},
+			"engines": {
+				"node": ">=0.6"
+			}
+		},
+		"node_modules/fstream/node_modules/rimraf": {
+			"version": "2.7.1",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+			"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+			"dev": true,
+			"dependencies": {
+				"glob": "^7.1.3"
+			},
+			"bin": {
+				"rimraf": "bin.js"
+			}
+		},
+		"node_modules/function-bind": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+			"dev": true
+		},
+		"node_modules/functional-red-black-tree": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+			"dev": true
+		},
+		"node_modules/gauge": {
+			"version": "2.7.4",
+			"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+			"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+			"dev": true,
+			"dependencies": {
+				"aproba": "^1.0.3",
+				"console-control-strings": "^1.0.0",
+				"has-unicode": "^2.0.0",
+				"object-assign": "^4.1.0",
+				"signal-exit": "^3.0.0",
+				"string-width": "^1.0.1",
+				"strip-ansi": "^3.0.1",
+				"wide-align": "^1.1.0"
+			}
+		},
+		"node_modules/gauge/node_modules/ansi-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/gauge/node_modules/is-fullwidth-code-point": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+			"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+			"dev": true,
+			"dependencies": {
+				"number-is-nan": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/gauge/node_modules/string-width": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+			"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+			"dev": true,
+			"dependencies": {
+				"code-point-at": "^1.0.0",
+				"is-fullwidth-code-point": "^1.0.0",
+				"strip-ansi": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/gauge/node_modules/strip-ansi": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+			"dev": true,
+			"dependencies": {
+				"ansi-regex": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/get-caller-file": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+			"dev": true,
+			"engines": {
+				"node": "6.* || 8.* || >= 10.*"
+			}
+		},
+		"node_modules/get-intrinsic": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+			"integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+			"dev": true,
+			"dependencies": {
+				"function-bind": "^1.1.1",
+				"has": "^1.0.3",
+				"has-symbols": "^1.0.1"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/github-from-package": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+			"integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=",
+			"dev": true
+		},
+		"node_modules/glob": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+			"integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+			"dev": true,
+			"dependencies": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			},
+			"engines": {
+				"node": "*"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/glob-parent": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+			"dev": true,
+			"dependencies": {
+				"is-glob": "^4.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/globals": {
+			"version": "13.11.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
+			"integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
+			"dev": true,
+			"dependencies": {
+				"type-fest": "^0.20.2"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/globby": {
+			"version": "11.0.4",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
+			"integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+			"dev": true,
+			"dependencies": {
+				"array-union": "^2.1.0",
+				"dir-glob": "^3.0.1",
+				"fast-glob": "^3.1.1",
+				"ignore": "^5.1.4",
+				"merge2": "^1.3.0",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/graceful-fs": {
+			"version": "4.2.8",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+			"integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
+			"dev": true
+		},
+		"node_modules/growl": {
+			"version": "1.10.5",
+			"resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+			"integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.x"
+			}
+		},
+		"node_modules/has": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+			"dev": true,
+			"dependencies": {
+				"function-bind": "^1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.4.0"
+			}
+		},
+		"node_modules/has-flag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/has-symbols": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+			"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/has-unicode": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+			"dev": true
+		},
+		"node_modules/he": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+			"dev": true,
+			"bin": {
+				"he": "bin/he"
+			}
+		},
+		"node_modules/hosted-git-info": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
+			"integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+			"dev": true,
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/hosted-git-info/node_modules/lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"dev": true,
+			"dependencies": {
+				"yallist": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/hosted-git-info/node_modules/yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+			"dev": true
+		},
+		"node_modules/htmlparser2": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+			"integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+			"dev": true,
+			"funding": [
+				"https://github.com/fb55/htmlparser2?sponsor=1",
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fb55"
+				}
+			],
+			"dependencies": {
+				"domelementtype": "^2.0.1",
+				"domhandler": "^4.0.0",
+				"domutils": "^2.5.2",
+				"entities": "^2.0.0"
+			}
+		},
+		"node_modules/http-proxy-agent": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+			"integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+			"dev": true,
+			"dependencies": {
+				"@tootallnate/once": "1",
+				"agent-base": "6",
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/https-proxy-agent": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+			"integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+			"dev": true,
+			"dependencies": {
+				"agent-base": "6",
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/ieee754": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+			"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
+		},
+		"node_modules/ignore": {
+			"version": "5.1.8",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+			"integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/import-fresh": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+			"dev": true,
+			"dependencies": {
+				"parent-module": "^1.0.0",
+				"resolve-from": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.19"
+			}
+		},
+		"node_modules/inflight": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+			"dev": true,
+			"dependencies": {
+				"once": "^1.3.0",
+				"wrappy": "1"
+			}
+		},
+		"node_modules/inherits": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+			"dev": true
+		},
+		"node_modules/ini": {
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+			"dev": true
+		},
+		"node_modules/is-binary-path": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+			"dev": true,
+			"dependencies": {
+				"binary-extensions": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/is-core-module": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
+			"integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
+			"dev": true,
+			"dependencies": {
+				"has": "^1.0.3"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-extglob": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/is-glob": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+			"dev": true,
+			"dependencies": {
+				"is-extglob": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.12.0"
+			}
+		},
+		"node_modules/is-plain-obj": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+			"integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/is-unicode-supported": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+			"dev": true
+		},
+		"node_modules/isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+			"dev": true
+		},
+		"node_modules/jju": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
+			"integrity": "sha1-o6vicYryQaKykE+EpiWXDzia4yo=",
+			"dev": true
+		},
+		"node_modules/js-tokens": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+			"dev": true
+		},
+		"node_modules/js-yaml": {
+			"version": "3.14.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+			"dev": true,
+			"dependencies": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
+		"node_modules/json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+			"dev": true
+		},
+		"node_modules/json-stable-stringify-without-jsonify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+			"dev": true
+		},
+		"node_modules/jsonfile": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+			"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+			"dev": true,
+			"dependencies": {
+				"universalify": "^2.0.0"
+			},
+			"optionalDependencies": {
+				"graceful-fs": "^4.1.6"
+			}
+		},
+		"node_modules/keytar": {
+			"version": "7.7.0",
+			"resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz",
+			"integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==",
+			"dev": true,
+			"hasInstallScript": true,
+			"dependencies": {
+				"node-addon-api": "^3.0.0",
+				"prebuild-install": "^6.0.0"
+			}
+		},
+		"node_modules/leven": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/levn": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+			"dev": true,
+			"dependencies": {
+				"prelude-ls": "^1.2.1",
+				"type-check": "~0.4.0"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/linkify-it": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
+			"integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
+			"dev": true,
+			"dependencies": {
+				"uc.micro": "^1.0.1"
+			}
+		},
+		"node_modules/listenercount": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
+			"integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=",
+			"dev": true
+		},
+		"node_modules/locate-path": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+			"dev": true,
+			"dependencies": {
+				"p-locate": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/lodash.clonedeep": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+			"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+			"dev": true
+		},
+		"node_modules/lodash.merge": {
+			"version": "4.6.2",
+			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+			"dev": true
+		},
+		"node_modules/lodash.truncate": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+			"integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+			"dev": true
+		},
+		"node_modules/log-symbols": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+			"integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^4.1.0",
+				"is-unicode-supported": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/lru-cache": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+			"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+			"dependencies": {
+				"pseudomap": "^1.0.2",
+				"yallist": "^2.1.2"
+			}
+		},
+		"node_modules/markdown-it": {
+			"version": "10.0.0",
+			"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
+			"integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
+			"dev": true,
+			"dependencies": {
+				"argparse": "^1.0.7",
+				"entities": "~2.0.0",
+				"linkify-it": "^2.0.0",
+				"mdurl": "^1.0.1",
+				"uc.micro": "^1.0.5"
+			},
+			"bin": {
+				"markdown-it": "bin/markdown-it.js"
+			}
+		},
+		"node_modules/markdown-it/node_modules/entities": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
+			"integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
+			"dev": true
+		},
+		"node_modules/mdurl": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+			"integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
+			"dev": true
+		},
+		"node_modules/merge2": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/micromatch": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+			"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+			"dev": true,
+			"dependencies": {
+				"braces": "^3.0.1",
+				"picomatch": "^2.2.3"
+			},
+			"engines": {
+				"node": ">=8.6"
+			}
+		},
+		"node_modules/mime": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+			"dev": true,
+			"bin": {
+				"mime": "cli.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/mimic-response": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+			"integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/minimatch": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"dev": true,
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/minimist": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+			"dev": true
+		},
+		"node_modules/mkdirp": {
+			"version": "0.5.5",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+			"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+			"dev": true,
+			"dependencies": {
+				"minimist": "^1.2.5"
+			},
+			"bin": {
+				"mkdirp": "bin/cmd.js"
+			}
+		},
+		"node_modules/mkdirp-classic": {
+			"version": "0.5.3",
+			"resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+			"integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+			"dev": true
+		},
+		"node_modules/mocha": {
+			"version": "9.1.3",
+			"resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz",
+			"integrity": "sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw==",
+			"dev": true,
+			"dependencies": {
+				"@ungap/promise-all-settled": "1.1.2",
+				"ansi-colors": "4.1.1",
+				"browser-stdout": "1.3.1",
+				"chokidar": "3.5.2",
+				"debug": "4.3.2",
+				"diff": "5.0.0",
+				"escape-string-regexp": "4.0.0",
+				"find-up": "5.0.0",
+				"glob": "7.1.7",
+				"growl": "1.10.5",
+				"he": "1.2.0",
+				"js-yaml": "4.1.0",
+				"log-symbols": "4.1.0",
+				"minimatch": "3.0.4",
+				"ms": "2.1.3",
+				"nanoid": "3.1.25",
+				"serialize-javascript": "6.0.0",
+				"strip-json-comments": "3.1.1",
+				"supports-color": "8.1.1",
+				"which": "2.0.2",
+				"workerpool": "6.1.5",
+				"yargs": "16.2.0",
+				"yargs-parser": "20.2.4",
+				"yargs-unparser": "2.0.0"
+			},
+			"bin": {
+				"_mocha": "bin/_mocha",
+				"mocha": "bin/mocha"
+			},
+			"engines": {
+				"node": ">= 12.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/mochajs"
+			}
+		},
+		"node_modules/mocha/node_modules/argparse": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+			"dev": true
+		},
+		"node_modules/mocha/node_modules/glob": {
+			"version": "7.1.7",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+			"integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+			"dev": true,
+			"dependencies": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			},
+			"engines": {
+				"node": "*"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/mocha/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/mocha/node_modules/js-yaml": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+			"dev": true,
+			"dependencies": {
+				"argparse": "^2.0.1"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
+		"node_modules/mocha/node_modules/ms": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+			"dev": true
+		},
+		"node_modules/mocha/node_modules/supports-color": {
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
+			}
+		},
+		"node_modules/ms": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+			"dev": true
+		},
+		"node_modules/mute-stream": {
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+			"integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+			"dev": true
+		},
+		"node_modules/nanoid": {
+			"version": "3.1.25",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
+			"integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==",
+			"dev": true,
+			"bin": {
+				"nanoid": "bin/nanoid.cjs"
+			},
+			"engines": {
+				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+			}
+		},
+		"node_modules/napi-build-utils": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
+			"integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
+			"dev": true
+		},
+		"node_modules/natural-compare": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+			"dev": true
+		},
+		"node_modules/node-abi": {
+			"version": "2.30.1",
+			"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz",
+			"integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==",
+			"dev": true,
+			"dependencies": {
+				"semver": "^5.4.1"
+			}
+		},
+		"node_modules/node-abi/node_modules/semver": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/node-addon-api": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+			"integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
+			"dev": true
+		},
+		"node_modules/noms": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/noms/-/noms-0.0.0.tgz",
+			"integrity": "sha512-lNDU9VJaOPxUmXcLb+HQFeUgQQPtMI24Gt6hgfuMHRJgMRHMF/qZ4HJD3GDru4sSw9IQl2jPjAYnQrdIeLbwow==",
+			"dev": true,
+			"dependencies": {
+				"inherits": "^2.0.1",
+				"readable-stream": "~1.0.31"
+			}
+		},
+		"node_modules/noms/node_modules/isarray": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+			"integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+			"dev": true
+		},
+		"node_modules/noms/node_modules/readable-stream": {
+			"version": "1.0.34",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+			"integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+			"dev": true,
+			"dependencies": {
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.1",
+				"isarray": "0.0.1",
+				"string_decoder": "~0.10.x"
+			}
+		},
+		"node_modules/noms/node_modules/string_decoder": {
+			"version": "0.10.31",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+			"integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+			"dev": true
+		},
+		"node_modules/normalize-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/npmlog": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+			"dev": true,
+			"dependencies": {
+				"are-we-there-yet": "~1.1.2",
+				"console-control-strings": "~1.1.0",
+				"gauge": "~2.7.3",
+				"set-blocking": "~2.0.0"
+			}
+		},
+		"node_modules/nth-check": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
+			"integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
+			"dev": true,
+			"dependencies": {
+				"boolbase": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/nth-check?sponsor=1"
+			}
+		},
+		"node_modules/number-is-nan": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object-assign": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object-inspect": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
+			"integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==",
+			"dev": true,
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/once": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+			"dev": true,
+			"dependencies": {
+				"wrappy": "1"
+			}
+		},
+		"node_modules/optionator": {
+			"version": "0.9.1",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+			"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+			"dev": true,
+			"dependencies": {
+				"deep-is": "^0.1.3",
+				"fast-levenshtein": "^2.0.6",
+				"levn": "^0.4.1",
+				"prelude-ls": "^1.2.1",
+				"type-check": "^0.4.0",
+				"word-wrap": "^1.2.3"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/p-limit": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+			"dev": true,
+			"dependencies": {
+				"yocto-queue": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/p-locate": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+			"dev": true,
+			"dependencies": {
+				"p-limit": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/parent-module": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+			"dev": true,
+			"dependencies": {
+				"callsites": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/parse-semver": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/parse-semver/-/parse-semver-1.1.1.tgz",
+			"integrity": "sha1-mkr9bfBj3Egm+T+6SpnPIj9mbLg=",
+			"dev": true,
+			"dependencies": {
+				"semver": "^5.1.0"
+			}
+		},
+		"node_modules/parse-semver/node_modules/semver": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/parse5": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+			"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+			"dev": true
+		},
+		"node_modules/parse5-htmlparser2-tree-adapter": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
+			"integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
+			"dev": true,
+			"dependencies": {
+				"parse5": "^6.0.1"
+			}
+		},
+		"node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/path-is-absolute": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/path-parse": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+			"dev": true
+		},
+		"node_modules/path-type": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/pend": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+			"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+			"dev": true
+		},
+		"node_modules/picomatch": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+			"integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/prebuild-install": {
+			"version": "6.1.4",
+			"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz",
+			"integrity": "sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ==",
+			"dev": true,
+			"dependencies": {
+				"detect-libc": "^1.0.3",
+				"expand-template": "^2.0.3",
+				"github-from-package": "0.0.0",
+				"minimist": "^1.2.3",
+				"mkdirp-classic": "^0.5.3",
+				"napi-build-utils": "^1.0.1",
+				"node-abi": "^2.21.0",
+				"npmlog": "^4.0.1",
+				"pump": "^3.0.0",
+				"rc": "^1.2.7",
+				"simple-get": "^3.0.3",
+				"tar-fs": "^2.0.0",
+				"tunnel-agent": "^0.6.0"
+			},
+			"bin": {
+				"prebuild-install": "bin.js"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/prelude-ls": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/process-nextick-args": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+			"dev": true
+		},
+		"node_modules/progress": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/pseudomap": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+			"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+		},
+		"node_modules/pump": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+			"dev": true,
+			"dependencies": {
+				"end-of-stream": "^1.1.0",
+				"once": "^1.3.1"
+			}
+		},
+		"node_modules/punycode": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/qs": {
+			"version": "6.10.2",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.10.2.tgz",
+			"integrity": "sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw==",
+			"dev": true,
+			"dependencies": {
+				"side-channel": "^1.0.4"
+			},
+			"engines": {
+				"node": ">=0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/queue-microtask": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
+		},
+		"node_modules/randombytes": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+			"dev": true,
+			"dependencies": {
+				"safe-buffer": "^5.1.0"
+			}
+		},
+		"node_modules/rc": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+			"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+			"dev": true,
+			"dependencies": {
+				"deep-extend": "^0.6.0",
+				"ini": "~1.3.0",
+				"minimist": "^1.2.0",
+				"strip-json-comments": "~2.0.1"
+			},
+			"bin": {
+				"rc": "cli.js"
+			}
+		},
+		"node_modules/rc/node_modules/strip-json-comments": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+			"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/read": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+			"integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
+			"dev": true,
+			"dependencies": {
+				"mute-stream": "~0.0.4"
+			},
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
+		"node_modules/readable-stream": {
+			"version": "2.3.7",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+			"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+			"dev": true,
+			"dependencies": {
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.3",
+				"isarray": "~1.0.0",
+				"process-nextick-args": "~2.0.0",
+				"safe-buffer": "~5.1.1",
+				"string_decoder": "~1.1.1",
+				"util-deprecate": "~1.0.1"
+			}
+		},
+		"node_modules/readdirp": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+			"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+			"dev": true,
+			"dependencies": {
+				"picomatch": "^2.2.1"
+			},
+			"engines": {
+				"node": ">=8.10.0"
+			}
+		},
+		"node_modules/regexpp": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
+			}
+		},
+		"node_modules/require-directory": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+			"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/require-from-string": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/resolve": {
+			"version": "1.19.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+			"integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+			"dev": true,
+			"dependencies": {
+				"is-core-module": "^2.1.0",
+				"path-parse": "^1.0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/resolve-from": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/reusify": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+			"dev": true,
+			"engines": {
+				"iojs": ">=1.0.0",
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/rimraf": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+			"dev": true,
+			"dependencies": {
+				"glob": "^7.1.3"
+			},
+			"bin": {
+				"rimraf": "bin.js"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/run-parallel": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"dependencies": {
+				"queue-microtask": "^1.2.2"
+			}
+		},
+		"node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"dev": true
+		},
+		"node_modules/sax": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+			"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+			"dev": true
+		},
+		"node_modules/semver": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/serialize-javascript": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+			"integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+			"dev": true,
+			"dependencies": {
+				"randombytes": "^2.1.0"
+			}
+		},
+		"node_modules/set-blocking": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+			"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+			"dev": true
+		},
+		"node_modules/setimmediate": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+			"integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+			"dev": true
+		},
+		"node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dev": true,
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/side-channel": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+			"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+			"dev": true,
+			"dependencies": {
+				"call-bind": "^1.0.0",
+				"get-intrinsic": "^1.0.2",
+				"object-inspect": "^1.9.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/sigmund": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+			"integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
+			"dev": true
+		},
+		"node_modules/signal-exit": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
+			"integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==",
+			"dev": true
+		},
+		"node_modules/simple-concat": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+			"integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
+		},
+		"node_modules/simple-get": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
+			"integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
+			"dev": true,
+			"dependencies": {
+				"decompress-response": "^4.2.0",
+				"once": "^1.3.1",
+				"simple-concat": "^1.0.0"
+			}
+		},
+		"node_modules/slash": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/slice-ansi": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+			"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.0.0",
+				"astral-regex": "^2.0.0",
+				"is-fullwidth-code-point": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/slice-ansi?sponsor=1"
+			}
+		},
+		"node_modules/slice-ansi/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/slice-ansi/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/slice-ansi/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/sprintf-js": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+			"dev": true
+		},
+		"node_modules/string_decoder": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+			"dev": true,
+			"dependencies": {
+				"safe-buffer": "~5.1.0"
+			}
+		},
+		"node_modules/string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
+			"dependencies": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
+			"dependencies": {
+				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-json-comments": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/supports-color": {
+			"version": "5.5.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/table": {
+			"version": "6.7.2",
+			"resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz",
+			"integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==",
+			"dev": true,
+			"dependencies": {
+				"ajv": "^8.0.1",
+				"lodash.clonedeep": "^4.5.0",
+				"lodash.truncate": "^4.4.2",
+				"slice-ansi": "^4.0.0",
+				"string-width": "^4.2.3",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=10.0.0"
+			}
+		},
+		"node_modules/table/node_modules/ajv": {
+			"version": "8.6.3",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
+			"integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/table/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true
+		},
+		"node_modules/tar-fs": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+			"integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+			"dev": true,
+			"dependencies": {
+				"chownr": "^1.1.1",
+				"mkdirp-classic": "^0.5.2",
+				"pump": "^3.0.0",
+				"tar-stream": "^2.1.4"
+			}
+		},
+		"node_modules/tar-stream": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+			"integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+			"dev": true,
+			"dependencies": {
+				"bl": "^4.0.3",
+				"end-of-stream": "^1.4.1",
+				"fs-constants": "^1.0.0",
+				"inherits": "^2.0.3",
+				"readable-stream": "^3.1.1"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/tar-stream/node_modules/readable-stream": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+			"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+			"dev": true,
+			"dependencies": {
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/text-table": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+			"dev": true
+		},
+		"node_modules/through2": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+			"dev": true,
+			"dependencies": {
+				"readable-stream": "~2.3.6",
+				"xtend": "~4.0.1"
+			}
+		},
+		"node_modules/tmp": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+			"integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+			"dev": true,
+			"dependencies": {
+				"rimraf": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8.17.0"
+			}
+		},
+		"node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"dev": true,
+			"dependencies": {
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
+			}
+		},
+		"node_modules/traverse": {
+			"version": "0.3.9",
+			"resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+			"integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
+			"dev": true,
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/tslib": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+			"dev": true
+		},
+		"node_modules/tsutils": {
+			"version": "3.21.0",
+			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+			"integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+			"dev": true,
+			"dependencies": {
+				"tslib": "^1.8.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			},
+			"peerDependencies": {
+				"typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+			}
+		},
+		"node_modules/tunnel": {
+			"version": "0.0.6",
+			"resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+			"integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+			}
+		},
+		"node_modules/tunnel-agent": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+			"dev": true,
+			"dependencies": {
+				"safe-buffer": "^5.0.1"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/type-check": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+			"dev": true,
+			"dependencies": {
+				"prelude-ls": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/typed-rest-client": {
+			"version": "1.8.6",
+			"resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.6.tgz",
+			"integrity": "sha512-xcQpTEAJw2DP7GqVNECh4dD+riS+C1qndXLfBCJ3xk0kqprtGN491P5KlmrDbKdtuW8NEcP/5ChxiJI3S9WYTA==",
+			"dev": true,
+			"dependencies": {
+				"qs": "^6.9.1",
+				"tunnel": "0.0.6",
+				"underscore": "^1.12.1"
+			}
+		},
+		"node_modules/typescript": {
+			"version": "4.4.4",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
+			"integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
+			"dev": true,
+			"bin": {
+				"tsc": "bin/tsc",
+				"tsserver": "bin/tsserver"
+			},
+			"engines": {
+				"node": ">=4.2.0"
+			}
+		},
+		"node_modules/typescript-formatter": {
+			"version": "7.2.2",
+			"resolved": "https://registry.npmjs.org/typescript-formatter/-/typescript-formatter-7.2.2.tgz",
+			"integrity": "sha512-V7vfI9XArVhriOTYHPzMU2WUnm5IMdu9X/CPxs8mIMGxmTBFpDABlbkBka64PZJ9/xgQeRpK8KzzAG4MPzxBDQ==",
+			"dev": true,
+			"dependencies": {
+				"commandpost": "^1.0.0",
+				"editorconfig": "^0.15.0"
+			},
+			"bin": {
+				"tsfmt": "bin/tsfmt"
+			},
+			"engines": {
+				"node": ">= 4.2.0"
+			},
+			"peerDependencies": {
+				"typescript": "^2.1.6 || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev"
+			}
+		},
+		"node_modules/uc.micro": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+			"integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+			"dev": true
+		},
+		"node_modules/underscore": {
+			"version": "1.13.1",
+			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
+			"integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
+			"dev": true
+		},
+		"node_modules/universalify": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+			"dev": true,
+			"engines": {
+				"node": ">= 10.0.0"
+			}
+		},
+		"node_modules/untildify": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+			"integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/unzipper": {
+			"version": "0.10.11",
+			"resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz",
+			"integrity": "sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==",
+			"dev": true,
+			"dependencies": {
+				"big-integer": "^1.6.17",
+				"binary": "~0.3.0",
+				"bluebird": "~3.4.1",
+				"buffer-indexof-polyfill": "~1.0.0",
+				"duplexer2": "~0.1.4",
+				"fstream": "^1.0.12",
+				"graceful-fs": "^4.2.2",
+				"listenercount": "~1.0.1",
+				"readable-stream": "~2.3.6",
+				"setimmediate": "~1.0.4"
+			}
+		},
+		"node_modules/uri-js": {
+			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+			"dev": true,
+			"dependencies": {
+				"punycode": "^2.1.0"
+			}
+		},
+		"node_modules/url-join": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
+			"integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==",
+			"dev": true
+		},
+		"node_modules/util-deprecate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+			"dev": true
+		},
+		"node_modules/v8-compile-cache": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+			"dev": true
+		},
+		"node_modules/vsce": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/vsce/-/vsce-2.5.1.tgz",
+			"integrity": "sha512-vJ+xY93Wv3NhgeriMyIC2oMA+niifOI9XGIqEToIq/rFRoQnXlmO4PSyis/OxBl9hw8OKKC/VcI9CijfFufEkw==",
+			"dev": true,
+			"dependencies": {
+				"azure-devops-node-api": "^11.0.1",
+				"chalk": "^2.4.2",
+				"cheerio": "^1.0.0-rc.9",
+				"commander": "^6.1.0",
+				"glob": "^7.0.6",
+				"hosted-git-info": "^4.0.2",
+				"keytar": "^7.7.0",
+				"leven": "^3.1.0",
+				"markdown-it": "^10.0.0",
+				"mime": "^1.3.4",
+				"minimatch": "^3.0.3",
+				"parse-semver": "^1.1.1",
+				"read": "^1.0.7",
+				"semver": "^5.1.0",
+				"tmp": "^0.2.1",
+				"typed-rest-client": "^1.8.4",
+				"url-join": "^4.0.1",
+				"xml2js": "^0.4.23",
+				"yauzl": "^2.3.1",
+				"yazl": "^2.2.2"
+			},
+			"bin": {
+				"vsce": "vsce"
+			},
+			"engines": {
+				"node": ">= 14"
+			}
+		},
+		"node_modules/vsce/node_modules/chalk": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/vsce/node_modules/commander": {
+			"version": "6.2.1",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+			"integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+			"dev": true,
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/vsce/node_modules/escape-string-regexp": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/vsce/node_modules/semver": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/vscode-jsonrpc": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz",
+			"integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==",
+			"engines": {
+				"node": ">=8.0.0 || >=10.0.0"
+			}
+		},
+		"node_modules/vscode-languageclient": {
+			"version": "6.1.4",
+			"resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.4.tgz",
+			"integrity": "sha512-EUOU+bJu6axmt0RFNo3nrglQLPXMfanbYViJee3Fbn2VuQoX0ZOI4uTYhSRvYLP2vfwTP/juV62P/mksCdTZMA==",
+			"dependencies": {
+				"semver": "^6.3.0",
+				"vscode-languageserver-protocol": "3.15.3"
+			},
+			"engines": {
+				"vscode": "^1.41.0"
+			}
+		},
+		"node_modules/vscode-languageserver-protocol": {
+			"version": "3.15.3",
+			"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz",
+			"integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==",
+			"dependencies": {
+				"vscode-jsonrpc": "^5.0.1",
+				"vscode-languageserver-types": "3.15.1"
+			}
+		},
+		"node_modules/vscode-languageserver-types": {
+			"version": "3.15.1",
+			"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
+			"integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="
+		},
+		"node_modules/vscode-test": {
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-1.6.1.tgz",
+			"integrity": "sha512-086q88T2ca1k95mUzffvbzb7esqQNvJgiwY4h29ukPhFo8u+vXOOmelUoU5EQUHs3Of8+JuQ3oGdbVCqaxuTXA==",
+			"deprecated": "This package has been renamed to @vscode/test-electron, please update to the new name",
+			"dev": true,
+			"dependencies": {
+				"http-proxy-agent": "^4.0.1",
+				"https-proxy-agent": "^5.0.0",
+				"rimraf": "^3.0.2",
+				"unzipper": "^0.10.11"
+			},
+			"engines": {
+				"node": ">=8.9.3"
+			}
+		},
+		"node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/wide-align": {
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+			"integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+			"dev": true,
+			"dependencies": {
+				"string-width": "^1.0.2 || 2 || 3 || 4"
+			}
+		},
+		"node_modules/word-wrap": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/workerpool": {
+			"version": "6.1.5",
+			"resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
+			"integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
+			"dev": true
+		},
+		"node_modules/wrap-ansi": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+			}
+		},
+		"node_modules/wrap-ansi/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/wrap-ansi/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/wrap-ansi/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/wrappy": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+			"dev": true
+		},
+		"node_modules/xml2js": {
+			"version": "0.4.23",
+			"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+			"integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+			"dev": true,
+			"dependencies": {
+				"sax": ">=0.6.0",
+				"xmlbuilder": "~11.0.0"
+			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/xmlbuilder": {
+			"version": "11.0.1",
+			"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+			"integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/xtend": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4"
+			}
+		},
+		"node_modules/y18n": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yallist": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+			"integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
+		},
+		"node_modules/yargs": {
+			"version": "16.2.0",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+			"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+			"dev": true,
+			"dependencies": {
+				"cliui": "^7.0.2",
+				"escalade": "^3.1.1",
+				"get-caller-file": "^2.0.5",
+				"require-directory": "^2.1.1",
+				"string-width": "^4.2.0",
+				"y18n": "^5.0.5",
+				"yargs-parser": "^20.2.2"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yargs-parser": {
+			"version": "20.2.4",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+			"integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yargs-unparser": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+			"integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
+			"dev": true,
+			"dependencies": {
+				"camelcase": "^6.0.0",
+				"decamelize": "^4.0.0",
+				"flat": "^5.0.2",
+				"is-plain-obj": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yauzl": {
+			"version": "2.10.0",
+			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+			"integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+			"dev": true,
+			"dependencies": {
+				"buffer-crc32": "~0.2.3",
+				"fd-slicer": "~1.1.0"
+			}
+		},
+		"node_modules/yazl": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
+			"integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
+			"dev": true,
+			"dependencies": {
+				"buffer-crc32": "~0.2.3"
+			}
+		},
+		"node_modules/yocto-queue": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		}
+	},
+	"dependencies": {
+		"@babel/code-frame": {
+			"version": "7.12.11",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+			"integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+			"dev": true,
+			"requires": {
+				"@babel/highlight": "^7.10.4"
+			}
+		},
+		"@babel/helper-validator-identifier": {
+			"version": "7.15.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
+			"integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
+			"dev": true
+		},
+		"@babel/highlight": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+			"integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-validator-identifier": "^7.14.5",
+				"chalk": "^2.0.0",
+				"js-tokens": "^4.0.0"
+			},
+			"dependencies": {
+				"chalk": {
+					"version": "2.4.2",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^3.2.1",
+						"escape-string-regexp": "^1.0.5",
+						"supports-color": "^5.3.0"
+					}
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				}
+			}
+		},
+		"@eslint/eslintrc": {
+			"version": "0.4.3",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+			"integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+			"dev": true,
+			"requires": {
+				"ajv": "^6.12.4",
+				"debug": "^4.1.1",
+				"espree": "^7.3.0",
+				"globals": "^13.9.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.2.1",
+				"js-yaml": "^3.13.1",
+				"minimatch": "^3.0.4",
+				"strip-json-comments": "^3.1.1"
+			},
+			"dependencies": {
+				"ignore": {
+					"version": "4.0.6",
+					"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+					"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+					"dev": true
+				}
+			}
+		},
+		"@humanwhocodes/config-array": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+			"integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+			"dev": true,
+			"requires": {
+				"@humanwhocodes/object-schema": "^1.2.0",
+				"debug": "^4.1.1",
+				"minimatch": "^3.0.4"
+			}
+		},
+		"@humanwhocodes/object-schema": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
+			"integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
+			"dev": true
+		},
+		"@microsoft/tsdoc": {
+			"version": "0.13.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.13.2.tgz",
+			"integrity": "sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==",
+			"dev": true
+		},
+		"@microsoft/tsdoc-config": {
+			"version": "0.15.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.15.2.tgz",
+			"integrity": "sha512-mK19b2wJHSdNf8znXSMYVShAHktVr/ib0Ck2FA3lsVBSEhSI/TfXT7DJQkAYgcztTuwazGcg58ZjYdk0hTCVrA==",
+			"dev": true,
+			"requires": {
+				"@microsoft/tsdoc": "0.13.2",
+				"ajv": "~6.12.6",
+				"jju": "~1.4.0",
+				"resolve": "~1.19.0"
+			}
+		},
+		"@nodelib/fs.scandir": {
+			"version": "2.1.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+			"dev": true,
+			"requires": {
+				"@nodelib/fs.stat": "2.0.5",
+				"run-parallel": "^1.1.9"
+			}
+		},
+		"@nodelib/fs.stat": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+			"dev": true
+		},
+		"@nodelib/fs.walk": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+			"dev": true,
+			"requires": {
+				"@nodelib/fs.scandir": "2.1.5",
+				"fastq": "^1.6.0"
+			}
+		},
+		"@tootallnate/once": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+			"integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+			"dev": true
+		},
+		"@types/command-exists": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@types/command-exists/-/command-exists-1.2.0.tgz",
+			"integrity": "sha512-ugsxEJfsCuqMLSuCD4PIJkp5Uk2z6TCMRCgYVuhRo5cYQY3+1xXTQkSlPtkpGHuvWMjS2KTeVQXxkXRACMbM6A==",
+			"dev": true
+		},
+		"@types/fs-extra": {
+			"version": "9.0.13",
+			"resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
+			"integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*"
+			}
+		},
+		"@types/glob": {
+			"version": "7.1.4",
+			"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz",
+			"integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==",
+			"dev": true,
+			"requires": {
+				"@types/minimatch": "*",
+				"@types/node": "*"
+			}
+		},
+		"@types/json-schema": {
+			"version": "7.0.9",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+			"integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+			"dev": true
+		},
+		"@types/minimatch": {
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
+			"integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
+			"dev": true
+		},
+		"@types/mocha": {
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.0.0.tgz",
+			"integrity": "sha512-scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA==",
+			"dev": true
+		},
+		"@types/node": {
+			"version": "14.17.27",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.27.tgz",
+			"integrity": "sha512-94+Ahf9IcaDuJTle/2b+wzvjmutxXAEXU6O81JHblYXUg2BDG+dnBy7VxIPHKAyEEDHzCMQydTJuWvrE+Aanzw==",
+			"dev": true
+		},
+		"@types/vscode": {
+			"version": "1.61.0",
+			"resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.61.0.tgz",
+			"integrity": "sha512-9k5Nwq45hkRwdfCFY+eKXeQQSbPoA114mF7U/4uJXRBJeGIO7MuJdhF1PnaDN+lllL9iKGQtd6FFXShBXMNaFg==",
+			"dev": true
+		},
+		"@typescript-eslint/eslint-plugin": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz",
+			"integrity": "sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/experimental-utils": "4.33.0",
+				"@typescript-eslint/scope-manager": "4.33.0",
+				"debug": "^4.3.1",
+				"functional-red-black-tree": "^1.0.1",
+				"ignore": "^5.1.8",
+				"regexpp": "^3.1.0",
+				"semver": "^7.3.5",
+				"tsutils": "^3.21.0"
+			},
+			"dependencies": {
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
+				"semver": {
+					"version": "7.3.5",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+					"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
+				}
+			}
+		},
+		"@typescript-eslint/experimental-utils": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz",
+			"integrity": "sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==",
+			"dev": true,
+			"requires": {
+				"@types/json-schema": "^7.0.7",
+				"@typescript-eslint/scope-manager": "4.33.0",
+				"@typescript-eslint/types": "4.33.0",
+				"@typescript-eslint/typescript-estree": "4.33.0",
+				"eslint-scope": "^5.1.1",
+				"eslint-utils": "^3.0.0"
+			}
+		},
+		"@typescript-eslint/parser": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz",
+			"integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/scope-manager": "4.33.0",
+				"@typescript-eslint/types": "4.33.0",
+				"@typescript-eslint/typescript-estree": "4.33.0",
+				"debug": "^4.3.1"
+			}
+		},
+		"@typescript-eslint/scope-manager": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz",
+			"integrity": "sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/types": "4.33.0",
+				"@typescript-eslint/visitor-keys": "4.33.0"
+			}
+		},
+		"@typescript-eslint/types": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz",
+			"integrity": "sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==",
+			"dev": true
+		},
+		"@typescript-eslint/typescript-estree": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz",
+			"integrity": "sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/types": "4.33.0",
+				"@typescript-eslint/visitor-keys": "4.33.0",
+				"debug": "^4.3.1",
+				"globby": "^11.0.3",
+				"is-glob": "^4.0.1",
+				"semver": "^7.3.5",
+				"tsutils": "^3.21.0"
+			},
+			"dependencies": {
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
+				"semver": {
+					"version": "7.3.5",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+					"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
+				}
+			}
+		},
+		"@typescript-eslint/visitor-keys": {
+			"version": "4.33.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz",
+			"integrity": "sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/types": "4.33.0",
+				"eslint-visitor-keys": "^2.0.0"
+			}
+		},
+		"@ungap/promise-all-settled": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
+			"integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
+			"dev": true
+		},
+		"@vscode/test-electron": {
+			"version": "2.1.5",
+			"resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.1.5.tgz",
+			"integrity": "sha512-O/ioqFpV+RvKbRykX2ItYPnbcZ4Hk5V0rY4uhQjQTLhGL9WZUvS7exzuYQCCI+ilSqJpctvxq2llTfGXf9UnnA==",
+			"dev": true,
+			"requires": {
+				"http-proxy-agent": "^4.0.1",
+				"https-proxy-agent": "^5.0.0",
+				"rimraf": "^3.0.2",
+				"unzipper": "^0.10.11"
+			}
+		},
+		"acorn": {
+			"version": "7.4.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+			"dev": true
+		},
+		"acorn-jsx": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+			"dev": true,
+			"requires": {}
+		},
+		"agent-base": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+			"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+			"dev": true,
+			"requires": {
+				"debug": "4"
+			}
+		},
+		"ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dev": true,
+			"requires": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			}
+		},
+		"ansi-colors": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+			"dev": true
+		},
+		"ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true
+		},
+		"ansi-styles": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+			"dev": true,
+			"requires": {
+				"color-convert": "^1.9.0"
+			}
+		},
+		"anymatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+			"integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+			"dev": true,
+			"requires": {
+				"normalize-path": "^3.0.0",
+				"picomatch": "^2.0.4"
+			}
+		},
+		"aproba": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+			"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+			"dev": true
+		},
+		"are-we-there-yet": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
+			"integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
+			"dev": true,
+			"requires": {
+				"delegates": "^1.0.0",
+				"readable-stream": "^2.0.6"
+			}
+		},
+		"argparse": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+			"dev": true,
+			"requires": {
+				"sprintf-js": "~1.0.2"
+			}
+		},
+		"array-union": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+			"dev": true
+		},
+		"astral-regex": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+			"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+			"dev": true
+		},
+		"azure-devops-node-api": {
+			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.1.0.tgz",
+			"integrity": "sha512-6/2YZuf+lJzJLrjXNYEA5RXAkMCb8j/4VcHD0qJQRsgG/KsRMYo0HgDh0by1FGHyZkQWY5LmQyJqCwRVUB3Y7Q==",
+			"dev": true,
+			"requires": {
+				"tunnel": "0.0.6",
+				"typed-rest-client": "^1.8.4"
+			}
+		},
+		"balanced-match": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+			"dev": true
+		},
+		"base64-js": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+			"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+			"dev": true
+		},
+		"big-integer": {
+			"version": "1.6.50",
+			"resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.50.tgz",
+			"integrity": "sha512-+O2uoQWFRo8ysZNo/rjtri2jIwjr3XfeAgRjAUADRqGG+ZITvyn8J1kvXLTaKVr3hhGXk+f23tKfdzmklVM9vQ==",
+			"dev": true
+		},
+		"binary": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+			"integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
+			"dev": true,
+			"requires": {
+				"buffers": "~0.1.1",
+				"chainsaw": "~0.1.0"
+			}
+		},
+		"binary-extensions": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+			"dev": true
+		},
+		"bl": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+			"integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+			"dev": true,
+			"requires": {
+				"buffer": "^5.5.0",
+				"inherits": "^2.0.4",
+				"readable-stream": "^3.4.0"
+			},
+			"dependencies": {
+				"readable-stream": {
+					"version": "3.6.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+					"dev": true,
+					"requires": {
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
+					}
+				}
+			}
+		},
+		"bluebird": {
+			"version": "3.4.7",
+			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
+			"integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=",
+			"dev": true
+		},
+		"boolbase": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+			"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+			"dev": true
+		},
+		"brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"requires": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
+			"requires": {
+				"fill-range": "^7.0.1"
+			}
+		},
+		"browser-stdout": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+			"integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+			"dev": true
+		},
+		"buffer": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+			"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+			"dev": true,
+			"requires": {
+				"base64-js": "^1.3.1",
+				"ieee754": "^1.1.13"
+			}
+		},
+		"buffer-crc32": {
+			"version": "0.2.13",
+			"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+			"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+			"dev": true
+		},
+		"buffer-indexof-polyfill": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",
+			"integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==",
+			"dev": true
+		},
+		"buffers": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+			"integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
+			"dev": true
+		},
+		"call-bind": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+			"dev": true,
+			"requires": {
+				"function-bind": "^1.1.1",
+				"get-intrinsic": "^1.0.2"
+			}
+		},
+		"callsites": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+			"dev": true
+		},
+		"camelcase": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+			"integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+			"dev": true
+		},
+		"chainsaw": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+			"integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
+			"dev": true,
+			"requires": {
+				"traverse": ">=0.3.0 <0.4"
+			}
+		},
+		"chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"requires": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+					"dev": true,
+					"requires": {
+						"color-convert": "^2.0.1"
+					}
+				},
+				"color-convert": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+					"dev": true,
+					"requires": {
+						"color-name": "~1.1.4"
+					}
+				},
+				"color-name": {
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "7.2.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^4.0.0"
+					}
+				}
+			}
+		},
+		"cheerio": {
+			"version": "1.0.0-rc.10",
+			"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz",
+			"integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==",
+			"dev": true,
+			"requires": {
+				"cheerio-select": "^1.5.0",
+				"dom-serializer": "^1.3.2",
+				"domhandler": "^4.2.0",
+				"htmlparser2": "^6.1.0",
+				"parse5": "^6.0.1",
+				"parse5-htmlparser2-tree-adapter": "^6.0.1",
+				"tslib": "^2.2.0"
+			},
+			"dependencies": {
+				"tslib": {
+					"version": "2.3.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+					"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+					"dev": true
+				}
+			}
+		},
+		"cheerio-select": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz",
+			"integrity": "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==",
+			"dev": true,
+			"requires": {
+				"css-select": "^4.1.3",
+				"css-what": "^5.0.1",
+				"domelementtype": "^2.2.0",
+				"domhandler": "^4.2.0",
+				"domutils": "^2.7.0"
+			}
+		},
+		"chokidar": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+			"integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+			"dev": true,
+			"requires": {
+				"anymatch": "~3.1.2",
+				"braces": "~3.0.2",
+				"fsevents": "~2.3.2",
+				"glob-parent": "~5.1.2",
+				"is-binary-path": "~2.1.0",
+				"is-glob": "~4.0.1",
+				"normalize-path": "~3.0.0",
+				"readdirp": "~3.6.0"
+			}
+		},
+		"chownr": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+			"integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+			"dev": true
+		},
+		"cliui": {
+			"version": "7.0.4",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+			"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+			"dev": true,
+			"requires": {
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.0",
+				"wrap-ansi": "^7.0.0"
+			}
+		},
+		"code-point-at": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+			"dev": true
+		},
+		"color-convert": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+			"dev": true,
+			"requires": {
+				"color-name": "1.1.3"
+			}
+		},
+		"color-name": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+			"dev": true
+		},
+		"command-exists": {
+			"version": "1.2.9",
+			"resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
+			"integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="
+		},
+		"commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"dev": true
+		},
+		"commandpost": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/commandpost/-/commandpost-1.4.0.tgz",
+			"integrity": "sha512-aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ==",
+			"dev": true
+		},
+		"concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+			"dev": true
+		},
+		"console-control-strings": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+			"dev": true
+		},
+		"copyfiles": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/copyfiles/-/copyfiles-2.4.1.tgz",
+			"integrity": "sha512-fereAvAvxDrQDOXybk3Qu3dPbOoKoysFMWtkY3mv5BsL8//OSZVL5DCLYqgRfY5cWirgRzlC+WSrxp6Bo3eNZg==",
+			"dev": true,
+			"requires": {
+				"glob": "^7.0.5",
+				"minimatch": "^3.0.3",
+				"mkdirp": "^1.0.4",
+				"noms": "0.0.0",
+				"through2": "^2.0.1",
+				"untildify": "^4.0.0",
+				"yargs": "^16.1.0"
+			},
+			"dependencies": {
+				"mkdirp": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+					"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+					"dev": true
+				}
+			}
+		},
+		"core-util-is": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+			"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+			"dev": true
+		},
+		"cross-env": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+			"integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+			"dev": true,
+			"requires": {
+				"cross-spawn": "^7.0.1"
+			}
+		},
+		"cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dev": true,
+			"requires": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			}
+		},
+		"css-select": {
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
+			"integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
+			"dev": true,
+			"requires": {
+				"boolbase": "^1.0.0",
+				"css-what": "^5.0.0",
+				"domhandler": "^4.2.0",
+				"domutils": "^2.6.0",
+				"nth-check": "^2.0.0"
+			}
+		},
+		"css-what": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
+			"integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
+			"dev": true
+		},
+		"debug": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+			"integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+			"dev": true,
+			"requires": {
+				"ms": "2.1.2"
+			}
+		},
+		"decamelize": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+			"integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+			"dev": true
+		},
+		"decompress-response": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+			"integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+			"dev": true,
+			"requires": {
+				"mimic-response": "^2.0.0"
+			}
+		},
+		"deep-extend": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+			"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+			"dev": true
+		},
+		"deep-is": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+			"dev": true
+		},
+		"delegates": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+			"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+			"dev": true
+		},
+		"detect-libc": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+			"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+			"dev": true
+		},
+		"diff": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+			"integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+			"dev": true
+		},
+		"dir-glob": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+			"dev": true,
+			"requires": {
+				"path-type": "^4.0.0"
+			}
+		},
+		"doctrine": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+			"dev": true,
+			"requires": {
+				"esutils": "^2.0.2"
+			}
+		},
+		"dom-serializer": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
+			"integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
+			"dev": true,
+			"requires": {
+				"domelementtype": "^2.0.1",
+				"domhandler": "^4.2.0",
+				"entities": "^2.0.0"
+			}
+		},
+		"domelementtype": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
+			"integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+			"dev": true
+		},
+		"domhandler": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz",
+			"integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==",
+			"dev": true,
+			"requires": {
+				"domelementtype": "^2.2.0"
+			}
+		},
+		"domutils": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+			"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+			"dev": true,
+			"requires": {
+				"dom-serializer": "^1.0.1",
+				"domelementtype": "^2.2.0",
+				"domhandler": "^4.2.0"
+			}
+		},
+		"duplexer2": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+			"integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
+			"dev": true,
+			"requires": {
+				"readable-stream": "^2.0.2"
+			}
+		},
+		"editorconfig": {
+			"version": "0.15.3",
+			"resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz",
+			"integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==",
+			"dev": true,
+			"requires": {
+				"commander": "^2.19.0",
+				"lru-cache": "^4.1.5",
+				"semver": "^5.6.0",
+				"sigmund": "^1.0.1"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "5.7.1",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+					"dev": true
+				}
+			}
+		},
+		"emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"dev": true
+		},
+		"end-of-stream": {
+			"version": "1.4.4",
+			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+			"dev": true,
+			"requires": {
+				"once": "^1.4.0"
+			}
+		},
+		"enquirer": {
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+			"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+			"dev": true,
+			"requires": {
+				"ansi-colors": "^4.1.1"
+			}
+		},
+		"entities": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+			"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+			"dev": true
+		},
+		"escalade": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+			"dev": true
+		},
+		"escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true
+		},
+		"eslint": {
+			"version": "7.32.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+			"integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "7.12.11",
+				"@eslint/eslintrc": "^0.4.3",
+				"@humanwhocodes/config-array": "^0.5.0",
+				"ajv": "^6.10.0",
+				"chalk": "^4.0.0",
+				"cross-spawn": "^7.0.2",
+				"debug": "^4.0.1",
+				"doctrine": "^3.0.0",
+				"enquirer": "^2.3.5",
+				"escape-string-regexp": "^4.0.0",
+				"eslint-scope": "^5.1.1",
+				"eslint-utils": "^2.1.0",
+				"eslint-visitor-keys": "^2.0.0",
+				"espree": "^7.3.1",
+				"esquery": "^1.4.0",
+				"esutils": "^2.0.2",
+				"fast-deep-equal": "^3.1.3",
+				"file-entry-cache": "^6.0.1",
+				"functional-red-black-tree": "^1.0.1",
+				"glob-parent": "^5.1.2",
+				"globals": "^13.6.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.0.0",
+				"imurmurhash": "^0.1.4",
+				"is-glob": "^4.0.0",
+				"js-yaml": "^3.13.1",
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"levn": "^0.4.1",
+				"lodash.merge": "^4.6.2",
+				"minimatch": "^3.0.4",
+				"natural-compare": "^1.4.0",
+				"optionator": "^0.9.1",
+				"progress": "^2.0.0",
+				"regexpp": "^3.1.0",
+				"semver": "^7.2.1",
+				"strip-ansi": "^6.0.0",
+				"strip-json-comments": "^3.1.0",
+				"table": "^6.0.9",
+				"text-table": "^0.2.0",
+				"v8-compile-cache": "^2.0.3"
+			},
+			"dependencies": {
+				"eslint-utils": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+					"integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+					"dev": true,
+					"requires": {
+						"eslint-visitor-keys": "^1.1.0"
+					},
+					"dependencies": {
+						"eslint-visitor-keys": {
+							"version": "1.3.0",
+							"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+							"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+							"dev": true
+						}
+					}
+				},
+				"ignore": {
+					"version": "4.0.6",
+					"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+					"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+					"dev": true
+				},
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
+				"semver": {
+					"version": "7.3.5",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+					"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
+				}
+			}
+		},
+		"eslint-plugin-tsdoc": {
+			"version": "0.2.14",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-tsdoc/-/eslint-plugin-tsdoc-0.2.14.tgz",
+			"integrity": "sha512-fJ3fnZRsdIoBZgzkQjv8vAj6NeeOoFkTfgosj6mKsFjX70QV256sA/wq+y/R2+OL4L8E79VVaVWrPeZnKNe8Ng==",
+			"dev": true,
+			"requires": {
+				"@microsoft/tsdoc": "0.13.2",
+				"@microsoft/tsdoc-config": "0.15.2"
+			}
+		},
+		"eslint-scope": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+			"dev": true,
+			"requires": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^4.1.1"
+			}
+		},
+		"eslint-utils": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+			"dev": true,
+			"requires": {
+				"eslint-visitor-keys": "^2.0.0"
+			}
+		},
+		"eslint-visitor-keys": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+			"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+			"dev": true
+		},
+		"espree": {
+			"version": "7.3.1",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+			"integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+			"dev": true,
+			"requires": {
+				"acorn": "^7.4.0",
+				"acorn-jsx": "^5.3.1",
+				"eslint-visitor-keys": "^1.3.0"
+			},
+			"dependencies": {
+				"eslint-visitor-keys": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+					"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+					"dev": true
+				}
+			}
+		},
+		"esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"dev": true
+		},
+		"esquery": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+			"dev": true,
+			"requires": {
+				"estraverse": "^5.1.0"
+			},
+			"dependencies": {
+				"estraverse": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+					"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+					"dev": true
+				}
+			}
+		},
+		"esrecurse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+			"dev": true,
+			"requires": {
+				"estraverse": "^5.2.0"
+			},
+			"dependencies": {
+				"estraverse": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+					"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+					"dev": true
+				}
+			}
+		},
+		"estraverse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+			"dev": true
+		},
+		"esutils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+			"dev": true
+		},
+		"expand-template": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+			"integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+			"dev": true
+		},
+		"fast-deep-equal": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+			"dev": true
+		},
+		"fast-glob": {
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
+			"integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
+			"dev": true,
+			"requires": {
+				"@nodelib/fs.stat": "^2.0.2",
+				"@nodelib/fs.walk": "^1.2.3",
+				"glob-parent": "^5.1.2",
+				"merge2": "^1.3.0",
+				"micromatch": "^4.0.4"
+			}
+		},
+		"fast-json-stable-stringify": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+			"dev": true
+		},
+		"fast-levenshtein": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+			"dev": true
+		},
+		"fastq": {
+			"version": "1.13.0",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+			"integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+			"dev": true,
+			"requires": {
+				"reusify": "^1.0.4"
+			}
+		},
+		"fd-slicer": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+			"integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+			"dev": true,
+			"requires": {
+				"pend": "~1.2.0"
+			}
+		},
+		"file-entry-cache": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+			"dev": true,
+			"requires": {
+				"flat-cache": "^3.0.4"
+			}
+		},
+		"fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"dev": true,
+			"requires": {
+				"to-regex-range": "^5.0.1"
+			}
+		},
+		"find-up": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+			"dev": true,
+			"requires": {
+				"locate-path": "^6.0.0",
+				"path-exists": "^4.0.0"
+			}
+		},
+		"flat": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+			"dev": true
+		},
+		"flat-cache": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+			"dev": true,
+			"requires": {
+				"flatted": "^3.1.0",
+				"rimraf": "^3.0.2"
+			}
+		},
+		"flatted": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
+			"integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
+			"dev": true
+		},
+		"fs-constants": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+			"integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+			"dev": true
+		},
+		"fs-extra": {
+			"version": "10.0.1",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
+			"integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "^4.2.0",
+				"jsonfile": "^6.0.1",
+				"universalify": "^2.0.0"
+			}
+		},
+		"fs.realpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+			"dev": true
+		},
+		"fsevents": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+			"dev": true,
+			"optional": true
+		},
+		"fstream": {
+			"version": "1.0.12",
+			"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+			"integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "^4.1.2",
+				"inherits": "~2.0.0",
+				"mkdirp": ">=0.5 0",
+				"rimraf": "2"
+			},
+			"dependencies": {
+				"rimraf": {
+					"version": "2.7.1",
+					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+					"dev": true,
+					"requires": {
+						"glob": "^7.1.3"
+					}
+				}
+			}
+		},
+		"function-bind": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+			"dev": true
+		},
+		"functional-red-black-tree": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+			"dev": true
+		},
+		"gauge": {
+			"version": "2.7.4",
+			"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+			"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+			"dev": true,
+			"requires": {
+				"aproba": "^1.0.3",
+				"console-control-strings": "^1.0.0",
+				"has-unicode": "^2.0.0",
+				"object-assign": "^4.1.0",
+				"signal-exit": "^3.0.0",
+				"string-width": "^1.0.1",
+				"strip-ansi": "^3.0.1",
+				"wide-align": "^1.1.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+					"dev": true
+				},
+				"is-fullwidth-code-point": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+					"dev": true,
+					"requires": {
+						"number-is-nan": "^1.0.0"
+					}
+				},
+				"string-width": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+					"dev": true,
+					"requires": {
+						"code-point-at": "^1.0.0",
+						"is-fullwidth-code-point": "^1.0.0",
+						"strip-ansi": "^3.0.0"
+					}
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "^2.0.0"
+					}
+				}
+			}
+		},
+		"get-caller-file": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+			"dev": true
+		},
+		"get-intrinsic": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+			"integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+			"dev": true,
+			"requires": {
+				"function-bind": "^1.1.1",
+				"has": "^1.0.3",
+				"has-symbols": "^1.0.1"
+			}
+		},
+		"github-from-package": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+			"integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=",
+			"dev": true
+		},
+		"glob": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+			"integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+			"dev": true,
+			"requires": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			}
+		},
+		"glob-parent": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+			"dev": true,
+			"requires": {
+				"is-glob": "^4.0.1"
+			}
+		},
+		"globals": {
+			"version": "13.11.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
+			"integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
+			"dev": true,
+			"requires": {
+				"type-fest": "^0.20.2"
+			}
+		},
+		"globby": {
+			"version": "11.0.4",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
+			"integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+			"dev": true,
+			"requires": {
+				"array-union": "^2.1.0",
+				"dir-glob": "^3.0.1",
+				"fast-glob": "^3.1.1",
+				"ignore": "^5.1.4",
+				"merge2": "^1.3.0",
+				"slash": "^3.0.0"
+			}
+		},
+		"graceful-fs": {
+			"version": "4.2.8",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+			"integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
+			"dev": true
+		},
+		"growl": {
+			"version": "1.10.5",
+			"resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+			"integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+			"dev": true
+		},
+		"has": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+			"dev": true,
+			"requires": {
+				"function-bind": "^1.1.1"
+			}
+		},
+		"has-flag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+			"dev": true
+		},
+		"has-symbols": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+			"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+			"dev": true
+		},
+		"has-unicode": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+			"dev": true
+		},
+		"he": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+			"dev": true
+		},
+		"hosted-git-info": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
+			"integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+			"dev": true,
+			"requires": {
+				"lru-cache": "^6.0.0"
+			},
+			"dependencies": {
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
+				}
+			}
+		},
+		"htmlparser2": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+			"integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+			"dev": true,
+			"requires": {
+				"domelementtype": "^2.0.1",
+				"domhandler": "^4.0.0",
+				"domutils": "^2.5.2",
+				"entities": "^2.0.0"
+			}
+		},
+		"http-proxy-agent": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+			"integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+			"dev": true,
+			"requires": {
+				"@tootallnate/once": "1",
+				"agent-base": "6",
+				"debug": "4"
+			}
+		},
+		"https-proxy-agent": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+			"integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+			"dev": true,
+			"requires": {
+				"agent-base": "6",
+				"debug": "4"
+			}
+		},
+		"ieee754": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+			"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+			"dev": true
+		},
+		"ignore": {
+			"version": "5.1.8",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+			"integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+			"dev": true
+		},
+		"import-fresh": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+			"dev": true,
+			"requires": {
+				"parent-module": "^1.0.0",
+				"resolve-from": "^4.0.0"
+			}
+		},
+		"imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+			"dev": true
+		},
+		"inflight": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+			"dev": true,
+			"requires": {
+				"once": "^1.3.0",
+				"wrappy": "1"
+			}
+		},
+		"inherits": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+			"dev": true
+		},
+		"ini": {
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+			"dev": true
+		},
+		"is-binary-path": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+			"dev": true,
+			"requires": {
+				"binary-extensions": "^2.0.0"
+			}
+		},
+		"is-core-module": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
+			"integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
+			"dev": true,
+			"requires": {
+				"has": "^1.0.3"
+			}
+		},
+		"is-extglob": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+			"dev": true
+		},
+		"is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+			"dev": true
+		},
+		"is-glob": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+			"dev": true,
+			"requires": {
+				"is-extglob": "^2.1.1"
+			}
+		},
+		"is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true
+		},
+		"is-plain-obj": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+			"integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+			"dev": true
+		},
+		"is-unicode-supported": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+			"dev": true
+		},
+		"isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+			"dev": true
+		},
+		"isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+			"dev": true
+		},
+		"jju": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
+			"integrity": "sha1-o6vicYryQaKykE+EpiWXDzia4yo=",
+			"dev": true
+		},
+		"js-tokens": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+			"dev": true
+		},
+		"js-yaml": {
+			"version": "3.14.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+			"dev": true,
+			"requires": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			}
+		},
+		"json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+			"dev": true
+		},
+		"json-stable-stringify-without-jsonify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+			"dev": true
+		},
+		"jsonfile": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+			"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "^4.1.6",
+				"universalify": "^2.0.0"
+			}
+		},
+		"keytar": {
+			"version": "7.7.0",
+			"resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz",
+			"integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==",
+			"dev": true,
+			"requires": {
+				"node-addon-api": "^3.0.0",
+				"prebuild-install": "^6.0.0"
+			}
+		},
+		"leven": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+			"dev": true
+		},
+		"levn": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+			"dev": true,
+			"requires": {
+				"prelude-ls": "^1.2.1",
+				"type-check": "~0.4.0"
+			}
+		},
+		"linkify-it": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
+			"integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
+			"dev": true,
+			"requires": {
+				"uc.micro": "^1.0.1"
+			}
+		},
+		"listenercount": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
+			"integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=",
+			"dev": true
+		},
+		"locate-path": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+			"dev": true,
+			"requires": {
+				"p-locate": "^5.0.0"
+			}
+		},
+		"lodash.clonedeep": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+			"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+			"dev": true
+		},
+		"lodash.merge": {
+			"version": "4.6.2",
+			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+			"dev": true
+		},
+		"lodash.truncate": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+			"integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+			"dev": true
+		},
+		"log-symbols": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+			"integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+			"dev": true,
+			"requires": {
+				"chalk": "^4.1.0",
+				"is-unicode-supported": "^0.1.0"
+			}
+		},
+		"lru-cache": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+			"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+			"requires": {
+				"pseudomap": "^1.0.2",
+				"yallist": "^2.1.2"
+			}
+		},
+		"markdown-it": {
+			"version": "10.0.0",
+			"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
+			"integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
+			"dev": true,
+			"requires": {
+				"argparse": "^1.0.7",
+				"entities": "~2.0.0",
+				"linkify-it": "^2.0.0",
+				"mdurl": "^1.0.1",
+				"uc.micro": "^1.0.5"
+			},
+			"dependencies": {
+				"entities": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
+					"integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
+					"dev": true
+				}
+			}
+		},
+		"mdurl": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+			"integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
+			"dev": true
+		},
+		"merge2": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+			"dev": true
+		},
+		"micromatch": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+			"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+			"dev": true,
+			"requires": {
+				"braces": "^3.0.1",
+				"picomatch": "^2.2.3"
+			}
+		},
+		"mime": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+			"dev": true
+		},
+		"mimic-response": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+			"integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+			"dev": true
+		},
+		"minimatch": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"dev": true,
+			"requires": {
+				"brace-expansion": "^1.1.7"
+			}
+		},
+		"minimist": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+			"dev": true
+		},
+		"mkdirp": {
+			"version": "0.5.5",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+			"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+			"dev": true,
+			"requires": {
+				"minimist": "^1.2.5"
+			}
+		},
+		"mkdirp-classic": {
+			"version": "0.5.3",
+			"resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+			"integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+			"dev": true
+		},
+		"mocha": {
+			"version": "9.1.3",
+			"resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz",
+			"integrity": "sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw==",
+			"dev": true,
+			"requires": {
+				"@ungap/promise-all-settled": "1.1.2",
+				"ansi-colors": "4.1.1",
+				"browser-stdout": "1.3.1",
+				"chokidar": "3.5.2",
+				"debug": "4.3.2",
+				"diff": "5.0.0",
+				"escape-string-regexp": "4.0.0",
+				"find-up": "5.0.0",
+				"glob": "7.1.7",
+				"growl": "1.10.5",
+				"he": "1.2.0",
+				"js-yaml": "4.1.0",
+				"log-symbols": "4.1.0",
+				"minimatch": "3.0.4",
+				"ms": "2.1.3",
+				"nanoid": "3.1.25",
+				"serialize-javascript": "6.0.0",
+				"strip-json-comments": "3.1.1",
+				"supports-color": "8.1.1",
+				"which": "2.0.2",
+				"workerpool": "6.1.5",
+				"yargs": "16.2.0",
+				"yargs-parser": "20.2.4",
+				"yargs-unparser": "2.0.0"
+			},
+			"dependencies": {
+				"argparse": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+					"dev": true
+				},
+				"glob": {
+					"version": "7.1.7",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+					"integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+					"dev": true,
+					"requires": {
+						"fs.realpath": "^1.0.0",
+						"inflight": "^1.0.4",
+						"inherits": "2",
+						"minimatch": "^3.0.4",
+						"once": "^1.3.0",
+						"path-is-absolute": "^1.0.0"
+					}
+				},
+				"has-flag": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+					"dev": true
+				},
+				"js-yaml": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+					"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+					"dev": true,
+					"requires": {
+						"argparse": "^2.0.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.3",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+					"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "8.1.1",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+					"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^4.0.0"
+					}
+				}
+			}
+		},
+		"ms": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+			"dev": true
+		},
+		"mute-stream": {
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+			"integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+			"dev": true
+		},
+		"nanoid": {
+			"version": "3.1.25",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
+			"integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==",
+			"dev": true
+		},
+		"napi-build-utils": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
+			"integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
+			"dev": true
+		},
+		"natural-compare": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+			"dev": true
+		},
+		"node-abi": {
+			"version": "2.30.1",
+			"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz",
+			"integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==",
+			"dev": true,
+			"requires": {
+				"semver": "^5.4.1"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "5.7.1",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+					"dev": true
+				}
+			}
+		},
+		"node-addon-api": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+			"integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
+			"dev": true
+		},
+		"noms": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/noms/-/noms-0.0.0.tgz",
+			"integrity": "sha512-lNDU9VJaOPxUmXcLb+HQFeUgQQPtMI24Gt6hgfuMHRJgMRHMF/qZ4HJD3GDru4sSw9IQl2jPjAYnQrdIeLbwow==",
+			"dev": true,
+			"requires": {
+				"inherits": "^2.0.1",
+				"readable-stream": "~1.0.31"
+			},
+			"dependencies": {
+				"isarray": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+					"integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "1.0.34",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+					"integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+					"dev": true,
+					"requires": {
+						"core-util-is": "~1.0.0",
+						"inherits": "~2.0.1",
+						"isarray": "0.0.1",
+						"string_decoder": "~0.10.x"
+					}
+				},
+				"string_decoder": {
+					"version": "0.10.31",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+					"integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+					"dev": true
+				}
+			}
+		},
+		"normalize-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+			"dev": true
+		},
+		"npmlog": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+			"dev": true,
+			"requires": {
+				"are-we-there-yet": "~1.1.2",
+				"console-control-strings": "~1.1.0",
+				"gauge": "~2.7.3",
+				"set-blocking": "~2.0.0"
+			}
+		},
+		"nth-check": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
+			"integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
+			"dev": true,
+			"requires": {
+				"boolbase": "^1.0.0"
+			}
+		},
+		"number-is-nan": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+			"dev": true
+		},
+		"object-assign": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+			"dev": true
+		},
+		"object-inspect": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
+			"integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==",
+			"dev": true
+		},
+		"once": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+			"dev": true,
+			"requires": {
+				"wrappy": "1"
+			}
+		},
+		"optionator": {
+			"version": "0.9.1",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+			"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+			"dev": true,
+			"requires": {
+				"deep-is": "^0.1.3",
+				"fast-levenshtein": "^2.0.6",
+				"levn": "^0.4.1",
+				"prelude-ls": "^1.2.1",
+				"type-check": "^0.4.0",
+				"word-wrap": "^1.2.3"
+			}
+		},
+		"p-limit": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+			"dev": true,
+			"requires": {
+				"yocto-queue": "^0.1.0"
+			}
+		},
+		"p-locate": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+			"dev": true,
+			"requires": {
+				"p-limit": "^3.0.2"
+			}
+		},
+		"parent-module": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+			"dev": true,
+			"requires": {
+				"callsites": "^3.0.0"
+			}
+		},
+		"parse-semver": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/parse-semver/-/parse-semver-1.1.1.tgz",
+			"integrity": "sha1-mkr9bfBj3Egm+T+6SpnPIj9mbLg=",
+			"dev": true,
+			"requires": {
+				"semver": "^5.1.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "5.7.1",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+					"dev": true
+				}
+			}
+		},
+		"parse5": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+			"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+			"dev": true
+		},
+		"parse5-htmlparser2-tree-adapter": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
+			"integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
+			"dev": true,
+			"requires": {
+				"parse5": "^6.0.1"
+			}
+		},
+		"path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true
+		},
+		"path-is-absolute": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+			"dev": true
+		},
+		"path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true
+		},
+		"path-parse": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+			"dev": true
+		},
+		"path-type": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+			"dev": true
+		},
+		"pend": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+			"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+			"dev": true
+		},
+		"picomatch": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+			"integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+			"dev": true
+		},
+		"prebuild-install": {
+			"version": "6.1.4",
+			"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz",
+			"integrity": "sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ==",
+			"dev": true,
+			"requires": {
+				"detect-libc": "^1.0.3",
+				"expand-template": "^2.0.3",
+				"github-from-package": "0.0.0",
+				"minimist": "^1.2.3",
+				"mkdirp-classic": "^0.5.3",
+				"napi-build-utils": "^1.0.1",
+				"node-abi": "^2.21.0",
+				"npmlog": "^4.0.1",
+				"pump": "^3.0.0",
+				"rc": "^1.2.7",
+				"simple-get": "^3.0.3",
+				"tar-fs": "^2.0.0",
+				"tunnel-agent": "^0.6.0"
+			}
+		},
+		"prelude-ls": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+			"dev": true
+		},
+		"process-nextick-args": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+			"dev": true
+		},
+		"progress": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+			"dev": true
+		},
+		"pseudomap": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+			"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+		},
+		"pump": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+			"dev": true,
+			"requires": {
+				"end-of-stream": "^1.1.0",
+				"once": "^1.3.1"
+			}
+		},
+		"punycode": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+			"dev": true
+		},
+		"qs": {
+			"version": "6.10.2",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.10.2.tgz",
+			"integrity": "sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw==",
+			"dev": true,
+			"requires": {
+				"side-channel": "^1.0.4"
+			}
+		},
+		"queue-microtask": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+			"dev": true
+		},
+		"randombytes": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "^5.1.0"
+			}
+		},
+		"rc": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+			"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+			"dev": true,
+			"requires": {
+				"deep-extend": "^0.6.0",
+				"ini": "~1.3.0",
+				"minimist": "^1.2.0",
+				"strip-json-comments": "~2.0.1"
+			},
+			"dependencies": {
+				"strip-json-comments": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+					"dev": true
+				}
+			}
+		},
+		"read": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+			"integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
+			"dev": true,
+			"requires": {
+				"mute-stream": "~0.0.4"
+			}
+		},
+		"readable-stream": {
+			"version": "2.3.7",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+			"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+			"dev": true,
+			"requires": {
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.3",
+				"isarray": "~1.0.0",
+				"process-nextick-args": "~2.0.0",
+				"safe-buffer": "~5.1.1",
+				"string_decoder": "~1.1.1",
+				"util-deprecate": "~1.0.1"
+			}
+		},
+		"readdirp": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+			"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+			"dev": true,
+			"requires": {
+				"picomatch": "^2.2.1"
+			}
+		},
+		"regexpp": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+			"dev": true
+		},
+		"require-directory": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+			"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+			"dev": true
+		},
+		"require-from-string": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+			"dev": true
+		},
+		"resolve": {
+			"version": "1.19.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+			"integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+			"dev": true,
+			"requires": {
+				"is-core-module": "^2.1.0",
+				"path-parse": "^1.0.6"
+			}
+		},
+		"resolve-from": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+			"dev": true
+		},
+		"reusify": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+			"dev": true
+		},
+		"rimraf": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+			"dev": true,
+			"requires": {
+				"glob": "^7.1.3"
+			}
+		},
+		"run-parallel": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+			"dev": true,
+			"requires": {
+				"queue-microtask": "^1.2.2"
+			}
+		},
+		"safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"dev": true
+		},
+		"sax": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+			"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+			"dev": true
+		},
+		"semver": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+		},
+		"serialize-javascript": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+			"integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+			"dev": true,
+			"requires": {
+				"randombytes": "^2.1.0"
+			}
+		},
+		"set-blocking": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+			"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+			"dev": true
+		},
+		"setimmediate": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+			"integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+			"dev": true
+		},
+		"shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dev": true,
+			"requires": {
+				"shebang-regex": "^3.0.0"
+			}
+		},
+		"shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true
+		},
+		"side-channel": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+			"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+			"dev": true,
+			"requires": {
+				"call-bind": "^1.0.0",
+				"get-intrinsic": "^1.0.2",
+				"object-inspect": "^1.9.0"
+			}
+		},
+		"sigmund": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+			"integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
+			"dev": true
+		},
+		"signal-exit": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
+			"integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==",
+			"dev": true
+		},
+		"simple-concat": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+			"integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+			"dev": true
+		},
+		"simple-get": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
+			"integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
+			"dev": true,
+			"requires": {
+				"decompress-response": "^4.2.0",
+				"once": "^1.3.1",
+				"simple-concat": "^1.0.0"
+			}
+		},
+		"slash": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+			"dev": true
+		},
+		"slice-ansi": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+			"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+			"dev": true,
+			"requires": {
+				"ansi-styles": "^4.0.0",
+				"astral-regex": "^2.0.0",
+				"is-fullwidth-code-point": "^3.0.0"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+					"dev": true,
+					"requires": {
+						"color-convert": "^2.0.1"
+					}
+				},
+				"color-convert": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+					"dev": true,
+					"requires": {
+						"color-name": "~1.1.4"
+					}
+				},
+				"color-name": {
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+					"dev": true
+				}
+			}
+		},
+		"sprintf-js": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+			"dev": true
+		},
+		"string_decoder": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "~5.1.0"
+			}
+		},
+		"string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
+			"requires": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			}
+		},
+		"strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
+			"requires": {
+				"ansi-regex": "^5.0.1"
+			}
+		},
+		"strip-json-comments": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+			"dev": true
+		},
+		"supports-color": {
+			"version": "5.5.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+			"dev": true,
+			"requires": {
+				"has-flag": "^3.0.0"
+			}
+		},
+		"table": {
+			"version": "6.7.2",
+			"resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz",
+			"integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==",
+			"dev": true,
+			"requires": {
+				"ajv": "^8.0.1",
+				"lodash.clonedeep": "^4.5.0",
+				"lodash.truncate": "^4.4.2",
+				"slice-ansi": "^4.0.0",
+				"string-width": "^4.2.3",
+				"strip-ansi": "^6.0.1"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "8.6.3",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
+					"integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
+					"dev": true,
+					"requires": {
+						"fast-deep-equal": "^3.1.1",
+						"json-schema-traverse": "^1.0.0",
+						"require-from-string": "^2.0.2",
+						"uri-js": "^4.2.2"
+					}
+				},
+				"json-schema-traverse": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+					"dev": true
+				}
+			}
+		},
+		"tar-fs": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+			"integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+			"dev": true,
+			"requires": {
+				"chownr": "^1.1.1",
+				"mkdirp-classic": "^0.5.2",
+				"pump": "^3.0.0",
+				"tar-stream": "^2.1.4"
+			}
+		},
+		"tar-stream": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+			"integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+			"dev": true,
+			"requires": {
+				"bl": "^4.0.3",
+				"end-of-stream": "^1.4.1",
+				"fs-constants": "^1.0.0",
+				"inherits": "^2.0.3",
+				"readable-stream": "^3.1.1"
+			},
+			"dependencies": {
+				"readable-stream": {
+					"version": "3.6.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+					"dev": true,
+					"requires": {
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
+					}
+				}
+			}
+		},
+		"text-table": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+			"dev": true
+		},
+		"through2": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+			"dev": true,
+			"requires": {
+				"readable-stream": "~2.3.6",
+				"xtend": "~4.0.1"
+			}
+		},
+		"tmp": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+			"integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+			"dev": true,
+			"requires": {
+				"rimraf": "^3.0.0"
+			}
+		},
+		"to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"dev": true,
+			"requires": {
+				"is-number": "^7.0.0"
+			}
+		},
+		"traverse": {
+			"version": "0.3.9",
+			"resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+			"integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
+			"dev": true
+		},
+		"tslib": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+			"dev": true
+		},
+		"tsutils": {
+			"version": "3.21.0",
+			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+			"integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+			"dev": true,
+			"requires": {
+				"tslib": "^1.8.1"
+			}
+		},
+		"tunnel": {
+			"version": "0.0.6",
+			"resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+			"integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+			"dev": true
+		},
+		"tunnel-agent": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "^5.0.1"
+			}
+		},
+		"type-check": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+			"dev": true,
+			"requires": {
+				"prelude-ls": "^1.2.1"
+			}
+		},
+		"type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+			"dev": true
+		},
+		"typed-rest-client": {
+			"version": "1.8.6",
+			"resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.6.tgz",
+			"integrity": "sha512-xcQpTEAJw2DP7GqVNECh4dD+riS+C1qndXLfBCJ3xk0kqprtGN491P5KlmrDbKdtuW8NEcP/5ChxiJI3S9WYTA==",
+			"dev": true,
+			"requires": {
+				"qs": "^6.9.1",
+				"tunnel": "0.0.6",
+				"underscore": "^1.12.1"
+			}
+		},
+		"typescript": {
+			"version": "4.4.4",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
+			"integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
+			"dev": true
+		},
+		"typescript-formatter": {
+			"version": "7.2.2",
+			"resolved": "https://registry.npmjs.org/typescript-formatter/-/typescript-formatter-7.2.2.tgz",
+			"integrity": "sha512-V7vfI9XArVhriOTYHPzMU2WUnm5IMdu9X/CPxs8mIMGxmTBFpDABlbkBka64PZJ9/xgQeRpK8KzzAG4MPzxBDQ==",
+			"dev": true,
+			"requires": {
+				"commandpost": "^1.0.0",
+				"editorconfig": "^0.15.0"
+			}
+		},
+		"uc.micro": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+			"integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+			"dev": true
+		},
+		"underscore": {
+			"version": "1.13.1",
+			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
+			"integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
+			"dev": true
+		},
+		"universalify": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+			"dev": true
+		},
+		"untildify": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+			"integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+			"dev": true
+		},
+		"unzipper": {
+			"version": "0.10.11",
+			"resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz",
+			"integrity": "sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==",
+			"dev": true,
+			"requires": {
+				"big-integer": "^1.6.17",
+				"binary": "~0.3.0",
+				"bluebird": "~3.4.1",
+				"buffer-indexof-polyfill": "~1.0.0",
+				"duplexer2": "~0.1.4",
+				"fstream": "^1.0.12",
+				"graceful-fs": "^4.2.2",
+				"listenercount": "~1.0.1",
+				"readable-stream": "~2.3.6",
+				"setimmediate": "~1.0.4"
+			}
+		},
+		"uri-js": {
+			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+			"dev": true,
+			"requires": {
+				"punycode": "^2.1.0"
+			}
+		},
+		"url-join": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
+			"integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==",
+			"dev": true
+		},
+		"util-deprecate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+			"dev": true
+		},
+		"v8-compile-cache": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+			"dev": true
+		},
+		"vsce": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/vsce/-/vsce-2.5.1.tgz",
+			"integrity": "sha512-vJ+xY93Wv3NhgeriMyIC2oMA+niifOI9XGIqEToIq/rFRoQnXlmO4PSyis/OxBl9hw8OKKC/VcI9CijfFufEkw==",
+			"dev": true,
+			"requires": {
+				"azure-devops-node-api": "^11.0.1",
+				"chalk": "^2.4.2",
+				"cheerio": "^1.0.0-rc.9",
+				"commander": "^6.1.0",
+				"glob": "^7.0.6",
+				"hosted-git-info": "^4.0.2",
+				"keytar": "^7.7.0",
+				"leven": "^3.1.0",
+				"markdown-it": "^10.0.0",
+				"mime": "^1.3.4",
+				"minimatch": "^3.0.3",
+				"parse-semver": "^1.1.1",
+				"read": "^1.0.7",
+				"semver": "^5.1.0",
+				"tmp": "^0.2.1",
+				"typed-rest-client": "^1.8.4",
+				"url-join": "^4.0.1",
+				"xml2js": "^0.4.23",
+				"yauzl": "^2.3.1",
+				"yazl": "^2.2.2"
+			},
+			"dependencies": {
+				"chalk": {
+					"version": "2.4.2",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^3.2.1",
+						"escape-string-regexp": "^1.0.5",
+						"supports-color": "^5.3.0"
+					}
+				},
+				"commander": {
+					"version": "6.2.1",
+					"resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+					"integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+					"dev": true
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"semver": {
+					"version": "5.7.1",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+					"dev": true
+				}
+			}
+		},
+		"vscode-jsonrpc": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz",
+			"integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="
+		},
+		"vscode-languageclient": {
+			"version": "6.1.4",
+			"resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.4.tgz",
+			"integrity": "sha512-EUOU+bJu6axmt0RFNo3nrglQLPXMfanbYViJee3Fbn2VuQoX0ZOI4uTYhSRvYLP2vfwTP/juV62P/mksCdTZMA==",
+			"requires": {
+				"semver": "^6.3.0",
+				"vscode-languageserver-protocol": "3.15.3"
+			}
+		},
+		"vscode-languageserver-protocol": {
+			"version": "3.15.3",
+			"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz",
+			"integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==",
+			"requires": {
+				"vscode-jsonrpc": "^5.0.1",
+				"vscode-languageserver-types": "3.15.1"
+			}
+		},
+		"vscode-languageserver-types": {
+			"version": "3.15.1",
+			"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
+			"integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="
+		},
+		"vscode-test": {
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-1.6.1.tgz",
+			"integrity": "sha512-086q88T2ca1k95mUzffvbzb7esqQNvJgiwY4h29ukPhFo8u+vXOOmelUoU5EQUHs3Of8+JuQ3oGdbVCqaxuTXA==",
+			"dev": true,
+			"requires": {
+				"http-proxy-agent": "^4.0.1",
+				"https-proxy-agent": "^5.0.0",
+				"rimraf": "^3.0.2",
+				"unzipper": "^0.10.11"
+			}
+		},
+		"which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
+			"requires": {
+				"isexe": "^2.0.0"
+			}
+		},
+		"wide-align": {
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+			"integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+			"dev": true,
+			"requires": {
+				"string-width": "^1.0.2 || 2 || 3 || 4"
+			}
+		},
+		"word-wrap": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+			"dev": true
+		},
+		"workerpool": {
+			"version": "6.1.5",
+			"resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
+			"integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
+			"dev": true
+		},
+		"wrap-ansi": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+			"dev": true,
+			"requires": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+					"dev": true,
+					"requires": {
+						"color-convert": "^2.0.1"
+					}
+				},
+				"color-convert": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+					"dev": true,
+					"requires": {
+						"color-name": "~1.1.4"
+					}
+				},
+				"color-name": {
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+					"dev": true
+				}
+			}
+		},
+		"wrappy": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+			"dev": true
+		},
+		"xml2js": {
+			"version": "0.4.23",
+			"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+			"integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+			"dev": true,
+			"requires": {
+				"sax": ">=0.6.0",
+				"xmlbuilder": "~11.0.0"
+			}
+		},
+		"xmlbuilder": {
+			"version": "11.0.1",
+			"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+			"integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+			"dev": true
+		},
+		"xtend": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+			"dev": true
+		},
+		"y18n": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+			"dev": true
+		},
+		"yallist": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+			"integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
+		},
+		"yargs": {
+			"version": "16.2.0",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+			"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+			"dev": true,
+			"requires": {
+				"cliui": "^7.0.2",
+				"escalade": "^3.1.1",
+				"get-caller-file": "^2.0.5",
+				"require-directory": "^2.1.1",
+				"string-width": "^4.2.0",
+				"y18n": "^5.0.5",
+				"yargs-parser": "^20.2.2"
+			}
+		},
+		"yargs-parser": {
+			"version": "20.2.4",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+			"integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+			"dev": true
+		},
+		"yargs-unparser": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+			"integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
+			"dev": true,
+			"requires": {
+				"camelcase": "^6.0.0",
+				"decamelize": "^4.0.0",
+				"flat": "^5.0.2",
+				"is-plain-obj": "^2.1.0"
+			}
+		},
+		"yauzl": {
+			"version": "2.10.0",
+			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+			"integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+			"dev": true,
+			"requires": {
+				"buffer-crc32": "~0.2.3",
+				"fd-slicer": "~1.1.0"
+			}
+		},
+		"yazl": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
+			"integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
+			"dev": true,
+			"requires": {
+				"buffer-crc32": "~0.2.3"
+			}
+		},
+		"yocto-queue": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+			"dev": true
+		}
+	}
 }
diff --git a/language/move-analyzer/editors/code/package.json b/language/move-analyzer/editors/code/package.json
index 7ee536c720..9e54615e57 100644
--- a/language/move-analyzer/editors/code/package.json
+++ b/language/move-analyzer/editors/code/package.json
@@ -3,8 +3,9 @@
 	"displayName": "move-analyzer",
 	"description": "A language server and basic grammar for the Move programming language.",
 	"publisher": "move",
+	"icon": "images/move.png",
 	"license": "Apache-2.0",
-	"version": "0.0.7",
+	"version": "0.0.10",
 	"preview": true,
 	"homepage": "https://github.com/move-language/move",
 	"repository": {
@@ -25,7 +26,8 @@
 	],
 	"main": "./out/src/main.js",
 	"activationEvents": [
-		"onLanguage:move"
+		"onLanguage:move",
+		"workspaceContains:Move.toml"
 	],
 	"contributes": {
 		"commands": [
@@ -84,14 +86,16 @@
 		}
 	},
 	"scripts": {
-		"compile": "tsc -p ./",
+		"compile": "tsc -p ./ && cd ../../ && cargo build",
 		"watch": "tsc -watch -p ./",
-		"lint": "tsfmt --verify && eslint . --ext ts --max-warnings 0",
-		"fix": "tsfmt --replace && eslint . --ext ts --fix",
-		"pretest": "npm run compile && npm run lint",
+		"lint": "eslint . --ext ts --max-warnings 0",
+		"fix": "eslint . --ext ts --fix",
+		"copy-tests-files": "copyfiles \"tests/**/*.move\" \"tests/**/*.exp\" \"tests/**/*.toml\" \"tests/**/*.code-workspace\" out",
+		"pretest": "npm run compile && npm run lint && npm run copy-tests-files",
 		"test": "node ./out/tests/runTests.js",
+		"dev": "npm run pretest && cross-env mode=dev node ./out/tests/runTests.js",
 		"vscode:prepublish": "npm run pretest",
-		"package": "vsce package -o move-analyzer.vsix",
+		"package": "npm run pretest && vsce package -o move-analyzer.vsix",
 		"publish": "npm run pretest && npm run test && vsce publish"
 	},
 	"extensionDependencies": [
@@ -99,19 +103,24 @@
 	],
 	"dependencies": {
 		"command-exists": "^1.2.9",
-		"vscode-languageclient": "6.1.4"
+		"vscode-languageclient": "6.1.4",
+		"lru-cache": "^4.1.3"
 	},
 	"devDependencies": {
 		"@types/command-exists": "^1.2.0",
+		"@types/fs-extra": "^9.0.13",
 		"@types/glob": "^7.1.4",
 		"@types/mocha": "^9.0.0",
 		"@types/node": "^14.17.22",
 		"@types/vscode": "^1.58.2",
 		"@typescript-eslint/eslint-plugin": "^4.33.0",
 		"@typescript-eslint/parser": "^4.33.0",
-		"@vscode/test-electron": "^1.6.1",
+		"@vscode/test-electron": "^2.0.0",
+		"copyfiles": "2.4.1",
+		"cross-env": "^7.0.3",
 		"eslint": "^7.32.0",
 		"eslint-plugin-tsdoc": "^0.2.14",
+		"fs-extra": "10.0.1",
 		"glob": "^7.1.7",
 		"mocha": "^9.1.1",
 		"typescript": "^4.4.4",
diff --git a/language/move-analyzer/editors/code/src/commands/index.ts b/language/move-analyzer/editors/code/src/commands/index.ts
new file mode 100644
index 0000000000..71d5f7fdfb
--- /dev/null
+++ b/language/move-analyzer/editors/code/src/commands/index.ts
@@ -0,0 +1 @@
+export * from './lsp_command';
diff --git a/language/move-analyzer/editors/code/src/commands/lsp_command.ts b/language/move-analyzer/editors/code/src/commands/lsp_command.ts
new file mode 100644
index 0000000000..157551759a
--- /dev/null
+++ b/language/move-analyzer/editors/code/src/commands/lsp_command.ts
@@ -0,0 +1,60 @@
+import type {
+    DocumentSymbolParams,
+    SymbolInformation,
+    DocumentSymbol,
+    CompletionParams,
+    CompletionList,
+    CompletionItem,
+} from 'vscode-languageclient';
+import { DocumentSymbolRequest, HoverRequest, CompletionRequest } from 'vscode-languageclient';
+import type { Context } from '../context';
+
+/**
+ * An LSP command textDocument/documentSymbol
+ */
+export async function textDocumentDocumentSymbol(
+    context: Readonly<Context>,
+    params: DocumentSymbolParams,
+): Promise<SymbolInformation[] | DocumentSymbol[] | null> {
+    const client = context.getClient();
+    if (client === undefined) {
+        return Promise.reject(new Error('No language client connected.'));
+    }
+
+    // Send the request to the language client.
+    return client.sendRequest(DocumentSymbolRequest.type, params);
+}
+
+/**
+ * An LSP command textDocument/completion
+ */
+export async function textDocumentCompletion(
+    context: Readonly<Context>,
+    params: CompletionParams,
+): Promise<CompletionList | CompletionItem[] | null> {
+    const client = context.getClient();
+    if (client === undefined) {
+        return Promise.reject(new Error('No language client connected.'));
+    }
+
+    // Send the request to the language client.
+    return client.sendRequest(CompletionRequest.type, params);
+}
+
+
+/**
+ * An LSP command textDocument/hover
+ */
+export async function textDocumentHover(
+    context: Readonly<Context>,
+    params: DocumentSymbolParams,
+)
+    : Promise<SymbolInformation[] | DocumentSymbol[] | null> {
+    const client = context.getClient();
+    if (client === undefined) {
+        return Promise.reject(new Error('No language client connected.'));
+    }
+
+    // Send the request to the language client.
+    return client.sendRequest(HoverRequest.method, params);
+}
diff --git a/language/move-analyzer/editors/code/src/configuration.ts b/language/move-analyzer/editors/code/src/configuration.ts
index 8c37429975..595a791cf5 100644
--- a/language/move-analyzer/editors/code/src/configuration.ts
+++ b/language/move-analyzer/editors/code/src/configuration.ts
@@ -4,6 +4,7 @@
 
 import * as os from 'os';
 import * as vscode from 'vscode';
+import * as Path from 'path';
 
 /**
  * User-defined configuration values, such as those specified in VS Code settings.
@@ -26,16 +27,28 @@ export class Configuration {
     /** The path to the move-analyzer executable. */
     get serverPath(): string {
         const defaultName = 'move-analyzer';
-        const path = this.configuration.get<string>('server.path', defaultName);
-        if (path.length === 0) {
+        let serverPath = this.configuration.get<string>('server.path', defaultName);
+        if (serverPath.length === 0) {
             // The default value of the `server.path` setting is 'move-analyzer'.
             // A user may have over-written this default with an empty string value, ''.
             // An empty string cannot be an executable name, so instead use the default.
             return defaultName;
         }
-        if (path.startsWith('~/')) {
-            return os.homedir() + path.slice('~'.length);
+
+        if (serverPath === defaultName) {
+            // If the program set by the user is through PATH,
+            // it will return directly if specified
+            return defaultName;
+        }
+
+        if (serverPath.startsWith('~/')) {
+            serverPath = os.homedir() + serverPath.slice('~'.length);
         }
-        return path;
+
+        if (process.platform === 'win32' && !serverPath.endsWith('.exe')) {
+            serverPath = serverPath + '.exe';
+        }
+
+        return Path.resolve(serverPath);
     }
 }
diff --git a/language/move-analyzer/editors/code/src/context.ts b/language/move-analyzer/editors/code/src/context.ts
index c962040772..2f894923b8 100644
--- a/language/move-analyzer/editors/code/src/context.ts
+++ b/language/move-analyzer/editors/code/src/context.ts
@@ -7,13 +7,19 @@ import * as vscode from 'vscode';
 import * as lc from 'vscode-languageclient';
 import { log } from './log';
 import { sync as commandExistsSync } from 'command-exists';
+import { IndentAction } from 'vscode';
 
 /** Information passed along to each VS Code command defined by this extension. */
 export class Context {
+    private client: lc.LanguageClient | undefined;
+
     private constructor(
         private readonly extensionContext: Readonly<vscode.ExtensionContext>,
         readonly configuration: Readonly<Configuration>,
-    ) { }
+        client: lc.LanguageClient | undefined = undefined,
+    ) {
+        this.client = client;
+    }
 
     static create(
         extensionContext: Readonly<vscode.ExtensionContext>,
@@ -39,11 +45,44 @@ export class Context {
      */
     registerCommand(
         name: Readonly<string>,
-        command: (context: Readonly<Context>) => Promise<void>,
+        command: (context: Readonly<Context>, ...args: Array<any>) => any,
     ): void {
-        const disposable = vscode.commands.registerCommand(`move-analyzer.${name}`, async () => {
-            const com = await command(this);
-            return com;
+        const disposable = vscode.commands.registerCommand(
+            `move-analyzer.${name}`,
+            async (...args: Array<any>) : Promise<any> => {
+                const ret = await command(this, ...args);
+                return ret;
+            },
+        );
+
+        this.extensionContext.subscriptions.push(disposable);
+    }
+
+    /**
+     * Sets up additional language configuration that's impossible to do via a
+     * separate language-configuration.json file. See [1] for more information.
+     *
+     * This code originates from [2](vscode-rust).
+     *
+     * [1]: https://github.com/Microsoft/vscode/issues/11514#issuecomment-244707076
+     * [2]: https://github.com/rust-lang/vscode-rust/blob/660b412701fe2ea62fad180c40ee4f8a60571c61/src/extension.ts#L287:L287
+     */
+    configureLanguage(): void {
+        const disposable = vscode.languages.setLanguageConfiguration('move', {
+            onEnterRules: [
+                {
+                    // Doc single-line comment
+                    // e.g. ///|
+                    beforeText: /^\s*\/{3}.*$/,
+                    action: { indentAction: IndentAction.None, appendText: '/// ' },
+                },
+                {
+                    // Parent doc single-line comment
+                    // e.g. //!|
+                    beforeText: /^\s*\/{2}!.*$/,
+                    action: { indentAction: IndentAction.None, appendText: '//! ' },
+                },
+            ],
         });
         this.extensionContext.subscriptions.push(disposable);
     }
@@ -59,8 +98,11 @@ export class Context {
      *
      * To read more about the messages sent and responses received by this client, such as
      * "initialize," read [the Language Server Protocol specification](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#initialize).
+     *
+     * In order to synchronously wait for the client to be completely ready,
+     * we need to mark the function as asynchronous
      **/
-    startClient(): void {
+    async startClient(): Promise<void> {
         const executable: lc.Executable = {
             command: this.configuration.serverPath,
         };
@@ -92,5 +134,19 @@ export class Context {
         log.info('Starting client...');
         const disposable = client.start();
         this.extensionContext.subscriptions.push(disposable);
+        this.client = client;
+
+        // Wait for the Move Language Server initialization to complete,
+        // especially the first symbol table parsing is completed
+        await this.client.onReady();
+    }
+
+    /**
+     * Returns the client that this extension interacts with.
+     *
+     * @returns lc.LanguageClient
+     */
+    getClient(): lc.LanguageClient | undefined {
+        return this.client;
     }
-}
+} // Context
diff --git a/language/move-analyzer/editors/code/src/main.ts b/language/move-analyzer/editors/code/src/main.ts
index 169bc9b2d1..64981a2263 100644
--- a/language/move-analyzer/editors/code/src/main.ts
+++ b/language/move-analyzer/editors/code/src/main.ts
@@ -6,8 +6,11 @@ import { Configuration } from './configuration';
 import { Context } from './context';
 import { Extension } from './extension';
 import { log } from './log';
+
 import * as childProcess from 'child_process';
 import * as vscode from 'vscode';
+import * as commands from './commands';
+
 
 /**
  * An extension command that displays the version of the server that this extension
@@ -40,8 +43,11 @@ async function serverVersion(context: Readonly<Context>): Promise<void> {
  *
  * Activation events for this extension are listed in its `package.json` file, under the key
  * `"activationEvents"`.
+ *
+ * In order to achieve synchronous activation, mark the function as an asynchronous function,
+ * so that you can wait for the activation to complete by await
  */
-export function activate(extensionContext: Readonly<vscode.ExtensionContext>): void {
+export async function activate(extensionContext: Readonly<vscode.ExtensionContext>): Promise<void> {
     const extension = new Extension();
     log.info(`${extension.identifier} version ${extension.version}`);
 
@@ -62,6 +68,12 @@ export function activate(extensionContext: Readonly<vscode.ExtensionContext>): v
     // Register handlers for VS Code commands that the user explicitly issues.
     context.registerCommand('serverVersion', serverVersion);
 
+    // Configure other language features.
+    context.configureLanguage();
+
     // All other utilities provided by this extension occur via the language server.
-    context.startClient();
+    await context.startClient();
+    context.registerCommand('textDocumentDocumentSymbol', commands.textDocumentDocumentSymbol);
+    context.registerCommand('textDocumentHover', commands.textDocumentHover);
+    context.registerCommand('textDocumentCompletion', commands.textDocumentCompletion);
 }
diff --git a/language/move-analyzer/editors/code/tests/index.ts b/language/move-analyzer/editors/code/tests/index.ts
index 8b7cd74b5a..1660a4dc49 100644
--- a/language/move-analyzer/editors/code/tests/index.ts
+++ b/language/move-analyzer/editors/code/tests/index.ts
@@ -14,13 +14,21 @@ import * as path from 'path';
 /* eslint-disable */
 // deno-lint-ignore require-await
 export async function run(): Promise<void> {
+    // dev mode
+    const mode = process.env['mode'] || 'test';
+    if (mode === 'dev') {
+        return new Promise((resolve) => {
+            setTimeout(resolve, 1000 * 60 * 15); // Development mode, set a timeout of 15 minutes
+        });
+    }
+
     /* eslint-disable */
     const suite = new Mocha({
         ui: 'tdd',
         color: true,
         // The default timeout of 2000 miliseconds can sometimes be too quick, since the extension
         // tests need to launch VS Code first.
-        timeout: 5000,
+        timeout: 10000,
     });
 
     const testsRoot = path.resolve(__dirname, '..');
diff --git a/language/move-analyzer/editors/code/tests/lsp-demo/Move.toml b/language/move-analyzer/editors/code/tests/lsp-demo/Move.toml
new file mode 100644
index 0000000000..47ddc67395
--- /dev/null
+++ b/language/move-analyzer/editors/code/tests/lsp-demo/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Symbols"
+version = "0.0.1"
+
+[dependencies]
+MoveStdlib = { local = "../../../../../../move-stdlib/", addr_subst = { "std" = "0x1" } }
+
+[addresses]
+Symbols = "0xCAFE"
diff --git a/language/move-analyzer/editors/code/tests/lsp-demo/lsp-demo-win.code-workspace b/language/move-analyzer/editors/code/tests/lsp-demo/lsp-demo-win.code-workspace
new file mode 100644
index 0000000000..4651fb61d0
--- /dev/null
+++ b/language/move-analyzer/editors/code/tests/lsp-demo/lsp-demo-win.code-workspace
@@ -0,0 +1,10 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {
+		"move-analyzer.server.path": "../../../../../../target/debug/move-analyzer"
+	}
+}
diff --git a/language/move-analyzer/editors/code/tests/lsp-demo/lsp-demo.code-workspace b/language/move-analyzer/editors/code/tests/lsp-demo/lsp-demo.code-workspace
new file mode 100644
index 0000000000..087aded48f
--- /dev/null
+++ b/language/move-analyzer/editors/code/tests/lsp-demo/lsp-demo.code-workspace
@@ -0,0 +1,10 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {
+		"move-analyzer.server.path": "../../../../target/debug/move-analyzer"
+	}
+}
diff --git a/language/move-analyzer/editors/code/tests/lsp-demo/sources/Completions.move b/language/move-analyzer/editors/code/tests/lsp-demo/sources/Completions.move
new file mode 100644
index 0000000000..b0ff2df28f
--- /dev/null
+++ b/language/move-analyzer/editors/code/tests/lsp-demo/sources/Completions.move
@@ -0,0 +1,13 @@
+module Symbols::Completions {
+  fun add(a: u64, b: u64): u64 {
+    a + b
+  }
+
+  fun subtract(a: u64, b: u64): u64 {
+    a - b
+  }
+
+  fun divide(a: u64, b: u64): u64 {
+    a / b
+  }
+}
diff --git a/language/move-analyzer/editors/code/tests/lsp-demo/sources/M1.move b/language/move-analyzer/editors/code/tests/lsp-demo/sources/M1.move
new file mode 100644
index 0000000000..d1454454b6
--- /dev/null
+++ b/language/move-analyzer/editors/code/tests/lsp-demo/sources/M1.move
@@ -0,0 +1,18 @@
+module Symbols::M1 {
+
+    const SOME_CONST: u64 = 42;
+
+    struct SomeOtherStruct has drop {
+        some_field: u64,
+    }
+
+    public fun some_other_struct(v: u64): SomeOtherStruct {
+        SomeOtherStruct { some_field: v }
+    }
+
+    #[test]
+    #[expected_failure]
+    fun this_is_a_test() {
+        1/0;
+    }
+}
diff --git a/language/move-analyzer/editors/code/tests/lsp-demo/sources/M2.move b/language/move-analyzer/editors/code/tests/lsp-demo/sources/M2.move
new file mode 100644
index 0000000000..4d00f275e7
--- /dev/null
+++ b/language/move-analyzer/editors/code/tests/lsp-demo/sources/M2.move
@@ -0,0 +1,22 @@
+module Symbols::M2 {
+
+    /// Constant containing the answer to the universe
+    const DOCUMENTED_CONSTANT: u64 = 42;
+
+    /**
+       This is a multiline docstring
+
+       This docstring has empty lines.
+
+       It uses the ** format instead of ///
+    */
+    fun other_doc_struct(): Symbols::M3::OtherDocStruct {
+        Symbols::M3::create_other_struct(DOCUMENTED_CONSTANT)
+    }
+
+    use Symbols::M3::{Self, OtherDocStruct};
+
+    fun other_doc_struct_import(): OtherDocStruct {
+        M3::create_other_struct(7)
+    }
+}
diff --git a/language/move-analyzer/editors/code/tests/lsp-demo/sources/M3.move b/language/move-analyzer/editors/code/tests/lsp-demo/sources/M3.move
new file mode 100644
index 0000000000..1fd363e82e
--- /dev/null
+++ b/language/move-analyzer/editors/code/tests/lsp-demo/sources/M3.move
@@ -0,0 +1,12 @@
+module Symbols::M3 {
+
+    /// Documented struct in another module
+    struct OtherDocStruct has drop {
+        some_field: u64,
+    }
+
+    /// Documented initializer in another module
+    public fun create_other_struct(v: u64): OtherDocStruct {
+        OtherDocStruct { some_field: v }
+    }
+}
diff --git a/language/move-analyzer/editors/code/tests/lsp.test.ts b/language/move-analyzer/editors/code/tests/lsp.test.ts
new file mode 100644
index 0000000000..c07e29730f
--- /dev/null
+++ b/language/move-analyzer/editors/code/tests/lsp.test.ts
@@ -0,0 +1,218 @@
+import * as assert from 'assert';
+import * as Mocha from 'mocha';
+import * as path from 'path';
+import * as vscode from 'vscode';
+import * as lc from 'vscode-languageclient';
+import type { MarkupContent } from 'vscode-languageclient';
+import { CompletionItemKind } from 'vscode-languageclient';
+
+const isFunctionInCompletionItems = (fnName: string, items: vscode.CompletionItem[]): boolean => {
+    return (
+        items.find((item) => item.label === fnName && item.kind === CompletionItemKind.Function) !==
+        undefined
+    );
+};
+
+const isKeywordInCompletionItems = (label: string, items: vscode.CompletionItem[]): boolean => {
+    return (
+        items.find((item) => item.label === label && item.kind === CompletionItemKind.Keyword) !==
+        undefined
+    );
+};
+
+const PRIMITIVE_TYPES = ['u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'vector'];
+
+Mocha.suite('LSP', () => {
+    Mocha.test('textDocument/documentSymbol', async () => {
+        const ext = vscode.extensions.getExtension('move.move-analyzer');
+        assert.ok(ext);
+
+        await ext.activate(); // Synchronous waiting for activation to complete
+
+        // 1. get workdir
+        const workDir = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? '';
+
+        // 2. open doc
+        const docs = await vscode.workspace.openTextDocument(path.join(workDir, 'sources/M1.move'));
+        await vscode.window.showTextDocument(docs);
+
+        // 3. execute command
+        const params: lc.DocumentSymbolParams = {
+            textDocument: {
+                uri: docs.uri.toString(),
+            },
+        };
+
+        const syms: Array<lc.DocumentSymbol> | undefined = await
+            vscode.commands.executeCommand(
+                'move-analyzer.textDocumentDocumentSymbol', params,
+            );
+
+        assert.ok(syms);
+        assert.deepStrictEqual(syms[0]?.kind, lc.SymbolKind.Module);
+        assert.deepStrictEqual(syms[0].name, 'M1');
+
+        assert.ok(syms[0].children);
+        assert.deepStrictEqual(syms[0]?.children[0]?.kind, lc.SymbolKind.Constant);
+        assert.deepStrictEqual(syms[0]?.children[0].name, 'SOME_CONST');
+        assert.deepStrictEqual(syms[0]?.children[1]?.kind, lc.SymbolKind.Struct);
+        assert.deepStrictEqual(syms[0]?.children[1].name, 'SomeOtherStruct');
+        assert.ok(syms[0].children[1].children);
+        assert.deepStrictEqual(syms[0]?.children[1]?.children[0]?.kind, lc.SymbolKind.Field);
+        assert.deepStrictEqual(syms[0]?.children[1]?.children[0]?.name, 'some_field');
+        assert.deepStrictEqual(syms[0]?.children[1].name, 'SomeOtherStruct');
+        assert.deepStrictEqual(syms[0]?.children[2]?.kind, lc.SymbolKind.Function);
+        assert.deepStrictEqual(syms[0]?.children[2].name, 'some_other_struct');
+        assert.deepStrictEqual(syms[0]?.children[3]?.kind, lc.SymbolKind.Function);
+        assert.deepStrictEqual(syms[0]?.children[3].name, 'this_is_a_test');
+        assert.deepStrictEqual(syms[0]?.children[3]?.detail, '["test", "expected_failure"]');
+    });
+
+    Mocha.test('textDocument/hover for definition in the same module', async () => {
+        const ext = vscode.extensions.getExtension('move.move-analyzer');
+        assert.ok(ext);
+
+        await ext.activate(); // Synchronous waiting for activation to complete
+
+        // 1. get workdir
+        const workDir = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? '';
+
+        // 2. open doc
+        const docs = await vscode.workspace.openTextDocument(
+            path.join(workDir, 'sources/M2.move'),
+        );
+        await vscode.window.showTextDocument(docs);
+
+        // 3. execute command
+        const params: lc.HoverParams = {
+            textDocument: {
+                uri: docs.uri.toString(),
+            },
+            position: {
+                line: 12,
+                character: 8,
+            },
+        };
+
+        const hoverResult: lc.Hover | undefined =
+            await vscode.commands.executeCommand(
+                'move-analyzer.textDocumentHover',
+                params,
+            );
+
+        assert.ok(hoverResult);
+        assert.deepStrictEqual((hoverResult.contents as MarkupContent).value,
+            // eslint-disable-next-line max-len
+            'fun Symbols::M2::other_doc_struct(): Symbols::M3::OtherDocStruct\n\n\nThis is a multiline docstring\n\nThis docstring has empty lines.\n\nIt uses the ** format instead of ///\n\n');
+
+    });
+
+    Mocha.test('textDocument/hover for definition in an external module', async () => {
+        const ext = vscode.extensions.getExtension('move.move-analyzer');
+        assert.ok(ext);
+
+        await ext.activate(); // Synchronous waiting for activation to complete
+
+        // 1. get workdir
+        const workDir = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? '';
+
+        // 2. open doc
+        const docs = await vscode.workspace.openTextDocument(
+            path.join(workDir, 'sources/M2.move'),
+        );
+        await vscode.window.showTextDocument(docs);
+
+        // 3. execute command
+        const params: lc.HoverParams = {
+            textDocument: {
+                uri: docs.uri.toString(),
+            },
+            position: {
+                line: 18,
+                character: 35,
+            },
+        };
+
+        const hoverResult: lc.Hover | undefined =
+            await vscode.commands.executeCommand(
+                'move-analyzer.textDocumentHover',
+                params,
+            );
+
+
+        assert.ok(hoverResult);
+        assert.deepStrictEqual((hoverResult.contents as MarkupContent).value,
+            'Symbols::M3::OtherDocStruct\n\nDocumented struct in another module\n');
+    });
+
+    Mocha.test('textDocument/completion', async () => {
+        const ext = vscode.extensions.getExtension('move.move-analyzer');
+        assert.ok(ext);
+
+        await ext.activate(); // Synchronous waiting for activation to complete
+
+        // 1. get workdir
+        const workDir = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? '';
+
+        // 2. open doc
+        const docs = await vscode.workspace.openTextDocument(
+            path.join(workDir, 'sources/Completions.move'),
+        );
+        await vscode.window.showTextDocument(docs);
+
+        // 3. execute command
+        const params: lc.CompletionParams = {
+            textDocument: {
+                uri: docs.uri.toString(),
+            },
+            position: {
+                line: 12,
+                character: 1,
+            },
+        };
+
+        const items = await vscode.commands.executeCommand<Array<vscode.CompletionItem>>(
+            'move-analyzer.textDocumentCompletion',
+            params,
+        );
+
+        assert.ok(items);
+
+        // Items should return all functions defined in the file
+        assert.strictEqual(isFunctionInCompletionItems('add', items), true);
+        assert.strictEqual(isFunctionInCompletionItems('subtract', items), true);
+        assert.strictEqual(isFunctionInCompletionItems('divide', items), true);
+
+        // Items also include all primitive types because they are keywords
+        PRIMITIVE_TYPES.forEach((primitive) => {
+            assert.strictEqual(isKeywordInCompletionItems(primitive, items), true);
+        });
+
+        const colonParams: lc.CompletionParams = {
+            textDocument: {
+                uri: docs.uri.toString(),
+            },
+            // The position of the character ":"
+            position: {
+                line: 9,
+                character: 15,
+            },
+        };
+
+        const itemsOnColon = await vscode.commands.executeCommand<Array<vscode.CompletionItem>>(
+            'move-analyzer.textDocumentCompletion',
+            colonParams,
+        );
+
+        assert.ok(itemsOnColon);
+
+        const keywordsOnColon = itemsOnColon.filter(i => i.kind === CompletionItemKind.Keyword);
+        // Primitive types are the only keywords returned after inserting the colon
+        assert.strictEqual(keywordsOnColon.length, PRIMITIVE_TYPES.length);
+
+        // Final safety check
+        PRIMITIVE_TYPES.forEach((primitive) => {
+            assert.strictEqual(isKeywordInCompletionItems(primitive, keywordsOnColon), true);
+        });
+    });
+});
diff --git a/language/move-analyzer/editors/code/tests/runTests.ts b/language/move-analyzer/editors/code/tests/runTests.ts
index 5bb578e7a4..a8cd46f285 100644
--- a/language/move-analyzer/editors/code/tests/runTests.ts
+++ b/language/move-analyzer/editors/code/tests/runTests.ts
@@ -9,8 +9,16 @@
  * https://code.visualstudio.com/api/working-with-extensions/testing-extension#the-test-script
  */
 
+import * as os from 'os';
 import * as path from 'path';
-import { runTests } from '@vscode/test-electron';
+import * as cp from 'child_process';
+import * as fs from 'fs';
+import * as fse from 'fs-extra';
+import {
+    runTests,
+    downloadAndUnzipVSCode,
+    resolveCliArgsFromVSCodeExecutablePath,
+} from '@vscode/test-electron';
 
 /**
  * Launches a VS Code instance to run tests.
@@ -18,7 +26,7 @@ import { runTests } from '@vscode/test-electron';
  * This is essentially a TypeScript program that executes the "VS Code Tokenizer Tests" launch
  * target defined in this repository's `.vscode/launch.json`.
  */
-async function main(): Promise<void> {
+async function runVSCodeTest(vscodeVersion: string): Promise<void> {
     try {
         // The `--extensionDevelopmentPath` argument passed to VS Code. This should point to the
         // directory that contains the extension manifest file, `package.json`.
@@ -28,12 +36,45 @@ async function main(): Promise<void> {
         // program that is considered to be the "test suite" for the extension.
         const extensionTestsPath = path.resolve(__dirname, 'index.js');
 
+        // The workspace
+        let testWorkspacePath = path.resolve(__dirname, './lsp-demo/lsp-demo.code-workspace');
+        if (process.platform === 'win32') {
+            testWorkspacePath = path.resolve(__dirname, './lsp-demo/lsp-demo-win.code-workspace');
+        }
+
+        // Install vscode and depends extension
+        const vscodeExecutablePath = await downloadAndUnzipVSCode(vscodeVersion);
+        const [cli, ...args] = resolveCliArgsFromVSCodeExecutablePath(vscodeExecutablePath);
+        const newCli = cli ?? 'code';
+        cp.spawnSync(newCli, [...args, '--install-extension', 'damirka.move-syntax', '--force'], {
+            encoding: 'utf-8',
+            stdio: 'inherit',
+        });
+
+        // Because the default vscode userDataDir is too long,
+        // v1.69.2 will report an error when running test.
+        // So generate a short
+        const userDataDir = path.join(os.tmpdir(), 'vscode-test', vscodeVersion);
+        if (!fs.existsSync(userDataDir)) {
+            fse.mkdirsSync(userDataDir);
+        }
+
         // Download VS Code, unzip it, and run the "test suite" program.
-        await runTests({ extensionDevelopmentPath, extensionTestsPath });
+        await runTests({
+            vscodeExecutablePath: vscodeExecutablePath,
+            extensionDevelopmentPath,
+            extensionTestsPath,
+            launchArgs: [testWorkspacePath, '--user-data-dir', userDataDir],
+        });
     } catch (_err: unknown) {
         console.error('Failed to run tests');
         process.exit(1);
     }
 }
 
+async function main(): Promise<void> {
+    await runVSCodeTest('1.64.0'); // Test with vscode v1.64.0
+    await runVSCodeTest('1.69.2'); // Test with vscode v1.69.2
+}
+
 void main();
diff --git a/language/move-analyzer/editors/code/types/vscode-test-electron.d.ts b/language/move-analyzer/editors/code/types/vscode-test-electron.d.ts
deleted file mode 100644
index e325fbf6ab..0000000000
--- a/language/move-analyzer/editors/code/types/vscode-test-electron.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// FIXME: The vscode-test `runTests` function is implemented in TypeScript and has type annotations:
-// https://github.com/microsoft/vscode-test/blob/v1.6.1/lib/runTest.ts#L86
-// But I don't know where, if anywhere, those types are published, so to appease the TypeScript
-// compiler's type-checker, I declare the function type in this file.
-declare module '@vscode/test-electron' {
-    export interface TestOptions {
-        extensionDevelopmentPath?: string;
-        extensionTestsPath?: string;
-        // N.B.: vscode-test's definition of `TestOptions` contains many more fields:
-        // https://github.com/microsoft/vscode-test/blob/v1.6.1/lib/runTest.ts#L9-L79
-    }
-
-    export function runTests(options: TestOptions): Thenable<number>;
-}
diff --git a/language/move-analyzer/src/bin/move-analyzer.rs b/language/move-analyzer/src/bin/move-analyzer.rs
index 4943a6e804..d99f6032f0 100644
--- a/language/move-analyzer/src/bin/move-analyzer.rs
+++ b/language/move-analyzer/src/bin/move-analyzer.rs
@@ -15,6 +15,7 @@ use std::{
     collections::BTreeMap,
     path::Path,
     sync::{Arc, Mutex},
+    thread,
 };
 
 use move_analyzer::{
@@ -27,7 +28,7 @@ use move_symbol_pool::Symbol;
 use url::Url;
 
 #[derive(Parser)]
-#[clap(author, version = "1.0.0", about)]
+#[clap(author, version, about)]
 struct Options {}
 
 fn main() {
@@ -48,11 +49,18 @@ fn main() {
     );
 
     let (connection, io_threads) = Connection::stdio();
+    let symbols = Arc::new(Mutex::new(symbols::Symbolicator::empty_symbols()));
     let mut context = Context {
         connection,
         files: VirtualFileSystem::default(),
-        symbols: Arc::new(Mutex::new(symbols::Symbolicator::empty_symbols())),
+        symbols: symbols.clone(),
     };
+
+    let (id, client_response) = context
+        .connection
+        .initialize_start()
+        .expect("could not start connection initialization");
+
     let capabilities = serde_json::to_value(lsp_types::ServerCapabilities {
         // The server receives notifications from the client as users open, close,
         // and modify documents.
@@ -98,22 +106,56 @@ fn main() {
             symbols::DEFS_AND_REFS_SUPPORT,
         )),
         references_provider: Some(OneOf::Left(symbols::DEFS_AND_REFS_SUPPORT)),
+        document_symbol_provider: Some(OneOf::Left(true)),
         ..Default::default()
     })
     .expect("could not serialize server capabilities");
 
-    context
-        .connection
-        .initialize(capabilities)
-        .expect("could not initialize the connection");
-
     let (diag_sender, diag_receiver) = bounded::<Result<BTreeMap<Symbol, Vec<Diagnostic>>>>(0);
     let mut symbolicator_runner = symbols::SymbolicatorRunner::idle();
     if symbols::DEFS_AND_REFS_SUPPORT {
-        symbolicator_runner =
-            symbols::SymbolicatorRunner::new(context.symbols.clone(), diag_sender);
+        let initialize_params: lsp_types::InitializeParams =
+            serde_json::from_value(client_response)
+                .expect("could not deserialize client capabilities");
+
+        symbolicator_runner = symbols::SymbolicatorRunner::new(symbols.clone(), diag_sender);
+
+        // If initialization information from the client contains a path to the directory being
+        // opened, try to initialize symbols before sending response to the client. Do not bother
+        // with diagnostics as they will be recomputed whenever the first source file is opened. The
+        // main reason for this is to enable unit tests that rely on the symbolication information
+        // to be available right after the client is initialized.
+        if let Some(uri) = initialize_params.root_uri {
+            if let Some(p) = symbols::SymbolicatorRunner::root_dir(&uri.to_file_path().unwrap()) {
+                // need to evaluate in a separate thread to allow for a larger stack size (needed on
+                // Windows)
+                thread::Builder::new()
+                    .stack_size(symbols::STACK_SIZE_BYTES)
+                    .spawn(move || {
+                        if let Ok((Some(new_symbols), _)) =
+                            symbols::Symbolicator::get_symbols(p.as_path())
+                        {
+                            let mut old_symbols = symbols.lock().unwrap();
+                            (*old_symbols).merge(new_symbols);
+                        }
+                    })
+                    .unwrap()
+                    .join()
+                    .unwrap();
+            }
+        }
     };
 
+    context
+        .connection
+        .initialize_finish(
+            id,
+            serde_json::json!({
+                "capabilities": capabilities,
+            }),
+        )
+        .expect("could not finish connection initialization");
+
     loop {
         select! {
             recv(diag_receiver) -> message => {
@@ -181,7 +223,9 @@ fn main() {
 
 fn on_request(context: &Context, request: &Request) {
     match request.method.as_str() {
-        lsp_types::request::Completion::METHOD => on_completion_request(context, request),
+        lsp_types::request::Completion::METHOD => {
+            on_completion_request(context, request, &context.symbols.lock().unwrap())
+        }
         lsp_types::request::GotoDefinition::METHOD => {
             symbols::on_go_to_def_request(context, request, &context.symbols.lock().unwrap());
         }
@@ -194,6 +238,9 @@ fn on_request(context: &Context, request: &Request) {
         lsp_types::request::HoverRequest::METHOD => {
             symbols::on_hover_request(context, request, &context.symbols.lock().unwrap());
         }
+        lsp_types::request::DocumentSymbolRequest::METHOD => {
+            symbols::on_document_symbol_request(context, request, &context.symbols.lock().unwrap());
+        }
         _ => eprintln!("handle request '{}' from client", request.method),
     }
 }
diff --git a/language/move-analyzer/src/completion.rs b/language/move-analyzer/src/completion.rs
index 34c61b4340..787ee43f4a 100644
--- a/language/move-analyzer/src/completion.rs
+++ b/language/move-analyzer/src/completion.rs
@@ -2,15 +2,16 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::context::Context;
+use crate::{context::Context, symbols::Symbols};
 use lsp_server::Request;
 use lsp_types::{CompletionItem, CompletionItemKind, CompletionParams, Position};
 use move_command_line_common::files::FileHash;
 use move_compiler::parser::{
-    keywords::{BUILTINS, CONTEXTUAL_KEYWORDS, KEYWORDS},
+    keywords::{BUILTINS, CONTEXTUAL_KEYWORDS, KEYWORDS, PRIMITIVE_TYPES},
     lexer::{Lexer, Tok},
 };
-use std::collections::HashSet;
+use move_symbol_pool::Symbol;
+use std::{collections::HashSet, path::PathBuf};
 
 /// Constructs an `lsp_types::CompletionItem` with the given `label` and `kind`.
 fn completion_item(label: &str, kind: CompletionItemKind) -> CompletionItem {
@@ -31,6 +32,7 @@ fn keywords() -> Vec<CompletionItem> {
     KEYWORDS
         .iter()
         .chain(CONTEXTUAL_KEYWORDS.iter())
+        .chain(PRIMITIVE_TYPES.iter())
         .map(|label| {
             let kind = if label == &"copy" || label == &"move" {
                 CompletionItemKind::Operator
@@ -42,6 +44,14 @@ fn keywords() -> Vec<CompletionItem> {
         .collect()
 }
 
+/// Return a list of completion items of Move's primitive types
+fn primitive_types() -> Vec<CompletionItem> {
+    PRIMITIVE_TYPES
+        .iter()
+        .map(|label| completion_item(label, CompletionItemKind::Keyword))
+        .collect()
+}
+
 /// Return a list of completion items corresponding to each one of Move's builtin functions.
 fn builtins() -> Vec<CompletionItem> {
     BUILTINS
@@ -59,7 +69,7 @@ fn builtins() -> Vec<CompletionItem> {
 /// server did not initialize with a response indicating it's capable of providing completions. In
 /// the future, the server should be modified to return semantically valid completion items, not
 /// simple textual suggestions.
-fn identifiers(buffer: &str) -> Vec<CompletionItem> {
+fn identifiers(buffer: &str, symbols: &Symbols, path: &PathBuf) -> Vec<CompletionItem> {
     let mut lexer = Lexer::new(buffer, FileHash::new(buffer));
     if lexer.advance().is_err() {
         return vec![];
@@ -83,13 +93,26 @@ fn identifiers(buffer: &str) -> Vec<CompletionItem> {
         }
     }
 
+    let mods_opt = symbols.file_mods().get(path);
+
     // The completion item kind "text" indicates that the item is based on simple textual matching,
     // not any deeper semantic analysis.
-    let items = ids
-        .iter()
-        .map(|label| completion_item(label, CompletionItemKind::Text))
-        .collect();
-    items
+    ids.iter()
+        .map(|label| {
+            if let Some(mods) = mods_opt {
+                if mods
+                    .iter()
+                    .any(|m| m.functions().contains_key(&Symbol::from(*label)))
+                {
+                    completion_item(label, CompletionItemKind::Function)
+                } else {
+                    completion_item(label, CompletionItemKind::Text)
+                }
+            } else {
+                completion_item(label, CompletionItemKind::Text)
+            }
+        })
+        .collect()
 }
 
 /// Returns the token corresponding to the "trigger character" that precedes the user's cursor,
@@ -122,15 +145,23 @@ fn get_cursor_token(buffer: &str, position: &Position) -> Option<Tok> {
 /// Sends the given connection a response to a completion request.
 ///
 /// The completions returned depend upon where the user's cursor is positioned.
-pub fn on_completion_request(context: &Context, request: &Request) {
+pub fn on_completion_request(context: &Context, request: &Request, symbols: &Symbols) {
     eprintln!("handling completion request");
     let parameters = serde_json::from_value::<CompletionParams>(request.params.clone())
         .expect("could not deserialize completion request");
 
-    let path = parameters.text_document_position.text_document.uri.path();
-    let buffer = context.files.get(path);
+    let path = parameters
+        .text_document_position
+        .text_document
+        .uri
+        .to_file_path()
+        .unwrap();
+    let buffer = context.files.get(&path);
     if buffer.is_none() {
-        eprintln!("Could not read '{}' when handling completion request", path);
+        eprintln!(
+            "Could not read '{:?}' when handling completion request",
+            path
+        );
     }
 
     // The completion items we provide depend upon where the user's cursor is positioned.
@@ -140,9 +171,7 @@ pub fn on_completion_request(context: &Context, request: &Request) {
     let mut items = vec![];
     match cursor {
         Some(Tok::Colon) => {
-            // If the user's cursor is positioned after a single `:`, do not provide any completion
-            // items at all -- this is a "mis-fire" of the "trigger character" `:`.
-            return;
+            items.extend_from_slice(&primitive_types());
         }
         Some(Tok::Period) | Some(Tok::ColonColon) => {
             // `.` or `::` must be followed by identifiers, which are added to the completion items
@@ -157,7 +186,7 @@ pub fn on_completion_request(context: &Context, request: &Request) {
     }
 
     if let Some(buffer) = &buffer {
-        let identifiers = identifiers(buffer);
+        let identifiers = identifiers(buffer, symbols, &path);
         items.extend_from_slice(&identifiers);
     }
 
diff --git a/language/move-analyzer/src/symbols.rs b/language/move-analyzer/src/symbols.rs
index c847c3758b..970549ef70 100644
--- a/language/move-analyzer/src/symbols.rs
+++ b/language/move-analyzer/src/symbols.rs
@@ -54,16 +54,19 @@ use crate::{
 use anyhow::{anyhow, Result};
 use codespan_reporting::files::SimpleFiles;
 use crossbeam::channel::Sender;
+use derivative::*;
 use im::ordmap::OrdMap;
 use lsp_server::{Request, RequestId};
 use lsp_types::{
-    request::GotoTypeDefinitionParams, Diagnostic, GotoDefinitionParams, Hover, HoverContents,
-    HoverParams, LanguageString, Location, MarkedString, Position, Range, ReferenceParams,
+    request::GotoTypeDefinitionParams, Diagnostic, DocumentSymbol, DocumentSymbolParams,
+    GotoDefinitionParams, Hover, HoverContents, HoverParams, LanguageString, Location,
+    MarkedString, Position, Range, ReferenceParams, SymbolKind,
 };
+
 use std::{
     cmp,
     collections::{BTreeMap, BTreeSet, HashMap},
-    fmt, fs,
+    fmt,
     path::{Path, PathBuf},
     sync::{Arc, Condvar, Mutex},
     thread,
@@ -90,6 +93,9 @@ use move_symbol_pool::Symbol;
 /// Enabling/disabling the language server reporting readiness to support go-to-def and
 /// go-to-references to the IDE.
 pub const DEFS_AND_REFS_SUPPORT: bool = true;
+// Building Move code requires a larger stack size on Windows (16M has been chosen somewhat
+// arbitrarily)
+pub const STACK_SIZE_BYTES: usize = 16 * 1024 * 1024;
 
 #[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Copy)]
 /// Location of a definition's identifier
@@ -121,7 +127,8 @@ pub enum IdentType {
         ModuleIdent_, /* defining module */
         Symbol,       /* name */
         Vec<Type>,    /* type args */
-        Vec<Type>,    /* args */
+        Vec<Symbol>,  /* arg names */
+        Vec<Type>,    /* arg types */
         Type,         /* ret */
         Vec<Type>,    /* acquires */
     ),
@@ -142,33 +149,50 @@ pub struct UseDef {
     def_loc: DefLoc,
     /// Location of the type definition
     type_def_loc: Option<DefLoc>,
+    /// Doc string for the relevant identifier/function
+    doc_string: String,
 }
 
 /// Definition of a struct field
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Ord, PartialOrd, PartialEq, Eq)]
 struct FieldDef {
     name: Symbol,
     start: Position,
 }
 
 /// Definition of a struct
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Ord, PartialOrd, PartialEq, Eq)]
 struct StructDef {
     name_start: Position,
     field_defs: Vec<FieldDef>,
 }
 
+#[derive(Derivative, Debug, Clone, PartialEq, Eq)]
+#[derivative(PartialOrd, Ord)]
+pub struct FunctionDef {
+    name: Symbol,
+    start: Position,
+    attrs: Vec<String>,
+    #[derivative(PartialOrd = "ignore")]
+    #[derivative(Ord = "ignore")]
+    ident_type: IdentType,
+}
+
 /// Module-level definitions
-#[derive(Debug)]
-struct ModuleDefs {
+#[derive(Debug, Clone, Ord, PartialOrd, PartialEq, Eq)]
+pub struct ModuleDefs {
     /// File where this module is located
     fhash: FileHash,
+    /// Location where this module is located
+    start: Position,
+    /// Module name
+    name: ModuleIdent_,
     /// Struct definitions
     structs: BTreeMap<Symbol, StructDef>,
     /// Const definitions
     constants: BTreeMap<Symbol, Position>,
     /// Function definitions
-    functions: BTreeMap<Symbol, Position>,
+    functions: BTreeMap<Symbol, FunctionDef>,
 }
 
 /// Data used during symbolication
@@ -179,6 +203,8 @@ pub struct Symbolicator {
     files: SimpleFiles<Symbol, String>,
     /// A mapping from file hashes to file IDs (used to obtain source file locations)
     file_id_mapping: HashMap<FileHash, usize>,
+    // A mapping from file IDs to a split vector of the lines in each file (used to build docstrings)
+    file_id_to_lines: HashMap<usize, Vec<String>>,
     /// Contains type params where relevant (e.g. when processing function definition)
     type_params: BTreeMap<Symbol, DefLoc>,
     /// Current processed module (always set before module processing starts)
@@ -187,9 +213,13 @@ pub struct Symbolicator {
 
 /// Maps a line number to a list of use-def pairs on a given line (use-def set is sorted by
 /// col_start)
-#[derive(Debug)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 struct UseDefMap(BTreeMap<u32, BTreeSet<UseDef>>);
 
+/// Maps a function name to its usage definition
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct FunctionIdentTypeMap(BTreeMap<String, IdentType>);
+
 /// Result of the symbolication process
 pub struct Symbols {
     /// A map from def locations to all the references (uses)
@@ -198,6 +228,8 @@ pub struct Symbols {
     file_use_defs: BTreeMap<PathBuf, UseDefMap>,
     /// A mapping from file hashes to file names
     file_name_mapping: BTreeMap<FileHash, Symbol>,
+    /// A mapping from filePath to ModuleDefs
+    file_mods: BTreeMap<PathBuf, BTreeSet<ModuleDefs>>,
 }
 
 #[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
@@ -212,6 +244,12 @@ pub struct SymbolicatorRunner {
     mtx_cvar: Arc<(Mutex<RunnerState>, Condvar)>,
 }
 
+impl ModuleDefs {
+    pub fn functions(&self) -> &BTreeMap<Symbol, FunctionDef> {
+        &self.functions
+    }
+}
+
 impl fmt::Display for IdentType {
     fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
         match self {
@@ -225,9 +263,9 @@ impl fmt::Display for IdentType {
                 // IDE independently on how compiler error messages are generated.
                 write!(f, "{}", type_to_ide_string(t))
             }
-            Self::FunctionType(mod_ident, name, type_args, args, ret, acquires) => {
+            Self::FunctionType(mod_ident, name, type_args, arg_names, arg_types, ret, acquires) => {
                 let type_args_str = if !type_args.is_empty() {
-                    let mut s = "<".to_string();
+                    let mut s = '<'.to_string();
                     s.push_str(&type_list_to_ide_string(type_args));
                     s.push('>');
                     s
@@ -253,7 +291,7 @@ impl fmt::Display for IdentType {
                     mod_ident.module.value(),
                     name,
                     type_args_str,
-                    type_list_to_ide_string(args),
+                    arg_list_to_ide_string(arg_names, arg_types),
                     ret_str,
                     acquires_str
                 )
@@ -262,6 +300,15 @@ impl fmt::Display for IdentType {
     }
 }
 
+fn arg_list_to_ide_string(names: &[Symbol], types: &[Type]) -> String {
+    names
+        .iter()
+        .zip(types.iter())
+        .map(|(n, t)| format!("{}: {}", n, type_to_ide_string(t)))
+        .collect::<Vec<_>>()
+        .join(", ")
+}
+
 fn type_to_ide_string(sp!(_, t): &Type) -> String {
     match t {
         Type_::Unit => "()".to_string(),
@@ -309,8 +356,8 @@ fn addr_to_ide_string(addr: &Address) -> String {
     }
 }
 
-fn type_list_to_ide_string(items: &[Type]) -> String {
-    items
+fn type_list_to_ide_string(types: &[Type]) -> String {
+    types
         .iter()
         .map(type_to_ide_string)
         .collect::<Vec<_>>()
@@ -333,95 +380,98 @@ impl SymbolicatorRunner {
         let thread_mtx_cvar = mtx_cvar.clone();
         let runner = SymbolicatorRunner { mtx_cvar };
 
-        thread::spawn(move || {
-            let (mtx, cvar) = &*thread_mtx_cvar;
-            // Locations opened in the IDE (files or directories) for which manifest file is missing
-            let mut missing_manifests = BTreeSet::new();
-            // infinite loop to wait for symbolication requests
-            eprintln!("starting symbolicator runner loop");
-            loop {
-                let starting_path_opt = {
-                    // hold the lock only as long as it takes to get the data, rather than through
-                    // the whole symbolication process (hence a separate scope here)
-                    let mut symbolicate = mtx.lock().unwrap();
-                    match symbolicate.clone() {
-                        RunnerState::Quit => break,
-                        RunnerState::Run(root_dir) => {
-                            *symbolicate = RunnerState::Wait;
-                            Some(root_dir)
-                        }
-                        RunnerState::Wait => {
-                            // wait for next request
-                            symbolicate = cvar.wait(symbolicate).unwrap();
-                            match symbolicate.clone() {
-                                RunnerState::Quit => break,
-                                RunnerState::Run(root_dir) => {
-                                    *symbolicate = RunnerState::Wait;
-                                    Some(root_dir)
+        thread::Builder::new()
+            .stack_size(STACK_SIZE_BYTES)
+            .spawn(move || {
+                let (mtx, cvar) = &*thread_mtx_cvar;
+                // Locations opened in the IDE (files or directories) for which manifest file is missing
+                let mut missing_manifests = BTreeSet::new();
+                // infinite loop to wait for symbolication requests
+                eprintln!("starting symbolicator runner loop");
+                loop {
+                    let starting_path_opt = {
+                        // hold the lock only as long as it takes to get the data, rather than through
+                        // the whole symbolication process (hence a separate scope here)
+                        let mut symbolicate = mtx.lock().unwrap();
+                        match symbolicate.clone() {
+                            RunnerState::Quit => break,
+                            RunnerState::Run(root_dir) => {
+                                *symbolicate = RunnerState::Wait;
+                                Some(root_dir)
+                            }
+                            RunnerState::Wait => {
+                                // wait for next request
+                                symbolicate = cvar.wait(symbolicate).unwrap();
+                                match symbolicate.clone() {
+                                    RunnerState::Quit => break,
+                                    RunnerState::Run(root_dir) => {
+                                        *symbolicate = RunnerState::Wait;
+                                        Some(root_dir)
+                                    }
+                                    RunnerState::Wait => None,
                                 }
-                                RunnerState::Wait => None,
                             }
                         }
-                    }
-                };
-                if let Some(starting_path) = starting_path_opt {
-                    let root_dir = Self::root_dir(&starting_path);
-                    if root_dir.is_none() && !missing_manifests.contains(&starting_path) {
-                        eprintln!("reporting missing manifest");
-
-                        // report missing manifest file only once to avoid cluttering IDE's UI in
-                        // cases when developer indeed intended to open a standalone file that was
-                        // not meant to compile
-                        missing_manifests.insert(starting_path);
-                        if let Err(err) = sender.send(Err(anyhow!(
-                            "Unable to find package manifest. Make sure that
+                    };
+                    if let Some(starting_path) = starting_path_opt {
+                        let root_dir = Self::root_dir(&starting_path);
+                        if root_dir.is_none() && !missing_manifests.contains(&starting_path) {
+                            eprintln!("reporting missing manifest");
+
+                            // report missing manifest file only once to avoid cluttering IDE's UI in
+                            // cases when developer indeed intended to open a standalone file that was
+                            // not meant to compile
+                            missing_manifests.insert(starting_path);
+                            if let Err(err) = sender.send(Err(anyhow!(
+                                "Unable to find package manifest. Make sure that
                             the source files are located in a sub-directory of a package containing
                             a Move.toml file. "
-                        ))) {
-                            eprintln!("could not pass missing manifest error: {:?}", err);
-                        }
-                        continue;
-                    }
-                    eprintln!("symbolication started");
-                    match Symbolicator::get_symbols(root_dir.unwrap().as_path()) {
-                        Ok((symbols_opt, lsp_diagnostics)) => {
-                            eprintln!("symbolication finished");
-                            if let Some(new_symbols) = symbols_opt {
-                                // merge the new symbols with the old ones to support a
-                                // (potentially) new project/package that symbolication information
-                                // was built for
-                                //
-                                // TODO: we may consider "unloading" symbolication information when
-                                // files/directories are being closed but as with other performance
-                                // optimizations (e.g. incrementalizatino of the vfs), let's wait
-                                // until we know we actually need it
-                                let mut old_symbols = symbols.lock().unwrap();
-                                (*old_symbols).merge(new_symbols);
-                            }
-                            // set/reset (previous) diagnostics
-                            if let Err(err) = sender.send(Ok(lsp_diagnostics)) {
-                                eprintln!("could not pass diagnostics: {:?}", err);
+                            ))) {
+                                eprintln!("could not pass missing manifest error: {:?}", err);
                             }
+                            continue;
                         }
-                        Err(err) => {
-                            eprintln!("symbolication failed: {:?}", err);
-                            if let Err(err) = sender.send(Err(err)) {
-                                eprintln!("could not pass compiler error: {:?}", err);
+                        eprintln!("symbolication started");
+                        match Symbolicator::get_symbols(root_dir.unwrap().as_path()) {
+                            Ok((symbols_opt, lsp_diagnostics)) => {
+                                eprintln!("symbolication finished");
+                                if let Some(new_symbols) = symbols_opt {
+                                    // merge the new symbols with the old ones to support a
+                                    // (potentially) new project/package that symbolication information
+                                    // was built for
+                                    //
+                                    // TODO: we may consider "unloading" symbolication information when
+                                    // files/directories are being closed but as with other performance
+                                    // optimizations (e.g. incrementalizatino of the vfs), let's wait
+                                    // until we know we actually need it
+                                    let mut old_symbols = symbols.lock().unwrap();
+                                    (*old_symbols).merge(new_symbols);
+                                }
+                                // set/reset (previous) diagnostics
+                                if let Err(err) = sender.send(Ok(lsp_diagnostics)) {
+                                    eprintln!("could not pass diagnostics: {:?}", err);
+                                }
+                            }
+                            Err(err) => {
+                                eprintln!("symbolication failed: {:?}", err);
+                                if let Err(err) = sender.send(Err(err)) {
+                                    eprintln!("could not pass compiler error: {:?}", err);
+                                }
                             }
                         }
                     }
                 }
-            }
-        });
+            })
+            .unwrap();
 
         runner
     }
 
-    pub fn run(&self, starting_path: &str) {
-        eprintln!("scheduling run for {}", starting_path);
+    pub fn run(&self, starting_path: PathBuf) {
+        eprintln!("scheduling run for {:?}", starting_path);
         let (mtx, cvar) = &*self.mtx_cvar;
         let mut symbolicate = mtx.lock().unwrap();
-        *symbolicate = RunnerState::Run(PathBuf::from(starting_path));
+        *symbolicate = RunnerState::Run(starting_path);
         cvar.notify_one();
         eprintln!("scheduled run");
     }
@@ -433,8 +483,8 @@ impl SymbolicatorRunner {
         cvar.notify_one();
     }
 
-    /// Finds manifest file in a subdirectory of a Move source file passed as argument
-    fn root_dir(starting_path: &Path) -> Option<PathBuf> {
+    /// Finds manifest file in a (sub)directory of the starting path passed as argument
+    pub fn root_dir(starting_path: &Path) -> Option<PathBuf> {
         let mut current_path_opt = Some(starting_path);
         while current_path_opt.is_some() {
             let current_path = current_path_opt.unwrap();
@@ -458,6 +508,7 @@ impl UseDef {
         use_name: &Symbol,
         use_type: IdentType,
         type_def_loc: Option<DefLoc>,
+        doc_string: String,
     ) -> Self {
         let def_loc = DefLoc {
             fhash: def_fhash,
@@ -480,6 +531,7 @@ impl UseDef {
             use_type,
             def_loc,
             type_def_loc,
+            doc_string,
         }
     }
 }
@@ -524,8 +576,22 @@ impl UseDefMap {
     }
 }
 
+impl FunctionIdentTypeMap {
+    fn new() -> Self {
+        Self(BTreeMap::new())
+    }
+
+    fn insert(&mut self, key: String, val: IdentType) {
+        self.0.entry(key).or_insert_with(|| val);
+    }
+
+    pub fn contains_key(self, key: &String) -> bool {
+        self.0.contains_key(key)
+    }
+}
+
 impl Symbols {
-    fn merge(&mut self, other: Self) {
+    pub fn merge(&mut self, other: Self) {
         for (k, v) in other.references {
             self.references
                 .entry(k)
@@ -534,6 +600,11 @@ impl Symbols {
         }
         self.file_use_defs.extend(other.file_use_defs);
         self.file_name_mapping.extend(other.file_name_mapping);
+        self.file_mods.extend(other.file_mods);
+    }
+
+    pub fn file_mods(&self) -> &BTreeMap<PathBuf, BTreeSet<ModuleDefs>> {
+        &self.file_mods
     }
 }
 
@@ -553,24 +624,30 @@ impl Symbolicator {
 
         eprintln!("symbolicating {:?}", pkg_path);
 
-        let resolution_graph = build_config.resolution_graph_for_package(pkg_path)?;
+        // resolution graph diagnostics are only needed for CLI commands so ignore them by passing a
+        // vector as the writer
+        let resolution_graph =
+            build_config.resolution_graph_for_package(pkg_path, &mut Vec::new())?;
 
         // get source files to be able to correlate positions (in terms of byte offsets) with actual
         // file locations (in terms of line/column numbers)
         let source_files = &resolution_graph.file_sources();
         let mut files = SimpleFiles::new();
         let mut file_id_mapping = HashMap::new();
+        let mut file_id_to_lines = HashMap::new();
         let mut file_name_mapping = BTreeMap::new();
         for (fhash, (fname, source)) in source_files {
             let id = files.add(*fname, source.clone());
             file_id_mapping.insert(*fhash, id);
             file_name_mapping.insert(*fhash, *fname);
+            let lines: Vec<String> = source.lines().map(String::from).collect();
+            file_id_to_lines.insert(id, lines);
         }
 
         let build_plan = BuildPlan::create(resolution_graph)?;
         let mut typed_ast = None;
         let mut diagnostics = None;
-        build_plan.compile_with_driver(&mut std::io::sink(), |compiler| {
+        build_plan.compile_with_driver(&mut std::io::sink(), None, |compiler| {
             let (files, compilation_result) = compiler.run::<PASS_TYPING>()?;
             let (_, compiler) = match compilation_result {
                 Ok(v) => v,
@@ -629,38 +706,66 @@ impl Symbolicator {
 
         let mut mod_outer_defs = BTreeMap::new();
         let mut mod_use_defs = BTreeMap::new();
+        let mut file_mods = BTreeMap::new();
+
         for (pos, module_ident, module_def) in modules {
-            let (defs, symbols) =
-                Self::get_mod_outer_defs(&pos, module_def, &files, &file_id_mapping);
+            let (defs, symbols) = Self::get_mod_outer_defs(
+                &pos,
+                &sp(pos, *module_ident),
+                module_def,
+                &files,
+                &file_id_mapping,
+            );
+
+            let cloned_defs = defs.clone();
+            let path = file_name_mapping.get(&cloned_defs.fhash.clone()).unwrap();
+            file_mods
+                .entry(
+                    dunce::canonicalize(path.as_str())
+                        .unwrap_or_else(|_| PathBuf::from(path.as_str())),
+                )
+                .or_insert_with(BTreeSet::new)
+                .insert(cloned_defs);
+
             mod_outer_defs.insert(*module_ident, defs);
             mod_use_defs.insert(*module_ident, symbols);
         }
 
+        eprintln!("get_symbols loaded file_mods length: {}", file_mods.len());
+
         let mut symbolicator = Symbolicator {
             mod_outer_defs,
             files,
             file_id_mapping,
+            file_id_to_lines,
             type_params: BTreeMap::new(),
             current_mod: None,
         };
 
         let mut references = BTreeMap::new();
         let mut file_use_defs = BTreeMap::new();
+        let mut function_ident_type = FunctionIdentTypeMap::new();
+
         for (pos, module_ident, module_def) in modules {
             let mut use_defs = mod_use_defs.remove(module_ident).unwrap();
             symbolicator.current_mod = Some(sp(pos, *module_ident));
-            symbolicator.mod_symbols(module_def, &mut references, &mut use_defs);
+            symbolicator.mod_symbols(
+                module_def,
+                &mut references,
+                &mut use_defs,
+                &mut function_ident_type,
+            );
 
             let fpath = match source_files.get(&pos.file_hash()) {
                 Some((p, _)) => p,
                 None => continue,
             };
 
+            let fpath_buffer = dunce::canonicalize(fpath.as_str())
+                .unwrap_or_else(|_| PathBuf::from(fpath.as_str()));
+
             file_use_defs
-                .entry(
-                    fs::canonicalize(fpath.as_str())
-                        .unwrap_or_else(|_| PathBuf::from(fpath.as_str())),
-                )
+                .entry(fpath_buffer)
                 .or_insert_with(UseDefMap::new)
                 .extend(use_defs.elements());
         }
@@ -669,7 +774,11 @@ impl Symbolicator {
             references,
             file_use_defs,
             file_name_mapping,
+            file_mods,
         };
+
+        eprintln!("get_symbols load complete");
+
         Ok((Some(symbols), ide_diagnostics))
     }
 
@@ -679,6 +788,7 @@ impl Symbolicator {
             file_use_defs: BTreeMap::new(),
             references: BTreeMap::new(),
             file_name_mapping: BTreeMap::new(),
+            file_mods: BTreeMap::new(),
         }
     }
 
@@ -687,6 +797,7 @@ impl Symbolicator {
     /// Get symbols for outer definitions in the module (functions, structs, and consts)
     fn get_mod_outer_defs(
         loc: &Loc,
+        mod_ident: &ModuleIdent,
         mod_def: &ModuleDefinition,
         files: &SimpleFiles<Symbol, String>,
         file_id_mapping: &HashMap<FileHash, usize>,
@@ -722,6 +833,7 @@ impl Symbolicator {
                     continue;
                 }
             };
+
             structs.insert(
                 *name,
                 StructDef {
@@ -742,7 +854,7 @@ impl Symbolicator {
             constants.insert(*name, name_start);
         }
 
-        for (pos, name, _) in &mod_def.functions {
+        for (pos, name, fun) in &mod_def.functions {
             let name_start = match Self::get_start_loc(&pos, files, file_id_mapping) {
                 Some(s) => s,
                 None => {
@@ -750,18 +862,80 @@ impl Symbolicator {
                     continue;
                 }
             };
-            functions.insert(*name, name_start);
+            let ident_type = IdentType::FunctionType(
+                mod_ident.value,
+                *name,
+                fun.signature
+                    .type_parameters
+                    .iter()
+                    .map(|t| sp(t.user_specified_name.loc, Type_::Param(t.clone())))
+                    .collect(),
+                fun.signature
+                    .parameters
+                    .iter()
+                    .map(|(n, _)| n.value())
+                    .collect(),
+                fun.signature
+                    .parameters
+                    .iter()
+                    .map(|(_, t)| t.clone())
+                    .collect(),
+                fun.signature.return_type.clone(),
+                fun.acquires
+                    .iter()
+                    .map(|(k, v)| Self::create_struct_type(*mod_ident, *k, *v, vec![]))
+                    .collect(),
+            );
+            functions.insert(
+                *name,
+                FunctionDef {
+                    name: *name,
+                    start: name_start,
+                    attrs: fun
+                        .attributes
+                        .clone()
+                        .iter()
+                        .map(|(_loc, name, _attr)| name.to_string())
+                        .collect(),
+                    ident_type,
+                },
+            );
         }
 
+        let use_def_map = UseDefMap::new();
+
+        let name = mod_ident.value;
         let fhash = loc.file_hash();
+        let start = match Self::get_start_loc(loc, files, file_id_mapping) {
+            Some(s) => s,
+            None => {
+                debug_assert!(false);
+                return (
+                    ModuleDefs {
+                        fhash,
+                        start: Position {
+                            line: 0,
+                            character: 0,
+                        },
+                        name,
+                        structs,
+                        constants,
+                        functions,
+                    },
+                    use_def_map,
+                );
+            }
+        };
+
         let module_defs = ModuleDefs {
+            name,
+            start,
             fhash,
             structs,
             constants,
             functions,
         };
 
-        let use_def_map = UseDefMap::new();
         (module_defs, use_def_map)
     }
 
@@ -771,51 +945,41 @@ impl Symbolicator {
         mod_def: &ModuleDefinition,
         references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
         use_defs: &mut UseDefMap,
+        function_ident_type: &mut FunctionIdentTypeMap,
     ) {
         for (pos, name, fun) in &mod_def.functions {
             // enter self-definition for function name (unwrap safe - done when inserting def)
             let name_start = Self::get_start_loc(&pos, &self.files, &self.file_id_mapping).unwrap();
-            let use_type = IdentType::FunctionType(
-                self.current_mod.unwrap().value,
-                *name,
-                fun.signature
-                    .type_parameters
-                    .iter()
-                    .map(|t| sp(t.user_specified_name.loc, Type_::Param(t.clone())))
-                    .collect(),
-                fun.signature
-                    .parameters
-                    .iter()
-                    .map(|(_, t)| t.clone())
-                    .collect(),
-                fun.signature.return_type.clone(),
-                fun.acquires
-                    .iter()
-                    .map(|(k, v)| {
-                        Self::create_struct_type(self.current_mod.unwrap(), *k, *v, vec![])
-                    })
-                    .collect(),
-            );
-            let ident_type_def = self.ident_type_def_loc(&use_type);
-            use_defs.insert(
-                name_start.line,
-                UseDef::new(
-                    references,
-                    pos.file_hash(),
-                    name_start,
-                    pos.file_hash(),
-                    name_start,
-                    name,
-                    use_type,
-                    ident_type_def,
-                ),
+            let doc_string = self.extract_doc_string(&name_start, &pos.file_hash());
+
+            let mod_ident = self.current_mod.unwrap();
+
+            let mod_def = self.mod_outer_defs.get(&mod_ident.value).unwrap();
+            let fun_def = mod_def.functions.get(name).unwrap();
+            let use_type = fun_def.ident_type.clone();
+
+            let fun_type_def = self.ident_type_def_loc(&use_type);
+            let use_def = UseDef::new(
+                references,
+                pos.file_hash(),
+                name_start,
+                pos.file_hash(),
+                name_start,
+                name,
+                use_type.clone(),
+                fun_type_def,
+                doc_string,
             );
+
+            use_defs.insert(name_start.line, use_def);
             self.fun_symbols(fun, references, use_defs);
+            function_ident_type.insert(name.to_string(), use_type);
         }
 
         for (pos, name, c) in &mod_def.constants {
             // enter self-definition for const name (unwrap safe - done when inserting def)
             let name_start = Self::get_start_loc(&pos, &self.files, &self.file_id_mapping).unwrap();
+            let doc_string = self.extract_doc_string(&name_start, &pos.file_hash());
             let ident_type = IdentType::RegularType(c.signature.clone());
             let ident_type_def = self.ident_type_def_loc(&ident_type);
             use_defs.insert(
@@ -829,6 +993,7 @@ impl Symbolicator {
                     name,
                     ident_type,
                     ident_type_def,
+                    doc_string,
                 ),
             );
         }
@@ -836,6 +1001,7 @@ impl Symbolicator {
         for (pos, name, struct_def) in &mod_def.structs {
             // enter self-definition for struct name (unwrap safe - done when inserting def)
             let name_start = Self::get_start_loc(&pos, &self.files, &self.file_id_mapping).unwrap();
+            let doc_string = self.extract_doc_string(&name_start, &pos.file_hash());
             let ident_type = IdentType::RegularType(Self::create_struct_type(
                 self.current_mod.unwrap(),
                 StructName(sp(pos, *name)),
@@ -854,6 +1020,7 @@ impl Symbolicator {
                     name,
                     ident_type,
                     ident_type_def,
+                    doc_string,
                 ),
             );
 
@@ -881,6 +1048,7 @@ impl Symbolicator {
                 let start = Self::get_start_loc(&fpos, &self.files, &self.file_id_mapping).unwrap();
                 let ident_type = IdentType::RegularType(t.clone());
                 let ident_type_def = self.ident_type_def_loc(&ident_type);
+                let doc_string = self.extract_doc_string(&start, &fpos.file_hash());
                 use_defs.insert(
                     start.line,
                     UseDef::new(
@@ -892,6 +1060,7 @@ impl Symbolicator {
                         fname,
                         ident_type,
                         ident_type_def,
+                        doc_string,
                     ),
                 );
             }
@@ -966,6 +1135,74 @@ impl Symbolicator {
         get_loc(&pos.file_hash(), pos.start(), files, file_id_mapping)
     }
 
+    /// Extracts the docstring (/// or /** ... */) for a given definition by traversing up from the line definition
+    fn extract_doc_string(&self, name_start: &Position, file_hash: &FileHash) -> String {
+        let mut doc_string = String::new();
+        let file_id = match self.file_id_mapping.get(file_hash) {
+            None => return doc_string,
+            Some(v) => v,
+        };
+
+        let file_lines = match self.file_id_to_lines.get(file_id) {
+            None => return doc_string,
+            Some(v) => v,
+        };
+
+        if name_start.line == 0 {
+            return doc_string;
+        }
+
+        let mut iter = (name_start.line - 1) as usize;
+        let mut line_before = file_lines[iter].trim();
+
+        // Detect the two different types of docstrings
+        if line_before.starts_with("///") {
+            while let Some(stripped_line) = line_before.strip_prefix("///") {
+                doc_string = format!("{}\n{}", stripped_line.trim(), doc_string);
+                if iter == 0 {
+                    break;
+                }
+                iter -= 1;
+                line_before = file_lines[iter].trim();
+            }
+        } else if line_before.ends_with("*/") {
+            let mut doc_string_found = false;
+            line_before = file_lines[iter].strip_suffix("*/").unwrap_or("").trim();
+
+            // Loop condition is a safe guard.
+            while !doc_string_found {
+                // We found the start of the multi-line comment/docstring
+                if line_before.starts_with("/*") {
+                    let is_doc = line_before.starts_with("/**") && !line_before.starts_with("/***");
+
+                    // Invalid doc_string start prefix so return empty doc string.
+                    if !is_doc {
+                        return String::new();
+                    }
+
+                    line_before = line_before.strip_prefix("/**").unwrap_or("").trim();
+                    doc_string_found = true;
+                }
+
+                doc_string = format!("{}\n{}", line_before, doc_string);
+
+                if iter == 0 {
+                    break;
+                }
+
+                iter -= 1;
+                line_before = file_lines[iter].trim();
+            }
+
+            // No doc_string found - return String::new();
+            if !doc_string_found {
+                return String::new();
+            }
+        }
+
+        doc_string
+    }
+
     /// Get symbols for a sequence representing function body
     fn seq_item_symbols(
         &self,
@@ -1144,9 +1381,7 @@ impl Symbolicator {
                 use_defs,
                 exp.ty.clone(),
             ),
-            E::ModuleCall(mod_call) => {
-                self.mod_call_symbols(mod_call, scope, references, use_defs, exp.ty.clone())
-            }
+            E::ModuleCall(mod_call) => self.mod_call_symbols(mod_call, scope, references, use_defs),
             E::Builtin(builtin_fun, exp) => {
                 use BuiltinFunction_ as BF;
                 match &builtin_fun.value {
@@ -1296,21 +1531,16 @@ impl Symbolicator {
         scope: &mut OrdMap<Symbol, DefLoc>,
         references: &mut BTreeMap<DefLoc, BTreeSet<UseLoc>>,
         use_defs: &mut UseDefMap,
-        ret_type: Type,
     ) {
-        // handle function name
-        let use_type = IdentType::FunctionType(
-            mod_call.module.value,
-            mod_call.name.value(),
-            mod_call.type_arguments.clone(),
-            mod_call.parameter_types.clone(),
-            ret_type,
-            mod_call
-                .acquires
-                .iter()
-                .map(|(k, v)| Self::create_struct_type(mod_call.module, *k, *v, vec![]))
-                .collect(),
-        );
+        let mod_ident = mod_call.module;
+        let mod_def = self.mod_outer_defs.get(&mod_ident.value).unwrap();
+
+        let fun_def = match mod_def.functions.get(&mod_call.name.value()) {
+            Some(v) => v,
+            None => return,
+        };
+        let use_type = fun_def.ident_type.clone();
+
         self.add_fun_use_def(
             &mod_call.module,
             &mod_call.name.value(),
@@ -1394,6 +1624,8 @@ impl Symbolicator {
                     Type_::Param(tp.clone()),
                 ));
                 let ident_type_def = self.ident_type_def_loc(&ident_type);
+
+                let doc_string = self.extract_doc_string(&start, &fhash);
                 use_defs.insert(
                     start.line,
                     UseDef::new(
@@ -1405,6 +1637,7 @@ impl Symbolicator {
                         &tname,
                         ident_type,
                         ident_type_def,
+                        doc_string,
                     ),
                 );
                 let exists = tp_scope.insert(tname, DefLoc { fhash, start });
@@ -1464,18 +1697,22 @@ impl Symbolicator {
             |use_name, name_start, mod_defs| match mod_defs.constants.get(use_name) {
                 Some(def_start) => {
                     let ident_type = IdentType::RegularType(use_type.clone());
+                    let def_fhash = self.mod_outer_defs.get(&module_ident).unwrap().fhash;
+                    let doc_string = self.extract_doc_string(def_start, &def_fhash);
                     let ident_type_def = self.ident_type_def_loc(&ident_type);
+
                     use_defs.insert(
                         name_start.line,
                         UseDef::new(
                             references,
                             use_pos.file_hash(),
                             name_start,
-                            self.mod_outer_defs.get(&module_ident).unwrap().fhash,
+                            def_fhash,
                             *def_start,
                             use_name,
                             ident_type,
                             ident_type_def,
+                            doc_string,
                         ),
                     );
                 }
@@ -1499,18 +1736,21 @@ impl Symbolicator {
             use_name,
             use_pos,
             |use_name, name_start, mod_defs| match mod_defs.functions.get(use_name) {
-                Some(def_start) => {
+                Some(func_def) => {
+                    let def_fhash = self.mod_outer_defs.get(&module_ident.value).unwrap().fhash;
+                    let doc_string = self.extract_doc_string(&func_def.start, &def_fhash);
                     use_defs.insert(
                         name_start.line,
                         UseDef::new(
                             references,
                             use_pos.file_hash(),
                             name_start,
-                            self.mod_outer_defs.get(&module_ident.value).unwrap().fhash,
-                            *def_start,
+                            def_fhash,
+                            func_def.start,
                             use_name,
                             use_type.clone(),
                             self.ident_type_def_loc(&use_type),
+                            doc_string,
                         ),
                     );
                 }
@@ -1536,18 +1776,22 @@ impl Symbolicator {
             |use_name, name_start, mod_defs| match mod_defs.structs.get(use_name) {
                 Some(def) => {
                     let ident_type = IdentType::RegularType(use_type.clone());
+
                     let ident_type_def = self.ident_type_def_loc(&ident_type);
+                    let def_fhash = self.mod_outer_defs.get(module_ident).unwrap().fhash;
+                    let doc_string = self.extract_doc_string(&def.name_start, &def_fhash);
                     use_defs.insert(
                         name_start.line,
                         UseDef::new(
                             references,
                             use_pos.file_hash(),
                             name_start,
-                            self.mod_outer_defs.get(module_ident).unwrap().fhash,
+                            def_fhash,
                             def.name_start,
                             use_name,
                             ident_type,
                             ident_type_def,
+                            doc_string,
                         ),
                     );
                 }
@@ -1577,17 +1821,21 @@ impl Symbolicator {
                         if fdef.name == *use_name {
                             let ident_type = IdentType::RegularType(use_type.clone());
                             let ident_type_def = self.ident_type_def_loc(&ident_type);
+
+                            let def_fhash = self.mod_outer_defs.get(module_ident).unwrap().fhash;
+                            let doc_string = self.extract_doc_string(&fdef.start, &def_fhash);
                             use_defs.insert(
                                 name_start.line,
                                 UseDef::new(
                                     references,
                                     use_pos.file_hash(),
                                     name_start,
-                                    self.mod_outer_defs.get(module_ident).unwrap().fhash,
+                                    def_fhash,
                                     fdef.start,
                                     use_name,
                                     ident_type,
                                     ident_type_def,
+                                    doc_string,
                                 ),
                             );
                         }
@@ -1615,6 +1863,8 @@ impl Symbolicator {
                         Some(def_loc) => {
                             let ident_type = IdentType::RegularType(id_type.clone());
                             let ident_type_def = self.ident_type_def_loc(&ident_type);
+                            let doc_string =
+                                self.extract_doc_string(&def_loc.start, &def_loc.fhash);
                             use_defs.insert(
                                 name_start.line,
                                 UseDef::new(
@@ -1626,6 +1876,7 @@ impl Symbolicator {
                                     &use_name,
                                     ident_type,
                                     ident_type_def,
+                                    doc_string,
                                 ),
                             );
                         }
@@ -1674,6 +1925,8 @@ impl Symbolicator {
                 // in rust) a variable can be re-defined in the same scope replacing the previous
                 // definition
 
+                let doc_string = self.extract_doc_string(&name_start, &pos.file_hash());
+
                 // enter self-definition for def name
                 let ident_type = IdentType::RegularType(use_type);
                 let ident_type_def = self.ident_type_def_loc(&ident_type);
@@ -1688,6 +1941,7 @@ impl Symbolicator {
                         name,
                         ident_type,
                         ident_type_def,
+                        doc_string,
                     ),
                 );
             }
@@ -1717,6 +1971,7 @@ impl Symbolicator {
         };
 
         if let Some(def_loc) = scope.get(use_name) {
+            let doc_string = self.extract_doc_string(&def_loc.start, &def_loc.fhash);
             let ident_type = IdentType::RegularType(use_type);
             let ident_type_def = self.ident_type_def_loc(&ident_type);
             use_defs.insert(
@@ -1730,6 +1985,7 @@ impl Symbolicator {
                     use_name,
                     ident_type,
                     ident_type_def,
+                    doc_string,
                 ),
             );
         } else {
@@ -1753,7 +2009,7 @@ impl Symbolicator {
     fn ident_type_def_loc(&self, ident_type: &IdentType) -> Option<DefLoc> {
         match ident_type {
             IdentType::RegularType(t) => self.type_def_loc(t),
-            IdentType::FunctionType(_, _, _, _, ret, _) => self.type_def_loc(ret),
+            IdentType::FunctionType(_, _, _, _, _, ret, _) => self.type_def_loc(ret),
         }
     }
 
@@ -1788,7 +2044,8 @@ pub fn on_go_to_def_request(context: &Context, request: &Request, symbols: &Symb
         .text_document_position_params
         .text_document
         .uri
-        .path();
+        .to_file_path()
+        .unwrap();
     let loc = parameters.text_document_position_params.position;
     let line = loc.line;
     let col = loc.character;
@@ -1796,7 +2053,7 @@ pub fn on_go_to_def_request(context: &Context, request: &Request, symbols: &Symb
     on_use_request(
         context,
         symbols,
-        fpath,
+        &fpath,
         line,
         col,
         request.id.clone(),
@@ -1827,7 +2084,8 @@ pub fn on_go_to_type_def_request(context: &Context, request: &Request, symbols:
         .text_document_position_params
         .text_document
         .uri
-        .path();
+        .to_file_path()
+        .unwrap();
     let loc = parameters.text_document_position_params.position;
     let line = loc.line;
     let col = loc.character;
@@ -1835,7 +2093,7 @@ pub fn on_go_to_type_def_request(context: &Context, request: &Request, symbols:
     on_use_request(
         context,
         symbols,
-        fpath,
+        &fpath,
         line,
         col,
         request.id.clone(),
@@ -1862,7 +2120,12 @@ pub fn on_references_request(context: &Context, request: &Request, symbols: &Sym
     let parameters = serde_json::from_value::<ReferenceParams>(request.params.clone())
         .expect("could not deserialize references request");
 
-    let fpath = parameters.text_document_position.text_document.uri.path();
+    let fpath = parameters
+        .text_document_position
+        .text_document
+        .uri
+        .to_file_path()
+        .unwrap();
     let loc = parameters.text_document_position.position;
     let line = loc.line;
     let col = loc.character;
@@ -1871,7 +2134,7 @@ pub fn on_references_request(context: &Context, request: &Request, symbols: &Sym
     on_use_request(
         context,
         symbols,
-        fpath,
+        &fpath,
         line,
         col,
         request.id.clone(),
@@ -1917,7 +2180,8 @@ pub fn on_hover_request(context: &Context, request: &Request, symbols: &Symbols)
         .text_document_position_params
         .text_document
         .uri
-        .path();
+        .to_file_path()
+        .unwrap();
     let loc = parameters.text_document_position_params.position;
     let line = loc.line;
     let col = loc.character;
@@ -1925,14 +2189,18 @@ pub fn on_hover_request(context: &Context, request: &Request, symbols: &Symbols)
     on_use_request(
         context,
         symbols,
-        fpath,
+        &fpath,
         line,
         col,
         request.id.clone(),
         |u| {
             let lang_string = LanguageString {
                 language: "".to_string(),
-                value: format!("{}", u.use_type),
+                value: if !u.doc_string.is_empty() {
+                    format!("{}\n\n{}", u.use_type, u.doc_string)
+                } else {
+                    format!("{}", u.use_type)
+                },
             };
             let contents = HoverContents::Scalar(MarkedString::LanguageString(lang_string));
             let range = None;
@@ -1945,7 +2213,7 @@ pub fn on_hover_request(context: &Context, request: &Request, symbols: &Symbols)
 pub fn on_use_request(
     context: &Context,
     symbols: &Symbols,
-    use_fpath: &str,
+    use_fpath: &PathBuf,
     use_line: u32,
     use_col: u32,
     id: RequestId,
@@ -1954,7 +2222,7 @@ pub fn on_use_request(
     let mut result = None;
 
     let mut use_def_found = false;
-    if let Some(mod_symbols) = symbols.file_use_defs.get(&PathBuf::from(use_fpath)) {
+    if let Some(mod_symbols) = symbols.file_use_defs.get(use_fpath) {
         if let Some(uses) = mod_symbols.get(use_line) {
             for u in uses {
                 if use_col >= u.col_start && use_col <= u.col_end {
@@ -1981,8 +2249,147 @@ pub fn on_use_request(
     }
 }
 
+/// Handles document symbol request of the language server
+#[allow(deprecated)]
+pub fn on_document_symbol_request(context: &Context, request: &Request, symbols: &Symbols) {
+    let parameters = serde_json::from_value::<DocumentSymbolParams>(request.params.clone())
+        .expect("could not deserialize document symbol request");
+
+    let fpath = parameters.text_document.uri.to_file_path().unwrap();
+    eprintln!("on_document_symbol_request: {:?}", fpath);
+
+    let empty_mods: BTreeSet<ModuleDefs> = BTreeSet::new();
+    let mods = symbols.file_mods.get(&fpath).unwrap_or(&empty_mods);
+
+    let mut defs: Vec<DocumentSymbol> = vec![];
+    for mod_def in mods {
+        let name = mod_def.name.module.clone().to_string();
+        let detail = Some(mod_def.name.clone().to_string());
+        let kind = SymbolKind::Module;
+        let range = Range {
+            start: mod_def.start,
+            end: mod_def.start,
+        };
+
+        let mut children = vec![];
+
+        // handle constants
+        let cloned_const_def = mod_def.constants.clone();
+        for (sym, const_def_pos) in cloned_const_def {
+            let const_range = Range {
+                start: const_def_pos,
+                end: const_def_pos,
+            };
+
+            children.push(DocumentSymbol {
+                name: sym.clone().to_string(),
+                detail: None,
+                kind: SymbolKind::Constant,
+                range: const_range,
+                selection_range: const_range,
+                children: None,
+                tags: Some(vec![]),
+                deprecated: Some(false),
+            });
+        }
+
+        // handle structs
+        let cloned_struct_def = mod_def.structs.clone();
+        for (sym, struct_def) in cloned_struct_def {
+            let struct_range = Range {
+                start: struct_def.name_start,
+                end: struct_def.name_start,
+            };
+
+            let mut fields: Vec<DocumentSymbol> = vec![];
+            handle_struct_fields(struct_def, &mut fields);
+
+            children.push(DocumentSymbol {
+                name: sym.clone().to_string(),
+                detail: None,
+                kind: SymbolKind::Struct,
+                range: struct_range,
+                selection_range: struct_range,
+                children: Some(fields),
+                tags: Some(vec![]),
+                deprecated: Some(false),
+            });
+        }
+
+        // handle functions
+        let cloned_func_def = mod_def.functions.clone();
+        for (sym, func_def) in cloned_func_def {
+            let func_range = Range {
+                start: func_def.start,
+                end: func_def.start,
+            };
+
+            let mut detail = None;
+            if !func_def.attrs.is_empty() {
+                detail = Some(format!("{:?}", func_def.attrs));
+            }
+
+            children.push(DocumentSymbol {
+                name: sym.clone().to_string(),
+                detail,
+                kind: SymbolKind::Function,
+                range: func_range,
+                selection_range: func_range,
+                children: None,
+                tags: Some(vec![]),
+                deprecated: Some(false),
+            });
+        }
+
+        defs.push(DocumentSymbol {
+            name,
+            detail,
+            kind,
+            range,
+            selection_range: range,
+            children: Some(children),
+            tags: Some(vec![]),
+            deprecated: Some(false),
+        });
+    }
+
+    // unwrap will succeed based on the logic above which the compiler is unable to figure out
+    let response = lsp_server::Response::new_ok(request.id.clone(), defs);
+    if let Err(err) = context
+        .connection
+        .sender
+        .send(lsp_server::Message::Response(response))
+    {
+        eprintln!("could not send use response: {:?}", err);
+    }
+}
+
+/// Helper function to handle struct fields
+#[allow(deprecated)]
+fn handle_struct_fields(struct_def: StructDef, fields: &mut Vec<DocumentSymbol>) {
+    let clonded_fileds = struct_def.field_defs;
+
+    for field_def in clonded_fileds {
+        let field_range = Range {
+            start: field_def.start,
+            end: field_def.start,
+        };
+
+        fields.push(DocumentSymbol {
+            name: field_def.name.clone().to_string(),
+            detail: None,
+            kind: SymbolKind::Field,
+            range: field_range,
+            selection_range: field_range,
+            children: None,
+            tags: Some(vec![]),
+            deprecated: Some(false),
+        });
+    }
+}
+
 #[cfg(test)]
-fn assert_use_def(
+fn assert_use_def_with_doc_string(
     mod_symbols: &UseDefMap,
     file_name_mapping: &BTreeMap<FileHash, Symbol>,
     use_idx: usize,
@@ -1993,6 +2400,7 @@ fn assert_use_def(
     def_file: &str,
     type_str: &str,
     type_def: Option<(u32, u32, &str)>,
+    doc_string: &str,
 ) {
     let uses = mod_symbols.get(use_line).unwrap();
     let use_def = uses.iter().nth(use_idx).unwrap();
@@ -2005,6 +2413,8 @@ fn assert_use_def(
         .as_str()
         .ends_with(def_file));
     assert!(type_str == format!("{}", use_def.use_type));
+
+    assert!(doc_string == use_def.doc_string);
     match use_def.type_def_loc {
         Some(type_def_loc) => {
             let tdef_line = type_def.unwrap().0;
@@ -2022,6 +2432,258 @@ fn assert_use_def(
     }
 }
 
+#[cfg(test)]
+fn assert_use_def(
+    mod_symbols: &UseDefMap,
+    file_name_mapping: &BTreeMap<FileHash, Symbol>,
+    use_idx: usize,
+    use_line: u32,
+    use_col: u32,
+    def_line: u32,
+    def_col: u32,
+    def_file: &str,
+    type_str: &str,
+    type_def: Option<(u32, u32, &str)>,
+) {
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        file_name_mapping,
+        use_idx,
+        use_line,
+        use_col,
+        def_line,
+        def_col,
+        def_file,
+        type_str,
+        type_def,
+        "",
+    )
+}
+
+#[test]
+/// Tests if symbolication + doc_string information for documented Move constructs is constructed correctly.
+fn docstring_test() {
+    let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+
+    path.push("tests/symbols");
+
+    let (symbols_opt, _) = Symbolicator::get_symbols(path.as_path()).unwrap();
+    let symbols = symbols_opt.unwrap();
+
+    let mut fpath = path.clone();
+    fpath.push("sources/M6.move");
+    let cpath = dunce::canonicalize(&fpath).unwrap();
+
+    let mod_symbols = symbols.file_use_defs.get(&cpath).unwrap();
+
+    // struct def name
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        4,
+        11,
+        4,
+        11,
+        "M6.move",
+        "Symbols::M6::DocumentedStruct",
+        Some((4, 11, "M6.move")),
+        "This is a documented struct\nWith a multi-line docstring\n",
+    );
+
+    // const def name
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        10,
+        10,
+        10,
+        10,
+        "M6.move",
+        "u64",
+        None,
+        "Constant containing the answer to the universe\n",
+    );
+
+    // function def name
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        14,
+        8,
+        14,
+        8,
+        "M6.move",
+        "fun Symbols::M6::unpack(s: Symbols::M6::DocumentedStruct): u64",
+        None,
+        "A documented function that unpacks a DocumentedStruct\n",
+    );
+    // param var (unpack function)
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        14,
+        15,
+        14,
+        15,
+        "M6.move",
+        "Symbols::M6::DocumentedStruct",
+        Some((4, 11, "M6.move")),
+        "A documented function that unpacks a DocumentedStruct\n",
+    );
+    // struct name in param type (unpack function)
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        2,
+        14,
+        18,
+        4,
+        11,
+        "M6.move",
+        "Symbols::M6::DocumentedStruct",
+        Some((4, 11, "M6.move")),
+        "This is a documented struct\nWith a multi-line docstring\n",
+    );
+    // struct name in unpack (unpack function)
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        15,
+        12,
+        4,
+        11,
+        "M6.move",
+        "Symbols::M6::DocumentedStruct",
+        Some((4, 11, "M6.move")),
+        "This is a documented struct\nWith a multi-line docstring\n",
+    );
+    // field name in unpack (unpack function)
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        15,
+        31,
+        6,
+        8,
+        "M6.move",
+        "u64",
+        None,
+        "A documented field\n",
+    );
+    // moved var in unpack assignment (unpack function)
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        3,
+        15,
+        59,
+        14,
+        15,
+        "M6.move",
+        "Symbols::M6::DocumentedStruct",
+        Some((4, 11, "M6.move")),
+        "A documented function that unpacks a DocumentedStruct\n",
+    );
+
+    // docstring construction for multi-line /** .. */ based strings
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        26,
+        8,
+        26,
+        8,
+        "M6.move",
+        "fun Symbols::M6::other_doc_struct(): Symbols::M7::OtherDocStruct",
+        Some((3, 11, "M7.move")),
+        "\nThis is a multiline docstring\n\nThis docstring has empty lines.\n\nIt uses the ** format instead of ///\n\n",
+    );
+
+    // docstring construction for single-line /** .. */ based strings
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        31,
+        8,
+        31,
+        8,
+        "M6.move",
+        "fun Symbols::M6::acq(addr: address): u64 acquires Symbols::M6::DocumentedStruct",
+        None,
+        "Asterix based single-line docstring\n",
+    );
+
+    /* Test doc_string construction for struct/function imported from another module */
+
+    // other module struct name (other_doc_struct function)
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        26,
+        41,
+        3,
+        11,
+        "M7.move",
+        "Symbols::M7::OtherDocStruct",
+        Some((3, 11, "M7.move")),
+        "Documented struct in another module\n",
+    );
+
+    // function name in a call (other_doc_struct function)
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        0,
+        27,
+        21,
+        9,
+        15,
+        "M7.move",
+        "fun Symbols::M7::create_other_struct(v: u64): Symbols::M7::OtherDocStruct",
+        Some((3, 11, "M7.move")),
+        "Documented initializer in another module\n",
+    );
+
+    // const in param (other_doc_struct function)
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        27,
+        41,
+        10,
+        10,
+        "M6.move",
+        "u64",
+        None,
+        "Constant containing the answer to the universe\n",
+    );
+
+    // // other documented struct name imported (other_doc_struct_import function)
+    assert_use_def_with_doc_string(
+        mod_symbols,
+        &symbols.file_name_mapping,
+        1,
+        38,
+        35,
+        3,
+        11,
+        "M7.move",
+        "Symbols::M7::OtherDocStruct",
+        Some((3, 11, "M7.move")),
+        "Documented struct in another module\n",
+    );
+}
+
 #[test]
 /// Tests if symbolication information for specific Move constructs has been constructed correctly.
 fn symbols_test() {
@@ -2034,7 +2696,7 @@ fn symbols_test() {
 
     let mut fpath = path.clone();
     fpath.push("sources/M1.move");
-    let cpath = fs::canonicalize(&fpath).unwrap();
+    let cpath = dunce::canonicalize(&fpath).unwrap();
 
     let mod_symbols = symbols.file_use_defs.get(&cpath).unwrap();
 
@@ -2074,7 +2736,7 @@ fn symbols_test() {
         9,
         8,
         "M1.move",
-        "fun Symbols::M1::unpack(Symbols::M1::SomeStruct): u64",
+        "fun Symbols::M1::unpack(s: Symbols::M1::SomeStruct): u64",
         None,
     );
     // param var (unpack function)
@@ -2243,7 +2905,7 @@ fn symbols_test() {
         6,
         15,
         "M2.move",
-        "fun Symbols::M2::some_other_struct(u64): Symbols::M2::SomeOtherStruct",
+        "fun Symbols::M2::some_other_struct(v: u64): Symbols::M2::SomeOtherStruct",
         Some((2, 11, "M2.move")),
     );
     // const in param (other_mod_struct function)
@@ -2282,7 +2944,7 @@ fn symbols_test() {
         34,
         8,
         "M1.move",
-        "fun Symbols::M1::acq(address): u64 acquires Symbols::M1::SomeStruct",
+        "fun Symbols::M1::acq(addr: address): u64 acquires Symbols::M1::SomeStruct",
         None,
     );
     // struct name in acquires (acq function)
@@ -2464,7 +3126,7 @@ fn symbols_test() {
         61,
         8,
         "M1.move",
-        "fun Symbols::M1::ret(bool, u64): u64",
+        "fun Symbols::M1::ret(p1: bool, p2: u64): u64",
         None,
     );
     // returned value (ret function)
@@ -2717,7 +3379,7 @@ fn symbols_test() {
 
     let mut fpath = path.clone();
     fpath.push("sources/M3.move");
-    let cpath = fs::canonicalize(&fpath).unwrap();
+    let cpath = dunce::canonicalize(&fpath).unwrap();
 
     let mod_symbols = symbols.file_use_defs.get(&cpath).unwrap();
 
@@ -2867,7 +3529,7 @@ fn symbols_test() {
 
     let mut fpath = path.clone();
     fpath.push("sources/M4.move");
-    let cpath = fs::canonicalize(&fpath).unwrap();
+    let cpath = dunce::canonicalize(&fpath).unwrap();
 
     let mod_symbols = symbols.file_use_defs.get(&cpath).unwrap();
 
diff --git a/language/move-analyzer/src/vfs.rs b/language/move-analyzer/src/vfs.rs
index 33c96c6b1e..0773375729 100644
--- a/language/move-analyzer/src/vfs.rs
+++ b/language/move-analyzer/src/vfs.rs
@@ -10,24 +10,24 @@
 //! basically just a mapping from file identifier (this could be the file's path were it to be
 //! saved) to its textual contents.
 
+use crate::symbols;
 use lsp_server::Notification;
 use lsp_types::{
     notification::Notification as _, DidChangeTextDocumentParams, DidCloseTextDocumentParams,
     DidOpenTextDocumentParams, DidSaveTextDocumentParams,
 };
-
-use crate::symbols;
+use std::path::PathBuf;
 
 /// A mapping from identifiers (file names, potentially, but not necessarily) to their contents.
 #[derive(Debug, Default)]
 pub struct VirtualFileSystem {
-    files: std::collections::HashMap<String, String>,
+    files: std::collections::HashMap<PathBuf, String>,
 }
 
 impl VirtualFileSystem {
     /// Returns a reference to the buffer corresponding to the given identifier, or `None` if it
     /// is not present in the system.
-    pub fn get(&self, identifier: &str) -> Option<&str> {
+    pub fn get(&self, identifier: &PathBuf) -> Option<&str> {
         self.files.get(identifier).map(|s| s.as_str())
     }
 
@@ -37,13 +37,12 @@ impl VirtualFileSystem {
     /// from the client, instead of completely replacing them each time. The rust-analyzer has a
     /// 'vfs' module that is capable of doing just that, but it is not published on crates.io. If
     /// we could help get it published, we could use it here.
-    pub fn update(&mut self, identifier: &str, content: &str) {
-        self.files
-            .insert(identifier.to_string(), content.to_string());
+    pub fn update(&mut self, identifier: PathBuf, content: &str) {
+        self.files.insert(identifier, content.to_string());
     }
 
     /// Removes the buffer and its identifier from the system.
-    pub fn remove(&mut self, identifier: &str) {
+    pub fn remove(&mut self, identifier: &PathBuf) {
         self.files.remove(identifier);
     }
 }
@@ -61,17 +60,17 @@ pub fn on_text_document_sync_notification(
                 serde_json::from_value::<DidOpenTextDocumentParams>(notification.params.clone())
                     .expect("could not deserialize notification");
             files.update(
-                parameters.text_document.uri.path(),
+                parameters.text_document.uri.to_file_path().unwrap(),
                 &parameters.text_document.text,
             );
-            symbolicator_runner.run(parameters.text_document.uri.path());
+            symbolicator_runner.run(parameters.text_document.uri.to_file_path().unwrap());
         }
         lsp_types::notification::DidChangeTextDocument::METHOD => {
             let parameters =
                 serde_json::from_value::<DidChangeTextDocumentParams>(notification.params.clone())
                     .expect("could not deserialize notification");
             files.update(
-                parameters.text_document.uri.path(),
+                parameters.text_document.uri.to_file_path().unwrap(),
                 &parameters.content_changes.last().unwrap().text,
             );
         }
@@ -80,16 +79,16 @@ pub fn on_text_document_sync_notification(
                 serde_json::from_value::<DidSaveTextDocumentParams>(notification.params.clone())
                     .expect("could not deserialize notification");
             files.update(
-                parameters.text_document.uri.path(),
+                parameters.text_document.uri.to_file_path().unwrap(),
                 &parameters.text.unwrap(),
             );
-            symbolicator_runner.run(parameters.text_document.uri.path());
+            symbolicator_runner.run(parameters.text_document.uri.to_file_path().unwrap());
         }
         lsp_types::notification::DidCloseTextDocument::METHOD => {
             let parameters =
                 serde_json::from_value::<DidCloseTextDocumentParams>(notification.params.clone())
                     .expect("could not deserialize notification");
-            files.remove(parameters.text_document.uri.path());
+            files.remove(&parameters.text_document.uri.to_file_path().unwrap());
         }
         _ => eprintln!("invalid notification '{}'", notification.method),
     }
diff --git a/language/move-analyzer/tests/symbols/sources/M6.move b/language/move-analyzer/tests/symbols/sources/M6.move
new file mode 100644
index 0000000000..aa3427fa8c
--- /dev/null
+++ b/language/move-analyzer/tests/symbols/sources/M6.move
@@ -0,0 +1,42 @@
+module Symbols::M6 {
+
+    /// This is a documented struct
+    /// With a multi-line docstring
+    struct DocumentedStruct has key, drop, store {
+        /// A documented field
+        documented_field: u64,
+    }
+
+    /// Constant containing the answer to the universe
+    const DOCUMENTED_CONSTANT: u64 = 42;
+
+
+    /// A documented function that unpacks a DocumentedStruct
+    fun unpack(s: DocumentedStruct): u64 {
+        let DocumentedStruct { documented_field: value } = s;
+        value
+    }
+
+    /**
+       This is a multiline docstring
+
+       This docstring has empty lines.
+
+       It uses the ** format instead of ///
+    */
+    fun other_doc_struct(): Symbols::M7::OtherDocStruct {
+        Symbols::M7::create_other_struct(DOCUMENTED_CONSTANT)
+    }
+
+    /** Asterix based single-line docstring */
+    fun acq(addr: address): u64 acquires DocumentedStruct {
+        let val = borrow_global<DocumentedStruct>(addr);
+        val.documented_field
+    }
+
+    use Symbols::M7::{Self, OtherDocStruct};
+
+    fun other_doc_struct_import(): OtherDocStruct {
+        M7::create_other_struct(7)
+    }
+}
diff --git a/language/move-analyzer/tests/symbols/sources/M7.move b/language/move-analyzer/tests/symbols/sources/M7.move
new file mode 100644
index 0000000000..b4165da101
--- /dev/null
+++ b/language/move-analyzer/tests/symbols/sources/M7.move
@@ -0,0 +1,13 @@
+module Symbols::M7 {
+
+    /// Documented struct in another module
+    struct OtherDocStruct has drop {
+        /// Documented field in another module
+        some_field: u64,
+    }
+
+    /// Documented initializer in another module
+    public fun create_other_struct(v: u64): OtherDocStruct {
+        OtherDocStruct { some_field: v }
+    }
+}
diff --git a/language/move-binary-format/Cargo.toml b/language/move-binary-format/Cargo.toml
index 0ae756af37..36b4253144 100644
--- a/language/move-binary-format/Cargo.toml
+++ b/language/move-binary-format/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = ["crates-io"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
@@ -16,15 +16,16 @@ proptest = { version = "1.0.0", optional = true }
 proptest-derive = { version = "0.3.0", optional = true }
 ref-cast = "1.0.6"
 variant_count = "1.1.0"
-move-core-types = { path = "../move-core/types", version = "0.0.4" }
+move-core-types = { path = "../move-core/types" }
 serde = { version = "1.0.124", default-features = false }
+arbitrary = { version = "1.1.7", optional = true, features = ["derive"] }
 
 [dev-dependencies]
 proptest = "1.0.0"
 proptest-derive = "0.3.0"
-move-core-types = { path = "../move-core/types", features = ["fuzzing"] }
+move-core-types = { path = "../move-core/types", features = ["fuzzing" ] }
 serde_json = "1.0.64"
 
 [features]
 default = []
-fuzzing = ["proptest", "proptest-derive", "move-core-types/fuzzing"]
+fuzzing = ["proptest", "proptest-derive", "arbitrary", "move-core-types/fuzzing"]
diff --git a/language/move-binary-format/serializer-tests/Cargo.toml b/language/move-binary-format/serializer-tests/Cargo.toml
index a7a85baba6..1cd9077992 100644
--- a/language/move-binary-format/serializer-tests/Cargo.toml
+++ b/language/move-binary-format/serializer-tests/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dev-dependencies]
 proptest = "1.0.0"
diff --git a/language/move-binary-format/src/binary_views.rs b/language/move-binary-format/src/binary_views.rs
index 260233e25d..43a002dc6f 100644
--- a/language/move-binary-format/src/binary_views.rs
+++ b/language/move-binary-format/src/binary_views.rs
@@ -257,7 +257,7 @@ impl<'a> BinaryIndexedView<'a> {
         use SignatureToken::*;
 
         match ty {
-            Bool | U8 | U64 | U128 | Address => Ok(AbilitySet::PRIMITIVES),
+            Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address => Ok(AbilitySet::PRIMITIVES),
 
             Reference(_) | MutableReference(_) => Ok(AbilitySet::REFERENCES),
             Signer => Ok(AbilitySet::SIGNER),
@@ -336,8 +336,6 @@ pub struct FunctionView<'a> {
 
 impl<'a> FunctionView<'a> {
     // Creates a `FunctionView` for a module function.
-    // Creates a `FunctionView` for a module function.
-    // Requires control flow verifier (control_flow.rs)
     pub fn function(
         module: &'a CompiledModule,
         index: FunctionDefinitionIndex,
diff --git a/language/move-binary-format/src/check_bounds.rs b/language/move-binary-format/src/check_bounds.rs
index dccc77a14a..c60fa080c5 100644
--- a/language/move-binary-format/src/check_bounds.rs
+++ b/language/move-binary-format/src/check_bounds.rs
@@ -11,14 +11,13 @@ use crate::{
     file_format::{
         AbilitySet, Bytecode, CodeOffset, CodeUnit, CompiledModule, CompiledScript, Constant,
         FieldHandle, FieldInstantiation, FunctionDefinition, FunctionDefinitionIndex,
-        FunctionHandle, FunctionInstantiation, ModuleHandle, Signature, SignatureToken,
+        FunctionHandle, FunctionInstantiation, LocalIndex, ModuleHandle, Signature, SignatureToken,
         StructDefInstantiation, StructDefinition, StructFieldInformation, StructHandle, TableIndex,
     },
     internals::ModuleIndex,
     IndexKind,
 };
 use move_core_types::vm_status::StatusCode;
-use std::u8;
 
 enum BoundsCheckingContext {
     Module,
@@ -61,6 +60,7 @@ impl<'a> BoundsChecker<'a> {
                 .signatures()
                 .get(script.parameters.into_index())
                 .unwrap(),
+            CompiledScript::MAIN_INDEX.into_index(),
         )
     }
 
@@ -324,24 +324,29 @@ impl<'a> BoundsChecker<'a> {
             None => return Ok(()),
         };
 
-        debug_assert!(function_def.function.into_index() < self.view.function_handles().len());
+        if function_def.function.into_index() >= self.view.function_handles().len() {
+            return Err(verification_error(
+                StatusCode::INDEX_OUT_OF_BOUNDS,
+                IndexKind::FunctionDefinition,
+                function_def_idx as TableIndex,
+            ));
+        }
         let function_handle = &self.view.function_handles()[function_def.function.into_index()];
-
-        debug_assert!(function_handle.parameters.into_index() < self.view.signatures().len());
-        let parameters = &self.view.signatures()[function_handle.parameters.into_index()];
-
-        // check if the number of parameters + locals is less than u8::MAX
-        let locals_count = self.get_locals(code_unit)?.len() + parameters.len();
-
-        if locals_count > (u8::MAX as usize) + 1 {
+        if function_handle.parameters.into_index() >= self.view.signatures().len() {
             return Err(verification_error(
-                StatusCode::TOO_MANY_LOCALS,
+                StatusCode::INDEX_OUT_OF_BOUNDS,
                 IndexKind::FunctionDefinition,
                 function_def_idx as TableIndex,
             ));
         }
+        let parameters = &self.view.signatures()[function_handle.parameters.into_index()];
 
-        self.check_code(code_unit, &function_handle.type_parameters, parameters)
+        self.check_code(
+            code_unit,
+            &function_handle.type_parameters,
+            parameters,
+            function_def_idx,
+        )
     }
 
     fn check_code(
@@ -349,11 +354,21 @@ impl<'a> BoundsChecker<'a> {
         code_unit: &CodeUnit,
         type_parameters: &[AbilitySet],
         parameters: &Signature,
+        index: usize,
     ) -> PartialVMResult<()> {
         check_bounds_impl(self.view.signatures(), code_unit.locals)?;
 
         let locals = self.get_locals(code_unit)?;
-        let locals_count = locals.len() + parameters.len();
+        // Use saturating add for stability
+        let locals_count = locals.len().saturating_add(parameters.len());
+
+        if locals_count > LocalIndex::MAX as usize {
+            return Err(verification_error(
+                StatusCode::TOO_MANY_LOCALS,
+                IndexKind::FunctionDefinition,
+                index as TableIndex,
+            ));
+        }
 
         // if there are locals check that the type parameters in local signature are in bounds.
         let type_param_count = type_parameters.len();
@@ -513,10 +528,11 @@ impl<'a> BoundsChecker<'a> {
 
                 // List out the other options explicitly so there's a compile error if a new
                 // bytecode gets added.
-                FreezeRef | Pop | Ret | LdU8(_) | LdU64(_) | LdU128(_) | CastU8 | CastU64
-                | CastU128 | LdTrue | LdFalse | ReadRef | WriteRef | Add | Sub | Mul | Mod
-                | Div | BitOr | BitAnd | Xor | Shl | Shr | Or | And | Not | Eq | Neq | Lt | Gt
-                | Le | Ge | Abort | Nop => (),
+                FreezeRef | Pop | Ret | LdU8(_) | LdU16(_) | LdU32(_) | LdU64(_) | LdU256(_)
+                | LdU128(_) | CastU8 | CastU16 | CastU32 | CastU64 | CastU128 | CastU256
+                | LdTrue | LdFalse | ReadRef | WriteRef | Add | Sub | Mul | Mod | Div | BitOr
+                | BitAnd | Xor | Shl | Shr | Or | And | Not | Eq | Neq | Lt | Gt | Le | Ge
+                | Abort | Nop => (),
             }
         }
         Ok(())
@@ -527,8 +543,8 @@ impl<'a> BoundsChecker<'a> {
 
         for ty in ty.preorder_traversal() {
             match ty {
-                Bool | U8 | U64 | U128 | Address | Signer | TypeParameter(_) | Reference(_)
-                | MutableReference(_) | Vector(_) => (),
+                Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address | Signer | TypeParameter(_)
+                | Reference(_) | MutableReference(_) | Vector(_) => (),
                 Struct(idx) => {
                     check_bounds_impl(self.view.struct_handles(), *idx)?;
                     if let Some(sh) = self.view.struct_handles().get(idx.into_index()) {
@@ -585,8 +601,11 @@ impl<'a> BoundsChecker<'a> {
 
                 Bool
                 | U8
+                | U16
+                | U32
                 | U64
                 | U128
+                | U256
                 | Address
                 | Signer
                 | Struct(_)
diff --git a/language/move-binary-format/src/compatibility.rs b/language/move-binary-format/src/compatibility.rs
index 258727dc2f..6ddab6d181 100644
--- a/language/move-binary-format/src/compatibility.rs
+++ b/language/move-binary-format/src/compatibility.rs
@@ -2,42 +2,83 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use std::collections::BTreeSet;
+
 use crate::{
+    errors::{PartialVMError, PartialVMResult},
     file_format::{AbilitySet, StructTypeParameter, Visibility},
     file_format_common::VERSION_5,
     normalized::Module,
 };
-use std::collections::BTreeSet;
+use move_core_types::vm_status::StatusCode;
 
-/// The result of a linking and layout compatibility check. Here is what the different combinations
+/// The result of a linking and layout compatibility check. Here is what the different combinations. NOTE that if `check_struct_layout` is false, type safety over a series of upgrades cannot be guaranteed.
 /// mean:
-/// `{ struct: true, struct_layout: true }`: fully backward compatible
-/// `{ struct_and_function_linking: true, struct_layout: false }`: Dependent modules that reference functions or types in this module may not link. However, fixing, recompiling, and redeploying all dependent modules will work--no data migration needed.
-/// `{ type_and_function_linking: true, struct_layout: false }`: Attempting to read structs published by this module will now fail at runtime. However, dependent modules will continue to link. Requires data migration, but no changes to dependent modules.
-/// `{ type_and_function_linking: false, struct_layout: false }`: Everything is broken. Need both a data migration and changes to dependent modules.
+/// `{ check_struct_and_pub_function_linking: true, check_struct_layout: true, check_friend_linking: true }`: fully backward compatible
+/// `{ check_struct_and_pub_function_linking: true, check_struct_layout: true, check_friend_linking: false }`: Backward compatible, exclude the friend module declare and friend functions
+/// `{ check_struct_and_pub_function_linking: false, check_struct_layout: true, check_friend_linking: false }`: Dependent modules that reference functions or types in this module may not link. However, fixing, recompiling, and redeploying all dependent modules will work--no data migration needed.
+/// `{ check_struct_and_pub_function_linking: true, check_struct_layout: false, check_friend_linking: true }`: Attempting to read structs published by this module will now fail at runtime. However, dependent modules will continue to link. Requires data migration, but no changes to dependent modules.
+/// `{ check_struct_and_pub_function_linking: false, check_struct_layout: false, check_friend_linking: false }`: Everything is broken. Need both a data migration and changes to dependent modules.
 #[derive(PartialEq, Eq, Debug, Clone, Copy)]
 pub struct Compatibility {
-    /// If false, dependent modules that reference functions or structs in this module may not link
-    pub struct_and_function_linking: bool,
-    /// If false, attempting to read structs previously published by this module will fail at runtime
-    pub struct_layout: bool,
+    /// if false, do not ensure the dependent modules that reference public functions or structs in this module can link
+    check_struct_and_pub_function_linking: bool,
+    /// if false, do not ensure the struct layout capability
+    check_struct_layout: bool,
+    /// if false, treat `friend` as `private` when `check_struct_and_function_linking`.
+    check_friend_linking: bool,
+}
+
+impl Default for Compatibility {
+    fn default() -> Self {
+        Self {
+            check_struct_and_pub_function_linking: true,
+            check_struct_layout: true,
+            check_friend_linking: true,
+        }
+    }
 }
 
 impl Compatibility {
-    /// Return true if the two module s compared in the compatiblity check are both linking and
-    /// layout compatible.
-    pub fn is_fully_compatible(&self) -> bool {
-        self.struct_and_function_linking && self.struct_layout
+    pub fn full_check() -> Self {
+        Self::default()
+    }
+
+    pub fn no_check() -> Self {
+        Self {
+            check_struct_and_pub_function_linking: false,
+            check_struct_layout: false,
+            check_friend_linking: false,
+        }
     }
 
-    /// Return compatibility assessment for `new_module` relative to old module `old_module`.
-    pub fn check(old_module: &Module, new_module: &Module) -> Compatibility {
-        let mut struct_and_function_linking = true;
+    pub fn new(
+        check_struct_and_pub_function_linking: bool,
+        check_struct_layout: bool,
+        check_friend_linking: bool,
+    ) -> Self {
+        Self {
+            check_struct_and_pub_function_linking,
+            check_struct_layout,
+            check_friend_linking,
+        }
+    }
+
+    pub fn need_check_compat(&self) -> bool {
+        self.check_struct_and_pub_function_linking
+            || self.check_friend_linking
+            || self.check_struct_layout
+    }
+
+    /// Check compatibility for `new_module` relative to old module `old_module`.
+    pub fn check(&self, old_module: &Module, new_module: &Module) -> PartialVMResult<()> {
+        let mut struct_and_pub_function_linking = true;
         let mut struct_layout = true;
+        let mut friend_linking = true;
 
         // module's name and address are unchanged
         if old_module.address != new_module.address || old_module.name != new_module.name {
-            struct_and_function_linking = false;
+            struct_and_pub_function_linking = false;
         }
 
         // old module's structs are a subset of the new module's structs
@@ -46,18 +87,11 @@ impl Compatibility {
                 Some(new_struct) => new_struct,
                 None => {
                     // Struct not present in new . Existing modules that depend on this struct will fail to link with the new version of the module.
-                    struct_and_function_linking = false;
-                    // Note: we intentionally do *not* label this a layout compatibility violation.
-                    // Existing modules can still successfully read previously published values of
-                    // this struct `Parent::T`. That is, code like the function `foo` in
-                    // ```
-                    // struct S { t: Parent::T }
-                    // public fun foo(a: addr): S { move_from<S>(addr) }
-                    // ```
-                    // in module `Child` will continue to run without error. But values of type
-                    // `Parent::T` in `Child` are now "orphaned" in the sense that `Parent` no
-                    // longer exposes any API for reading/writing them.
-                    continue;
+                    // Also, struct layout cannot be guaranteed transitively, because after
+                    // removing the struct, it could be re-added later with a different layout.
+                    struct_and_pub_function_linking = false;
+                    struct_layout = false;
+                    break;
                 }
             };
 
@@ -67,22 +101,15 @@ impl Compatibility {
                     &new_struct.type_parameters,
                 )
             {
-                struct_and_function_linking = false;
+                struct_and_pub_function_linking = false;
             }
             if new_struct.fields != old_struct.fields {
                 // Fields changed. Code in this module will fail at runtime if it tries to
                 // read a previously published struct value
                 // TODO: this is a stricter definition than required. We could in principle
-                // choose to label the following as compatible
-                // (1) changing the name (but not position or type) of a field. The VM does
-                //     not care about the name of a field (it's purely informational), but
-                //     clients presumably do.
-                // (2) changing the type of a field to a different, but layout and kind
-                //     compatible type. E.g. `struct S { b: bool }` to `struct S { b: B }`
-                // where
-                //     B is struct B { some_name: bool }. TODO: does this affect clients? I
-                //     think not--the serialization of the same data with these two types
-                //     will be the same.
+                // choose that changing the name (but not position or type) of a field is
+                // compatible. The VM does not care about the name of a field
+                // (it's purely informational), but clients presumably do.
                 struct_layout = false
             }
         }
@@ -105,7 +132,11 @@ impl Compatibility {
             let new_func = match new_module.exposed_functions.get(name) {
                 Some(new_func) => new_func,
                 None => {
-                    struct_and_function_linking = false;
+                    if matches!(old_func.visibility, Visibility::Friend) {
+                        friend_linking = false;
+                    } else {
+                        struct_and_pub_function_linking = false;
+                    }
                     continue;
                 }
             };
@@ -140,7 +171,11 @@ impl Compatibility {
                     &new_func.type_parameters,
                 )
             {
-                struct_and_function_linking = false;
+                if matches!(old_func.visibility, Visibility::Friend) {
+                    friend_linking = false;
+                } else {
+                    struct_and_pub_function_linking = false;
+                }
             }
         }
 
@@ -149,19 +184,29 @@ impl Compatibility {
         // - additions to the list are allowed
         // - removals are not allowed
         //
-        // NOTE: we may also relax this checking a bit in the future: we may allow the removal of
-        // a module removed from the friend list if the module does not call any friend function
-        // in this module.
         let old_friend_module_ids: BTreeSet<_> = old_module.friends.iter().cloned().collect();
         let new_friend_module_ids: BTreeSet<_> = new_module.friends.iter().cloned().collect();
         if !old_friend_module_ids.is_subset(&new_friend_module_ids) {
-            struct_and_function_linking = false;
+            friend_linking = false;
         }
 
-        Compatibility {
-            struct_and_function_linking,
-            struct_layout,
+        if self.check_struct_and_pub_function_linking && !struct_and_pub_function_linking {
+            return Err(PartialVMError::new(
+                StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+            ));
+        }
+        if self.check_struct_layout && !struct_layout {
+            return Err(PartialVMError::new(
+                StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+            ));
         }
+        if self.check_friend_linking && !friend_linking {
+            return Err(PartialVMError::new(
+                StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+            ));
+        }
+
+        Ok(())
     }
 }
 
diff --git a/language/move-binary-format/src/constant.rs b/language/move-binary-format/src/constant.rs
index 08f4ed8297..a6df17d72a 100644
--- a/language/move-binary-format/src/constant.rs
+++ b/language/move-binary-format/src/constant.rs
@@ -12,8 +12,11 @@ fn sig_to_ty(sig: &SignatureToken) -> Option<MoveTypeLayout> {
         SignatureToken::Address => Some(MoveTypeLayout::Address),
         SignatureToken::Bool => Some(MoveTypeLayout::Bool),
         SignatureToken::U8 => Some(MoveTypeLayout::U8),
+        SignatureToken::U16 => Some(MoveTypeLayout::U16),
+        SignatureToken::U32 => Some(MoveTypeLayout::U32),
         SignatureToken::U64 => Some(MoveTypeLayout::U64),
         SignatureToken::U128 => Some(MoveTypeLayout::U128),
+        SignatureToken::U256 => Some(MoveTypeLayout::U256),
         SignatureToken::Vector(v) => Some(MoveTypeLayout::Vector(Box::new(sig_to_ty(v.as_ref())?))),
         SignatureToken::Reference(_)
         | SignatureToken::MutableReference(_)
@@ -28,8 +31,11 @@ fn ty_to_sig(ty: &MoveTypeLayout) -> Option<SignatureToken> {
         MoveTypeLayout::Address => Some(SignatureToken::Address),
         MoveTypeLayout::Signer => Some(SignatureToken::Signer),
         MoveTypeLayout::U8 => Some(SignatureToken::U8),
+        MoveTypeLayout::U16 => Some(SignatureToken::U16),
+        MoveTypeLayout::U32 => Some(SignatureToken::U32),
         MoveTypeLayout::U64 => Some(SignatureToken::U64),
         MoveTypeLayout::U128 => Some(SignatureToken::U128),
+        MoveTypeLayout::U256 => Some(SignatureToken::U256),
         MoveTypeLayout::Vector(v) => Some(SignatureToken::Vector(Box::new(ty_to_sig(v.as_ref())?))),
         MoveTypeLayout::Struct(_) => None,
         MoveTypeLayout::Bool => Some(SignatureToken::Bool),
diff --git a/language/move-binary-format/src/control_flow_graph.rs b/language/move-binary-format/src/control_flow_graph.rs
index 9026bcf0c9..63ac1e0a29 100644
--- a/language/move-binary-format/src/control_flow_graph.rs
+++ b/language/move-binary-format/src/control_flow_graph.rs
@@ -4,7 +4,7 @@
 
 //! This module defines the control-flow graph uses for bytecode verification.
 use crate::file_format::{Bytecode, CodeOffset};
-use std::collections::{BTreeMap, BTreeSet};
+use std::collections::{btree_map::Entry, BTreeMap, BTreeSet};
 
 // BTree/Hash agnostic type wrappers
 type Map<K, V> = BTreeMap<K, V>;
@@ -45,6 +45,9 @@ pub trait ControlFlowGraph {
     /// Checks if the the edge from cur->next is a back edge
     /// returns false if the edge is not in the cfg
     fn is_back_edge(&self, cur: BlockId, next: BlockId) -> bool;
+
+    /// Return the number of back edges in the cfg
+    fn num_back_edges(&self) -> usize;
 }
 
 struct BasicBlock {
@@ -77,12 +80,7 @@ impl BasicBlock {
 const ENTRY_BLOCK_ID: BlockId = 0;
 
 impl VMControlFlowGraph {
-    // Requires checks from the control flow verifier (control_flow.rs)
     pub fn new(code: &[Bytecode]) -> Self {
-        fn is_back_edge(cur_block: BlockId, target_block: BlockId) -> bool {
-            target_block <= cur_block
-        }
-
         let code_len = code.len() as CodeOffset;
         // First go through and collect block ids, i.e., offsets that begin basic blocks.
         // Need to do this first in order to handle backwards edges.
@@ -112,56 +110,103 @@ impl VMControlFlowGraph {
         let blocks = blocks;
         assert_eq!(entry, code_len);
 
-        // Determine traversal order
-        // build a DAG subgraph (remove the loop back edges)
-        let dag: Map<BlockId, Set<BlockId>> = blocks
-            .iter()
-            .map(|(id, block)| {
-                let id = *id;
-                let non_loop_continue_successors = block
-                    .successors
-                    .iter()
-                    // remove the loop back edges
-                    // this simple check for back edges relies on guarantees from the control flow
-                    // verifier (control_flow.rs)
-                    .filter(|successor| !is_back_edge(id, **successor))
-                    .copied()
-                    .collect();
-                (id, non_loop_continue_successors)
-            })
-            .collect();
-        // assert it is a dag
-        debug_assert!(dag.iter().all(|(id, successors)| successors
-            .iter()
-            .all(|successor| !is_back_edge(*id, *successor))));
+        // # Loop analysis
+        //
+        // This section identifies loops in the control-flow graph, picks a back edge and loop head
+        // (the basic block the back edge returns to), and decides the order that blocks are
+        // traversed during abstract interpretation (reverse post-order).
+        //
+        // The implementation is based on the algorithm for finding widening points in Section 4.1,
+        // "Depth-first numbering" of Bourdoncle [1993], "Efficient chaotic iteration strategies
+        // with widenings."
+        //
+        // NB. The comments below refer to a block's sub-graph -- the reflexive transitive closure
+        // of its successor edges, modulo cycles.
+
+        #[derive(Copy, Clone)]
+        enum Exploration {
+            InProgress,
+            Done,
+        }
+
+        let mut exploration: Map<BlockId, Exploration> = Map::new();
+        let mut stack = vec![ENTRY_BLOCK_ID];
+
+        // For every loop in the CFG that is reachable from the entry block, there is an entry in
+        // `loop_heads` mapping to all the back edges pointing to it, and vice versa.
+        //
+        // Entry in `loop_heads` implies loop in the CFG is justified by the comments in the loop
+        // below.  Loop in the CFG implies entry in `loop_heads` is justified by considering the
+        // point at which the first node in that loop, `F` is added to the `exploration` map:
+        //
+        // - By definition `F` is part of a loop, meaning there is a block `L` such that:
+        //
+        //     F - ... -> L -> F
+        //
+        // - `F` will not transition to `Done` until all the nodes reachable from it (including `L`)
+        //   have been visited.
+        // - Because `F` is the first node seen in the loop, all the other nodes in the loop
+        //   (including `L`) will be visited while `F` is `InProgress`.
+        // - Therefore, we will process the `L -> F` edge while `F` is `InProgress`.
+        // - Therefore, we will record a back edge to it.
+        let mut loop_heads: Map<BlockId, Set<BlockId>> = Map::new();
 
-        // build the post-order traversal
+        // Blocks appear in `post_order` after all the blocks in their (non-reflexive) sub-graph.
         let mut post_order = Vec::with_capacity(blocks.len());
-        let mut finished = Set::new();
-        let mut stack = vec![(ENTRY_BLOCK_ID, /* is_first_visit */ true)];
-        while let Some((cur, is_first_visit)) = stack.pop() {
-            if is_first_visit {
-                stack.push((cur, false));
-                stack.extend(
-                    dag[&cur]
-                        .iter()
-                        .filter(|successor| !finished.contains(*successor))
-                        .map(|successor| (*successor, /* is_first_visit */ true)),
-                );
-            } else {
-                debug_assert!(dag[&cur]
-                    .iter()
-                    .all(|successor| finished.contains(successor)));
-                if finished.insert(cur) {
-                    post_order.push(cur)
+
+        while let Some(block) = stack.pop() {
+            match exploration.entry(block) {
+                Entry::Vacant(entry) => {
+                    // Record the fact that exploration of this block and its sub-graph has started.
+                    entry.insert(Exploration::InProgress);
+
+                    // Push the block back on the stack to finish processing it, and mark it as done
+                    // once its sub-graph has been traversed.
+                    stack.push(block);
+
+                    for succ in &blocks[&block].successors {
+                        match exploration.get(succ) {
+                            // This successor has never been visited before, add it to the stack to
+                            // be explored before `block` gets marked `Done`.
+                            None => stack.push(*succ),
+
+                            // This block's sub-graph was being explored, meaning it is a (reflexive
+                            // transitive) predecessor of `block` as well as being a successor,
+                            // implying a loop has been detected -- greedily choose the successor
+                            // block as the loop head.
+                            Some(Exploration::InProgress) => {
+                                loop_heads.entry(*succ).or_default().insert(block);
+                            }
+
+                            // Cross-edge detected, this block and its entire sub-graph (modulo
+                            // cycles) has already been explored via a different path, and is
+                            // already present in `post_order`.
+                            Some(Exploration::Done) => { /* skip */ }
+                        };
+                    }
                 }
+
+                Entry::Occupied(mut entry) => match entry.get() {
+                    // Already traversed the sub-graph reachable from this block, so skip it.
+                    Exploration::Done => continue,
+
+                    // Finish up the traversal by adding this block to the post-order traversal
+                    // after its sub-graph (modulo cycles).
+                    Exploration::InProgress => {
+                        post_order.push(block);
+                        entry.insert(Exploration::Done);
+                    }
+                },
             }
         }
-        // traversal order is the reverse post-order
+
         let traversal_order = {
+            // This reverse post order is akin to a topological sort (ignoring cycles) and is
+            // different from a pre-order in the presence of diamond patterns in the graph.
             post_order.reverse();
             post_order
         };
+
         // build a mapping from a block id to the next block id in the traversal order
         let traversal_successors = traversal_order
             .windows(2)
@@ -171,18 +216,6 @@ impl VMControlFlowGraph {
             })
             .collect();
 
-        // Gather loop head information
-        let mut loop_heads: Map<BlockId, Set<BlockId>> = Map::new();
-        for (id, block) in &blocks {
-            for successor in &block.successors {
-                // this simple check for back edges relies on guarantees from the control flow
-                // verifier (control_flow.rs)
-                if is_back_edge(*id, *successor) {
-                    loop_heads.entry(*successor).or_default().insert(*id);
-                }
-            }
-        }
-
         VMControlFlowGraph {
             blocks,
             traversal_successors,
@@ -295,4 +328,10 @@ impl ControlFlowGraph for VMControlFlowGraph {
             .get(&next)
             .map_or(false, |back_edges| back_edges.contains(&cur))
     }
+
+    fn num_back_edges(&self) -> usize {
+        self.loop_heads
+            .iter()
+            .fold(0, |acc, (_, edges)| acc + edges.len())
+    }
 }
diff --git a/language/move-binary-format/src/deserializer.rs b/language/move-binary-format/src/deserializer.rs
index 3f68235c8d..33ca060009 100644
--- a/language/move-binary-format/src/deserializer.rs
+++ b/language/move-binary-format/src/deserializer.rs
@@ -4,7 +4,7 @@
 
 use crate::{check_bounds::BoundsChecker, errors::*, file_format::*, file_format_common::*};
 use move_core_types::{
-    account_address::AccountAddress, identifier::Identifier, metadata::Metadata,
+    account_address::AccountAddress, identifier::Identifier, metadata::Metadata, state::VMState,
     vm_status::StatusCode,
 };
 use std::{collections::HashSet, convert::TryInto, io::Read};
@@ -12,7 +12,15 @@ use std::{collections::HashSet, convert::TryInto, io::Read};
 impl CompiledScript {
     /// Deserializes a &[u8] slice into a `CompiledScript` instance.
     pub fn deserialize(binary: &[u8]) -> BinaryLoaderResult<Self> {
-        let script = CompiledScript::deserialize_no_check_bounds(binary)?;
+        Self::deserialize_with_max_version(binary, VERSION_MAX)
+    }
+
+    /// Deserializes a &[u8] slice into a `CompiledScript` instance.
+    pub fn deserialize_with_max_version(
+        binary: &[u8],
+        max_binary_format_version: u32,
+    ) -> BinaryLoaderResult<Self> {
+        let script = deserialize_compiled_script(binary, max_binary_format_version)?;
         BoundsChecker::verify_script(&script)?;
         Ok(script)
     }
@@ -20,21 +28,42 @@ impl CompiledScript {
     // exposed as a public function to enable testing the deserializer
     #[doc(hidden)]
     pub fn deserialize_no_check_bounds(binary: &[u8]) -> BinaryLoaderResult<Self> {
-        deserialize_compiled_script(binary)
+        deserialize_compiled_script(binary, VERSION_MAX)
     }
 }
 
 impl CompiledModule {
     /// Deserialize a &[u8] slice into a `CompiledModule` instance.
     pub fn deserialize(binary: &[u8]) -> BinaryLoaderResult<Self> {
-        let module = CompiledModule::deserialize_no_check_bounds(binary)?;
-        BoundsChecker::verify_module(&module)?;
-        Ok(module)
+        Self::deserialize_with_max_version(binary, VERSION_MAX)
+    }
+
+    /// Deserialize a &[u8] slice into a `CompiledModule` instance, up to the specified version.
+    pub fn deserialize_with_max_version(
+        binary: &[u8],
+        max_binary_format_version: u32,
+    ) -> BinaryLoaderResult<Self> {
+        let prev_state = move_core_types::state::set_state(VMState::DESERIALIZER);
+        let result = std::panic::catch_unwind(|| {
+            let module = deserialize_compiled_module(binary, max_binary_format_version)?;
+            BoundsChecker::verify_module(&module)?;
+
+            Ok(module)
+        })
+        .unwrap_or_else(|_| {
+            Err(PartialVMError::new(
+                StatusCode::VERIFIER_INVARIANT_VIOLATION,
+            ))
+        });
+        move_core_types::state::set_state(prev_state);
+
+        result
     }
 
     // exposed as a public function to enable testing the deserializer
+    #[doc(hidden)]
     pub fn deserialize_no_check_bounds(binary: &[u8]) -> BinaryLoaderResult<Self> {
-        deserialize_compiled_module(binary)
+        deserialize_compiled_module(binary, VERSION_MAX)
     }
 }
 
@@ -57,6 +86,22 @@ impl Table {
     }
 }
 
+fn read_u16_internal(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u16> {
+    let mut u16_bytes = [0; 2];
+    cursor
+        .read_exact(&mut u16_bytes)
+        .map_err(|_| PartialVMError::new(StatusCode::BAD_U16))?;
+    Ok(u16::from_le_bytes(u16_bytes))
+}
+
+fn read_u32_internal(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u32> {
+    let mut u32_bytes = [0; 4];
+    cursor
+        .read_exact(&mut u32_bytes)
+        .map_err(|_| PartialVMError::new(StatusCode::BAD_U32))?;
+    Ok(u32::from_le_bytes(u32_bytes))
+}
+
 fn read_u64_internal(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u64> {
     let mut u64_bytes = [0; 8];
     cursor
@@ -73,6 +118,16 @@ fn read_u128_internal(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u128>
     Ok(u128::from_le_bytes(u128_bytes))
 }
 
+fn read_u256_internal(
+    cursor: &mut VersionedCursor,
+) -> BinaryLoaderResult<move_core_types::u256::U256> {
+    let mut u256_bytes = [0; 32];
+    cursor
+        .read_exact(&mut u256_bytes)
+        .map_err(|_| PartialVMError::new(StatusCode::BAD_U256))?;
+    Ok(move_core_types::u256::U256::from_le_bytes(&u256_bytes))
+}
+
 //
 // Helpers to read all uleb128 encoded integers.
 //
@@ -256,9 +311,12 @@ fn load_local_index(cursor: &mut VersionedCursor) -> BinaryLoaderResult<u8> {
 }
 
 /// Module internal function that manages deserialization of transactions.
-fn deserialize_compiled_script(binary: &[u8]) -> BinaryLoaderResult<CompiledScript> {
+fn deserialize_compiled_script(
+    binary: &[u8],
+    max_binary_format_version: u32,
+) -> BinaryLoaderResult<CompiledScript> {
     let binary_len = binary.len();
-    let mut cursor = VersionedCursor::new(binary)?;
+    let mut cursor = VersionedCursor::new(binary, max_binary_format_version)?;
     let table_count = load_table_count(&mut cursor)?;
     let mut tables: Vec<Table> = Vec::new();
     read_tables(&mut cursor, table_count, &mut tables)?;
@@ -287,9 +345,12 @@ fn deserialize_compiled_script(binary: &[u8]) -> BinaryLoaderResult<CompiledScri
 }
 
 /// Module internal function that manages deserialization of modules.
-fn deserialize_compiled_module(binary: &[u8]) -> BinaryLoaderResult<CompiledModule> {
+fn deserialize_compiled_module(
+    binary: &[u8],
+    max_binary_format_version: u32,
+) -> BinaryLoaderResult<CompiledModule> {
     let binary_len = binary.len();
-    let mut cursor = VersionedCursor::new(binary)?;
+    let mut cursor = VersionedCursor::new(binary, max_binary_format_version)?;
     let table_count = load_table_count(&mut cursor)?;
     let mut tables: Vec<Table> = Vec::new();
     read_tables(&mut cursor, table_count, &mut tables)?;
@@ -971,11 +1032,26 @@ fn load_signature_token(cursor: &mut VersionedCursor) -> BinaryLoaderResult<Sign
 
     let mut read_next = || {
         if let Ok(byte) = cursor.read_u8() {
+            match S::from_u8(byte)? {
+                S::U16 | S::U32 | S::U256 if (cursor.version() < VERSION_6) => {
+                    return Err(
+                        PartialVMError::new(StatusCode::MALFORMED).with_message(format!(
+                            "u16, u32, u256 integers not supported in bytecode version {}",
+                            cursor.version()
+                        )),
+                    );
+                }
+                _ => (),
+            };
+
             Ok(match S::from_u8(byte)? {
                 S::BOOL => T::Saturated(SignatureToken::Bool),
                 S::U8 => T::Saturated(SignatureToken::U8),
+                S::U16 => T::Saturated(SignatureToken::U16),
+                S::U32 => T::Saturated(SignatureToken::U32),
                 S::U64 => T::Saturated(SignatureToken::U64),
                 S::U128 => T::Saturated(SignatureToken::U128),
+                S::U256 => T::Saturated(SignatureToken::U256),
                 S::ADDRESS => T::Saturated(SignatureToken::Address),
                 S::SIGNER => T::Saturated(SignatureToken::Signer),
                 S::VECTOR => T::Vector,
@@ -988,6 +1064,10 @@ fn load_signature_token(cursor: &mut VersionedCursor) -> BinaryLoaderResult<Sign
                 S::STRUCT_INST => {
                     let sh_idx = load_struct_handle_index(cursor)?;
                     let arity = load_type_parameter_count(cursor)?;
+                    if arity == 0 {
+                        return Err(PartialVMError::new(StatusCode::MALFORMED)
+                            .with_message("Struct inst with arity 0".to_string()));
+                    }
                     T::StructInst {
                         sh_idx,
                         arity,
@@ -1378,6 +1458,26 @@ fn load_code(cursor: &mut VersionedCursor, code: &mut Vec<Bytecode>) -> BinaryLo
             }
             _ => {}
         };
+
+        match opcode {
+            Opcodes::LD_U16
+            | Opcodes::LD_U32
+            | Opcodes::LD_U256
+            | Opcodes::CAST_U16
+            | Opcodes::CAST_U32
+            | Opcodes::CAST_U256
+                if (cursor.version() < VERSION_6) =>
+            {
+                return Err(
+                    PartialVMError::new(StatusCode::MALFORMED).with_message(format!(
+                        "Loading or casting u16, u32, u256 integers not supported in bytecode version {}",
+                        cursor.version()
+                    )),
+                );
+            }
+            _ => (),
+        };
+
         // conversion
         let bytecode = match opcode {
             Opcodes::POP => Bytecode::Pop,
@@ -1479,6 +1579,21 @@ fn load_code(cursor: &mut VersionedCursor, code: &mut Vec<Bytecode>) -> BinaryLo
                 Bytecode::VecUnpack(load_signature_index(cursor)?, read_u64_internal(cursor)?)
             }
             Opcodes::VEC_SWAP => Bytecode::VecSwap(load_signature_index(cursor)?),
+            Opcodes::LD_U16 => {
+                let value = read_u16_internal(cursor)?;
+                Bytecode::LdU16(value)
+            }
+            Opcodes::LD_U32 => {
+                let value = read_u32_internal(cursor)?;
+                Bytecode::LdU32(value)
+            }
+            Opcodes::LD_U256 => {
+                let value = read_u256_internal(cursor)?;
+                Bytecode::LdU256(value)
+            }
+            Opcodes::CAST_U16 => Bytecode::CastU16,
+            Opcodes::CAST_U32 => Bytecode::CastU32,
+            Opcodes::CAST_U256 => Bytecode::CastU256,
         };
         code.push(bytecode);
     }
@@ -1523,6 +1638,9 @@ impl SerializedType {
             0xA => Ok(SerializedType::VECTOR),
             0xB => Ok(SerializedType::STRUCT_INST),
             0xC => Ok(SerializedType::SIGNER),
+            0xD => Ok(SerializedType::U16),
+            0xE => Ok(SerializedType::U32),
+            0xF => Ok(SerializedType::U256),
             _ => Err(PartialVMError::new(StatusCode::UNKNOWN_SERIALIZED_TYPE)),
         }
     }
@@ -1650,6 +1768,12 @@ impl Opcodes {
             0x45 => Ok(Opcodes::VEC_POP_BACK),
             0x46 => Ok(Opcodes::VEC_UNPACK),
             0x47 => Ok(Opcodes::VEC_SWAP),
+            0x48 => Ok(Opcodes::LD_U16),
+            0x49 => Ok(Opcodes::LD_U32),
+            0x4A => Ok(Opcodes::LD_U256),
+            0x4B => Ok(Opcodes::CAST_U16),
+            0x4C => Ok(Opcodes::CAST_U32),
+            0x4D => Ok(Opcodes::CAST_U256),
             _ => Err(PartialVMError::new(StatusCode::UNKNOWN_OPCODE)),
         }
     }
diff --git a/language/move-binary-format/src/errors.rs b/language/move-binary-format/src/errors.rs
index 9f56314968..5d4ad1a7f6 100644
--- a/language/move-binary-format/src/errors.rs
+++ b/language/move-binary-format/src/errors.rs
@@ -41,8 +41,11 @@ impl ExecutionState {
     }
 }
 
-#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
-pub struct VMError {
+#[derive(Clone, Eq, Ord, PartialEq, PartialOrd)]
+pub struct VMError(Box<VMError_>);
+
+#[derive(Clone, Eq, Ord, PartialEq, PartialOrd)]
+struct VMError_ {
     major_status: StatusCode,
     sub_status: Option<u64>,
     message: Option<String>,
@@ -54,13 +57,13 @@ pub struct VMError {
 
 impl VMError {
     pub fn into_vm_status(self) -> VMStatus {
-        let VMError {
+        let VMError_ {
             major_status,
             sub_status,
             location,
             mut offsets,
             ..
-        } = self;
+        } = *self.0;
         match (major_status, sub_status, location) {
             (StatusCode::EXECUTED, sub_status, _) => {
                 debug_assert!(sub_status.is_none());
@@ -82,10 +85,17 @@ impl VMError {
                 VMStatus::Error(StatusCode::ABORTED)
             }
 
-            // TODO Errors for OUT_OF_GAS do not always have index set
             (major_status, sub_status, location)
                 if major_status.status_type() == StatusType::Execution =>
             {
+                let abort_location = match &location {
+                    Location::Script => vm_status::AbortLocation::Script,
+                    Location::Module(id) => vm_status::AbortLocation::Module(id.clone()),
+                    Location::Undefined => {
+                        return VMStatus::Error(major_status);
+                    }
+                };
+                // Errors for OUT_OF_GAS do not always have index set: if it does not, it should already return above.
                 debug_assert!(
                     offsets.len() == 1,
                     "Unexpected offsets. major_status: {:?}\
@@ -97,13 +107,6 @@ impl VMError {
                     location,
                     offsets
                 );
-                let abort_location = match location {
-                    Location::Script => vm_status::AbortLocation::Script,
-                    Location::Module(id) => vm_status::AbortLocation::Module(id),
-                    Location::Undefined => {
-                        return VMStatus::Error(major_status);
-                    }
-                };
                 let (function, code_offset) = match offsets.pop() {
                     None => {
                         return VMStatus::Error(major_status);
@@ -123,39 +126,39 @@ impl VMError {
     }
 
     pub fn major_status(&self) -> StatusCode {
-        self.major_status
+        self.0.major_status
     }
 
     pub fn sub_status(&self) -> Option<u64> {
-        self.sub_status
+        self.0.sub_status
     }
 
     pub fn message(&self) -> Option<&String> {
-        self.message.as_ref()
+        self.0.message.as_ref()
     }
 
     pub fn exec_state(&self) -> Option<&ExecutionState> {
-        self.exec_state.as_ref()
+        self.0.exec_state.as_ref()
     }
 
     pub fn remove_exec_state(&mut self) {
-        self.exec_state = None;
+        self.0.exec_state = None;
     }
 
     pub fn location(&self) -> &Location {
-        &self.location
+        &self.0.location
     }
 
     pub fn indices(&self) -> &Vec<(IndexKind, TableIndex)> {
-        &self.indices
+        &self.0.indices
     }
 
     pub fn offsets(&self) -> &Vec<(FunctionDefinitionIndex, CodeOffset)> {
-        &self.offsets
+        &self.0.offsets
     }
 
     pub fn status_type(&self) -> StatusType {
-        self.major_status.status_type()
+        self.0.major_status.status_type()
     }
 
     pub fn all_data(
@@ -169,7 +172,7 @@ impl VMError {
         Vec<(IndexKind, TableIndex)>,
         Vec<(FunctionDefinitionIndex, CodeOffset)>,
     ) {
-        let VMError {
+        let VMError_ {
             major_status,
             sub_status,
             message,
@@ -177,7 +180,7 @@ impl VMError {
             location,
             indices,
             offsets,
-        } = self;
+        } = *self.0;
         (
             major_status,
             sub_status,
@@ -190,7 +193,7 @@ impl VMError {
     }
 
     pub fn to_partial(self) -> PartialVMError {
-        let VMError {
+        let VMError_ {
             major_status,
             sub_status,
             message,
@@ -198,22 +201,54 @@ impl VMError {
             indices,
             offsets,
             ..
-        } = self;
-        PartialVMError {
+        } = *self.0;
+        PartialVMError(Box::new(PartialVMError_ {
             major_status,
             sub_status,
             message,
             exec_state,
             indices,
             offsets,
-        }
+        }))
+    }
+}
+
+impl fmt::Debug for VMError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&self.0, f)
+    }
+}
+
+impl fmt::Debug for VMError_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let Self {
+            major_status,
+            sub_status,
+            message,
+            exec_state,
+            location,
+            indices,
+            offsets,
+        } = self;
+        f.debug_struct("VMError")
+            .field("major_status", major_status)
+            .field("sub_status", sub_status)
+            .field("message", message)
+            .field("exec_state", exec_state)
+            .field("location", location)
+            .field("indices", indices)
+            .field("offsets", offsets)
+            .finish()
     }
 }
 
 impl std::error::Error for VMError {}
 
-#[derive(Debug, Clone)]
-pub struct PartialVMError {
+#[derive(Clone)]
+pub struct PartialVMError(Box<PartialVMError_>);
+
+#[derive(Clone)]
+struct PartialVMError_ {
     major_status: StatusCode,
     sub_status: Option<u64>,
     message: Option<String>,
@@ -233,14 +268,14 @@ impl PartialVMError {
         Vec<(IndexKind, TableIndex)>,
         Vec<(FunctionDefinitionIndex, CodeOffset)>,
     ) {
-        let PartialVMError {
+        let PartialVMError_ {
             major_status,
             sub_status,
             message,
             exec_state,
             indices,
             offsets,
-        } = self;
+        } = *self.0;
         (
             major_status,
             sub_status,
@@ -252,15 +287,15 @@ impl PartialVMError {
     }
 
     pub fn finish(self, location: Location) -> VMError {
-        let PartialVMError {
+        let PartialVMError_ {
             major_status,
             sub_status,
             message,
             exec_state,
             indices,
             offsets,
-        } = self;
-        VMError {
+        } = *self.0;
+        VMError(Box::new(VMError_ {
             major_status,
             sub_status,
             message,
@@ -268,96 +303,82 @@ impl PartialVMError {
             location,
             indices,
             offsets,
-        }
+        }))
     }
 
     pub fn new(major_status: StatusCode) -> Self {
-        Self {
+        Self(Box::new(PartialVMError_ {
             major_status,
             sub_status: None,
             message: None,
             exec_state: None,
             indices: vec![],
             offsets: vec![],
-        }
+        }))
     }
 
     pub fn major_status(&self) -> StatusCode {
-        self.major_status
+        self.0.major_status
     }
 
-    pub fn with_sub_status(self, sub_status: u64) -> Self {
-        debug_assert!(self.sub_status.is_none());
-        Self {
-            sub_status: Some(sub_status),
-            ..self
-        }
+    pub fn with_sub_status(mut self, sub_status: u64) -> Self {
+        debug_assert!(self.0.sub_status.is_none());
+        self.0.sub_status = Some(sub_status);
+        self
     }
 
-    pub fn with_message(self, message: String) -> Self {
-        debug_assert!(self.message.is_none());
-        Self {
-            message: Some(message),
-            ..self
-        }
+    pub fn with_message(mut self, message: String) -> Self {
+        debug_assert!(self.0.message.is_none());
+        self.0.message = Some(message);
+        self
     }
 
-    pub fn with_exec_state(self, exec_state: ExecutionState) -> Self {
-        debug_assert!(self.exec_state.is_none());
-        Self {
-            exec_state: Some(exec_state),
-            ..self
-        }
+    pub fn with_exec_state(mut self, exec_state: ExecutionState) -> Self {
+        debug_assert!(self.0.exec_state.is_none());
+        self.0.exec_state = Some(exec_state);
+        self
     }
 
-    pub fn at_index(self, kind: IndexKind, index: TableIndex) -> Self {
-        let mut indices = self.indices;
-        indices.push((kind, index));
-        Self { indices, ..self }
+    pub fn at_index(mut self, kind: IndexKind, index: TableIndex) -> Self {
+        self.0.indices.push((kind, index));
+        self
     }
 
-    pub fn at_indices(self, additional_indices: Vec<(IndexKind, TableIndex)>) -> Self {
-        let mut indices = self.indices;
-        indices.extend(additional_indices);
-        Self { indices, ..self }
+    pub fn at_indices(mut self, additional_indices: Vec<(IndexKind, TableIndex)>) -> Self {
+        self.0.indices.extend(additional_indices);
+        self
     }
 
-    pub fn at_code_offset(self, function: FunctionDefinitionIndex, offset: CodeOffset) -> Self {
-        let mut offsets = self.offsets;
-        offsets.push((function, offset));
-        Self { offsets, ..self }
+    pub fn at_code_offset(mut self, function: FunctionDefinitionIndex, offset: CodeOffset) -> Self {
+        self.0.offsets.push((function, offset));
+        self
     }
 
     pub fn at_code_offsets(
-        self,
+        mut self,
         additional_offsets: Vec<(FunctionDefinitionIndex, CodeOffset)>,
     ) -> Self {
-        let mut offsets = self.offsets;
-        offsets.extend(additional_offsets);
-        Self { offsets, ..self }
+        self.0.offsets.extend(additional_offsets);
+        self
     }
 
     /// Append the message `message` to the message field of the VM status, and insert a seperator
     /// if the original message is non-empty.
     pub fn append_message_with_separator(
-        self,
+        mut self,
         separator: char,
         additional_message: String,
     ) -> Self {
-        let message = match self.message {
-            Some(mut msg) => {
+        match self.0.message.as_mut() {
+            Some(msg) => {
                 if !msg.is_empty() {
                     msg.push(separator);
                 }
                 msg.push_str(&additional_message);
-                msg
             }
-            None => additional_message,
+            None => self.0.message = Some(additional_message),
         };
-        Self {
-            message: Some(message),
-            ..self
-        }
+        self
     }
 }
 
@@ -373,20 +394,20 @@ impl fmt::Display for Location {
 
 impl fmt::Display for PartialVMError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let mut status = format!("PartialVMError with status {:#?}", self.major_status);
+        let mut status = format!("PartialVMError with status {:#?}", self.0.major_status);
 
-        if let Some(sub_status) = self.sub_status {
+        if let Some(sub_status) = self.0.sub_status {
             status = format!("{} with sub status {}", status, sub_status);
         }
 
-        if let Some(msg) = &self.message {
+        if let Some(msg) = &self.0.message {
             status = format!("{} and message {}", status, msg);
         }
 
-        for (kind, index) in &self.indices {
+        for (kind, index) in &self.0.indices {
             status = format!("{} at index {} for {}", status, index, kind);
         }
-        for (fdef, code_offset) in &self.offsets {
+        for (fdef, code_offset) in &self.0.offsets {
             status = format!(
                 "{} at code offset {} in function definition {}",
                 status, code_offset, fdef
@@ -399,22 +420,22 @@ impl fmt::Display for PartialVMError {
 
 impl fmt::Display for VMError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let mut status = format!("VMError with status {:#?}", self.major_status);
+        let mut status = format!("VMError with status {:#?}", self.0.major_status);
 
-        if let Some(sub_status) = self.sub_status {
+        if let Some(sub_status) = self.0.sub_status {
             status = format!("{} with sub status {}", status, sub_status);
         }
 
-        status = format!("{} at location {}", status, self.location);
+        status = format!("{} at location {}", status, self.0.location);
 
-        if let Some(msg) = &self.message {
+        if let Some(msg) = &self.0.message {
             status = format!("{} and message {}", status, msg);
         }
 
-        for (kind, index) in &self.indices {
+        for (kind, index) in &self.0.indices {
             status = format!("{} at index {} for {}", status, index, kind);
         }
-        for (fdef, code_offset) in &self.offsets {
+        for (fdef, code_offset) in &self.0.offsets {
             status = format!(
                 "{} at code offset {} in function definition {}",
                 status, code_offset, fdef
@@ -477,6 +498,33 @@ pub fn verification_error(status: StatusCode, kind: IndexKind, idx: TableIndex)
     PartialVMError::new(status).at_index(kind, idx)
 }
 
+impl fmt::Debug for PartialVMError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&self.0, f)
+    }
+}
+
+impl fmt::Debug for PartialVMError_ {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let Self {
+            major_status,
+            sub_status,
+            message,
+            exec_state,
+            indices,
+            offsets,
+        } = self;
+        f.debug_struct("PartialVMError")
+            .field("major_status", major_status)
+            .field("sub_status", sub_status)
+            .field("message", message)
+            .field("exec_state", exec_state)
+            .field("indices", indices)
+            .field("offsets", offsets)
+            .finish()
+    }
+}
+
 impl std::error::Error for PartialVMError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         None
diff --git a/language/move-binary-format/src/file_format.rs b/language/move-binary-format/src/file_format.rs
index e6a92f591f..0be6b85fb8 100644
--- a/language/move-binary-format/src/file_format.rs
+++ b/language/move-binary-format/src/file_format.rs
@@ -43,8 +43,6 @@ use move_core_types::{
 };
 #[cfg(any(test, feature = "fuzzing"))]
 use proptest::{collection::vec, prelude::*, strategy::BoxedStrategy};
-#[cfg(any(test, feature = "fuzzing"))]
-use proptest_derive::Arbitrary;
 use ref_cast::RefCast;
 use serde::{Deserialize, Serialize};
 use std::ops::BitOr;
@@ -60,8 +58,9 @@ macro_rules! define_index {
         doc: $comment: literal,
     } => {
         #[derive(Clone, Copy, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
-        #[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+        #[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
         #[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+        #[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
         #[doc=$comment]
         pub struct $name(pub TableIndex);
 
@@ -216,8 +215,9 @@ pub const NO_TYPE_ARGUMENTS: SignatureIndex = SignatureIndex(0);
 /// Type definitions (fields) are private to the module. Outside the module a
 /// Type is an opaque handle.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
 #[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct ModuleHandle {
     /// Index into the `AddressIdentifierIndex`. Identifies module-holding account's address.
     pub address: AddressIdentifierIndex,
@@ -239,8 +239,9 @@ pub struct ModuleHandle {
 /// At link time ability/constraint checking is performed and an error is reported if there is a
 /// mismatch with the definition.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
 #[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct StructHandle {
     /// The module that defines the type.
     pub module: ModuleHandleIndex,
@@ -262,8 +263,9 @@ impl StructHandle {
 
 /// A type parameter used in the declaration of a struct.
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
 #[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct StructTypeParameter {
     /// The type parameter constraints.
     pub constraints: AbilitySet,
@@ -279,8 +281,9 @@ pub struct StructTypeParameter {
 /// ensure the function reference is valid and it is also used by the verifier to type check
 /// function calls.
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
 #[cfg_attr(any(test, feature = "fuzzing"), proptest(params = "usize"))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct FunctionHandle {
     /// The module that defines the function.
     pub module: ModuleHandleIndex,
@@ -296,8 +299,9 @@ pub struct FunctionHandle {
 
 /// A field access info (owner type and offset)
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
 #[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct FieldHandle {
     pub owner: StructDefinitionIndex,
     pub field: MemberCount,
@@ -308,8 +312,9 @@ pub struct FieldHandle {
 
 /// `StructFieldInformation` indicates whether a struct is native or has user-specified fields
 #[derive(Clone, Debug, Eq, PartialEq)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
 #[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub enum StructFieldInformation {
     Native,
     Declared(Vec<FieldDefinition>),
@@ -325,8 +330,9 @@ pub enum StructFieldInformation {
 
 /// A complete or partial instantiation of a generic struct
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
 #[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct StructDefInstantiation {
     pub def: StructDefinitionIndex,
     pub type_parameters: SignatureIndex,
@@ -334,8 +340,9 @@ pub struct StructDefInstantiation {
 
 /// A complete or partial instantiation of a function
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
 #[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct FunctionInstantiation {
     pub handle: FunctionHandleIndex,
     pub type_parameters: SignatureIndex,
@@ -346,10 +353,11 @@ pub struct FunctionInstantiation {
 /// A `FieldInstantiation` points to a generic `FieldHandle` and the instantiation
 /// of the owner type.
 /// E.g. for `S<u8, bool>.f` where `f` is a field of any type, `instantiation`
-/// would be `[u8, boo]`
+/// would be `[u8, bool]`
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
 #[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct FieldInstantiation {
     pub handle: FieldHandleIndex,
     pub type_parameters: SignatureIndex,
@@ -358,8 +366,9 @@ pub struct FieldInstantiation {
 /// A `StructDefinition` is a type definition. It either indicates it is native or defines all the
 /// user-specified fields declared on the type.
 #[derive(Clone, Debug, Eq, PartialEq)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
 #[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct StructDefinition {
     /// The `StructHandle` for this `StructDefinition`. This has the name and the abilities
     /// for the type.
@@ -390,8 +399,9 @@ impl StructDefinition {
 
 /// A `FieldDefinition` is the definition of a field: its name and the field type.
 #[derive(Clone, Debug, Eq, PartialEq)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
 #[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct FieldDefinition {
     /// The name of the field.
     pub name: IdentifierIndex,
@@ -402,8 +412,9 @@ pub struct FieldDefinition {
 /// `Visibility` restricts the accessibility of the associated entity.
 /// - For function visibility, it restricts who may call into the associated function.
 #[derive(Clone, Copy, Debug, Eq, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
 #[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 #[repr(u8)]
 pub enum Visibility {
     /// Accessible within its defining module only.
@@ -443,8 +454,9 @@ impl std::convert::TryFrom<u8> for Visibility {
 /// A `FunctionDefinition` is the implementation of a function. It defines
 /// the *prototype* of the function and the function body.
 #[derive(Clone, Debug, Default, Eq, PartialEq)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
 #[cfg_attr(any(test, feature = "fuzzing"), proptest(params = "usize"))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct FunctionDefinition {
     /// The prototype of the function (module, name, signature).
     pub function: FunctionHandleIndex,
@@ -495,16 +507,18 @@ impl FunctionDefinition {
 /// A type definition. `SignatureToken` allows the definition of the set of known types and their
 /// composition.
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
 #[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct TypeSignature(pub SignatureToken);
 
 // TODO: remove at some point or move it in the front end (language/move-ir-compiler)
 /// A `FunctionSignature` in internally used to create a unique representation of the overall
 /// signature as need. Consider deprecated...
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
 #[cfg_attr(any(test, feature = "fuzzing"), proptest(params = "usize"))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct FunctionSignature {
     /// The list of return types.
     #[cfg_attr(
@@ -527,8 +541,9 @@ pub struct FunctionSignature {
 /// Locals include the arguments to the function from position `0` to argument `count - 1`.
 /// The remaining elements are the type of each local.
 #[derive(Clone, Debug, Default, Eq, Hash, PartialEq, Ord, PartialOrd)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
 #[cfg_attr(any(test, feature = "fuzzing"), proptest(params = "usize"))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct Signature(
     #[cfg_attr(
         any(test, feature = "fuzzing"),
@@ -558,7 +573,8 @@ pub type TypeParameterIndex = u16;
 /// An `Ability` classifies what operations are permitted for a given type
 #[repr(u8)]
 #[derive(Debug, Clone, Eq, Copy, Hash, Ord, PartialEq, PartialOrd)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub enum Ability {
     /// Allows values of types with this ability to be copied, via CopyLoc or ReadRef
     Copy = 0x1,
@@ -609,6 +625,7 @@ impl Ability {
 
 /// A set of `Ability`s
 #[derive(Clone, Eq, Copy, Hash, Ord, PartialEq, PartialOrd, Serialize, Deserialize)]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct AbilitySet(u8);
 
 impl AbilitySet {
@@ -634,6 +651,10 @@ impl AbilitySet {
             | (Ability::Key as u8),
     );
 
+    pub fn singleton(ability: Ability) -> Self {
+        Self(ability as u8)
+    }
+
     pub fn has_ability(self, ability: Ability) -> bool {
         let a = ability as u8;
         (a & self.0) == a
@@ -816,6 +837,7 @@ impl Arbitrary for AbilitySet {
 /// A SignatureToken can express more types than the VM can handle safely, and correctness is
 /// enforced by the verifier.
 #[derive(Clone, Eq, Hash, Ord, PartialEq, PartialOrd)]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub enum SignatureToken {
     /// Boolean, `true` or `false`.
     Bool,
@@ -840,6 +862,12 @@ pub enum SignatureToken {
     MutableReference(Box<SignatureToken>),
     /// Type parameter.
     TypeParameter(TypeParameterIndex),
+    /// Unsigned integers, 16 bits length.
+    U16,
+    /// Unsigned integers, 32 bits length.
+    U32,
+    /// Unsigned integers, 256 bits length.
+    U256,
 }
 
 /// An iterator to help traverse the `SignatureToken` in a non-recursive fashion to avoid
@@ -867,7 +895,8 @@ impl<'a> Iterator for SignatureTokenPreorderTraversalIter<'a> {
                         self.stack.extend(inner_toks.iter().rev())
                     }
 
-                    Signer | Bool | Address | U8 | U64 | U128 | Struct(_) | TypeParameter(_) => (),
+                    Signer | Bool | Address | U8 | U16 | U32 | U64 | U128 | U256 | Struct(_)
+                    | TypeParameter(_) => (),
                 }
                 Some(tok)
             }
@@ -899,7 +928,8 @@ impl<'a> Iterator for SignatureTokenPreorderTraversalIterWithDepth<'a> {
                         .stack
                         .extend(inner_toks.iter().map(|tok| (tok, depth + 1)).rev()),
 
-                    Signer | Bool | Address | U8 | U64 | U128 | Struct(_) | TypeParameter(_) => (),
+                    Signer | Bool | Address | U8 | U16 | U32 | U64 | U128 | U256 | Struct(_)
+                    | TypeParameter(_) => (),
                 }
                 Some((tok, depth))
             }
@@ -920,8 +950,11 @@ impl Arbitrary for SignatureToken {
         let leaf = prop_oneof![
             Just(Bool),
             Just(U8),
+            Just(U16),
+            Just(U32),
             Just(U64),
             Just(U128),
+            Just(U256),
             Just(Address),
             any::<StructHandleIndex>().prop_map(Struct),
             any::<TypeParameterIndex>().prop_map(TypeParameter),
@@ -947,8 +980,11 @@ impl std::fmt::Debug for SignatureToken {
         match self {
             SignatureToken::Bool => write!(f, "Bool"),
             SignatureToken::U8 => write!(f, "U8"),
+            SignatureToken::U16 => write!(f, "U16"),
+            SignatureToken::U32 => write!(f, "U32"),
             SignatureToken::U64 => write!(f, "U64"),
             SignatureToken::U128 => write!(f, "U128"),
+            SignatureToken::U256 => write!(f, "U256"),
             SignatureToken::Address => write!(f, "Address"),
             SignatureToken::Signer => write!(f, "Signer"),
             SignatureToken::Vector(boxed) => write!(f, "Vector({:?})", boxed),
@@ -976,8 +1012,11 @@ impl SignatureToken {
             MutableReference(_) => SignatureTokenKind::MutableReference,
             Bool
             | U8
+            | U16
+            | U32
             | U64
             | U128
+            | U256
             | Address
             | Signer
             | Struct(_)
@@ -993,7 +1032,7 @@ impl SignatureToken {
     pub fn is_integer(&self) -> bool {
         use SignatureToken::*;
         match self {
-            U8 | U64 | U128 => true,
+            U8 | U16 | U32 | U64 | U128 | U256 => true,
             Bool
             | Address
             | Signer
@@ -1033,7 +1072,7 @@ impl SignatureToken {
         use SignatureToken::*;
 
         match self {
-            Bool | U8 | U64 | U128 | Address => true,
+            Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address => true,
             Vector(inner) => inner.is_valid_for_constant(),
             Signer
             | Struct(_)
@@ -1076,6 +1115,7 @@ impl SignatureToken {
 /// A `Constant` is a serialized value along with its type. That type will be deserialized by the
 /// loader/evauluator
 #[derive(Clone, Debug, Eq, PartialEq, Hash)]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct Constant {
     pub type_: SignatureToken,
     pub data: Vec<u8>,
@@ -1083,8 +1123,9 @@ pub struct Constant {
 
 /// A `CodeUnit` is the body of a function. It has the function header and the instruction stream.
 #[derive(Clone, Debug, Default, Eq, PartialEq)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
 #[cfg_attr(any(test, feature = "fuzzing"), proptest(params = "usize"))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct CodeUnit {
     /// List of locals type. All locals are typed.
     pub locals: SignatureIndex,
@@ -1102,8 +1143,9 @@ pub struct CodeUnit {
 /// Bytecodes operate on a stack machine and each bytecode has side effect on the stack and the
 /// instruction stream.
 #[derive(Clone, Hash, Eq, VariantCount, PartialEq)]
-#[cfg_attr(any(test, feature = "fuzzing"), derive(Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
 #[cfg_attr(any(test, feature = "fuzzing"), proptest(no_params))]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub enum Bytecode {
     /// Pop and discard the value at the top of the stack.
     /// The value on the stack must be an copyable type.
@@ -1168,7 +1210,7 @@ pub enum Bytecode {
     ///
     /// Stack transition:
     ///
-    /// ```..., integer_value -> ..., u8_value```
+    /// ```..., integer_value -> ..., u64_value```
     CastU64,
     /// Convert the value at the top of the stack into u128.
     ///
@@ -1557,10 +1599,44 @@ pub enum Bytecode {
     ///
     /// ```..., vector_reference, u64_value(1), u64_value(2) -> ...```
     VecSwap(SignatureIndex),
+    /// Push a U16 constant onto the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```... -> ..., u16_value```
+    LdU16(u16),
+    /// Push a U32 constant onto the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```... -> ..., u32_value```
+    LdU32(u32),
+    /// Push a U256 constant onto the stack.
+    ///
+    /// Stack transition:
+    ///
+    /// ```... -> ..., u256_value```
+    LdU256(move_core_types::u256::U256),
+    /// Convert the value at the top of the stack into u16.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., integer_value -> ..., u16_value```
+    CastU16,
+    /// Convert the value at the top of the stack into u32.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., integer_value -> ..., u32_value```
+    CastU32,
+    /// Convert the value at the top of the stack into u256.
+    ///
+    /// Stack transition:
+    ///
+    /// ```..., integer_value -> ..., u256_value```
+    CastU256,
 }
 
-pub const NUMBER_OF_NATIVE_FUNCTIONS: usize = 18;
-
 impl ::std::fmt::Debug for Bytecode {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
         match self {
@@ -1570,11 +1646,17 @@ impl ::std::fmt::Debug for Bytecode {
             Bytecode::BrFalse(a) => write!(f, "BrFalse({})", a),
             Bytecode::Branch(a) => write!(f, "Branch({})", a),
             Bytecode::LdU8(a) => write!(f, "LdU8({})", a),
+            Bytecode::LdU16(a) => write!(f, "LdU16({})", a),
+            Bytecode::LdU32(a) => write!(f, "LdU32({})", a),
             Bytecode::LdU64(a) => write!(f, "LdU64({})", a),
             Bytecode::LdU128(a) => write!(f, "LdU128({})", a),
+            Bytecode::LdU256(a) => write!(f, "LdU256({})", a),
             Bytecode::CastU8 => write!(f, "CastU8"),
+            Bytecode::CastU16 => write!(f, "CastU16"),
+            Bytecode::CastU32 => write!(f, "CastU32"),
             Bytecode::CastU64 => write!(f, "CastU64"),
             Bytecode::CastU128 => write!(f, "CastU128"),
+            Bytecode::CastU256 => write!(f, "CastU256"),
             Bytecode::LdConst(a) => write!(f, "LdConst({})", a),
             Bytecode::LdTrue => write!(f, "LdTrue"),
             Bytecode::LdFalse => write!(f, "LdFalse"),
@@ -1670,11 +1752,11 @@ impl Bytecode {
     /// Return the successor offsets of this bytecode instruction.
     pub fn get_successors(pc: CodeOffset, code: &[Bytecode]) -> Vec<CodeOffset> {
         assert!(
-            // The program counter could be added to at most twice and must remain
-            // within the bounds of the code.
-            pc <= u16::max_value() - 2 && (pc as usize) < code.len(),
+            // The program counter must remain within the bounds of the code
+            pc < u16::MAX && (pc as usize) < code.len(),
             "Program counter out of bounds"
         );
+
         let bytecode = &code[pc as usize];
         let mut v = vec![];
 
@@ -1749,6 +1831,7 @@ impl CompiledScript {
 ///
 /// A module is published as a single entry and it is retrieved as a single blob.
 #[derive(Clone, Debug, Default, Eq, PartialEq)]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct CompiledModule {
     /// Version number found during deserialization
     pub version: u32,
diff --git a/language/move-binary-format/src/file_format_common.rs b/language/move-binary-format/src/file_format_common.rs
index 82d7979bf0..392090b574 100644
--- a/language/move-binary-format/src/file_format_common.rs
+++ b/language/move-binary-format/src/file_format_common.rs
@@ -24,10 +24,10 @@ use std::{
 pub enum BinaryConstants {}
 impl BinaryConstants {
     /// The blob that must start a binary.
-    pub const DIEM_MAGIC_SIZE: usize = 4;
-    pub const DIEM_MAGIC: [u8; BinaryConstants::DIEM_MAGIC_SIZE] = [0xA1, 0x1C, 0xEB, 0x0B];
+    pub const MOVE_MAGIC_SIZE: usize = 4;
+    pub const MOVE_MAGIC: [u8; BinaryConstants::MOVE_MAGIC_SIZE] = [0xA1, 0x1C, 0xEB, 0x0B];
     /// The `DIEM_MAGIC` size, 4 byte for major version and 1 byte for table count.
-    pub const HEADER_SIZE: usize = BinaryConstants::DIEM_MAGIC_SIZE + 5;
+    pub const HEADER_SIZE: usize = BinaryConstants::MOVE_MAGIC_SIZE + 5;
     /// A (Table Type, Start Offset, Byte Count) size, which is 1 byte for the type and
     /// 4 bytes for the offset/count.
     pub const TABLE_HEADER_SIZE: u8 = size_of::<u32>() as u8 * 2 + 1;
@@ -121,6 +121,9 @@ pub enum SerializedType {
     VECTOR                  = 0xA,
     STRUCT_INST             = 0xB,
     SIGNER                  = 0xC,
+    U16                     = 0xD,
+    U32                     = 0xE,
+    U256                    = 0xF,
 }
 
 #[rustfmt::skip]
@@ -209,6 +212,12 @@ pub enum Opcodes {
     VEC_POP_BACK                = 0x45,
     VEC_UNPACK                  = 0x46,
     VEC_SWAP                    = 0x47,
+    LD_U16                      = 0x48,
+    LD_U32                      = 0x49,
+    LD_U256                     = 0x4A,
+    CAST_U16                    = 0x4B,
+    CAST_U32                    = 0x4C,
+    CAST_U256                   = 0x4D,
 }
 
 /// Upper limit on the binary size
@@ -320,6 +329,14 @@ pub(crate) fn write_u128(binary: &mut BinaryData, value: u128) -> Result<()> {
     binary.extend(&value.to_le_bytes())
 }
 
+/// Write a `u256` in Little Endian format.
+pub(crate) fn write_u256(
+    binary: &mut BinaryData,
+    value: move_core_types::u256::U256,
+) -> Result<()> {
+    binary.extend(&value.to_le_bytes())
+}
+
 pub fn read_u8(cursor: &mut Cursor<&[u8]>) -> Result<u8> {
     let mut buf = [0; 1];
     cursor.read_exact(&mut buf)?;
@@ -384,8 +401,12 @@ pub const VERSION_4: u32 = 4;
 ///  + metadata
 pub const VERSION_5: u32 = 5;
 
+/// Version 6: changes compared with version 5
+///  + u16, u32, u256 integers and corresponding Ld, Cast bytecodes
+pub const VERSION_6: u32 = 6;
+
 // Mark which version is the latest version
-pub const VERSION_MAX: u32 = VERSION_5;
+pub const VERSION_MAX: u32 = VERSION_6;
 
 // Mark which oldest version is supported.
 // TODO(#145): finish v4 compatibility; as of now, only metadata is implemented
@@ -406,11 +427,11 @@ pub(crate) mod versioned_data {
     }
 
     impl<'a> VersionedBinary<'a> {
-        fn new(binary: &'a [u8]) -> BinaryLoaderResult<(Self, Cursor<&'a [u8]>)> {
+        fn new(binary: &'a [u8], max_version: u32) -> BinaryLoaderResult<(Self, Cursor<&'a [u8]>)> {
             let mut cursor = Cursor::<&'a [u8]>::new(binary);
-            let mut magic = [0u8; BinaryConstants::DIEM_MAGIC_SIZE];
+            let mut magic = [0u8; BinaryConstants::MOVE_MAGIC_SIZE];
             if let Ok(count) = cursor.read(&mut magic) {
-                if count != BinaryConstants::DIEM_MAGIC_SIZE || magic != BinaryConstants::DIEM_MAGIC
+                if count != BinaryConstants::MOVE_MAGIC_SIZE || magic != BinaryConstants::MOVE_MAGIC
                 {
                     return Err(PartialVMError::new(StatusCode::BAD_MAGIC));
                 }
@@ -425,7 +446,7 @@ pub(crate) mod versioned_data {
                         .with_message("Bad binary header".to_string()));
                 }
             };
-            if version == 0 || version > VERSION_MAX {
+            if version == 0 || version > u32::min(max_version, VERSION_MAX) {
                 return Err(PartialVMError::new(StatusCode::UNKNOWN_VERSION));
             }
             Ok((Self { version, binary }, cursor))
@@ -451,8 +472,8 @@ pub(crate) mod versioned_data {
     impl<'a> VersionedCursor<'a> {
         /// Verifies the correctness of the "static" part of the binary's header.
         /// If valid, returns a cursor to the binary
-        pub fn new(binary: &'a [u8]) -> BinaryLoaderResult<Self> {
-            let (binary, cursor) = VersionedBinary::new(binary)?;
+        pub fn new(binary: &'a [u8], max_version: u32) -> BinaryLoaderResult<Self> {
+            let (binary, cursor) = VersionedBinary::new(binary, max_version)?;
             Ok(VersionedCursor {
                 version: binary.version,
                 cursor,
@@ -598,6 +619,12 @@ pub fn instruction_key(instruction: &Bytecode) -> u8 {
         VecPopBack(_) => Opcodes::VEC_POP_BACK,
         VecUnpack(..) => Opcodes::VEC_UNPACK,
         VecSwap(_) => Opcodes::VEC_SWAP,
+        LdU16(_) => Opcodes::LD_U16,
+        LdU32(_) => Opcodes::LD_U32,
+        LdU256(_) => Opcodes::LD_U256,
+        CastU16 => Opcodes::CAST_U16,
+        CastU32 => Opcodes::CAST_U32,
+        CastU256 => Opcodes::CAST_U256,
     };
     opcode as u8
 }
diff --git a/language/move-binary-format/src/lib.rs b/language/move-binary-format/src/lib.rs
index b5fab63af3..ebcd6b1b24 100644
--- a/language/move-binary-format/src/lib.rs
+++ b/language/move-binary-format/src/lib.rs
@@ -136,3 +136,59 @@ impl fmt::Display for SignatureTokenKind {
         f.write_str(desc)
     }
 }
+
+/// A macro which should be preferred in critical runtime paths for unwrapping an option
+/// if a `PartialVMError` is expected. In debug mode, this will panic. Otherwise
+/// we return an Err.
+#[macro_export]
+macro_rules! safe_unwrap {
+    ($e:expr) => {{
+        match $e {
+            Some(x) => x,
+            None => {
+                let err = PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message(format!("{}:{} (none)", file!(), line!()));
+                if cfg!(debug_assertions) {
+                    panic!("{:?}", err);
+                } else {
+                    return Err(err);
+                }
+            }
+        }
+    }};
+}
+
+/// Similar as above but for Result
+#[macro_export]
+macro_rules! safe_unwrap_err {
+    ($e:expr) => {{
+        match $e {
+            Ok(x) => x,
+            Err(e) => {
+                let err = PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message(format!("{}:{} {:#}", file!(), line!(), e));
+                if cfg!(debug_assertions) {
+                    panic!("{:?}", err);
+                } else {
+                    return Err(err);
+                }
+            }
+        }
+    }};
+}
+
+/// Similar as above, but asserts a boolean expression to be true.
+#[macro_export]
+macro_rules! safe_assert {
+    ($e:expr) => {{
+        if !$e {
+            let err = PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message(format!("{}:{} (assert)", file!(), line!()));
+            if cfg!(debug_assertions) {
+                panic!("{:?}", err)
+            } else {
+                return Err(err);
+            }
+        }
+    }};
+}
diff --git a/language/move-binary-format/src/normalized.rs b/language/move-binary-format/src/normalized.rs
index 0323cc8c34..183ae569c0 100644
--- a/language/move-binary-format/src/normalized.rs
+++ b/language/move-binary-format/src/normalized.rs
@@ -53,6 +53,13 @@ pub enum Type {
     TypeParameter(TypeParameterIndex),
     Reference(Box<Type>),
     MutableReference(Box<Type>),
+    // NOTE: Added in bytecode version v6, do not reorder!
+    #[serde(rename = "u16")]
+    U16,
+    #[serde(rename = "u32")]
+    U32,
+    #[serde(rename = "u256")]
+    U256,
 }
 
 /// Normalized version of a `FieldDefinition`. The `name` is included even though it is
@@ -161,8 +168,11 @@ impl Type {
             }
             Bool => Type::Bool,
             U8 => Type::U8,
+            U16 => Type::U16,
+            U32 => Type::U32,
             U64 => Type::U64,
             U128 => Type::U128,
+            U256 => Type::U256,
             Address => Type::Address,
             Signer => Type::Signer,
             Vector(t) => Type::Vector(Box::new(Type::new(m, t))),
@@ -179,8 +189,11 @@ impl Type {
             TypeParameter(_) => false,
             Bool => true,
             U8 => true,
+            U16 => true,
+            U32 => true,
             U64 => true,
             U128 => true,
+            U256 => true,
             Address => true,
             Signer => true,
             Struct { type_arguments, .. } => type_arguments.iter().all(|t| t.is_closed()),
@@ -195,8 +208,11 @@ impl Type {
                 Reference(_) | MutableReference(_) => return None,
                 Bool => TypeTag::Bool,
                 U8 => TypeTag::U8,
+                U16 => TypeTag::U16,
+                U32 => TypeTag::U32,
                 U64 => TypeTag::U64,
                 U128 => TypeTag::U128,
+                U256 => TypeTag::U256,
                 Address => TypeTag::Address,
                 Signer => TypeTag::Signer,
                 Vector(t) => TypeTag::Vector(Box::new(
@@ -208,7 +224,7 @@ impl Type {
                     module,
                     name,
                     type_arguments,
-                } => TypeTag::Struct(StructTag {
+                } => TypeTag::Struct(Box::new(StructTag {
                     address,
                     module,
                     name,
@@ -220,7 +236,7 @@ impl Type {
                             )
                         })
                         .collect(),
-                }),
+                })),
                 TypeParameter(_) => unreachable!(),
             }
         } else {
@@ -230,7 +246,7 @@ impl Type {
 
     pub fn into_struct_tag(self) -> Option<StructTag> {
         match self.into_type_tag()? {
-            TypeTag::Struct(s) => Some(s),
+            TypeTag::Struct(s) => Some(*s),
             _ => None,
         }
     }
@@ -238,7 +254,7 @@ impl Type {
     pub fn subst(&self, type_args: &[Type]) -> Self {
         use Type::*;
         match self {
-            Bool | U8 | U64 | U128 | Address | Signer => self.clone(),
+            Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address | Signer => self.clone(),
             Reference(ty) => Reference(Box::new(ty.subst(type_args))),
             MutableReference(ty) => MutableReference(Box::new(ty.subst(type_args))),
             Vector(t) => Vector(Box::new(t.subst(type_args))),
@@ -280,7 +296,10 @@ impl Struct {
     pub fn new(m: &CompiledModule, def: &StructDefinition) -> (Identifier, Self) {
         let handle = m.struct_handle_at(def.struct_handle);
         let fields = match &def.field_information {
-            StructFieldInformation::Native => panic!("Can't extract for native struct"),
+            StructFieldInformation::Native => {
+                // Pretend for compatibility checking no fields
+                vec![]
+            }
             StructFieldInformation::Declared(fields) => {
                 fields.iter().map(|f| Field::new(m, f)).collect()
             }
@@ -341,8 +360,11 @@ impl From<TypeTag> for Type {
         match ty {
             TypeTag::Bool => Bool,
             TypeTag::U8 => U8,
+            TypeTag::U16 => U16,
+            TypeTag::U32 => U32,
             TypeTag::U64 => U64,
             TypeTag::U128 => U128,
+            TypeTag::U256 => U256,
             TypeTag::Address => Address,
             TypeTag::Signer => Signer,
             TypeTag::Vector(ty) => Vector(Box::new(Type::from(*ty))),
@@ -384,8 +406,11 @@ impl std::fmt::Display for Type {
             }
             Type::Vector(ty) => write!(f, "vector<{}>", ty),
             Type::U8 => write!(f, "u8"),
+            Type::U16 => write!(f, "u16"),
+            Type::U32 => write!(f, "u32"),
             Type::U64 => write!(f, "u64"),
             Type::U128 => write!(f, "u128"),
+            Type::U256 => write!(f, "u256"),
             Type::Address => write!(f, "address"),
             Type::Signer => write!(f, "signer"),
             Type::Bool => write!(f, "bool"),
diff --git a/language/move-binary-format/src/proptest_types/functions.rs b/language/move-binary-format/src/proptest_types/functions.rs
index 26d402b62c..30c9a28af8 100644
--- a/language/move-binary-format/src/proptest_types/functions.rs
+++ b/language/move-binary-format/src/proptest_types/functions.rs
@@ -18,6 +18,7 @@ use crate::{
         TableSize,
     },
 };
+use move_core_types::u256::U256;
 use proptest::{
     collection::{vec, SizeRange},
     prelude::*,
@@ -782,6 +783,9 @@ impl BytecodeGen {
                 Bytecode::ImmBorrowLoc(idx.index(locals_signature.len()) as LocalIndex)
             }
             BytecodeGen::VecPack((idx, num)) => {
+                if num > u16::MAX as u64 {
+                    return None;
+                }
                 let sigs_len = state.signatures.signatures.len();
                 if sigs_len == 0 {
                     return None;
@@ -854,6 +858,9 @@ impl BytecodeGen {
                 Bytecode::VecPopBack(SignatureIndex(sig_idx as TableIndex))
             }
             BytecodeGen::VecUnpack((idx, num)) => {
+                if num > u16::MAX as u64 {
+                    return None;
+                }
                 let sigs_len = state.signatures.signatures.len();
                 if sigs_len == 0 {
                     return None;
@@ -887,7 +894,8 @@ impl BytecodeGen {
     fn check_signature_token(token: &SignatureToken) -> bool {
         use SignatureToken::*;
         match token {
-            U8 | U64 | U128 | Bool | Address | Signer | Struct(_) | TypeParameter(_) => true,
+            U8 | U16 | U32 | U64 | U128 | U256 | Bool | Address | Signer | Struct(_)
+            | TypeParameter(_) => true,
             Vector(element_token) => BytecodeGen::check_signature_token(element_token),
             StructInstantiation(_, type_arguments) => type_arguments
                 .iter()
@@ -905,11 +913,14 @@ impl BytecodeGen {
 
     fn simple_bytecode_strategy() -> impl Strategy<Value = Bytecode> {
         prop_oneof![
-            // The numbers are relative weights, somewhat arbitrarily picked.
-            9 => Self::just_bytecode_strategy(),
-            1 => any::<u64>().prop_map(Bytecode::LdU64),
-            1 => any::<u8>().prop_map(Bytecode::LdU8),
-            1 => any::<u128>().prop_map(Bytecode::LdU128),
+        // The numbers are relative weights, somewhat arbitrarily picked.
+        9 => Self::just_bytecode_strategy(),
+        1 => any::<u64>().prop_map(Bytecode::LdU64),
+        1 => any::<u8>().prop_map(Bytecode::LdU8),
+        1 => any::<u128>().prop_map(Bytecode::LdU128),
+        1 => any::<u16>().prop_map(Bytecode::LdU16),
+        1 => any::<u32>().prop_map(Bytecode::LdU32),
+        1 => any::<U256>().prop_map(Bytecode::LdU256),
         ]
     }
 
@@ -919,7 +930,7 @@ impl BytecodeGen {
         static JUST_BYTECODES: &[Bytecode] = &[
             FreezeRef, Pop, Ret, LdTrue, LdFalse, ReadRef, WriteRef, Add, Sub, Mul, Mod, Div,
             BitOr, BitAnd, Xor, Or, And, Eq, Neq, Lt, Gt, Le, Ge, Abort, CastU8, CastU64, CastU128,
-            Not, Nop, Shl, Shr,
+            CastU16, CastU32, CastU256, Not, Nop, Shl, Shr,
         ];
         select(JUST_BYTECODES)
     }
diff --git a/language/move-binary-format/src/proptest_types/signature.rs b/language/move-binary-format/src/proptest_types/signature.rs
index d769a706f1..5b94c12925 100644
--- a/language/move-binary-format/src/proptest_types/signature.rs
+++ b/language/move-binary-format/src/proptest_types/signature.rs
@@ -84,8 +84,11 @@ pub enum SignatureTokenGen {
     // Atomic signature tokens.
     Bool,
     U8,
+    U16,
+    U32,
     U64,
     U128,
+    U256,
     Address,
     Signer,
     TypeParameter(PropIndex),
@@ -124,7 +127,8 @@ impl SignatureTokenGen {
     pub fn owned_non_struct_strategy() -> impl Strategy<Value = Self> {
         use SignatureTokenGen::*;
 
-        static OWNED_NON_STRUCTS: &[SignatureTokenGen] = &[Bool, U8, U64, U128, Address, Signer];
+        static OWNED_NON_STRUCTS: &[SignatureTokenGen] =
+            &[Bool, U8, U16, U32, U64, U128, U256, Address, Signer];
 
         select(OWNED_NON_STRUCTS)
     }
@@ -158,8 +162,11 @@ impl SignatureTokenGen {
         match self {
             Bool => SignatureToken::Bool,
             U8 => SignatureToken::U8,
+            U16 => SignatureToken::U16,
+            U32 => SignatureToken::U32,
             U64 => SignatureToken::U64,
             U128 => SignatureToken::U128,
+            U256 => SignatureToken::U256,
             Address => SignatureToken::Address,
             Signer => SignatureToken::Signer,
             Struct(idx) => {
diff --git a/language/move-binary-format/src/proptest_types/types.rs b/language/move-binary-format/src/proptest_types/types.rs
index 716ba66ea9..8879daa9e6 100644
--- a/language/move-binary-format/src/proptest_types/types.rs
+++ b/language/move-binary-format/src/proptest_types/types.rs
@@ -61,7 +61,7 @@ impl StDefnMaterializeState {
         use SignatureToken::*;
 
         match ty {
-            Bool | U8 | U64 | U128 | Address => AbilitySet::PRIMITIVES,
+            Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address => AbilitySet::PRIMITIVES,
 
             Reference(_) | MutableReference(_) => AbilitySet::REFERENCES,
             Signer => AbilitySet::SIGNER,
diff --git a/language/move-binary-format/src/serializer.rs b/language/move-binary-format/src/serializer.rs
index 2c33e91212..3a63bf5717 100644
--- a/language/move-binary-format/src/serializer.rs
+++ b/language/move-binary-format/src/serializer.rs
@@ -16,7 +16,7 @@
 //! serialization errors.
 
 use crate::{file_format::*, file_format_common::*};
-use anyhow::{bail, Result};
+use anyhow::{anyhow, bail, Result};
 use move_core_types::{
     account_address::AccountAddress, identifier::Identifier, metadata::Metadata,
 };
@@ -320,7 +320,7 @@ fn serialize_table_index(
 }
 
 fn serialize_magic(binary: &mut BinaryData) -> Result<()> {
-    for byte in &BinaryConstants::DIEM_MAGIC {
+    for byte in &BinaryConstants::MOVE_MAGIC {
         binary.push(*byte)?;
     }
     Ok(())
@@ -641,8 +641,11 @@ fn serialize_signature_token_single_node_impl(
     match token {
         SignatureToken::Bool => binary.push(SerializedType::BOOL as u8)?,
         SignatureToken::U8 => binary.push(SerializedType::U8 as u8)?,
+        SignatureToken::U16 => binary.push(SerializedType::U16 as u8)?,
+        SignatureToken::U32 => binary.push(SerializedType::U32 as u8)?,
         SignatureToken::U64 => binary.push(SerializedType::U64 as u8)?,
         SignatureToken::U128 => binary.push(SerializedType::U128 as u8)?,
+        SignatureToken::U256 => binary.push(SerializedType::U256 as u8)?,
         SignatureToken::Address => binary.push(SerializedType::ADDRESS as u8)?,
         SignatureToken::Signer => binary.push(SerializedType::SIGNER as u8)?,
         SignatureToken::Vector(_) => {
@@ -720,13 +723,34 @@ fn serialize_ability_sets(binary: &mut BinaryData, sets: &[AbilitySet]) -> Resul
 /// - `CodeUnit.max_stack_size` as a ULEB128
 /// - `CodeUnit.locals` as a ULEB128 (index into the `LocalSignaturePool`)
 /// - `CodeUnit.code` as variable size byte stream for the bytecode
-fn serialize_code_unit(binary: &mut BinaryData, code: &CodeUnit) -> Result<()> {
+fn serialize_code_unit(major_version: u32, binary: &mut BinaryData, code: &CodeUnit) -> Result<()> {
     serialize_signature_index(binary, &code.locals)?;
-    serialize_code(binary, &code.code)
+    serialize_code(major_version, binary, &code.code)
 }
 
 /// Serializes a single `Bytecode` instruction.
-fn serialize_instruction_inner(binary: &mut BinaryData, opcode: &Bytecode) -> Result<()> {
+fn serialize_instruction_inner(
+    major_version: u32,
+    binary: &mut BinaryData,
+    opcode: &Bytecode,
+) -> Result<()> {
+    match opcode {
+        Bytecode::LdU16(_)
+        | Bytecode::LdU32(_)
+        | Bytecode::LdU256(_)
+        | Bytecode::CastU16
+        | Bytecode::CastU32
+        | Bytecode::CastU256
+            if (major_version < VERSION_6) =>
+        {
+            return Err(anyhow!(
+                "Loading or casting u16, u32, u256 integers not supported in bytecode version {}",
+                major_version
+            ));
+        }
+        _ => (),
+    };
+
     let res = match opcode {
         Bytecode::FreezeRef => binary.push(Opcodes::FREEZE_REF as u8),
         Bytecode::Pop => binary.push(Opcodes::POP as u8),
@@ -921,16 +945,31 @@ fn serialize_instruction_inner(binary: &mut BinaryData, opcode: &Bytecode) -> Re
             binary.push(Opcodes::VEC_SWAP as u8)?;
             serialize_signature_index(binary, sig_idx)
         }
+        Bytecode::LdU16(value) => {
+            binary.push(Opcodes::LD_U16 as u8)?;
+            write_u16(binary, *value)
+        }
+        Bytecode::LdU32(value) => {
+            binary.push(Opcodes::LD_U32 as u8)?;
+            write_u32(binary, *value)
+        }
+        Bytecode::LdU256(value) => {
+            binary.push(Opcodes::LD_U256 as u8)?;
+            write_u256(binary, *value)
+        }
+        Bytecode::CastU16 => binary.push(Opcodes::CAST_U16 as u8),
+        Bytecode::CastU32 => binary.push(Opcodes::CAST_U32 as u8),
+        Bytecode::CastU256 => binary.push(Opcodes::CAST_U256 as u8),
     };
     res?;
     Ok(())
 }
 
 /// Serializes a `Bytecode` stream. Serialization of the function body.
-fn serialize_code(binary: &mut BinaryData, code: &[Bytecode]) -> Result<()> {
+fn serialize_code(major_version: u32, binary: &mut BinaryData, code: &[Bytecode]) -> Result<()> {
     serialize_bytecode_count(binary, code.len())?;
     for opcode in code {
-        serialize_instruction_inner(binary, opcode)?;
+        serialize_instruction_inner(major_version, binary, opcode)?;
     }
     Ok(())
 }
@@ -1202,6 +1241,10 @@ impl CommonSerializer {
         }
         Ok(())
     }
+
+    pub fn major_version(&self) -> u32 {
+        self.major_version
+    }
 }
 
 impl ModuleSerializer {
@@ -1392,7 +1435,7 @@ impl ModuleSerializer {
 
         serialize_acquires(binary, &function_definition.acquires_global_resources)?;
         if let Some(code) = &function_definition.code {
-            serialize_code_unit(binary, code)?;
+            serialize_code_unit(self.common.major_version(), binary, code)?;
         }
         Ok(())
     }
@@ -1425,7 +1468,7 @@ impl ScriptSerializer {
     fn serialize_main(&mut self, binary: &mut BinaryData, script: &CompiledScript) -> Result<()> {
         serialize_ability_sets(binary, &script.type_parameters)?;
         serialize_signature_index(binary, &script.parameters)?;
-        serialize_code_unit(binary, &script.code)?;
+        serialize_code_unit(self.common.major_version(), binary, &script.code)?;
         Ok(())
     }
 }
diff --git a/language/move-binary-format/src/unit_tests/binary_tests.rs b/language/move-binary-format/src/unit_tests/binary_tests.rs
index 64353191f4..1d7f325378 100644
--- a/language/move-binary-format/src/unit_tests/binary_tests.rs
+++ b/language/move-binary-format/src/unit_tests/binary_tests.rs
@@ -2,7 +2,7 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::file_format_common::*;
+use crate::{file_format::Bytecode, file_format_common::*};
 use proptest::prelude::*;
 
 #[test]
@@ -14,6 +14,18 @@ fn binary_len() {
     assert_eq!(binary_data.len(), 100);
 }
 
+#[test]
+fn test_max_number_of_bytecode() {
+    let mut nops = vec![];
+    for _ in 0..u16::MAX - 1 {
+        nops.push(Bytecode::Nop);
+    }
+    nops.push(Bytecode::Branch(0));
+
+    let result = Bytecode::get_successors(u16::MAX - 1, &nops);
+    assert_eq!(result, vec![0]);
+}
+
 proptest! {
     #[test]
     fn vec_to_binary(vec in any::<Vec<u8>>()) {
diff --git a/language/move-binary-format/src/unit_tests/compatibility_tests.rs b/language/move-binary-format/src/unit_tests/compatibility_tests.rs
index d6855421e5..9e5e0c78f2 100644
--- a/language/move-binary-format/src/unit_tests/compatibility_tests.rs
+++ b/language/move-binary-format/src/unit_tests/compatibility_tests.rs
@@ -68,23 +68,12 @@ fn mk_module(vis: u8) -> normalized::Module {
     normalized::Module::new(&m)
 }
 
-const NON_COMPATIBLE: Compatibility = Compatibility {
-    struct_and_function_linking: false,
-    struct_layout: true,
-};
-
-const COMPATIBLE: Compatibility = Compatibility {
-    struct_and_function_linking: true,
-    struct_layout: true,
-};
-
 #[test]
 fn deprecated_unchanged_script_visibility() {
     let script_module = mk_module(Visibility::DEPRECATED_SCRIPT);
-    assert_eq!(
-        Compatibility::check(&script_module, &script_module,),
-        COMPATIBLE
-    );
+    assert!(Compatibility::full_check()
+        .check(&script_module, &script_module)
+        .is_ok(),);
 }
 
 #[test]
@@ -92,22 +81,19 @@ fn deprecated_remove_script_visibility() {
     let script_module = mk_module(Visibility::DEPRECATED_SCRIPT);
     // script -> private, not allowed
     let private_module = mk_module(Visibility::Private as u8);
-    assert_eq!(
-        Compatibility::check(&script_module, &private_module),
-        NON_COMPATIBLE
-    );
+    assert!(Compatibility::full_check()
+        .check(&script_module, &private_module)
+        .is_err());
     // script -> public, not allowed
     let public_module = mk_module(Visibility::Public as u8);
-    assert_eq!(
-        Compatibility::check(&script_module, &public_module),
-        NON_COMPATIBLE
-    );
+    assert!(Compatibility::full_check()
+        .check(&script_module, &public_module)
+        .is_err());
     // script -> friend, not allowed
     let friend_module = mk_module(Visibility::Friend as u8);
-    assert_eq!(
-        Compatibility::check(&script_module, &friend_module),
-        NON_COMPATIBLE
-    );
+    assert!(Compatibility::full_check()
+        .check(&script_module, &friend_module)
+        .is_err());
 }
 
 #[test]
@@ -115,20 +101,17 @@ fn deprecated_add_script_visibility() {
     let script_module = mk_module(Visibility::DEPRECATED_SCRIPT);
     // private -> script, allowed
     let private_module = mk_module(Visibility::Private as u8);
-    assert_eq!(
-        Compatibility::check(&private_module, &script_module,),
-        COMPATIBLE
-    );
+    assert!(Compatibility::full_check()
+        .check(&private_module, &script_module)
+        .is_ok());
     // public -> script, not allowed
     let public_module = mk_module(Visibility::Public as u8);
-    assert_eq!(
-        Compatibility::check(&public_module, &script_module),
-        NON_COMPATIBLE
-    );
+    assert!(Compatibility::full_check()
+        .check(&public_module, &script_module)
+        .is_err());
     // friend -> script, not allowed
     let friend_module = mk_module(Visibility::Friend as u8);
-    assert_eq!(
-        Compatibility::check(&friend_module, &script_module),
-        NON_COMPATIBLE
-    );
+    assert!(Compatibility::full_check()
+        .check(&friend_module, &script_module)
+        .is_err());
 }
diff --git a/language/move-binary-format/src/unit_tests/control_flow_graph_tests.rs b/language/move-binary-format/src/unit_tests/control_flow_graph_tests.rs
new file mode 100644
index 0000000000..064aa151bf
--- /dev/null
+++ b/language/move-binary-format/src/unit_tests/control_flow_graph_tests.rs
@@ -0,0 +1,74 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    control_flow_graph::{BlockId, ControlFlowGraph, VMControlFlowGraph},
+    file_format::Bytecode,
+};
+
+#[test]
+fn traversal_no_loops() {
+    let cfg = {
+        use Bytecode::*;
+        VMControlFlowGraph::new(&[
+            /* L0 */ LdTrue,
+            /*    */ BrTrue(3),
+            /* L2 */ Branch(3),
+            /* L3 */ Ret,
+        ])
+    };
+
+    cfg.display();
+    assert_eq!(cfg.num_blocks(), 3);
+    assert_eq!(traversal(&cfg), vec![0, 2, 3]);
+}
+
+#[test]
+fn traversal_loops() {
+    let cfg = {
+        use Bytecode::*;
+        VMControlFlowGraph::new(&[
+            /* L0: Outer head     */ LdTrue,
+            /*     Outer break    */ BrTrue(6),
+            /* L2: Inner head     */ LdTrue,
+            /*     Inner break    */ BrTrue(5),
+            /* L4: Inner continue */ Branch(2),
+            /*     Outer continue */ Branch(0),
+            /* L6:                */ Ret,
+        ])
+    };
+
+    cfg.display();
+    assert_eq!(cfg.num_blocks(), 5);
+    assert_eq!(traversal(&cfg), vec![0, 2, 4, 5, 6]);
+}
+
+#[test]
+fn traversal_non_loop_back_branch() {
+    let cfg = {
+        use Bytecode::*;
+        VMControlFlowGraph::new(&[
+            /* L0 */ Branch(2),
+            /* L1 */ Ret,
+            /* L2 */ Branch(1),
+        ])
+    };
+
+    cfg.display();
+    assert_eq!(cfg.num_blocks(), 3);
+    assert_eq!(traversal(&cfg), vec![0, 2, 1]);
+}
+
+/// Return a vector containing the `BlockId`s from `cfg` in the order suggested by successively
+/// calling `ControlFlowGraph::next_block` starting from the entry block.
+fn traversal(cfg: &dyn ControlFlowGraph) -> Vec<BlockId> {
+    let mut order = Vec::with_capacity(cfg.num_blocks() as usize);
+    let mut next = Some(cfg.entry_block_id());
+
+    while let Some(block) = next {
+        order.push(block);
+        next = cfg.next_block(block);
+    }
+
+    order
+}
diff --git a/language/move-binary-format/src/unit_tests/deserializer_tests.rs b/language/move-binary-format/src/unit_tests/deserializer_tests.rs
index 2d266b23ae..756e6d3815 100644
--- a/language/move-binary-format/src/unit_tests/deserializer_tests.rs
+++ b/language/move-binary-format/src/unit_tests/deserializer_tests.rs
@@ -10,8 +10,8 @@ use move_core_types::vm_status::StatusCode;
 
 fn malformed_simple_versioned_test(version: u32) {
     // bad uleb (more than allowed for table count)
-    let mut binary = BinaryConstants::DIEM_MAGIC.to_vec();
-    binary.extend(&version.to_le_bytes()); // version
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
     binary.push(150); // table count (high bit 1)
     binary.push(150); // table count (high bit 1)
     binary.push(1);
@@ -22,8 +22,8 @@ fn malformed_simple_versioned_test(version: u32) {
     );
 
     // bad uleb (too big)
-    let mut binary = BinaryConstants::DIEM_MAGIC.to_vec();
-    binary.extend(&version.to_le_bytes()); // version
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
     binary.push(150); // table count (high bit 1)
     binary.push(150); // table count again (high bit 1)
     binary.push(150); // table count again (high bit 1)
@@ -43,8 +43,8 @@ fn malformed_simple_versioned_test(version: u32) {
     );
 
     // no tables
-    let mut binary = BinaryConstants::DIEM_MAGIC.to_vec();
-    binary.extend(&version.to_le_bytes()); // version
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
     binary.push(0); // table count
     let res = CompiledModule::deserialize(&binary);
     assert_eq!(
@@ -53,8 +53,8 @@ fn malformed_simple_versioned_test(version: u32) {
     );
 
     // missing tables
-    let mut binary = BinaryConstants::DIEM_MAGIC.to_vec();
-    binary.extend(&version.to_le_bytes()); // version
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
     binary.push(10); // table count
     let res = CompiledModule::deserialize(&binary);
     assert_eq!(
@@ -63,8 +63,8 @@ fn malformed_simple_versioned_test(version: u32) {
     );
 
     // missing table content
-    let mut binary = BinaryConstants::DIEM_MAGIC.to_vec();
-    binary.extend(&version.to_le_bytes()); // version
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
     binary.push(1); // table count
     binary.push(1); // table type
     binary.push(0); // table offset
@@ -76,8 +76,8 @@ fn malformed_simple_versioned_test(version: u32) {
     );
 
     // bad table header (bad offset)
-    let mut binary = BinaryConstants::DIEM_MAGIC.to_vec();
-    binary.extend(&version.to_le_bytes()); // version
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
     binary.push(1); // table count
     binary.push(1); // table type
     binary.push(100); // bad table offset
@@ -89,8 +89,8 @@ fn malformed_simple_versioned_test(version: u32) {
     );
 
     // bad table header (bad offset)
-    let mut binary = BinaryConstants::DIEM_MAGIC.to_vec();
-    binary.extend(&version.to_le_bytes()); // version
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
     binary.push(2); // table count
     binary.push(1); // table type
     binary.push(0); // table offset
@@ -106,8 +106,8 @@ fn malformed_simple_versioned_test(version: u32) {
     );
 
     // incomplete table
-    let mut binary = BinaryConstants::DIEM_MAGIC.to_vec();
-    binary.extend(&version.to_le_bytes()); // version
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
     binary.push(1); // table count
     binary.push(1); // table type
     binary.push(0); // table offset
@@ -120,8 +120,8 @@ fn malformed_simple_versioned_test(version: u32) {
     );
 
     // unknown table
-    let mut binary = BinaryConstants::DIEM_MAGIC.to_vec();
-    binary.extend(&version.to_le_bytes()); // version
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
     binary.push(1); // table count
     binary.push(100); // table type
     binary.push(0); // table offset
@@ -134,8 +134,8 @@ fn malformed_simple_versioned_test(version: u32) {
     );
 
     // duplicate table
-    let mut binary = BinaryConstants::DIEM_MAGIC.to_vec();
-    binary.extend(&version.to_le_bytes()); // version
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
     binary.push(3); // table count
     binary.push(1); // table type
     binary.push(0); // table offset
@@ -155,8 +155,8 @@ fn malformed_simple_versioned_test(version: u32) {
     );
 
     // bad table in script
-    let mut binary = BinaryConstants::DIEM_MAGIC.to_vec();
-    binary.extend(&version.to_le_bytes()); // version
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend(version.to_le_bytes()); // version
     binary.push(1); // table count
     binary.push(0xD); // table type - FieldHandle not good for script
     binary.push(0); // table offset
@@ -198,7 +198,7 @@ fn malformed_simple() {
     );
 
     // only magic
-    let binary = BinaryConstants::DIEM_MAGIC.to_vec();
+    let binary = BinaryConstants::MOVE_MAGIC.to_vec();
     let res = CompiledScript::deserialize(&binary);
     assert_eq!(
         res.expect_err("Expected malformed binary").major_status(),
@@ -206,8 +206,8 @@ fn malformed_simple() {
     );
 
     // bad version
-    let mut binary = BinaryConstants::DIEM_MAGIC.to_vec();
-    binary.extend(&(VERSION_MAX.checked_add(1).unwrap()).to_le_bytes()); // version
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend((VERSION_MAX.checked_add(1).unwrap()).to_le_bytes()); // version
     binary.push(10); // table count
     binary.push(0); // rest of binary
     let res = CompiledScript::deserialize(&binary);
@@ -222,6 +222,21 @@ fn malformed_simple() {
     }
 }
 
+#[test]
+fn max_version_lower_than_hardcoded() {
+    let mut binary = BinaryConstants::MOVE_MAGIC.to_vec();
+    binary.extend((VERSION_MAX).to_le_bytes()); // version
+    binary.push(10); // table count
+    binary.push(0); // rest of binary
+
+    let res =
+        CompiledScript::deserialize_with_max_version(&binary, VERSION_MAX.checked_sub(1).unwrap());
+    assert_eq!(
+        res.expect_err("Expected unknown version").major_status(),
+        StatusCode::UNKNOWN_VERSION
+    );
+}
+
 // Ensure that we can deserialize a script from disk
 static EMPTY_SCRIPT: &[u8] = include_bytes!("empty_script.mv");
 
diff --git a/language/move-binary-format/src/unit_tests/mod.rs b/language/move-binary-format/src/unit_tests/mod.rs
index 04fca3168f..e811762a11 100644
--- a/language/move-binary-format/src/unit_tests/mod.rs
+++ b/language/move-binary-format/src/unit_tests/mod.rs
@@ -4,6 +4,7 @@
 
 mod binary_tests;
 mod compatibility_tests;
+mod control_flow_graph_tests;
 mod deserializer_tests;
 mod number_tests;
 mod signature_token_tests;
diff --git a/language/move-binary-format/src/unit_tests/signature_token_tests.rs b/language/move-binary-format/src/unit_tests/signature_token_tests.rs
index 900319c2cc..c2e2d82130 100644
--- a/language/move-binary-format/src/unit_tests/signature_token_tests.rs
+++ b/language/move-binary-format/src/unit_tests/signature_token_tests.rs
@@ -5,7 +5,7 @@
 use crate::{
     deserializer::load_signature_token_test_entry,
     file_format::{SignatureToken, StructHandleIndex},
-    file_format_common::{BinaryData, SIGNATURE_TOKEN_DEPTH_MAX},
+    file_format_common::{BinaryData, SerializedType, SIGNATURE_TOKEN_DEPTH_MAX},
     serializer::{serialize_signature_token, serialize_signature_token_unchecked},
 };
 use std::io::Cursor;
@@ -44,3 +44,46 @@ fn serialize_nested_types_too_deep() {
         load_signature_token_test_entry(cursor).expect_err("deserialization should fail");
     }
 }
+
+#[test]
+fn deserialize_struct_inst_arity_0() {
+    let cursor = Cursor::new(
+        [
+            SerializedType::STRUCT_INST as u8,
+            0x0, /* struct handle idx */
+            0x0, /* arity */
+            SerializedType::BOOL as u8,
+        ]
+        .as_slice(),
+    );
+    load_signature_token_test_entry(cursor).expect_err("deserialization should fail");
+}
+
+#[test]
+fn deserialize_struct_inst_arity_1() {
+    let cursor = Cursor::new(
+        [
+            SerializedType::STRUCT_INST as u8,
+            0x0, /* struct handle idx */
+            0x1, /* arity */
+            SerializedType::BOOL as u8,
+        ]
+        .as_slice(),
+    );
+    load_signature_token_test_entry(cursor).expect("deserialization should succeed");
+}
+
+#[test]
+fn deserialize_struct_inst_arity_2() {
+    let cursor = Cursor::new(
+        [
+            SerializedType::STRUCT_INST as u8,
+            0x0, /* struct handle idx */
+            0x2, /* arity */
+            SerializedType::BOOL as u8,
+            SerializedType::BOOL as u8,
+        ]
+        .as_slice(),
+    );
+    load_signature_token_test_entry(cursor).expect("deserialization should succeed");
+}
diff --git a/language/move-borrow-graph/Cargo.toml b/language/move-borrow-graph/Cargo.toml
index 5e2285b2ef..891b9be448 100644
--- a/language/move-borrow-graph/Cargo.toml
+++ b/language/move-borrow-graph/Cargo.toml
@@ -3,5 +3,5 @@ name = "move-borrow-graph"
 version = "0.0.1"
 authors = ["Diem Association <opensource@diem.com>"]
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
diff --git a/language/move-borrow-graph/src/graph.rs b/language/move-borrow-graph/src/graph.rs
index 0aa742ad65..517baa1463 100644
--- a/language/move-borrow-graph/src/graph.rs
+++ b/language/move-borrow-graph/src/graph.rs
@@ -12,7 +12,7 @@ use std::collections::{BTreeMap, BTreeSet};
 // Definitions
 //**************************************************************************************************
 
-#[derive(Clone, Debug, Default, PartialEq)]
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
 pub struct BorrowGraph<Loc: Copy, Lbl: Clone + Ord>(BTreeMap<RefID, Ref<Loc, Lbl>>);
 
 //**************************************************************************************************
@@ -26,6 +26,14 @@ impl<Loc: Copy, Lbl: Clone + Ord> BorrowGraph<Loc, Lbl> {
         Self(BTreeMap::new())
     }
 
+    /// Returns the graph size, that is the number of nodes + number of edges
+    pub fn graph_size(&self) -> usize {
+        self.0
+            .values()
+            .map(|r| 1 + r.borrowed_by.0.values().map(|e| e.len()).sum::<usize>())
+            .sum()
+    }
+
     /// checks if the given reference is mutable or not
     pub fn is_mutable(&self, id: RefID) -> bool {
         self.0.get(&id).unwrap().mutable
@@ -325,14 +333,16 @@ impl<Loc: Copy, Lbl: Clone + Ord> BorrowGraph<Loc, Lbl> {
     /// If it is not in the map, the id remains the same
     pub fn remap_refs(&mut self, id_map: &BTreeMap<RefID, RefID>) {
         debug_assert!(self.check_invariant());
-        for info in self.0.values_mut() {
-            info.remap_refs(id_map);
-        }
-        for (old, new) in id_map {
-            if let Some(info) = self.0.remove(old) {
-                self.0.insert(*new, info);
-            }
-        }
+        let _before = self.0.len();
+        self.0 = std::mem::take(&mut self.0)
+            .into_iter()
+            .map(|(id, mut info)| {
+                info.remap_refs(id_map);
+                (id_map.get(&id).copied().unwrap_or(id), info)
+            })
+            .collect();
+        let _after = self.0.len();
+        debug_assert!(_before == _after);
         debug_assert!(self.check_invariant());
     }
 
diff --git a/language/move-borrow-graph/src/references.rs b/language/move-borrow-graph/src/references.rs
index a420d56032..c04e390c37 100644
--- a/language/move-borrow-graph/src/references.rs
+++ b/language/move-borrow-graph/src/references.rs
@@ -162,11 +162,13 @@ impl<Loc: Copy, Lbl: Clone + Ord> BorrowEdges<Loc, Lbl> {
     /// Utility for remapping the reference ids according the `id_map` provided
     /// If it is not in the map, the id remains the same
     pub(crate) fn remap_refs(&mut self, id_map: &BTreeMap<RefID, RefID>) {
-        for (old, new) in id_map {
-            if let Some(edges) = self.0.remove(old) {
-                self.0.insert(*new, edges);
-            }
-        }
+        let _before = self.0.len();
+        self.0 = std::mem::take(&mut self.0)
+            .into_iter()
+            .map(|(id, edges)| (id_map.get(&id).copied().unwrap_or(id), edges))
+            .collect();
+        let _after = self.0.len();
+        debug_assert!(_before == _after)
     }
 }
 
@@ -229,7 +231,7 @@ impl<Loc: Copy, Lbl: Clone + Ord + Debug> Debug for BorrowEdge<Loc, Lbl> {
 // Iteration
 //**********************************************************************************************
 
-impl<'a, Loc: Copy, Lbl: Clone + Ord> IntoIterator for BorrowEdgeSet<Loc, Lbl> {
+impl<Loc: Copy, Lbl: Clone + Ord> IntoIterator for BorrowEdgeSet<Loc, Lbl> {
     type Item = BorrowEdge<Loc, Lbl>;
     type IntoIter = std::collections::btree_set::IntoIter<BorrowEdge<Loc, Lbl>>;
 
diff --git a/language/move-borrow-graph/src/shared.rs b/language/move-borrow-graph/src/shared.rs
index c6ee221085..b3baca041b 100644
--- a/language/move-borrow-graph/src/shared.rs
+++ b/language/move-borrow-graph/src/shared.rs
@@ -4,9 +4,11 @@
 use std::collections::{BTreeMap, BTreeSet};
 
 pub fn remap_set<T: Copy + Ord>(set: &mut BTreeSet<T>, id_map: &BTreeMap<T, T>) {
-    for (old, new) in id_map {
-        if set.remove(old) {
-            set.insert(*new);
-        }
-    }
+    let _before = set.len();
+    *set = std::mem::take(set)
+        .into_iter()
+        .map(|x| id_map.get(&x).copied().unwrap_or(x))
+        .collect();
+    let _after = set.len();
+    debug_assert!(_before == _after);
 }
diff --git a/language/move-bytecode-verifier/Cargo.toml b/language/move-bytecode-verifier/Cargo.toml
index c85640fbeb..2b1bab73d0 100644
--- a/language/move-bytecode-verifier/Cargo.toml
+++ b/language/move-bytecode-verifier/Cargo.toml
@@ -7,17 +7,19 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
 petgraph = "0.5.1"
+fail = "0.4.0"
 
 move-borrow-graph = { path = "../move-borrow-graph" }
 move-binary-format = { path = "../move-binary-format" }
 move-core-types = { path = "../move-core/types" }
 
 [dev-dependencies]
+hex-literal = "0.3.4"
 invalid-mutations = { path = "invalid-mutations" }
 
 [features]
diff --git a/language/move-bytecode-verifier/README.md b/language/move-bytecode-verifier/README.md
index f6e3fdeaea..4b3b4ee4c9 100644
--- a/language/move-bytecode-verifier/README.md
+++ b/language/move-bytecode-verifier/README.md
@@ -29,7 +29,7 @@ Resources represent the assets of the blockchain. As such, there are certain res
 
 * `CopyLoc` and `StLoc` require that the type of local is not of resource kind.
 * `WriteRef`, `Eq`, and `Neq` require that the type of the reference is not of resource kind.
-* At the end of a function (when `Ret` is reached), no local whose type is of resource kind must be empty, i.e., the value must have been moved out of the local.
+* At the end of a function (when `Ret` is reached), any local whose type is of resource kind must be empty, i.e., the value must have been moved out of the local.
 
 As mentioned above, this last rule around `Ret` implies that the resource *must* have been either:
 
diff --git a/language/move-bytecode-verifier/bytecode-verifier-tests/Cargo.toml b/language/move-bytecode-verifier/bytecode-verifier-tests/Cargo.toml
index 7ba9a30293..902cb2340d 100644
--- a/language/move-bytecode-verifier/bytecode-verifier-tests/Cargo.toml
+++ b/language/move-bytecode-verifier/bytecode-verifier-tests/Cargo.toml
@@ -7,16 +7,18 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dev-dependencies]
 petgraph = "0.5.1"
 proptest = "1.0.0"
-
+fail = { version = "0.4.0", features = ['failpoints']}
+hex = "0.4.3"
 move-bytecode-verifier = { path = "../" }
 invalid-mutations = { path = "../invalid-mutations" }
 move-core-types = { path = "../../move-core/types" }
-move-binary-format = { path = "../../move-binary-format", features = ["fuzzing"] }
+move-binary-format = { path = "../../move-binary-format", features = ["fuzzing" ] }
 
 [features]
 fuzzing = ["move-binary-format/fuzzing"]
+address32 = ["move-core-types/address32"]
diff --git a/language/move-bytecode-verifier/bytecode-verifier-tests/METER_TESTING.md b/language/move-bytecode-verifier/bytecode-verifier-tests/METER_TESTING.md
new file mode 100644
index 0000000000..cd5ae0f421
--- /dev/null
+++ b/language/move-bytecode-verifier/bytecode-verifier-tests/METER_TESTING.md
@@ -0,0 +1,5 @@
+This testsuite can be run in a specific way to print the time until a 'complex' program is detected or accepted. Call as in:
+
+```
+cargo test --release --features=address32   -- --nocapture 1>/dev/null
+```
diff --git a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/binary_samples.rs b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/binary_samples.rs
new file mode 100644
index 0000000000..9da0b1c989
--- /dev/null
+++ b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/binary_samples.rs
@@ -0,0 +1,83 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Tests in here are based on binary representation of modules taken from production. Those tests
+//! may fail over time if the representation becomes out of date, then they can be removed.
+//! Right now the serve to calibrate the metering working as expected. Those tests represent
+//! cases which we want to continue to succeed.
+
+use crate::unit_tests::production_config;
+use move_binary_format::{errors::VMResult, CompiledModule};
+use move_bytecode_verifier::verifier;
+
+#[allow(unused)]
+fn run_binary_test(name: &str, bytes: &str) -> VMResult<()> {
+    let bytes = hex::decode(bytes).expect("invalid hex string");
+    let m = CompiledModule::deserialize(&bytes).expect("invalid module");
+    verifier::verify_module_with_config_for_test(name, &production_config(), &m)
+}
+
+#[cfg(feature = "address32")]
+#[test]
+fn sample_price_oracle() {
+    let code =
+    "a11ceb0b050000000c01001602162003368a0104c0011405d401a80607fc07f90308f50b6006d50c9b3210f03e770ae73f170cfe3f951e0d935e060000010101020103010401050006020702080209020a000b0800000c0800080d070004170402030100010318070009190700071c0700000e000100000f0201010000100201010000110302000012030200001304020000140506000015050600080f080900071d0a0100081e080900071f0a0b0007200a010006210c01000122020f01000123020c01000424110b020300042511120203000a261314000527020f0100022803180004290219020304092a1a1b00032b1a0f00042c1c02020302020e0e0e0f0e10101110130e1016111615101810020608020201030001060c02060c0304030103010203010908060303080603010301030106080201080601060806010101020502060800080508040802010900010804020804080502060b0302090009010900010609010208050301080202080406080102080403ae010a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a02080508000708000a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050a0208050105010b030209000901010a0201080503070b0302090009010900090193010508000708000a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a020a02080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805080508050805010708000b03030101010301030103010b01030101010301030103010c70726963655f6f7261636c6504636f696e067369676e657206737472696e67057461626c6509747970655f696e666f046d617468036936340570726963651070726963655f6964656e74696669657204707974681250726963654964656e7469666965724d61700e54657374507269636553746f72650550726963650c666f726d61745f7072696365096765745f7072696365126765745f70726963655f666f725f746573740a696e697469616c697a6512696e697469616c697a655f746573746e6574127365745f7468726573686f6c645f73656373107369676e65645f7536345f6d696e75730f7369676e65645f7536345f706c757304696e666f055461626c6506537472696e670f50726963654964656e7469666965720e7468726573686f6c645f736563730b70726963655f7461626c6503493634196765745f6d61676e69747564655f69665f706f736974697665086765745f6578706f0f6765745f69735f6e65676174697665196765745f6d61676e69747564655f69665f6e6567617469766506706f775f31300673796d626f6c08646563696d616c7308636f6e7461696e7306626f72726f77176765745f70726963655f6e6f5f6f6c6465725f7468616e09747970655f6e616d650a616464726573735f6f66036e65770d66726f6d5f627974655f76656304757466380675707365727414812adfd8ba2f589c0fe48c5170fa287cd36050dd487d17e2f4a765101f70ed00000000000000000000000000000000000000000000000000000000000000017e783b349d3e89cf5931af376ebeadbfab855b3fa239b7ada8f5a92fbea6b3870308700000000000000003086d0000000000000003086e0000000000000003081000000000000000052014812adfd8ba2f589c0fe48c5170fa287cd36050dd487d17e2f4a765101f70ed0a0221202b9ab1e972a281585084148ba1389800799bd4be63b957507db1349314e474450a020504414156450a022120bd640cddb72063e2ede34c6a0baf6699759b9837fcb06aa0e2fbcecb9b65fde70a02040341434d0a0221202a01deaec9e51a579277b34b122399984d0bbf57e2458a7e42fecd2829867a0d0a0204034144410a022120fa17ceaf30d19ba51112fdcc750cc83454776f47fb0112e4af07f15f4bb1ebc00a020504414c474f0a0221206d0af467543fc7daedf7abed96423877560c8d03725f3e5c87516774982a679c0a020403414e430a02212015add95022ae13563a11992e727c91bdb6b55bc183d9d747436c80a483d8c8640a0204034150450a02212003ae4db29ed4ae33d323568895aa00337e658e348b37509f5372ae51f0af00d50a0204034150540a022120b881c6dad5dd3dc9a83222f8032fb439859288119afc742d43adc305cef151cc0a0204034153520a022120681e0eb7acf9a2a3384927684d932560fb6f67c6beb21baa0f110e993b2653860a02060541544c41530a0221208ff1200345393bb25be4f4eeb2d97234e91f7e6213f3745a694b1436e700f2710a02040341544d0a022120b00b60f88b03a6a625a8d1c048c3f66653edf217439983d037e7222c4e6128190a02050441544f4d0a0221204cbd623d7aa47003fff1cd75c3f96cb24a660014b697d91cfb7adcd204b952020a020504415553540a02212093da3352f9f1d105fdfe4971cfa80e9dd777bfc5d0f683ebb6e1294b92137bb70a020504415641580a022120b7e3904c08ddd9c0c10c6d207d390fd19e87eb6aab96304f571ed94caebdefa00a0204034158530a0221209d23a47f843f5c9284832ae6e76e4aa067dc6072a58f151d39a65a4cc792ef9f0a0204034241520a0221203dd2b63686a450ec7290df3a1e0b583c0481f651351edfa7636f39aed55cf8a30a0204034243480a0221207f981f906d7cfe93f618804f1de89e0199ead306edc022d3230b3e8305f391b00a020504424554480a0221202f95862b045670cd22bee3114c39763a4a08beeb663b145d283c31d7d1101c4f0a020403424e420a0221201ce9069708fb49e2f1b062fa4f1be0bb151475ca506939d6d8c14386d49f43dc0a02040342525a0a022120e62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b430a0204034254430a022120097d687437374051c75160d648800f021086bc8edf469f11284491fda81923150a0204034254540a0221205bc91f13e412c07599167bae86f07543f076a638962b8d6017ec19dab4a828140a020504425553440a0221202dd14c7c38aa7066c7a508aac299ebcde5165b07d5d9f2d94dfbfe41f0bc5f2e0a0204034339380a0221202356af9529a1064d41e32d617e2ce1dca5733afa901daba9e2b68dee5d53ecf90a02050443414b450a02212015ecddd26d49e1a8f1de9376ebebc03916ede873447c1255d2d5891b92ce57170a02060543424554480a022120bd4dbcbfd90e6bc6c583e07ffcb5cb6d09a0c7b1221805211ace08c8378596270a0204034348520a022120e799f456b358a2534aa1b45141d454ac04b444ed23b1440b778549bb758f2b5c0a02040343485a0a0221209c479b12a2b2c1051715d4d462dd7a6abbb6dccabf3af31a53f6130a1cd88efc0a020504434954590a0221208517b35589b5f1f6ad626da2379ff592d5101b63aa661d75b7a883fdbda023f00a020504434f50450a0221204e53c6ef1f2f9952facdcf64551edb6d2a550985484ccce6a0477cae4c1bca3e0a020403434f570a0221208f218655050a1476b780185e89f19d2b1e1f49e9bd629efad6ac547a946bf6ab0a020504435553440a022120b0948a5e5313200c632b51bb5ca32f6de0d36e9950a942d19751e833f70dabfd0a0204034441490a022120dcef50dd0a4cd2dcc17e45df1676dcb336a11a61c69df7a0299b0150c672d25c0a020504444f47450a022120ca3eed9b267293f6595901c734c7525ce8ef49adafe8284606ceb307afa2ca5b0a020403444f540a022120ff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace0a0204034554480a022120c80657b7f6f3eac27218d09d5a4e54e47b25768d9f5e10ac15fe2cf9008814000a020504464944410a0221202fb245b9a84554a0f15aa123cbb5f64cd263b59e9a87d80148cbffab50c69f300a020504464c4f570a0221205c6c0d2386e3352356c3ab84434fafb5ea067ac2678a38a338c4a69ddc4bdb0c0a02040346544d0a0221206c75e52531ec5fd3ef253f6062956a8508a2f03fa0a209fb7fbc51efd9d35f880a0204034654540a022120301377b122716cee1a498e7930a1836c0b1db84667cc78bbbcbad6c330ea6afb0a02040347414c0a0221200781209c28fda797616212b7f94d77af3a01f3e94a5d421760aef020cf2bcb510a02050447414c410a022120baa284eaf23edf975b371ba2818772f93dbae72836bbdea28b07d40f3cf8b4850a020403474d540a0221206034b1f68b9363dff2cf9d53b1a88fb4d0929c65f34d532db53738853efc00ad0a020504474f46580a02212095609d32c98a467a72ac419f2e64bb2b8dbd5b00b74f3a0fd72f42343af1743d0a0205044858524f0a0221207a5bc1d2b56ad029048cd63964b3ad2776eadf812edc1a43a31406cb54bff5920a020403494e4a0a022120a4702f0f5818258783a1e47f453cb20b0fbec32ca67260e1d19dfcdd6a4d0ebb0a020605494e5445520a02212081a21b01c15b8d01f6cdfed65e00987cc4c901858c821b2089344987de3102e90a0204034a45540a022120ee42016c303126bd9263724e00f83a8114e84518c6e8ffc9738c001cc301daff0a0204034a53540a022120abe4f2b264560a397f38eec024369356e5c1ea4f7aab94729369f144b3d977790a0204034a55560a022120d1d95644ffc11ca502f21e067a7814144c56b37018515ced4335a886a827a3050a0206054c415a494f0a0221206e3f3fa8253588df9326580180233eb791e03b443a3ba7a1d892e73874e19a540a0204034c54430a022120e6ccd3f878cf338e6732bf59f60943e8ca2c28402fc4d9c258503b2edbe74a310a0205044c554e410a0221204456d442a152fd1f972b18459263ef467d3c29fb9d667e30c463b086691fbc790a0205044c554e430a0221205de33a9112c2b700b8d30b8a3402c103578ccfa2765696471cc672bd5cf6ac520a0206054d415449430a0221201888f463c27997174f97d2a36af29bf4648b61a5f69e67c45505a80f826bb7850a0205044d424f580a02212027d108eb764c912f49d3453a21dd95516619b1c45d0b607ee58a137ac8a6f32d0a0205044d45414e0a022120dfaeafde7f8ad3cb9ddbcc85ed7ae7e53910e7ab377fd75921920f97c80a8edc0a0204034d45520a0221200b46c1c04e9c914037cc4e0561a7e6787f6db0b89b7b65281f0f6fea1ce45a740a0204034d49520a0221205b70af49d639eefe11f20df47a0c0760123291bb5bc55053faf797d1ff9059830a0205044d4e474f0a022120c2289a6a43d2ce91c6f55caec370f4acc38a2ed477f58813334c6d03749ff2a40a0205044d534f4c0a022120c415de8d2eba7db216527dff4b60e8f3a5311c740dadb233e13e12547e2267500a0205044e4541520a02212005934526b94a9fbe4c4ce0c3792213032f086ee4bf58f2168a7085361af9bdc10a0203024f470a022120c572690504b42b57a3f7aed6bd4aae08cbeeebdadcf130646a692fe73ec1e0090a0204034f4e450a02212037505261e557e251290b8c8899453064e8d760ed5c65a779726f2490980da74c0a0205044f5243410a0221200afa3199e0899270a74ddcf5cc960d3c6c4414b4ca71024af1a62786dd24f52a0a020504504f52540a02212088e2d5cbd2474766abffb2a67a58755a2cc19beb3b309e1ded1e357253aa36230a020605504f52544f0a0221203d253019d38099c0fe918291bd08c9b887f4306a44d7d472c8031529141f275a0a0204035053470a022120fd0690232b0fae5efdc402c1b9aac74176383ff7daf87d021554bda24a38e0ec0a020504524143410a02212091568baa8beb53db23eb3fb7f22c6e8bd303d103919e19733f2bb642d3e7987a0a0204035241590a0221206ed3c7c4427ae2f91707495fc5a891b30795d93dbb3931782ddd77a5d8cb6db70a0204035342520a0221201021a42d623ab4fe0bf8c47fd21cc10636e39e07f91e9b2478551e137d512aaa0a02070653434e534f4c0a022120f8d030e4ef460b91ad23eabbbb27aec463e3c30ecc8d5c4b71e92f54a36ccdbd0a020504534c4e440a0221209fb0bd29fe51481b61df41e650346cc374b13c2bab2e3610364cd834a592025a0a020403534e590a022120ef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d0a020403534f4c0a02212023245bb74254e65a98cc3ff4a37443d79f527e44e449750ad304538b006f21bc0a02040353524d0a022120a1a6465f4c2ebf244c31d80bc95c27345a3424e428c2def33eced9e90d3f701b0a0206055354534f4c0a0221204457960559b812558bb0f8cb7912f8bcb843eb801a3133ef45be998630ff8c050a020403544c4d0a022120433faaa801ecdb6618e3897177a118b273a8e18cc3ff545aadfc207d58d028f70a020504545553440a022120eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a0a020504555344430a0221202b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b0a020504555344540a022120ef94acc2fb09eb976c6eb3000bab898cab891d5b800702cd1dc88e61d7c3c5e60a020504555354430a0221207507a4629ad0143550666bce2e7cae0b961a0f624f821feaab642fe1be632f5c0a0204035641490a022120b216f7ca372b318985903866e0b6dc44a14564828c49f36d0d363805aa76335c0a02040357494e0a022120b82449fd728133488d2d41131cffe763f9c1693b73c544d9ef6aaa371060dd250a020403574f4f0a022120831624f51c7bd4499fe5e0f16dfa2fd22584ae4bdc496bbbbe9ba831b2d9bce90a0204035856530a02212026852e2d0696e25e6adaad2d7ca3a1f2f15aab68d317ace14d41b4128a7e780f0a0204035a42430a022120d6b3bc030a8bbb7dd9de46fb564c34bb7f860dead8985eb16a49cdc62f8ab3a50a02212073dc009953c83c944690037ea477df627657f45c14f16ad3a61089c5a3f9f4f20a02212008f781a893bc9340140c5f89c8a96f438bcfae4d1474cc0f688e3a52892c73180a0221204204a764d9e0ca8db0fd43b62728265bf82671ce8a8b4bfedba13672be12de620a022120cb1743d0e3e3eace7e84b8230dc082829813e3ab04e91b503c08e9a441c0ea8b0a02212044a93dddd8effa54ea51076c4e851b6cbbfd938e82eb90197de38fe8876bb66e0a022120c11efd88a9b2c96bc84bccd6ce4aa05bebad7aa760dbe5f2f00ef90c4abd50cc0a02212061226d39beea19d334f17c2febce27e12646d84675924ebb02b9cdaea68727e30a022120d7566a3ba7f7286ed54f4ae7e983f4420ae0b1e0f3892e11f9c4ab107bbad7b90a02212030029479598797290e3638a1712c29bde2367d0eca794f778b25b5a472f192de0a022120fc309467defa4b198c6b5bd59c08db4b9dfb27ddbcc32f31560f217b4ff8fc2b0a022120ecf553770d9b10965f8fb64771e93f5690a182edc32be4a3236e0caaa6e0581a0a022120457064c555edae5b6b89267e992be4c58be5375f0e9ca9749391c7094f7d90330a022120f9c0172ba10dfa4d19088d94f5bf61d3b54d5bd7483a322a982e1373ee8ea31b0a022120eb3b5720301b36fa074260e6e27e2cfff3a7c6bbb47564eb218a9a7f2a8c01930a02212006c532524fabd49cc142815502d785e4f34ec3bd035480efb770568d423f46c60a022120c098773aa18ebb7e84d5ee7ea7d97105ab2015a329f670012398cd2c8f5cc6ca0a0221200d10b9ccdc9af1d65cd4bafabf4e34db01c0ce83abba190230eaf26d7592cd210a022120970541e943e11d1bf1d4d763bc8e70995f613dc682f727045a866312312a63760a02212013ac8c71e4e1c61dece57bea76163d393bf75cd0db8e52981e1564fa592698cb0a022120b59d65c2e10af17c0d6f7d10be8d64c0c13dd15d957c4c39763b4cc55e5919370a02212087a67534df591d2dd5ec577ab3c75668a8e3d35e92e27bf29d9e2e52df8de4120a02212031775e1d6897129e8a84eeba975778fb50015b88039e9bc140bbd839694ac0ae0a02212036032e522b810babd8e3148e9f0d588af9e95e93b97ffb58566b837fdbd31f7f0a022120ca80ba6dc32e08d06f1aa886011eed1d77c77be9eb761cc10d72b7d0a2fd57a60a0221206660d7629213995af8aa169ad6a1cf1a725765d3741b7e7a27825f884a701b960a022120aa67a6594d0e1578faa3bba80bec5b31e461b945e4fbab59eeab38ece09335fb0a0221209b7bfd7654cbb80099d5edc0a29159afc9e9b4636c811cf8c3b95bd11dd8e3dd0a0221200184a60a47ab7c23fcb828d727b05748ef52433fb5ae96f775cc98c9049d8c2c0a0221206354d685c247f1efc36f967617beffa2ebd5a95d8ffe17de4498505c923067b80a02212021adabf73ad61903c1872fa220f84d3b1b9990cec2047f8317e2a67efcd1764e0a022120c999fe8a75bf9528931deb832e2934dd1ac138757d7f2c1398675b6f521d556f0a02212087fd5a8d0bf026239f98b53311d2cec2ee171e853f545e1ad742e092a97ef8600a02212051ae9b785e6aeb288955720faef15f63ee3ae21af38114ade8b3fc3d3831b5ad0a0221202d9315a88f3019f8efa88dfe9c0f0843712da0bac814461e27733f6b83eb51b30a0221202245aec1db780b8dc9f710173256996164f0a65f25a975453e4202a54371d2ea0a022120077e345652cb98edba89815a63a0ede724eba12d7a10c8498e0e762d581aca6b0a022120997e0bf451cb36b4aea096e6b5c254d700922211dd933d9d17c467f0d6f343210a022120677dbbf4f68b5cb996a40dfae338b87d5efb2e12a9b2686d1ca16d69b3d7f2040a0221206de025a4cf28124f8ea6cb8085f860096dbc36d9c40002e221fc449337e065b20a022120d2c2c1f2bba8e0964f9589e060c2ee97f5e19057267ac3284caef3bd50bd2cb50a02212070bf2974182b6ebf4eac64977170074315e7a07d7b58a963758060924ee9a1920a0221209f2acb902ee5c3a8e41c643164a498ed3089c99df3477189babd3682801340750a02212052800482aa2666c0d2621f8f0a8c19ee6e5e5039a65524e268315501b3355fbb0a0221202f317bea04ce89adb8acc85a1a68d20d6e89976d5e86306570a0bb3107e4916a0a022120b5366e5ded52c3db5d81635a624a39d81eb8c639427fc79c539e5c91e17c84940a0221207f57ca775216655022daa88e41c380529211cde01a1517735dbcf30e4a02bdaa0a02212027e867f0f4f61076456d1a73b14c7edc1cf5cef4f4d6193a33424288f11bd0f40a0221209b245faf19d2f3306b58821ef60b194d7b67eb5250635059d8eaae4a36337b280a02212085dafbfa99c733fdd33649551666958ca8f82fd0d849746e093b770caab249d20a0221206b86b78584e182c61729267d73593f48b6a929f3218234769281513cbe5e87ee0a0204035041490a0221201e761bb4e6b1e4d7899b618d389516ddbdfbdb858018b71c45cb6ade57c96f620a0221207730809b4a4656325b7fbc8157fd803c3da170727c541afc4db37773246258b10a022120cb9372930932694b8a74dd5599c0f9e236575f434faf05141d95803a91f044ed0a022120341d9502b1e6bc445036fd76f57bc824c09254a754289878b52a40eb067d2a0b0a022120f9917668f24038a383e51c0b019f5d9645d6785c6bf9a0d48483edf82ba5caec0a022120dd51a67a1b4d0702abf5b5385631b7d3e586993eadacf2e0d900c0a81edcffdd0a022120b5d2cee0b86bb0571db898ae7b9f288c5e272fa486d41a5bf375b52a0249d94c0a022120fe650f0367d4a7ef9815a593ea15d36593f0643aaaf0149bb04be67ab851decd0a02212078ec25615d53d2486db101e829f77615c4408cbbd543088714b9f267da44591a0a022120b718e659619a031b41c6ea9122f146859a82d4a7edc17c55b1e5188e8b4c1d1c0a020504535445500a02212013f7925c9186b8cca50dde4bbf2d4fa9705052cceb6f2fc79df827e2b37d6f3b0a0221200adbf6463e27f60f171bcc498703a4282d1954ec3a85e1f6698b48ecde18c00e0a0221201bd1c59cd425aebf8a931c1b2a902b9a11e7d18dc68021e4a35a5cf24220a6c70a02212041f3625971ca2ed2263e78573fe5ce23e13d2558ed3f2e47ab0f84fb9e7ae7220a0221201fc18861232290221461220bd4e2acd1dcdfbc89c84092c93c18bdc7756c15880a022120026d1f1cf9f1c0ee92eb55696d3bd2393075b611c4f468ae5b967175edc4c25c0a022120eca4f9c5ce7cbef8a349fa9f6c12b23ac45b9ad91c4d1808c6a2dda841f95a020a022120834d3f05278b6f5c963670f437a2267c160914707328f888418902106bcd13d70a022120bf517e0f7ccfc307f0b2fa93b99a737641933989af6af769c928725989c21e660a0221206ff709bf1f0fdb46d991ae6839163df1e050d143429d737fc650b6b2143478080a02212064abe8a459058c60d55427f62be3dc4942c0ba93d1eb5cb85117b70b8e4651ad126170746f733a3a6d657461646174615f763063036d000000000000001a4552525f4e4f545f454e4f5547485f5045524d495353494f4e53006e00000000000000134552525f544f4b454e5f4e4f545f464f554e44007000000000000000174552525f414c52454144595f494e495449414c495a454400000202160b0302080408051a030102011b0b03020804030000000007440a0011080c020e0211090c080b00110a0c050600000000000000000c0a090c090b0a0b0907030911070c090c0a0e05110b0c070a07031a051e0e05110c0c0305210e0511090c030b030c060b0a0b090b060b0711070c090c0a0b0a0b090b01340911060c090c0a0b090335053c0b080b0a33110d1a0c0405420b080b0a33110d180c040b04020101000200010d26070429010304050638000238010c0338020c0007042b000c010a0110000a03380303160b01010702270a0110000b033804140c020b020b0110011411120c040e040b001100020200000101151438050c0007042b010c010a0110020a003806030e0b01010702270b0110020b0038071402030104010017a4060a00111407042103090b00010701270a00111429002003120b00010700273808063c0000000000000012000c6b0a000b6b2d000b0011142a000c6c070511160c020a6c0f00070611170b023809070711160c040a6c0f00070811170b043809070911160c060a6c0f00070a11170b063809070b11160c080a6c0f00070c11170b083809070d11160c0a0a6c0f00070e11170b0a3809070f11160c0c0a6c0f00071011170b0c3809071111160c0e0a6c0f00071211170b0e3809071311160c100a6c0f00071411170b103809071511160c120a6c0f00071611170b123809071711160c140a6c0f00071811170b143809071911160c160a6c0f00071a11170b163809071b11160c180a6c0f00071c11170b183809071d11160c1a0a6c0f00071e11170b1a3809071f11160c1c0a6c0f00072011170b1c3809072111160c1e0a6c0f00072211170b1e3809072311160c200a6c0f00072411170b203809072511160c220a6c0f00072611170b223809072711160c240a6c0f00072811170b243809072911160c260a6c0f00072a11170b263809072b11160c280a6c0f00072c11170b283809072d11160c2a0a6c0f00072e11170b2a3809072f11160c2c0a6c0f00073011170b2c3809073111160c2e0a6c0f00073211170b2e3809073311160c300a6c0f00073411170b303809073511160c320a6c0f00073611170b323809073711160c340a6c0f00073811170b343809073911160c360a6c0f00073a11170b363809073b11160c380a6c0f00073c11170b383809073d11160c3a0a6c0f00073e11170b3a3809073f11160c3c0a6c0f00074011170b3c3809074111160c3e0a6c0f00074211170b3e3809074311160c400a6c0f00074411170b403809074511160c420a6c0f00074611170b423809074711160c440a6c0f00074811170b443809074911160c460a6c0f00074a11170b463809074b11160c480a6c0f00074c11170b483809074d11160c4a0a6c0f00074e11170b4a3809074f11160c4c0a6c0f00075011170b4c3809075111160c4e0a6c0f00075211170b4e3809075311160c500a6c0f00075411170b503809075511160c520a6c0f00075611170b523809075711160c540a6c0f00075811170b543809075911160c560a6c0f00075a11170b563809075b11160c580a6c0f00075c11170b583809075d11160c5a0a6c0f00075e11170b5a3809075f11160c5c0a6c0f00076011170b5c3809076111160c5e0a6c0f00076211170b5e3809076311160c600a6c0f00076411170b603809076511160c620a6c0f00076611170b623809076711160c640a6c0f00076811170b643809076911160c660a6c0f00076a11170b663809076b11160c680a6c0f00076c11170b683809076d11160c6a0a6c0f00076e11170b6a3809076f11160c6e0a6c0f00077011170b6e3809077111160c700a6c0f00077211170b703809077311160c720a6c0f00077411170b723809077511160c740a6c0f00077611170b743809077711160c760a6c0f00077811170b763809077911160c780a6c0f00077a11170b783809077b11160c7a0a6c0f00077c11170b7a3809077d11160c7c0a6c0f00077e11170b7c3809077f11160c7e0a6c0f0007800111170b7e380907810111160c80010a6c0f0007820111170b8001380907830111160c82010a6c0f0007840111170b8201380907850111160c84010a6c0f0007860111170b8401380907870111160c86010a6c0f0007880111170b8601380907890111160c88010a6c0f00078a0111170b88013809078b0111160c8a010a6c0f00078c0111170b8a013809078d0111160c8c010a6c0f00078e0111170b8c013809078f0111160c8e010a6c0f0007900111170b8e01380907910111160c90010a6c0f0007920111170b9001380907930111160c92010a6c0f0007940111170b9201380907950111160c94010a6c0f0007960111170b9401380907970111160c96010a6c0f0007980111170b9601380907990111160c98010a6c0f00079a0111170b98013809079b0111160c9a010a6c0f00079c0111170b9a013809079d0111160c9c010a6c0f00079e0111170b9c013809079f0111160c9e010a6c0f0007a00111170b9e01380907a10111160ca0010a6c0f0007a20111170ba001380907a30111160ca2010a6c0f0007a40111170ba201380907a50111160ca4010a6c0f0007a60111170ba401380907a70111160ca6010a6c0f0007a80111170ba601380907a90111160ca8010a6c0f0007aa0111170ba801380907ab0111160caa010a6c0f0007ac0111170baa01380907ad0111160cac010a6c0f0007ae0111170bac01380907af0111160cae010b6c0f0007b00111170bae0138090204010401001da7050a0011140c010a01070421030b0b00010701270a00111429002003140b0001070027380806504600000000000012000c020b000b022d000b012a000c0307b10111160c4c0a030f00070611170b4c380907b20111160c6d0a030f00070a11170b6d380907b30111160c780a030f00070c11170b78380907b40111160c83010a030f00070e11170b8301380907b50111160c8e010a030f00071011170b8e01380907b60111160c520a030f00071211170b52380907b70111160c5d0a030f00071611170b5d380907b80111160c650a030f00071a11170b65380907b90111160c660a030f00071e11170b66380907ba0111160c670a030f00072411170b67380907bb0111160c680a030f00072611170b68380907bc0111160c690a030f00072811170b69380907bd0111160c6a0a030f00072a11170b6a380907be0111160c6b0a030f00072c11170b6b380907bf0111160c6c0a030f00072e11170b6c380907c00111160c6e0a030f00073011170b6e380907c10111160c6f0a030f00073211170b6f380907c20111160c700a030f00073811170b70380907c30111160c710a030f00073e11170b71380907c40111160c720a030f00074011170b72380907c50111160c730a030f00074211170b73380907c60111160c740a030f00074411170b74380907c70111160c750a030f00074611170b75380907c80111160c760a030f00074811170b76380907c90111160c770a030f00074a11170b77380907ca0111160c790a030f00074c11170b79380907cb0111160c7a0a030f00074e11170b7a380907cc0111160c7b0a030f00075011170b7b380907cd0111160c7c0a030f00075211170b7c380907ce0111160c7d0a030f00075411170b7d380907cf0111160c7e0a030f00075611170b7e380907d00111160c7f0a030f00075811170b7f380907d10111160c80010a030f00075a11170b8001380907d20111160c81010a030f00075c11170b8101380907d30111160c82010a030f00075e11170b8201380907d40111160c84010a030f00076211170b8401380907d50111160c85010a030f00076411170b8501380907d60111160c86010a030f00076a11170b8601380907d70111160c87010a030f00076c11170b8701380907d80111160c88010a030f00076e11170b8801380907d90111160c89010a030f00077011170b8901380907da0111160c8a010a030f00077211170b8a01380907db0111160c8b010a030f00077411170b8b01380907dc0111160c8c010a030f00077611170b8c01380907dd0111160c8d010a030f00077811170b8d01380907de0111160c8f010a030f00077a11170b8f01380907df0111160c90010a030f00077c11170b9001380907e00111160c91010a030f00077e11170b9101380907e10111160c92010a030f0007820111170b9201380907e20111160c93010a030f0007840111170b9301380907e30111160c4d0a030f0007e40111170b4d380907e50111160c4e0a030f0007860111170b4e380907e60111160c4f0a030f00078c0111170b4f380907e70111160c500a030f00078e0111170b50380907e80111160c510a030f0007900111170b51380907e90111160c530a030f0007920111170b53380907ea0111160c540a030f0007940111170b54380907eb0111160c550a030f0007960111170b55380907ec0111160c560a030f0007980111170b56380907ed0111160c570a030f00079a0111170b57380907ee0111160c580a030f0007ef0111170b58380907f00111160c590a030f00079c0111170b59380907f10111160c5a0a030f00079e0111170b5a380907f20111160c5b0a030f0007a00111170b5b380907f30111160c5c0a030f0007a20111170b5c380907f40111160c5e0a030f0007a40111170b5e380907f50111160c5f0a030f0007a60111170b5f380907f60111160c600a030f0007a80111170b60380907f70111160c610a030f0007aa0111170b61380907f80111160c620a030f0007ac0111170b62380907f90111160c630a030f0007ae0111170b63380907fa0111160c640b030f0007b00111170b6438090205010401001e120a00111407042103090b00010701270b0011142a000c020b010b020f011502060000001f5d0a010a031f0305051c0a020a0026030a05110b020b0017090c070c0405170b000b0217080c070c040b040b070c060c05055a0a01031f05230a03200c080525090c080b080328052f0b000b0216080c0e0c0d05560b01200b031f0335053c0b000b0216090c0c0c0b05520a000a0226034105480b000b0217090c0a0c09054e0b020b0017080c0a0c090b090b0a0c0c0c0b0b0b0b0c0c0e0c0d0b0d0b0e0c060c050b050b060207000000205e0a010a031f03050508080c0705140a0120030c05100a03200c040512090c040b040c070b070317051e0b000b02160b010c060c05055b0b01032105250b03200c080527090c080b08032a05410a000a0224032f05360b000b0217080c0a0c09053c0b020b0017090c0a0c090b090b0a0c0e0c0d05570a020a00240346054d0b020b0017080c0c0c0b05530b000b0217090c0c0c0b0b0b0b0c0c0e0c0d0b0d0b0e0c060c050b050b060200000001010000";
+    let res = run_binary_test("sample_price_oracle", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[cfg(feature = "address32")]
+#[test]
+fn sample_aptosd_swap() {
+    let code = "a11ceb0b050000000c0100160216300346ee0104b4022205d602960407ec06de0708ca0e40068a0f8b01109510f9010a8e12520ce012e80e0dc821160000010101020103010401050106010700080009000a000b0700000c0700000d0800000e0700000f07000a28040207000400042b0401060102380800083a0000063c070100000010000100001102010000120101000013030100001401010000150101000016020100001701040000180506000019010700001a020100001b020100001c010100001d000100001e020100001f02010000200001000021000100092f01090009300105000a310b0c02070604320e01010607330205000934010f0009350104000936010f000a37110f020704033900010100033b02010100093d0104000a3e1617020704063f180f01000640191a01000a411b1c02070409421d010005431f040005441f0400094501200009460104000947010f0009480901000a490125020704014a022601060a4b1128020704140a150d1a0a1b121c1315141e0a1f052005210a151e290a2a0d2a142a1e2b0a1b1303060c05030001060c02060c0301030105050303030303010a050c03030303030505070b0502050803070b0502050803070802070803070b0601080401020205080303070b050209000901090009010107090101080402070b060109000900010108070b05020508030501070b06010800030107080207080302060b05020900090109000108070108080108002d0b0901050b0901050b0901050c0b0901050b0901050b0901050b0901050b090105030303030303070b06010801070b06010801070b06010801070b0601080103070803070803070803070803070b0502050803070b0502050803070b0502050803070b0502050803070b090105070b090105070b090105070b09010503030b0901050b0901050b0901050b090105070802070802070802070802070802030301060b050209000901010b0901090001060b0901090001070b0901090001090002070b0502090009010900030709010b090109000b09010900020503010801020303010c04010103030a03030303030505070b0502050803070b0502050803070803070b0901050b090105070803070b0502050803070b0901050b0901050a050a0b0502050803060c030c0b060108040c0b060108000c0b060108010c010b050209000901010b060109000c0b0901050c070b0502050803050b090105070b06010801060803070b0502050803070b0901050b090105070802060c030609010b090109000b090109000d6170746f737061645f73776170076163636f756e740a6170746f735f636f696e04636f696e056576656e74066d6174683634066f7074696f6e067369676e65720d6170746f737061645f636f696e06636f6e6669670e6974657261626c655f7461626c65104269644170746f735061644576656e7417446973747269627574654170746f737061644576656e74114c61756e636850616452656769737472790f546f6b656e446973747269627574650e57686974654c6973744576656e740c61646457686974654c6973740c6173736572745f61646d696e136173736572745f6e6f5f656d657267656e63790b6269644170746f735061640d64697374726962757465416c6c0e64697374726962757465417470701064697374726962757465536561736f6e0f67657453776170546f74616c4269640c67657457686974654c6973740d67657457686974654c697374730a696e697469616c697a650f6c61756e6368506164536561736f6e09726566756e64416c6c0b726566756e644170746f730b7265736574536561736f6e0f77686974654c697374536561736f6e0d77697468647261774170746f731077697468647261774170746f73506164036361700362696408696e766573746f72106469737472696275746564546f6b656e06726566756e6409696e766573746f72730d4974657261626c655461626c6508746f74616c426964126269646170746f737061645f6576656e74730b4576656e7448616e646c6519646973747269627574656170746f737061645f6576656e74731077686974656c6973745f6576656e74730b64697374726962757465640c676574537761705374617465126765745265736f757263654164647265737317626f72726f775f6d75745f776974685f64656661756c740a656d69745f6576656e740a616464726573735f6f660b6973456d657267656e63791467657453776170436f6e6669674861726443617011697342797061737357686974654c69737408636f6e7461696e73094170746f73436f696e087472616e736665720c4170746f73506164436f696e087265676973746572064f7074696f6e1a67657453776170436f6e666967417074546f417074745261746508686561645f6b65790769735f736f6d6507657874726163740f626f72726f775f697465725f6d75740a6d696e7441747070546f036d696e036d6178116765745265736f757263655369676e65721467657453776170436f6e666967536f66744361701967657453776170436f6e666967456e61626c65526566756e640c736574537761705374617465036e6577106e65775f6576656e745f68616e646c650b626f72726f775f6974657241376d8231e6aedc29a19459e804b3770a250c3f367ac8d0f91e10842e8c906d0000000000000000000000000000000000000000000000000000000000000001030800e87648170000000308950100000000000003089a0100000000000003089b010000000000000308930100000000000003089801000000000000030896010000000000000308970100000000000003089901000000000000020104020105020101020103020102052041376d8231e6aedc29a19459e804b3770a250c3f367ac8d0f91e10842e8c906d126170746f733a3a6d657461646174615f7630e4010893010000000000000f4552525f5045524d495353494f4e530095010000000000000d4552525f454d455247454e4359009601000000000000104552525f534541534f4e5f454e444544009701000000000000144552525f534541534f4e5f4e4f545f5245534554009801000000000000114552525f534541534f4e5f414354495645009901000000000000104552525f534541534f4e5f5354415445009a01000000000000134552525f484152444341505f52454143484544009b01000000000000144552525f4e4f545f494e5f57484954454c4953540b6572726f7220636f64657300020322032303240501020522032303250326032405020205270b050205080329032a0b060108002c0b060108012d0b06010804030206220323032e03250326032405040206220323032e032503260324050001000102083c0b0011011112070d21030807082711132a020c0c0a0c0f000c0b0b0c0f010c0e0b0b0c0a0a010c090b010c080b0a0b090600000000000000000600000000000000000600000000000000000600000000000000000600000000000000000b08120338000c0d0b020a0d0f02150b0e0a0d1002140a0d1003140a0d1004140a0d1005140a0d1005140b0d10061412043801020100000001080b001116070e210307070427020200000001061117200305070127020301000102106111021112070c2103090b000107082711180c0611132a020c0811190c040a080f000a0011160c030c020b022e0b0338020c070b040b071e03250b00010b08010703270a081007140b062503310b00010b08010702270a081007140a01160a080f07150a080f080c050a0011130a0138030a0038040b080f000a00111607000600000000000000000600000000000000000600000000000000000600000000000000000b001116120338000c090b010a090f03150b050a091002140a091003140b091006141200380502040000010215a00311180c13111d0c2b11132a020c260b261007140c2c0b2c0a13250310055c11132a020c270a270f000c180b270f090c0f0a182e38060c010d010c1c0a1c2e3807032405550a180b1c380838090c22010c140a141003140a140f0a150a14100a140a2b180a140f04150a141006140a1410041411220a0f0a141002140a141003140a141004140a141005140b141006141201380a0d220c1c051f0b1c010b18010b0f01059f030b130c0a11132a020c2a0a2a0f000c1b0b2a0f090c120a1b2e38060c040d040c1f0a1f2e3807037205c3010a1b0b1f380838090c23010c170a171002140c0d0a171003140c0b0b0d0b0b11230a0a11230c090a0906000000000000000024038c0105b4010a090a170f0a150a090a2b180a170f04150b0a0b09170c0a0a171006140a1710041411220a120a171002140a171003140a171004140a171005140b171006141201380a05b6010b17010a0a0600000000000000002503bb0105c0010b1b010b120105c3010d230c1f056d0a0a0600000000000000002403c80105b30211132a020c280a280f000c190b280f090c100a192e38060c000d000c1d0a1d2e380703dc0105b3020a190b1d380838090c24010c150a151003140a15100a141706000000000000000011240a0a11230c200a200600000000000000002403f40105a4020a15100a140a20160a150f0a150a200a2b180c210a151004140a21160a150f04150b0a0b20170c0a0a151006140b2111220a100a151002140a151003140a151004140a151005140b151006141201380a05a6020b15010a0a0600000000000000002503ab0205b0020b19010b100105b3020d240c1d05d7010b0a0600000000000000002503b90206a1860100000000002711132a020c290a290f000c1a0b290f090c110a1a2e38060c020d020c1e0a1e2e380703cd020599030a1a0b1e380838090c25010c160a161003140c0c0a16100a140c0e0a0c0a0e2603e8020b1a010b16010b1101061127000000000000270b0c0b0e1706000000000000000011240a160f05150a161005140600000000000000002403f70205940311250c030e030a161006140a16100514110d0a110a161002140a161003140a161004140a161005140b161006141201380a0596030b16010d250c1e05c8020b1e010b1a010b1101020500000102211a11260c0211132a021007140c0311270c010b01030c05110b030b02230c000513090c000b0003160518110c05191104020601000102010f0b00110111021112070c210309070827070911281105070a1128020701000102010511132b02100714020801000102222511132a020f000c090b090c080a000c070b000c060b080b070600000000000000000600000000000000000600000000000000000600000000000000000600000000000000000b06120338000c0a0a0a1002140a0a1003140a0a100a140a0a1004140b0a100514020901000102232611132a020f000c03400500000000000000000c060a032e38060c000d000c040a042e3807031105200a030b04380838090c05010c020d060b0210061444050d050c04050c0b04010b03010b06020a01000024220b00110111250c0a0e0a0c02380b0c0111250c040e04380c0c0511250c060e06380d0c0711250c080e08380e0c090b020b010600000000000000000b070b090b0512022d02070b1128020b010000010b0b0011011112070d210308070827070c1128020c00000102274a11132a020c0a0a0a0f000c070b0a0f090c050a072e38060c000d000c0811250c010e010c0b0a082e3807031805410a070b0838080c030c020b022e0b03380f0c09010c060a0b0a061006140a06100314110d0a050a061002140a061003140a061004140a061005140b061006141201380a0d090c0805130b0b010b08010b07010b0501020d00000001050b000b010b023803020e010000010b0b0011011112070a210308070627070b1128020f010000010b0b0011011112070b210308070727070d1128021001000020090b00110111250c030e030b010b023803021101000020090b00110111250c030e030b010b02381002020002040300030103030304030502010202020303020000";
+    let res = run_binary_test("sample_aptosd_swap", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[cfg(feature = "address32")]
+#[test]
+fn sample_router() {
+    let code = "a11ceb0b050000000a01000e020e0603148f0104a3012805cb018f0207da03f90208d30640069307a00110b3082b0cde08db110000010101020003000400050006010a0401000100070000000008010202000000090102020000020b050600050c060700050d050200030e0207020000040f02070200000410020a0200000111020c01000612000d000113020f01000414020a0200000115100f0100031611120200000117130201000418020d0200000519140d00041a1500020000041b020a020000041c020d020000051d140d00031e111202000006080609070907080808090b0b0e0c080d0b0e080f0b100812080f0e0809090e130914091209160802040403060c030300030404043501010101010103030404040404040404040b000109000b000109000b000109000b000109000b000109000b000109000b000109010b000109010b0001090103030303030303030404030301010404010404040503030303030301060c0105010102090009010209010900010301090001020104010901010b0001090002060c0308060c070b00010900070b00010901030301030302030302050b000109000305040106060c010303030432010103030404040404040404040b000109000b000109000b000109000b000109000b000109000b000109000b000109010b000109010b000109010303030303030404030301010404010404040505030303030303030306726f7574657204636f696e067369676e657203616d6d0b636c6f625f6d61726b657403666565047574696c0873696d706c69667918737761705f636f696e5f666f725f65786163745f636f696e18737761705f65786163745f636f696e5f666f725f636f696e04436f696e0a616464726573735f6f660a6665655f65786973747316696e697469616c697a655f6665655f64656661756c740b706f6f6c5f6578697374730d6d61726b65745f657869737473086c6f745f73697a6508646563696d616c7303657870047a65726f0c6e5f6269645f6c6576656c730877697468647261771d636f696e5f737761705f636f696e5f666f725f65786163745f636f696e076465706f7369740b626573745f6269645f61750c73756274726163745f66656516706c6163655f6f726465725f666f725f726f757465720c6e5f61736b5f6c6576656c730b626573745f61736b5f6175076164645f6665651d636f696e5f737761705f65786163745f636f696e5f666f725f636f696e49661cd59c0b89440313af587bc99c3d38614d9a52479eb3f7c7c766d580c30b00000000000000000000000000000000000000000000000000000000000000010308c9000000000000000308ca000000000000000308c800000000000000030804000000000000000308070000000000000003086500000000000000030866000000000000000308030000000000000003080200000000000000030864000000000000000308ffffffffffffffff0308050000000000000003080100000000000000030868000000000000000308670000000000000003080600000000000000126170746f733a3a6d657461646174615f7630170104000000000000000c45544553545f4641494c4544000001000003190a000c030a010c040a01320000000000000000000000000000000022030905120b000a01190c020b010c000b020c0105040b030a001a0b040b001a020101040004ec030a0011030c310a311104200308050a0a0011053800030d0510080c03051238010c030b030c2d38020c2a38030c290a2d0b291f031d05fb0138040c27320a000000000000000000000000000000380535110a0c0e0600000000000000000c320600000000000000000c3438060c1a0a340a0223032f05340a320a01230c060536090c060b06033905eb01380706000000000000000021033e055f0a000a010a321738080c140b000d140d1a0a010a32170a020a34170906000000000000000006000000000000000038090c210c1d0a310b14380a0b320b21160c320b340b1d160c3405eb01380b0c130a310a130811110c120a020a3417350a0e180a121a340c090b090a272303750596010a000a010a321738080c180b000d180d1a0a010a32170a020a34170906000000000000000006000000000000000038090c230c1f0a310b18380a0b320b23160c320b340b1f160c3405eb010a0e0a1211000c250c2b0a000a010a321738080c190a000d190d1a0a010a32170a020a3417080b2b340b253438090c240c200a310b19380a0b320b24160c320b340b20160c340a340a022303c20105c7010a320a01230c0805c901090c080b0803cc0105ea010a020a3417350a0e180b121a340c0a0a000907060b13340b0a3200000000000000000000000000000000380c0c2e0c0d0b320b0d34160c320b340b2e34160c34052a0b320b012503f1010707270b340b022103f7010708270b310b1a380d05eb030a2d0a2a1f03800205b203380e0c28320a000000000000000000000000000000380f35110a0c0f0600000000000000000c330600000000000000000c3538060c1b0a350a02230392020597020a330a01230c04059902090c040b04039c0205a20338100600000000000000002103a10205a402080c0505aa020a020a35170a28230c050b0503ad0205ce020a000a010a331738080c150b000d150d1b0a010a33170a020a35170906000000000000000006000000000000000038090c220c1e0a310b15380a0b330b22160c330b350b1e160c3505a20338110c110a310a110811150c100b100a0f11000c260c2c0a000a010a331738080c160a000d160d1b0a010a33170a020a3517080b2c340b263438090c360c370a310b16380a0b330b36160c330b350b37160c350a350a02230381030586030a330a01230c07058803090c070b07038b0305a1030a000807060b11340a020a3517320000000000000000000000000000000038120c2f0c0b0b330b2f34160c330b350b0b34160c35058d020b330b012503a8030707270b350b022103ae030708270b310b1b380d05eb030b2d03b50305cd030a000a0138080c1738060c1c0b000d170d1c0b010b0209060000000000000000060000000000000000380901010a310b17380a0b310b1c380d05eb030b2a03d00305e7030b00080705070a0a02320000000000000000000000000000000038120c300c0c0b0c340b022103e0030707270b30340b012503eb030708270b0001070c27020201040016d1030a0011030c2b0a2b1104200308050a0a0011053800030d0510080c03051238010c030b030c2738020c2438030c230a270a231f031d05b70138040c21320a000000000000000000000000000000380535110a0c0a0600000000000000000c2d0600000000000000000c2f38060c160a2d0a0123032f05a70138070600000000000000002103340537080c04053d0a010a2d170a21230c040b040340055f0a000a010a2d1738080c100b000d100d160a010a2d170600000000000000000906000000000000000006000000000000000038130c1c0c190a2b0b10380a0b2d0b1c160c2d0b2f0b19160c2f05a701380b0c0f0a2b0a0f0811110c0e0b0e0a0a11000c1f0c250a000a010a2d1738080c140a000d140d160a010a2d17060000000000000000080b25340b1f3438130c310c330a2b0b14380a0b2d0b31160c2d0b2f0b33160c2f0a2d0a012303900105a6010a000907060b0f340a010a2d173200000000000000000000000000000000380c0c280c080b2d0b0834160c2d0b2f0b2834160c2f052a0b2d0b012103ad010707270b2f0b022603b3010708270b2b0b16380d05d0030a270b241f03bc01059403380e0c22320a000000000000000000000000000000380f35110a0c0b0600000000000000000c2e0600000000000000000c3038060c180a2e0a012303ce0105840338100600000000000000002103d30105f2010a000a010a2e1738080c150b000d150d180a010a2e170600000000000000000906000000000000000006000000000000000038130c1d0c1a0a2b0b15380a0b2e0b1d160c2e0b300b1a160c3005840338110c0d0a2b0a0d0811150c0c0a010a2e17350a0b180a0c1a340c050b050a222303880205a7020a000a010a2e1738080c110b000d110d180a010a2e170600000000000000000906000000000000000006000000000000000038130c1e0c1b0a2b0b11380a0b2e0b1e160c2e0b300b1b160c300584030a0b0a0c11000c200c260a000a010a2e1738080c120a000d120d180a010a2e17060000000000000000080b26340b203438130c320c340a2b0b12380a0b2e0b32160c2e0b300b34160c300a2e0a012303d1020583030a010a2e17350a0b180b0c1a340c060a000807060b0d340a06320000000000000000000000000000000038120c2a0c070a07340b062503ee020b0001061111000000000000270a2a340a010a2e172503f9020b0001062222000000000000270b2e0b2a34160c2e0b300b0734160c3005c9010b2e0b0121038a030707270b300b02260390030708270b2b0b18380d05d0030b2703970305b2030a000a0138080c1338060c170a000d130d170b010b0209060000000000000000060000000000000000381301010b0011030c2c0a2c0b17380d0b2c0b13380a05d0030b2303b50305cc030b000907050600000000000000000a013200000000000000000000000000000000380c0c290c090b09340b012103c5030707270b29340b022603d0030708270b0001070c270200";
+    let res = run_binary_test("sample_router", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[cfg(feature = "address32")]
+#[test]
+fn sample_pool() {
+    let code = "a11ceb0b050000000c010020022079039901c90204e2036605c804fd0507c50aa80c08ed166006cd17c101108e19bb020ac91bd4020c9d1eb3250dd043340000010101020103010401050106010701080109010a020b000c000d000e000f0010070000110600001206000013060000140600001508000000040000160800001708000018060000190600001a0600001b0600071d07000b2707000b3a0700053c040106010344040100010245080009470402030100010b480400084e0402030100010b6c07000e7807000e7b07000e7e07000e80010700001c000100001e020100001f030100002002010000210201000022020100002300010000240201000025040100002605010000280607000029080100002a090100002b0a0100002c0b01000658050d0008590f07020300045a101000085b1213020300045c101000035d15160100035e17010100035f1810010005601a0101060b611e1c000b621f06000b632010000b64212200096524010203000a66250101000867122a0203000a682c2d01000a672e2f01000967312a0203000b69320100096a3301020300036b340101000d6d393a000c6d393a0009593b070203000b6e1c3c000b6f3d10000b703d10000b713d0d0003723e16010007733f1d000d74393a000c74393a000975013302030408654401020300087501460203040176054701060b7706100008790f490203000e7a4b4a000e7c4c4d000f7d4e0101040e7f3951000e81010e5300100e1011121114141514161417191c231d1c17261728120e1e111f2b202b12302123232324141735173617371f1c201c27232c1417403023103031303111310e17453211320e32303345333733263319333533363328334035303511384d384a3851350e385303060c04030006060c040a050a080d0a080d0a0306060c04020303030b060c020a050a080d0a080d0a03030303030201060c01080e010103060c05080d02060c0407060c03030303030302060c05040b11010812070805070806070808010502050a0402060b150209000901090001030204080602070b15020900090109000107090101081202060c03010b1101090002070b110109000b1101090001060b1101090001080202070b100109000900070708050303070806070808080f0a080f01080f01080d0405080d080d030305080d080d0205080f03060c080f0301081402080f081403070b1302090009010900090102070a09000a0900010803030708050708060708080108041a06040604030b1101081205080d070a0405020307080503030303030307080803080f0a080f0b1302080f0814040302070a04010901010402060a090006090002010302070a0900030109000208000a0402070b130209000901090002060c0814010b13020900090102050b1101090001080c01080b0108092c03030303030816050405080d040302030a080f0303030503080d03070b1001080a020b11010812030307080503030303030303070806070b150204080603060816030503080f0a080f0503030303030602030303030302060b13020900090109000108160106081602070b1101090003010a0201080a2b03030303030816050405080d040302030a080f0303030503080d03070b1001080a020b110108120307080503030303030303070806070b150204080603060816030503080f0a080f08070805030303070806070808080f0a080f0d01050b1101081206080d060507080507040303070808080f0a080f0b1302080f081403070b15020900090109000901010801010b150209000901010b10010900080800030403060a040608060708080a0817010609010108170d05030305080d020303020a080f0304030405080d0a040a081701081802060c09000206080607080817030303020303030303020303030303020303030303030301081902060a0407080801081a04506f6f6c076163636f756e740a6170746f735f636f696e04636f696e056572726f72056576656e74067369676e657206737472696e67057461626c65117461626c655f776974685f6c656e67746806766563746f7205746f6b656e104578706f6e656e7469616c43757276650b4c696e6561724375727665054d6f64656c04566965770c436f6c6c656374696f6e49640f437265617465506f6f6c4576656e74144465706f736974436f696e506f6f6c4576656e74154465706f736974546f6b656e506f6f6c4576656e740d45646974506f6f6c4576656e740a4576656e7453746f726508506f6f6c4775696405506f6f6c730f52656d6f7665506f6f6c4576656e7409537761704576656e74155769746864726177436f696e506f6f6c4576656e74165769746864726177546f6b656e506f6f6c4576656e740b4465706f736974436f696e06537472696e670c4465706f736974546f6b656e0845646974506f6f6c0a52656d6f7665506f6f6c1753776170436f696e466f7253706563696669634e4654730f537761704e465473466f72436f696e0c5769746864726177436f696e0d5769746864726177546f6b656e066372656174650b696e69745f6d6f64756c650b546f6b656e4461746149640a69735f6572633131353515766965775f636f6c6c656374696f6e5f706f6f6c7309766965775f706f6f6c0f766965775f70726963655f63616c630f766965775f757365725f706f6f6c7312636f6c6c656374696f6e5f63726561746f720f636f6c6c656374696f6e5f6e616d650763726561746f7207706f6f6c5f69640a73706f745f70726963650563757276650564656c7461116c705f6665655f6d756c7469706c69657204747970650673656e646572136465706f7369745f636f696e5f616d6f756e7405636f696e7309746f6b656e5f69647307546f6b656e49640b6372656174655f706f6f6c0b4576656e7448616e646c650b72656d6f76655f706f6f6c126465706f7369745f746f6b656e5f706f6f6c116465706f7369745f636f696e5f706f6f6c1377697468647261775f746f6b656e5f706f6f6c1277697468647261775f636f696e5f706f6f6c09656469745f706f6f6c047377617004436f696e094170746f73436f696e06746f6b656e730f5461626c65576974684c656e67746805546f6b656e0c7472616e73616374696f6e7317746f74616c5f7472616e73616374696f6e5f76616c75650f6c705f6665655f6561726e696e677305636f756e7405706f6f6c73055461626c650a757365725f706f6f6c7310636f6c6c656374696f6e5f706f6f6c730b636f696e5f616d6f756e740c70726f746f636f6c5f6665650e70726f746f636f6c5f70617965650b726f79616c74795f6665650d726f79616c74795f7061796565066c705f6665651477697468647261775f636f696e5f616d6f756e740a616464726573735f6f6608636f6e7461696e7310696e76616c69645f617267756d656e740a626f72726f775f6d7574117065726d697373696f6e5f64656e696564087769746864726177056d657267650576616c75650a656d69745f6576656e74136372656174655f746f6b656e5f69645f726177146372656174655f746f6b656e5f646174615f69640a62616c616e63655f6f660e77697468647261775f746f6b656e0361646406617070656e640672656d6f766508696e6465785f6f660d6465706f7369745f746f6b656e0d64657374726f795f656d707479076465706f73697407526f79616c74790a676574427579496e666f0b6765745f726f79616c7479176765745f726f79616c74795f64656e6f6d696e61746f72156765745f726f79616c74795f6e756d657261746f72116765745f726f79616c74795f7061796565076578747261637404757466380b67657453656c6c496e666f036e6577106e65775f6576656e745f68616e646c65156765745f746f6b656e646174615f6d6178696d756d08506f6f6c5669657706626f72726f7709706f6f6c5f7669657713436f6c6c656374696f6e506f6f6c735669657715636f6c6c656374696f6e5f706f6f6c735f7669657704766965770d507269636543616c63566965770f70726963655f63616c635f766965770d55736572506f6f6c73566965770f757365725f706f6f6c735f76696577ecb44cec6276ddc5860a13b976262c786e06af8f7306923cabec17808dabf0940000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000303086600000000000000030869000000000000000308680000000000000003086e000000000000000308670000000000000003086a0000000000000003086b0000000000000003086c000000000000000308650000000000000003086d000000000000000520ecb44cec6276ddc5860a13b976262c786e06af8f7306923cabec17808dabf09403086400000000000000052000000000000000000000000000000000000000000000000000000000000000000a0204036275790a02050473656c6c126170746f733a3a6d657461646174615f7630a6020a6500000000000000074552525f4e554d006600000000000000134552525f444946465f434f4c4c454354494f4e006700000000000000124552525f4e4f545f45584953545f504f4f4c006800000000000000154552525f494e56414c49445f504f4f4c5f54595045006900000000000000154552525f494e56414c49445f504f4f4c5f41524753006a000000000000001c4552525f4e4f545f4558495453545f544f4b454e5f494e5f504f4f4c006b00000000000000124552525f4e4f545f484156455f544f4b454e006c00000000000000144552525f4e4f545f504f4f4c5f43524541544f52006d00000000000000184552525f504f4f4c5f4e4f545f454e4f5547485f434f494e006e00000000000000114552525f49535f313135355f544f4b454e000002022d052e080d0102092f0530042d052e080d3103320233033403350202020a360530042d052e080d37033803310332023303340303020a360530042d052e080d390a080f3803310332023303340304020730042d052e080d31033202330334030502083b0b100108013d0b100108093e0b100108033f0b10010802400b1001080c410b1001080b420b10010804430b1001080a06020e2f053103380b11010812460b1302080f08142d052e080d3202330334033502390a080f49034a044b030702014c040802034d0b15020408064f0b1502050a04500b150208000a0409020c2f0530042d052e080d3103320233033403350249034a044b030a0210360530042d052e080d310332023303390a080f510352035305540355055603380335080d0b020a360530042d052e080d5703380331033202330334030c020a360530042d052e080d390a080f380331033202330334030001000205080c61070a2a080c06070a2a050c040a0610000a00110f3800040d05160b00010b06010b040107041111270a0610010a013801041c05250b00010b06010b040107041111270b060f010a0138020c050a051002140a00110f210432053b0b00010b05010b040107071113270a000a0238030c030a050f030b0338040b040f040b00110f0b010a051005140a051006140b020a05100338050a051007140a051008140a051009140b05100a1412023806020101000205081bd801070a2a080c0a070a2a050c060a0a10000a00110f3800040d05160b00010b0a010b060107041111270a0a10010a013801041c05250b00010b0a010b060107041111270b0a0f010a0138020c09401c00000000000000000c0c0a091002140a00110f210434053d0b00010b09010b060107071113270e02410d0c080600000000000000000c070a070a082304b60105470e020a07420d0a09100521044f05580b00010b09010b060107001111270e030a07421d0a09100621046005690b00010b09010b060107001111270e020a07420d140e030a07421d140e040a07421d140e050a0742101411180c0b0e020a07420d140e030a07421d140e040a07421d141119110a20048c010595010b00010b09010b060107031111270d0c0a0b441c0a00110f0a0b111a0601000000000000002604a00105a9010b00010b09010b060107061111270a090f0b0a0b0a000b0b060100000000000000111b38070b07060100000000000000160c0705420a090f0c0a0c38080b060f0d0b00110f0b010a091005140a091006140b0c0a09100338050a091007140a091008140a091009140b09100a1412033809020201000205082759070a2a080c08070a2a050c060a0810000a00110f3800040d05160b00010b08010b060107041111270a0810010a013801041c05250b00010b08010b060107041111270b080f010a0138020c070a071002140b00110f21043205390b07010b060107071113270a020a070f08150a040a070f09150a030a070f07150a050a070f0a150b060f0e0b010a071005140b071006140b030b020b040b051204380a0203010002050829dc01070a2a080c17070a2a050c100a1710000a00110f3800040d05160b00010b17010b100107041111270a170f000a00110f380b0c1f0a1710010a0138010422052d0b1f010b00010b17010b100107041111270a170f010a01380c13060c150c1c0c1d010c1e0c160c0f0c0e0c0b0c0a0c1b0c090c180c0d0a0d0a00110f21044605510b1f010b00010b17010b100107071113270a1f0e010c062e0b06380d0c12010b1f0b12380e010b170f0f0a0a0a0b1200380f0c0c0a0c0e010c072e0b07380d0c13046d05760b00010b10010b0c0107051111270b0c0b13380e010600000000000000000c110e02410d0c14401c00000000000000000c1a0a110a142304a5010586010e020a11420d140e030a11421d140e040a11421d140e050a1142101411180c190d1a0a19441c0a000d1b0b19381011220b11060100000000000000160c110581010b1b38110e0938050c080a00110f0b0938120a100f100a0d0a010a0a0a0b0b1a0600000000000000000600000000000000003100060000000000000000060000000000000000120c38130a100f110b0d0a010a0a0a0b0b080600000000000000000600000000000000003100060000000000000000060000000000000000120b38140b100f120b00110f0b010b0a0b0b0b180b0e0b0f0b160b1e0b1d0b1c0b15120938150204010002050838d502070a2a080f010c2a070a2a050c210a2a0a010c102e0b103801040f05180b00010b2a010b210107041111270e02410d0c270b2a0a0138020c290a2910081431012104380a291007140a291009140a270a29100a14070b11250c0a0c090c080c070c060c1d055a0a29100814310221043f05480b00010b29010b210107021111270a291007140a291009140a270a29100a14070b11260c0a0c090c080c070c060c1d0b1d0b060b070b080b090b0a0c240c2b0c1f0c250c26310021046905720b00010b29010b21010701111127070c0600000000000000000600000000000000000c2f0c2d0c2e0b260a290f07150b250a290f0915401c00000000000000000c310a000a1f38030c1e0600000000000000000c220a220a272304f401058d010e020a22420d140e030a22421d140e040a22421d140e050a2242101411180c300a29100c0e3038160c2304a60105af010b00010b29010b210107051111270a290f0c0b233817010d310a30441c0a29100b0a30381804bd0105c6010b00010b29010b210107051111270a000a290f0b0a30381011220b3011280c0b0e0b0c2c0a2c11290c200a2c112a0c280b2c112b0c2e0a200600000000000000002204ef010a1f0a271a0b28180b201a0c2d0b2f0a2d160c2f0a2e0d1e0a2d381938120b22060100000000000000160c220588010a291013140a1f35160a290f13150a29101414060100000000000000160a290f1415070a0d1e0a2b381938120a290f030b1e38040b210f150c1c0b00110f0c0c0b010c0d0a291005140c0e0a291006140c0f0a291007140c110a291008140c120a291009140c130b310c140b1f0a2b160b2d160c150b2b0c160b2f0c170b2e0c180b240c19070d112d0c1a0b29100338050c1b0b1c0b0c0b0d0b0e0b0f0b110b120b130b140b150b16070a0b170b180b190b1b0b1a120a381a02050100020508418c03070a2a080f010c29070a2a050c200a290a010c102e0b103801040f05180b00010b29010b200107041111270e02410d0c250b290a0138020c280a2810081431012104380a281007140a281009140a250a28100a14070b112e0c0a0c090c080c070c060c1d055a0a28100814310221043f05480b00010b28010b200107021111270a281007140a281009140a250a28100a14070b112f0c0a0c090c080c070c060c1d0b1d0b060b070b080b090b0a0c220c2a0c270c230c24310021046905720b00010b28010b20010701111127070c0600000000000000000600000000000000000c2e0c2c0c2d401c00000000000000000c300a280f030a270a2a1738190c1e0600000000000000000c210a210a2523049a020588010e020a21420d0a281005210490010599010b00010b28010b200107001111270e030a21421d0a2810062104a10105aa010b00010b28010b200107001111270e020a21420d140e030a21421d140e040a21421d140e050a2142101411180c2f0e020a21420d140e030a21421d140e040a21421d141119110a2004cd0105d6010b00010b28010b200107031111270d300a2f441c0a00110f0a2f111a0601000000000000002604e10105ea010b00010b28010b200107061111270a280f0b0a2f0a000a2f060100000000000000111b38070b2f11280c0b0e0b0c2b0a2b11290c1f0a2b112a0c260b2b112b0c2d0a1f060000000000000000220495020a270a251a0b26180b1f1a0c2c0b2e0a2c160c2e0a2d0d1e0a2c381938120b21060100000000000000160c210583010a280f0c0a303808070a0a280f030a2a381938120b240a280f07150b230a280f09150a00110f0b1e38120a281013140a270a2a170b2e1735160a280f13150a28101414060100000000000000160a280f14150b200f150c1c0b00110f0c0c0b010c0d0a281005140c0e0a281006140c0f0a281007140c110a281008140c120a281009140c130b300c140b270a2a170a2c170c150b2a0c160b2c0c170b2d0c180b220c19070e112d0c1a0b28100338050c1b0b1c0b0c0b0d0b0e0b0f0b110b120b130b140b150b16070a0b170b180b190b1b0b1a120a381a020601000205082770070a2a080c05070a2a050c030a0510000a00110f3800040d05160b00010b05010b030107041111270a0510010a013801041c05250b00010b05010b030107041111270b050f010a0138020c040a041002140a00110f210432053b0b00010b04010b030107071113270a04100338050a02260442054b0b00010b04010b030107091111270a00110f0a040f030a02381938120b030f110b00110f0b010a041005140a041006140b020a04100338050a041007140a041008140a041009140b04100a14120b38140207010002050842a901070a2a080c0b070a2a050c060a0b10000a00110f3800040d05160b00010b0b010b060107041111270a0b10010a013801041c05250b00010b0b010b060107041111270b0b0f010a0138020c0a401c00000000000000000c0d0a0a1002140a00110f210434053d0b00010b0a010b060107071113270e02410d0c090600000000000000000c070a070a0923048b0105470e020a07420d140e030a07421d140e040a07421d140e050a0742101411180c0c0a0a100c0e0c38160c08046005690b00010b0a010b060107051111270a0a0f0c0b083817010d0d0a0c441c0a0a100b0a0c381804770580010b00010b0a010b060107051111270a000a0a0f0b0b0c381011220b07060100000000000000160c0705420b060f100b00110f0b010a0a1005140a0a1006140b0d0a0a100338050a0a1007140a0a1008140a0a1009140b0a100a14120c38130208010003050708439f02070a2a080c14070a2a070f160c11070a2a050c10381b0c170e02410d0c130a13060000000000000000240414051f0b00010b14010b11010b100107081111270e02060000000000000000420d0c0f0e03060000000000000000421d0c0e0a14100f0a0f140a0e141200381c20043a0a140f0f0a0f140a0e141200402b0000000000000000381d0a140f0f0a0f140a0e141200380f0a1114442b401c00000000000000000c160600000000000000000c120a120a132304b001054e0a0f0e020a12420d21045b0a0e0e030a12421d210c0b055d090c0b0b0b0460056f0b00010b14010b11010b10010b0f010b0e0107001111270e020a12420d140e030a12421d140e040a12421d141119110a20048001058f010b00010b14010b11010b10010b0f010b0e0107031111270e020a12420d140e030a12421d140e040a12421d140e050a1242101411180c150d160a15441c0d170a150a000b15060100000000000000111b38070b12060100000000000000160c1205490a100f0d0a00110f0a11140a0f140a0e140a160a060a070a010a080a09120338090a000a0638030c0d0a100f040a00110f0a11140a0f140a0e140a060b060a070a010a080a09120238060a140f010a11140a00110f0a070b0d0b170a0f140a0e140a010a080a090a0a0b1606000000000000000032000000000000000000000000000000000600000000000000001206381e0a140f000a00110f0c0c2e0b0c38002004ff010a140f000a00110f402b0000000000000000381f0b140f000a00110f380b0a1114442b0b100f170b00110f0a11140b0f140b0e140b070b010b080b090b0a120138200a11143201000000000000000000000000000000160b11150209000000011e0a0038213822382312082d080a00320000000000000000000000000000000012072d070a000a0038240a0038250a0038260a0038270a0038280a0038290a00382a0b00382b12052d05020a00000001060601000000000000000b0011342120020b010401084876070a2a080c090a010a0212000c030a09100f0a03381c040d05130b00010b0901063f05000000000000270a09100f0b03382c0c07404a00000000000000000c0a0a07412b0c060600000000000000000c040a040a0623046b05240a070a04422b140c050a0910010a053801042f05370b00010b09010b0701063f05000000000000270a0910010b05382d0c080d0a0a081002140a081007140a08100338050a081005140a081006140a081008140a081009140a08100a140a081018140a08100c140a081014140a081013140b081019141136444a0b04060100000000000000160c04051f0b09010b000b010b020b07140b0a1137382e020c010401084f40070a2a080c030a0310010a013801040905100b00010b030107041111270b0310010b01382d0c020b000a021002140a021007140a02100338050a021005140a021006140a021008140a021009140a02100a140a021018140a02100c140a021014140a021013140b021019141136382f020d0104005087010b010600000000000000002104380a020601000000000000002104150b030b040b050b06070b11250c090c080c070c180c170c16052b0b0206020000000000000021041a051f0b000107021111270b030b040b050b06070b11260c090c080c070c180c170c160b160b170b180b070b080b090c150c140c130c120c110c10056b0a020601000000000000002104490b030b040b050b06070b112e0c0f0c0e0c0d0c0c0c0b0c0a055f0b0206020000000000000021044e05530b000107021111270b030b040b050b06070b112f0c0f0c0e0c0d0c0c0c0b0c0a0b0a0b0b0b0c0b0d0b0e0b0f0c150c140c130c120c110c100b100b110b120b130b140b150c1a0c1d0c190c1b0c1c310021047a057e0b0001064705000000000000270b000b1c0b1b0b190b1d0b1a11393830020e01040108521b070a2a080c030a0310000a0138000409050f0b00010b0301063f05000000000000270b0310000a0138310c020b000b010b0214113a383202080108000600060205030604060506010606060706080603060a050205060802050405050501060c060b0507070005000609060d00";
+    let res = run_binary_test("sample_pool", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[cfg(feature = "address32")]
+#[test]
+fn sample_farming() {
+    let code = "a11ceb0b050000000e01001e021e2603447c04c00158059802c80107e003bb04089b08a00106bb09e101109c0b780a940c3e0bd20c040cd60cd10d0da71a080eaf1a060000010101020103010401050106000700080209020a0309030a0409040a000b0800000c0e0200010001000d0c0200010001011106000513070002230401000107240000000e000100000f0201020000032104050001220607000525090a000e26010c0200000c26010c0200000a26010c0200000427001200022812140100022915160100022a17010100082b150101000d2c1a010200000b2c1a01020000092c1a010200000d2d1b010200000b2d1b01020000092d1b01020000062e011400050b050d050e050f05100511060b060d060e060f06100611070b070d070e070f0710071109130a130b1309180a180b1809190a190b190c130c180d0b0e0b0f0b0d0d0e0d0f0d0d0e0d100e0e0e100f0e0f10100b110b120b01060c0009060c0303030303030303020c080302060c0501080301060803010c2001010101010101010101030303030308040b050108060b050109000b050109010708000b0102090009010b0102090009010b020209000901070b020209000901050c0a0b0102090009010503030303010a0201080402090009010101020901090002080609000209000806020806090102090108060105010900010302060c03010b0501090002050b0501090001090101080603060c030305060c03030303010b010209000901076661726d696e67076163636f756e7404636f696e107265736f757263655f6163636f756e74067369676e657206737472696e670974696d657374616d700d6661756365745f746f6b656e73076c656e64696e6706726f7574657204737761700a4d6f64756c65446174610c506f736974696f6e496e666f0f506f736974696f6e496e666f4465780b696e69745f6d6f64756c65166c657665726167655f7969656c645f6661726d696e670a7369676e65725f636170105369676e65724361706162696c697479086465785f6e616d6506537472696e670b7369676e65725f616464720a637265617465645f617406737461747573086c657665726167650e737570706c79416d6f756e745f780e737570706c79416d6f756e745f790e737570706c79416d6f756e745f7a0e626f72726f77416d6f756e745f780e626f72726f77416d6f756e745f790e626f72726f77416d6f756e745f7a10706f736974696f6e496e666f5f70616e10706f736974696f6e496e666f5f6c697110706f736974696f6e496e666f5f6175781d72657472696576655f7265736f757263655f6163636f756e745f6361701d6372656174655f7369676e65725f776974685f6361706162696c69747904436f696e03455a4d04757466380f69735f706169725f637265617465640a616464726573735f6f660762616c616e6365087769746864726177076465706f73697406626f72726f7710737761705f65786163745f696e7075740d6164645f6c69717569646974790b6e6f775f7365636f6e64734d63574ba8d90a5926e2866d8291e57683108a47b96d884232a871fe4feddf4100000000000000000000000000000000000000000000000000000000000000015e40a5bf7ab741784d3a99d96d8e2ddc6706ee06e5f509a3314a74c9e53746f5b30dd6a14dd7626ac8a37bc964914f07e3dc38d629637f1087f9f7186f1e0909c4911c40cf758ec21c0ebf0e547933ef6bb0f53ad581c08d2ecc7ad11364be1b030804000000000000000520f67b2452fd82768002ec6c28568713b9359a596585dc1a4bf85fce6b0e3754020308020000000000000003080300000000000000030801000000000000000308ffffffffffffffff0410e80300000000000000000000000000000308000000000000000005204d63574ba8d90a5926e2866d8291e57683108a47b96d884232a871fe4feddf41052000000000000000000000000000000000000000000000000000000000000000000a020c0b50616e63616b65537761700a020b0a4c6971756964537761700a020d0c4155582045786368616e6765126170746f733a3a6d657461646174615f763064030100000000000000164552524f525f4e4f545f435245415445445f50414952000200000000000000184552524f525f494e53554646494349454e545f4153534554000300000000000000174552524f525f494e56414c49445f504152414d5f4445580000020110080301020b1208041405150316011703180319031a031b031c031d030202031e0a0b0102090009011f0a0b010209000901200a0b010209000901020b010b00000000030c0b00070111020c020e0211030c010e010b0212002d000201010402000208ee04070a1104010a010600000000000000002103080536070a11040c183800030e0511080c09051338010c090b0903190b00010704273802031c051f080c0b052138030c0b0b0b03270b00010704273804032a052d080c0c052f38050c0c0b0c03350b0001070427059f010a0106010000000000000021033b0569070b11040c18380603410544080c0d054638070c0d0b0d034c0b00010704273808034f0552080c0e055438090c0e0b0e035a0b0001070427380a035d0560080c0f0562380b0c0f0b0f03680b0001070427059f010a0106020000000000000021036e059b01070c11040c18380c03740577080c100579380d0c100b10037f0b0001070427380e038201058501080c11058701380f0c110b11038d010b00010704273810039001059301080c1205950138110c120b12039f010b00010704270b000107032707082a000c1c0b1c100011030c220e2211080c210a030600000000000000002403ae0105c1010a00110838120c160b160a032403ba010b00010702270a000a0338130c1a07080b1a38140a040600000000000000002403c60105d9010a00110838150c170b170a042403d2010b00010702270a000a0438160c1b07080b1b38170a050600000000000000002403de0105f1010a00110838180c150b150a052403ea010b00010702270a000a0538190c1907080b19381a0a060600000000000000002403f60105f9010e220a06381b0a070600000000000000002403fe010581020e220a07381c0a0806000000000000000024038502070838120c26070838150c280a030a06160602000000000000001a0600000000000000002403940205bd020a010600000000000000002103990205a2020e220a030a06160602000000000000001a060000000000000000381d05bd020a010601000000000000002103a70205b0020e220a030a06160602000000000000001a060000000000000000381e05bd020a010602000000000000002103b50205bd020e220a030a06160602000000000000001a060000000000000000381f0a040a07160602000000000000001a0600000000000000002403c60205ef020a010600000000000000002103cb0205d4020e220a040a07160602000000000000001a060000000000000000382005ef020a010601000000000000002103d90205e2020e220a040a07160602000000000000001a060000000000000000382105ef020a010602000000000000002103e70205ef020e220a040a07160602000000000000001a06000000000000000038220a050a08160602000000000000001a0600000000000000002403f80205b9030a010600000000000000002103fd02058e030e220a050a08160602000000000000001a06000000000000000038230e220a050a08160602000000000000001a060000000000000000382405b9030a010601000000000000002103930305a4030e220a050a08160602000000000000001a06000000000000000038250e220a050a08160602000000000000001a060000000000000000382605b9030a010602000000000000002103a90305b9030e220a050a08160602000000000000001a06000000000000000038270e220a050a08160602000000000000001a0600000000000000003828070838120c25070838150c270a030b25160b26170c130a040b27160b28170c140a130600000000000000002403d00305d5030a14060000000000000000240c0a05d703090c0a0b0a03da0305eb040a010600000000000000002103df0305e6030e220b130b14060000000000000000060000000000000000382905fd030a010601000000000000002103eb0305f2030e220b130b14060000000000000000060000000000000000382a05fd030a010602000000000000002103f70305fd030e220b130b14060000000000000000060000000000000000382b0b0011080c240a213b002003850405ba040b180b241113080b020b030b040b050b060b070b0839010c1d401c000000000000000001401c0000000000000000401c0000000000000000401c000000000000000039000c1f0a0106000000000000000021039e0405a3040d1f36000b1d441c05b6040a010601000000000000002103a80405ad040d1f36010b1d441c05b6040b010602000000000000002103b20405b6040d1f36020b1d441c0e220b1f3f0005ea040b213c000c200b180b241113080b020b030b040b050b060b070b0839010c1e0a010600000000000000002103cf0405d4040b2036000b1e441c05ea040a010601000000000000002103d90405de040b2036010b1e441c05ea040b010602000000000000002103e30405e8040b2036020b1e441c05ea040b200105ed040b0001020000020002010202010b020b030b00";
+    let res = run_binary_test("sample_farming", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[cfg(feature = "address32")]
+#[test]
+fn sample_whitelist() {
+    let code = "a11ceb0b050000000c01000602060c03123a044c0805545707ab01660891024006d102988b0210e98d02d7010ac08f02090cc98f02a2470debd6020200000101010200030800020a04020301000100040001000005020100000603040000070201000008000100010b0203000204070102030002060a04020300020c010c02030402080d0e020300060607060806090602060c050001060c01050101020507080002050203070b010209000901090009010305070b010205020708000106080002060b0102090009010900010b01020502010b01020900090102070b01020900090109000109010977686974656c697374067369676e6572057461626c650957686974656c69737403616464086164645f6d616e7908636f6e7461696e730a696e697469616c697a650672656d6f766507656e7472696573055461626c650a616464726573735f6f66036e65774419523fdfa01e96fc7c18b67d900be8c863459e25383a5c661b9523631811c1000000000000000000000000000000000000000000000000000000000000000103082003000000000000030822030000000000000308210300000000000005204419523fdfa01e96fc7c18b67d900be8c863459e25383a5c661b9523631811c1052000000000000000000000000000000000000000000000000000000000000000000520000000000000000000000000000000000000000000000000000000000000000105200000000000000000000000000000000000000000000000000000000000000002052000000000000000000000000000000000000000000000000000000000000000030520000000000000000000000000000000000000000000000000000000000000000405200000000000000000000000000000000000000000000000000000000000000005052000000000000000000000000000000000000000000000000000000000000000060520000000000000000000000000000000000000000000000000000000000000000705200000000000000000000000000000000000000000000000000000000000000008052000000000000000000000000000000000000000000000000000000000000000090520000000000000000000000000000000000000000000000000000000000000001005200000000000000000000000000000000000000000000000000000000000000011052000000000000000000000000000000000000000000000000000000000000000120520000000000000000000000000000000000000000000000000000000000000001305200000000000000000000000000000000000000000000000000000000000000014052000000000000000000000000000000000000000000000000000000000000000150520000000000000000000000000000000000000000000000000000000000000001605200000000000000000000000000000000000000000000000000000000000000017052000000000000000000000000000000000000000000000000000000000000000180520000000000000000000000000000000000000000000000000000000000000001905200000000000000000000000000000000000000000000000000000000000000020052000000000000000000000000000000000000000000000000000000000000000210520000000000000000000000000000000000000000000000000000000000000002205200000000000000000000000000000000000000000000000000000000000000023052000000000000000000000000000000000000000000000000000000000000000240520000000000000000000000000000000000000000000000000000000000000002505200000000000000000000000000000000000000000000000000000000000000026052000000000000000000000000000000000000000000000000000000000000000270520000000000000000000000000000000000000000000000000000000000000002805200000000000000000000000000000000000000000000000000000000000000029052000000000000000000000000000000000000000000000000000000000000000300520000000000000000000000000000000000000000000000000000000000000003105200000000000000000000000000000000000000000000000000000000000000032052000000000000000000000000000000000000000000000000000000000000000330520000000000000000000000000000000000000000000000000000000000000003405200000000000000000000000000000000000000000000000000000000000000035052000000000000000000000000000000000000000000000000000000000000000360520000000000000000000000000000000000000000000000000000000000000003705200000000000000000000000000000000000000000000000000000000000000038052000000000000000000000000000000000000000000000000000000000000000390520000000000000000000000000000000000000000000000000000000000000004005200000000000000000000000000000000000000000000000000000000000000041052000000000000000000000000000000000000000000000000000000000000000420520000000000000000000000000000000000000000000000000000000000000004305200000000000000000000000000000000000000000000000000000000000000044052000000000000000000000000000000000000000000000000000000000000000450520000000000000000000000000000000000000000000000000000000000000004605200000000000000000000000000000000000000000000000000000000000000047052000000000000000000000000000000000000000000000000000000000000000480520000000000000000000000000000000000000000000000000000000000000004905200000000000000000000000000000000000000000000000000000000000000050052000000000000000000000000000000000000000000000000000000000000000510520000000000000000000000000000000000000000000000000000000000000005205200000000000000000000000000000000000000000000000000000000000000053052000000000000000000000000000000000000000000000000000000000000000540520000000000000000000000000000000000000000000000000000000000000005505200000000000000000000000000000000000000000000000000000000000000056052000000000000000000000000000000000000000000000000000000000000000570520000000000000000000000000000000000000000000000000000000000000005805200000000000000000000000000000000000000000000000000000000000000059052000000000000000000000000000000000000000000000000000000000000000600520000000000000000000000000000000000000000000000000000000000000006105200000000000000000000000000000000000000000000000000000000000000062052000000000000000000000000000000000000000000000000000000000000000630520000000000000000000000000000000000000000000000000000000000000006405200000000000000000000000000000000000000000000000000000000000000065052000000000000000000000000000000000000000000000000000000000000000660520000000000000000000000000000000000000000000000000000000000000006705200000000000000000000000000000000000000000000000000000000000000068052000000000000000000000000000000000000000000000000000000000000000690520000000000000000000000000000000000000000000000000000000000000007005200000000000000000000000000000000000000000000000000000000000000071052000000000000000000000000000000000000000000000000000000000000000720520000000000000000000000000000000000000000000000000000000000000007305200000000000000000000000000000000000000000000000000000000000000074052000000000000000000000000000000000000000000000000000000000000000750520000000000000000000000000000000000000000000000000000000000000007605200000000000000000000000000000000000000000000000000000000000000077052000000000000000000000000000000000000000000000000000000000000000780520000000000000000000000000000000000000000000000000000000000000007905200000000000000000000000000000000000000000000000000000000000000080052000000000000000000000000000000000000000000000000000000000000000810520000000000000000000000000000000000000000000000000000000000000008205200000000000000000000000000000000000000000000000000000000000000083052000000000000000000000000000000000000000000000000000000000000000840520000000000000000000000000000000000000000000000000000000000000008505200000000000000000000000000000000000000000000000000000000000000086052000000000000000000000000000000000000000000000000000000000000000870520000000000000000000000000000000000000000000000000000000000000008805200000000000000000000000000000000000000000000000000000000000000089052000000000000000000000000000000000000000000000000000000000000000900520000000000000000000000000000000000000000000000000000000000000009105200000000000000000000000000000000000000000000000000000000000000092052000000000000000000000000000000000000000000000000000000000000000930520000000000000000000000000000000000000000000000000000000000000009405200000000000000000000000000000000000000000000000000000000000000095052000000000000000000000000000000000000000000000000000000000000000960520000000000000000000000000000000000000000000000000000000000000009705200000000000000000000000000000000000000000000000000000000000000098052000000000000000000000000000000000000000000000000000000000000000990520000000000000000000000000000000000000000000000000000000000000010005200000000000000000000000000000000000000000000000000000000000000101052000000000000000000000000000000000000000000000000000000000000001020520000000000000000000000000000000000000000000000000000000000000010305200000000000000000000000000000000000000000000000000000000000000104052000000000000000000000000000000000000000000000000000000000000001050520000000000000000000000000000000000000000000000000000000000000010605200000000000000000000000000000000000000000000000000000000000000107052000000000000000000000000000000000000000000000000000000000000001080520000000000000000000000000000000000000000000000000000000000000010905200000000000000000000000000000000000000000000000000000000000000110052000000000000000000000000000000000000000000000000000000000000001110520000000000000000000000000000000000000000000000000000000000000011205200000000000000000000000000000000000000000000000000000000000000113052000000000000000000000000000000000000000000000000000000000000001140520000000000000000000000000000000000000000000000000000000000000011505200000000000000000000000000000000000000000000000000000000000000116052000000000000000000000000000000000000000000000000000000000000001170520000000000000000000000000000000000000000000000000000000000000011805200000000000000000000000000000000000000000000000000000000000000119052000000000000000000000000000000000000000000000000000000000000001200520000000000000000000000000000000000000000000000000000000000000012105200000000000000000000000000000000000000000000000000000000000000122052000000000000000000000000000000000000000000000000000000000000001230520000000000000000000000000000000000000000000000000000000000000012405200000000000000000000000000000000000000000000000000000000000000125052000000000000000000000000000000000000000000000000000000000000001260520000000000000000000000000000000000000000000000000000000000000012705200000000000000000000000000000000000000000000000000000000000000128052000000000000000000000000000000000000000000000000000000000000001290520000000000000000000000000000000000000000000000000000000000000013005200000000000000000000000000000000000000000000000000000000000000131052000000000000000000000000000000000000000000000000000000000000001320520000000000000000000000000000000000000000000000000000000000000013305200000000000000000000000000000000000000000000000000000000000000134052000000000000000000000000000000000000000000000000000000000000001350520000000000000000000000000000000000000000000000000000000000000013605200000000000000000000000000000000000000000000000000000000000000137052000000000000000000000000000000000000000000000000000000000000001380520000000000000000000000000000000000000000000000000000000000000013905200000000000000000000000000000000000000000000000000000000000000140052000000000000000000000000000000000000000000000000000000000000001410520000000000000000000000000000000000000000000000000000000000000014205200000000000000000000000000000000000000000000000000000000000000143052000000000000000000000000000000000000000000000000000000000000001440520000000000000000000000000000000000000000000000000000000000000014505200000000000000000000000000000000000000000000000000000000000000146052000000000000000000000000000000000000000000000000000000000000001470520000000000000000000000000000000000000000000000000000000000000014805200000000000000000000000000000000000000000000000000000000000000149052000000000000000000000000000000000000000000000000000000000000001500520000000000000000000000000000000000000000000000000000000000000015105200000000000000000000000000000000000000000000000000000000000000152052000000000000000000000000000000000000000000000000000000000000001530520000000000000000000000000000000000000000000000000000000000000015405200000000000000000000000000000000000000000000000000000000000000155052000000000000000000000000000000000000000000000000000000000000001560520000000000000000000000000000000000000000000000000000000000000015705200000000000000000000000000000000000000000000000000000000000000158052000000000000000000000000000000000000000000000000000000000000001590520000000000000000000000000000000000000000000000000000000000000016005200000000000000000000000000000000000000000000000000000000000000161052000000000000000000000000000000000000000000000000000000000000001620520000000000000000000000000000000000000000000000000000000000000016305200000000000000000000000000000000000000000000000000000000000000164052000000000000000000000000000000000000000000000000000000000000001650520000000000000000000000000000000000000000000000000000000000000016605200000000000000000000000000000000000000000000000000000000000000167052000000000000000000000000000000000000000000000000000000000000001680520000000000000000000000000000000000000000000000000000000000000016905200000000000000000000000000000000000000000000000000000000000000170052000000000000000000000000000000000000000000000000000000000000001710520000000000000000000000000000000000000000000000000000000000000017205200000000000000000000000000000000000000000000000000000000000000173052000000000000000000000000000000000000000000000000000000000000001740520000000000000000000000000000000000000000000000000000000000000017505200000000000000000000000000000000000000000000000000000000000000176052000000000000000000000000000000000000000000000000000000000000001770520000000000000000000000000000000000000000000000000000000000000017805200000000000000000000000000000000000000000000000000000000000000179052000000000000000000000000000000000000000000000000000000000000001800520000000000000000000000000000000000000000000000000000000000000018105200000000000000000000000000000000000000000000000000000000000000182052000000000000000000000000000000000000000000000000000000000000001830520000000000000000000000000000000000000000000000000000000000000018405200000000000000000000000000000000000000000000000000000000000000185052000000000000000000000000000000000000000000000000000000000000001860520000000000000000000000000000000000000000000000000000000000000018705200000000000000000000000000000000000000000000000000000000000000188052000000000000000000000000000000000000000000000000000000000000001890520000000000000000000000000000000000000000000000000000000000000019005200000000000000000000000000000000000000000000000000000000000000191052000000000000000000000000000000000000000000000000000000000000001920520000000000000000000000000000000000000000000000000000000000000019305200000000000000000000000000000000000000000000000000000000000000194052000000000000000000000000000000000000000000000000000000000000001950520000000000000000000000000000000000000000000000000000000000000019605200000000000000000000000000000000000000000000000000000000000000197052000000000000000000000000000000000000000000000000000000000000001980520000000000000000000000000000000000000000000000000000000000000019905200000000000000000000000000000000000000000000000000000000000000200052000000000000000000000000000000000000000000000000000000000000002010520000000000000000000000000000000000000000000000000000000000000020205200000000000000000000000000000000000000000000000000000000000000203052000000000000000000000000000000000000000000000000000000000000002040520000000000000000000000000000000000000000000000000000000000000020505200000000000000000000000000000000000000000000000000000000000000206052000000000000000000000000000000000000000000000000000000000000002070520000000000000000000000000000000000000000000000000000000000000020805200000000000000000000000000000000000000000000000000000000000000209052000000000000000000000000000000000000000000000000000000000000002100520000000000000000000000000000000000000000000000000000000000000021105200000000000000000000000000000000000000000000000000000000000000212052000000000000000000000000000000000000000000000000000000000000002130520000000000000000000000000000000000000000000000000000000000000021405200000000000000000000000000000000000000000000000000000000000000215052000000000000000000000000000000000000000000000000000000000000002160520000000000000000000000000000000000000000000000000000000000000021705200000000000000000000000000000000000000000000000000000000000000218052000000000000000000000000000000000000000000000000000000000000002190520000000000000000000000000000000000000000000000000000000000000022005200000000000000000000000000000000000000000000000000000000000000221052000000000000000000000000000000000000000000000000000000000000002220520000000000000000000000000000000000000000000000000000000000000022305200000000000000000000000000000000000000000000000000000000000000224052000000000000000000000000000000000000000000000000000000000000002250520000000000000000000000000000000000000000000000000000000000000022605200000000000000000000000000000000000000000000000000000000000000227052000000000000000000000000000000000000000000000000000000000000002280520000000000000000000000000000000000000000000000000000000000000022905200000000000000000000000000000000000000000000000000000000000000230052000000000000000000000000000000000000000000000000000000000000002310520000000000000000000000000000000000000000000000000000000000000023205200000000000000000000000000000000000000000000000000000000000000233052000000000000000000000000000000000000000000000000000000000000002340520000000000000000000000000000000000000000000000000000000000000023505200000000000000000000000000000000000000000000000000000000000000236052000000000000000000000000000000000000000000000000000000000000002370520000000000000000000000000000000000000000000000000000000000000023805200000000000000000000000000000000000000000000000000000000000000239052000000000000000000000000000000000000000000000000000000000000002400520000000000000000000000000000000000000000000000000000000000000024105200000000000000000000000000000000000000000000000000000000000000242052000000000000000000000000000000000000000000000000000000000000002430520000000000000000000000000000000000000000000000000000000000000024405200000000000000000000000000000000000000000000000000000000000000245052000000000000000000000000000000000000000000000000000000000000002460520000000000000000000000000000000000000000000000000000000000000024705200000000000000000000000000000000000000000000000000000000000000248052000000000000000000000000000000000000000000000000000000000000002490520000000000000000000000000000000000000000000000000000000000000025005200000000000000000000000000000000000000000000000000000000000000251052000000000000000000000000000000000000000000000000000000000000002520520000000000000000000000000000000000000000000000000000000000000025305200000000000000000000000000000000000000000000000000000000000000254052000000000000000000000000000000000000000000000000000000000000002550520000000000000000000000000000000000000000000000000000000000000025605200000000000000000000000000000000000000000000000000000000000000257052000000000000000000000000000000000000000000000000000000000000002580520000000000000000000000000000000000000000000000000000000000000025905200000000000000000000000000000000000000000000000000000000000000260052000000000000000000000000000000000000000000000000000000000000002610520000000000000000000000000000000000000000000000000000000000000026205200000000000000000000000000000000000000000000000000000000000000263052000000000000000000000000000000000000000000000000000000000000002640520000000000000000000000000000000000000000000000000000000000000026505200000000000000000000000000000000000000000000000000000000000000266052000000000000000000000000000000000000000000000000000000000000002670520000000000000000000000000000000000000000000000000000000000000026805200000000000000000000000000000000000000000000000000000000000000269052000000000000000000000000000000000000000000000000000000000000002700520000000000000000000000000000000000000000000000000000000000000027105200000000000000000000000000000000000000000000000000000000000000272052000000000000000000000000000000000000000000000000000000000000002730520000000000000000000000000000000000000000000000000000000000000027405200000000000000000000000000000000000000000000000000000000000000275052000000000000000000000000000000000000000000000000000000000000002760520000000000000000000000000000000000000000000000000000000000000027705200000000000000000000000000000000000000000000000000000000000000278052000000000000000000000000000000000000000000000000000000000000002790520000000000000000000000000000000000000000000000000000000000000028005200000000000000000000000000000000000000000000000000000000000000281052000000000000000000000000000000000000000000000000000000000000002820520000000000000000000000000000000000000000000000000000000000000028305200000000000000000000000000000000000000000000000000000000000000284052000000000000000000000000000000000000000000000000000000000000002850520000000000000000000000000000000000000000000000000000000000000028605200000000000000000000000000000000000000000000000000000000000000287052000000000000000000000000000000000000000000000000000000000000002880520000000000000000000000000000000000000000000000000000000000000028905200000000000000000000000000000000000000000000000000000000000000290052000000000000000000000000000000000000000000000000000000000000002910520000000000000000000000000000000000000000000000000000000000000029205200000000000000000000000000000000000000000000000000000000000000293052000000000000000000000000000000000000000000000000000000000000002940520000000000000000000000000000000000000000000000000000000000000029505200000000000000000000000000000000000000000000000000000000000000296052000000000000000000000000000000000000000000000000000000000000002970520000000000000000000000000000000000000000000000000000000000000029805200000000000000000000000000000000000000000000000000000000000000299052000000000000000000000000000000000000000000000000000000000000003000520000000000000000000000000000000000000000000000000000000000000030105200000000000000000000000000000000000000000000000000000000000000302052000000000000000000000000000000000000000000000000000000000000003030520000000000000000000000000000000000000000000000000000000000000030405200000000000000000000000000000000000000000000000000000000000000305052000000000000000000000000000000000000000000000000000000000000003060520000000000000000000000000000000000000000000000000000000000000030705200000000000000000000000000000000000000000000000000000000000000308052000000000000000000000000000000000000000000000000000000000000003090520000000000000000000000000000000000000000000000000000000000000031005200000000000000000000000000000000000000000000000000000000000000311052000000000000000000000000000000000000000000000000000000000000003120520000000000000000000000000000000000000000000000000000000000000031305200000000000000000000000000000000000000000000000000000000000000314052000000000000000000000000000000000000000000000000000000000000003150520000000000000000000000000000000000000000000000000000000000000031605200000000000000000000000000000000000000000000000000000000000000317052000000000000000000000000000000000000000000000000000000000000003180520000000000000000000000000000000000000000000000000000000000000031905200000000000000000000000000000000000000000000000000000000000000320052000000000000000000000000000000000000000000000000000000000000003210520000000000000000000000000000000000000000000000000000000000000032205200000000000000000000000000000000000000000000000000000000000000323052000000000000000000000000000000000000000000000000000000000000003240520000000000000000000000000000000000000000000000000000000000000032505200000000000000000000000000000000000000000000000000000000000000326052000000000000000000000000000000000000000000000000000000000000003270520000000000000000000000000000000000000000000000000000000000000032805200000000000000000000000000000000000000000000000000000000000000329052000000000000000000000000000000000000000000000000000000000000003300520000000000000000000000000000000000000000000000000000000000000033105200000000000000000000000000000000000000000000000000000000000000332052000000000000000000000000000000000000000000000000000000000000003330520000000000000000000000000000000000000000000000000000000000000033405200000000000000000000000000000000000000000000000000000000000000335052000000000000000000000000000000000000000000000000000000000000003360520000000000000000000000000000000000000000000000000000000000000033705200000000000000000000000000000000000000000000000000000000000000338052000000000000000000000000000000000000000000000000000000000000003390520000000000000000000000000000000000000000000000000000000000000034005200000000000000000000000000000000000000000000000000000000000000341052000000000000000000000000000000000000000000000000000000000000003420520000000000000000000000000000000000000000000000000000000000000034305200000000000000000000000000000000000000000000000000000000000000344052000000000000000000000000000000000000000000000000000000000000003450520000000000000000000000000000000000000000000000000000000000000034605200000000000000000000000000000000000000000000000000000000000000347052000000000000000000000000000000000000000000000000000000000000003480520000000000000000000000000000000000000000000000000000000000000034905200000000000000000000000000000000000000000000000000000000000000350052000000000000000000000000000000000000000000000000000000000000003510520000000000000000000000000000000000000000000000000000000000000035205200000000000000000000000000000000000000000000000000000000000000353052000000000000000000000000000000000000000000000000000000000000003540520000000000000000000000000000000000000000000000000000000000000035505200000000000000000000000000000000000000000000000000000000000000356052000000000000000000000000000000000000000000000000000000000000003570520000000000000000000000000000000000000000000000000000000000000035805200000000000000000000000000000000000000000000000000000000000000359052000000000000000000000000000000000000000000000000000000000000003600520000000000000000000000000000000000000000000000000000000000000036105200000000000000000000000000000000000000000000000000000000000000362052000000000000000000000000000000000000000000000000000000000000003630520000000000000000000000000000000000000000000000000000000000000036405200000000000000000000000000000000000000000000000000000000000000365052000000000000000000000000000000000000000000000000000000000000003660520000000000000000000000000000000000000000000000000000000000000036705200000000000000000000000000000000000000000000000000000000000000368052000000000000000000000000000000000000000000000000000000000000003690520000000000000000000000000000000000000000000000000000000000000037005200000000000000000000000000000000000000000000000000000000000000371052000000000000000000000000000000000000000000000000000000000000003720520000000000000000000000000000000000000000000000000000000000000037305200000000000000000000000000000000000000000000000000000000000000374052000000000000000000000000000000000000000000000000000000000000003750520000000000000000000000000000000000000000000000000000000000000037605200000000000000000000000000000000000000000000000000000000000000377052000000000000000000000000000000000000000000000000000000000000003780520000000000000000000000000000000000000000000000000000000000000037905200000000000000000000000000000000000000000000000000000000000000380052000000000000000000000000000000000000000000000000000000000000003810520000000000000000000000000000000000000000000000000000000000000038205200000000000000000000000000000000000000000000000000000000000000383052000000000000000000000000000000000000000000000000000000000000003840520000000000000000000000000000000000000000000000000000000000000038505200000000000000000000000000000000000000000000000000000000000000386052000000000000000000000000000000000000000000000000000000000000003870520000000000000000000000000000000000000000000000000000000000000038805200000000000000000000000000000000000000000000000000000000000000389052000000000000000000000000000000000000000000000000000000000000003900520000000000000000000000000000000000000000000000000000000000000039105200000000000000000000000000000000000000000000000000000000000000392052000000000000000000000000000000000000000000000000000000000000003930520000000000000000000000000000000000000000000000000000000000000039405200000000000000000000000000000000000000000000000000000000000000395052000000000000000000000000000000000000000000000000000000000000003960520000000000000000000000000000000000000000000000000000000000000039705200000000000000000000000000000000000000000000000000000000000000398052000000000000000000000000000000000000000000000000000000000000003990520000000000000000000000000000000000000000000000000000000000000040005200000000000000000000000000000000000000000000000000000000000000401052000000000000000000000000000000000000000000000000000000000000004020520000000000000000000000000000000000000000000000000000000000000040305200000000000000000000000000000000000000000000000000000000000000404052000000000000000000000000000000000000000000000000000000000000004050520000000000000000000000000000000000000000000000000000000000000040605200000000000000000000000000000000000000000000000000000000000000407052000000000000000000000000000000000000000000000000000000000000004080520000000000000000000000000000000000000000000000000000000000000040905200000000000000000000000000000000000000000000000000000000000000410052000000000000000000000000000000000000000000000000000000000000004110520000000000000000000000000000000000000000000000000000000000000041205200000000000000000000000000000000000000000000000000000000000000413052000000000000000000000000000000000000000000000000000000000000004140520000000000000000000000000000000000000000000000000000000000000041505200000000000000000000000000000000000000000000000000000000000000416052000000000000000000000000000000000000000000000000000000000000004170520000000000000000000000000000000000000000000000000000000000000041805200000000000000000000000000000000000000000000000000000000000000419052000000000000000000000000000000000000000000000000000000000000004200520000000000000000000000000000000000000000000000000000000000000042105200000000000000000000000000000000000000000000000000000000000000422052000000000000000000000000000000000000000000000000000000000000004230520000000000000000000000000000000000000000000000000000000000000042405200000000000000000000000000000000000000000000000000000000000000425052000000000000000000000000000000000000000000000000000000000000004260520000000000000000000000000000000000000000000000000000000000000042705200000000000000000000000000000000000000000000000000000000000000428052000000000000000000000000000000000000000000000000000000000000004290520000000000000000000000000000000000000000000000000000000000000043005200000000000000000000000000000000000000000000000000000000000000431052000000000000000000000000000000000000000000000000000000000000004320520000000000000000000000000000000000000000000000000000000000000043305200000000000000000000000000000000000000000000000000000000000000434052000000000000000000000000000000000000000000000000000000000000004350520000000000000000000000000000000000000000000000000000000000000043605200000000000000000000000000000000000000000000000000000000000000437052000000000000000000000000000000000000000000000000000000000000004380520000000000000000000000000000000000000000000000000000000000000043905200000000000000000000000000000000000000000000000000000000000000440052000000000000000000000000000000000000000000000000000000000000004410520000000000000000000000000000000000000000000000000000000000000044205200000000000000000000000000000000000000000000000000000000000000443052000000000000000000000000000000000000000000000000000000000000004440520000000000000000000000000000000000000000000000000000000000000044505200000000000000000000000000000000000000000000000000000000000000446052000000000000000000000000000000000000000000000000000000000000004470520000000000000000000000000000000000000000000000000000000000000044805200000000000000000000000000000000000000000000000000000000000000449052000000000000000000000000000000000000000000000000000000000000004500520000000000000000000000000000000000000000000000000000000000000045105200000000000000000000000000000000000000000000000000000000000000452052000000000000000000000000000000000000000000000000000000000000004530520000000000000000000000000000000000000000000000000000000000000045405200000000000000000000000000000000000000000000000000000000000000455052000000000000000000000000000000000000000000000000000000000000004560520000000000000000000000000000000000000000000000000000000000000045705200000000000000000000000000000000000000000000000000000000000000458052000000000000000000000000000000000000000000000000000000000000004590520000000000000000000000000000000000000000000000000000000000000046005200000000000000000000000000000000000000000000000000000000000000461052000000000000000000000000000000000000000000000000000000000000004620520000000000000000000000000000000000000000000000000000000000000046305200000000000000000000000000000000000000000000000000000000000000464052000000000000000000000000000000000000000000000000000000000000004650520000000000000000000000000000000000000000000000000000000000000046605200000000000000000000000000000000000000000000000000000000000000467052000000000000000000000000000000000000000000000000000000000000004680520000000000000000000000000000000000000000000000000000000000000046905200000000000000000000000000000000000000000000000000000000000000470052000000000000000000000000000000000000000000000000000000000000004710520000000000000000000000000000000000000000000000000000000000000047205200000000000000000000000000000000000000000000000000000000000000473052000000000000000000000000000000000000000000000000000000000000004740520000000000000000000000000000000000000000000000000000000000000047505200000000000000000000000000000000000000000000000000000000000000476052000000000000000000000000000000000000000000000000000000000000004770520000000000000000000000000000000000000000000000000000000000000047805200000000000000000000000000000000000000000000000000000000000000479052000000000000000000000000000000000000000000000000000000000000004800520000000000000000000000000000000000000000000000000000000000000048105200000000000000000000000000000000000000000000000000000000000000482052000000000000000000000000000000000000000000000000000000000000004830520000000000000000000000000000000000000000000000000000000000000048405200000000000000000000000000000000000000000000000000000000000000485052000000000000000000000000000000000000000000000000000000000000004860520000000000000000000000000000000000000000000000000000000000000048705200000000000000000000000000000000000000000000000000000000000000488052000000000000000000000000000000000000000000000000000000000000004890520000000000000000000000000000000000000000000000000000000000000049005200000000000000000000000000000000000000000000000000000000000000491052000000000000000000000000000000000000000000000000000000000000004920520000000000000000000000000000000000000000000000000000000000000049305200000000000000000000000000000000000000000000000000000000000000494052000000000000000000000000000000000000000000000000000000000000004950520000000000000000000000000000000000000000000000000000000000000049605200000000000000000000000000000000000000000000000000000000000000497052000000000000000000000000000000000000000000000000000000000000004980520000000000000000000000000000000000000000000000000000000000000049905200000000000000000000000000000000000000000000000000000000000000500052000000000000000000000000000000000000000000000000000000000000005010520000000000000000000000000000000000000000000000000000000000000050205200000000000000000000000000000000000000000000000000000000000000503052000000000000000000000000000000000000000000000000000000000000005040520000000000000000000000000000000000000000000000000000000000000050505200000000000000000000000000000000000000000000000000000000000000506052000000000000000000000000000000000000000000000000000000000000005070520000000000000000000000000000000000000000000000000000000000000050805200000000000000000000000000000000000000000000000000000000000000509052000000000000000000000000000000000000000000000000000000000000005100520000000000000000000000000000000000000000000000000000000000000051105200000000000000000000000000000000000000000000000000000000000000512052000000000000000000000000000000000000000000000000000000000000005130520000000000000000000000000000000000000000000000000000000000000051405200000000000000000000000000000000000000000000000000000000000000515052000000000000000000000000000000000000000000000000000000000000005160520000000000000000000000000000000000000000000000000000000000000051705200000000000000000000000000000000000000000000000000000000000000518052000000000000000000000000000000000000000000000000000000000000005190520000000000000000000000000000000000000000000000000000000000000052005200000000000000000000000000000000000000000000000000000000000000521052000000000000000000000000000000000000000000000000000000000000005220520000000000000000000000000000000000000000000000000000000000000052305200000000000000000000000000000000000000000000000000000000000000524052000000000000000000000000000000000000000000000000000000000000005250520000000000000000000000000000000000000000000000000000000000000052605200000000000000000000000000000000000000000000000000000000000000527052000000000000000000000000000000000000000000000000000000000000005280520000000000000000000000000000000000000000000000000000000000000052905200000000000000000000000000000000000000000000000000000000000000530052000000000000000000000000000000000000000000000000000000000000005310520000000000000000000000000000000000000000000000000000000000000053205200000000000000000000000000000000000000000000000000000000000000533052000000000000000000000000000000000000000000000000000000000000005340520000000000000000000000000000000000000000000000000000000000000053505200000000000000000000000000000000000000000000000000000000000000536052000000000000000000000000000000000000000000000000000000000000005370520000000000000000000000000000000000000000000000000000000000000053805200000000000000000000000000000000000000000000000000000000000000539052000000000000000000000000000000000000000000000000000000000000005400520000000000000000000000000000000000000000000000000000000000000054105200000000000000000000000000000000000000000000000000000000000000542052000000000000000000000000000000000000000000000000000000000000005430520000000000000000000000000000000000000000000000000000000000000054405200000000000000000000000000000000000000000000000000000000000000545052000000000000000000000000000000000000000000000000000000000000005460520000000000000000000000000000000000000000000000000000000000000054705200000000000000000000000000000000000000000000000000000000000000548052000000000000000000000000000000000000000000000000000000000000005490520000000000000000000000000000000000000000000000000000000000000055005200000000000000000000000000000000000000000000000000000000000000551052000000000000000000000000000000000000000000000000000000000000005520520000000000000000000000000000000000000000000000000000000000000055305200000000000000000000000000000000000000000000000000000000000000554052000000000000000000000000000000000000000000000000000000000000005550520000000000000000000000000000000000000000000000000000000000000055605200000000000000000000000000000000000000000000000000000000000000557052000000000000000000000000000000000000000000000000000000000000005580520000000000000000000000000000000000000000000000000000000000000055905200000000000000000000000000000000000000000000000000000000000000560052000000000000000000000000000000000000000000000000000000000000005610520000000000000000000000000000000000000000000000000000000000000056205200000000000000000000000000000000000000000000000000000000000000563052000000000000000000000000000000000000000000000000000000000000005640520000000000000000000000000000000000000000000000000000000000000056505200000000000000000000000000000000000000000000000000000000000000566052000000000000000000000000000000000000000000000000000000000000005670520000000000000000000000000000000000000000000000000000000000000056805200000000000000000000000000000000000000000000000000000000000000569052000000000000000000000000000000000000000000000000000000000000005700520000000000000000000000000000000000000000000000000000000000000057105200000000000000000000000000000000000000000000000000000000000000572052000000000000000000000000000000000000000000000000000000000000005730520000000000000000000000000000000000000000000000000000000000000057405200000000000000000000000000000000000000000000000000000000000000575052000000000000000000000000000000000000000000000000000000000000005760520000000000000000000000000000000000000000000000000000000000000057705200000000000000000000000000000000000000000000000000000000000000578052000000000000000000000000000000000000000000000000000000000000005790520000000000000000000000000000000000000000000000000000000000000058005200000000000000000000000000000000000000000000000000000000000000581052000000000000000000000000000000000000000000000000000000000000005820520000000000000000000000000000000000000000000000000000000000000058305200000000000000000000000000000000000000000000000000000000000000584052000000000000000000000000000000000000000000000000000000000000005850520000000000000000000000000000000000000000000000000000000000000058605200000000000000000000000000000000000000000000000000000000000000587052000000000000000000000000000000000000000000000000000000000000005880520000000000000000000000000000000000000000000000000000000000000058905200000000000000000000000000000000000000000000000000000000000000590052000000000000000000000000000000000000000000000000000000000000005910520000000000000000000000000000000000000000000000000000000000000059205200000000000000000000000000000000000000000000000000000000000000593052000000000000000000000000000000000000000000000000000000000000005940520000000000000000000000000000000000000000000000000000000000000059505200000000000000000000000000000000000000000000000000000000000000596052000000000000000000000000000000000000000000000000000000000000005970520000000000000000000000000000000000000000000000000000000000000059805200000000000000000000000000000000000000000000000000000000000000599052000000000000000000000000000000000000000000000000000000000000006000520000000000000000000000000000000000000000000000000000000000000060105200000000000000000000000000000000000000000000000000000000000000602052000000000000000000000000000000000000000000000000000000000000006030520000000000000000000000000000000000000000000000000000000000000060405200000000000000000000000000000000000000000000000000000000000000605052000000000000000000000000000000000000000000000000000000000000006060520000000000000000000000000000000000000000000000000000000000000060705200000000000000000000000000000000000000000000000000000000000000608052000000000000000000000000000000000000000000000000000000000000006090520000000000000000000000000000000000000000000000000000000000000061005200000000000000000000000000000000000000000000000000000000000000611052000000000000000000000000000000000000000000000000000000000000006120520000000000000000000000000000000000000000000000000000000000000061305200000000000000000000000000000000000000000000000000000000000000614052000000000000000000000000000000000000000000000000000000000000006150520000000000000000000000000000000000000000000000000000000000000061605200000000000000000000000000000000000000000000000000000000000000617052000000000000000000000000000000000000000000000000000000000000006180520000000000000000000000000000000000000000000000000000000000000061905200000000000000000000000000000000000000000000000000000000000000620052000000000000000000000000000000000000000000000000000000000000006210520000000000000000000000000000000000000000000000000000000000000062205200000000000000000000000000000000000000000000000000000000000000623052000000000000000000000000000000000000000000000000000000000000006240520000000000000000000000000000000000000000000000000000000000000062505200000000000000000000000000000000000000000000000000000000000000626052000000000000000000000000000000000000000000000000000000000000006270520000000000000000000000000000000000000000000000000000000000000062805200000000000000000000000000000000000000000000000000000000000000629052000000000000000000000000000000000000000000000000000000000000006300520000000000000000000000000000000000000000000000000000000000000063105200000000000000000000000000000000000000000000000000000000000000632052000000000000000000000000000000000000000000000000000000000000006330520000000000000000000000000000000000000000000000000000000000000063405200000000000000000000000000000000000000000000000000000000000000635052000000000000000000000000000000000000000000000000000000000000006360520000000000000000000000000000000000000000000000000000000000000063705200000000000000000000000000000000000000000000000000000000000000638052000000000000000000000000000000000000000000000000000000000000006390520000000000000000000000000000000000000000000000000000000000000064005200000000000000000000000000000000000000000000000000000000000000641052000000000000000000000000000000000000000000000000000000000000006420520000000000000000000000000000000000000000000000000000000000000064305200000000000000000000000000000000000000000000000000000000000000644052000000000000000000000000000000000000000000000000000000000000006450520000000000000000000000000000000000000000000000000000000000000064605200000000000000000000000000000000000000000000000000000000000000647052000000000000000000000000000000000000000000000000000000000000006480520000000000000000000000000000000000000000000000000000000000000064905200000000000000000000000000000000000000000000000000000000000000650052000000000000000000000000000000000000000000000000000000000000006510520000000000000000000000000000000000000000000000000000000000000065205200000000000000000000000000000000000000000000000000000000000000653052000000000000000000000000000000000000000000000000000000000000006540520000000000000000000000000000000000000000000000000000000000000065505200000000000000000000000000000000000000000000000000000000000000656052000000000000000000000000000000000000000000000000000000000000006570520000000000000000000000000000000000000000000000000000000000000065805200000000000000000000000000000000000000000000000000000000000000659052000000000000000000000000000000000000000000000000000000000000006600520000000000000000000000000000000000000000000000000000000000000066105200000000000000000000000000000000000000000000000000000000000000662052000000000000000000000000000000000000000000000000000000000000006630520000000000000000000000000000000000000000000000000000000000000066405200000000000000000000000000000000000000000000000000000000000000665052000000000000000000000000000000000000000000000000000000000000006660520000000000000000000000000000000000000000000000000000000000000066705200000000000000000000000000000000000000000000000000000000000000668052000000000000000000000000000000000000000000000000000000000000006690520000000000000000000000000000000000000000000000000000000000000067005200000000000000000000000000000000000000000000000000000000000000671052000000000000000000000000000000000000000000000000000000000000006720520000000000000000000000000000000000000000000000000000000000000067305200000000000000000000000000000000000000000000000000000000000000674052000000000000000000000000000000000000000000000000000000000000006750520000000000000000000000000000000000000000000000000000000000000067605200000000000000000000000000000000000000000000000000000000000000677052000000000000000000000000000000000000000000000000000000000000006780520000000000000000000000000000000000000000000000000000000000000067905200000000000000000000000000000000000000000000000000000000000000680052000000000000000000000000000000000000000000000000000000000000006810520000000000000000000000000000000000000000000000000000000000000068205200000000000000000000000000000000000000000000000000000000000000683052000000000000000000000000000000000000000000000000000000000000006840520000000000000000000000000000000000000000000000000000000000000068505200000000000000000000000000000000000000000000000000000000000000686052000000000000000000000000000000000000000000000000000000000000006870520000000000000000000000000000000000000000000000000000000000000068805200000000000000000000000000000000000000000000000000000000000000689052000000000000000000000000000000000000000000000000000000000000006900520000000000000000000000000000000000000000000000000000000000000069105200000000000000000000000000000000000000000000000000000000000000692052000000000000000000000000000000000000000000000000000000000000006930520000000000000000000000000000000000000000000000000000000000000069405200000000000000000000000000000000000000000000000000000000000000695052000000000000000000000000000000000000000000000000000000000000006960520000000000000000000000000000000000000000000000000000000000000069705200000000000000000000000000000000000000000000000000000000000000698052000000000000000000000000000000000000000000000000000000000000006990520000000000000000000000000000000000000000000000000000000000000070005200000000000000000000000000000000000000000000000000000000000000701052000000000000000000000000000000000000000000000000000000000000007020520000000000000000000000000000000000000000000000000000000000000070305200000000000000000000000000000000000000000000000000000000000000704052000000000000000000000000000000000000000000000000000000000000007050520000000000000000000000000000000000000000000000000000000000000070605200000000000000000000000000000000000000000000000000000000000000707052000000000000000000000000000000000000000000000000000000000000007080520000000000000000000000000000000000000000000000000000000000000070905200000000000000000000000000000000000000000000000000000000000000710052000000000000000000000000000000000000000000000000000000000000007110520000000000000000000000000000000000000000000000000000000000000071205200000000000000000000000000000000000000000000000000000000000000713052000000000000000000000000000000000000000000000000000000000000007140520000000000000000000000000000000000000000000000000000000000000071505200000000000000000000000000000000000000000000000000000000000000716052000000000000000000000000000000000000000000000000000000000000007170520000000000000000000000000000000000000000000000000000000000000071805200000000000000000000000000000000000000000000000000000000000000719052000000000000000000000000000000000000000000000000000000000000007200520000000000000000000000000000000000000000000000000000000000000072105200000000000000000000000000000000000000000000000000000000000000722052000000000000000000000000000000000000000000000000000000000000007230520000000000000000000000000000000000000000000000000000000000000072405200000000000000000000000000000000000000000000000000000000000000725052000000000000000000000000000000000000000000000000000000000000007260520000000000000000000000000000000000000000000000000000000000000072705200000000000000000000000000000000000000000000000000000000000000728052000000000000000000000000000000000000000000000000000000000000007290520000000000000000000000000000000000000000000000000000000000000073005200000000000000000000000000000000000000000000000000000000000000731052000000000000000000000000000000000000000000000000000000000000007320520000000000000000000000000000000000000000000000000000000000000073305200000000000000000000000000000000000000000000000000000000000000734052000000000000000000000000000000000000000000000000000000000000007350520000000000000000000000000000000000000000000000000000000000000073605200000000000000000000000000000000000000000000000000000000000000737052000000000000000000000000000000000000000000000000000000000000007380520000000000000000000000000000000000000000000000000000000000000073905200000000000000000000000000000000000000000000000000000000000000740052000000000000000000000000000000000000000000000000000000000000007410520000000000000000000000000000000000000000000000000000000000000074205200000000000000000000000000000000000000000000000000000000000000743052000000000000000000000000000000000000000000000000000000000000007440520000000000000000000000000000000000000000000000000000000000000074505200000000000000000000000000000000000000000000000000000000000000746052000000000000000000000000000000000000000000000000000000000000007470520000000000000000000000000000000000000000000000000000000000000074805200000000000000000000000000000000000000000000000000000000000000749052000000000000000000000000000000000000000000000000000000000000007500520000000000000000000000000000000000000000000000000000000000000075105200000000000000000000000000000000000000000000000000000000000000752052000000000000000000000000000000000000000000000000000000000000007530520000000000000000000000000000000000000000000000000000000000000075405200000000000000000000000000000000000000000000000000000000000000755052000000000000000000000000000000000000000000000000000000000000007560520000000000000000000000000000000000000000000000000000000000000075705200000000000000000000000000000000000000000000000000000000000000758052000000000000000000000000000000000000000000000000000000000000007590520000000000000000000000000000000000000000000000000000000000000076005200000000000000000000000000000000000000000000000000000000000000761052000000000000000000000000000000000000000000000000000000000000007620520000000000000000000000000000000000000000000000000000000000000076305200000000000000000000000000000000000000000000000000000000000000764052000000000000000000000000000000000000000000000000000000000000007650520000000000000000000000000000000000000000000000000000000000000076605200000000000000000000000000000000000000000000000000000000000000767052000000000000000000000000000000000000000000000000000000000000007680520000000000000000000000000000000000000000000000000000000000000076905200000000000000000000000000000000000000000000000000000000000000770052000000000000000000000000000000000000000000000000000000000000007710520000000000000000000000000000000000000000000000000000000000000077205200000000000000000000000000000000000000000000000000000000000000773052000000000000000000000000000000000000000000000000000000000000007740520000000000000000000000000000000000000000000000000000000000000077505200000000000000000000000000000000000000000000000000000000000000776052000000000000000000000000000000000000000000000000000000000000007770520000000000000000000000000000000000000000000000000000000000000077805200000000000000000000000000000000000000000000000000000000000000779052000000000000000000000000000000000000000000000000000000000000007800520000000000000000000000000000000000000000000000000000000000000078105200000000000000000000000000000000000000000000000000000000000000782052000000000000000000000000000000000000000000000000000000000000007830520000000000000000000000000000000000000000000000000000000000000078405200000000000000000000000000000000000000000000000000000000000000785052000000000000000000000000000000000000000000000000000000000000007860520000000000000000000000000000000000000000000000000000000000000078705200000000000000000000000000000000000000000000000000000000000000788052000000000000000000000000000000000000000000000000000000000000007890520000000000000000000000000000000000000000000000000000000000000079005200000000000000000000000000000000000000000000000000000000000000791052000000000000000000000000000000000000000000000000000000000000007920520000000000000000000000000000000000000000000000000000000000000079305200000000000000000000000000000000000000000000000000000000000000794052000000000000000000000000000000000000000000000000000000000000007950520000000000000000000000000000000000000000000000000000000000000079605200000000000000000000000000000000000000000000000000000000000000797052000000000000000000000000000000000000000000000000000000000000007980520000000000000000000000000000000000000000000000000000000000000079905200000000000000000000000000000000000000000000000000000000000000800052000000000000000000000000000000000000000000000000000000000000008010520000000000000000000000000000000000000000000000000000000000000080205200000000000000000000000000000000000000000000000000000000000000803052000000000000000000000000000000000000000000000000000000000000008040520000000000000000000000000000000000000000000000000000000000000080505200000000000000000000000000000000000000000000000000000000000000806052000000000000000000000000000000000000000000000000000000000000008070520000000000000000000000000000000000000000000000000000000000000080805200000000000000000000000000000000000000000000000000000000000000809052000000000000000000000000000000000000000000000000000000000000008100520000000000000000000000000000000000000000000000000000000000000081105200000000000000000000000000000000000000000000000000000000000000812052000000000000000000000000000000000000000000000000000000000000008130520000000000000000000000000000000000000000000000000000000000000081405200000000000000000000000000000000000000000000000000000000000000815052000000000000000000000000000000000000000000000000000000000000008160520000000000000000000000000000000000000000000000000000000000000081705200000000000000000000000000000000000000000000000000000000000000818052000000000000000000000000000000000000000000000000000000000000008190520000000000000000000000000000000000000000000000000000000000000082005200000000000000000000000000000000000000000000000000000000000000821052000000000000000000000000000000000000000000000000000000000000008220520000000000000000000000000000000000000000000000000000000000000082305200000000000000000000000000000000000000000000000000000000000000824052000000000000000000000000000000000000000000000000000000000000008250520000000000000000000000000000000000000000000000000000000000000082605200000000000000000000000000000000000000000000000000000000000000827052000000000000000000000000000000000000000000000000000000000000008280520000000000000000000000000000000000000000000000000000000000000082905200000000000000000000000000000000000000000000000000000000000000830052000000000000000000000000000000000000000000000000000000000000008310520000000000000000000000000000000000000000000000000000000000000083205200000000000000000000000000000000000000000000000000000000000000833052000000000000000000000000000000000000000000000000000000000000008340520000000000000000000000000000000000000000000000000000000000000083505200000000000000000000000000000000000000000000000000000000000000836052000000000000000000000000000000000000000000000000000000000000008370520000000000000000000000000000000000000000000000000000000000000083805200000000000000000000000000000000000000000000000000000000000000839052000000000000000000000000000000000000000000000000000000000000008400520000000000000000000000000000000000000000000000000000000000000084105200000000000000000000000000000000000000000000000000000000000000842052000000000000000000000000000000000000000000000000000000000000008430520000000000000000000000000000000000000000000000000000000000000084405200000000000000000000000000000000000000000000000000000000000000845052000000000000000000000000000000000000000000000000000000000000008460520000000000000000000000000000000000000000000000000000000000000084705200000000000000000000000000000000000000000000000000000000000000848052000000000000000000000000000000000000000000000000000000000000008490520000000000000000000000000000000000000000000000000000000000000085005200000000000000000000000000000000000000000000000000000000000000851052000000000000000000000000000000000000000000000000000000000000008520520000000000000000000000000000000000000000000000000000000000000085305200000000000000000000000000000000000000000000000000000000000000854052000000000000000000000000000000000000000000000000000000000000008550520000000000000000000000000000000000000000000000000000000000000085605200000000000000000000000000000000000000000000000000000000000000857052000000000000000000000000000000000000000000000000000000000000008580520000000000000000000000000000000000000000000000000000000000000085905200000000000000000000000000000000000000000000000000000000000000860052000000000000000000000000000000000000000000000000000000000000008610520000000000000000000000000000000000000000000000000000000000000086205200000000000000000000000000000000000000000000000000000000000000863052000000000000000000000000000000000000000000000000000000000000008640520000000000000000000000000000000000000000000000000000000000000086505200000000000000000000000000000000000000000000000000000000000000866052000000000000000000000000000000000000000000000000000000000000008670520000000000000000000000000000000000000000000000000000000000000086805200000000000000000000000000000000000000000000000000000000000000869052000000000000000000000000000000000000000000000000000000000000008700520000000000000000000000000000000000000000000000000000000000000087105200000000000000000000000000000000000000000000000000000000000000872052000000000000000000000000000000000000000000000000000000000000008730520000000000000000000000000000000000000000000000000000000000000087405200000000000000000000000000000000000000000000000000000000000000875052000000000000000000000000000000000000000000000000000000000000008760520000000000000000000000000000000000000000000000000000000000000087705200000000000000000000000000000000000000000000000000000000000000878052000000000000000000000000000000000000000000000000000000000000008790520000000000000000000000000000000000000000000000000000000000000088005200000000000000000000000000000000000000000000000000000000000000881052000000000000000000000000000000000000000000000000000000000000008820520000000000000000000000000000000000000000000000000000000000000088305200000000000000000000000000000000000000000000000000000000000000884052000000000000000000000000000000000000000000000000000000000000008850520000000000000000000000000000000000000000000000000000000000000088605200000000000000000000000000000000000000000000000000000000000000887052000000000000000000000000000000000000000000000000000000000000008880520000000000000000000000000000000000000000000000000000000000000088905200000000000000000000000000000000000000000000000000000000000000890052000000000000000000000000000000000000000000000000000000000000008910520000000000000000000000000000000000000000000000000000000000000089205200000000000000000000000000000000000000000000000000000000000000893052000000000000000000000000000000000000000000000000000000000000008940520000000000000000000000000000000000000000000000000000000000000089505200000000000000000000000000000000000000000000000000000000000000896052000000000000000000000000000000000000000000000000000000000000008970520000000000000000000000000000000000000000000000000000000000000089805200000000000000000000000000000000000000000000000000000000000000899052000000000000000000000000000000000000000000000000000000000000009000520000000000000000000000000000000000000000000000000000000000000090105200000000000000000000000000000000000000000000000000000000000000902052000000000000000000000000000000000000000000000000000000000000009030520000000000000000000000000000000000000000000000000000000000000090405200000000000000000000000000000000000000000000000000000000000000905052000000000000000000000000000000000000000000000000000000000000009060520000000000000000000000000000000000000000000000000000000000000090705200000000000000000000000000000000000000000000000000000000000000908052000000000000000000000000000000000000000000000000000000000000009090520000000000000000000000000000000000000000000000000000000000000091005200000000000000000000000000000000000000000000000000000000000000911052000000000000000000000000000000000000000000000000000000000000009120520000000000000000000000000000000000000000000000000000000000000091305200000000000000000000000000000000000000000000000000000000000000914052000000000000000000000000000000000000000000000000000000000000009150520000000000000000000000000000000000000000000000000000000000000091605200000000000000000000000000000000000000000000000000000000000000917052000000000000000000000000000000000000000000000000000000000000009180520000000000000000000000000000000000000000000000000000000000000091905200000000000000000000000000000000000000000000000000000000000000920052000000000000000000000000000000000000000000000000000000000000009210520000000000000000000000000000000000000000000000000000000000000092205200000000000000000000000000000000000000000000000000000000000000923052000000000000000000000000000000000000000000000000000000000000009240520000000000000000000000000000000000000000000000000000000000000092505200000000000000000000000000000000000000000000000000000000000000926052000000000000000000000000000000000000000000000000000000000000009270520000000000000000000000000000000000000000000000000000000000000092805200000000000000000000000000000000000000000000000000000000000000929052000000000000000000000000000000000000000000000000000000000000009300520000000000000000000000000000000000000000000000000000000000000093105200000000000000000000000000000000000000000000000000000000000000932052000000000000000000000000000000000000000000000000000000000000009330520000000000000000000000000000000000000000000000000000000000000093405200000000000000000000000000000000000000000000000000000000000000935052000000000000000000000000000000000000000000000000000000000000009360520000000000000000000000000000000000000000000000000000000000000093705200000000000000000000000000000000000000000000000000000000000000938052000000000000000000000000000000000000000000000000000000000000009390520000000000000000000000000000000000000000000000000000000000000094005200000000000000000000000000000000000000000000000000000000000000941052000000000000000000000000000000000000000000000000000000000000009420520000000000000000000000000000000000000000000000000000000000000094305200000000000000000000000000000000000000000000000000000000000000944052000000000000000000000000000000000000000000000000000000000000009450520000000000000000000000000000000000000000000000000000000000000094605200000000000000000000000000000000000000000000000000000000000000947052000000000000000000000000000000000000000000000000000000000000009480520000000000000000000000000000000000000000000000000000000000000094905200000000000000000000000000000000000000000000000000000000000000950052000000000000000000000000000000000000000000000000000000000000009510520000000000000000000000000000000000000000000000000000000000000095205200000000000000000000000000000000000000000000000000000000000000953052000000000000000000000000000000000000000000000000000000000000009540520000000000000000000000000000000000000000000000000000000000000095505200000000000000000000000000000000000000000000000000000000000000956052000000000000000000000000000000000000000000000000000000000000009570520000000000000000000000000000000000000000000000000000000000000095805200000000000000000000000000000000000000000000000000000000000000959052000000000000000000000000000000000000000000000000000000000000009600520000000000000000000000000000000000000000000000000000000000000096105200000000000000000000000000000000000000000000000000000000000000962052000000000000000000000000000000000000000000000000000000000000009630520000000000000000000000000000000000000000000000000000000000000096405200000000000000000000000000000000000000000000000000000000000000965052000000000000000000000000000000000000000000000000000000000000009660520000000000000000000000000000000000000000000000000000000000000096705200000000000000000000000000000000000000000000000000000000000000968052000000000000000000000000000000000000000000000000000000000000009690520000000000000000000000000000000000000000000000000000000000000097005200000000000000000000000000000000000000000000000000000000000000971052000000000000000000000000000000000000000000000000000000000000009720520000000000000000000000000000000000000000000000000000000000000097305200000000000000000000000000000000000000000000000000000000000000974052000000000000000000000000000000000000000000000000000000000000009750520000000000000000000000000000000000000000000000000000000000000097605200000000000000000000000000000000000000000000000000000000000000977052000000000000000000000000000000000000000000000000000000000000009780520000000000000000000000000000000000000000000000000000000000000097905200000000000000000000000000000000000000000000000000000000000000980052000000000000000000000000000000000000000000000000000000000000009810520000000000000000000000000000000000000000000000000000000000000098205200000000000000000000000000000000000000000000000000000000000000983052000000000000000000000000000000000000000000000000000000000000009840520000000000000000000000000000000000000000000000000000000000000098505200000000000000000000000000000000000000000000000000000000000000986052000000000000000000000000000000000000000000000000000000000000009870520000000000000000000000000000000000000000000000000000000000000098805200000000000000000000000000000000000000000000000000000000000000989052000000000000000000000000000000000000000000000000000000000000009900520000000000000000000000000000000000000000000000000000000000000099105200000000000000000000000000000000000000000000000000000000000000992052000000000000000000000000000000000000000000000000000000000000009930520000000000000000000000000000000000000000000000000000000000000099405200000000000000000000000000000000000000000000000000000000000000995052000000000000000000000000000000000000000000000000000000000000009960520000000000000000000000000000000000000000000000000000000000000099705200000000000000000000000000000000000000000000000000000000000000998052000000000000000000000000000000000000000000000000000000000000009990520e57eb8d10b6eed36a88a464538f8fcedbba7b1a71d6ed52124f77b835807d0fd05201c53ca351e7f26f963ced56cf18f9ebee56535170171b72a0addb4e1613776850520636b8e5a599cfe0833dbe141dbc093d65e0a497451ac21415fbf03698587c7b905204ea21cad94a85adb252b0a76b9826c67d7c697ca386d201752e38f19ed92a223126170746f733a3a6d657461646174615f7630c201032003000000000000134552525f414c52454144595f50524553454e542c4164647265737320697320616c72656164792070726573656e7420696e207468652077686974656c6973742e2103000000000000134552525f4e4f5f535543485f41444452455353214e6f2073756368206164647265737320696e207468652077686974656c6973742e2203000000000000134552525f4e4f545f494e495449414c495a45441d57686974656c697374206973206e6f7420696e697469616c697a65642e000201090b010205020001040100051d0b0011050c020b02070321030907012707032900030e0701270a01110220031407002707032a000c030b030f000b013101380002010104010008b01f0b0011050c010b01070321030907012707032a000c030b030f000c020a020704310138000a020705310138000a020706310138000a020707310138000a020708310138000a020709310138000a02070a310138000a02070b310138000a02070c310138000a02070d310138000a02070e310138000a02070f310138000a020710310138000a020711310138000a020712310138000a020713310138000a020714310138000a020715310138000a020716310138000a020717310138000a020718310138000a020719310138000a02071a310138000a02071b310138000a02071c310138000a02071d310138000a02071e310138000a02071f310138000a020720310138000a020721310138000a020722310138000a020723310138000a020724310138000a020725310138000a020726310138000a020727310138000a020728310138000a020729310138000a02072a310138000a02072b310138000a02072c310138000a02072d310138000a02072e310138000a02072f310138000a020730310138000a020731310138000a020732310138000a020733310138000a020734310138000a020735310138000a020736310138000a020737310138000a020738310138000a020739310138000a02073a310138000a02073b310138000a02073c310138000a02073d310138000a02073e310138000a02073f310138000a020740310138000a020741310138000a020742310138000a020743310138000a020744310138000a020745310138000a020746310138000a020747310138000a020748310138000a020749310138000a02074a310138000a02074b310138000a02074c310138000a02074d310138000a02074e310138000a02074f310138000a020750310138000a020751310138000a020752310138000a020753310138000a020754310138000a020755310138000a020756310138000a020757310138000a020758310138000a020759310138000a02075a310138000a02075b310138000a02075c310138000a02075d310138000a02075e310138000a02075f310138000a020760310138000a020761310138000a020762310138000a020763310138000a020764310138000a020765310138000a020766310138000a020767310138000a020768310138000a020769310138000a02076a310138000a02076b310138000a02076c310138000a02076d310138000a02076e310138000a02076f310138000a020770310138000a020771310138000a020772310138000a020773310138000a020774310138000a020775310138000a020776310138000a020777310138000a020778310138000a020779310138000a02077a310138000a02077b310138000a02077c310138000a02077d310138000a02077e310138000a02077f310138000a02078001310138000a02078101310138000a02078201310138000a02078301310138000a02078401310138000a02078501310138000a02078601310138000a02078701310138000a02078801310138000a02078901310138000a02078a01310138000a02078b01310138000a02078c01310138000a02078d01310138000a02078e01310138000a02078f01310138000a02079001310138000a02079101310138000a02079201310138000a02079301310138000a02079401310138000a02079501310138000a02079601310138000a02079701310138000a02079801310138000a02079901310138000a02079a01310138000a02079b01310138000a02079c01310138000a02079d01310138000a02079e01310138000a02079f01310138000a0207a001310138000a0207a101310138000a0207a201310138000a0207a301310138000a0207a401310138000a0207a501310138000a0207a601310138000a0207a701310138000a0207a801310138000a0207a901310138000a0207aa01310138000a0207ab01310138000a0207ac01310138000a0207ad01310138000a0207ae01310138000a0207af01310138000a0207b001310138000a0207b101310138000a0207b201310138000a0207b301310138000a0207b401310138000a0207b501310138000a0207b601310138000a0207b701310138000a0207b801310138000a0207b901310138000a0207ba01310138000a0207bb01310138000a0207bc01310138000a0207bd01310138000a0207be01310138000a0207bf01310138000a0207c001310138000a0207c101310138000a0207c201310138000a0207c301310138000a0207c401310138000a0207c501310138000a0207c601310138000a0207c701310138000a0207c801310138000a0207c901310138000a0207ca01310138000a0207cb01310138000a0207cc01310138000a0207cd01310138000a0207ce01310138000a0207cf01310138000a0207d001310138000a0207d101310138000a0207d201310138000a0207d301310138000a0207d401310138000a0207d501310138000a0207d601310138000a0207d701310138000a0207d801310138000a0207d901310138000a0207da01310138000a0207db01310138000a0207dc01310138000a0207dd01310138000a0207de01310138000a0207df01310138000a0207e001310138000a0207e101310138000a0207e201310138000a0207e301310138000a0207e401310138000a0207e501310138000a0207e601310138000a0207e701310138000a0207e801310138000a0207e901310138000a0207ea01310138000a0207eb01310138000a0207ec01310138000a0207ed01310138000a0207ee01310138000a0207ef01310138000a0207f001310138000a0207f101310138000a0207f201310138000a0207f301310138000a0207f401310138000a0207f501310138000a0207f601310138000a0207f701310138000a0207f801310138000a0207f901310138000a0207fa01310138000a0207fb01310138000a0207fc01310138000a0207fd01310138000a0207fe01310138000a0207ff01310138000a02078002310138000a02078102310138000a02078202310138000a02078302310138000a02078402310138000a02078502310138000a02078602310138000a02078702310138000a02078802310138000a02078902310138000a02078a02310138000a02078b02310138000a02078c02310138000a02078d02310138000a02078e02310138000a02078f02310138000a02079002310138000a02079102310138000a02079202310138000a02079302310138000a02079402310138000a02079502310138000a02079602310138000a02079702310138000a02079802310138000a02079902310138000a02079a02310138000a02079b02310138000a02079c02310138000a02079d02310138000a02079e02310138000a02079f02310138000a0207a002310138000a0207a102310138000a0207a202310138000a0207a302310138000a0207a402310138000a0207a502310138000a0207a602310138000a0207a702310138000a0207a802310138000a0207a902310138000a0207aa02310138000a0207ab02310138000a0207ac02310138000a0207ad02310138000a0207ae02310138000a0207af02310138000a0207b002310138000a0207b102310138000a0207b202310138000a0207b302310138000a0207b402310138000a0207b502310138000a0207b602310138000a0207b702310138000a0207b802310138000a0207b902310138000a0207ba02310138000a0207bb02310138000a0207bc02310138000a0207bd02310138000a0207be02310138000a0207bf02310138000a0207c002310138000a0207c102310138000a0207c202310138000a0207c302310138000a0207c402310138000a0207c502310138000a0207c602310138000a0207c702310138000a0207c802310138000a0207c902310138000a0207ca02310138000a0207cb02310138000a0207cc02310138000a0207cd02310138000a0207ce02310138000a0207cf02310138000a0207d002310138000a0207d102310138000a0207d202310138000a0207d302310138000a0207d402310138000a0207d502310138000a0207d602310138000a0207d702310138000a0207d802310138000a0207d902310138000a0207da02310138000a0207db02310138000a0207dc02310138000a0207dd02310138000a0207de02310138000a0207df02310138000a0207e002310138000a0207e102310138000a0207e202310138000a0207e302310138000a0207e402310138000a0207e502310138000a0207e602310138000a0207e702310138000a0207e802310138000a0207e902310138000a0207ea02310138000a0207eb02310138000a0207ec02310138000a0207ed02310138000a0207ee02310138000a0207ef02310138000a0207f002310138000a0207f102310138000a0207f202310138000a0207f302310138000a0207f402310138000a0207f502310138000a0207f602310138000a0207f702310138000a0207f802310138000a0207f902310138000a0207fa02310138000a0207fb02310138000a0207fc02310138000a0207fd02310138000a0207fe02310138000a0207ff02310138000a02078003310138000a02078103310138000a02078203310138000a02078303310138000a02078403310138000a02078503310138000a02078603310138000a02078703310138000a02078803310138000a02078903310138000a02078a03310138000a02078b03310138000a02078c03310138000a02078d03310138000a02078e03310138000a02078f03310138000a02079003310138000a02079103310138000a02079203310138000a02079303310138000a02079403310138000a02079503310138000a02079603310138000a02079703310138000a02079803310138000a02079903310138000a02079a03310138000a02079b03310138000a02079c03310138000a02079d03310138000a02079e03310138000a02079f03310138000a0207a003310138000a0207a103310138000a0207a203310138000a0207a303310138000a0207a403310138000a0207a503310138000a0207a603310138000a0207a703310138000a0207a803310138000a0207a903310138000a0207aa03310138000a0207ab03310138000a0207ac03310138000a0207ad03310138000a0207ae03310138000a0207af03310138000a0207b003310138000a0207b103310138000a0207b203310138000a0207b303310138000a0207b403310138000a0207b503310138000a0207b603310138000a0207b703310138000a0207b803310138000a0207b903310138000a0207ba03310138000a0207bb03310138000a0207bc03310138000a0207bd03310138000a0207be03310138000a0207bf03310138000a0207c003310138000a0207c103310138000a0207c203310138000a0207c303310138000a0207c403310138000a0207c503310138000a0207c603310138000a0207c703310138000a0207c803310138000a0207c903310138000a0207ca03310138000a0207cb03310138000a0207cc03310138000a0207cd03310138000a0207ce03310138000a0207cf03310138000a0207d003310138000a0207d103310138000a0207d203310138000a0207d303310138000a0207d403310138000a0207d503310138000a0207d603310138000a0207d703310138000a0207d803310138000a0207d903310138000a0207da03310138000a0207db03310138000a0207dc03310138000a0207dd03310138000a0207de03310138000a0207df03310138000a0207e003310138000a0207e103310138000a0207e203310138000a0207e303310138000a0207e403310138000a0207e503310138000a0207e603310138000a0207e703310138000a0207e803310138000a0207e903310138000a0207ea03310138000a0207eb03310138000a0207ec03310138000a0207ed03310138000a0207ee03310138000a0207ef03310138000a0207f003310138000a0207f103310138000a0207f203310138000a0207f303310138000a0207f403310138000a0207f503310138000a0207f603310138000a0207f703310138000a0207f803310138000a0207f903310138000a0207fa03310138000a0207fb03310138000a0207fc03310138000a0207fd03310138000a0207fe03310138000a0207ff03310138000a02078004310138000a02078104310138000a02078204310138000a02078304310138000a02078404310138000a02078504310138000a02078604310138000a02078704310138000a02078804310138000a02078904310138000a02078a04310138000a02078b04310138000a02078c04310138000a02078d04310138000a02078e04310138000a02078f04310138000a02079004310138000a02079104310138000a02079204310138000a02079304310138000a02079404310138000a02079504310138000a02079604310138000a02079704310138000a02079804310138000a02079904310138000a02079a04310138000a02079b04310138000a02079c04310138000a02079d04310138000a02079e04310138000a02079f04310138000a0207a004310138000a0207a104310138000a0207a204310138000a0207a304310138000a0207a404310138000a0207a504310138000a0207a604310138000a0207a704310138000a0207a804310138000a0207a904310138000a0207aa04310138000a0207ab04310138000a0207ac04310138000a0207ad04310138000a0207ae04310138000a0207af04310138000a0207b004310138000a0207b104310138000a0207b204310138000a0207b304310138000a0207b404310138000a0207b504310138000a0207b604310138000a0207b704310138000a0207b804310138000a0207b904310138000a0207ba04310138000a0207bb04310138000a0207bc04310138000a0207bd04310138000a0207be04310138000a0207bf04310138000a0207c004310138000a0207c104310138000a0207c204310138000a0207c304310138000a0207c404310138000a0207c504310138000a0207c604310138000a0207c704310138000a0207c804310138000a0207c904310138000a0207ca04310138000a0207cb04310138000a0207cc04310138000a0207cd04310138000a0207ce04310138000a0207cf04310138000a0207d004310138000a0207d104310138000a0207d204310138000a0207d304310138000a0207d404310138000a0207d504310138000a0207d604310138000a0207d704310138000a0207d804310138000a0207d904310138000a0207da04310138000a0207db04310138000a0207dc04310138000a0207dd04310138000a0207de04310138000a0207df04310138000a0207e004310138000a0207e104310138000a0207e204310138000a0207e304310138000a0207e404310138000a0207e504310138000a0207e604310138000a0207e704310138000a0207e804310138000a0207e904310138000a0207ea04310138000a0207eb04310138000a0207ec04310138000a0207ed04310138000a0207ee04310138000a0207ef04310138000a0207f004310138000a0207f104310138000a0207f204310138000a0207f304310138000a0207f404310138000a0207f504310138000a0207f604310138000a0207f704310138000a0207f804310138000a0207f904310138000a0207fa04310138000a0207fb04310138000a0207fc04310138000a0207fd04310138000a0207fe04310138000a0207ff04310138000a02078005310138000a02078105310138000a02078205310138000a02078305310138000a02078405310138000a02078505310138000a02078605310138000a02078705310138000a02078805310138000a02078905310138000a02078a05310138000a02078b05310138000a02078c05310138000a02078d05310138000a02078e05310138000a02078f05310138000a02079005310138000a02079105310138000a02079205310138000a02079305310138000a02079405310138000a02079505310138000a02079605310138000a02079705310138000a02079805310138000a02079905310138000a02079a05310138000a02079b05310138000a02079c05310138000a02079d05310138000a02079e05310138000a02079f05310138000a0207a005310138000a0207a105310138000a0207a205310138000a0207a305310138000a0207a405310138000a0207a505310138000a0207a605310138000a0207a705310138000a0207a805310138000a0207a905310138000a0207aa05310138000a0207ab05310138000a0207ac05310138000a0207ad05310138000a0207ae05310138000a0207af05310138000a0207b005310138000a0207b105310138000a0207b205310138000a0207b305310138000a0207b405310138000a0207b505310138000a0207b605310138000a0207b705310138000a0207b805310138000a0207b905310138000a0207ba05310138000a0207bb05310138000a0207bc05310138000a0207bd05310138000a0207be05310138000a0207bf05310138000a0207c005310138000a0207c105310138000a0207c205310138000a0207c305310138000a0207c405310138000a0207c505310138000a0207c605310138000a0207c705310138000a0207c805310138000a0207c905310138000a0207ca05310138000a0207cb05310138000a0207cc05310138000a0207cd05310138000a0207ce05310138000a0207cf05310138000a0207d005310138000a0207d105310138000a0207d205310138000a0207d305310138000a0207d405310138000a0207d505310138000a0207d605310138000a0207d705310138000a0207d805310138000a0207d905310138000a0207da05310138000a0207db05310138000a0207dc05310138000a0207dd05310138000a0207de05310138000a0207df05310138000a0207e005310138000a0207e105310138000a0207e205310138000a0207e305310138000a0207e405310138000a0207e505310138000a0207e605310138000a0207e705310138000a0207e805310138000a0207e905310138000a0207ea05310138000a0207eb05310138000a0207ec05310138000a0207ed05310138000a0207ee05310138000a0207ef05310138000a0207f005310138000a0207f105310138000a0207f205310138000a0207f305310138000a0207f405310138000a0207f505310138000a0207f605310138000a0207f705310138000a0207f805310138000a0207f905310138000a0207fa05310138000a0207fb05310138000a0207fc05310138000a0207fd05310138000a0207fe05310138000a0207ff05310138000a02078006310138000a02078106310138000a02078206310138000a02078306310138000a02078406310138000a02078506310138000a02078606310138000a02078706310138000a02078806310138000a02078906310138000a02078a06310138000a02078b06310138000a02078c06310138000a02078d06310138000a02078e06310138000a02078f06310138000a02079006310138000a02079106310138000a02079206310138000a02079306310138000a02079406310138000a02079506310138000a02079606310138000a02079706310138000a02079806310138000a02079906310138000a02079a06310138000a02079b06310138000a02079c06310138000a02079d06310138000a02079e06310138000a02079f06310138000a0207a006310138000a0207a106310138000a0207a206310138000a0207a306310138000a0207a406310138000a0207a506310138000a0207a606310138000a0207a706310138000a0207a806310138000a0207a906310138000a0207aa06310138000a0207ab06310138000a0207ac06310138000a0207ad06310138000a0207ae06310138000a0207af06310138000a0207b006310138000a0207b106310138000a0207b206310138000a0207b306310138000a0207b406310138000a0207b506310138000a0207b606310138000a0207b706310138000a0207b806310138000a0207b906310138000a0207ba06310138000a0207bb06310138000a0207bc06310138000a0207bd06310138000a0207be06310138000a0207bf06310138000a0207c006310138000a0207c106310138000a0207c206310138000a0207c306310138000a0207c406310138000a0207c506310138000a0207c606310138000a0207c706310138000a0207c806310138000a0207c906310138000a0207ca06310138000a0207cb06310138000a0207cc06310138000a0207cd06310138000a0207ce06310138000a0207cf06310138000a0207d006310138000a0207d106310138000a0207d206310138000a0207d306310138000a0207d406310138000a0207d506310138000a0207d606310138000a0207d706310138000a0207d806310138000a0207d906310138000a0207da06310138000a0207db06310138000a0207dc06310138000a0207dd06310138000a0207de06310138000a0207df06310138000a0207e006310138000a0207e106310138000a0207e206310138000a0207e306310138000a0207e406310138000a0207e506310138000a0207e606310138000a0207e706310138000a0207e806310138000a0207e906310138000a0207ea06310138000a0207eb06310138000a0207ec06310138000a0207ed06310138000a0207ee06310138000a0207ef06310138000a0207f006310138000a0207f106310138000a0207f206310138000a0207f306310138000a0207f406310138000a0207f506310138000a0207f606310138000a0207f706310138000a0207f806310138000a0207f906310138000a0207fa06310138000a0207fb06310138000a0207fc06310138000a0207fd06310138000a0207fe06310138000a0207ff06310138000a02078007310138000a02078107310138000a02078207310138000a02078307310138000a02078407310138000a02078507310138000a02078607310138000a02078707310138000a02078807310138000a02078907310138000a02078a07310138000a02078b07310138000a02078c07310138000a02078d07310138000a02078e07310138000a02078f07310138000a02079007310138000a02079107310138000a02079207310138000a02079307310138000a02079407310138000a02079507310138000a02079607310138000a02079707310138000a02079807310138000a02079907310138000a02079a07310138000a02079b07310138000a02079c07310138000a02079d07310138000a02079e07310138000a02079f07310138000a0207a007310138000a0207a107310138000a0207a207310138000a0207a307310138000a0207a407310138000a0207a507310138000a0207a607310138000a0207a707310138000a0207a807310138000a0207a907310138000a0207aa07310138000a0207ab07310138000a0207ac07310138000a0207ad07310138000a0207ae07310138000a0207af07310138000a0207b007310138000a0207b107310138000a0207b207310138000a0207b307310138000a0207b407310138000a0207b507310138000a0207b607310138000a0207b707310138000a0207b807310138000a0207b907310138000a0207ba07310138000a0207bb07310138000a0207bc07310138000a0207bd07310138000a0207be07310138000a0207bf07310138000a0207c007310138000a0207c107310138000a0207c207310138000a0207c307310138000a0207c407310138000a0207c507310138000a0207c607310138000a0207c707310138000a0207c807310138000a0207c907310138000a0207ca07310138000a0207cb07310138000a0207cc07310138000a0207cd07310138000a0207ce07310138000a0207cf07310138000a0207d007310138000a0207d107310138000a0207d207310138000a0207d307310138000a0207d407310138000a0207d507310138000a0207d607310138000a0207d707310138000a0207d807310138000a0207d907310138000a0207da07310138000a0207db07310138000a0207dc07310138000a0207dd07310138000a0207de07310138000a0207df07310138000a0207e007310138000a0207e107310138000a0207e207310138000a0207e307310138000a0207e407310138000a0207e507310138000a0207e607310138000a0207e707310138000a0207e807310138000a0207e907310138000a0207ea07310138000b0207eb0731013800020201000100090807032b000c010b0110000b00380102030100000b1f38020c010d0107ec07310138000d0107ed07310138000d0107ee07310138000d0107ef07310138000d01071a310138000d01071b310138000b000b0112002d00020401040100051c0b0011050c020b02070321030907012707032900030e0701270a011102031307022707032a000c030b030f000b0138030102000000";
+    let res = run_binary_test("sample_whitelist", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[cfg(feature = "address32")]
+#[test]
+fn sample_coin_store() {
+    let code = "a11ceb0b050000000e01001e021e0c032acb0604f5065405c907a41207ed19e80908d523800206d5252c108126420ac326090bcc26040cd026fd86010dcdad01020ecfad01040000010101020103020402050306030704080509050a0607060b070c070d000e08010001011104010001000f00010200000010010201000012030101000013040103000000001404010300000000150401030000000016040103000000001704010300000000180401030000000019040103000000001a040103000000001b040103000000001c040103000000001d040103000000001e040103000000001f0401030000000020040103000000002104010300000000220401030000000023040103000000002404010300000000250401030000000026040103000000002704010300000000280401030000000029040103000000002a040103000000002b040103000000002c040103000000002d040103000000002e040103000000002f0401030000000030040103000000003104010300000000320401030000000033050103000000003405010300000000350501030000000036050103000000003705010300000000380501030000000039050103000000003a050103000000003b050103000000003c050103000000003d050103000000003e050103000000003f0501030000000040050103000000004105010300000000420501030000000043050103000000004405010300000000450501030000000046050103000000004705010300000000480501030000000049050103000000004a050103000000004b050103000000004c050103000000004d050103000000004e050103000000004f050103000000005005010300000000510601010000520701010000530801010000540901020000005509010200000056000102000000570a010200000058070102000000590a01020000005a0b01020000005b0001020000005c0c0103000000005d0c01020000005e0c01020000005f0701010000600701010000610201010000620701010000630d01010000640e010100006502030100006601030100006702030100016810020100016911010100096a0114020000046b0100020000016c16030100016d01030100090b1819020000040b1a1b020000016e030101000c6f011d0200000b70031e020000066b0100030000000771221e030000000872010202000008730102020000087424000200000e6a01140200000d0b261e020000037508400002760202000165070301000477014200057801430200000a790100020000060b1a1b03000000011226010100017a48030100580f590f5a135a155b135c0f5d175e135e1559175d0f5f155f136017611361156215600f6320632164216513661366156515671568136815691562136420671369136c0f6e136f135c17702070215817710f720f020303000103010b010109000d030403040404010101010404040d0304030404010101010404040402060c0b0101090002060c0301060c0b030403040404010104040403060c030304060c0303010a060c03040403030404010102050303060c050301090001060b0101090002070b010109000b01010900230b010109000b010109010403040b010109000403040404040b010109010403030304040b010109000b010109000b01010901070b00010900040404040b010109000b010109000b0101090104040b0101090104040209000901020404020901090002070b0101090003010901040b01010900040b0101090104040b010109000b010109010b010109000b01010901040b01010900030b0101090103020b010109000b01010901250303030403040b010109000403040404040b0101090103030304040b010109000b010109010b01010900070b000109000404040b010109000b0101090003040404030b0101090104030403030303010b0101090122040303040b010109000403040404040b0101090103030304040b010109000b010109000b01010901070b000109000404040b0101090003040b010109000404030b0101090104040309000901090203090109000902020b010109000323040404040b010109000403040404040b0101090103030304040b010109000b010109000b01010901070b000109000404050b01010900040b010109000b01010901040b0101090004040b0101090104040805070b01010900070b01010901030301040423040404040b010109000403040404040b0101090103030304040b010109000b010109010b01010900070b00010900040405040b0101090004040b010109000404040b01010901040402050b01010900240403040403040404040403030304040b010109000b010109010b01010900070b000109000b0101090104040504040b010109010b010109000b01010900040b01010900040b010109010b0101090104040b01010900200303030403030404030404040403030304040b010109000b010109010b01010900070b000109000b010109010404030b01010900040303040b010109001d040303030404030404040403030304040b010109000b010109010b01010900070b000109000b01010901040403040b0101090003040b010109001e040404030404030404040403030304040b010109000b010109010b01010900070b000109000b010109010404050b01010900040b010109000b01010901040b010109001e040404030404030404040403030304040b010109000b010109010b01010900070b000109000b0101090104040504040b0101090004040b010109002603030304030403040404040403030304040b010109010b01010900070b00010900040405030b010109000b0101090104040b01010900040b01010900030b01010901040b01010901040304200303030b010109000b010109010403030403040404040403030304040b010109010b01010900070b000109000404030b010109000b01010901040303041d0303030403030304030404040403030304040b01010900070b0001090004040303040303030421030303040404030404030404040403030304040b010109010b01010900070b000109000404050b01010900030b010109000b01010901040303041f0303030404040304030404040403030304040b010109010b01010900070b0001090004040503040403040304230403030403040404040403030304040b010109000b01010901070b0001090004040503040b01010901040b010109000b01010900040b01010900030b01010901040b0101090104041d0b010109000b01010901040303030403040404040403030304040b010109000b01010901070b00010900040403040b010109000b0101090103041e04040403030404030404040403030304040b010109000b01010901070b000109000404050b0101090003040b010109000b0101090103041c040404030304030404040403030304040b010109000b01010901070b00010900040405030404030404240404040403040404040403030304040b010109000b010109000b01010901070b000109000404050b01010901040b01010901040b010109010b010109000b01010900040b01010900040b010109010b0101090104041f04040b010109000b0101090104030403040404040403030304040b010109000b010109000b01010901070b000109000404050b01010901040b010109010b010109000b0101090104200404030303040304030404040403030304040b010109000b01010900070b000109000404050b01010901030b010109010b01010900040303041d040404030304030404040403030304040b010109000b01010900070b000109000404050b0101090103040b010109010b0101090003041e040404040404030404040403030304040b010109000b010109010b01010900070b000109000404050b01010901040b01010900040b010109010404240404040403040404040403030304040b010109000b010109000b01010901070b00010900040405040b010109000b0101090104040b01010900040b01010900040b01010901040b0101090104041f04040b010109000b0101090104030403040404040403030304040b010109000b010109000b01010901070b0001090004040504040b010109000b0101090104041f0404030303040304030404040403030304040b010109000b01010900070b00010900040405040304040303041c040404030304030404040403030304040b010109000b01010900070b000109000404050403040403041f04040404040404030404040403030304040b010109000b010109000b01010901070b000109000404050b01010900040b010109000b01010901040404010b0001090001050d05030403070b000109000b01010901040b01010900040303030b01010900040302010101011a0504040404070b00010900070b000109010404030303030b01010901040404040b010109000b010109000b010109000b010109000b010109010b010109010b010109010b010109010f03030305040404030b010109010b01010901040b0101090003030b010109000e04040305040404030b010109000b01010901040b010109010b010109010b010109000f030303030305040404030b010109010403030301070b01010900030b0101090003070b000109000a636f696e5f73746f726504636f696e056572726f72067369676e65720f416e696d6553776170506f6f6c563116416e696d6553776170506f6f6c56314c6962726172790e6c69717569646974795f706f6f6c06726f7574657203616d6d09546f6b656e537761700f546f6b656e53776170436f6e66696704737761700a616d6d5f726f7574657208616d6d5f737761700b4d79436f696e53746f726512616e696d65737761705f73746172737761700762616c616e636504436f696e076465706f736974066c3073307431066c3073317430066c3173307431066c3173307432066c3173307433066c3173307434066c3173307435066c3173317430066c3173317432066c3173317433066c3173317434066c3173317435066c3173327430066c3173327431066c3173327433066c3173327434066c3173327435066c3173337430066c3173337431066c3173337432066c3173337434066c3173337435066c3173347430066c3173347431066c3173347432066c3173347433066c3173347435066c3173357430066c3173357431066c3173357432066c3173357433066c3173357434066c3273307431066c3273307432066c3273307433066c3273307434066c3273307435066c3273317430066c3273317432066c3273317433066c3273317434066c3273317435066c3273327430066c3273327431066c3273327433066c3273327434066c3273327435066c3273337430066c3273337431066c3273337432066c3273337434066c3273337435066c3273347430066c3273347431066c3273347432066c3273347433066c3273347435066c3273357430066c3273357431066c3273357432066c3273357433066c3273357434036e65770d6e65775f66726f6d5f6d61696e0d6e65775f66726f6d5f7a65726f047330743104733174301073696d706c655f616e696d65737761701373696d706c655f616e696d65737761705f76320f73696d706c655f73746172737761701273696d706c655f73746172737761705f76321273696d706c655f73746172737761705f76331273746172737761705f616e696d657377617012737761705f61625f6c69717569647377617008737761705f61757810737761705f70616e63616b6573776170127472616e736665725f66726f6d5f6d61696e197472616e736665725f66726f6d5f6d61696e5f736372697074107472616e736665725f746f5f6d61696e177472616e736665725f746f5f6d61696e5f736372697074117472616e736665725f746f5f6f74686572187472616e736665725f746f5f6f746865725f7363726970740877697468647261770c77697468647261775f616c6c0c77697468647261775f616e790576616c7565056d657267650c6765745f7265736572766573116765745f72657365727665735f73697a650765787472616374047a65726f0c64657374726f795f7a65726f0e746f6b656e5f726573657276657321737761705f65786163745f785f746f5f795f6469726563745f65787465726e616c18737761705f65786163745f636f696e5f666f725f636f696e04785f617504795f61751c737761705f65786163745f636f696e5f666f725f636f696e5f6d75740a616464726573735f6f66117065726d697373696f6e5f64656e6965640e6765745f61646d696e5f6461746107636f6d70617265116765745f706f756e646167655f726174650b657874726163745f616c6cd1b58e44ea11ffd326a280c453b080fd8af294298815a00e65b6e2bffc48d6ac000000000000000000000000000000000000000000000000000000000000000116fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c190d44266241744264b964a37b8f09863167a12d3e70cda39376cfb4e3561e12bd35135844473187163ca197ca93b2ab014370587bb0ed3befff9e902d6bb541c755e4c8d7a6ab6d56f9289d97c43c1c94bde75ec09147c90d35cd1be61c8fb9c7efb4076dbe143cbcd98cfaaa929ecfc8f299203dfff63b95ccb6bfe19850faec42a352cc65eca17a9fa85d0fc602295897ed6b8b8af6a6c79ef490eb8f9eba0308915f0100000000000520d1b58e44ea11ffd326a280c453b080fd8af294298815a00e65b6e2bffc48d6ac126170746f733a3a6d657461646174615f76302e01915f010000000000234552524f525f5448455f4f55545055545f4c4553535f5448414e5f4d494e5f5245435600000201010b01010900000f001700010400010206ffffffffffffffff270101000100010507013c0037003800020201000100010607013c0036000b0038010203010400010206ffffffffffffffff2704010400010206ffffffffffffffff2705010400010206ffffffffffffffff2706010400010206ffffffffffffffff2707010400010206ffffffffffffffff2708010400010206ffffffffffffffff2709010400010206ffffffffffffffff270a010400010206ffffffffffffffff270b010400010206ffffffffffffffff270c010400010206ffffffffffffffff270d010400010206ffffffffffffffff270e010400010206ffffffffffffffff270f010400010206ffffffffffffffff2710010400010206ffffffffffffffff2711010400010206ffffffffffffffff2712010400010206ffffffffffffffff2713010400010206ffffffffffffffff2714010400010206ffffffffffffffff2715010400010206ffffffffffffffff2716010400010206ffffffffffffffff2717010400010206ffffffffffffffff2718010400010206ffffffffffffffff2719010400010206ffffffffffffffff271a010400010206ffffffffffffffff271b010400010206ffffffffffffffff271c010400010206ffffffffffffffff271d010400010206ffffffffffffffff271e010400010206ffffffffffffffff271f010400010206ffffffffffffffff2720010400010206ffffffffffffffff2721010400010206ffffffffffffffff2722010400010206ffffffffffffffff27230104010012f1010b05040638020c2c0c26050d38030c2b0c2e0b2b0c260b2e0c2c0b260b2c0c180c1738040c10350b10350c1f0c1e0a0432000000000000000000000000000000002104660a180a0c180a0a1a0a1f160c110a170a1f180a111a0c0f0a1e0a18180a0c180a0a1a0b111a0c110a0f0a11180a0b180a091a0c2f0a0f0a11180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2f23045e054d0a270c2f0a0f0a11180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c2705480b2f0b0f170a0b180a091a0c040a040b0b180c150b170b09180a15160c240b150b18180b241a320b000000000000000000000000000000170c130a130b0c180c160b1f0b0a180a16160c250b160b1e180b251a320b000000000000000000000000000000170c1a0a1a0a04170b0317010b04340c1407013c000c230a23370038000c1b0a2336000b1438050c200b0804ab010b200b133806320000000000000000000000000000000038070c190c120c2d0c2805b401380632000000000000000000000000000000000b200b1338080c120c190c280c2d0d280b1238010d2d0b1938090b2d0c220a2336000b283801380a0c290b0704cd010b220600000000000000000b290b1a34380b0c0d0c0e05d5010b290b1a340b22060000000000000000380c0c0e0c0d0b0e0b0d0c210c2a0a2336000b2138010b1b0b02160c1c0b23370038000c1d0a1d0a1c2404ea0105ee010b1c0b1d17270b2a380d0224010401001cef010b05040638020c2c0c26050d38030c2b0c2f0b2b0c260b2f0c2c0b260b2c0c190c180b060418380e0c0f0c0e0c0d0522380f0c300c290c2d0b290b2d0b300c0f0c0e0c0d0b0d0b0e0b0f010c11350b11350c1f0c1e0a04320000000000000000000000000000000021047a0a190a0c180a0a1a0a1f160c120a180a1f180a121a0c100a1e0a19180a0c180a0a1a0b121a0c120a100a12180a0b180a091a0c310a100a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c2a0a2a0a3123047205610a2a0c310a100a12180a0b180a091a0a2a1a0b2a1632020000000000000000000000000000001a0c2a055c0b310b10170a0b180a091a0c040a040b0b180c160b180b09180a16160c240b160b19180b241a320b000000000000000000000000000000170c140a140b0c180c170b1f0b0a180a17160c250b170b1e180b251a320b000000000000000000000000000000170a04170b0317010b04340c1507013c000c230a23370038000c1b0a2336000b1538050c200b0804bd010b200b143806320000000000000000000000000000000038070c1a0c130c2e0c2705c601380632000000000000000000000000000000000b200b1438080c130c1a0c270c2e0d270b1338010d2e0b1a38090b2e0c210a2336000b273801380a0c280b2138100c220a2336000b2238010b1b0b02160c1c0b23370038000c1d0a1d0a1c2404e80105ec010b1c0b1d17270b2838110225010401001fe8010b05040638020c2a0c24050d38030c290c2d0b290c240b2d0c2a0b240b2a0c170c160b06041738120c0f0c0e051e38130c260c2b0b260c0e0b2b0c0f0b0e350b0f350c1d0c1c0a0432000000000000000000000000000000002104720a170a0c180a0a1a0a1d160c100a160a1d180a101a0c0d0a1c0a17180a0c180a0a1a0b101a0c100a0d0a10180a0b180a091a0c2e0a0d0a10180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2e23046a05590a270c2e0a0d0a10180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c2705540b2e0b0d170a0b180a091a0c040a040b0b180c140b160b09180a14160c220b140b17180b221a320b000000000000000000000000000000170c120a120b0c180c150b1d0b0a180a15160c230b150b1c180b231a320b000000000000000000000000000000170a04170b0317010b04340c1307013c000c210a21370038000c190a2136000b1338050c1e0b0804b5010b1e0b123806320000000000000000000000000000000038070c180c110c2c0c2805be01380632000000000000000000000000000000000b1e0b1238080c110c180c280c2c0d280b1138010d2c0b1838090b2c0c200a2136000b283801380a0c250b2006000000000000000038140c1f0a2136000b1f38010b190b02160c1a0b21370038000c1b0a1b0a1a2404e10105e5010b1a0b1b17270b25381102260104010023f8010b05040638020c2c0c26050d38030c2b0c2e0b2b0c260b2e0c2c0b260b2c0c170c160b06041a3815353816350c0e0c0d05203817353818350c0e0c0d0b0d0b0e0c1d0c1c0a0432000000000000000000000000000000002104720a170a0c180a0a1a0a1d160c100a160a1d180a101a0c0f0a1c0a17180a0c180a0a1a0b101a0c100a0f0a10180a0b180a091a0c2f0a0f0a10180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c290a290a2f23046a05590a290c2f0a0f0a10180a0b180a091a0a291a0b291632020000000000000000000000000000001a0c2905540b2f0b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c220b140b17180b221a320b000000000000000000000000000000170c120a120b0c180c150b1d0b0a180a15160c230b150b1c180b231a320b000000000000000000000000000000170a04170b0317010b04340c1307010c240a243c000c210a21370038000c190a2136000b1338050c1e0b0804b7010b1e0a123806320000000000000000000000000000000038070c180c110c2d0c2a05c001380632000000000000000000000000000000000b1e0a1238080c110c180c2a0c2d0d2a0b1138010d2d0b1838090b2d0c200a2136000b2a3801380a0c270b240d200d270b12340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381901010b270c250b200c280b250c1f0a2136000b1f38010b190b02160c1a0b21370038000c1b0a1b0a1a2404f10105f5010b1a0b1b17270b28380d02270104010025e8010b05040638020c2b0c25050d38030c2a0c2e0b2a0c250b2e0c2b0b250b2b0c170c160b060417381a0c0e0c0d051e381b0c270c2c0b270b2c0c0e0c0d0b0d0b0e0c1d0c1c0a0432000000000000000000000000000000002104700a170a0c180a0a1a0a1d160c100a160a1d180a101a0c0f0a1c0a17180a0c180a0a1a0b101a0c100a0f0a10180a0b180a091a0c2f0a0f0a10180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c280a280a2f23046805570a280c2f0a0f0a10180a0b180a091a0a281a0b281632020000000000000000000000000000001a0c2805520b2f0b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c220b140b17180b221a320b000000000000000000000000000000170c120a120b0c180c150b1d0b0a180a15160c230b150b1c180b231a320b000000000000000000000000000000170a04170b0317010b04340c1307010c240a243c000c210a21370038000c190a2136000b1338050c1e0b0804b5010b1e0b123806320000000000000000000000000000000038070c180c110c2d0c2905be01380632000000000000000000000000000000000b1e0b1238080c110c180c290c2d0d290b1138010d2d0b1838090b2d0c1f0a2136000b293801380a0c260b240b1f381c0c200a2136000b2038010b190b02160c1a0b21370038000c1b0a1b0a1a2404e10105e5010b1a0b1b17270b26381102280104010027f20138040c0e350b0e350c150c140b06040d38020c2b0c24051438030c290c2e0b290c240b2e0c2b0b240b2b0c1b0c1a0a0432000000000000000000000000000000002104660a150a0c180a0a1a0a1b160c0f0a140a1b180a0f1a0c0d0a1a0a15180a0c180a0a1a0b0f1a0c0f0a0d0a0f180a0b180a091a0c2f0a0d0a0f180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2f23045e054d0a250c2f0a0d0a0f180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c2505480b2f0b0d170a0b180a091a0c040a040b0b180c120b140b09180a12160c210b120b15180b211a320b000000000000000000000000000000170c100a100b0c180c130b1b0b0a180a13160c220b130b1a180b221a320b000000000000000000000000000000170c160a160a04170b0317010b04340c1107010c230a233c000c1f0a1f370038000c170a1f36000b1138050c1c0b0804ac010b1c06000000000000000038060b1034380c0c200c3005b40138060b10340b1c060000000000000000380b0c300c200b300b200c1d0c270b0704c4010b1d0b160b27320000000000000000000000000000000038080c280c2d0c2a0c2c05cd010b2732000000000000000000000000000000000b1d0b1638070c2d0c280c2c0c2a0d2a0b2838010d2c0b2d38090b2a0c1e0b2c0c260a1f36000b1e38010b170b02160c180b1f370038000c190a190a182404e80105ec010b180b1917270b233c0136010b26380902290104010028d90138040c11350b11350c190c180b06040e380e0c0f0c0e0c0d0518380f0c2a0c260c290b260b290b2a0c0f0c0e0c0d0b0d0b0e0b0f010c12350b12350c1e0c1d0a0432000000000000000000000000000000002104700a190a0c180a0a1a0a1e160c130a180a1e180a131a0c100a1d0a19180a0c180a0a1a0b131a0c130a100a13180a0b180a091a0c2b0a100a13180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c280a280a2b23046805570a280c2b0a100a13180a0b180a091a0a281a0b281632020000000000000000000000000000001a0c2805520b2b0b10170a0b180a091a0c040a040b0b180c160b180b09180a16160c240b160b19180b241a320b000000000000000000000000000000170c140a140b0c180c170b1e0b0a180a17160c250b170b1d180b251a320b000000000000000000000000000000170a04170b0317010b04340c1507013c000c220a22370038000c1a0a2236000b1538050c1f0b0804b2010b1f06000000000000000038060b1434380c0c230c2c05ba0138060b14340b1f060000000000000000380b0c2c0c230b2c0b230c200c270b2038100c210a2236000b2138010b1a0b02160c1b0b22370038000c1c0a1c0a1b2404d20105d6010b1b0b1c17270b273811022a0104010029d20138040c0f350b0f350c170c160b06040d38120c100c0e051438130c240c270b240c0e0b270c100b0e350b10350c1c0c1b0a0432000000000000000000000000000000002104680a170a0c180a0a1a0a1c160c110a160a1c180a111a0c0d0a1b0a17180a0c180a0a1a0b111a0c110a0d0a11180a0b180a091a0c280a0d0a11180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a28230460054f0a250c280a0d0a11180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c25054a0b280b0d170a0b180a091a0c040a040b0b180c140b160b09180a14160c220b140b17180b221a320b000000000000000000000000000000170c120a120b0c180c150b1c0b0a180a15160c230b150b1b180b231a320b000000000000000000000000000000170a04170b0317010b04340c1307013c000c200a20370038000c180a2036000b1338050c1d0b0804aa010b1d06000000000000000038060b1234380c0c210c2905b20138060b12340b1d060000000000000000380b0c290c210b290b210c1e0c260b1e06000000000000000038140c1f0a2036000b1f38010b180b02160c190b20370038000c1a0a1a0a192404cb0105cf010b190b1a17270b263811022b010401002ae20138040c10350b10350c170c160b0604103815353816350c0e0c0d05163817353818350c0e0c0d0b0d0b0e0c1c0c1b0a0432000000000000000000000000000000002104680a170a0c180a0a1a0a1c160c110a160a1c180a111a0c0f0a1b0a17180a0c180a0a1a0b111a0c110a0f0a11180a0b180a091a0c290a0f0a11180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c260a260a29230460054f0a260c290a0f0a11180a0b180a091a0a261a0b261632020000000000000000000000000000001a0c26054a0b290b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c220b140b17180b221a320b000000000000000000000000000000170c120a120b0c180c150b1c0b0a180a15160c230b150b1b180b231a320b000000000000000000000000000000170a04170b0317010b04340c1307010c240a243c000c200a20370038000c180a2036000b1338050c1d0b0804ac010b1d06000000000000000038060a1234380c0c210c2a05b40138060a12340b1d060000000000000000380b0c2a0c210b2a0b210c1e0c270b240d1e0d270b12340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381901010b270c250b1e0c280b250c1f0a2036000b1f38010b180b02160c190b20370038000c1a0a1a0a192404db0105df010b190b1a17270b28380d022c010401002bd20138040c10350b10350c170c160b06040d381a0c0e0c0d0514381b0c250c280b250b280c0e0c0d0b0d0b0e0c1c0c1b0a0432000000000000000000000000000000002104660a170a0c180a0a1a0a1c160c110a160a1c180a111a0c0f0a1b0a17180a0c180a0a1a0b111a0c110a0f0a11180a0b180a091a0c290a0f0a11180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c260a260a2923045e054d0a260c290a0f0a11180a0b180a091a0a261a0b261632020000000000000000000000000000001a0c2605480b290b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c220b140b17180b221a320b000000000000000000000000000000170c120a120b0c180c150b1c0b0a180a15160c230b150b1b180b231a320b000000000000000000000000000000170a04170b0317010b04340c1307010c240a243c000c200a20370038000c180a2036000b1338050c1d0b0804aa010b1d06000000000000000038060b1234380c0c210c2a05b20138060b12340b1d060000000000000000380b0c2a0c210b2a0b210c1e0c270b240b1e381c0c1f0a2036000b1f38010b180b02160c190b20370038000c1a0a1a0a192404cb0105cf010b190b1a17270b273811022d010401002cec010b050407380e0c0f0c0e0c0d0511380f0c310c240c2c0b240b2c0b310c0f0c0e0c0d0b0d0b0e0b0f010c11350b11350c170c160b06042138020c2e0c27052838030c2a0c300b2a0c270b300c2e0b270b2e0c1d0c1c0a04320000000000000000000000000000000021047a0a170a0c180a0a1a0a1d160c120a160a1d180a121a0c100a1c0a17180a0c180a0a1a0b121a0c120a100a12180a0b180a091a0c320a100a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c280a280a3223047205610a280c320a100a12180a0b180a091a0a281a0b281632020000000000000000000000000000001a0c28055c0b320b10170a0b180a091a0c040a040b0b180c140b160b09180a14160c210b140b17180b211a0b0c180c150b1d0b0a180a15160c220b150b1c180b221a0c180a180a04170b0317010b04340c1307010c230a233c000c200a20370038000c190a2036000b133805381d0c1e380a0c250b0704be010b1e0b180b25320000000000000000000000000000000038080c290c2f0c2b0c2d05c7010b2532000000000000000000000000000000000b1e0b1838070c2f0c290c2d0c2b0d2b0b2938010d2d0b2f38090b2b0c1f0b2d0c260a2036000b1f38010b190b02160c1a0b20370038000c1b0a1b0a1a2404e20105e6010b1a0b1b17270b233c0136010b263809022e010401002dd5010b050407380e0c0f0c0e0c0d0511380f0c2b0c260c2a0b260b2a0b2b0c0f0c0e0c0d0b0d0b0e0b0f010c13350b13350c1a0c1938040c14350b14350c200c1f0a0432000000000000000000000000000000002104700a1a0a0c180a0a1a0a20160c150a190a20180a151a0c120a1f0a1a180a0c180a0a1a0b151a0c150a120a15180a0b180a091a0c2c0a120a15180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c290a290a2c23046805570a290c2c0a120a15180a0b180a091a0a291a0b291632020000000000000000000000000000001a0c2905520b2c0b12170a0b180a091a0c040a040b0b180c170b190b09180a17160c240b170b1a180b241a0b0c180c180b200b0a180a18160c250b180b1f180b251a0c1b0a1b0a04170b0317010b04340c1607013c000c230a23370038000c1c0a2336000b163805381d0c21380a0c270b0704b1010b210600000000000000000b270b1b34380b0c100c1105b9010b270b1b340b21060000000000000000380c0c110c100b110b100c220c280a2336000b2238010b1c0b02160c1d0b23370038000c1e0a1e0a1d2404ce0105d2010b1d0b1e17270b28380d022f010401002ec6010b050407380e0c0f0c0e0c0d0511380f0c280c230c260b230b260b280c0f0c0e0c0d0b0d0b0e0b0f010c12350b12350c190c180b06042138120c130c11052838130c240c270b240c110b270c130b11350b13350c1e0c1d0a04320000000000000000000000000000000021047c0a190a0c180a0a1a0a1e160c140a180a1e180a141a0c100a1d0a19180a0c180a0a1a0b141a0c140a100a14180a0b180a091a0c290a100a14180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2923047405630a250c290a100a14180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c25055e0b290b10170a0b180a091a0c040a040b0b180c160b180b09180a16160c210b160b19180b211a0b0c180c170b1e0b0a180a17160c220b170b1d180b221a0a04170b0317010b04340c1507013c000c200a20370038000c1a0a2036000b153805381d06000000000000000038140c1f0a2036000b1f38010b1a0b02160c1b0b20370038000c1c0a1c0a1b2404c10105c5010b1b0b1c17270230010401002fde010b050407380e0c0f0c0e0c0d0511380f0c2c0c270c2b0b270b2b0b2c0c0f0c0e0c0d0b0d0b0e0b0f010c13350b13350c1a0c190b0604243815353816350c110c10052a3817353818350c110c100b100b110c1f0c1e0a04320000000000000000000000000000000021047c0a1a0a0c180a0a1a0a1f160c140a190a1f180a141a0c120a1e0a1a180a0c180a0a1a0b141a0c140a120a14180a0b180a091a0c2d0a120a14180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c2a0a2a0a2d23047405630a2a0c2d0a120a14180a0b180a091a0a2a1a0b2a1632020000000000000000000000000000001a0c2a055e0b2d0b12170a0b180a091a0c040a040b0b180c170b190b09180a17160c230b170b1a180b231a0c150a150b0c180c180b1f0b0a180a18160c240b180b1e180b241a0a04170b0317010b04340c1607010c250a253c000c220a22370038000c1b0a2236000b163805381d0c20380a0c280b250d200d280b15340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381901010b280c260b200c290b260c210a2236000b2138010b1b0b02160c1c0b22370038000c1d0a1d0a1c2404d70105db010b1c0b1d17270b29380d02310104010030c8010b050407380e0c0f0c0e0c0d0511380f0c2a0c250c280b250b280b2a0c0f0c0e0c0d0b0d0b0e0b0f010c13350b13350c190c180b060421381a0c110c100528381b0c260c290b260b290c110c100b100b110c1e0c1d0a04320000000000000000000000000000000021047a0a190a0c180a0a1a0a1e160c140a180a1e180a141a0c120a1d0a19180a0c180a0a1a0b141a0c140a120a14180a0b180a091a0c2b0a120a14180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2b23047205610a270c2b0a120a14180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c27055c0b2b0b12170a0b180a091a0c040a040b0b180c160b180b09180a16160c220b160b19180b221a0b0c180c170b1e0b0a180a17160c230b170b1d180b231a0a04170b0317010b04340c1507010c240a243c000c210a21370038000c1a0a2136000b153805381d0c1f0b240b1f381c0c200a2136000b2038010b1a0b02160c1b0b21370038000c1c0a1c0a1b2404c30105c7010b1b0b1c172702320104010031e5010b05040638120c0f0c0e050d38130c220c2a0b220c0e0b2a0c0f0b0e350b0f350c150c140b06041938020c2c0c23052038030c280c2e0b280c230b2e0c2c0b230b2c0c1b0c1a0a0432000000000000000000000000000000002104720a150a0c180a0a1a0a1b160c100a140a1b180a101a0c0d0a1a0a15180a0c180a0a1a0b101a0c100a0d0a10180a0b180a091a0c2f0a0d0a10180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2f23046a05590a250c2f0a0d0a10180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c2505540b2f0b0d170a0b180a091a0c040a040b0b180c120b140b09180a12160c1f0b120b15180b1f1a0b0c180c130b1b0b0a180a13160c200b130b1a180b201a0c160a160a04170b0317010b04340c1107010c210a213c000c1e0a1e370038000c170a1e36000b113805060000000000000000381e0c1d380a0c260b0704b7010b1d0b160b26320000000000000000000000000000000038080c270c2d0c290c2b05c0010b2632000000000000000000000000000000000b1d0b1638070c2d0c270c2b0c290d290b2738010d2b0b2d38090b290c1c0b2b0c240a1e36000b1c38010b170b02160c180b1e370038000c190a190a182404db0105df010b180b1917270b213c0136010b24380902330104010032ce010b05040638120c110c10050d38130c240c280b240c100b280c110b10350b11350c180c1738040c12350b12350c1e0c1d0a0432000000000000000000000000000000002104680a180a0c180a0a1a0a1e160c130a170a1e180a131a0c0f0a1d0a18180a0c180a0a1a0b131a0c130a0f0a13180a0b180a091a0c290a0f0a13180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a29230460054f0a250c290a0f0a13180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c25054a0b290b0f170a0b180a091a0c040a040b0b180c150b170b09180a15160c220b150b18180b221a0b0c180c160b1e0b0a180a16160c230b160b1d180b231a0c190a190a04170b0317010b04340c1407013c000c210a21370038000c1a0a2136000b143805060000000000000000381e0c20380a0c260b0704aa010b200600000000000000000b260b1934380b0c0d0c0e05b2010b260b19340b20060000000000000000380c0c0e0c0d0b0e0b0d0c1f0c270a2136000b1f38010b1a0b02160c1b0b21370038000c1c0a1c0a1b2404c70105cb010b1b0b1c17270b27380d0234010401002ec6010b05040638120c120c11050d38130c230c260b230c110b260c120b11350b12350c190c180b06041a380e0c0f0c0e0c0d0524380f0c280c240c270b240b270b280c0f0c0e0c0d0b0d0b0e0b0f010c13350b13350c1e0c1d0a04320000000000000000000000000000000021047c0a190a0c180a0a1a0a1e160c140a180a1e180a141a0c100a1d0a19180a0c180a0a1a0b141a0c140a100a14180a0b180a091a0c290a100a14180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2923047405630a250c290a100a14180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c25055e0b290b10170a0b180a091a0c040a040b0b180c160b180b09180a16160c210b160b19180b211a0b0c180c170b1e0b0a180a17160c220b170b1d180b221a0a04170b0317010b04340c1507013c000c200a20370038000c1a0a2036000b153805060000000000000000381e38100c1f0a2036000b1f38010b1a0b02160c1b0b20370038000c1c0a1c0a1b2404c10105c5010b1b0b1c172702350104010033d7010b05040638120c110c10050d38130c250c290b250c100b290c110b10350b11350c180c170b06041c3815353816350c0e0c0d05223817353818350c0e0c0d0b0d0b0e0c1d0c1c0a0432000000000000000000000000000000002104740a180a0c180a0a1a0a1d160c120a170a1d180a121a0c0f0a1c0a18180a0c180a0a1a0b121a0c120a0f0a12180a0b180a091a0c2a0a0f0a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c260a260a2a23046c055b0a260c2a0a0f0a12180a0b180a091a0a261a0b261632020000000000000000000000000000001a0c2605560b2a0b0f170a0b180a091a0c040a040b0b180c150b170b09180a15160c210b150b18180b211a0c130a130b0c180c160b1d0b0a180a16160c220b160b1c180b221a0a04170b0317010b04340c1407010c230a233c000c200a20370038000c190a2036000b143805060000000000000000381e0c1f380a0c270b230d1f0d270b13340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381901010b270c240b1f0c280b240c1e0a2036000b1e38010b190b02160c1a0b20370038000c1b0a1b0a1a2404d00105d4010b1a0b1b17270b28380d02360104010034c1010b05040638120c110c10050d38130c230c260b230c100b260c110b10350b11350c170c160b060419381a0c0e0c0d0520381b0c240c270b240b270c0e0c0d0b0d0b0e0c1c0c1b0a0432000000000000000000000000000000002104720a170a0c180a0a1a0a1c160c120a160a1c180a121a0c0f0a1b0a17180a0c180a0a1a0b121a0c120a0f0a12180a0b180a091a0c280a0f0a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2823046a05590a250c280a0f0a12180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c2505540b280b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c200b140b17180b201a0b0c180c150b1c0b0a180a15160c210b150b1b180b211a0a04170b0317010b04340c1307010c220a223c000c1f0a1f370038000c180a1f36000b133805060000000000000000381e0c1e0b220b1e381c0c1d0a1f36000b1d38010b180b02160c190b1f370038000c1a0a1a0a192404bc0105c0010b190b1a172702370104010035f9010b0504093815353816350c0e0c0d050f3817353818350c0e0c0d0b0d0b0e0c150c140b06041938020c2c0c24052038030c2a0c2f0b2a0c240b2f0c2c0b240b2c0c1b0c1a0a0432000000000000000000000000000000002104720a150a0c180a0a1a0a1b160c100a140a1b180a101a0c0f0a1a0a15180a0c180a0a1a0b101a0c100a0f0a10180a0b180a091a0c300a0f0a10180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c260a260a3023046a05590a260c300a0f0a10180a0b180a091a0a261a0b261632020000000000000000000000000000001a0c2605540b300b0f170a0b180a091a0c040a040b0b180c120b140b09180a12160c200b120b15180b201a320b000000000000000000000000000000170b0c180c130b1b0b0a180a13160c210b130b1a180b211a320b000000000000000000000000000000170c160a160a04170b0317010b04340c1107010c220a223c000c1f0a1f370038000c170a1f36000a1138050c1c38060c270a220d1c0d270b11340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381f01010b270c230b1c0c280b230c1e0b0704cb010b1e0b160b28320000000000000000000000000000000038080c290c2e0c2b0c2d05d4010b2832000000000000000000000000000000000b1e0b1638070c2e0c290c2d0c2b0d2b0b2938010d2d0b2e38090b2b0c1d0b2d0c250a1f36000b1d38010b170b02160c180b1f370038000c190a190a182404ef0105f3010b180b1917270b223c0136010b25380902380104010036e4010b0504093815353816350c0e0c0d050f3817353818350c0e0c0d0b0d0b0e0c180c1738040c12350b12350c1e0c1d0a0432000000000000000000000000000000002104680a180a0c180a0a1a0a1e160c130a170a1e180a131a0c110a1d0a18180a0c180a0a1a0b131a0c130a110a13180a0b180a091a0c2b0a110a13180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2b230460054f0a270c2b0a110a13180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c27054a0b2b0b11170a0b180a091a0c040a040b0b180c150b170b09180a15160c230b150b18180b231a320b000000000000000000000000000000170b0c180c160b1e0b0a180a16160c240b160b1d180b241a320b000000000000000000000000000000170c190a190a04170b0317010b04340c1407010c250a253c000c220a22370038000c1a0a2236000a1438050c1f38060c280b250d1f0d280b14340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381f01010b280c260b1f0c290b260c210b0704c0010b210600000000000000000b290b1934380b0c0f0c1005c8010b290b19340b21060000000000000000380c0c100c0f0b100b0f0c200c2a0a2236000b2038010b1a0b02160c1b0b22370038000c1c0a1c0a1b2404dd0105e1010b1b0b1c17270b2a380d02390104010037e0010b0504093815353816350c0e0c0d050f3817353818350c0e0c0d0b0d0b0e0c190c180b06041a380e0c110c100c0f0524380f0c2b0c260c2a0b260b2a0b2b0c110c100c0f0b0f0b100b11010c13350b13350c1e0c1d0a04320000000000000000000000000000000021047c0a190a0c180a0a1a0a1e160c140a180a1e180a141a0c120a1d0a19180a0c180a0a1a0b141a0c140a120a14180a0b180a091a0c2c0a120a14180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c290a290a2c23047405630a290c2c0a120a14180a0b180a091a0a291a0b291632020000000000000000000000000000001a0c29055e0b2c0b12170a0b180a091a0c040a040b0b180c160b180b09180a16160c220b160b19180b221a320b000000000000000000000000000000170b0c180c170b1e0b0a180a17160c230b170b1d180b231a320b000000000000000000000000000000170a04170b0317010b04340c1507010c240a243c000c210a21370038000c1a0a2136000a1538050c1f38060c270b240d1f0d270b15340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381f01010b270c250b1f0c280b2538100c200a2136000b2038010b1a0b02160c1b0b21370038000c1c0a1c0a1b2404d90105dd010b1b0b1c17270b283811023a0104010038d9010b0504093815353816350c0e0c0d050f3817353818350c0e0c0d0b0d0b0e0c170c160b06041938120c110c10052038130c240c280b240c100b280c110b10350b11350c1c0c1b0a0432000000000000000000000000000000002104740a170a0c180a0a1a0a1c160c120a160a1c180a121a0c0f0a1b0a17180a0c180a0a1a0b121a0c120a0f0a12180a0b180a091a0c290a0f0a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2923046c055b0a250c290a0f0a12180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c2505560b290b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c200b140b17180b201a320b000000000000000000000000000000170b0c180c150b1c0b0a180a15160c210b150b1b180b211a320b000000000000000000000000000000170a04170b0317010b04340c1307010c220a223c000c1f0a1f370038000c180a1f36000a1338050c1d38060c260b220d1d0d260b13340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381f01010b260c230b1d0c270b2306000000000000000038140c1e0a1f36000b1e38010b180b02160c190b1f370038000c1a0a1a0a192404d20105d6010b190b1a17270b273811023b0104010039d9010b0504093815353816350c0e0c0d050f3817353818350c0e0c0d0b0d0b0e0c170c160b060419381a0c100c0f0520381b0c250c290b250b290c100c0f0b0f0b100c1c0c1b0a0432000000000000000000000000000000002104720a170a0c180a0a1a0a1c160c120a160a1c180a121a0c110a1b0a17180a0c180a0a1a0b121a0c120a110a12180a0b180a091a0c2a0a110a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2a23046a05590a270c2a0a110a12180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c2705540b2a0b11170a0b180a091a0c040a040b0b180c140b160b09180a14160c210b140b17180b211a320b000000000000000000000000000000170b0c180c150b1c0b0a180a15160c220b150b1b180b221a320b000000000000000000000000000000170a04170b0317010b04340c1307010c230a233c000c200a20370038000c180a2036000a1338050c1d38060c280a230d1d0d280b13340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381f01010b280c240b1d0c260b240c1e0b230b1e381c0c1f0a2036000b1f38010b180b02160c190b20370038000c1a0a1a0a192404d20105d6010b190b1a17270b263811023c010401003ae5010b050406381a0c0e0c0d050d381b0c230c2b0b230b2b0c0e0c0d0b0d0b0e0c150c140b06041738020c2d0c26051e38030c290c2f0b290c260b2f0c2d0b260b2d0c1b0c1a0a0432000000000000000000000000000000002104700a150a0c180a0a1a0a1b160c100a140a1b180a101a0c0f0a1a0a15180a0c180a0a1a0b101a0c100a0f0a10180a0b180a091a0c300a0f0a10180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a3023046805570a270c300a0f0a10180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c2705520b300b0f170a0b180a091a0c040a040b0b180c120b140b09180a12160c200b120b15180b201a0b0c180c130b1b0b0a180a13160c210b130b1a180b211a0c160a160a04170b0317010b04340c1107010c220a223c000c1f0a1f370038000c170a1f36000b1138050c1c0a220b1c38200c1e380a0c240b0704b7010b1e0b160b24320000000000000000000000000000000038080c280c2e0c2a0c2c05c0010b2432000000000000000000000000000000000b1e0b1638070c2e0c280c2c0c2a0d2a0b2838010d2c0b2e38090b2a0c1d0b2c0c250a1f36000b1d38010b170b02160c180b1f370038000c190a190a182404db0105df010b180b1917270b223c0136010b253809023d010401003bd0010b050406381a0c0e0c0d050d381b0c260c2a0b260b2a0c0e0c0d0b0d0b0e0c180c1738040c12350b12350c1e0c1d0a0432000000000000000000000000000000002104660a180a0c180a0a1a0a1e160c130a170a1e180a131a0c110a1d0a18180a0c180a0a1a0b131a0c130a110a13180a0b180a091a0c2b0a110a13180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2b23045e054d0a270c2b0a110a13180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c2705480b2b0b11170a0b180a091a0c040a040b0b180c150b170b09180a15160c230b150b18180b231a0b0c180c160b1e0b0a180a16160c240b160b1d180b241a0c190a190a04170b0317010b04340c1407010c250a253c000c220a22370038000c1a0a2236000b1438050c1f0b250b1f38200c21380a0c280b0704ac010b210600000000000000000b280b1934380b0c0f0c1005b4010b280b19340b21060000000000000000380c0c100c0f0b100b0f0c200c290a2236000b2038010b1a0b02160c1b0b22370038000c1c0a1c0a1b2404c90105cd010b1b0b1c17270b29380d023e010401003cc8010b050406381a0c0e0c0d050d381b0c250c280b250b280c0e0c0d0b0d0b0e0c190c180b060418380e0c110c100c0f0522380f0c2a0c260c290b260b290b2a0c110c100c0f0b0f0b100b11010c13350b13350c1e0c1d0a04320000000000000000000000000000000021047a0a190a0c180a0a1a0a1e160c140a180a1e180a141a0c120a1d0a19180a0c180a0a1a0b141a0c140a120a14180a0b180a091a0c2b0a120a14180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c270a270a2b23047205610a270c2b0a120a14180a0b180a091a0a271a0b271632020000000000000000000000000000001a0c27055c0b2b0b12170a0b180a091a0c040a040b0b180c160b180b09180a16160c220b160b19180b221a0b0c180c170b1e0b0a180a17160c230b170b1d180b231a0a04170b0317010b04340c1507010c240a243c000c210a21370038000c1a0a2136000b1538050c1f0b240b1f382038100c200a2136000b2038010b1a0b02160c1b0b21370038000c1c0a1c0a1b2404c30105c7010b1b0b1c1727023f010401003dc1010b050406381a0c0e0c0d050d381b0c230c260b230b260c0e0c0d0b0d0b0e0c170c160b06041738120c110c10051e38130c240c270b240c100b270c110b10350b11350c1c0c1b0a0432000000000000000000000000000000002104720a170a0c180a0a1a0a1c160c120a160a1c180a121a0c0f0a1b0a17180a0c180a0a1a0b121a0c120a0f0a12180a0b180a091a0c280a0f0a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c250a250a2823046a05590a250c280a0f0a12180a0b180a091a0a251a0b251632020000000000000000000000000000001a0c2505540b280b0f170a0b180a091a0c040a040b0b180c140b160b09180a14160c200b140b17180b201a0b0c180c150b1c0b0a180a15160c210b150b1b180b211a0a04170b0317010b04340c1307010c220a223c000c1f0a1f370038000c180a1f36000b1338050c1d0b220b1d382006000000000000000038140c1e0a1f36000b1e38010b180b02160c190b1f370038000c1a0a1a0a192404bc0105c0010b190b1a17270240010401003ed7010b050406381a0c0e0c0d050d381b0c260c2a0b260b2a0c0e0c0d0b0d0b0e0c180c170b06041a3815353816350c100c0f05203817353818350c100c0f0b0f0b100c1d0c1c0a0432000000000000000000000000000000002104720a180a0c180a0a1a0a1d160c120a170a1d180a121a0c110a1c0a18180a0c180a0a1a0b121a0c120a110a12180a0b180a091a0c2b0a110a12180a0b180a091a32020000000000000000000000000000001a3201000000000000000000000000000000160c290a290a2b23046a05590a290c2b0a110a12180a0b180a091a0a291a0b291632020000000000000000000000000000001a0c2905540b2b0b11170a0b180a091a0c040a040b0b180c150b170b09180a15160c220b150b18180b221a0c130a130b0c180c160b1d0b0a180a16160c230b160b1c180b231a0a04170b0317010b04340c1407010c240a243c000c210a21370038000c190a2136000b1438050c1e0a240b1e38200c20380a0c270b240d200d270b13340600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381901010b270c250b200c280b250c1f0a2136000b1f38010b190b02160c1a0b21370038000c1b0a1b0a1a2404d00105d4010b1a0b1b17270b28380d02410300003f070b0139000c020b000b023f0002420104003f140a00116a0701210406050b0b0001060000000000000000116b270a000b01382139000c020b000b023f0002430104003f120a00116a0701210406050b0b0001060000000000000000116b27380a39000c010b000b013f000244010400010206ffffffffffffffff2745010400010206ffffffffffffffff27460104000102060000000000000000274701040100415b0b00116a0c030a030701210408050b060000000000000000116b270a033c000c070a0736000b0138050c0a0e0a38000c04116d0101010c0e38040c0d0c0c0b04350610270000000000000b0e1735180c050a050b0d35180c0b0b0c353210270000000000000000000000000000180b05160c090b0b0b091a340c060a060b0226043c05400b07010700273822044a0b0a06000000000000000038060b06380c0c080c0f055138060b060b0a060000000000000000380b0c0f0c080b0736000b0f38010b033c0136010b0838090248010400010206000000000000000027490104000102060000000000000000274a010401004493010b00116a0c040a040701210408050b060000000000000000116b270b03044f38020c140c1238230c0d0c0f0a01350a0d0b0f1735180c050b120b0d35180a05160c0b0b050b14180b0b1a0c070a070b023524042e05300700270a043c000c090a0936000b0138050b073806320000000000000000000000000000000038070c1c0c180c1a0c160d160b1838010d1a0b1c38090b0936000b1638010b043c0136010b1a380905920138020c130c1538230c0e0c100a01350a0e0b101735180c060b130b0e35180a06160c0c0b060b15180b0c1a0c080a080b023524047005720700270a043c010c0a0a0a36010b0138240c11380a32000000000000000000000000000000000b110b0838070c1d0c190c1b0c170d170b1938010d1b0b1d38090b0a36010b1b38090b043c0036000b173801024b010400010206ffffffffffffffff274c0104010045650b00116a0c0d0a0d0701210408050b060000000000000000116b270b08041138120c0b0c0a051838130c160c170b160c0a0b170c0b0b0a350b0b350c100c0f0b030b07180c0e0b0f0b06180a0e160c140b0e0b10180b141a340c0c0a0c0a0526043405380b050b0c17270a0d3c0036000b0438050c150b0904480b1506000000000000000038060b0c38250c130c18054f38060b0c0b1506000000000000000038260c180c130b180b130c1238110e1238270c110a110a0524045b055f0b050b1117270b0d3c0136010b123809024d0104010046650b00116a0c0d0a0d0701210408050b060000000000000000116b270b0804143815353816350c0b0c0a051a3817353818350c0b0c0a0b0a0b0b0c100c0f0b030b07180c0e0b0f0b06180a0e160c140b0e0b10180b141a340c0c0a0c0a0526043405380b050b0c17270a0d3c0036000a0438050c1238060c160a0d0d120d160b040600000000000000000932000000000000000000000000000000003200000000000000000000000000000000381f01010b160c150b120c170b150c130e1338270c110a110a05240459055d0b050b1117270b0d3c0136010b1338090b173811024e0104010047590b00116a0c0f0a0f0701210408050b060000000000000000116b270b080412380e0c0c0c0b0c0a051c380f0c180c160c170b160b170b180c0c0c0b0c0a0b0a0b0b0b0c010c0d350b0d350c120c110b030b07180c100b110b06180a10160c150b100b12180b151a340c0e0a0e0a0526043c05400b050b0e17270a0f3c0036000b043805381d0c140e1438270c130a130a0524044f05530b050b1317270b0f3c0136010b143809024f03000100030a0b000b0138210c0207013c0036000b02380102500004010026170a00116a0c020a020701210408050d0b0001060000000000000000116b270b000b0138210c030b023c0036000b033801025103000100260c07010c010a013c0036000b0038050c020b010b02382802520004010026150b00116a0c020a020701210408050b060000000000000000116b270a023c0036000b0138050c030b020b033828025303000100030a07013c0036000b0138050c020b000b02382802540004010026150b00116a0c030a030701210408050b060000000000000000116b270b033c0036000b0238050c040b010b043828025503000100010607013c0036000b003805025603000100010507013c0036003829025703000100491707013c000c030a03370038000c020a000b022404110b0336000b0038050c0105150b03360038290c010b01020000000f001700";
+    let res = run_binary_test("sample_coin_store", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
+
+#[cfg(feature = "address32")]
+#[test]
+fn sample_liquidity_pool() {
+    let code = "a11ceb0b050000000e0100240224ab0103cf01b6030485056405e905eb0507d40bde0d08b2196006921ab80110ca1bd8070aa223ef010b9125160ca725c9120df0372a0e9a38280000010101020103010401050106000700080009000a000b000c000d000e000f021002110012080300010001000100130003000100010001001406030001000100010015060300010001000100160803000100010001001706030001000100010018060300010001000100190800001a0603000100010001001b0603000100010001001c0603000100010001001d06030001000100010220040100010d210003000100010001033804010601024f05010001025105010001015b0600105e0700027305010001057407001185010700001e00010100001f01010300000000220203030000000023040503000000002401060300000000250107030000000026010403000000002701040300000000280107030000000029010403000000002a010403000000002b080100002c010903000000002d010903000000002e030203000000002f0a0b01000030050103000000003108010300000000320c010300000000330c010300000000340d010300000000350e030300000000360d0103000000085f010901000f6011120010611314000862010901001063151200106407120010651612000766010902000002671c0701000768011501000e691e0700026a1f200100022221010100036b230101060a6c010100046d0828000c6e0827000b2b0801000a2b0801000e6f0415000e7015070002712a010100022e2b2001000e722e070007750101010008760101010001773334000778013503000000022b36370100027938010100027a011401000e7b140700027c012001000b7d010701000b7e0107000931080103000000017f083a01060b80010128000b81010701000b82010701000983014101030000000684010107001186010444001187014415000e88010b150017101a101e1a01181f1b201b1f101f1d2210221d1618231b2422051808182c102c1d2d1b242c0f300030141824312f102f1d30303218331b341b17303510351d3710371d38303a183b393b2c3b223b3b3b313b3c3b3d3b3e2439243e243d3f18243b243c0603030404040400010b0c010b0d03090009010902020b0c0109000b0c010901020303030b0c0109000b0c0109010b010309000901090203040403010301060c010105030303030302040402060c0303070b04030900090109020303040b0c010900030b0c0109010307020208120812081204081201090004040304030108120206081206081201020104020812081201060b0403090009010902030900090109020b0103070b000309000901090204070b04030900090109020b0c01090003030b0c01090103030209000901010b0d0309000901090201060b0c0109000109010304040402070b0c01090003010b0c010900020b0c010900060b10010900010b050309000901090202070b0e01090009000601070b040309000901090203030b0c0109000b0c01090104030404060b040309000901090203060b0403090009010902030301081101050e0303070b0003090009010902030b0c010b0d0309000901090204070b04030900090109020303030303030302070b0c0109000b0c0109000203060b0f010900010b030309000901090206040404040404030303030b01070b0003090009010902070b04030900090109020303040303030403010902010b02030900090109020b0b00030900090109020b10010b0d030900090109020b13010b0d030900090109020b0f010b0d03090009010902081408140b04030900090109020c060807030301060811010c020814081405060c081408140201030b100109000b130109000b0f010900010b13010900010b0803090009010902010b0e010900010b0903090009010902010b0603090009010902010b0b03090009010902010b0a0309000901090202070b0003090009010902070b040309000901090208030303030b0c010900030b0c0109010303050b0c0109000b0c010901100103030303070b0e010b0903090009010902070b0003090009010902070b04030900090109020304030b0c0109000304030b0c01090108010103070b0003090009010902030404040108150e6c69717569646974795f706f6f6c076163636f756e7404636f696e056576656e74067369676e657206737472696e670974696d657374616d700b636f696e5f68656c706572066375727665730b64616f5f73746f7261676509656d657267656e63790d676c6f62616c5f636f6e6669670a6c705f6163636f756e74076c705f636f696e046d6174680c737461626c655f6375727665047532353607757136347836340b4576656e747353746f726509466c6173686c6f616e0e466c6173686c6f616e4576656e74134c697175696469747941646465644576656e740d4c6971756964697479506f6f6c154c697175696469747952656d6f7665644576656e74124f7261636c65557064617465644576656e7415506f6f6c4163636f756e744361706162696c69747910506f6f6c437265617465644576656e7409537761704576656e741155706461746544414f4665654576656e740e5570646174654665654576656e741c6173736572745f6c705f76616c75655f69735f696e63726561736564146173736572745f706f6f6c5f756e6c6f636b656404436f696e024c50046275726e09666c6173686c6f616e156765745f63756d756c61746976655f7072696365730b6765745f64616f5f666565136765745f64616f5f666565735f636f6e666967136765745f646563696d616c735f7363616c6573076765745f6665650f6765745f666565735f636f6e666967116765745f72657365727665735f73697a650a696e697469616c697a650e69735f706f6f6c5f6578697374730e69735f706f6f6c5f6c6f636b6564046d696e741e6e65775f72657365727665735f61667465725f666565735f7363616c65640d7061795f666c6173686c6f616e0872656769737465720b7365745f64616f5f666565077365745f6665651073706c69745f6665655f746f5f64616f04737761700d7570646174655f6f7261636c6513706f6f6c5f637265617465645f68616e646c650b4576656e7448616e646c65166c69717569646974795f61646465645f68616e646c65186c69717569646974795f72656d6f7665645f68616e646c650b737761705f68616e646c6510666c6173686c6f616e5f68616e646c65156f7261636c655f757064617465645f68616e646c65117570646174655f6665655f68616e646c65157570646174655f64616f5f6665655f68616e646c6506785f6c6f616e06795f6c6f616e04785f696e05785f6f757404795f696e05795f6f75740b61646465645f785f76616c0b61646465645f795f76616c126c705f746f6b656e735f72656365697665640e636f696e5f785f726573657276650e636f696e5f795f72657365727665146c6173745f626c6f636b5f74696d657374616d70176c6173745f70726963655f785f63756d756c6174697665176c6173745f70726963655f795f63756d756c61746976650b6c705f6d696e745f6361700e4d696e744361706162696c6974790b6c705f6275726e5f6361700e4275726e4361706162696c69747907785f7363616c6507795f7363616c65066c6f636b6564036665650764616f5f6665650e72657475726e65645f785f76616c0e72657475726e65645f795f76616c106c705f746f6b656e735f6275726e65640a7369676e65725f636170105369676e65724361706162696c6974790763726561746f72076e65775f66656504553235360969735f737461626c65086c705f76616c756507636f6d706172650f69735f756e636f7272656c617465640966726f6d5f753132380866726f6d5f753634036d756c0969735f736f727465640576616c756506737570706c790c6d756c5f6469765f7531323807657874726163740a656d69745f6576656e74136173736572745f6e6f5f656d657267656e63790a616464726573735f6f661372657472696576655f7369676e65725f6361700b6d756c5f746f5f753132380473717274056d65726765076d756c5f64697610467265657a654361706162696c69747906537472696e670e6173736572745f69735f636f696e126173736572745f76616c69645f63757276651d6372656174655f7369676e65725f776974685f6361706162696c6974791b67656e65726174655f6c705f6e616d655f616e645f73796d626f6c1264657374726f795f667265657a655f63617008646563696d616c7306706f775f3130047a65726f0f6765745f64656661756c745f666565136765745f64656661756c745f64616f5f666565106e65775f6576656e745f68616e646c650d6765745f6665655f61646d696e146173736572745f76616c69645f64616f5f666565106173736572745f76616c69645f666565076465706f7369740b6e6f775f7365636f6e64730755513634783634086672616374696f6e07746f5f753132380c6f766572666c6f775f61646449bcc662ad23bb4f134aad8c8117c03f238bf3f03f324afe91ce231a559e8a6b00000000000000000000000000000000000000000000000000000000000000014e9fce03284c0ce0b86c88dd5a46f050cad2f4f33c4cdd29d98f501868558c81030864000000000000000308680000000000000003086e0000000000000003086a000000000000000308690000000000000003087000000000000000030866000000000000000308670000000000000003086d0000000000000003086b000000000000000308650000000000000003086f0000000000000003086c00000000000000030810270000000000000308e803000000000000052049bcc662ad23bb4f134aad8c8117c03f238bf3f03f324afe91ce231a559e8a6b126170746f733a3a6d657461646174615f7630c3070d6400000000000000174552525f57524f4e475f504149525f4f52444552494e47335768656e20636f696e73207573656420746f20637265617465207061697220686176652077726f6e67206f72646572696e672e6500000000000000184552525f504f4f4c5f4558495354535f464f525f50414952245768656e207061697220616c726561647920657869737473206f6e206163636f756e742e6600000000000000204552525f4e4f545f454e4f5547485f494e495449414c5f4c4951554944495459215768656e206e6f7420656e6f756768206c6971756964697479206d696e7465642e6700000000000000184552525f4e4f545f454e4f5547485f4c4951554944495459215768656e206e6f7420656e6f756768206c6971756964697479206d696e7465642e6800000000000000114552525f454d5054595f434f494e5f494e335768656e20626f7468205820616e6420592070726f766964656420666f7220737761702061726520657175616c207a65726f2e6900000000000000124552525f494e434f52524543545f535741504b5768656e20696e636f727265637420494e732f4f55547320617267756d656e74732070617373656420647572696e67207377617020616e64206d61746820646f65736e277420776f726b2e6a00000000000000194552525f494e434f52524543545f4255524e5f56414c5545531d496e636f7272656374206c7020636f696e206275726e2076616c7565736b00000000000000174552525f504f4f4c5f444f45535f4e4f545f4558495354225768656e20706f6f6c20646f65736e27742065786973747320666f7220706169722e6c000000000000000f4552525f554e524541434841424c451353686f756c64206e65766572206f636375722e6d00000000000000284552525f4e4f545f454e4f5547485f5045524d495353494f4e535f544f5f494e495449414c495a45525768656e2060696e697469616c697a65282960207472616e73616374696f6e206973207369676e6564207769746820616e79206163636f756e74206f74686572207468616e20406c6971756964737761702e6e00000000000000134552525f454d5054595f434f494e5f4c4f414e385768656e20626f7468205820616e6420592070726f766964656420666f7220666c6173686c6f616e2061726520657175616c207a65726f2e6f00000000000000124552525f504f4f4c5f49535f4c4f434b4544145768656e20706f6f6c206973206c6f636b65642e70000000000000000d4552525f4e4f545f41444d494e165768656e2075736572206973206e6f742061646d696e000208370b0e010b0803090009010902390b0e010b03030900090109023a0b0e010b05030900090109023b0b0e010b09030900090109023c0b0e010b02030900090109023d0b0e010b06030900090109023e0b0e010b0b030900090109023f0b0e010b0a0309000901090201020240034103020204420343034403450303020346034703480304020c490b0c0109004a0b0c0109014b034c044d044e0b0f010b0d03090009010902500b10010b0d03090009010902520353035401550356030502035703580359030602024c044d040702015a08110802015c0509020442034303440345030a02015d030b02015d0304180018051801180318021808180a180b1809180618000000000f3c38000303051a0b020a000b030a0111180c0a0b040b000b050b0111180c080e080e0a11190c060b063102210319070427053b3801031d05390b020b03180c0b0b0b111b070d070d18111c111d0c0c0b04111b0b05111b111d0c090e090e0c11190c070b07310221033b070427070c27020100000104170c070f3d000c000b003700140921030b070b2702020100020004195938020304070027070f3b00030907092738030e0038040c02070f3c000c0538050c040a05370138060c070a05370238070c0a0a02350a07350a0411210c080a02350a0a350b0411210c0b0a0806000000000000000024032d05320a0b060000000000000000240c010534090c010b01033a0b05010703270a0536010a0838080c060a0536020a0b38090c090a050b070b0a380a0b000b053703380b070f3c010c030b0336040b080b0b0b023902380c0b060b0902030100020004243e112538020305070027070f3b00030a07092738030a000600000000000000002403100513080c0205170a01060000000000000000240c020b02031b070227070f3c000c030a03370138060c040a03370238070c050a0336010a0038080c060a0336020a0138090c07080a033600150b030b040b05380a0b060b070b000b013903020401000104251e112538020305070027070f3b00030a0709273803070f3d000c030a033705140c010a033706140c020b033707140c000b010b020b00020501000104171038020304070027070f3b000309070927070f3d000c000b003708140206010001040103380d0700020701000104171338020304070027070f3b000309070927070f3d000c000a003709140b00370a14020801000104171038020304070027070f3b000309070927070f3d000c000b00370b140209010001040103380e070d020a010001042619112538020305070027070f3b00030a0709273803070f3d000c000a00370138060c010b00370238070c020b010b02020b01040027150a001126070f2103090b00010708270a0011270c010a000b0112072d070a0011280b001129020c010000010738020304070027070f3b00020d01000104171038020304070027070f3b000309070927070f3d000c000b00370014020e01000200042976112538020305070027070f3b00030a070927380338050c07070f3c000c080a08370138060c0c0a08370238070c0f0e0038060c0b0e0138070c0e0a07320000000000000000000000000000000021032305350a0b0a0e112a112b0c050a05070e2403300b08010706270b05070e170c03054f0a0b350a070a0c3511210c0a0a0e350b070a0f3511210c0d0a0a0a0d230348054b0b0a0c02054d0b0d0c020b020c030b030c090a090600000000000000002403590b08010707270a0836010b00380f0a0836020b0138100a090a08370c38110c060b080b0c0b0f380a070f3c010c040b04360d0b0b0b0e0b09390438120b06020f0000002d3b38010303050c0b00070d112a0b020a04112a170c06051a38000310070c270b000b020a04070d112e17350c050b050c060b060c093801031f05280b01070d112a0b030b04112a170c0805363800032c070c270b010b030b04070d112e17350c070b070c080b080c0a0b090b0a021001000200042f6e112538020305070027070f3b00030a0709270b023a030c0b0c070e0038060c060e0138070c0a0a06060000000000000000240319051c080c0305200a0a060000000000000000240c030b030324070127070f3c000c050a05370138060c090a05370238070c0d0b090a07160c090b0d0a0b160c0d0a0536010b00380f0a0536020b0138100a05370138060a05370238070a060a0a0a05370b1438130c0c0c080a053709140a05370a140b09350b0d350b080b0c38140a050a060a0a3815090b05360015070f3c010c040b04360e0b060b070b0a0b0b390538160211010001073263112538173818380203090b00010700273819070f3b002003120b0001070a27070f2b070c090b09100f11310c08381a0c060c050e080b050b06310608381b0c040c030c020b03381c0600000000000000000c0a0600000000000000000c0b381d032e0534381e11360c0a381f11360c0b38203821060000000000000000320000000000000000000000000000000032000000000000000000000000000000000b040b020b0a0b0b093822113939000c070e080b073f000e0838230e0838240e0838250e0838260e0838270e0838280e0838290e08382a0e08382b39010c010d01360f0b0011263906382c0e080b013f01021201040200043f27380203060b0001070027070f3b00030d0b000107092738030b001126113c2103150705270a01113d070f3c000c030a010b03360815070f3c010c020b0236100b013907382d021301040200043f27380203060b0001070027070f3b00030d0b000107092738030b001126113c2103150705270a01113e070f3c000c030a010b03360b15070f3c010c020b0236110b013908382e0214000000403b0a00370b140c0a0a003708140c040a0a0a0418070019060000000000000000220311051a0b0a0b041807001a060100000000000000160c0305200b0a0b041807001a0c030b030c050b010a05070d112e0c060b020b05070d112e0c080a0036010b0638080c070b0036020b0838090c09070f0b070b09382f02150100020004427b112538020305070027070f3b00030a07092738030e0038060c0c0e0238070c100a0c0600000000000000002403160519080c04051d0a10060000000000000000240c040b040321070127070f3c000c0b0a0b370138060c0e0a0b370238070c120a0b36010b00380f0a0b36020b0238100a0b36010a0138080c0f0a0b36020a0338090c130a0b370138060a0b370238070a0c0a100a0b370b1438130c110c0d0a0b3709140a0b370a140a0e350a12350b0d350b113538140a0b0a0c0a1038150b0b0b0e0b12380a070f3c010c0a0b0a36120c090b0c0c050b100c060b010c070b030c080b090b050b070b060b08390938300b0f0b1302160000010043540a003707140c0711400c050a050b0717350c0a0a0a320000000000000000000000000000000024031005150a01060000000000000000220c030517090c030b03031a051f0a02060000000000000000220c040521090c040b040324054f0a020a01114111420a0a180c080b010b02114111420b0a180c090a003705140b0811430a003605150a003706140b0911430a00360615070f3c010c060b0636130a003705140a00370614390a38310b050b003607150204090400040104060002040304040402040b04070408040a04050001000407000000000700060003000500180118021803180418051806180718081809180a180b180c180d180e181018111812181318141800";
+    let res = run_binary_test("sample_liquidity_pool", code);
+    assert!(res.is_ok(), "{:?}", res)
+}
diff --git a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/catch_unwind.rs b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/catch_unwind.rs
new file mode 100644
index 0000000000..b248c8584f
--- /dev/null
+++ b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/catch_unwind.rs
@@ -0,0 +1,29 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+use fail::FailScenario;
+use move_binary_format::file_format::empty_module;
+use move_bytecode_verifier::VerifierConfig;
+use move_core_types::{
+    state::{self, VMState},
+    vm_status::StatusCode,
+};
+use std::panic::{self, PanicInfo};
+
+// TODO: this tests must run in its own process since otherwise any crashing test here
+//   secondary-crashes in the panic handler.
+#[ignore]
+#[test]
+fn test_unwind() {
+    let scenario = FailScenario::setup();
+    fail::cfg("verifier-failpoint-panic", "panic").unwrap();
+
+    panic::set_hook(Box::new(move |_: &PanicInfo<'_>| {
+        assert_eq!(state::get_state(), VMState::VERIFIER);
+    }));
+
+    let m = empty_module();
+    let res = move_bytecode_verifier::verify_module_with_config(&VerifierConfig::unbounded(), &m)
+        .unwrap_err();
+    assert_eq!(res.major_status(), StatusCode::VERIFIER_INVARIANT_VIOLATION);
+    scenario.teardown();
+}
diff --git a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/code_unit_tests.rs b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/code_unit_tests.rs
index e8091afb85..cc172e3fa0 100644
--- a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/code_unit_tests.rs
+++ b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/code_unit_tests.rs
@@ -4,13 +4,13 @@
 
 use crate::support::dummy_procedure_module;
 use move_binary_format::file_format::Bytecode;
-use move_bytecode_verifier::CodeUnitVerifier;
+use move_bytecode_verifier::{CodeUnitVerifier, VerifierConfig};
 use move_core_types::vm_status::StatusCode;
 
 #[test]
 fn invalid_fallthrough_br_true() {
     let module = dummy_procedure_module(vec![Bytecode::LdFalse, Bytecode::BrTrue(1)]);
-    let result = CodeUnitVerifier::verify_module(&module);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module);
     assert_eq!(
         result.unwrap_err().major_status(),
         StatusCode::INVALID_FALL_THROUGH
@@ -20,7 +20,7 @@ fn invalid_fallthrough_br_true() {
 #[test]
 fn invalid_fallthrough_br_false() {
     let module = dummy_procedure_module(vec![Bytecode::LdTrue, Bytecode::BrFalse(1)]);
-    let result = CodeUnitVerifier::verify_module(&module);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module);
     assert_eq!(
         result.unwrap_err().major_status(),
         StatusCode::INVALID_FALL_THROUGH
@@ -31,7 +31,7 @@ fn invalid_fallthrough_br_false() {
 #[test]
 fn invalid_fallthrough_non_branch() {
     let module = dummy_procedure_module(vec![Bytecode::LdTrue, Bytecode::Pop]);
-    let result = CodeUnitVerifier::verify_module(&module);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module);
     assert_eq!(
         result.unwrap_err().major_status(),
         StatusCode::INVALID_FALL_THROUGH
@@ -41,20 +41,54 @@ fn invalid_fallthrough_non_branch() {
 #[test]
 fn valid_fallthrough_branch() {
     let module = dummy_procedure_module(vec![Bytecode::Branch(0)]);
-    let result = CodeUnitVerifier::verify_module(&module);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module);
     assert!(result.is_ok());
 }
 
 #[test]
 fn valid_fallthrough_ret() {
     let module = dummy_procedure_module(vec![Bytecode::Ret]);
-    let result = CodeUnitVerifier::verify_module(&module);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module);
     assert!(result.is_ok());
 }
 
 #[test]
 fn valid_fallthrough_abort() {
     let module = dummy_procedure_module(vec![Bytecode::LdU64(7), Bytecode::Abort]);
-    let result = CodeUnitVerifier::verify_module(&module);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module);
     assert!(result.is_ok());
 }
+
+#[test]
+fn test_max_number_of_bytecode() {
+    let mut nops = vec![];
+    for _ in 0..u16::MAX - 1 {
+        nops.push(Bytecode::Nop);
+    }
+    nops.push(Bytecode::Ret);
+    let module = dummy_procedure_module(nops);
+
+    let result = CodeUnitVerifier::verify_module(&VerifierConfig::unbounded(), &module);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn test_max_basic_blocks() {
+    let mut code = (0..17)
+        .map(|idx| Bytecode::Branch(idx + 1))
+        .collect::<Vec<_>>();
+    code.push(Bytecode::Ret);
+    let module = dummy_procedure_module(code);
+
+    let result = CodeUnitVerifier::verify_module(
+        &VerifierConfig {
+            max_basic_blocks: Some(16),
+            ..Default::default()
+        },
+        &module,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::TOO_MANY_BASIC_BLOCKS
+    );
+}
diff --git a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/constants_tests.rs b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/constants_tests.rs
index 1fbc46b841..f74e2653a1 100644
--- a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/constants_tests.rs
+++ b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/constants_tests.rs
@@ -14,6 +14,7 @@ proptest! {
 }
 
 #[test]
+#[cfg(not(feature = "address32"))]
 fn valid_primitives() {
     let mut module = empty_module();
     module.constant_pool = vec![
@@ -25,6 +26,14 @@ fn valid_primitives() {
             type_: SignatureToken::U8,
             data: vec![0],
         },
+        Constant {
+            type_: SignatureToken::U16,
+            data: vec![0, 0],
+        },
+        Constant {
+            type_: SignatureToken::U32,
+            data: vec![0, 0, 0, 0],
+        },
         Constant {
             type_: SignatureToken::U64,
             data: vec![0, 0, 0, 0, 0, 0, 0, 0],
@@ -33,6 +42,13 @@ fn valid_primitives() {
             type_: SignatureToken::U128,
             data: vec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
         },
+        Constant {
+            type_: SignatureToken::U256,
+            data: vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ],
+        },
         Constant {
             type_: SignatureToken::Address,
             data: vec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
@@ -42,10 +58,14 @@ fn valid_primitives() {
 }
 
 #[test]
+#[cfg(not(feature = "address32"))]
 fn invalid_primitives() {
     malformed(SignatureToken::U8, vec![0, 0]);
+    malformed(SignatureToken::U16, vec![0, 0, 0, 0]);
+    malformed(SignatureToken::U32, vec![0, 0, 0]);
     malformed(SignatureToken::U64, vec![0]);
     malformed(SignatureToken::U128, vec![0]);
+    malformed(SignatureToken::U256, vec![0, 0]);
     let data = vec![
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0,
@@ -54,6 +74,7 @@ fn invalid_primitives() {
 }
 
 #[test]
+#[cfg(not(feature = "address32"))]
 fn valid_vectors() {
     let double_vec = |item: Vec<u8>| -> Vec<u8> {
         let mut items = vec![2];
@@ -103,6 +124,14 @@ fn valid_vectors() {
             type_: tvec(SignatureToken::U8),
             data: large_vec(vec![0]),
         },
+        Constant {
+            type_: tvec(SignatureToken::U16),
+            data: large_vec(vec![0, 0]),
+        },
+        Constant {
+            type_: tvec(SignatureToken::U32),
+            data: large_vec(vec![0, 0, 0, 0]),
+        },
         Constant {
             type_: tvec(SignatureToken::U64),
             data: large_vec(vec![0, 0, 0, 0, 0, 0, 0, 0]),
@@ -111,6 +140,13 @@ fn valid_vectors() {
             type_: tvec(SignatureToken::U128),
             data: large_vec(vec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),
         },
+        Constant {
+            type_: tvec(SignatureToken::U256),
+            data: large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ]),
+        },
         Constant {
             type_: tvec(SignatureToken::Address),
             data: large_vec(vec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),
@@ -124,6 +160,14 @@ fn valid_vectors() {
             type_: tvec(tvec(SignatureToken::U8)),
             data: double_vec(large_vec(vec![0])),
         },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U16)),
+            data: double_vec(large_vec(vec![0, 0])),
+        },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U32)),
+            data: double_vec(large_vec(vec![0, 0, 0, 0])),
+        },
         Constant {
             type_: tvec(tvec(SignatureToken::U64)),
             data: double_vec(large_vec(vec![0, 0, 0, 0, 0, 0, 0, 0])),
@@ -134,6 +178,13 @@ fn valid_vectors() {
                 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             ])),
         },
+        Constant {
+            type_: tvec(tvec(SignatureToken::U256)),
+            data: double_vec(large_vec(vec![
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0,
+            ])),
+        },
         Constant {
             type_: tvec(tvec(SignatureToken::Address)),
             data: double_vec(large_vec(vec![
@@ -145,6 +196,7 @@ fn valid_vectors() {
 }
 
 #[test]
+#[cfg(not(feature = "address32"))]
 fn invalid_vectors() {
     let double_vec = |item: Vec<u8>| -> Vec<u8> {
         let mut items = vec![2];
@@ -158,6 +210,8 @@ fn invalid_vectors() {
         items
     };
     // wrong inner
+    malformed(tvec(SignatureToken::U16), vec![1, 0]);
+    malformed(tvec(SignatureToken::U32), vec![1, 0]);
     malformed(tvec(SignatureToken::U64), vec![1, 0]);
     malformed(
         tvec(SignatureToken::Address),
@@ -194,6 +248,7 @@ fn tvec(s: SignatureToken) -> SignatureToken {
     SignatureToken::Vector(Box::new(s))
 }
 
+#[allow(unused)]
 fn malformed(type_: SignatureToken, data: Vec<u8>) {
     error(type_, data, StatusCode::MALFORMED_CONSTANT_DATA)
 }
diff --git a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/control_flow_tests.rs b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/control_flow_tests.rs
index ddf7796f3d..447ef51d94 100644
--- a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/control_flow_tests.rs
+++ b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/control_flow_tests.rs
@@ -8,23 +8,30 @@ use move_binary_format::{
     errors::PartialVMResult,
     file_format::{Bytecode, CompiledModule, FunctionDefinitionIndex, TableIndex},
 };
-use move_bytecode_verifier::control_flow;
+use move_bytecode_verifier::{control_flow, meter::DummyMeter, VerifierConfig};
 use move_core_types::vm_status::StatusCode;
 
-fn verify_module(module: &CompiledModule) -> PartialVMResult<()> {
+fn verify_module(verifier_config: &VerifierConfig, module: &CompiledModule) -> PartialVMResult<()> {
     for (idx, function_definition) in module
         .function_defs()
         .iter()
         .enumerate()
         .filter(|(_, def)| !def.is_native())
     {
-        control_flow::verify(
-            Some(FunctionDefinitionIndex(idx as TableIndex)),
-            function_definition
-                .code
-                .as_ref()
-                .expect("unexpected native function"),
-        )?
+        let current_function = FunctionDefinitionIndex(idx as TableIndex);
+        let code = function_definition
+            .code
+            .as_ref()
+            .expect("unexpected native function");
+
+        control_flow::verify_function(
+            verifier_config,
+            module,
+            current_function,
+            function_definition,
+            code,
+            &mut DummyMeter,
+        )?;
     }
     Ok(())
 }
@@ -33,10 +40,32 @@ fn verify_module(module: &CompiledModule) -> PartialVMResult<()> {
 // Simple cases -  Copied from code unit verifier
 //**************************************************************************************************
 
+#[test]
+fn empty_bytecode() {
+    let module = dummy_procedure_module(vec![]);
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::EMPTY_CODE_UNIT,
+    );
+}
+
+#[test]
+fn empty_bytecode_v5() {
+    let mut module = dummy_procedure_module(vec![]);
+    module.version = 5;
+
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::EMPTY_CODE_UNIT,
+    );
+}
+
 #[test]
 fn invalid_fallthrough_br_true() {
     let module = dummy_procedure_module(vec![Bytecode::LdFalse, Bytecode::BrTrue(1)]);
-    let result = verify_module(&module);
+    let result = verify_module(&Default::default(), &module);
     assert_eq!(
         result.unwrap_err().major_status(),
         StatusCode::INVALID_FALL_THROUGH
@@ -46,7 +75,7 @@ fn invalid_fallthrough_br_true() {
 #[test]
 fn invalid_fallthrough_br_false() {
     let module = dummy_procedure_module(vec![Bytecode::LdTrue, Bytecode::BrFalse(1)]);
-    let result = verify_module(&module);
+    let result = verify_module(&Default::default(), &module);
     assert_eq!(
         result.unwrap_err().major_status(),
         StatusCode::INVALID_FALL_THROUGH
@@ -57,7 +86,7 @@ fn invalid_fallthrough_br_false() {
 #[test]
 fn invalid_fallthrough_non_branch() {
     let module = dummy_procedure_module(vec![Bytecode::LdTrue, Bytecode::Pop]);
-    let result = verify_module(&module);
+    let result = verify_module(&Default::default(), &module);
     assert_eq!(
         result.unwrap_err().major_status(),
         StatusCode::INVALID_FALL_THROUGH
@@ -67,20 +96,144 @@ fn invalid_fallthrough_non_branch() {
 #[test]
 fn valid_fallthrough_branch() {
     let module = dummy_procedure_module(vec![Bytecode::Branch(0)]);
-    let result = verify_module(&module);
+    let result = verify_module(&Default::default(), &module);
     assert!(result.is_ok());
 }
 
 #[test]
 fn valid_fallthrough_ret() {
     let module = dummy_procedure_module(vec![Bytecode::Ret]);
-    let result = verify_module(&module);
+    let result = verify_module(&Default::default(), &module);
     assert!(result.is_ok());
 }
 
 #[test]
 fn valid_fallthrough_abort() {
     let module = dummy_procedure_module(vec![Bytecode::LdU64(7), Bytecode::Abort]);
-    let result = verify_module(&module);
+    let result = verify_module(&Default::default(), &module);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn nested_loops_max_depth() {
+    let module = dummy_procedure_module(vec![
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::BrFalse(1),
+        Bytecode::BrFalse(0),
+        Bytecode::Ret,
+    ]);
+    let result = verify_module(
+        &VerifierConfig {
+            max_loop_depth: Some(2),
+            ..VerifierConfig::default()
+        },
+        &module,
+    );
+    assert!(result.is_ok());
+}
+
+#[test]
+fn nested_loops_exceed_max_depth() {
+    let module = dummy_procedure_module(vec![
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::BrFalse(2),
+        Bytecode::BrFalse(1),
+        Bytecode::BrFalse(0),
+        Bytecode::Ret,
+    ]);
+    let result = verify_module(
+        &VerifierConfig {
+            max_loop_depth: Some(2),
+            ..VerifierConfig::default()
+        },
+        &module,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::LOOP_MAX_DEPTH_REACHED
+    );
+}
+
+#[test]
+fn non_loop_backward_jump() {
+    let module = dummy_procedure_module(vec![
+        Bytecode::Branch(2),
+        Bytecode::Ret,
+        Bytecode::Branch(1),
+    ]);
+    let result = verify_module(&Default::default(), &module);
     assert!(result.is_ok());
 }
+
+#[test]
+fn non_loop_backward_jump_v5() {
+    let mut module = dummy_procedure_module(vec![
+        Bytecode::Branch(2),
+        Bytecode::Ret,
+        Bytecode::Branch(1),
+    ]);
+
+    module.version = 5;
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_LOOP_SPLIT,
+    );
+}
+
+#[test]
+fn irreducible_control_flow_graph() {
+    let module = dummy_procedure_module(vec![
+        Bytecode::LdTrue,
+        Bytecode::BrTrue(3),
+        Bytecode::Nop,
+        Bytecode::LdFalse,
+        Bytecode::BrFalse(2),
+        Bytecode::Ret,
+    ]);
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_LOOP_SPLIT,
+    );
+}
+
+#[test]
+fn nested_loop_break() {
+    let module = dummy_procedure_module(vec![
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::Branch(7),
+        Bytecode::BrFalse(2),
+        Bytecode::BrFalse(1),
+        Bytecode::BrFalse(0),
+        Bytecode::Ret,
+    ]);
+    let result = verify_module(&Default::default(), &module);
+    assert!(result.is_ok());
+}
+
+#[test]
+fn nested_loop_break_v5() {
+    let mut module = dummy_procedure_module(vec![
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::LdFalse,
+        Bytecode::Branch(7),
+        Bytecode::BrFalse(2),
+        Bytecode::BrFalse(1),
+        Bytecode::BrFalse(0),
+        Bytecode::Ret,
+    ]);
+
+    module.version = 5;
+    let result = verify_module(&Default::default(), &module);
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::INVALID_LOOP_BREAK,
+    );
+}
diff --git a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/large_type_test.rs b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/large_type_test.rs
new file mode 100644
index 0000000000..c8499625e8
--- /dev/null
+++ b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/large_type_test.rs
@@ -0,0 +1,155 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::production_config;
+use move_binary_format::file_format::{
+    empty_module, Bytecode, CodeUnit, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+    IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
+    Visibility::Public,
+};
+use move_core_types::{identifier::Identifier, vm_status::StatusCode};
+
+const NUM_LOCALS: u8 = 64;
+const NUM_CALLS: u16 = 77;
+const NUM_FUNCTIONS: u16 = 177;
+
+fn get_nested_vec_type(len: usize) -> SignatureToken {
+    let mut ret = SignatureToken::Bool;
+    for _ in 0..len {
+        ret = SignatureToken::Vector(Box::new(ret));
+    }
+    ret
+}
+
+#[test]
+fn test_large_types() {
+    // See also: github.com/aptos-labs/aptos-core/security/advisories/GHSA-37qw-jfpw-8899
+    let mut m = empty_module();
+
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::Reference(Box::new(get_nested_vec_type(64))))
+            .take(NUM_LOCALS as usize)
+            .collect(),
+    ));
+
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(0)), Bytecode::Ret],
+        }),
+    });
+
+    // returns_vecs
+    m.identifiers.push(Identifier::new("returns_vecs").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(1),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(1)), Bytecode::Ret],
+        }),
+    });
+
+    // takes_and_returns_vecs
+    m.identifiers
+        .push(Identifier::new("takes_and_returns_vecs").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(2),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(2),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(1)), Bytecode::Ret],
+        }),
+    });
+
+    // takes_vecs
+    m.identifiers.push(Identifier::new("takes_vecs").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(3),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(3),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Ret],
+        }),
+    });
+
+    // other fcts
+    for i in 0..NUM_FUNCTIONS {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i + 4),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i + 4),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code: vec![],
+            }),
+        });
+
+        let code = &mut m.function_defs[i as usize + 4].code.as_mut().unwrap().code;
+        code.clear();
+        code.push(Bytecode::Call(FunctionHandleIndex(1)));
+        for _ in 0..NUM_CALLS {
+            code.push(Bytecode::Call(FunctionHandleIndex(2)));
+        }
+        code.push(Bytecode::Call(FunctionHandleIndex(3)));
+        code.push(Bytecode::Ret);
+    }
+
+    let result = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_large_types",
+        &production_config(),
+        &m,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED,
+    );
+}
diff --git a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/limit_tests.rs b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/limit_tests.rs
new file mode 100644
index 0000000000..8833331542
--- /dev/null
+++ b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/limit_tests.rs
@@ -0,0 +1,674 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::*;
+use move_bytecode_verifier::{
+    limits::LimitsVerifier, verify_module_with_config_for_test, VerifierConfig,
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
+};
+
+#[test]
+fn test_function_handle_type_instantiation() {
+    let mut m = basic_test_module();
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: std::iter::repeat(AbilitySet::ALL).take(10).collect(),
+    });
+
+    assert_eq!(
+        LimitsVerifier::verify_module(
+            &VerifierConfig {
+                max_generic_instantiation_length: Some(9),
+                ..Default::default()
+            },
+            &m
+        )
+        .unwrap_err()
+        .major_status(),
+        StatusCode::TOO_MANY_TYPE_PARAMETERS
+    );
+
+    let mut s = basic_test_script();
+    s.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: std::iter::repeat(AbilitySet::ALL).take(10).collect(),
+    });
+
+    assert_eq!(
+        LimitsVerifier::verify_script(
+            &VerifierConfig {
+                max_generic_instantiation_length: Some(9),
+                ..Default::default()
+            },
+            &s
+        )
+        .unwrap_err()
+        .major_status(),
+        StatusCode::TOO_MANY_TYPE_PARAMETERS
+    );
+}
+
+#[test]
+fn test_struct_handle_type_instantiation() {
+    let mut m = basic_test_module();
+    m.struct_handles.push(StructHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(0),
+        abilities: AbilitySet::ALL,
+        type_parameters: std::iter::repeat(StructTypeParameter {
+            constraints: AbilitySet::ALL,
+            is_phantom: false,
+        })
+        .take(10)
+        .collect(),
+    });
+
+    assert_eq!(
+        LimitsVerifier::verify_module(
+            &VerifierConfig {
+                max_generic_instantiation_length: Some(9),
+                ..Default::default()
+            },
+            &m
+        )
+        .unwrap_err()
+        .major_status(),
+        StatusCode::TOO_MANY_TYPE_PARAMETERS
+    );
+
+    let mut s = basic_test_script();
+    s.struct_handles.push(StructHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(0),
+        abilities: AbilitySet::ALL,
+        type_parameters: std::iter::repeat(StructTypeParameter {
+            constraints: AbilitySet::ALL,
+            is_phantom: false,
+        })
+        .take(10)
+        .collect(),
+    });
+
+    assert_eq!(
+        LimitsVerifier::verify_script(
+            &VerifierConfig {
+                max_generic_instantiation_length: Some(9),
+                ..Default::default()
+            },
+            &s
+        )
+        .unwrap_err()
+        .major_status(),
+        StatusCode::TOO_MANY_TYPE_PARAMETERS
+    );
+}
+
+#[test]
+fn test_function_handle_parameters() {
+    let mut m = basic_test_module();
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::Bool).take(10).collect(),
+    ));
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(0),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+
+    assert_eq!(
+        LimitsVerifier::verify_module(
+            &VerifierConfig {
+                max_function_parameters: Some(9),
+                ..Default::default()
+            },
+            &m
+        )
+        .unwrap_err()
+        .major_status(),
+        StatusCode::TOO_MANY_PARAMETERS
+    );
+
+    let mut s = basic_test_script();
+    s.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::Bool).take(10).collect(),
+    ));
+    s.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex::new(0),
+        name: IdentifierIndex::new(0),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+
+    assert_eq!(
+        LimitsVerifier::verify_script(
+            &VerifierConfig {
+                max_function_parameters: Some(9),
+                ..Default::default()
+            },
+            &s
+        )
+        .unwrap_err()
+        .major_status(),
+        StatusCode::TOO_MANY_PARAMETERS
+    );
+}
+
+#[test]
+fn big_vec_unpacks() {
+    const N_TYPE_PARAMS: usize = 16;
+    let mut st = SignatureToken::Vector(Box::new(SignatureToken::U8));
+    let type_params = vec![st; N_TYPE_PARAMS];
+    st = SignatureToken::StructInstantiation(StructHandleIndex(0), type_params);
+    const N_VEC_PUSH: u16 = 1000;
+    let mut code = vec![];
+    // 1. CopyLoc:     ...         -> ... st
+    // 2. VecPack:     ... st      -> ... Vec<st>
+    // 3. VecUnpack:   ... Vec<st> -> ... st, st, st, ... st
+    for _ in 0..N_VEC_PUSH {
+        code.push(Bytecode::CopyLoc(0));
+        code.push(Bytecode::VecPack(SignatureIndex(1), 1));
+        code.push(Bytecode::VecUnpack(SignatureIndex(1), 1 << 15));
+    }
+    // 1. VecPack:   ... st, st, st, ... st -> ... Vec<st>
+    // 2. Pop:       ... Vec<st>            -> ...
+    for _ in 0..N_VEC_PUSH {
+        code.push(Bytecode::VecPack(SignatureIndex(1), 1 << 15));
+        code.push(Bytecode::Pop);
+    }
+    code.push(Bytecode::Ret);
+    let type_param_constraints = StructTypeParameter {
+        constraints: AbilitySet::EMPTY,
+        is_phantom: false,
+    };
+    let module = CompiledModule {
+        version: 5,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![StructHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(1),
+            abilities: AbilitySet::ALL,
+            type_parameters: vec![type_param_constraints; N_TYPE_PARAMS],
+        }],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(0),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![Signature(vec![]), Signature(vec![st])],
+        identifiers: vec![
+            Identifier::new("f").unwrap(),
+            Identifier::new("generic_struct").unwrap(),
+        ],
+        address_identifiers: vec![AccountAddress::ONE],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![StructDefinition {
+            struct_handle: StructHandleIndex(0),
+            field_information: StructFieldInformation::Native,
+        }],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: Visibility::Public,
+            is_entry: true,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code,
+            }),
+        }],
+    };
+
+    // save module and verify that it can ser/de
+    let mut mvbytes = vec![];
+    module.serialize(&mut mvbytes).unwrap();
+    let module = CompiledModule::deserialize(&mvbytes).unwrap();
+
+    let res = verify_module_with_config_for_test(
+        "big_vec_unpacks",
+        &VerifierConfig {
+            max_loop_depth: Some(5),
+            max_generic_instantiation_length: Some(32),
+            max_function_parameters: Some(128),
+            max_basic_blocks: Some(1024),
+            max_push_size: Some(10000),
+            ..Default::default()
+        },
+        &module,
+    );
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::VALUE_STACK_PUSH_OVERFLOW
+    );
+}
+
+const MAX_STRUCTS: usize = 200;
+const MAX_FIELDS: usize = 30;
+const MAX_FUNCTIONS: usize = 1000;
+
+#[test]
+fn max_struct_test() {
+    let config = VerifierConfig {
+        max_struct_definitions: Some(MAX_STRUCTS),
+        max_fields_in_struct: Some(MAX_FIELDS),
+        max_function_definitions: Some(MAX_FUNCTIONS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 0);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    multi_struct(&mut module, 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS / 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_STRUCT_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_STRUCT_DEFINITIONS_REACHED,
+    );
+}
+
+#[test]
+fn max_fields_test() {
+    let config = VerifierConfig {
+        max_struct_definitions: Some(MAX_STRUCTS),
+        max_fields_in_struct: Some(MAX_FIELDS),
+        max_function_definitions: Some(MAX_FUNCTIONS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 1);
+    multi_fields(&mut module, MAX_FIELDS / 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 10);
+    multi_fields(&mut module, MAX_FIELDS - 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 50);
+    multi_fields(&mut module, MAX_FIELDS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 100);
+    multi_fields(&mut module, MAX_FIELDS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 2);
+    multi_fields(&mut module, MAX_FIELDS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 50);
+    multi_fields_except_one(&mut module, 0, 2, MAX_FIELDS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 20);
+    multi_fields_except_one(&mut module, 19, MAX_FIELDS, MAX_FIELDS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 100);
+    multi_fields_except_one(&mut module, 50, 1, MAX_FIELDS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+}
+
+#[test]
+fn max_functions_test() {
+    let config = VerifierConfig {
+        max_struct_definitions: Some(MAX_STRUCTS),
+        max_fields_in_struct: Some(MAX_FIELDS),
+        max_function_definitions: Some(MAX_FUNCTIONS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 1);
+    multi_functions(&mut module, 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 10);
+    multi_functions(&mut module, MAX_FUNCTIONS / 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 5);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 5);
+    multi_functions(&mut module, MAX_FUNCTIONS - 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 5);
+    multi_functions(&mut module, MAX_FUNCTIONS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FUNCTION_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_functions(&mut module, MAX_FUNCTIONS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FUNCTION_DEFINITIONS_REACHED,
+    );
+}
+
+#[test]
+fn max_mixed_config_test() {
+    let config = VerifierConfig {
+        max_struct_definitions: Some(MAX_STRUCTS),
+        max_fields_in_struct: Some(MAX_FIELDS),
+        max_function_definitions: Some(MAX_FUNCTIONS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+
+    let config = VerifierConfig {
+        max_function_definitions: None,
+        max_struct_definitions: None,
+        max_fields_in_struct: None,
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, 1);
+    multi_fields(&mut module, 1);
+    multi_functions(&mut module, 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS * 2);
+    multi_fields(&mut module, MAX_FIELDS * 2);
+    multi_functions(&mut module, MAX_FUNCTIONS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS + 1);
+    multi_fields(&mut module, MAX_FIELDS + 1);
+    multi_functions(&mut module, MAX_FUNCTIONS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+
+    let config = VerifierConfig {
+        max_struct_definitions: Some(MAX_STRUCTS),
+        max_fields_in_struct: Some(MAX_FIELDS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS + 10);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS * 3);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS * 2);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS + 1);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_STRUCT_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS * 2);
+    multi_functions(&mut module, MAX_FUNCTIONS * 3);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+
+    let config = VerifierConfig {
+        max_struct_definitions: Some(MAX_STRUCTS),
+        max_function_definitions: Some(MAX_FUNCTIONS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS + 1);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS * 3);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS * 2);
+    multi_fields(&mut module, MAX_FIELDS * 3);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_STRUCT_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS * 2);
+    multi_functions(&mut module, MAX_FUNCTIONS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FUNCTION_DEFINITIONS_REACHED,
+    );
+
+    let config = VerifierConfig {
+        max_fields_in_struct: Some(MAX_FIELDS),
+        max_function_definitions: Some(MAX_FUNCTIONS),
+        ..Default::default()
+    };
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS * 3);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS + 1);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(res, Ok(()));
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS + 1);
+    multi_fields(&mut module, MAX_FIELDS * 3);
+    multi_functions(&mut module, MAX_FUNCTIONS);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+    );
+    let mut module = leaf_module("M");
+    multi_struct(&mut module, MAX_STRUCTS * 2);
+    multi_fields(&mut module, MAX_FIELDS);
+    multi_functions(&mut module, MAX_FUNCTIONS * 2);
+    let res = LimitsVerifier::verify_module(&config, &module);
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::MAX_FUNCTION_DEFINITIONS_REACHED,
+    );
+}
+
+fn multi_struct(module: &mut CompiledModule, count: usize) {
+    for i in 0..count {
+        module
+            .identifiers
+            .push(Identifier::new(format!("A_{}", i)).unwrap());
+        module.struct_handles.push(StructHandle {
+            module: module.self_module_handle_idx,
+            name: IdentifierIndex((module.identifiers.len() - 1) as u16),
+            abilities: AbilitySet::EMPTY,
+            type_parameters: vec![],
+        });
+        module.struct_defs.push(StructDefinition {
+            struct_handle: StructHandleIndex((module.struct_handles.len() - 1) as u16),
+            field_information: StructFieldInformation::Declared(vec![]),
+        });
+    }
+}
+
+fn multi_fields(module: &mut CompiledModule, count: usize) {
+    for def in &mut module.struct_defs {
+        let mut fields = vec![];
+        for i in 0..count {
+            module
+                .identifiers
+                .push(Identifier::new(format!("f_{}", i)).unwrap());
+            fields.push(FieldDefinition {
+                name: Default::default(),
+                signature: TypeSignature(SignatureToken::U8),
+            });
+        }
+        def.field_information = StructFieldInformation::Declared(fields);
+    }
+}
+
+fn multi_fields_except_one(module: &mut CompiledModule, idx: usize, count: usize, one: usize) {
+    for (struct_idx, def) in module.struct_defs.iter_mut().enumerate() {
+        let mut fields = vec![];
+        let count = if struct_idx == idx { one } else { count };
+        for i in 0..count {
+            module
+                .identifiers
+                .push(Identifier::new(format!("f_{}", i)).unwrap());
+            fields.push(FieldDefinition {
+                name: Default::default(),
+                signature: TypeSignature(SignatureToken::U8),
+            });
+        }
+        def.field_information = StructFieldInformation::Declared(fields);
+    }
+}
+
+fn multi_functions(module: &mut CompiledModule, count: usize) {
+    module.signatures.push(Signature(vec![]));
+    for i in 0..count {
+        module
+            .identifiers
+            .push(Identifier::new(format!("func_{}", i)).unwrap());
+        module.function_handles.push(FunctionHandle {
+            module: module.self_module_handle_idx,
+            name: IdentifierIndex((module.identifiers.len() - 1) as u16),
+            parameters: SignatureIndex((module.signatures.len() - 1) as u16),
+            return_: SignatureIndex((module.signatures.len() - 1) as u16),
+            type_parameters: vec![],
+        });
+        module.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex((module.function_handles.len() - 1) as u16),
+            visibility: Visibility::Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex((module.signatures.len() - 1) as u16),
+                code: vec![Bytecode::Ret],
+            }),
+        });
+    }
+}
+
+fn leaf_module(name: &str) -> CompiledModule {
+    let mut module = empty_module();
+    module.identifiers[0] = Identifier::new(name).unwrap();
+    module.address_identifiers[0] = AccountAddress::ONE;
+    module
+}
diff --git a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/locals.rs b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/locals.rs
new file mode 100644
index 0000000000..efca303080
--- /dev/null
+++ b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/locals.rs
@@ -0,0 +1,120 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::production_config;
+use move_binary_format::file_format::{
+    empty_module, Bytecode, CodeUnit, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+    IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
+    Visibility::Public,
+};
+use move_core_types::{identifier::Identifier, vm_status::StatusCode};
+
+#[test]
+fn test_locals() {
+    // See also: github.com/aptos-labs/aptos-core/security/advisories/GHSA-jjqw-f9pc-525j
+    let mut m = empty_module();
+
+    const MAX_BASIC_BLOCKS: u16 = 1024;
+    const MAX_LOCALS: u8 = 255;
+    const NUM_FUNCTIONS: u16 = 16;
+
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Public,
+        is_entry: true,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Ret],
+        }),
+    });
+
+    // signature of locals in f1..f<NUM_FUNCTIONS>
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::U8)
+            .take(MAX_LOCALS as usize)
+            .collect(),
+    ));
+
+    m.identifiers.push(Identifier::new("pwn").unwrap());
+
+    // create returns_bool_and_u64
+    m.signatures
+        .push(Signature(vec![SignatureToken::Bool, SignatureToken::U8]));
+    m.identifiers
+        .push(Identifier::new("returns_bool_and_u64").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(2),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(1),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::LdTrue, Bytecode::LdU8(0), Bytecode::Ret],
+        }),
+    });
+
+    // create other functions
+    for i in 1..(NUM_FUNCTIONS + 1) {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i + 1), // the +1 accounts for returns_bool_and_u64
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i + 1),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(1),
+                code: vec![],
+            }),
+        });
+
+        let code = &mut m.function_defs[i as usize + 1].code.as_mut().unwrap().code;
+
+        for _ in 0..(MAX_BASIC_BLOCKS / 2 - MAX_LOCALS as u16 - 3) {
+            code.push(Bytecode::LdTrue);
+            code.push(Bytecode::BrTrue((code.len() + 2) as u16));
+            code.push(Bytecode::Ret);
+            code.push(Bytecode::LdTrue);
+            code.push(Bytecode::BrTrue(0));
+        }
+        for i in 0..MAX_LOCALS {
+            code.push(Bytecode::Call(FunctionHandleIndex(1))); // calls returns_bool_and_u64
+            code.push(Bytecode::StLoc(i as u8)); // i'th local is now available for the first time
+            code.push(Bytecode::BrTrue(0));
+        }
+        code.push(Bytecode::Ret);
+    }
+
+    let result = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_locals",
+        &production_config(),
+        &m,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED
+    );
+}
diff --git a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/loop_summary_tests.rs b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/loop_summary_tests.rs
new file mode 100644
index 0000000000..819b941270
--- /dev/null
+++ b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/loop_summary_tests.rs
@@ -0,0 +1,391 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{control_flow_graph::VMControlFlowGraph, file_format::Bytecode};
+use move_bytecode_verifier::loop_summary::{LoopPartition, LoopSummary};
+
+macro_rules! assert_node {
+    ( $summary:ident, $node:expr ; $block:expr, $preds:expr, $descs:expr, $backs:expr ) => {
+        let (s, n) = (&$summary, $node);
+        assert_eq!(s.block(n), $block, "Block");
+
+        let descs = $descs;
+        for d in descs {
+            assert!(s.is_descendant(n, *d), "{:?} -> {:?}", n, d)
+        }
+
+        assert_eq!(s.pred_edges(n), $preds, "Predecessor Edges");
+        assert_eq!(s.back_edges(n), $backs, "Back Edges");
+    };
+}
+
+#[test]
+fn linear_summary() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ Nop,
+            /*        */ Branch(2),
+            /* B2, L1 */ Nop,
+            /*        */ Branch(4),
+            /* B4, L2 */ Ret,
+        ]))
+    };
+
+    let n: Vec<_> = summary.preorder().collect();
+
+    assert_eq!(n.len(), 3);
+
+    assert_node!(
+        summary, n[0];
+        /* block */ 0,
+        /* preds */ &[],
+        /* descs */ &[n[1], n[2]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[1];
+        /* block */ 2,
+        /* preds */ &[n[0]],
+        /* descs */ &[n[2]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[2];
+        /* block */ 4,
+        /* preds */ &[n[1]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+}
+
+#[test]
+fn non_loop_back_branch_summary() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ Nop,
+            /*        */ Branch(3),
+            /* B2, L2 */ Ret,
+            /* B3, L1 */ Branch(2),
+        ]))
+    };
+
+    let n: Vec<_> = summary.preorder().collect();
+
+    assert_eq!(n.len(), 3);
+
+    assert_node!(
+        summary, n[0];
+        /* block */ 0,
+        /* preds */ &[],
+        /* descs */ &[n[1], n[2]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[1];
+        /* block */ 3,
+        /* preds */ &[n[0]],
+        /* descs */ &[n[2]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[2];
+        /* block */ 2,
+        /* preds */ &[n[1]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+}
+
+#[test]
+fn branching_summary() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ LdTrue,
+            /*        */ BrTrue(3),
+            /* B2, L2 */ Nop,
+            /* B3, L1 */ Ret,
+        ]))
+    };
+
+    let n: Vec<_> = summary.preorder().collect();
+
+    assert_eq!(n.len(), 3);
+
+    assert_node!(
+        summary, n[0];
+        /* block */ 0,
+        /* preds */ &[],
+        /* descs */ &[n[1], n[2]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[1];
+        /* block */ 3,
+        /* preds */ &[n[0], n[2]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[2];
+        /* block */ 2,
+        /* preds */ &[n[0]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+
+    // Although L2 -> L1 is an edge in the CFG, it's not an edge in the DFST, so L2 is said to have
+    // no descendants.
+    assert!(!summary.is_descendant(n[2], n[1]));
+}
+
+#[test]
+fn looping_summary() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ LdTrue,
+            /*        */ BrTrue(4),
+            /* B2, L2 */ Nop,
+            /*        */ Branch(0),
+            /* B4, L1 */ Ret,
+        ]))
+    };
+
+    let n: Vec<_> = summary.preorder().collect();
+
+    assert_eq!(n.len(), 3);
+
+    assert_node!(
+        summary, n[0];
+        /* block */ 0,
+        /* preds */ &[],
+        /* descs */ &[n[1], n[2]],
+        /* backs */ &[n[2]]
+    );
+
+    assert_node!(
+        summary, n[1];
+        /* block */ 4,
+        /* preds */ &[n[0]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[2];
+        /* block */ 2,
+        /* preds */ &[n[0]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+}
+
+#[test]
+fn branches_in_loops_summary() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ LdTrue,
+            /*        */ BrTrue(3),
+            /* B2, L3 */ Nop,
+            /* B3, L1 */ LdFalse,
+            /*        */ BrFalse(0),
+            /* B5, L2 */ Ret,
+        ]))
+    };
+
+    let n: Vec<_> = summary.preorder().collect();
+
+    assert_eq!(n.len(), 4);
+
+    assert_node!(
+        summary, n[0];
+        /* block */ 0,
+        /* preds */ &[],
+        /* descs */ &[n[1], n[2], n[3]],
+        /* backs */ &[n[1]]
+    );
+
+    assert_node!(
+        summary, n[1];
+        /* block */ 3,
+        /* preds */ &[n[0], n[3]],
+        /* descs */ &[n[2]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[2];
+        /* block */ 5,
+        /* preds */ &[n[1]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[3];
+        /* block */ 2,
+        /* preds */ &[n[0]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+}
+
+#[test]
+fn loops_in_branches_summary() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0,  L0 */ LdTrue,
+            /*         */ BrTrue(8),
+            /* B2,  L5   */ Nop,
+            /* B3,  L6     */ LdFalse,
+            /*             */ BrFalse(3),
+            /* B5,  L7   */ LdTrue,
+            /*           */ BrTrue(2),
+            /* B7,  L8 */ Branch(13),
+            /* B8,  L1   */ Nop,
+            /* B9,  L2   */ LdTrue,
+            /*           */ BrTrue(8),
+            /* B11, L3   */ LdFalse,
+            /*           */ BrFalse(9),
+            /* B13, L4 */ Ret,
+        ]))
+    };
+
+    let n: Vec<_> = summary.preorder().collect();
+
+    assert_eq!(n.len(), 9);
+
+    assert_node!(
+        summary, n[0];
+        /* block */ 0,
+        /* preds */ &[],
+        /* descs */ &[n[1], n[2], n[3], n[4], n[5], n[6], n[7], n[8]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[1];
+        /* block */ 8,
+        /* preds */ &[n[0]],
+        /* descs */ &[n[2], n[3], n[4]],
+        /* backs */ &[n[2]]
+    );
+
+    assert_node!(
+        summary, n[2];
+        /* block */ 9,
+        /* preds */ &[n[1]],
+        /* descs */ &[n[3], n[4]],
+        /* backs */ &[n[3]]
+    );
+
+    assert_node!(
+        summary, n[3];
+        /* block */ 11,
+        /* preds */ &[n[2]],
+        /* descs */ &[n[4]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[4];
+        /* block */ 13,
+        /* preds */ &[n[3], n[8]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[5];
+        /* block */ 2,
+        /* preds */ &[n[0]],
+        /* descs */ &[n[6], n[7], n[8]],
+        /* backs */ &[n[7]]
+    );
+
+    assert_node!(
+        summary, n[6];
+        /* block */ 3,
+        /* preds */ &[n[5]],
+        /* descs */ &[n[7], n[8]],
+        /* backs */ &[n[6]]
+    );
+
+    assert_node!(
+        summary, n[7];
+        /* block */ 5,
+        /* preds */ &[n[6]],
+        /* descs */ &[n[8]],
+        /* backs */ &[]
+    );
+
+    assert_node!(
+        summary, n[8];
+        /* block */ 7,
+        /* preds */ &[n[7]],
+        /* descs */ &[],
+        /* backs */ &[]
+    );
+}
+
+#[test]
+fn loop_collapsing() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ LdTrue,
+            /*        */ BrTrue(4),
+            /* B2, L2 */ Nop,
+            /*        */ Branch(0),
+            /* B4, L1 */ Ret,
+        ]))
+    };
+
+    let mut partition = LoopPartition::new(&summary);
+    let n: Vec<_> = summary.preorder().collect();
+
+    for id in &n {
+        assert_eq!(*id, partition.containing_loop(*id), "Self-parent {:?}", id);
+    }
+
+    assert_eq!(partition.collapse_loop(n[0], &[n[2]].into()), 1);
+    assert_eq!(partition.containing_loop(n[0]), n[0]);
+    assert_eq!(partition.containing_loop(n[1]), n[1]);
+    assert_eq!(partition.containing_loop(n[2]), n[0]);
+}
+
+#[test]
+fn nested_loop_collapsing() {
+    let summary = {
+        use Bytecode::*;
+        LoopSummary::new(&VMControlFlowGraph::new(&[
+            /* B0, L0 */ Nop,
+            /* B1, L1   */ LdTrue,
+            /*          */ BrTrue(1),
+            /* B3, L2 */ LdFalse,
+            /*        */ BrFalse(0),
+            /* B5, L3 */ LdTrue,
+            /*        */ BrTrue(0),
+            /* B7, L4 */ Ret,
+        ]))
+    };
+
+    let mut partition = LoopPartition::new(&summary);
+    let n: Vec<_> = summary.preorder().collect();
+
+    // Self-loop is a special case -- its depth should still be bumped.
+    assert_eq!(partition.collapse_loop(n[1], &[].into()), 1);
+    assert_eq!(partition.collapse_loop(n[0], &[n[1], n[2]].into()), 2);
+    assert_eq!(partition.collapse_loop(n[0], &[n[0], n[3]].into()), 3);
+}
diff --git a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/many_back_edges.rs b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/many_back_edges.rs
new file mode 100644
index 0000000000..cb9a7ac47f
--- /dev/null
+++ b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/many_back_edges.rs
@@ -0,0 +1,96 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::production_config;
+use move_binary_format::file_format::{
+    empty_module, Bytecode, CodeUnit, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+    IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
+    Visibility::Public,
+};
+use move_core_types::{identifier::Identifier, vm_status::StatusCode};
+
+const MAX_BASIC_BLOCKS: u16 = 1024;
+const MAX_LOCALS: u8 = 255;
+
+const NUM_FUNCTIONS: u16 = 16;
+
+#[test]
+fn many_backedges() {
+    let mut m = empty_module();
+
+    // signature of locals in f1..f<NUM_FUNCTIONS>
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::U8)
+            .take(MAX_LOCALS as usize)
+            .collect(),
+    ));
+
+    // create returns_bool_and_u64
+    m.signatures
+        .push(Signature(vec![SignatureToken::Bool, SignatureToken::U8]));
+    m.identifiers
+        .push(Identifier::new("returns_bool_and_u64").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(2),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::LdTrue, Bytecode::LdU8(0), Bytecode::Ret],
+        }),
+    });
+
+    // create other functions
+    for i in 1..(NUM_FUNCTIONS + 1) {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i + 1), // the +1 accounts for returns_bool_and_u64
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(1),
+                code: vec![],
+            }),
+        });
+
+        let code = &mut m.function_defs[i as usize].code.as_mut().unwrap().code;
+
+        for _ in 0..(MAX_BASIC_BLOCKS - MAX_LOCALS as u16 - 2) {
+            code.push(Bytecode::LdTrue);
+            code.push(Bytecode::BrTrue(0));
+        }
+        for i in 0..MAX_LOCALS {
+            code.push(Bytecode::Call(FunctionHandleIndex(0))); // calls returns_bool_and_u64
+            code.push(Bytecode::StLoc(i as u8)); // i'th local is now available for the first time
+            code.push(Bytecode::BrTrue(0));
+        }
+        code.push(Bytecode::Ret);
+    }
+
+    let result = move_bytecode_verifier::verify_module_with_config_for_test(
+        "many_backedges",
+        &production_config(),
+        &m,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED
+    );
+}
diff --git a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/mod.rs b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/mod.rs
index 57d1e9b847..325cdddcba 100644
--- a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/mod.rs
+++ b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/mod.rs
@@ -2,15 +2,52 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use move_bytecode_verifier::VerifierConfig;
+
 pub mod ability_field_requirements_tests;
+pub mod binary_samples;
 pub mod bounds_tests;
+pub mod catch_unwind;
 pub mod code_unit_tests;
 pub mod constants_tests;
 pub mod control_flow_tests;
 pub mod dependencies_tests;
 pub mod duplication_tests;
 pub mod generic_ops_tests;
+pub mod large_type_test;
+pub mod limit_tests;
+pub mod locals;
+pub mod loop_summary_tests;
+pub mod many_back_edges;
 pub mod multi_pass_tests;
 pub mod negative_stack_size_tests;
+pub mod reference_safety_tests;
 pub mod signature_tests;
 pub mod struct_defs_tests;
+pub mod vec_pack_tests;
+
+/// Configuration used in production.
+pub(crate) fn production_config() -> VerifierConfig {
+    VerifierConfig {
+        max_loop_depth: Some(5),
+        max_generic_instantiation_length: Some(32),
+        max_function_parameters: Some(128),
+        max_basic_blocks: Some(1024),
+        max_basic_blocks_in_script: Some(1024),
+        max_value_stack_size: 1024,
+        max_type_nodes: Some(256),
+        max_push_size: Some(10000),
+        max_dependency_depth: Some(100),
+        max_struct_definitions: Some(200),
+        max_fields_in_struct: Some(30),
+        max_function_definitions: Some(1000),
+
+        // Do not use back edge constraints as they are superseded by metering
+        max_back_edges_per_function: None,
+        max_back_edges_per_module: None,
+
+        // Same as the default.
+        max_per_fun_meter_units: Some(1000 * 8000),
+        max_per_mod_meter_units: Some(1000 * 8000),
+    }
+}
diff --git a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/negative_stack_size_tests.rs b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/negative_stack_size_tests.rs
index ceacdcea50..c239747e3d 100644
--- a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/negative_stack_size_tests.rs
+++ b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/negative_stack_size_tests.rs
@@ -10,7 +10,7 @@ use move_core_types::vm_status::StatusCode;
 #[test]
 fn one_pop_no_push() {
     let module = dummy_procedure_module(vec![Bytecode::Pop, Bytecode::Ret]);
-    let result = CodeUnitVerifier::verify_module(&module);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module);
     assert_eq!(
         result.unwrap_err().major_status(),
         StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK
@@ -21,7 +21,7 @@ fn one_pop_no_push() {
 fn one_pop_one_push() {
     // Height: 0 + (-1 + 1) = 0 would have passed original usage verifier
     let module = dummy_procedure_module(vec![Bytecode::ReadRef, Bytecode::Ret]);
-    let result = CodeUnitVerifier::verify_module(&module);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module);
     assert_eq!(
         result.unwrap_err().major_status(),
         StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK
@@ -32,7 +32,7 @@ fn one_pop_one_push() {
 fn two_pop_one_push() {
     // Height: 0 + 1 + (-2 + 1) = 0 would have passed original usage verifier
     let module = dummy_procedure_module(vec![Bytecode::LdU64(0), Bytecode::Add, Bytecode::Ret]);
-    let result = CodeUnitVerifier::verify_module(&module);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module);
     assert_eq!(
         result.unwrap_err().major_status(),
         StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK
@@ -42,7 +42,7 @@ fn two_pop_one_push() {
 #[test]
 fn two_pop_no_push() {
     let module = dummy_procedure_module(vec![Bytecode::WriteRef, Bytecode::Ret]);
-    let result = CodeUnitVerifier::verify_module(&module);
+    let result = CodeUnitVerifier::verify_module(&Default::default(), &module);
     assert_eq!(
         result.unwrap_err().major_status(),
         StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK
diff --git a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/reference_safety_tests.rs b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/reference_safety_tests.rs
new file mode 100644
index 0000000000..e063280d8f
--- /dev/null
+++ b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/reference_safety_tests.rs
@@ -0,0 +1,422 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::production_config;
+use move_binary_format::file_format::{
+    empty_module, Bytecode, CodeUnit, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+    IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
+    Visibility::Public,
+};
+use move_core_types::{identifier::Identifier, vm_status::StatusCode};
+
+#[test]
+fn test_bicliques() {
+    // See also: github.com/aptos-labs/aptos-core/security/advisories/GHSA-xm6p-ffcq-5p2v
+    const NUM_LOCALS: u8 = 128;
+    const NUM_CALLS: u16 = 76;
+    const NUM_FUNCTIONS: u16 = 1;
+
+    let mut m = empty_module();
+
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(0)), Bytecode::Ret],
+        }),
+    });
+
+    // create take_and_return_references
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::Reference(Box::new(SignatureToken::U64)))
+            .take(NUM_LOCALS as usize)
+            .collect(),
+    ));
+    m.identifiers
+        .push(Identifier::new("take_and_return_references").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(1),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![],
+        }),
+    });
+    let code = &mut m.function_defs[1].code.as_mut().unwrap().code;
+    for i in 0..NUM_LOCALS {
+        code.push(Bytecode::MoveLoc(i));
+    }
+    code.push(Bytecode::Ret);
+
+    // create swallow_references
+    m.identifiers
+        .push(Identifier::new("swallow_references").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(2),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(2),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Ret],
+        }),
+    });
+
+    // create other functions
+    for i in 1..(NUM_FUNCTIONS + 1) {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i + 2),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i + 2),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code: vec![],
+            }),
+        });
+        let code = &mut m.function_defs[i as usize + 2].code.as_mut().unwrap().code;
+        for j in 0..NUM_LOCALS {
+            code.push(Bytecode::CopyLoc(j));
+        }
+        for _ in 0..NUM_CALLS {
+            code.push(Bytecode::Call(FunctionHandleIndex(1)));
+        }
+        code.push(Bytecode::Call(FunctionHandleIndex(2)));
+        code.push(Bytecode::Ret);
+    }
+
+    let result = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_bicliques",
+        &production_config(),
+        &m,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED
+    );
+}
+
+#[test]
+fn test_merge_state_large_graph() {
+    // See also: github.com/aptos-labs/aptos-core/security/advisories/GHSA-g8v8-fw4c-8h82
+    const N: u8 = 127;
+    const NUM_NOP_BLOCKS: u16 = 950;
+    const NUM_FUNCTIONS: u16 = 18;
+
+    let mut m = empty_module();
+
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(0)), Bytecode::Ret],
+        }),
+    });
+
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::Reference(Box::new(SignatureToken::U8)))
+            .take(N as usize)
+            .collect(),
+    ));
+
+    m.identifiers.push(Identifier::new("return_refs").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(1),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(1)), Bytecode::Ret],
+        }),
+    });
+
+    m.identifiers
+        .push(Identifier::new("take_and_return_refs").unwrap());
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(2),
+        parameters: SignatureIndex(1),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(2),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(1)), Bytecode::Ret],
+        }),
+    });
+
+    for i in 0..NUM_FUNCTIONS {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i + 3),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i + 3),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(1),
+                code: vec![],
+            }),
+        });
+        let code = &mut m.function_defs[i as usize + 3].code.as_mut().unwrap().code;
+        for j in 0..N {
+            code.push(Bytecode::CopyLoc(j));
+        }
+        code.push(Bytecode::Call(FunctionHandleIndex(2)));
+        for j in 0..N {
+            code.push(Bytecode::StLoc(N + j));
+        }
+        for _ in 0..NUM_NOP_BLOCKS {
+            code.push(Bytecode::LdTrue);
+            code.push(Bytecode::BrTrue(0));
+        }
+
+        code.push(Bytecode::Ret);
+    }
+
+    let res = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_merge_state_large_graph",
+        &production_config(),
+        &m,
+    );
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED
+    );
+}
+
+#[test]
+fn test_merge_state() {
+    // See also: github.com/aptos-labs/aptos-core/security/advisories/GHSA-g8v8-fw4c-8h82
+    const NUM_NOP_BLOCKS: u16 = 965;
+    const NUM_LOCALS: u8 = 32;
+    const NUM_FUNCTIONS: u16 = 21;
+
+    let mut m = empty_module();
+
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(0),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![Bytecode::Call(FunctionHandleIndex(0)), Bytecode::Ret],
+        }),
+    });
+
+    m.signatures
+        .push(Signature(vec![SignatureToken::Reference(Box::new(
+            SignatureToken::U8,
+        ))]));
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::Reference(Box::new(SignatureToken::U8)))
+            .take(NUM_LOCALS as usize - 1)
+            .collect(),
+    ));
+
+    for i in 0..NUM_FUNCTIONS {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i + 1),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i + 1),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(2),
+                code: vec![],
+            }),
+        });
+        let code = &mut m.function_defs[i as usize + 1].code.as_mut().unwrap().code;
+        // create reference id
+        code.push(Bytecode::CopyLoc(0));
+        code.push(Bytecode::StLoc(1));
+        // create a path of length NUM_LOCALS - 1 in the borrow graph
+        for j in 0..(NUM_LOCALS - 2) {
+            // create Ref(new_id) and factor in empty-path edge id -> new_id
+            code.push(Bytecode::CopyLoc(1));
+            // can't leave those references on stack since basic blocks need to be stack-neutral
+            code.push(Bytecode::StLoc(j + 2));
+        }
+        for _ in 0..NUM_NOP_BLOCKS {
+            code.push(Bytecode::LdTrue);
+            // create back edge to first block
+            code.push(Bytecode::BrTrue(0));
+        }
+
+        code.push(Bytecode::Ret);
+    }
+
+    let res = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_merge_state",
+        &production_config(),
+        &m,
+    );
+    assert_eq!(
+        res.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED
+    );
+}
+
+#[test]
+fn test_copyloc_pop() {
+    // See also: github.com/aptos-labs/aptos-core/security/advisories/GHSA-2qvr-c9qp-wch7
+    const NUM_COPYLOCS: u16 = 1880;
+    const NUM_CHILDREN: u16 = 1020;
+    const NUM_FUNCTIONS: u16 = 2;
+
+    let mut m = empty_module();
+
+    // parameters of f0, f1, ...
+    m.signatures
+        .push(Signature(vec![SignatureToken::Reference(Box::new(
+            SignatureToken::Vector(Box::new(SignatureToken::U8)),
+        ))]));
+    // locals of f0, f1, ...
+    m.signatures.push(Signature(vec![
+        SignatureToken::Reference(Box::new(SignatureToken::Vector(Box::new(
+            SignatureToken::U8,
+        )))),
+        SignatureToken::U8, // ignore this, it's just here because I don't want to fix indices and the TypeParameter after removing the collision
+    ]));
+    // for VecImmBorrow
+    m.signatures.push(Signature(
+        std::iter::repeat(SignatureToken::U8).take(1).collect(),
+    ));
+    m.signatures
+        .push(Signature(vec![SignatureToken::TypeParameter(0)]));
+
+    for i in 0..NUM_FUNCTIONS {
+        m.identifiers
+            .push(Identifier::new(format!("f{}", i)).unwrap());
+        m.function_handles.push(FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(i),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        });
+        m.function_defs.push(FunctionDefinition {
+            function: FunctionHandleIndex(i),
+            visibility: Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(2),
+                code: vec![],
+            }),
+        });
+        let code = &mut m.function_defs[i as usize].code.as_mut().unwrap().code;
+
+        // create reference id
+        code.push(Bytecode::CopyLoc(0));
+        code.push(Bytecode::StLoc(1));
+        // create NUM_CHLIDREN children of id
+        for _ in 0..NUM_CHILDREN {
+            code.push(Bytecode::CopyLoc(1));
+            code.push(Bytecode::LdU64(0));
+            code.push(Bytecode::VecImmBorrow(SignatureIndex(3)));
+        }
+        // then do a whole lot of copylocs on that reference
+        for _ in 0..NUM_COPYLOCS {
+            code.push(Bytecode::CopyLoc(1));
+            code.push(Bytecode::Pop);
+        }
+        for _ in 0..NUM_CHILDREN {
+            code.push(Bytecode::Pop);
+        }
+
+        code.push(Bytecode::Ret);
+    }
+
+    let result = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_copyloc_pop",
+        &production_config(),
+        &m,
+    );
+    assert_eq!(
+        result.unwrap_err().major_status(),
+        StatusCode::CONSTRAINT_NOT_SATISFIED
+    );
+}
diff --git a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/signature_tests.rs b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/signature_tests.rs
index b077852144..30729e5a17 100644
--- a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/signature_tests.rs
+++ b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/signature_tests.rs
@@ -2,10 +2,15 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::unit_tests::production_config;
 use invalid_mutations::signature::{FieldRefMutation, SignatureRefMutation};
-use move_binary_format::file_format::{Bytecode::*, CompiledModule, SignatureToken::*, *};
-use move_bytecode_verifier::{verify_module, SignatureChecker};
-use move_core_types::{account_address::AccountAddress, identifier::Identifier};
+use move_binary_format::file_format::{
+    Bytecode::*, CompiledModule, SignatureToken::*, Visibility::Public, *,
+};
+use move_bytecode_verifier::{verify_module, verify_module_with_config_for_test, SignatureChecker};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
+};
 use proptest::{collection::vec, prelude::*, sample::Index as PropIndex};
 
 #[test]
@@ -121,3 +126,95 @@ fn no_verify_locals_good() {
     };
     assert!(verify_module(&compiled_module_good).is_ok());
 }
+
+#[test]
+fn big_signature_test() {
+    const N_TYPE_PARAMS: usize = 5;
+    const INSTANTIATION_DEPTH: usize = 3;
+    const VECTOR_DEPTH: usize = 250;
+    let mut st = SignatureToken::U8;
+    for _ in 0..VECTOR_DEPTH {
+        st = SignatureToken::Vector(Box::new(st));
+    }
+    for _ in 0..INSTANTIATION_DEPTH {
+        let type_params = vec![st; N_TYPE_PARAMS];
+        st = SignatureToken::StructInstantiation(StructHandleIndex(0), type_params);
+    }
+
+    const N_READPOP: u16 = 7500;
+
+    let mut code = vec![];
+    // 1. ImmBorrowLoc: ... ref
+    // 2. ReadRef:      ... value
+    // 3. Pop:          ...
+    for _ in 0..N_READPOP {
+        code.push(Bytecode::ImmBorrowLoc(0));
+        code.push(Bytecode::ReadRef);
+        code.push(Bytecode::Pop);
+    }
+    code.push(Bytecode::Ret);
+
+    let type_param_constraints = StructTypeParameter {
+        constraints: AbilitySet::EMPTY,
+        is_phantom: false,
+    };
+
+    let module = CompiledModule {
+        version: 5,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![StructHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(1),
+            abilities: AbilitySet::ALL,
+            type_parameters: vec![type_param_constraints; N_TYPE_PARAMS],
+        }],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(0),
+            parameters: SignatureIndex(1),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![Signature(vec![]), Signature(vec![st])],
+        identifiers: vec![
+            Identifier::new("f").unwrap(),
+            Identifier::new("generic_struct").unwrap(),
+        ],
+        address_identifiers: vec![AccountAddress::ONE],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![StructDefinition {
+            struct_handle: StructHandleIndex(0),
+            field_information: StructFieldInformation::Native,
+        }],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: Public,
+            is_entry: true,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code,
+            }),
+        }],
+    };
+
+    // save module and verify that it can ser/de
+    let mut mvbytes = vec![];
+    module.serialize(&mut mvbytes).unwrap();
+    let module = CompiledModule::deserialize(&mvbytes).unwrap();
+
+    let res =
+        verify_module_with_config_for_test("big_signature_test", &production_config(), &module)
+            .unwrap_err();
+    assert_eq!(res.major_status(), StatusCode::TOO_MANY_TYPE_NODES);
+}
diff --git a/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/vec_pack_tests.rs b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/vec_pack_tests.rs
new file mode 100644
index 0000000000..8a1b5b27f9
--- /dev/null
+++ b/language/move-bytecode-verifier/bytecode-verifier-tests/src/unit_tests/vec_pack_tests.rs
@@ -0,0 +1,69 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::unit_tests::production_config;
+use move_binary_format::file_format::{
+    empty_module, Bytecode, CodeUnit, FunctionDefinition, FunctionHandle, FunctionHandleIndex,
+    IdentifierIndex, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken, Visibility,
+};
+use move_core_types::{identifier::Identifier, vm_status::StatusCode};
+
+fn vec_sig(len: usize) -> SignatureToken {
+    if len > 0 {
+        SignatureToken::Vector(Box::new(vec_sig(len - 1)))
+    } else {
+        SignatureToken::U8
+    }
+}
+
+#[test]
+fn test_vec_pack() {
+    let mut m = empty_module();
+
+    let sig = SignatureIndex(m.signatures.len() as u16);
+    m.signatures.push(Signature(vec![vec_sig(255)]));
+
+    m.function_defs.push(FunctionDefinition {
+        function: FunctionHandleIndex(0),
+        visibility: Visibility::Private,
+        is_entry: false,
+        acquires_global_resources: vec![],
+        code: Some(CodeUnit {
+            locals: SignatureIndex(0),
+            code: vec![],
+        }),
+    });
+
+    m.function_handles.push(FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(m.identifiers.len() as u16),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(0),
+        type_parameters: vec![],
+    });
+    m.identifiers
+        .push(Identifier::new("foo".to_string()).unwrap());
+
+    const COUNT: usize = 3000;
+
+    m.function_defs[0].code.as_mut().unwrap().code =
+        std::iter::once(&[Bytecode::VecPack(sig, 0)][..])
+            .chain(
+                std::iter::repeat(
+                    &[Bytecode::VecUnpack(sig, 1024), Bytecode::VecPack(sig, 1024)][..],
+                )
+                .take(COUNT),
+            )
+            .chain(std::iter::once(&[Bytecode::Pop, Bytecode::Ret][..]))
+            .flatten()
+            .cloned()
+            .collect();
+
+    let res = move_bytecode_verifier::verify_module_with_config_for_test(
+        "test_vec_pack",
+        &production_config(),
+        &m,
+    )
+    .unwrap_err();
+    assert_eq!(res.major_status(), StatusCode::VALUE_STACK_PUSH_OVERFLOW);
+}
diff --git a/language/move-bytecode-verifier/fuzz/.gitignore b/language/move-bytecode-verifier/fuzz/.gitignore
new file mode 100644
index 0000000000..a0925114d6
--- /dev/null
+++ b/language/move-bytecode-verifier/fuzz/.gitignore
@@ -0,0 +1,3 @@
+target
+corpus
+artifacts
diff --git a/language/move-bytecode-verifier/fuzz/Cargo.toml b/language/move-bytecode-verifier/fuzz/Cargo.toml
new file mode 100644
index 0000000000..90c2a406bd
--- /dev/null
+++ b/language/move-bytecode-verifier/fuzz/Cargo.toml
@@ -0,0 +1,39 @@
+[package]
+name = "bytecode-verifier-libfuzzer"
+version = "0.0.0"
+authors = ["Diem Association <opensource@diem.com>"]
+license = "Apache-2.0"
+publish = false
+edition = "2018"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+libfuzzer-sys = "0.4"
+arbitrary = "1.1.7"
+move-bytecode-verifier = { path = "../" }
+move-core-types = { path = "../../move-core/types", features = ["fuzzing"] }
+move-binary-format = { path = "../../move-binary-format", features = ["fuzzing"] }
+
+# Prevent this from interfering with workspaces
+#[workspace]
+#members = ["."]
+
+[[bin]]
+name = "code_unit"
+path = "fuzz_targets/code_unit.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "compiled_module"
+path = "fuzz_targets/compiled_module.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "mixed"
+path = "fuzz_targets/mixed.rs"
+test = false
+doc = false
diff --git a/language/move-bytecode-verifier/fuzz/README.md b/language/move-bytecode-verifier/fuzz/README.md
new file mode 100644
index 0000000000..633a4797a4
--- /dev/null
+++ b/language/move-bytecode-verifier/fuzz/README.md
@@ -0,0 +1,4 @@
+See the [Rust fuzzing book](https://rust-fuzz.github.io/book/)
+for how to use the fuzz targets in this directory. Notice that
+`cargo +nightly fuzz run <target>` need to be executed in the parent
+directory; nightly is required.
diff --git a/language/move-bytecode-verifier/fuzz/fuzz_targets/code_unit.rs b/language/move-bytecode-verifier/fuzz/fuzz_targets/code_unit.rs
new file mode 100644
index 0000000000..32d4cb8ac5
--- /dev/null
+++ b/language/move-bytecode-verifier/fuzz/fuzz_targets/code_unit.rs
@@ -0,0 +1,83 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![no_main]
+use move_binary_format::file_format::{
+    empty_module, AbilitySet, CodeUnit, Constant, FieldDefinition, FunctionDefinition,
+    FunctionHandle, FunctionHandleIndex, IdentifierIndex, ModuleHandleIndex, Signature,
+    SignatureIndex,
+    SignatureToken::{Address, Bool, U128, U64},
+    StructDefinition, StructFieldInformation, StructHandle, StructHandleIndex, TypeSignature,
+    Visibility,
+};
+use move_core_types::{account_address::AccountAddress, identifier::Identifier};
+use std::str::FromStr;
+
+use libfuzzer_sys::fuzz_target;
+
+fuzz_target!(|code_unit: CodeUnit| {
+    let mut module = empty_module();
+    module.version = 5;
+
+    module.struct_handles.push(StructHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        abilities: AbilitySet::ALL,
+        type_parameters: vec![],
+    });
+
+    let fun_handle = FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(2),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    };
+
+    module.function_handles.push(fun_handle);
+
+    module.signatures.pop();
+    module.signatures.push(Signature(vec![
+        Address, U64, Address, Address, U128, Address, U64, U64, U64,
+    ]));
+    module.signatures.push(Signature(vec![]));
+    module
+        .signatures
+        .push(Signature(vec![Address, Bool, Address]));
+
+    module.identifiers.extend(
+        vec![
+            Identifier::from_str("zf_hello_world").unwrap(),
+            Identifier::from_str("awldFnU18mlDKQfh6qNfBGx8X").unwrap(),
+            Identifier::from_str("aQPwJNHyAHpvJ").unwrap(),
+            Identifier::from_str("aT7ZphKTrKcYCwCebJySrmrKlckmnL5").unwrap(),
+            Identifier::from_str("arYpsFa2fvrpPJ").unwrap(),
+        ]
+        .into_iter(),
+    );
+    module.address_identifiers.push(AccountAddress::random());
+
+    module.constant_pool.push(Constant {
+        type_: Address,
+        data: AccountAddress::ZERO.into_bytes().to_vec(),
+    });
+
+    module.struct_defs.push(StructDefinition {
+        struct_handle: StructHandleIndex(0),
+        field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+            name: IdentifierIndex::new(3),
+            signature: TypeSignature(Address),
+        }]),
+    });
+
+    let fun_def = FunctionDefinition {
+        code: Some(code_unit),
+        function: FunctionHandleIndex(0),
+        visibility: Visibility::Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+    };
+
+    module.function_defs.push(fun_def);
+    let _ = move_bytecode_verifier::verify_module(&module);
+});
diff --git a/language/move-bytecode-verifier/fuzz/fuzz_targets/compiled_module.rs b/language/move-bytecode-verifier/fuzz/fuzz_targets/compiled_module.rs
new file mode 100644
index 0000000000..ba077a820d
--- /dev/null
+++ b/language/move-bytecode-verifier/fuzz/fuzz_targets/compiled_module.rs
@@ -0,0 +1,10 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![no_main]
+use libfuzzer_sys::fuzz_target;
+use move_binary_format::file_format::CompiledModule;
+
+fuzz_target!(|module: CompiledModule| {
+    let _ = move_bytecode_verifier::verify_module(&module);
+});
diff --git a/language/move-bytecode-verifier/fuzz/fuzz_targets/mixed.rs b/language/move-bytecode-verifier/fuzz/fuzz_targets/mixed.rs
new file mode 100644
index 0000000000..35df4a5f2f
--- /dev/null
+++ b/language/move-bytecode-verifier/fuzz/fuzz_targets/mixed.rs
@@ -0,0 +1,97 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![no_main]
+use move_binary_format::file_format::{
+    empty_module, AbilitySet, Bytecode, CodeUnit, Constant, FieldDefinition, FunctionDefinition,
+    FunctionHandle, FunctionHandleIndex, IdentifierIndex, ModuleHandleIndex, Signature,
+    SignatureIndex, SignatureToken,
+    SignatureToken::{Address, Bool},
+    StructDefinition, StructFieldInformation, StructHandle, StructHandleIndex, TypeSignature,
+    Visibility,
+};
+use move_core_types::{account_address::AccountAddress, identifier::Identifier};
+use std::str::FromStr;
+
+use arbitrary::Arbitrary;
+use libfuzzer_sys::fuzz_target;
+
+#[derive(Arbitrary, Debug)]
+struct Mixed {
+    code: Vec<Bytecode>,
+    abilities: AbilitySet,
+    param_types: Vec<SignatureToken>,
+    return_type: Option<SignatureToken>,
+}
+
+fuzz_target!(|mix: Mixed| {
+    let mut module = empty_module();
+    module.version = 5;
+
+    module.struct_handles.push(StructHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        abilities: mix.abilities,
+        type_parameters: vec![],
+    });
+
+    let fun_handle = FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(2),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    };
+
+    module.function_handles.push(fun_handle);
+
+    module.signatures.pop();
+    module.signatures.push(Signature(mix.param_types));
+    module.signatures.push(Signature(
+        mix.return_type.map(|s| vec![s]).unwrap_or_default(),
+    ));
+    module
+        .signatures
+        .push(Signature(vec![Address, Bool, Address]));
+
+    module.identifiers.extend(
+        vec![
+            Identifier::from_str("zf_hello_world").unwrap(),
+            Identifier::from_str("awldFnU18mlDKQfh6qNfBGx8X").unwrap(),
+            Identifier::from_str("aQPwJNHyAHpvJ").unwrap(),
+            Identifier::from_str("aT7ZphKTrKcYCwCebJySrmrKlckmnL5").unwrap(),
+            Identifier::from_str("arYpsFa2fvrpPJ").unwrap(),
+        ]
+        .into_iter(),
+    );
+    module.address_identifiers.push(AccountAddress::random());
+
+    module.constant_pool.push(Constant {
+        type_: Address,
+        data: AccountAddress::ZERO.into_bytes().to_vec(),
+    });
+
+    module.struct_defs.push(StructDefinition {
+        struct_handle: StructHandleIndex(0),
+        field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+            name: IdentifierIndex::new(3),
+            signature: TypeSignature(Address),
+        }]),
+    });
+
+    let code_unit = CodeUnit {
+        code: mix.code,
+        locals: SignatureIndex(0),
+    };
+
+    let fun_def = FunctionDefinition {
+        code: Some(code_unit),
+        function: FunctionHandleIndex(0),
+        visibility: Visibility::Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+    };
+
+    module.function_defs.push(fun_def);
+    let _ = move_bytecode_verifier::verify_module(&module);
+});
diff --git a/language/move-bytecode-verifier/invalid-mutations/Cargo.toml b/language/move-bytecode-verifier/invalid-mutations/Cargo.toml
index 5f6fc2617c..ed46af714c 100644
--- a/language/move-bytecode-verifier/invalid-mutations/Cargo.toml
+++ b/language/move-bytecode-verifier/invalid-mutations/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "invalid-mutations"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem invalid mutations"
 repository = "https://github.com/diem/diem"
diff --git a/language/move-bytecode-verifier/invalid-mutations/src/bounds.rs b/language/move-bytecode-verifier/invalid-mutations/src/bounds.rs
index e3d0d9d2af..b4d31c2011 100644
--- a/language/move-bytecode-verifier/invalid-mutations/src/bounds.rs
+++ b/language/move-bytecode-verifier/invalid-mutations/src/bounds.rs
@@ -358,6 +358,7 @@ fn struct_handle(token: &SignatureToken) -> Option<StructHandleIndex> {
         Struct(sh_idx) => Some(*sh_idx),
         StructInstantiation(sh_idx, _) => Some(*sh_idx),
         Reference(token) | MutableReference(token) => struct_handle(token),
-        Bool | U8 | U64 | U128 | Address | Signer | Vector(_) | TypeParameter(_) => None,
+        Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address | Signer | Vector(_)
+        | TypeParameter(_) => None,
     }
 }
diff --git a/language/move-bytecode-verifier/invalid-mutations/src/bounds/code_unit.rs b/language/move-bytecode-verifier/invalid-mutations/src/bounds/code_unit.rs
index 6396835a23..18085317dc 100644
--- a/language/move-bytecode-verifier/invalid-mutations/src/bounds/code_unit.rs
+++ b/language/move-bytecode-verifier/invalid-mutations/src/bounds/code_unit.rs
@@ -478,8 +478,9 @@ impl<'a> ApplyCodeUnitBoundsContext<'a> {
 
                     // List out the other options explicitly so there's a compile error if a new
                     // bytecode gets added.
-                    FreezeRef | Pop | Ret | LdU8(_) | LdU64(_) | LdU128(_) | CastU8 | CastU64
-                    | CastU128 | LdTrue | LdFalse | ReadRef | WriteRef | Add | Sub | Mul | Mod
+                    FreezeRef | Pop | Ret | LdU8(_) | LdU16(_) | LdU32(_) | LdU64(_)
+                    | LdU128(_) | LdU256(_) | CastU8 | CastU16 | CastU32 | CastU64 | CastU128
+                    | CastU256 | LdTrue | LdFalse | ReadRef | WriteRef | Add | Sub | Mul | Mod
                     | Div | BitOr | BitAnd | Xor | Shl | Shr | Or | And | Not | Eq | Neq | Lt
                     | Gt | Le | Ge | Abort | Nop => {
                         panic!("Bytecode has no internal index: {:?}", code[bytecode_idx])
@@ -538,8 +539,9 @@ fn is_interesting(bytecode: &Bytecode) -> bool {
 
         // List out the other options explicitly so there's a compile error if a new
         // bytecode gets added.
-        FreezeRef | Pop | Ret | LdU8(_) | LdU64(_) | LdU128(_) | CastU8 | CastU64 | CastU128
-        | LdTrue | LdFalse | ReadRef | WriteRef | Add | Sub | Mul | Mod | Div | BitOr | BitAnd
-        | Xor | Shl | Shr | Or | And | Not | Eq | Neq | Lt | Gt | Le | Ge | Abort | Nop => false,
+        FreezeRef | Pop | Ret | LdU8(_) | LdU16(_) | LdU32(_) | LdU64(_) | LdU128(_)
+        | LdU256(_) | CastU8 | CastU16 | CastU32 | CastU64 | CastU128 | CastU256 | LdTrue
+        | LdFalse | ReadRef | WriteRef | Add | Sub | Mul | Mod | Div | BitOr | BitAnd | Xor
+        | Shl | Shr | Or | And | Not | Eq | Neq | Lt | Gt | Le | Ge | Abort | Nop => false,
     }
 }
diff --git a/language/move-bytecode-verifier/src/absint.rs b/language/move-bytecode-verifier/src/absint.rs
index acb4077ced..9945d6f3d7 100644
--- a/language/move-bytecode-verifier/src/absint.rs
+++ b/language/move-bytecode-verifier/src/absint.rs
@@ -2,9 +2,11 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::meter::Meter;
 use move_binary_format::{
     binary_views::FunctionView,
     control_flow_graph::{BlockId, ControlFlowGraph},
+    errors::PartialVMResult,
     file_format::{Bytecode, CodeOffset},
 };
 use std::collections::BTreeMap;
@@ -12,7 +14,7 @@ use std::collections::BTreeMap;
 /// Trait for finite-height abstract domains. Infinite height domains would require a more complex
 /// trait with widening and a partial order.
 pub trait AbstractDomain: Clone + Sized {
-    fn join(&mut self, other: &Self) -> JoinResult;
+    fn join(&mut self, other: &Self, meter: &mut impl Meter) -> PartialVMResult<JoinResult>;
 }
 
 #[derive(Debug)]
@@ -21,36 +23,22 @@ pub enum JoinResult {
     Unchanged,
 }
 
-#[derive(Clone)]
-pub enum BlockPostcondition<AnalysisError> {
-    /// Block not yet analyzed
-    Unprocessed,
-    /// Analyzing block was successful
-    /// TODO might carry post state at some point
-    Success,
-    /// Analyzing block resulted in an error
-    Error(AnalysisError),
-}
-
 #[allow(dead_code)]
 #[derive(Clone)]
-pub struct BlockInvariant<State, AnalysisError> {
+pub struct BlockInvariant<State> {
     /// Precondition of the block
-    pub pre: State,
-    /// Postcondition of the block
-    pub post: BlockPostcondition<AnalysisError>,
+    pre: State,
 }
 
 /// A map from block id's to the pre/post of each block after a fixed point is reached.
 #[allow(dead_code)]
-pub type InvariantMap<State, AnalysisError> =
-    BTreeMap<BlockId, BlockInvariant<State, AnalysisError>>;
+pub type InvariantMap<State> = BTreeMap<BlockId, BlockInvariant<State>>;
 
 /// Take a pre-state + instruction and mutate it to produce a post-state
 /// Auxiliary data can be stored in self.
 pub trait TransferFunctions {
     type State: AbstractDomain;
-    type AnalysisError;
+    type Error;
 
     /// Execute local@instr found at index local@index in the current basic block from pre-state
     /// local@pre.
@@ -68,7 +56,8 @@ pub trait TransferFunctions {
         instr: &Bytecode,
         index: CodeOffset,
         last_index: CodeOffset,
-    ) -> Result<(), Self::AnalysisError>;
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()>;
 }
 
 pub trait AbstractInterpreter: TransferFunctions {
@@ -77,17 +66,12 @@ pub trait AbstractInterpreter: TransferFunctions {
         &mut self,
         initial_state: Self::State,
         function_view: &FunctionView,
-    ) -> InvariantMap<Self::State, Self::AnalysisError> {
-        let mut inv_map: InvariantMap<Self::State, Self::AnalysisError> = InvariantMap::new();
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        let mut inv_map = InvariantMap::new();
         let entry_block_id = function_view.cfg().entry_block_id();
         let mut next_block = Some(entry_block_id);
-        inv_map.insert(
-            entry_block_id,
-            BlockInvariant {
-                pre: initial_state,
-                post: BlockPostcondition::Unprocessed,
-            },
-        );
+        inv_map.insert(entry_block_id, BlockInvariant { pre: initial_state });
 
         while let Some(block_id) = next_block {
             let block_invariant = match inv_map.get_mut(&block_id) {
@@ -101,17 +85,9 @@ pub trait AbstractInterpreter: TransferFunctions {
             };
 
             let pre_state = &block_invariant.pre;
-            let post_state = match self.execute_block(block_id, pre_state, function_view) {
-                Err(e) => {
-                    block_invariant.post = BlockPostcondition::Error(e);
-                    next_block = function_view.cfg().next_block(block_id);
-                    continue;
-                }
-                Ok(s) => {
-                    block_invariant.post = BlockPostcondition::Success;
-                    s
-                }
-            };
+            // Note: this will stop analysis after the first error occurs, to avoid the risk of
+            // subsequent crashes
+            let post_state = self.execute_block(block_id, pre_state, function_view, meter)?;
 
             let mut next_block_candidate = function_view.cfg().next_block(block_id);
             // propagate postcondition of this block to successor blocks
@@ -120,8 +96,8 @@ pub trait AbstractInterpreter: TransferFunctions {
                     Some(next_block_invariant) => {
                         let join_result = {
                             let old_pre = &mut next_block_invariant.pre;
-                            old_pre.join(&post_state)
-                        };
+                            old_pre.join(&post_state, meter)
+                        }?;
                         match join_result {
                             JoinResult::Unchanged => {
                                 // Pre is the same after join. Reanalyzing this block would produce
@@ -136,8 +112,6 @@ pub trait AbstractInterpreter: TransferFunctions {
                                 {
                                     next_block_candidate = Some(*successor_block_id);
                                 }
-                                // Pre has changed, the post condition is now unknown for the block
-                                next_block_invariant.post = BlockPostcondition::Unprocessed
                             }
                         }
                     }
@@ -148,7 +122,6 @@ pub trait AbstractInterpreter: TransferFunctions {
                             *successor_block_id,
                             BlockInvariant {
                                 pre: post_state.clone(),
-                                post: BlockPostcondition::Success,
                             },
                         );
                     }
@@ -156,7 +129,7 @@ pub trait AbstractInterpreter: TransferFunctions {
             }
             next_block = next_block_candidate;
         }
-        inv_map
+        Ok(())
     }
 
     fn execute_block(
@@ -164,12 +137,13 @@ pub trait AbstractInterpreter: TransferFunctions {
         block_id: BlockId,
         pre_state: &Self::State,
         function_view: &FunctionView,
-    ) -> Result<Self::State, Self::AnalysisError> {
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<Self::State> {
         let mut state_acc = pre_state.clone();
         let block_end = function_view.cfg().block_end(block_id);
         for offset in function_view.cfg().instr_indexes(block_id) {
             let instr = &function_view.code().code[offset as usize];
-            self.execute(&mut state_acc, instr, offset, block_end)?
+            self.execute(&mut state_acc, instr, offset, block_end, meter)?
         }
         Ok(state_acc)
     }
diff --git a/language/move-bytecode-verifier/src/acquires_list_verifier.rs b/language/move-bytecode-verifier/src/acquires_list_verifier.rs
index de034ff742..9bad9e5731 100644
--- a/language/move-bytecode-verifier/src/acquires_list_verifier.rs
+++ b/language/move-bytecode-verifier/src/acquires_list_verifier.rs
@@ -11,6 +11,9 @@
 //! - No missing resources (any resource acquired must be present)
 //! - No additional resources (no extraneous resources not actually acquired)
 
+use std::collections::{BTreeSet, HashMap};
+
+use crate::meter::Meter;
 use move_binary_format::{
     access::ModuleAccess,
     errors::{PartialVMError, PartialVMResult},
@@ -18,9 +21,9 @@ use move_binary_format::{
         Bytecode, CodeOffset, CompiledModule, FunctionDefinition, FunctionDefinitionIndex,
         FunctionHandle, FunctionHandleIndex, StructDefinitionIndex,
     },
+    safe_unwrap,
 };
 use move_core_types::vm_status::StatusCode;
-use std::collections::{BTreeSet, HashMap};
 
 pub(crate) struct AcquiresVerifier<'a> {
     module: &'a CompiledModule,
@@ -35,8 +38,9 @@ impl<'a> AcquiresVerifier<'a> {
         module: &'a CompiledModule,
         index: FunctionDefinitionIndex,
         function_definition: &'a FunctionDefinition,
+        _meter: &mut impl Meter, // currently unused
     ) -> PartialVMResult<()> {
-        let annotated_acquires = function_definition
+        let annotated_acquires: BTreeSet<_> = function_definition
             .acquires_global_resources
             .iter()
             .cloned()
@@ -53,10 +57,7 @@ impl<'a> AcquiresVerifier<'a> {
             handle_to_def,
         };
 
-        for (offset, instruction) in function_definition
-            .code
-            .as_ref()
-            .unwrap()
+        for (offset, instruction) in safe_unwrap!(function_definition.code.as_ref())
             .code
             .iter()
             .enumerate()
@@ -71,7 +72,7 @@ impl<'a> AcquiresVerifier<'a> {
                 ));
             }
 
-            let struct_def = module.struct_defs().get(annotation.0 as usize).unwrap();
+            let struct_def = safe_unwrap!(module.struct_defs().get(annotation.0 as usize));
             let struct_handle = module.struct_handle_at(struct_def.struct_handle);
             if !struct_handle.abilities.has_key() {
                 return Err(PartialVMError::new(StatusCode::INVALID_ACQUIRES_ANNOTATION));
@@ -101,7 +102,76 @@ impl<'a> AcquiresVerifier<'a> {
                 let si = self.module.struct_instantiation_at(*idx);
                 self.struct_acquire(si.def, offset)
             }
-            _ => Ok(()),
+
+            Bytecode::Pop
+            | Bytecode::BrTrue(_)
+            | Bytecode::BrFalse(_)
+            | Bytecode::Abort
+            | Bytecode::Branch(_)
+            | Bytecode::Nop
+            | Bytecode::Ret
+            | Bytecode::StLoc(_)
+            | Bytecode::MoveLoc(_)
+            | Bytecode::CopyLoc(_)
+            | Bytecode::ImmBorrowLoc(_)
+            | Bytecode::MutBorrowLoc(_)
+            | Bytecode::FreezeRef
+            | Bytecode::MutBorrowField(_)
+            | Bytecode::MutBorrowFieldGeneric(_)
+            | Bytecode::ImmBorrowField(_)
+            | Bytecode::ImmBorrowFieldGeneric(_)
+            | Bytecode::LdU8(_)
+            | Bytecode::LdU16(_)
+            | Bytecode::LdU32(_)
+            | Bytecode::LdU64(_)
+            | Bytecode::LdU128(_)
+            | Bytecode::LdU256(_)
+            | Bytecode::LdConst(_)
+            | Bytecode::LdTrue
+            | Bytecode::LdFalse
+            | Bytecode::Pack(_)
+            | Bytecode::PackGeneric(_)
+            | Bytecode::Unpack(_)
+            | Bytecode::UnpackGeneric(_)
+            | Bytecode::ReadRef
+            | Bytecode::WriteRef
+            | Bytecode::CastU8
+            | Bytecode::CastU16
+            | Bytecode::CastU32
+            | Bytecode::CastU64
+            | Bytecode::CastU128
+            | Bytecode::CastU256
+            | Bytecode::Add
+            | Bytecode::Sub
+            | Bytecode::Mul
+            | Bytecode::Mod
+            | Bytecode::Div
+            | Bytecode::BitOr
+            | Bytecode::BitAnd
+            | Bytecode::Xor
+            | Bytecode::Shl
+            | Bytecode::Shr
+            | Bytecode::Or
+            | Bytecode::And
+            | Bytecode::Not
+            | Bytecode::Eq
+            | Bytecode::Neq
+            | Bytecode::Lt
+            | Bytecode::Gt
+            | Bytecode::Le
+            | Bytecode::Ge
+            | Bytecode::Exists(_)
+            | Bytecode::ExistsGeneric(_)
+            | Bytecode::MoveTo(_)
+            | Bytecode::MoveToGeneric(_)
+            | Bytecode::VecPack(..)
+            | Bytecode::VecLen(_)
+            | Bytecode::VecImmBorrow(_)
+            | Bytecode::VecMutBorrow(_)
+            | Bytecode::VecPushBack(_)
+            | Bytecode::VecPopBack(_)
+            | Bytecode::VecUnpack(..)
+            | Bytecode::VecSwap(_) => Ok(()),
         }
     }
 
diff --git a/language/move-bytecode-verifier/src/code_unit_verifier.rs b/language/move-bytecode-verifier/src/code_unit_verifier.rs
index 13b96b20e5..265d86f3c2 100644
--- a/language/move-bytecode-verifier/src/code_unit_verifier.rs
+++ b/language/move-bytecode-verifier/src/code_unit_verifier.rs
@@ -6,93 +6,189 @@
 //! The overall verification is split between stack_usage_verifier.rs and
 //! abstract_interpreter.rs. CodeUnitVerifier simply orchestrates calls into these two files.
 use crate::{
-    acquires_list_verifier::AcquiresVerifier, control_flow, locals_safety, reference_safety,
-    stack_usage_verifier::StackUsageVerifier, type_safety,
+    acquires_list_verifier::AcquiresVerifier,
+    control_flow, locals_safety,
+    meter::{BoundMeter, Meter, Scope},
+    reference_safety,
+    stack_usage_verifier::StackUsageVerifier,
+    type_safety,
+    verifier::VerifierConfig,
 };
 use move_binary_format::{
     access::ModuleAccess,
     binary_views::{BinaryIndexedView, FunctionView},
-    errors::{Location, PartialVMResult, VMResult},
+    control_flow_graph::ControlFlowGraph,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
     file_format::{
         CompiledModule, CompiledScript, FunctionDefinition, FunctionDefinitionIndex,
         IdentifierIndex, TableIndex,
     },
     IndexKind,
 };
+use move_core_types::vm_status::StatusCode;
 use std::collections::HashMap;
 
 pub struct CodeUnitVerifier<'a> {
     resolver: BinaryIndexedView<'a>,
     function_view: FunctionView<'a>,
-    name_def_map: HashMap<IdentifierIndex, FunctionDefinitionIndex>,
+    name_def_map: &'a HashMap<IdentifierIndex, FunctionDefinitionIndex>,
 }
 
 impl<'a> CodeUnitVerifier<'a> {
-    pub fn verify_module(module: &'a CompiledModule) -> VMResult<()> {
-        Self::verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+    pub fn verify_module(
+        verifier_config: &VerifierConfig,
+        module: &'a CompiledModule,
+    ) -> VMResult<()> {
+        Self::verify_module_impl(verifier_config, module)
+            .map_err(|e| e.finish(Location::Module(module.self_id())))
     }
 
-    fn verify_module_impl(module: &'a CompiledModule) -> PartialVMResult<()> {
+    fn verify_module_impl(
+        verifier_config: &VerifierConfig,
+        module: &CompiledModule,
+    ) -> PartialVMResult<()> {
+        let mut meter = BoundMeter::new(verifier_config);
+        let mut name_def_map = HashMap::new();
+        for (idx, func_def) in module.function_defs().iter().enumerate() {
+            let fh = module.function_handle_at(func_def.function);
+            name_def_map.insert(fh.name, FunctionDefinitionIndex(idx as u16));
+        }
+        let mut total_back_edges = 0;
         for (idx, function_definition) in module.function_defs().iter().enumerate() {
             let index = FunctionDefinitionIndex(idx as TableIndex);
-            Self::verify_function(index, function_definition, module)
-                .map_err(|err| err.at_index(IndexKind::FunctionDefinition, index.0))?
+            let num_back_edges = Self::verify_function(
+                verifier_config,
+                index,
+                function_definition,
+                module,
+                &name_def_map,
+                &mut meter,
+            )
+            .map_err(|err| err.at_index(IndexKind::FunctionDefinition, index.0))?;
+            total_back_edges += num_back_edges;
+        }
+        if let Some(limit) = verifier_config.max_back_edges_per_module {
+            if total_back_edges > limit {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_BACK_EDGES));
+            }
         }
         Ok(())
     }
 
-    pub fn verify_script(module: &'a CompiledScript) -> VMResult<()> {
-        Self::verify_script_impl(module).map_err(|e| e.finish(Location::Script))
+    pub fn verify_script(
+        verifier_config: &VerifierConfig,
+        module: &'a CompiledScript,
+    ) -> VMResult<()> {
+        Self::verify_script_impl(verifier_config, module).map_err(|e| e.finish(Location::Script))
     }
 
-    fn verify_script_impl(script: &'a CompiledScript) -> PartialVMResult<()> {
+    fn verify_script_impl(
+        verifier_config: &VerifierConfig,
+        script: &'a CompiledScript,
+    ) -> PartialVMResult<()> {
+        let mut meter = BoundMeter::new(verifier_config);
         // create `FunctionView` and `BinaryIndexedView`
-        control_flow::verify(None, &script.code)?;
-        let function_view = FunctionView::script(script);
+        let function_view = control_flow::verify_script(verifier_config, script)?;
         let resolver = BinaryIndexedView::Script(script);
+        let name_def_map = HashMap::new();
+
+        if let Some(limit) = verifier_config.max_basic_blocks_in_script {
+            if function_view.cfg().blocks().len() > limit {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_BASIC_BLOCKS));
+            }
+        }
+
+        if let Some(limit) = verifier_config.max_back_edges_per_function {
+            if function_view.cfg().num_back_edges() > limit {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_BACK_EDGES));
+            }
+        }
+
         //verify
+        meter.enter_scope("script", Scope::Function);
         let code_unit_verifier = CodeUnitVerifier {
             resolver,
             function_view,
-            name_def_map: HashMap::new(),
+            name_def_map: &name_def_map,
         };
-        code_unit_verifier.verify_common()
+        code_unit_verifier.verify_common(verifier_config, &mut meter)
     }
 
     fn verify_function(
+        verifier_config: &VerifierConfig,
         index: FunctionDefinitionIndex,
-        function_definition: &'a FunctionDefinition,
-        module: &'a CompiledModule,
-    ) -> PartialVMResult<()> {
+        function_definition: &FunctionDefinition,
+        module: &CompiledModule,
+        name_def_map: &HashMap<IdentifierIndex, FunctionDefinitionIndex>,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<usize> {
+        meter.enter_scope(
+            module
+                .identifier_at(module.function_handle_at(function_definition.function).name)
+                .as_str(),
+            Scope::Function,
+        );
         // nothing to verify for native function
         let code = match &function_definition.code {
             Some(code) => code,
-            None => return Ok(()),
+            None => return Ok(0),
         };
+
         // create `FunctionView` and `BinaryIndexedView`
-        let function_handle = module.function_handle_at(function_definition.function);
-        control_flow::verify(Some(index), code)?;
-        let function_view = FunctionView::function(module, index, code, function_handle);
-        let resolver = BinaryIndexedView::Module(module);
-        let mut name_def_map = HashMap::new();
-        for (idx, func_def) in module.function_defs().iter().enumerate() {
-            let fh = module.function_handle_at(func_def.function);
-            name_def_map.insert(fh.name, FunctionDefinitionIndex(idx as u16));
+        let function_view = control_flow::verify_function(
+            verifier_config,
+            module,
+            index,
+            function_definition,
+            code,
+            meter,
+        )?;
+
+        if let Some(limit) = verifier_config.max_basic_blocks {
+            if function_view.cfg().blocks().len() > limit {
+                return Err(
+                    PartialVMError::new(StatusCode::TOO_MANY_BASIC_BLOCKS).at_code_offset(index, 0)
+                );
+            }
         }
+
+        let num_back_edges = function_view.cfg().num_back_edges();
+        if let Some(limit) = verifier_config.max_back_edges_per_function {
+            if num_back_edges > limit {
+                return Err(
+                    PartialVMError::new(StatusCode::TOO_MANY_BACK_EDGES).at_code_offset(index, 0)
+                );
+            }
+        }
+
+        let resolver = BinaryIndexedView::Module(module);
         // verify
         let code_unit_verifier = CodeUnitVerifier {
             resolver,
             function_view,
             name_def_map,
         };
-        code_unit_verifier.verify_common()?;
-        AcquiresVerifier::verify(module, index, function_definition)
+        code_unit_verifier.verify_common(verifier_config, meter)?;
+        AcquiresVerifier::verify(module, index, function_definition, meter)?;
+
+        meter.transfer(Scope::Function, Scope::Module, 1.0)?;
+
+        Ok(num_back_edges)
     }
 
-    fn verify_common(&self) -> PartialVMResult<()> {
-        StackUsageVerifier::verify(&self.resolver, &self.function_view)?;
-        type_safety::verify(&self.resolver, &self.function_view)?;
-        locals_safety::verify(&self.resolver, &self.function_view)?;
-        reference_safety::verify(&self.resolver, &self.function_view, &self.name_def_map)
+    fn verify_common(
+        &self,
+        verifier_config: &VerifierConfig,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        StackUsageVerifier::verify(verifier_config, &self.resolver, &self.function_view, meter)?;
+        type_safety::verify(&self.resolver, &self.function_view, meter)?;
+        locals_safety::verify(&self.resolver, &self.function_view, meter)?;
+        reference_safety::verify(
+            &self.resolver,
+            &self.function_view,
+            self.name_def_map,
+            meter,
+        )
     }
 }
diff --git a/language/move-bytecode-verifier/src/control_flow.rs b/language/move-bytecode-verifier/src/control_flow.rs
index c2ed834801..6012684be1 100644
--- a/language/move-bytecode-verifier/src/control_flow.rs
+++ b/language/move-bytecode-verifier/src/control_flow.rs
@@ -2,240 +2,181 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-//! This module implements a checker for verifies control flow. The following properties are
-//! ensured:
-//! - All forward jumps do not enter into the middle of a loop
-//! - All "breaks" (forward, loop-exiting jumps) go to the "end" of the loop
-//! - All "continues" (back jumps in a loop) are only to the current loop
+//! This module implements control flow checks.
+//!
+//! For bytecode versions 6 and up, the following properties are ensured:
+//! - The CFG is not empty and the last block ends in an unconditional jump, so it's not possible to
+//!   fall off the end of a function.
+//! - The CFG is reducible (and optionally max loop depth is bounded), to limit the potential for
+//!   pathologically long abstract interpretation runtimes (through poor choice of loop heads and
+//!   back edges).
+//!
+//! For bytecode versions 5 and below, delegates to `control_flow_v5`.
+use crate::{
+    control_flow_v5,
+    loop_summary::{LoopPartition, LoopSummary},
+    meter::Meter,
+    verifier::VerifierConfig,
+};
 use move_binary_format::{
+    access::{ModuleAccess, ScriptAccess},
+    binary_views::FunctionView,
     errors::{PartialVMError, PartialVMResult},
-    file_format::{Bytecode, CodeOffset, CodeUnit, FunctionDefinitionIndex},
+    file_format::{
+        CodeOffset, CodeUnit, CompiledScript, FunctionDefinition, FunctionDefinitionIndex,
+    },
+    CompiledModule,
 };
 use move_core_types::vm_status::StatusCode;
-use std::{collections::HashSet, convert::TryInto};
+use std::collections::BTreeSet;
+
+/// Perform control flow verification on the compiled function, returning its `FunctionView` if
+/// verification was successful.
+pub fn verify_function<'a>(
+    verifier_config: &'a VerifierConfig,
+    module: &'a CompiledModule,
+    index: FunctionDefinitionIndex,
+    function_definition: &'a FunctionDefinition,
+    code: &'a CodeUnit,
+    _meter: &mut impl Meter, // TODO: metering
+) -> PartialVMResult<FunctionView<'a>> {
+    let function_handle = module.function_handle_at(function_definition.function);
+
+    if module.version() <= 5 {
+        control_flow_v5::verify(verifier_config, Some(index), code)?;
+        Ok(FunctionView::function(module, index, code, function_handle))
+    } else {
+        verify_fallthrough(Some(index), code)?;
+        let function_view = FunctionView::function(module, index, code, function_handle);
+        verify_reducibility(verifier_config, &function_view)?;
+        Ok(function_view)
+    }
+}
+
+/// Perform control flow verification on the compiled script, returning its `FunctionView` if
+/// verification was successful.
+pub fn verify_script<'a>(
+    verifier_config: &'a VerifierConfig,
+    script: &'a CompiledScript,
+) -> PartialVMResult<FunctionView<'a>> {
+    if script.version() <= 5 {
+        control_flow_v5::verify(verifier_config, None, &script.code)?;
+        Ok(FunctionView::script(script))
+    } else {
+        verify_fallthrough(None, &script.code)?;
+        let function_view = FunctionView::script(script);
+        verify_reducibility(verifier_config, &function_view)?;
+        Ok(function_view)
+    }
+}
 
-pub fn verify(
+/// Check to make sure that the bytecode vector is non-empty and ends with a branching instruction.
+fn verify_fallthrough(
     current_function_opt: Option<FunctionDefinitionIndex>,
     code: &CodeUnit,
 ) -> PartialVMResult<()> {
     let current_function = current_function_opt.unwrap_or(FunctionDefinitionIndex(0));
-    // check fall through
-    // Check to make sure that the bytecode vector ends with a branching instruction.
     match code.code.last() {
-        None => return Err(PartialVMError::new(StatusCode::EMPTY_CODE_UNIT)),
+        None => Err(PartialVMError::new(StatusCode::EMPTY_CODE_UNIT)),
         Some(last) if !last.is_unconditional_branch() => {
-            return Err(PartialVMError::new(StatusCode::INVALID_FALL_THROUGH)
+            Err(PartialVMError::new(StatusCode::INVALID_FALL_THROUGH)
                 .at_code_offset(current_function, (code.code.len() - 1) as CodeOffset))
         }
-        Some(_) => (),
+        Some(_) => Ok(()),
     }
-
-    // check jumps
-    let context = &ControlFlowVerifier {
-        current_function,
-        code: &code.code,
-    };
-    let labels = instruction_labels(context);
-    check_jumps(context, labels)
-}
-
-#[derive(Clone, Copy)]
-enum Label {
-    Loop { last_continue: u16 },
-    Code,
-}
-
-struct ControlFlowVerifier<'a> {
-    current_function: FunctionDefinitionIndex,
-    code: &'a Vec<Bytecode>,
 }
 
-impl<'a> ControlFlowVerifier<'a> {
-    fn code(&self) -> impl Iterator<Item = (CodeOffset, &'a Bytecode)> {
-        self.code
-            .iter()
-            .enumerate()
-            .map(|(idx, instr)| (idx.try_into().unwrap(), instr))
-    }
-
-    fn labeled_code<'b: 'a>(
-        &self,
-        labels: &'b [Label],
-    ) -> impl Iterator<Item = (CodeOffset, &'a Bytecode, &'b Label)> {
-        self.code()
-            .zip(labels)
-            .map(|((i, instr), lbl)| (i, instr, lbl))
-    }
-
-    fn error(&self, status: StatusCode, offset: CodeOffset) -> PartialVMError {
-        PartialVMError::new(status).at_code_offset(self.current_function, offset)
-    }
-}
-
-fn instruction_labels(context: &ControlFlowVerifier) -> Vec<Label> {
-    let mut labels: Vec<Label> = (0..context.code.len()).map(|_| Label::Code).collect();
-    let mut loop_continue = |loop_idx: CodeOffset, last_continue: CodeOffset| {
-        labels[loop_idx as usize] = Label::Loop { last_continue }
+/// Test that `function_view`'s control-flow graph is reducible using Tarjan's algorithm [1].
+/// Optionally test loop depth bounded by `verifier_config.max_loop_depth`.
+///
+/// A CFG, `G`, with starting block `s` is reducible if and only if [2] any of the following
+/// equivalent properties hold:
+///
+///  1. G has a unique set of back-edges `u -> v` where `v` dominates `u`, that corresponds to the
+///     set of back-edges for any depth-first spanning tree of G.
+///
+///  2. Every loop in G contains a unique node `h` (the "head") which dominates all other nodes in
+///     the loop.
+///
+///  3. G has a unique maximal (in terms of number of edges) acyclic sub-graph.
+///
+///  4. G can be reduced to a CFG containing just `s` through a sequence of the following two
+///     operations:
+///      a. Delete a cyclic edge `v -> v`
+///      b. For an edge `e: u -> v` where `e` is the only incident edge to `v`, collapse `v` into `u`
+///         by deleting `e` and `v` and replacing all `v -> w` edges with `u -> w` edges.
+///
+/// Reducibility means that a control-flow graph can be decomposed into a series of nested loops
+/// (strongly connected subgraphs), which leads to more predictable abstract interpretation
+/// performance.
+///
+/// ## References
+///
+///  1. Tarjan, R.  1974.  Testing Flow Graph Reducibility.
+///  2. Hecht, M. S., Ullman J. D.  1974.  Characterizations of Reducible Flow Graphs.
+fn verify_reducibility<'a>(
+    verifier_config: &VerifierConfig,
+    function_view: &'a FunctionView<'a>,
+) -> PartialVMResult<()> {
+    let current_function = function_view.index().unwrap_or(FunctionDefinitionIndex(0));
+    let err = move |code: StatusCode, offset: CodeOffset| {
+        Err(PartialVMError::new(code).at_code_offset(current_function, offset))
     };
-    for (i, instr) in context.code() {
-        match instr {
-            // Back jump/"continue"
-            Bytecode::Branch(prev) | Bytecode::BrTrue(prev) | Bytecode::BrFalse(prev)
-                if is_back_edge(i, *prev) =>
-            {
-                loop_continue(*prev, i)
-            }
-            _ => (),
-        }
-    }
-    labels
-}
 
-// Ensures the invariant:
-//   - All forward jumps do not enter into the middle of a loop
-//   - All "breaks" go to the "end" of the loop
-//   - All back jumps are only to the current loop
-fn check_jumps(context: &ControlFlowVerifier, labels: Vec<Label>) -> PartialVMResult<()> {
-    // All back jumps are only to the current loop
-    check_continues(context, &labels)?;
-    // All "breaks" go to the "end" of the loop
-    check_breaks(context, &labels)?;
-    // All forward jumps do not enter into the middle of a loop
-    check_no_loop_splits(context, &labels)
-}
+    let summary = LoopSummary::new(function_view.cfg());
+    let mut partition = LoopPartition::new(&summary);
 
-fn check_code<
-    F: FnMut(&Vec<(CodeOffset, CodeOffset)>, CodeOffset, &Bytecode) -> PartialVMResult<()>,
->(
-    context: &ControlFlowVerifier,
-    labels: &[Label],
-    mut check: F,
-) -> PartialVMResult<()> {
-    let mut loop_stack: Vec<(CodeOffset, CodeOffset)> = vec![];
-    for (cur_instr, instr, label) in context.labeled_code(labels) {
-        // Add loop to stack
-        if let Label::Loop { last_continue } = label {
-            loop_stack.push((cur_instr, *last_continue));
+    // Iterate through nodes in reverse pre-order so more deeply nested loops (which would appear
+    // later in the pre-order) are processed first.
+    for head in summary.preorder().rev() {
+        // If a node has no back edges, it is not a loop head, so doesn't need to be processed.
+        let back = summary.back_edges(head);
+        if back.is_empty() {
+            continue;
         }
 
-        check(&loop_stack, cur_instr, instr)?;
-
-        // Pop if last continue
-        match instr {
-            // Back jump/"continue"
-            Bytecode::Branch(target) | Bytecode::BrTrue(target) | Bytecode::BrFalse(target)
-                if is_back_edge(cur_instr, *target) =>
-            {
-                let (_cur_loop_head, last_continue) = loop_stack.last().unwrap();
-                if cur_instr == *last_continue {
-                    loop_stack.pop();
-                }
-            }
-            _ => (),
-        }
-    }
-    Ok(())
-}
+        // Collect the rest of the nodes in `head`'s loop, in `body`.  Start with the nodes that
+        // jump back to the head, and grow `body` by repeatedly following predecessor edges until
+        // `head` is found again.
 
-fn is_back_edge(cur_instr: CodeOffset, target_instr: CodeOffset) -> bool {
-    target_instr <= cur_instr
-}
+        let mut body = BTreeSet::new();
+        for node in back {
+            let node = partition.containing_loop(*node);
 
-// All back jumps are only to the current loop
-fn check_continues(context: &ControlFlowVerifier, labels: &[Label]) -> PartialVMResult<()> {
-    check_code(context, labels, |loop_stack, cur_instr, instr| {
-        match instr {
-            // Back jump/"continue"
-            Bytecode::Branch(target) | Bytecode::BrTrue(target) | Bytecode::BrFalse(target)
-                if is_back_edge(cur_instr, *target) =>
-            {
-                let (cur_loop_head, _last_continue) = loop_stack.last().unwrap();
-                if target != cur_loop_head {
-                    // Invalid back jump. Cannot back jump outside of the current loop
-                    Err(context.error(StatusCode::INVALID_LOOP_CONTINUE, cur_instr))
-                } else {
-                    Ok(())
-                }
+            if node != head {
+                body.insert(node);
             }
-            _ => Ok(()),
         }
-    })
-}
 
-fn check_breaks(context: &ControlFlowVerifier, labels: &[Label]) -> PartialVMResult<()> {
-    check_code(context, labels, |loop_stack, cur_instr, instr| {
-        match instr {
-            // Forward jump/"break"
-            Bytecode::Branch(target) | Bytecode::BrTrue(target) | Bytecode::BrFalse(target)
-                if !is_back_edge(cur_instr, *target) =>
-            {
-                match loop_stack.last() {
-                    Some((_cur_loop_head, last_continue))
-                        if target > last_continue && *target != last_continue + 1 =>
-                    {
-                        // Invalid loop break. Must break immediately to the instruction after
-                        // the last continue
-                        Err(context.error(StatusCode::INVALID_LOOP_BREAK, cur_instr))
-                    }
-                    _ => Ok(()),
+        let mut frontier: Vec<_> = body.iter().copied().collect();
+        while let Some(node) = frontier.pop() {
+            for pred in summary.pred_edges(node) {
+                let pred = partition.containing_loop(*pred);
+
+                // `pred` can eventually jump back to `head`, so is part of its body.  If it is not
+                // a descendant of `head`, it implies that `head` does not dominate a node in its
+                // loop, therefore the CFG is not reducible, according to Property 1 (see doc
+                // comment).
+                if !summary.is_descendant(/* ancestor */ head, /* descendant */ pred) {
+                    return err(StatusCode::INVALID_LOOP_SPLIT, summary.block(pred));
                 }
-            }
-            _ => Ok(()),
-        }
-    })
-}
 
-fn check_no_loop_splits(context: &ControlFlowVerifier, labels: &[Label]) -> PartialVMResult<()> {
-    let is_break = |loop_stack: &Vec<(CodeOffset, CodeOffset)>, jump_target: CodeOffset| -> bool {
-        match loop_stack.last() {
-            None => false,
-            Some((_cur_loop_head, last_continue)) => jump_target > *last_continue,
-        }
-    };
-    let loop_depth = count_loop_depth(labels);
-    check_code(context, labels, |loop_stack, i, instr| {
-        match instr {
-            // Forward jump/"break"
-            Bytecode::Branch(j) | Bytecode::BrTrue(j) | Bytecode::BrFalse(j)
-                if *j > i && !is_break(loop_stack, *j) =>
-            {
-                let j = *j;
-                let before_depth = loop_depth[i as usize];
-                let after_depth = match &labels[j as usize] {
-                    Label::Loop { .. } => loop_depth[j as usize] - 1,
-                    Label::Code => loop_depth[j as usize],
-                };
-                if before_depth != after_depth {
-                    // Invalid forward jump. Entered the middle of a loop
-                    Err(context.error(StatusCode::INVALID_LOOP_SPLIT, i))
-                } else {
-                    Ok(())
+                let body_extended = pred != head && body.insert(pred);
+                if body_extended {
+                    frontier.push(pred);
                 }
             }
-            _ => Ok(()),
         }
-    })
-}
 
-// Only called after continues are verified, so we can assume that loops are well nested
-fn count_loop_depth(labels: &[Label]) -> Vec<usize> {
-    let last_continues: HashSet<CodeOffset> = labels
-        .iter()
-        .filter_map(|label| match label {
-            Label::Loop { last_continue } => Some(*last_continue),
-            Label::Code => None,
-        })
-        .collect();
-    let mut count = 0;
-    let mut counts = vec![];
-    for (idx, label) in labels.iter().enumerate() {
-        if let Label::Loop { .. } = label {
-            count += 1
-        }
-        counts.push(count);
-        if last_continues.contains(&idx.try_into().unwrap()) {
-            count -= 1;
+        // Collapse all the nodes in `body` into `head`, so it appears as one node when processing
+        // outer loops (this performs a sequence of Operation 4(b), followed by a 4(a)).
+        let depth = partition.collapse_loop(head, &body);
+        if let Some(max_depth) = verifier_config.max_loop_depth {
+            if depth as usize > max_depth {
+                return err(StatusCode::LOOP_MAX_DEPTH_REACHED, summary.block(head));
+            }
         }
     }
-    counts
+
+    Ok(())
 }
diff --git a/language/move-bytecode-verifier/src/control_flow_v5.rs b/language/move-bytecode-verifier/src/control_flow_v5.rs
new file mode 100644
index 0000000000..092fcbf46b
--- /dev/null
+++ b/language/move-bytecode-verifier/src/control_flow_v5.rs
@@ -0,0 +1,283 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module implements a checker to verify control flow in bytecode version 5 and below. The
+//! following properties are ensured:
+//! - All forward jumps do not enter into the middle of a loop
+//! - All "breaks" (forward, loop-exiting jumps) go to the "end" of the loop
+//! - All "continues" (back jumps in a loop) are only to the current loop
+use crate::verifier::VerifierConfig;
+use move_binary_format::{
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{Bytecode, CodeOffset, CodeUnit, FunctionDefinitionIndex},
+    safe_unwrap,
+};
+use move_core_types::vm_status::StatusCode;
+use std::{collections::HashSet, convert::TryInto};
+
+pub fn verify(
+    verifier_config: &VerifierConfig,
+    current_function_opt: Option<FunctionDefinitionIndex>,
+    code: &CodeUnit,
+) -> PartialVMResult<()> {
+    let current_function = current_function_opt.unwrap_or(FunctionDefinitionIndex(0));
+
+    // check fallthrough
+    verify_fallthrough(current_function, &code.code)?;
+
+    // check jumps
+    let context = &ControlFlowVerifier {
+        current_function,
+        code: &code.code,
+    };
+    let labels = instruction_labels(context);
+    check_jumps(verifier_config, context, labels)
+}
+
+fn verify_fallthrough(
+    current_function: FunctionDefinitionIndex,
+    code: &Vec<Bytecode>,
+) -> PartialVMResult<()> {
+    // Check to make sure that the bytecode vector ends with a branching instruction.
+    match code.last() {
+        None => Err(PartialVMError::new(StatusCode::EMPTY_CODE_UNIT)),
+        Some(last) if !last.is_unconditional_branch() => {
+            Err(PartialVMError::new(StatusCode::INVALID_FALL_THROUGH)
+                .at_code_offset(current_function, (code.len() - 1) as CodeOffset))
+        }
+        Some(_) => Ok(()),
+    }
+}
+
+#[derive(Clone, Copy)]
+enum Label {
+    Loop { last_continue: u16 },
+    Code,
+}
+
+struct ControlFlowVerifier<'a> {
+    current_function: FunctionDefinitionIndex,
+    code: &'a Vec<Bytecode>,
+}
+
+impl<'a> ControlFlowVerifier<'a> {
+    fn code(&self) -> impl Iterator<Item = (CodeOffset, &'a Bytecode)> {
+        self.code
+            .iter()
+            .enumerate()
+            .map(|(idx, instr)| (idx.try_into().unwrap(), instr))
+    }
+
+    fn labeled_code<'b: 'a>(
+        &self,
+        labels: &'b [Label],
+    ) -> impl Iterator<Item = (CodeOffset, &'a Bytecode, &'b Label)> {
+        self.code()
+            .zip(labels)
+            .map(|((i, instr), lbl)| (i, instr, lbl))
+    }
+
+    fn error(&self, status: StatusCode, offset: CodeOffset) -> PartialVMError {
+        PartialVMError::new(status).at_code_offset(self.current_function, offset)
+    }
+}
+
+fn instruction_labels(context: &ControlFlowVerifier) -> Vec<Label> {
+    let mut labels: Vec<Label> = (0..context.code.len()).map(|_| Label::Code).collect();
+    let mut loop_continue = |loop_idx: CodeOffset, last_continue: CodeOffset| {
+        labels[loop_idx as usize] = Label::Loop { last_continue }
+    };
+    for (i, instr) in context.code() {
+        match instr {
+            // Back jump/"continue"
+            Bytecode::Branch(prev) | Bytecode::BrTrue(prev) | Bytecode::BrFalse(prev)
+                if is_back_edge(i, *prev) =>
+            {
+                loop_continue(*prev, i)
+            }
+            _ => (),
+        }
+    }
+    labels
+}
+
+// Ensures the invariant:
+//   - All forward jumps do not enter into the middle of a loop
+//   - All "breaks" go to the "end" of the loop
+//   - All back jumps are only to the current loop
+//   - Nested loops do not exceed a given depth
+fn check_jumps(
+    verifier_config: &VerifierConfig,
+    context: &ControlFlowVerifier,
+    labels: Vec<Label>,
+) -> PartialVMResult<()> {
+    // All back jumps are only to the current loop
+    check_continues(context, &labels)?;
+    // All "breaks" go to the "end" of the loop
+    check_breaks(context, &labels)?;
+
+    let loop_depth = count_loop_depth(&labels);
+
+    // All forward jumps do not enter into the middle of a loop
+    check_no_loop_splits(context, &labels, &loop_depth)?;
+    // Nested loops do not exceed a given depth
+    check_loop_depth(verifier_config, context, &labels, &loop_depth)
+}
+
+fn check_code<
+    F: FnMut(&Vec<(CodeOffset, CodeOffset)>, CodeOffset, &Bytecode) -> PartialVMResult<()>,
+>(
+    context: &ControlFlowVerifier,
+    labels: &[Label],
+    mut check: F,
+) -> PartialVMResult<()> {
+    let mut loop_stack: Vec<(CodeOffset, CodeOffset)> = vec![];
+    for (cur_instr, instr, label) in context.labeled_code(labels) {
+        // Add loop to stack
+        if let Label::Loop { last_continue } = label {
+            loop_stack.push((cur_instr, *last_continue));
+        }
+
+        check(&loop_stack, cur_instr, instr)?;
+
+        // Pop if last continue
+        match instr {
+            // Back jump/"continue"
+            Bytecode::Branch(target) | Bytecode::BrTrue(target) | Bytecode::BrFalse(target)
+                if is_back_edge(cur_instr, *target) =>
+            {
+                let (_cur_loop_head, last_continue) = safe_unwrap!(loop_stack.last());
+                if cur_instr == *last_continue {
+                    loop_stack.pop();
+                }
+            }
+            _ => (),
+        }
+    }
+    Ok(())
+}
+
+fn is_back_edge(cur_instr: CodeOffset, target_instr: CodeOffset) -> bool {
+    target_instr <= cur_instr
+}
+
+// All back jumps are only to the current loop
+fn check_continues(context: &ControlFlowVerifier, labels: &[Label]) -> PartialVMResult<()> {
+    check_code(context, labels, |loop_stack, cur_instr, instr| {
+        match instr {
+            // Back jump/"continue"
+            Bytecode::Branch(target) | Bytecode::BrTrue(target) | Bytecode::BrFalse(target)
+                if is_back_edge(cur_instr, *target) =>
+            {
+                let (cur_loop_head, _last_continue) = safe_unwrap!(loop_stack.last());
+                if target != cur_loop_head {
+                    // Invalid back jump. Cannot back jump outside of the current loop
+                    Err(context.error(StatusCode::INVALID_LOOP_CONTINUE, cur_instr))
+                } else {
+                    Ok(())
+                }
+            }
+            _ => Ok(()),
+        }
+    })
+}
+
+fn check_breaks(context: &ControlFlowVerifier, labels: &[Label]) -> PartialVMResult<()> {
+    check_code(context, labels, |loop_stack, cur_instr, instr| {
+        match instr {
+            // Forward jump/"break"
+            Bytecode::Branch(target) | Bytecode::BrTrue(target) | Bytecode::BrFalse(target)
+                if !is_back_edge(cur_instr, *target) =>
+            {
+                match loop_stack.last() {
+                    Some((_cur_loop_head, last_continue))
+                        if target > last_continue && *target != last_continue + 1 =>
+                    {
+                        // Invalid loop break. Must break immediately to the instruction after
+                        // the last continue
+                        Err(context.error(StatusCode::INVALID_LOOP_BREAK, cur_instr))
+                    }
+                    _ => Ok(()),
+                }
+            }
+            _ => Ok(()),
+        }
+    })
+}
+
+fn check_no_loop_splits(
+    context: &ControlFlowVerifier,
+    labels: &[Label],
+    loop_depth: &[usize],
+) -> PartialVMResult<()> {
+    let is_break = |loop_stack: &Vec<(CodeOffset, CodeOffset)>, jump_target: CodeOffset| -> bool {
+        match loop_stack.last() {
+            None => false,
+            Some((_cur_loop_head, last_continue)) => jump_target > *last_continue,
+        }
+    };
+    check_code(context, labels, |loop_stack, i, instr| {
+        match instr {
+            // Forward jump/"break"
+            Bytecode::Branch(j) | Bytecode::BrTrue(j) | Bytecode::BrFalse(j)
+                if *j > i && !is_break(loop_stack, *j) =>
+            {
+                let j = *j;
+                let before_depth = loop_depth[i as usize];
+                let after_depth = match &labels[j as usize] {
+                    Label::Loop { .. } => loop_depth[j as usize] - 1,
+                    Label::Code => loop_depth[j as usize],
+                };
+                if before_depth != after_depth {
+                    // Invalid forward jump. Entered the middle of a loop
+                    Err(context.error(StatusCode::INVALID_LOOP_SPLIT, i))
+                } else {
+                    Ok(())
+                }
+            }
+            _ => Ok(()),
+        }
+    })
+}
+
+fn check_loop_depth(
+    verifier_config: &VerifierConfig,
+    context: &ControlFlowVerifier,
+    labels: &[Label],
+    loop_depth: &[usize],
+) -> PartialVMResult<()> {
+    let max_depth = match verifier_config.max_loop_depth {
+        Some(depth) => depth,
+        None => return Ok(()),
+    };
+    check_code(context, labels, |_loop_stack, i, _instr| {
+        if loop_depth[i as usize] > max_depth {
+            return Err(context.error(StatusCode::LOOP_MAX_DEPTH_REACHED, i));
+        }
+        Ok(())
+    })
+}
+
+// Only called after continues are verified, so we can assume that loops are well nested
+fn count_loop_depth(labels: &[Label]) -> Vec<usize> {
+    let last_continues: HashSet<CodeOffset> = labels
+        .iter()
+        .filter_map(|label| match label {
+            Label::Loop { last_continue } => Some(*last_continue),
+            Label::Code => None,
+        })
+        .collect();
+    let mut count = 0;
+    let mut counts = vec![];
+    for (idx, label) in labels.iter().enumerate() {
+        if let Label::Loop { .. } = label {
+            count += 1
+        }
+        counts.push(count);
+        if last_continues.contains(&idx.try_into().unwrap()) {
+            count -= 1;
+        }
+    }
+    counts
+}
diff --git a/language/move-bytecode-verifier/src/dependencies.rs b/language/move-bytecode-verifier/src/dependencies.rs
index 509310a296..f24b75487f 100644
--- a/language/move-bytecode-verifier/src/dependencies.rs
+++ b/language/move-bytecode-verifier/src/dependencies.rs
@@ -13,7 +13,7 @@ use move_binary_format::{
         StructTypeParameter, TableIndex, Visibility,
     },
     file_format_common::VERSION_5,
-    IndexKind,
+    safe_unwrap, IndexKind,
 };
 use move_core_types::{identifier::Identifier, language_storage::ModuleId, vm_status::StatusCode};
 use std::collections::{BTreeMap, BTreeSet};
@@ -226,7 +226,7 @@ fn verify_imported_structs(context: &Context) -> PartialVMResult<()> {
             .resolver
             .module_id_for_handle(context.resolver.module_handle_at(struct_handle.module));
         // TODO: remove unwrap
-        let owner_module = context.dependency_map.get(&owner_module_id).unwrap();
+        let owner_module = safe_unwrap!(context.dependency_map.get(&owner_module_id));
         let struct_name = context.resolver.identifier_at(struct_handle.name);
         match context
             .struct_id_to_handle_map
@@ -269,8 +269,7 @@ fn verify_imported_functions(context: &Context) -> PartialVMResult<()> {
             .resolver
             .module_id_for_handle(context.resolver.module_handle_at(function_handle.module));
         let function_name = context.resolver.identifier_at(function_handle.name);
-        // TODO: remove unwrap
-        let owner_module = context.dependency_map.get(&owner_module_id).unwrap();
+        let owner_module = safe_unwrap!(context.dependency_map.get(&owner_module_id));
         match context
             .func_id_to_handle_map
             .get(&(owner_module_id.clone(), function_name.to_owned()))
@@ -444,8 +443,11 @@ fn compare_types(
     match (handle_type, def_type) {
         (SignatureToken::Bool, SignatureToken::Bool)
         | (SignatureToken::U8, SignatureToken::U8)
+        | (SignatureToken::U16, SignatureToken::U16)
+        | (SignatureToken::U32, SignatureToken::U32)
         | (SignatureToken::U64, SignatureToken::U64)
         | (SignatureToken::U128, SignatureToken::U128)
+        | (SignatureToken::U256, SignatureToken::U256)
         | (SignatureToken::Address, SignatureToken::Address)
         | (SignatureToken::Signer, SignatureToken::Signer) => Ok(()),
         (SignatureToken::Vector(ty1), SignatureToken::Vector(ty2)) => {
@@ -472,7 +474,21 @@ fn compare_types(
                 Ok(())
             }
         }
-        _ => Err(PartialVMError::new(StatusCode::TYPE_MISMATCH)),
+        (SignatureToken::Bool, _)
+        | (SignatureToken::U8, _)
+        | (SignatureToken::U64, _)
+        | (SignatureToken::U128, _)
+        | (SignatureToken::Address, _)
+        | (SignatureToken::Signer, _)
+        | (SignatureToken::Vector(_), _)
+        | (SignatureToken::Struct(_), _)
+        | (SignatureToken::StructInstantiation(_, _), _)
+        | (SignatureToken::Reference(_), _)
+        | (SignatureToken::MutableReference(_), _)
+        | (SignatureToken::TypeParameter(_), _)
+        | (SignatureToken::U16, _)
+        | (SignatureToken::U32, _)
+        | (SignatureToken::U256, _) => Err(PartialVMError::new(StatusCode::TYPE_MISMATCH)),
     }
 }
 
@@ -551,7 +567,7 @@ fn verify_script_visibility_usage(
             }
             _ => continue,
         };
-        match (current_is_entry, script_functions.contains(&fhandle_idx)) {
+        match (current_is_entry, script_functions.contains(fhandle_idx)) {
             (true, true) => (),
             (_, true) => {
                 return Err(PartialVMError::new(
diff --git a/language/move-bytecode-verifier/src/instantiation_loops.rs b/language/move-bytecode-verifier/src/instantiation_loops.rs
index ca48cedb38..9af7dff237 100644
--- a/language/move-bytecode-verifier/src/instantiation_loops.rs
+++ b/language/move-bytecode-verifier/src/instantiation_loops.rs
@@ -143,7 +143,7 @@ impl<'a> InstantiationLoopChecker<'a> {
 
         fn rec(type_params: &mut HashSet<TypeParameterIndex>, ty: &SignatureToken) {
             match ty {
-                Bool | Address | U8 | U64 | U128 | Signer | Struct(_) => (),
+                Bool | Address | U8 | U16 | U32 | U64 | U128 | U256 | Signer | Struct(_) => (),
                 TypeParameter(idx) => {
                     type_params.insert(*idx);
                 }
@@ -233,8 +233,8 @@ impl<'a> InstantiationLoopChecker<'a> {
             .module
             .function_defs()
             .iter()
-            .filter(|def| !def.is_native())
             .enumerate()
+            .filter(|(_, def)| !def.is_native())
         {
             self.build_graph_function_def(FunctionDefinitionIndex::new(def_idx as u16), func_def)
         }
diff --git a/language/move-bytecode-verifier/src/instruction_consistency.rs b/language/move-bytecode-verifier/src/instruction_consistency.rs
index 15a1c6fcf4..52cb7cd00c 100644
--- a/language/move-bytecode-verifier/src/instruction_consistency.rs
+++ b/language/move-bytecode-verifier/src/instruction_consistency.rs
@@ -4,7 +4,7 @@
 
 //! This module defines the transfer functions for verifying consistency of each bytecode
 //! instruction, in particular, for the bytecode instructions that come in both generic and
-//! non-generic flavors.
+//! non-generic flavors. It also checks constraints on instructions like VecPack/VecUnpack.
 
 use move_binary_format::{
     access::ModuleAccess,
@@ -132,16 +132,23 @@ impl<'a> InstructionConsistency<'a> {
                     let struct_inst = self.resolver.struct_instantiation_at(*idx)?;
                     self.check_type_op(offset, struct_inst.def, /* generic */ true)?;
                 }
+                VecPack(_, num) | VecUnpack(_, num) => {
+                    if *num > u16::MAX as u64 {
+                        return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED)
+                            .at_code_offset(self.current_function(), offset as CodeOffset)
+                            .with_message("VecPack/VecUnpack argument out of range".to_string()));
+                    }
+                }
 
                 // List out the other options explicitly so there's a compile error if a new
                 // bytecode gets added.
-                FreezeRef | Pop | Ret | Branch(_) | BrTrue(_) | BrFalse(_) | LdU8(_) | LdU64(_)
-                | LdU128(_) | LdConst(_) | CastU8 | CastU64 | CastU128 | LdTrue | LdFalse
-                | ReadRef | WriteRef | Add | Sub | Mul | Mod | Div | BitOr | BitAnd | Xor | Shl
-                | Shr | Or | And | Not | Eq | Neq | Lt | Gt | Le | Ge | CopyLoc(_) | MoveLoc(_)
-                | StLoc(_) | MutBorrowLoc(_) | ImmBorrowLoc(_) | VecPack(..) | VecLen(_)
-                | VecImmBorrow(_) | VecMutBorrow(_) | VecPushBack(_) | VecPopBack(_)
-                | VecUnpack(..) | VecSwap(_) | Abort | Nop => (),
+                FreezeRef | Pop | Ret | Branch(_) | BrTrue(_) | BrFalse(_) | LdU8(_) | LdU16(_)
+                | LdU32(_) | LdU64(_) | LdU128(_) | LdU256(_) | LdConst(_) | CastU8 | CastU16
+                | CastU32 | CastU64 | CastU128 | CastU256 | LdTrue | LdFalse | ReadRef
+                | WriteRef | Add | Sub | Mul | Mod | Div | BitOr | BitAnd | Xor | Shl | Shr
+                | Or | And | Not | Eq | Neq | Lt | Gt | Le | Ge | CopyLoc(_) | MoveLoc(_)
+                | StLoc(_) | MutBorrowLoc(_) | ImmBorrowLoc(_) | VecLen(_) | VecImmBorrow(_)
+                | VecMutBorrow(_) | VecPushBack(_) | VecPopBack(_) | VecSwap(_) | Abort | Nop => (),
             }
         }
         Ok(())
diff --git a/language/move-bytecode-verifier/src/lib.rs b/language/move-bytecode-verifier/src/lib.rs
index 443b6c4691..11fd9eb90d 100644
--- a/language/move-bytecode-verifier/src/lib.rs
+++ b/language/move-bytecode-verifier/src/lib.rs
@@ -13,11 +13,14 @@ pub mod check_duplication;
 pub mod code_unit_verifier;
 pub mod constants;
 pub mod control_flow;
+pub mod control_flow_v5;
 pub mod cyclic_dependencies;
 pub mod dependencies;
 pub mod friends;
 pub mod instantiation_loops;
 pub mod instruction_consistency;
+pub mod limits;
+pub mod loop_summary;
 pub mod script_signature;
 pub mod signature;
 pub mod struct_defs;
@@ -31,10 +34,15 @@ pub use script_signature::{
 };
 pub use signature::SignatureChecker;
 pub use struct_defs::RecursiveStructDefChecker;
-pub use verifier::{verify_module, verify_script};
+pub use verifier::{
+    verify_module, verify_module_with_config, verify_module_with_config_for_test, verify_script,
+    verify_script_with_config, VerifierConfig,
+};
 
 mod acquires_list_verifier;
 mod locals_safety;
+pub mod meter;
 mod reference_safety;
+mod regression_tests;
 mod stack_usage_verifier;
 mod type_safety;
diff --git a/language/move-bytecode-verifier/src/limits.rs b/language/move-bytecode-verifier/src/limits.rs
new file mode 100644
index 0000000000..890d8f00f9
--- /dev/null
+++ b/language/move-bytecode-verifier/src/limits.rs
@@ -0,0 +1,173 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::VerifierConfig;
+use move_binary_format::{
+    binary_views::BinaryIndexedView,
+    errors::{Location, PartialVMError, PartialVMResult, VMResult},
+    file_format::{CompiledModule, CompiledScript, SignatureToken, StructFieldInformation},
+    IndexKind,
+};
+use move_core_types::vm_status::StatusCode;
+
+pub struct LimitsVerifier<'a> {
+    resolver: BinaryIndexedView<'a>,
+}
+
+impl<'a> LimitsVerifier<'a> {
+    pub fn verify_module(config: &VerifierConfig, module: &'a CompiledModule) -> VMResult<()> {
+        Self::verify_module_impl(config, module)
+            .map_err(|e| e.finish(Location::Module(module.self_id())))
+    }
+
+    fn verify_module_impl(
+        config: &VerifierConfig,
+        module: &'a CompiledModule,
+    ) -> PartialVMResult<()> {
+        let limit_check = Self {
+            resolver: BinaryIndexedView::Module(module),
+        };
+        limit_check.verify_function_handles(config)?;
+        limit_check.verify_struct_handles(config)?;
+        limit_check.verify_type_nodes(config)?;
+        limit_check.verify_definitions(config)
+    }
+
+    pub fn verify_script(config: &VerifierConfig, module: &'a CompiledScript) -> VMResult<()> {
+        Self::verify_script_impl(config, module).map_err(|e| e.finish(Location::Script))
+    }
+
+    fn verify_script_impl(
+        config: &VerifierConfig,
+        script: &'a CompiledScript,
+    ) -> PartialVMResult<()> {
+        let limit_check = Self {
+            resolver: BinaryIndexedView::Script(script),
+        };
+        limit_check.verify_function_handles(config)?;
+        limit_check.verify_struct_handles(config)?;
+        limit_check.verify_type_nodes(config)
+    }
+
+    fn verify_struct_handles(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        if let Some(limit) = config.max_generic_instantiation_length {
+            for (idx, struct_handle) in self.resolver.struct_handles().iter().enumerate() {
+                if struct_handle.type_parameters.len() > limit {
+                    return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_PARAMETERS)
+                        .at_index(IndexKind::StructHandle, idx as u16));
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn verify_function_handles(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        for (idx, function_handle) in self.resolver.function_handles().iter().enumerate() {
+            if let Some(limit) = config.max_generic_instantiation_length {
+                if function_handle.type_parameters.len() > limit {
+                    return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_PARAMETERS)
+                        .at_index(IndexKind::FunctionHandle, idx as u16));
+                }
+            };
+            if let Some(limit) = config.max_function_parameters {
+                if self
+                    .resolver
+                    .signature_at(function_handle.parameters)
+                    .0
+                    .len()
+                    > limit
+                {
+                    return Err(PartialVMError::new(StatusCode::TOO_MANY_PARAMETERS)
+                        .at_index(IndexKind::FunctionHandle, idx as u16));
+                }
+            };
+        }
+        Ok(())
+    }
+
+    fn verify_type_nodes(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        for sign in self.resolver.signatures() {
+            for ty in &sign.0 {
+                self.verify_type_node(config, ty)?
+            }
+        }
+        for cons in self.resolver.constant_pool() {
+            self.verify_type_node(config, &cons.type_)?
+        }
+        if let Some(sdefs) = self.resolver.struct_defs() {
+            for sdef in sdefs {
+                if let StructFieldInformation::Declared(fdefs) = &sdef.field_information {
+                    for fdef in fdefs {
+                        self.verify_type_node(config, &fdef.signature.0)?
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn verify_type_node(
+        &self,
+        config: &VerifierConfig,
+        ty: &SignatureToken,
+    ) -> PartialVMResult<()> {
+        if let Some(max) = &config.max_type_nodes {
+            // Structs and Parameters can expand to an unknown number of nodes, therefore
+            // we give them a higher size weight here.
+            const STRUCT_SIZE_WEIGHT: usize = 4;
+            const PARAM_SIZE_WEIGHT: usize = 4;
+            let mut size = 0;
+            for t in ty.preorder_traversal() {
+                // Notice that the preorder traversal will iterate all type instantiations, so we
+                // why we can ignore them below.
+                match t {
+                    SignatureToken::Struct(..) | SignatureToken::StructInstantiation(..) => {
+                        size += STRUCT_SIZE_WEIGHT
+                    }
+                    SignatureToken::TypeParameter(..) => size += PARAM_SIZE_WEIGHT,
+                    _ => size += 1,
+                }
+            }
+            if size > *max {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+            }
+        }
+        Ok(())
+    }
+
+    fn verify_definitions(&self, config: &VerifierConfig) -> PartialVMResult<()> {
+        if let Some(defs) = self.resolver.function_defs() {
+            if let Some(max_function_definitions) = config.max_function_definitions {
+                if defs.len() > max_function_definitions {
+                    return Err(PartialVMError::new(
+                        StatusCode::MAX_FUNCTION_DEFINITIONS_REACHED,
+                    ));
+                }
+            }
+        }
+        if let Some(defs) = self.resolver.struct_defs() {
+            if let Some(max_struct_definitions) = config.max_struct_definitions {
+                if defs.len() > max_struct_definitions {
+                    return Err(PartialVMError::new(
+                        StatusCode::MAX_STRUCT_DEFINITIONS_REACHED,
+                    ));
+                }
+            }
+            if let Some(max_fields_in_struct) = config.max_fields_in_struct {
+                for def in defs {
+                    match &def.field_information {
+                        StructFieldInformation::Native => (),
+                        StructFieldInformation::Declared(fields) => {
+                            if fields.len() > max_fields_in_struct {
+                                return Err(PartialVMError::new(
+                                    StatusCode::MAX_FIELD_DEFINITIONS_REACHED,
+                                ));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/language/move-bytecode-verifier/src/locals_safety/abstract_state.rs b/language/move-bytecode-verifier/src/locals_safety/abstract_state.rs
index 7e43a7962a..099a679ad7 100644
--- a/language/move-bytecode-verifier/src/locals_safety/abstract_state.rs
+++ b/language/move-bytecode-verifier/src/locals_safety/abstract_state.rs
@@ -23,8 +23,14 @@ pub(crate) enum LocalState {
     /// The local has a value
     Available,
 }
+use crate::meter::{Meter, Scope};
 use LocalState::*;
 
+pub(crate) const STEP_BASE_COST: u128 = 15;
+pub(crate) const RET_PER_LOCAL_COST: u128 = 30;
+pub(crate) const JOIN_BASE_COST: u128 = 10;
+pub(crate) const JOIN_PER_LOCAL_COST: u128 = 5;
+
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub(crate) struct AbstractState {
     current_function: Option<FunctionDefinitionIndex>,
@@ -130,7 +136,17 @@ impl AbstractState {
 
 impl AbstractDomain for AbstractState {
     /// attempts to join state to self and returns the result
-    fn join(&mut self, state: &AbstractState) -> JoinResult {
+    fn join(
+        &mut self,
+        state: &AbstractState,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<JoinResult> {
+        meter.add(Scope::Function, JOIN_BASE_COST)?;
+        meter.add_items(
+            Scope::Function,
+            JOIN_PER_LOCAL_COST,
+            state.local_states.len(),
+        )?;
         let joined = Self::join_(self, state);
         assert!(self.local_states.len() == joined.local_states.len());
         let locals_unchanged = self
@@ -139,10 +155,10 @@ impl AbstractDomain for AbstractState {
             .zip(&joined.local_states)
             .all(|(self_state, other_state)| self_state == other_state);
         if locals_unchanged {
-            JoinResult::Unchanged
+            Ok(JoinResult::Unchanged)
         } else {
             *self = joined;
-            JoinResult::Changed
+            Ok(JoinResult::Changed)
         }
     }
 }
diff --git a/language/move-bytecode-verifier/src/locals_safety/mod.rs b/language/move-bytecode-verifier/src/locals_safety/mod.rs
index 106f17ac73..55c80d93e5 100644
--- a/language/move-bytecode-verifier/src/locals_safety/mod.rs
+++ b/language/move-bytecode-verifier/src/locals_safety/mod.rs
@@ -8,7 +8,11 @@
 
 mod abstract_state;
 
-use crate::absint::{AbstractInterpreter, BlockInvariant, BlockPostcondition, TransferFunctions};
+use crate::{
+    absint::{AbstractInterpreter, TransferFunctions},
+    locals_safety::abstract_state::{RET_PER_LOCAL_COST, STEP_BASE_COST},
+    meter::{Meter, Scope},
+};
 use abstract_state::{AbstractState, LocalState};
 use move_binary_format::{
     binary_views::{BinaryIndexedView, FunctionView},
@@ -20,25 +24,19 @@ use move_core_types::vm_status::StatusCode;
 pub(crate) fn verify<'a>(
     resolver: &BinaryIndexedView,
     function_view: &'a FunctionView<'a>,
+    meter: &mut impl Meter,
 ) -> PartialVMResult<()> {
     let initial_state = AbstractState::new(resolver, function_view)?;
-    let inv_map = LocalsSafetyAnalysis().analyze_function(initial_state, function_view);
-    // Report all the join failures
-    for (_block_id, BlockInvariant { post, .. }) in inv_map {
-        match post {
-            BlockPostcondition::Error(err) => return Err(err),
-            // Block might be unprocessed if all predecessors had an error
-            BlockPostcondition::Unprocessed | BlockPostcondition::Success => (),
-        }
-    }
-    Ok(())
+    LocalsSafetyAnalysis().analyze_function(initial_state, function_view, meter)
 }
 
 fn execute_inner(
     state: &mut AbstractState,
     bytecode: &Bytecode,
     offset: CodeOffset,
+    meter: &mut impl Meter,
 ) -> PartialVMResult<()> {
+    meter.add(Scope::Function, STEP_BASE_COST)?;
     match bytecode {
         Bytecode::StLoc(idx) => match state.local_state(*idx) {
             LocalState::MaybeAvailable | LocalState::Available
@@ -74,6 +72,7 @@ fn execute_inner(
 
         Bytecode::Ret => {
             let local_states = state.local_states();
+            meter.add_items(Scope::Function, RET_PER_LOCAL_COST, local_states.len())?;
             let all_local_abilities = state.all_local_abilities();
             assert!(local_states.len() == all_local_abilities.len());
             for (local_state, local_abilities) in local_states.iter().zip(all_local_abilities) {
@@ -102,8 +101,11 @@ fn execute_inner(
         | Bytecode::ImmBorrowField(_)
         | Bytecode::ImmBorrowFieldGeneric(_)
         | Bytecode::LdU8(_)
+        | Bytecode::LdU16(_)
+        | Bytecode::LdU32(_)
         | Bytecode::LdU64(_)
         | Bytecode::LdU128(_)
+        | Bytecode::LdU256(_)
         | Bytecode::LdConst(_)
         | Bytecode::LdTrue
         | Bytecode::LdFalse
@@ -116,8 +118,11 @@ fn execute_inner(
         | Bytecode::ReadRef
         | Bytecode::WriteRef
         | Bytecode::CastU8
+        | Bytecode::CastU16
+        | Bytecode::CastU32
         | Bytecode::CastU64
         | Bytecode::CastU128
+        | Bytecode::CastU256
         | Bytecode::Add
         | Bytecode::Sub
         | Bytecode::Mul
@@ -163,7 +168,7 @@ struct LocalsSafetyAnalysis();
 
 impl TransferFunctions for LocalsSafetyAnalysis {
     type State = AbstractState;
-    type AnalysisError = PartialVMError;
+    type Error = PartialVMError;
 
     fn execute(
         &mut self,
@@ -171,8 +176,9 @@ impl TransferFunctions for LocalsSafetyAnalysis {
         bytecode: &Bytecode,
         index: CodeOffset,
         _last_index: CodeOffset,
-    ) -> Result<(), Self::AnalysisError> {
-        execute_inner(state, bytecode, index)
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        execute_inner(state, bytecode, index, meter)
     }
 }
 
diff --git a/language/move-bytecode-verifier/src/loop_summary.rs b/language/move-bytecode-verifier/src/loop_summary.rs
new file mode 100644
index 0000000000..0f56382b83
--- /dev/null
+++ b/language/move-bytecode-verifier/src/loop_summary.rs
@@ -0,0 +1,280 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::control_flow_graph::{BlockId, ControlFlowGraph, VMControlFlowGraph};
+use std::collections::{btree_map::Entry, BTreeMap, BTreeSet};
+
+/// Dense index into nodes in the same `LoopSummary`
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub struct NodeId(u16);
+
+/// Alias to treat vectors as `NodeId -> T` maps.
+type NodeMap<T> = Vec<T>;
+
+/// Summarise loop information from a control-flow graph by calculating its depth-first spanning
+/// tree (DFST) and then using that to:
+///
+/// - Distinguish edges in the CFG as:
+///   - tree edges (in the spanning tree)
+///   - back edges (going backward from descendant to ancestor in the spanning tree)
+///   - ... everything else.
+/// - Calculate which node is descendant of which in the DFST
+/// - Mapping nodes in the summary back to the blocks they originate from in the CFG.
+///
+/// This is used to implement Tarjan's Loop Reducibility algorithm (Tarjan 1974).
+pub struct LoopSummary {
+    /// Original block corresponding to this node, useful for recovering code offsets, e.g. for
+    /// error messages.
+    blocks: NodeMap<BlockId>,
+
+    /// Number of transitive descendants for a node, in the depth-first spanning tree.
+    descs: NodeMap<u16>,
+
+    /// The incoming edges for a node are partitioned between `back_edges` which create cycles in
+    /// the DFS tree, and `pred_edges` which are all the rest.
+    backs: NodeMap<Vec<NodeId>>,
+    preds: NodeMap<Vec<NodeId>>,
+}
+
+/// A disjoint-set data structure used when collapsing loops down to single nodes in the summary
+/// graph while remembering their loop nesting depth (how many levels of nesting are contained
+/// within them)
+pub struct LoopPartition {
+    /// The parent relationship in the disjoint-set.  The transitive closure of this type maps a
+    /// node to its representative.
+    parents: NodeMap<NodeId>,
+
+    /// The nesting depth of (collapsed) nodes in the summary graph.  Nodes that are uncollapsed
+    /// (not in any loop) have a depth of 0.  Initially, all nodes are uncollapsed.
+    depths: NodeMap<u16>,
+}
+
+impl LoopSummary {
+    pub fn new(cfg: &VMControlFlowGraph) -> Self {
+        use Exploration::*;
+        use Frontier::*;
+
+        enum Exploration {
+            InProgress(NodeId),
+            Done(NodeId),
+        }
+
+        enum Frontier {
+            Visit {
+                from_node: NodeId,
+                to_block: BlockId,
+            },
+            Finish {
+                block: BlockId,
+                node_id: NodeId,
+                parent: NodeId,
+            },
+        }
+
+        let num_blocks = cfg.num_blocks() as usize;
+
+        // Fields in LoopSummary that are filled via a depth-first traversal of `cfg`.
+        let mut blocks = vec![0; num_blocks];
+        let mut descs = vec![0; num_blocks];
+        let mut backs = vec![vec![]; num_blocks];
+        let mut preds = vec![vec![]; num_blocks];
+
+        let mut next_node = NodeId(0);
+
+        let root_block = cfg.entry_block_id();
+        let root_node = next_node.bump();
+
+        let mut exploration = BTreeMap::new();
+        blocks[usize::from(root_node)] = root_block;
+        exploration.insert(root_block, InProgress(root_node));
+
+        let mut stack: Vec<Frontier> = cfg
+            .successors(root_block)
+            .iter()
+            .map(|succ| Visit {
+                from_node: root_node,
+                to_block: *succ,
+            })
+            .collect();
+
+        while let Some(action) = stack.pop() {
+            match action {
+                Finish {
+                    block,
+                    node_id,
+                    parent,
+                } => {
+                    descs[usize::from(parent)] += 1 + descs[usize::from(node_id)];
+                    *exploration.get_mut(&block).unwrap() = Done(node_id);
+                }
+
+                Visit {
+                    from_node,
+                    to_block,
+                } => match exploration.entry(to_block) {
+                    Entry::Occupied(entry) => match entry.get() {
+                        // Cyclic back edge detected by re-visiting `to` while still processing its
+                        // children.
+                        InProgress(to_node) => backs[usize::from(*to_node)].push(from_node),
+
+                        // Cross edge detected by re-visiting `to` after it and its children have
+                        // been processed.
+                        Done(to_node) => preds[usize::from(*to_node)].push(from_node),
+                    },
+
+                    // Visiting `to` for the first time: `from` must be its parent in the depth-
+                    // -first spanning tree, and we should continue exploring its successors.
+                    Entry::Vacant(entry) => {
+                        let to_node = next_node.bump();
+                        entry.insert(InProgress(to_node));
+                        blocks[usize::from(to_node)] = to_block;
+                        preds[usize::from(to_node)].push(from_node);
+
+                        stack.push(Finish {
+                            block: to_block,
+                            node_id: to_node,
+                            parent: from_node,
+                        });
+
+                        stack.extend(cfg.successors(to_block).iter().map(|succ| Visit {
+                            from_node: to_node,
+                            to_block: *succ,
+                        }));
+                    }
+                },
+            }
+        }
+
+        LoopSummary {
+            blocks,
+            descs,
+            backs,
+            preds,
+        }
+    }
+
+    /// Decides whether `descendant` is a descendant of `ancestor` in the depth-first spanning
+    /// tree.
+    pub fn is_descendant(&self, NodeId(ancestor): NodeId, NodeId(descendant): NodeId) -> bool {
+        // All the descendants of `ancestor` in the DFST will have the IDs immediately following it,
+        // so we can check for descendants with a bounds check on `NodeId`, given `ancestor`'s
+        // transitive descendant count in `self.descs[ancestor]`.
+        ancestor <= descendant && descendant <= ancestor + self.descs[ancestor as usize]
+    }
+
+    /// Returns an iterator over `NodeId`s in this `LoopSummary` in pre-order according to its
+    /// depth-first spanning tree.
+    pub fn preorder(&self) -> impl DoubleEndedIterator<Item = NodeId> {
+        // `LoopSummary::new` assigns `NodeId`s to blocks in preorder, so just return the natural
+        // order.
+        (0..self.blocks.len()).map(|id| NodeId(id as u16))
+    }
+
+    /// Per-node accessors
+    pub fn block(&self, l: NodeId) -> BlockId {
+        self.blocks[usize::from(l)]
+    }
+
+    pub fn back_edges(&self, l: NodeId) -> &Vec<NodeId> {
+        &self.backs[usize::from(l)]
+    }
+
+    pub fn pred_edges(&self, l: NodeId) -> &Vec<NodeId> {
+        &self.preds[usize::from(l)]
+    }
+}
+
+impl LoopPartition {
+    pub fn new(summary: &LoopSummary) -> Self {
+        let num_blocks = summary.blocks.len();
+        LoopPartition {
+            parents: (0..num_blocks).map(|id| NodeId(id as u16)).collect(),
+            depths: vec![0; num_blocks],
+        }
+    }
+
+    /// Find the head of the collapsed node containing loop `id`, use path-compression to speed up
+    /// future accesses.
+    pub fn containing_loop(&mut self, id: NodeId) -> NodeId {
+        let mut child = id;
+        let mut parent = self.parent(child);
+        let mut grandparent = self.parent(parent);
+
+        if child == parent || parent == grandparent {
+            return parent;
+        }
+
+        let mut descendants = vec![];
+        loop {
+            // Invariant: child -> parent -> grandparent
+            //       and  parent != grandparent
+            //       and  forall d in descendants. parent(d) != parent(parent(d))
+            descendants.push(child);
+            (child, parent, grandparent) = (parent, grandparent, self.parent(grandparent));
+            if parent == grandparent {
+                break;
+            }
+        }
+
+        for descendant in descendants {
+            *self.parent_mut(descendant) = parent;
+        }
+
+        parent
+    }
+
+    /// Collapse `body` of a loop down to one node, represented by its `head`.  Calculate the
+    /// nesting depth of the collapsed node and return it.
+    ///
+    /// Assumes that all the nodes involved are the heads of their corresponding sets in the
+    /// partition.
+    ///
+    /// Note that this function can be called with an empty body, meaning `head` is the only
+    /// node in the loop.  Its nesting depth will still be incremented in this case.
+    pub fn collapse_loop(&mut self, head: NodeId, body: &BTreeSet<NodeId>) -> u16 {
+        debug_assert_eq!(head, self.parent(head));
+
+        let mut depth = self.depth(head);
+        for constituent in body {
+            debug_assert_eq!(*constituent, self.parent(*constituent));
+            *self.parent_mut(*constituent) = head;
+            depth = self.depth(*constituent).max(depth);
+        }
+
+        depth += 1;
+        *self.depth_mut(head) = depth;
+        depth
+    }
+
+    /// Per-node accessors
+    fn parent(&self, l: NodeId) -> NodeId {
+        self.parents[usize::from(l)]
+    }
+
+    fn parent_mut(&mut self, l: NodeId) -> &mut NodeId {
+        &mut self.parents[usize::from(l)]
+    }
+
+    fn depth(&self, l: NodeId) -> u16 {
+        self.depths[usize::from(l)]
+    }
+
+    fn depth_mut(&mut self, l: NodeId) -> &mut u16 {
+        &mut self.depths[usize::from(l)]
+    }
+}
+
+impl NodeId {
+    /// Post-increment (e.g. `self++`).
+    fn bump(&mut self) -> NodeId {
+        let ret = *self;
+        self.0 += 1;
+        ret
+    }
+}
+
+impl From<NodeId> for usize {
+    fn from(NodeId(id): NodeId) -> usize {
+        id as usize
+    }
+}
diff --git a/language/move-bytecode-verifier/src/meter.rs b/language/move-bytecode-verifier/src/meter.rs
new file mode 100644
index 0000000000..2e53fdadd0
--- /dev/null
+++ b/language/move-bytecode-verifier/src/meter.rs
@@ -0,0 +1,143 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::VerifierConfig;
+use move_binary_format::errors::{PartialVMError, PartialVMResult};
+use move_core_types::vm_status::StatusCode;
+use std::ops::Mul;
+
+/// Scope of meterinng
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub enum Scope {
+    // Metering is for module level
+    Module,
+    // Metering is for function level
+    Function,
+}
+
+/// Trait for a metering verification.
+pub trait Meter {
+    /// Indicates the begin of a new scope.
+    fn enter_scope(&mut self, name: &str, scope: Scope);
+
+    /// Transfer the amount of metering from once scope to the next. If the current scope has
+    /// metered N units, the target scope will be charged with N*factor.
+    fn transfer(&mut self, from: Scope, to: Scope, factor: f32) -> PartialVMResult<()>;
+
+    /// Add the number of units to the meter, returns an error if a limit is hit.
+    fn add(&mut self, scope: Scope, units: u128) -> PartialVMResult<()>;
+
+    /// Adds the number of items.
+    fn add_items(
+        &mut self,
+        scope: Scope,
+        units_per_item: u128,
+        items: usize,
+    ) -> PartialVMResult<()> {
+        if items == 0 {
+            return Ok(());
+        }
+        self.add(scope, units_per_item.saturating_mul(items as u128))
+    }
+
+    /// Adds the number of items with growth factor
+    fn add_items_with_growth(
+        &mut self,
+        scope: Scope,
+        mut units_per_item: u128,
+        items: usize,
+        growth_factor: f32,
+    ) -> PartialVMResult<()> {
+        if items == 0 {
+            return Ok(());
+        }
+        for _ in 0..items {
+            self.add(scope, units_per_item)?;
+            units_per_item = growth_factor.mul(units_per_item as f32) as u128;
+        }
+        Ok(())
+    }
+}
+
+pub struct BoundMeter {
+    mod_bounds: Bounds,
+    fun_bounds: Bounds,
+}
+
+struct Bounds {
+    name: String,
+    units: u128,
+    max: Option<u128>,
+}
+
+impl Meter for BoundMeter {
+    fn enter_scope(&mut self, name: &str, scope: Scope) {
+        let bounds = self.get_bounds(scope);
+        bounds.name = name.into();
+        bounds.units = 0;
+    }
+
+    fn transfer(&mut self, from: Scope, to: Scope, factor: f32) -> PartialVMResult<()> {
+        let units = (self.get_bounds(from).units as f32 * factor) as u128;
+        self.add(to, units)
+    }
+
+    fn add(&mut self, scope: Scope, units: u128) -> PartialVMResult<()> {
+        self.get_bounds(scope).add(units)
+    }
+}
+
+impl Bounds {
+    fn add(&mut self, units: u128) -> PartialVMResult<()> {
+        if let Some(max) = self.max {
+            let new_units = self.units.saturating_add(units);
+            if new_units > max {
+                // TODO: change to a new status PROGRAM_TOO_COMPLEX once this is rolled out. For
+                // now we use an existing code to avoid breaking changes on potential rollback.
+                return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED)
+                    .with_message(format!(
+                        "program too complex (in `{}` with `{} current + {} new > {} max`)",
+                        self.name, self.units, units, max
+                    )));
+            }
+            self.units = new_units;
+        }
+        Ok(())
+    }
+}
+
+impl BoundMeter {
+    pub fn new(config: &VerifierConfig) -> Self {
+        Self {
+            mod_bounds: Bounds {
+                name: "<unknown>".to_string(),
+                units: 0,
+                max: config.max_per_fun_meter_units,
+            },
+            fun_bounds: Bounds {
+                name: "<unknown>".to_string(),
+                units: 0,
+                max: config.max_per_fun_meter_units,
+            },
+        }
+    }
+
+    fn get_bounds(&mut self, scope: Scope) -> &mut Bounds {
+        if scope == Scope::Module {
+            &mut self.mod_bounds
+        } else {
+            &mut self.fun_bounds
+        }
+    }
+}
+
+pub struct DummyMeter;
+impl Meter for DummyMeter {
+    fn enter_scope(&mut self, _name: &str, _scope: Scope) {}
+    fn transfer(&mut self, _from: Scope, _to: Scope, _factor: f32) -> PartialVMResult<()> {
+        Ok(())
+    }
+    fn add(&mut self, _scope: Scope, _units: u128) -> PartialVMResult<()> {
+        Ok(())
+    }
+}
diff --git a/language/move-bytecode-verifier/src/reference_safety/abstract_state.rs b/language/move-bytecode-verifier/src/reference_safety/abstract_state.rs
index 707fda3720..d2d4172807 100644
--- a/language/move-bytecode-verifier/src/reference_safety/abstract_state.rs
+++ b/language/move-bytecode-verifier/src/reference_safety/abstract_state.rs
@@ -3,7 +3,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //! This module defines the abstract state for the type and memory safety analysis.
-use crate::absint::{AbstractDomain, JoinResult};
+use crate::{
+    absint::{AbstractDomain, JoinResult},
+    meter::{Meter, Scope},
+};
 use move_binary_format::{
     binary_views::FunctionView,
     errors::{PartialVMError, PartialVMResult},
@@ -11,6 +14,7 @@ use move_binary_format::{
         CodeOffset, FieldHandleIndex, FunctionDefinitionIndex, LocalIndex, Signature,
         SignatureToken, StructDefinitionIndex,
     },
+    safe_unwrap,
 };
 use move_borrow_graph::references::RefID;
 use move_core_types::vm_status::StatusCode;
@@ -68,13 +72,26 @@ impl std::fmt::Display for Label {
     }
 }
 
+pub(crate) const STEP_BASE_COST: u128 = 10;
+pub(crate) const STEP_PER_LOCAL_COST: u128 = 20;
+pub(crate) const STEP_PER_GRAPH_ITEM_COST: u128 = 50;
+pub(crate) const JOIN_BASE_COST: u128 = 100;
+pub(crate) const JOIN_PER_LOCAL_COST: u128 = 10;
+pub(crate) const JOIN_PER_GRAPH_ITEM_COST: u128 = 50;
+
+// The cost for an edge from an input reference parameter to output reference.
+pub(crate) const REF_PARAM_EDGE_COST: u128 = 100;
+pub(crate) const REF_PARAM_EDGE_COST_GROWTH: f32 = 1.5;
+
+// The cost of an acquires in a call.
+pub(crate) const CALL_PER_ACQUIRES_COST: u128 = 100;
+
 /// AbstractState is the analysis state over which abstract interpretation is performed.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub(crate) struct AbstractState {
     current_function: Option<FunctionDefinitionIndex>,
-    locals: BTreeMap<LocalIndex, AbstractValue>,
+    locals: Vec<AbstractValue>,
     borrow_graph: BorrowGraph,
-    num_locals: usize,
     next_id: usize,
 }
 
@@ -82,29 +99,24 @@ impl AbstractState {
     /// create a new abstract state
     pub fn new(function_view: &FunctionView) -> Self {
         let num_locals = function_view.parameters().len() + function_view.locals().len();
-
         // ids in [0, num_locals) are reserved for constructing canonical state
         // id at num_locals is reserved for the frame root
         let next_id = num_locals + 1;
         let mut state = AbstractState {
             current_function: function_view.index(),
-            locals: BTreeMap::new(),
+            locals: vec![AbstractValue::NonReference; num_locals],
             borrow_graph: BorrowGraph::new(),
-            num_locals,
             next_id,
         };
 
         for (param_idx, param_ty) in function_view.parameters().0.iter().enumerate() {
-            let value = if param_ty.is_reference() {
+            if param_ty.is_reference() {
                 let id = RefID::new(param_idx);
                 state
                     .borrow_graph
                     .new_ref(id, param_ty.is_mutable_reference());
-                AbstractValue::Reference(id)
-            } else {
-                AbstractValue::NonReference
-            };
-            state.locals.insert(param_idx as LocalIndex, value);
+                state.locals[param_idx] = AbstractValue::Reference(id)
+            }
         }
         state.borrow_graph.new_ref(state.frame_root(), true);
 
@@ -112,9 +124,17 @@ impl AbstractState {
         state
     }
 
+    pub(crate) fn local_count(&self) -> usize {
+        self.locals.len()
+    }
+
+    pub(crate) fn graph_size(&self) -> usize {
+        self.borrow_graph.graph_size()
+    }
+
     /// returns the frame root id
     fn frame_root(&self) -> RefID {
-        RefID::new(self.num_locals)
+        RefID::new(self.locals.len())
     }
 
     fn error(&self, status: StatusCode, offset: CodeOffset) -> PartialVMError {
@@ -285,7 +305,7 @@ impl AbstractState {
         offset: CodeOffset,
         local: LocalIndex,
     ) -> PartialVMResult<AbstractValue> {
-        match self.locals.get(&local).unwrap() {
+        match safe_unwrap!(self.locals.get(local as usize)) {
             AbstractValue::Reference(id) => {
                 let id = *id;
                 let new_id = self.new_ref(self.borrow_graph.is_mutable(id));
@@ -304,7 +324,11 @@ impl AbstractState {
         offset: CodeOffset,
         local: LocalIndex,
     ) -> PartialVMResult<AbstractValue> {
-        match self.locals.remove(&local).unwrap() {
+        let old_value = std::mem::replace(
+            safe_unwrap!(self.locals.get_mut(local as usize)),
+            AbstractValue::NonReference,
+        );
+        match old_value {
             AbstractValue::Reference(id) => Ok(AbstractValue::Reference(id)),
             AbstractValue::NonReference if self.is_local_borrowed(local) => {
                 Err(self.error(StatusCode::MOVELOC_EXISTS_BORROW_ERROR, offset))
@@ -319,17 +343,17 @@ impl AbstractState {
         local: LocalIndex,
         new_value: AbstractValue,
     ) -> PartialVMResult<()> {
-        let old_value = self.locals.insert(local, new_value);
+        let old_value =
+            std::mem::replace(safe_unwrap!(self.locals.get_mut(local as usize)), new_value);
         match old_value {
-            None => Ok(()),
-            Some(AbstractValue::Reference(id)) => {
+            AbstractValue::Reference(id) => {
                 self.release(id);
                 Ok(())
             }
-            Some(AbstractValue::NonReference) if self.is_local_borrowed(local) => {
+            AbstractValue::NonReference if self.is_local_borrowed(local) => {
                 Err(self.error(StatusCode::STLOC_UNSAFE_TO_DESTROY_ERROR, offset))
             }
-            Some(AbstractValue::NonReference) => Ok(()),
+            AbstractValue::NonReference => Ok(()),
         }
     }
 
@@ -462,7 +486,7 @@ impl AbstractState {
         vector: AbstractValue,
         mut_: bool,
     ) -> PartialVMResult<()> {
-        let id = vector.ref_id().unwrap();
+        let id = safe_unwrap!(vector.ref_id());
         if mut_ && !self.is_writable(id) {
             return Err(self.error(StatusCode::VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR, offset));
         }
@@ -476,7 +500,7 @@ impl AbstractState {
         vector: AbstractValue,
         mut_: bool,
     ) -> PartialVMResult<AbstractValue> {
-        let vec_id = vector.ref_id().unwrap();
+        let vec_id = safe_unwrap!(vector.ref_id());
         if mut_ && !self.is_writable(vec_id) {
             return Err(self.error(
                 StatusCode::VEC_BORROW_ELEMENT_EXISTS_MUTABLE_BORROW_ERROR,
@@ -497,7 +521,13 @@ impl AbstractState {
         arguments: Vec<AbstractValue>,
         acquired_resources: &BTreeSet<StructDefinitionIndex>,
         return_: &Signature,
+        meter: &mut impl Meter,
     ) -> PartialVMResult<Vec<AbstractValue>> {
+        meter.add_items(
+            Scope::Function,
+            CALL_PER_ACQUIRES_COST,
+            acquired_resources.len(),
+        )?;
         // Check acquires
         for acquired_resource in acquired_resources {
             if self.is_global_borrowed(*acquired_resource) {
@@ -521,6 +551,7 @@ impl AbstractState {
         }
 
         // Track borrow relationships of return values on inputs
+        let mut returned_refs = 0;
         let return_values = return_
             .0
             .iter()
@@ -530,6 +561,7 @@ impl AbstractState {
                     for parent in &mutable_references_to_borrow_from {
                         self.add_borrow(*parent, id);
                     }
+                    returned_refs += 1;
                     AbstractValue::Reference(id)
                 }
                 SignatureToken::Reference(_) => {
@@ -537,12 +569,23 @@ impl AbstractState {
                     for parent in &all_references_to_borrow_from {
                         self.add_borrow(*parent, id);
                     }
+                    returned_refs += 1;
                     AbstractValue::Reference(id)
                 }
                 _ => AbstractValue::NonReference,
             })
             .collect();
 
+        // Meter usage of reference edges
+        meter.add_items_with_growth(
+            Scope::Function,
+            REF_PARAM_EDGE_COST,
+            all_references_to_borrow_from
+                .len()
+                .saturating_mul(returned_refs),
+            REF_PARAM_EDGE_COST_GROWTH,
+        )?;
+
         // Release input references
         for id in all_references_to_borrow_from {
             self.release(id)
@@ -553,7 +596,7 @@ impl AbstractState {
     pub fn ret(&mut self, offset: CodeOffset, values: Vec<AbstractValue>) -> PartialVMResult<()> {
         // release all local variables
         let mut released = BTreeSet::new();
-        for (_local, stored_value) in self.locals.iter() {
+        for stored_value in self.locals.iter() {
             if let AbstractValue::Reference(id) = stored_value {
                 released.insert(*id);
             }
@@ -588,18 +631,16 @@ impl AbstractState {
         let locals = self
             .locals
             .iter()
-            .map(|(local, value)| {
-                let new_value = match value {
-                    AbstractValue::Reference(old_id) => {
-                        let new_id = RefID::new(*local as usize);
-                        id_map.insert(*old_id, new_id);
-                        AbstractValue::Reference(new_id)
-                    }
-                    AbstractValue::NonReference => AbstractValue::NonReference,
-                };
-                (*local, new_value)
+            .enumerate()
+            .map(|(local, value)| match value {
+                AbstractValue::Reference(old_id) => {
+                    let new_id = RefID::new(local);
+                    id_map.insert(*old_id, new_id);
+                    AbstractValue::Reference(new_id)
+                }
+                AbstractValue::NonReference => AbstractValue::NonReference,
             })
-            .collect::<BTreeMap<_, _>>();
+            .collect::<Vec<_>>();
         assert!(self.locals.len() == locals.len());
         let mut borrow_graph = self.borrow_graph.clone();
         borrow_graph.remap_refs(&id_map);
@@ -607,8 +648,7 @@ impl AbstractState {
             locals,
             borrow_graph,
             current_function: self.current_function,
-            num_locals: self.num_locals,
-            next_id: self.num_locals + 1,
+            next_id: self.locals.len() + 1,
         };
         assert!(canonical_state.is_canonical());
         canonical_state
@@ -619,66 +659,53 @@ impl AbstractState {
     }
 
     fn is_canonical(&self) -> bool {
-        self.num_locals + 1 == self.next_id
-            && self.locals.iter().all(|(local, value)| {
+        self.locals.len() + 1 == self.next_id
+            && self.locals.iter().enumerate().all(|(local, value)| {
                 value
                     .ref_id()
-                    .map(|id| RefID::new(*local as usize) == id)
+                    .map(|id| RefID::new(local) == id)
                     .unwrap_or(true)
             })
     }
 
-    fn iter_locals(&self) -> impl Iterator<Item = LocalIndex> {
-        0..self.num_locals as LocalIndex
-    }
-
     pub fn join_(&self, other: &Self) -> Self {
         assert!(self.current_function == other.current_function);
         assert!(self.is_canonical() && other.is_canonical());
         assert!(self.next_id == other.next_id);
-        assert!(self.num_locals == other.num_locals);
-        let mut locals = BTreeMap::new();
+        assert!(self.locals.len() == other.locals.len());
         let mut self_graph = self.borrow_graph.clone();
         let mut other_graph = other.borrow_graph.clone();
-        for local in self.iter_locals() {
-            let self_value = self.locals.get(&local);
-            let other_value = other.locals.get(&local);
-            match (self_value, other_value) {
-                // Unavailable on both sides, nothing to add
-                (None, None) => (),
-
-                (Some(v), None) => {
-                    // A reference exists on one side, but not the other. Release
-                    if let AbstractValue::Reference(id) = v {
+        let locals = self
+            .locals
+            .iter()
+            .zip(&other.locals)
+            .map(|(self_value, other_value)| {
+                match (self_value, other_value) {
+                    (AbstractValue::Reference(id), AbstractValue::NonReference) => {
                         self_graph.release(*id);
+                        AbstractValue::NonReference
                     }
-                }
-                (None, Some(v)) => {
-                    // A reference exists on one side, but not the other. Release
-                    if let AbstractValue::Reference(id) = v {
+                    (AbstractValue::NonReference, AbstractValue::Reference(id)) => {
                         other_graph.release(*id);
+                        AbstractValue::NonReference
+                    }
+                    // The local has a value on each side, add it to the state
+                    (v1, v2) => {
+                        assert!(v1 == v2);
+                        *v1
                     }
                 }
-
-                // The local has a value on each side, add it to the state
-                (Some(v1), Some(v2)) => {
-                    assert!(v1 == v2);
-                    assert!(!locals.contains_key(&local));
-                    locals.insert(local, *v1);
-                }
-            }
-        }
+            })
+            .collect();
 
         let borrow_graph = self_graph.join(&other_graph);
         let current_function = self.current_function;
         let next_id = self.next_id;
-        let num_locals = self.num_locals;
 
         Self {
             current_function,
             locals,
             borrow_graph,
-            num_locals,
             next_id,
         }
     }
@@ -686,19 +713,33 @@ impl AbstractState {
 
 impl AbstractDomain for AbstractState {
     /// attempts to join state to self and returns the result
-    fn join(&mut self, state: &AbstractState) -> JoinResult {
+    fn join(
+        &mut self,
+        state: &AbstractState,
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<JoinResult> {
         let joined = Self::join_(self, state);
         assert!(joined.is_canonical());
-        assert!(self.num_locals == joined.num_locals);
+        assert!(self.locals.len() == joined.locals.len());
+        meter.add(Scope::Function, JOIN_BASE_COST)?;
+        meter.add_items(Scope::Function, JOIN_PER_LOCAL_COST, self.locals.len())?;
+        meter.add_items(
+            Scope::Function,
+            JOIN_PER_GRAPH_ITEM_COST,
+            self.borrow_graph.graph_size(),
+        )?;
         let locals_unchanged = self
-            .iter_locals()
-            .all(|idx| self.locals.get(&idx) == joined.locals.get(&idx));
-        let borrow_graph_unchanged = self.borrow_graph.leq(&joined.borrow_graph);
-        if locals_unchanged && borrow_graph_unchanged {
-            JoinResult::Unchanged
+            .locals
+            .iter()
+            .zip(&joined.locals)
+            .all(|(self_value, joined_value)| self_value == joined_value);
+        // locals unchanged and borrow graph covered, return unchanged
+        // else mark as changed and update the state
+        if locals_unchanged && self.borrow_graph.leq(&joined.borrow_graph) {
+            Ok(JoinResult::Unchanged)
         } else {
             *self = joined;
-            JoinResult::Changed
+            Ok(JoinResult::Changed)
         }
     }
 }
diff --git a/language/move-bytecode-verifier/src/reference_safety/mod.rs b/language/move-bytecode-verifier/src/reference_safety/mod.rs
index 5244d902fb..85bcb555a8 100644
--- a/language/move-bytecode-verifier/src/reference_safety/mod.rs
+++ b/language/move-bytecode-verifier/src/reference_safety/mod.rs
@@ -10,7 +10,13 @@
 
 mod abstract_state;
 
-use crate::absint::{AbstractInterpreter, BlockInvariant, BlockPostcondition, TransferFunctions};
+use crate::{
+    absint::{AbstractInterpreter, TransferFunctions},
+    meter::{Meter, Scope},
+    reference_safety::abstract_state::{
+        STEP_BASE_COST, STEP_PER_GRAPH_ITEM_COST, STEP_PER_LOCAL_COST,
+    },
+};
 use abstract_state::{AbstractState, AbstractValue};
 use move_binary_format::{
     binary_views::{BinaryIndexedView, FunctionView},
@@ -19,6 +25,7 @@ use move_binary_format::{
         Bytecode, CodeOffset, FunctionDefinitionIndex, FunctionHandle, IdentifierIndex,
         SignatureIndex, SignatureToken, StructDefinition, StructFieldInformation,
     },
+    safe_assert, safe_unwrap,
 };
 use move_core_types::vm_status::StatusCode;
 use std::collections::{BTreeSet, HashMap};
@@ -49,20 +56,12 @@ pub(crate) fn verify<'a>(
     resolver: &'a BinaryIndexedView<'a>,
     function_view: &FunctionView,
     name_def_map: &'a HashMap<IdentifierIndex, FunctionDefinitionIndex>,
+    meter: &mut impl Meter,
 ) -> PartialVMResult<()> {
     let initial_state = AbstractState::new(function_view);
 
     let mut verifier = ReferenceSafetyAnalysis::new(resolver, function_view, name_def_map);
-    let inv_map = verifier.analyze_function(initial_state, function_view);
-    // Report all the join failures
-    for (_block_id, BlockInvariant { post, .. }) in inv_map {
-        match post {
-            BlockPostcondition::Error(err) => return Err(err),
-            // Block might be unprocessed if all predecessors had an error
-            BlockPostcondition::Unprocessed | BlockPostcondition::Success => (),
-        }
-    }
-    Ok(())
+    verifier.analyze_function(initial_state, function_view, meter)
 }
 
 fn call(
@@ -70,6 +69,7 @@ fn call(
     state: &mut AbstractState,
     offset: CodeOffset,
     function_handle: &FunctionHandle,
+    meter: &mut impl Meter,
 ) -> PartialVMResult<()> {
     let parameters = verifier.resolver.signature_at(function_handle.parameters);
     let arguments = parameters
@@ -92,7 +92,7 @@ fn call(
         None => BTreeSet::new(),
     };
     let return_ = verifier.resolver.signature_at(function_handle.return_);
-    let values = state.call(offset, arguments, &acquired_resources, return_)?;
+    let values = state.call(offset, arguments, &acquired_resources, return_, meter)?;
     for value in values {
         verifier.stack.push(value)
     }
@@ -106,20 +106,28 @@ fn num_fields(struct_def: &StructDefinition) -> usize {
     }
 }
 
-fn pack(verifier: &mut ReferenceSafetyAnalysis, struct_def: &StructDefinition) {
+fn pack(
+    verifier: &mut ReferenceSafetyAnalysis,
+    struct_def: &StructDefinition,
+) -> PartialVMResult<()> {
     for _ in 0..num_fields(struct_def) {
-        assert!(verifier.stack.pop().unwrap().is_value())
+        safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value())
     }
     // TODO maybe call state.value_for
-    verifier.stack.push(AbstractValue::NonReference)
+    verifier.stack.push(AbstractValue::NonReference);
+    Ok(())
 }
 
-fn unpack(verifier: &mut ReferenceSafetyAnalysis, struct_def: &StructDefinition) {
-    assert!(verifier.stack.pop().unwrap().is_value());
+fn unpack(
+    verifier: &mut ReferenceSafetyAnalysis,
+    struct_def: &StructDefinition,
+) -> PartialVMResult<()> {
+    safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value());
     // TODO maybe call state.value_for
     for _ in 0..num_fields(struct_def) {
         verifier.stack.push(AbstractValue::NonReference)
     }
+    Ok(())
 }
 
 fn vec_element_type(
@@ -139,9 +147,18 @@ fn execute_inner(
     state: &mut AbstractState,
     bytecode: &Bytecode,
     offset: CodeOffset,
+    meter: &mut impl Meter,
 ) -> PartialVMResult<()> {
+    meter.add(Scope::Function, STEP_BASE_COST)?;
+    meter.add_items(Scope::Function, STEP_PER_LOCAL_COST, state.local_count())?;
+    meter.add_items(
+        Scope::Function,
+        STEP_PER_GRAPH_ITEM_COST,
+        state.graph_size(),
+    )?;
+
     match bytecode {
-        Bytecode::Pop => state.release_value(verifier.stack.pop().unwrap()),
+        Bytecode::Pop => state.release_value(safe_unwrap!(verifier.stack.pop())),
 
         Bytecode::CopyLoc(local) => {
             let value = state.copy_loc(offset, *local)?;
@@ -151,28 +168,30 @@ fn execute_inner(
             let value = state.move_loc(offset, *local)?;
             verifier.stack.push(value)
         }
-        Bytecode::StLoc(local) => state.st_loc(offset, *local, verifier.stack.pop().unwrap())?,
+        Bytecode::StLoc(local) => {
+            state.st_loc(offset, *local, safe_unwrap!(verifier.stack.pop()))?
+        }
 
         Bytecode::FreezeRef => {
-            let id = verifier.stack.pop().unwrap().ref_id().unwrap();
+            let id = safe_unwrap!(safe_unwrap!(verifier.stack.pop()).ref_id());
             let frozen = state.freeze_ref(offset, id)?;
             verifier.stack.push(frozen)
         }
         Bytecode::Eq | Bytecode::Neq => {
-            let v1 = verifier.stack.pop().unwrap();
-            let v2 = verifier.stack.pop().unwrap();
+            let v1 = safe_unwrap!(verifier.stack.pop());
+            let v2 = safe_unwrap!(verifier.stack.pop());
             let value = state.comparison(offset, v1, v2)?;
             verifier.stack.push(value)
         }
         Bytecode::ReadRef => {
-            let id = verifier.stack.pop().unwrap().ref_id().unwrap();
+            let id = safe_unwrap!(safe_unwrap!(verifier.stack.pop()).ref_id());
             let value = state.read_ref(offset, id)?;
             verifier.stack.push(value)
         }
         Bytecode::WriteRef => {
-            let id = verifier.stack.pop().unwrap().ref_id().unwrap();
-            let val_operand = verifier.stack.pop().unwrap();
-            assert!(val_operand.is_value());
+            let id = safe_unwrap!(safe_unwrap!(verifier.stack.pop()).ref_id());
+            let val_operand = safe_unwrap!(verifier.stack.pop());
+            safe_assert!(val_operand.is_value());
             state.write_ref(offset, id)?
         }
 
@@ -185,7 +204,7 @@ fn execute_inner(
             verifier.stack.push(value)
         }
         Bytecode::MutBorrowField(field_handle_index) => {
-            let id = verifier.stack.pop().unwrap().ref_id().unwrap();
+            let id = safe_unwrap!(safe_unwrap!(verifier.stack.pop()).ref_id());
             let value = state.borrow_field(offset, true, id, *field_handle_index)?;
             verifier.stack.push(value)
         }
@@ -193,12 +212,12 @@ fn execute_inner(
             let field_inst = verifier
                 .resolver
                 .field_instantiation_at(*field_inst_index)?;
-            let id = verifier.stack.pop().unwrap().ref_id().unwrap();
+            let id = safe_unwrap!(safe_unwrap!(verifier.stack.pop()).ref_id());
             let value = state.borrow_field(offset, true, id, field_inst.handle)?;
             verifier.stack.push(value)
         }
         Bytecode::ImmBorrowField(field_handle_index) => {
-            let id = verifier.stack.pop().unwrap().ref_id().unwrap();
+            let id = safe_unwrap!(safe_unwrap!(verifier.stack.pop()).ref_id());
             let value = state.borrow_field(offset, false, id, *field_handle_index)?;
             verifier.stack.push(value)
         }
@@ -206,40 +225,40 @@ fn execute_inner(
             let field_inst = verifier
                 .resolver
                 .field_instantiation_at(*field_inst_index)?;
-            let id = verifier.stack.pop().unwrap().ref_id().unwrap();
+            let id = safe_unwrap!(safe_unwrap!(verifier.stack.pop()).ref_id());
             let value = state.borrow_field(offset, false, id, field_inst.handle)?;
             verifier.stack.push(value)
         }
 
         Bytecode::MutBorrowGlobal(idx) => {
-            assert!(verifier.stack.pop().unwrap().is_value());
+            safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value());
             let value = state.borrow_global(offset, true, *idx)?;
             verifier.stack.push(value)
         }
         Bytecode::MutBorrowGlobalGeneric(idx) => {
-            assert!(verifier.stack.pop().unwrap().is_value());
+            safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value());
             let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
             let value = state.borrow_global(offset, true, struct_inst.def)?;
             verifier.stack.push(value)
         }
         Bytecode::ImmBorrowGlobal(idx) => {
-            assert!(verifier.stack.pop().unwrap().is_value());
+            safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value());
             let value = state.borrow_global(offset, false, *idx)?;
             verifier.stack.push(value)
         }
         Bytecode::ImmBorrowGlobalGeneric(idx) => {
-            assert!(verifier.stack.pop().unwrap().is_value());
+            safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value());
             let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
             let value = state.borrow_global(offset, false, struct_inst.def)?;
             verifier.stack.push(value)
         }
         Bytecode::MoveFrom(idx) => {
-            assert!(verifier.stack.pop().unwrap().is_value());
+            safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value());
             let value = state.move_from(offset, *idx)?;
             verifier.stack.push(value)
         }
         Bytecode::MoveFromGeneric(idx) => {
-            assert!(verifier.stack.pop().unwrap().is_value());
+            safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value());
             let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
             let value = state.move_from(offset, struct_inst.def)?;
             verifier.stack.push(value)
@@ -247,18 +266,18 @@ fn execute_inner(
 
         Bytecode::Call(idx) => {
             let function_handle = verifier.resolver.function_handle_at(*idx);
-            call(verifier, state, offset, function_handle)?
+            call(verifier, state, offset, function_handle, meter)?
         }
         Bytecode::CallGeneric(idx) => {
             let func_inst = verifier.resolver.function_instantiation_at(*idx);
             let function_handle = verifier.resolver.function_handle_at(func_inst.handle);
-            call(verifier, state, offset, function_handle)?
+            call(verifier, state, offset, function_handle, meter)?
         }
 
         Bytecode::Ret => {
             let mut return_values = vec![];
             for _ in 0..verifier.function_view.return_().len() {
-                return_values.push(verifier.stack.pop().unwrap());
+                return_values.push(safe_unwrap!(verifier.stack.pop()));
             }
             return_values.reverse();
 
@@ -268,28 +287,34 @@ fn execute_inner(
         Bytecode::Branch(_)
         | Bytecode::Nop
         | Bytecode::CastU8
+        | Bytecode::CastU16
+        | Bytecode::CastU32
         | Bytecode::CastU64
         | Bytecode::CastU128
+        | Bytecode::CastU256
         | Bytecode::Not
         | Bytecode::Exists(_)
         | Bytecode::ExistsGeneric(_) => (),
 
         Bytecode::BrTrue(_) | Bytecode::BrFalse(_) | Bytecode::Abort => {
-            assert!(verifier.stack.pop().unwrap().is_value());
+            safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value());
         }
         Bytecode::MoveTo(_) | Bytecode::MoveToGeneric(_) => {
             // resource value
-            assert!(verifier.stack.pop().unwrap().is_value());
+            safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value());
             // signer reference
-            state.release_value(verifier.stack.pop().unwrap());
+            state.release_value(safe_unwrap!(verifier.stack.pop()));
         }
 
         Bytecode::LdTrue | Bytecode::LdFalse => {
             verifier.stack.push(state.value_for(&SignatureToken::Bool))
         }
         Bytecode::LdU8(_) => verifier.stack.push(state.value_for(&SignatureToken::U8)),
+        Bytecode::LdU16(_) => verifier.stack.push(state.value_for(&SignatureToken::U16)),
+        Bytecode::LdU32(_) => verifier.stack.push(state.value_for(&SignatureToken::U32)),
         Bytecode::LdU64(_) => verifier.stack.push(state.value_for(&SignatureToken::U64)),
         Bytecode::LdU128(_) => verifier.stack.push(state.value_for(&SignatureToken::U128)),
+        Bytecode::LdU256(_) => verifier.stack.push(state.value_for(&SignatureToken::U256)),
         Bytecode::LdConst(idx) => {
             let signature = &verifier.resolver.constant_at(*idx).type_;
             verifier.stack.push(state.value_for(signature))
@@ -311,34 +336,34 @@ fn execute_inner(
         | Bytecode::Gt
         | Bytecode::Le
         | Bytecode::Ge => {
-            assert!(verifier.stack.pop().unwrap().is_value());
-            assert!(verifier.stack.pop().unwrap().is_value());
+            safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value());
+            safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value());
             // TODO maybe call state.value_for
             verifier.stack.push(AbstractValue::NonReference)
         }
 
         Bytecode::Pack(idx) => {
             let struct_def = verifier.resolver.struct_def_at(*idx)?;
-            pack(verifier, struct_def)
+            pack(verifier, struct_def)?
         }
         Bytecode::PackGeneric(idx) => {
             let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
             let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
-            pack(verifier, struct_def)
+            pack(verifier, struct_def)?
         }
         Bytecode::Unpack(idx) => {
             let struct_def = verifier.resolver.struct_def_at(*idx)?;
-            unpack(verifier, struct_def)
+            unpack(verifier, struct_def)?
         }
         Bytecode::UnpackGeneric(idx) => {
             let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
             let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
-            unpack(verifier, struct_def)
+            unpack(verifier, struct_def)?
         }
 
         Bytecode::VecPack(idx, num) => {
             for _ in 0..*num {
-                assert!(verifier.stack.pop().unwrap().is_value())
+                safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value())
             }
 
             let element_type = vec_element_type(verifier, *idx)?;
@@ -348,32 +373,32 @@ fn execute_inner(
         }
 
         Bytecode::VecLen(_) => {
-            let vec_ref = verifier.stack.pop().unwrap();
+            let vec_ref = safe_unwrap!(verifier.stack.pop());
             state.vector_op(offset, vec_ref, false)?;
             verifier.stack.push(state.value_for(&SignatureToken::U64));
         }
 
         Bytecode::VecImmBorrow(_) => {
-            assert!(verifier.stack.pop().unwrap().is_value());
-            let vec_ref = verifier.stack.pop().unwrap();
+            safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value());
+            let vec_ref = safe_unwrap!(verifier.stack.pop());
             let elem_ref = state.vector_element_borrow(offset, vec_ref, false)?;
             verifier.stack.push(elem_ref);
         }
         Bytecode::VecMutBorrow(_) => {
-            assert!(verifier.stack.pop().unwrap().is_value());
-            let vec_ref = verifier.stack.pop().unwrap();
+            safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value());
+            let vec_ref = safe_unwrap!(verifier.stack.pop());
             let elem_ref = state.vector_element_borrow(offset, vec_ref, true)?;
             verifier.stack.push(elem_ref);
         }
 
         Bytecode::VecPushBack(_) => {
-            assert!(verifier.stack.pop().unwrap().is_value());
-            let vec_ref = verifier.stack.pop().unwrap();
+            safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value());
+            let vec_ref = safe_unwrap!(verifier.stack.pop());
             state.vector_op(offset, vec_ref, true)?;
         }
 
         Bytecode::VecPopBack(idx) => {
-            let vec_ref = verifier.stack.pop().unwrap();
+            let vec_ref = safe_unwrap!(verifier.stack.pop());
             state.vector_op(offset, vec_ref, true)?;
 
             let element_type = vec_element_type(verifier, *idx)?;
@@ -381,7 +406,7 @@ fn execute_inner(
         }
 
         Bytecode::VecUnpack(idx, num) => {
-            assert!(verifier.stack.pop().unwrap().is_value());
+            safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value());
 
             let element_type = vec_element_type(verifier, *idx)?;
             for _ in 0..*num {
@@ -390,9 +415,9 @@ fn execute_inner(
         }
 
         Bytecode::VecSwap(_) => {
-            assert!(verifier.stack.pop().unwrap().is_value());
-            assert!(verifier.stack.pop().unwrap().is_value());
-            let vec_ref = verifier.stack.pop().unwrap();
+            safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value());
+            safe_assert!(safe_unwrap!(verifier.stack.pop()).is_value());
+            let vec_ref = safe_unwrap!(verifier.stack.pop());
             state.vector_op(offset, vec_ref, true)?;
         }
     };
@@ -401,7 +426,7 @@ fn execute_inner(
 
 impl<'a> TransferFunctions for ReferenceSafetyAnalysis<'a> {
     type State = AbstractState;
-    type AnalysisError = PartialVMError;
+    type Error = PartialVMError;
 
     fn execute(
         &mut self,
@@ -409,10 +434,11 @@ impl<'a> TransferFunctions for ReferenceSafetyAnalysis<'a> {
         bytecode: &Bytecode,
         index: CodeOffset,
         last_index: CodeOffset,
-    ) -> Result<(), Self::AnalysisError> {
-        execute_inner(self, state, bytecode, index)?;
+        meter: &mut impl Meter,
+    ) -> PartialVMResult<()> {
+        execute_inner(self, state, bytecode, index, meter)?;
         if index == last_index {
-            assert!(self.stack.is_empty());
+            safe_assert!(self.stack.is_empty());
             *state = state.construct_canonical_state()
         }
         Ok(())
diff --git a/language/move-bytecode-verifier/src/regression_tests/bounds_check.rs b/language/move-bytecode-verifier/src/regression_tests/bounds_check.rs
new file mode 100644
index 0000000000..ac18d7a8a3
--- /dev/null
+++ b/language/move-bytecode-verifier/src/regression_tests/bounds_check.rs
@@ -0,0 +1,11 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use hex_literal::hex;
+use move_binary_format::file_format::CompiledScript;
+
+#[test]
+fn script_with_too_many_locals() {
+    let bad_script = hex!("a11ceb0b05000000010500d1018701010101010705050601070101010101070505060107050505050505060107010505050601070101010101070505060107050a0101010101070505060107010101010107050506010705050505050506010701050505060107010101010107010101010c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c050c0c0c0c0c0c0c0c0c0c0c012d0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c030602000000070b010c000a20010b000c010500");
+    let _ = CompiledScript::deserialize(&bad_script).unwrap_err();
+}
diff --git a/language/move-bytecode-verifier/src/regression_tests/mod.rs b/language/move-bytecode-verifier/src/regression_tests/mod.rs
new file mode 100644
index 0000000000..84a8075de0
--- /dev/null
+++ b/language/move-bytecode-verifier/src/regression_tests/mod.rs
@@ -0,0 +1,7 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(test)]
+mod bounds_check;
+#[cfg(test)]
+mod reference_analysis;
diff --git a/language/move-bytecode-verifier/src/regression_tests/reference_analysis.rs b/language/move-bytecode-verifier/src/regression_tests/reference_analysis.rs
new file mode 100644
index 0000000000..25244f1a41
--- /dev/null
+++ b/language/move-bytecode-verifier/src/regression_tests/reference_analysis.rs
@@ -0,0 +1,323 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    file_format::{
+        empty_module, AbilitySet, AddressIdentifierIndex,
+        Bytecode::{self, *},
+        CodeUnit, Constant, FieldDefinition, FunctionDefinition, FunctionHandle,
+        FunctionHandleIndex, IdentifierIndex, ModuleHandle, ModuleHandleIndex, Signature,
+        SignatureIndex,
+        SignatureToken::{self, *},
+        StructDefinition, StructDefinitionIndex, StructFieldInformation, StructHandle,
+        StructHandleIndex, TypeSignature, Visibility,
+        Visibility::*,
+    },
+    CompiledModule,
+};
+use move_core_types::{
+    account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
+};
+use std::str::FromStr;
+
+use crate::VerifierConfig;
+
+#[test]
+fn unbalanced_stack_crash() {
+    let mut module = empty_module();
+    module.version = 5;
+
+    module.struct_handles.push(StructHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(1),
+        abilities: AbilitySet::ALL,
+        type_parameters: vec![],
+    });
+
+    let fun_handle = FunctionHandle {
+        module: ModuleHandleIndex(0),
+        name: IdentifierIndex(2),
+        parameters: SignatureIndex(0),
+        return_: SignatureIndex(1),
+        type_parameters: vec![],
+    };
+
+    module.function_handles.push(fun_handle);
+
+    module.signatures.pop();
+    module.signatures.push(Signature(vec![
+        Address, U64, Address, Address, U128, Address, U64, U64, U64,
+    ]));
+    module.signatures.push(Signature(vec![]));
+    module
+        .signatures
+        .push(Signature(vec![Address, Bool, Address]));
+
+    module.identifiers.extend(
+        vec![
+            Identifier::from_str("zf_hello_world").unwrap(),
+            Identifier::from_str("awldFnU18mlDKQfh6qNfBGx8X").unwrap(),
+            Identifier::from_str("aQPwJNHyAHpvJ").unwrap(),
+            Identifier::from_str("aT7ZphKTrKcYCwCebJySrmrKlckmnL5").unwrap(),
+            Identifier::from_str("arYpsFa2fvrpPJ").unwrap(),
+        ]
+        .into_iter(),
+    );
+    module.address_identifiers.push(AccountAddress::random());
+
+    module.constant_pool.push(Constant {
+        type_: Address,
+        data: AccountAddress::ZERO.into_bytes().to_vec(),
+    });
+
+    module.struct_defs.push(StructDefinition {
+        struct_handle: StructHandleIndex(0),
+        field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+            name: IdentifierIndex::new(3),
+            signature: TypeSignature(Address),
+        }]),
+    });
+
+    let code_unit = CodeUnit {
+        code: vec![
+            LdFalse,
+            BrTrue(13),
+            MoveLoc(3),
+            MutBorrowGlobal(StructDefinitionIndex(0)),
+            MoveLoc(6),
+            Pop,
+            MoveLoc(5),
+            MutBorrowGlobal(StructDefinitionIndex(0)),
+            MoveLoc(0),
+            MutBorrowGlobal(StructDefinitionIndex(0)),
+            Pop,
+            Pop,
+            Pop,
+            Ret,
+        ],
+        locals: SignatureIndex::new(2),
+    };
+    let fun_def = FunctionDefinition {
+        code: Some(code_unit),
+        function: FunctionHandleIndex(0),
+        visibility: Visibility::Public,
+        is_entry: false,
+        acquires_global_resources: vec![],
+    };
+
+    module.function_defs.push(fun_def);
+    match crate::verify_module(&module) {
+        Ok(_) => {}
+        Err(e) => assert_eq!(e.major_status(), StatusCode::GLOBAL_REFERENCE_ERROR),
+    }
+}
+
+#[test]
+fn too_many_locals() {
+    // Create a signature of 128 elements. This will be used both for locals and parameters,
+    // thus the overall size will be 256. If this is not intercepted in bounds checks,
+    // as a result the following iterator in abstract state
+    // would be empty, breaking reference analysis: `0..self.num_locals as LocalIndex`
+    // (since LocalIndex is u8).
+    let sign_128 = (0..128)
+        .map(|_| Reference(Box::new(U64)))
+        .collect::<Vec<_>>();
+    let module = CompiledModule {
+        version: 5,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(0),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![AbilitySet::ALL],
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![Signature(sign_128)],
+        identifiers: vec![Identifier::new("x").unwrap()],
+        address_identifiers: vec![AccountAddress::ONE],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: Public,
+            is_entry: true,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code: vec![CopyLoc(2), StLoc(33), Branch(0)],
+            }),
+        }],
+    };
+
+    let res = crate::verify_module(&module);
+
+    match res {
+        Ok(_) => {}
+        Err(e) => assert_eq!(e.major_status(), StatusCode::TOO_MANY_LOCALS),
+    }
+}
+
+#[test]
+fn borrow_graph() {
+    let module = CompiledModule {
+        version: 5,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(0),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![Signature(vec![
+            Reference(Box::new(U64)),
+            Reference(Box::new(U64)),
+        ])],
+        identifiers: vec![Identifier::new("a").unwrap()],
+        address_identifiers: vec![AccountAddress::ONE],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: Visibility::Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(0),
+                code: vec![MoveLoc(0), MoveLoc(1), StLoc(0), StLoc(1), Branch(0)],
+            }),
+        }],
+    };
+
+    let res = crate::verify_module(&module);
+    assert!(res.is_ok());
+}
+
+#[test]
+fn indirect_code() {
+    use Bytecode::*;
+    let v = 0;
+    let v_ref = 1;
+    let x = 2;
+    let x_ref = 3;
+    let vsig = SignatureIndex(2);
+    let next = 16;
+    let mut code = vec![
+        // x = 10; x_ref = &mut x;
+        LdU64(10),
+        StLoc(x),
+        MutBorrowLoc(x),
+        StLoc(x_ref),
+        // v = vector[100, 1000]; v_ref = &mut v
+        LdU64(100),
+        LdU64(1000),
+        VecPack(vsig, 2),
+        StLoc(v),
+        MutBorrowLoc(v),
+        StLoc(v_ref),
+        // if (*x_ref == 0) return;
+        CopyLoc(x_ref),
+        ReadRef,
+        LdU64(0),
+        Eq,
+        BrFalse(next),
+        Ret,
+    ];
+    assert_eq!(code.len(), next as usize);
+    code.extend(vec![
+        // creates dangling reference on second iteration
+        // _ = vec_pop_back(x_ref)
+        CopyLoc(v_ref),
+        VecPopBack(vsig),
+        Pop,
+        // *x_ref = 0
+        LdU64(0),
+        CopyLoc(x_ref),
+        WriteRef,
+        // x_ref = vec_mut_borrow(v_ref, 0);
+        CopyLoc(v_ref),
+        LdU64(0),
+        VecMutBorrow(vsig),
+        StLoc(x_ref),
+    ]);
+    let nops = vec![Nop; (u16::MAX as usize) - code.len() - 1];
+    code.extend(nops);
+    code.push(Branch(10));
+    assert_eq!(code.len(), (u16::MAX as usize));
+    let module = CompiledModule {
+        version: 5,
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        struct_handles: vec![],
+        function_handles: vec![FunctionHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(0),
+            parameters: SignatureIndex(0),
+            return_: SignatureIndex(0),
+            type_parameters: vec![],
+        }],
+        field_handles: vec![],
+        friend_decls: vec![],
+        struct_def_instantiations: vec![],
+        function_instantiations: vec![],
+        field_instantiations: vec![],
+        signatures: vec![
+            Signature(vec![]),
+            Signature(vec![
+                SignatureToken::Vector(Box::new(SignatureToken::U64)),
+                SignatureToken::MutableReference(Box::new(SignatureToken::Vector(Box::new(
+                    SignatureToken::U64,
+                )))),
+                SignatureToken::U64,
+                SignatureToken::MutableReference(Box::new(SignatureToken::U64)),
+            ]),
+            Signature(vec![SignatureToken::U64]),
+        ],
+        identifiers: vec![Identifier::new("a").unwrap()],
+        address_identifiers: vec![AccountAddress::ONE],
+        constant_pool: vec![],
+        metadata: vec![],
+        struct_defs: vec![],
+        function_defs: vec![FunctionDefinition {
+            function: FunctionHandleIndex(0),
+            visibility: Visibility::Public,
+            is_entry: false,
+            acquires_global_resources: vec![],
+            code: Some(CodeUnit {
+                locals: SignatureIndex(1),
+                code,
+            }),
+        }],
+    };
+
+    let res = crate::verify_module_with_config(&VerifierConfig::unbounded(), &module).unwrap_err();
+    assert_eq!(
+        res.major_status(),
+        StatusCode::VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR
+    );
+}
diff --git a/language/move-bytecode-verifier/src/signature.rs b/language/move-bytecode-verifier/src/signature.rs
index df53746d84..3894b4b448 100644
--- a/language/move-bytecode-verifier/src/signature.rs
+++ b/language/move-bytecode-verifier/src/signature.rs
@@ -14,6 +14,7 @@ use move_binary_format::{
         FunctionHandle, Signature, SignatureIndex, SignatureToken, StructDefinition,
         StructFieldInformation, StructTypeParameter, TableIndex,
     },
+    file_format_common::VERSION_6,
     IndexKind,
 };
 use move_core_types::vm_status::StatusCode;
@@ -201,12 +202,13 @@ impl<'a> SignatureChecker<'a> {
 
                 // List out the other options explicitly so there's a compile error if a new
                 // bytecode gets added.
-                Pop | Ret | Branch(_) | BrTrue(_) | BrFalse(_) | LdU8(_) | LdU64(_) | LdU128(_)
-                | LdConst(_) | CastU8 | CastU64 | CastU128 | LdTrue | LdFalse | Call(_)
-                | Pack(_) | Unpack(_) | ReadRef | WriteRef | FreezeRef | Add | Sub | Mul | Mod
-                | Div | BitOr | BitAnd | Xor | Shl | Shr | Or | And | Not | Eq | Neq | Lt | Gt
-                | Le | Ge | CopyLoc(_) | MoveLoc(_) | StLoc(_) | MutBorrowLoc(_)
-                | ImmBorrowLoc(_) | MutBorrowField(_) | ImmBorrowField(_) | MutBorrowGlobal(_)
+                Pop | Ret | Branch(_) | BrTrue(_) | BrFalse(_) | LdU8(_) | LdU16(_) | LdU32(_)
+                | LdU64(_) | LdU128(_) | LdU256(_) | LdConst(_) | CastU8 | CastU16 | CastU32
+                | CastU64 | CastU128 | CastU256 | LdTrue | LdFalse | Call(_) | Pack(_)
+                | Unpack(_) | ReadRef | WriteRef | FreezeRef | Add | Sub | Mul | Mod | Div
+                | BitOr | BitAnd | Xor | Shl | Shr | Or | And | Not | Eq | Neq | Lt | Gt | Le
+                | Ge | CopyLoc(_) | MoveLoc(_) | StLoc(_) | MutBorrowLoc(_) | ImmBorrowLoc(_)
+                | MutBorrowField(_) | ImmBorrowField(_) | MutBorrowGlobal(_)
                 | ImmBorrowGlobal(_) | Exists(_) | MoveTo(_) | MoveFrom(_) | Abort | Nop => Ok(()),
             };
             result.map_err(|err| {
@@ -251,8 +253,11 @@ impl<'a> SignatureChecker<'a> {
             | SignatureToken::MutableReference(_)
             | SignatureToken::Bool
             | SignatureToken::U8
+            | SignatureToken::U16
+            | SignatureToken::U32
             | SignatureToken::U64
             | SignatureToken::U128
+            | SignatureToken::U256
             | SignatureToken::Address
             | SignatureToken::Signer => {}
         }
@@ -287,7 +292,8 @@ impl<'a> SignatureChecker<'a> {
     fn check_signature_token(&self, ty: &SignatureToken) -> PartialVMResult<()> {
         use SignatureToken::*;
         match ty {
-            U8 | U64 | U128 | Bool | Address | Signer | Struct(_) | TypeParameter(_) => Ok(()),
+            U8 | U16 | U32 | U64 | U128 | U256 | Bool | Address | Signer | Struct(_)
+            | TypeParameter(_) => Ok(()),
             Reference(_) | MutableReference(_) => {
                 // TODO: Prop tests expect us to NOT check the inner types.
                 // Revisit this once we rework prop tests.
@@ -312,10 +318,26 @@ impl<'a> SignatureChecker<'a> {
 
     fn check_type_instantiation(
         &self,
-        ty: &SignatureToken,
+        s: &SignatureToken,
         type_parameters: &[AbilitySet],
     ) -> PartialVMResult<()> {
-        match ty {
+        if self.resolver.version() >= VERSION_6 {
+            for ty in s.preorder_traversal() {
+                self.check_type_instantiation_(ty, type_parameters)?
+            }
+            Ok(())
+        } else {
+            // preserve buggy, but harmless old behavior for backward compatibility
+            self.check_type_instantiation_(s, type_parameters)
+        }
+    }
+
+    fn check_type_instantiation_(
+        &self,
+        s: &SignatureToken,
+        type_parameters: &[AbilitySet],
+    ) -> PartialVMResult<()> {
+        match s {
             SignatureToken::StructInstantiation(idx, type_arguments) => {
                 // Check that the instantiation satisfies the `idx` struct's constraints
                 // Cannot be checked completely if we do not know the constraints of type parameters
@@ -328,7 +350,20 @@ impl<'a> SignatureChecker<'a> {
                     type_parameters,
                 )
             }
-            _ => Ok(()),
+            SignatureToken::Reference(_)
+            | SignatureToken::MutableReference(_)
+            | SignatureToken::Vector(_)
+            | SignatureToken::TypeParameter(_)
+            | SignatureToken::Struct(_)
+            | SignatureToken::Bool
+            | SignatureToken::U8
+            | SignatureToken::U16
+            | SignatureToken::U32
+            | SignatureToken::U64
+            | SignatureToken::U128
+            | SignatureToken::U256
+            | SignatureToken::Address
+            | SignatureToken::Signer => Ok(()),
         }
     }
 
diff --git a/language/move-bytecode-verifier/src/stack_usage_verifier.rs b/language/move-bytecode-verifier/src/stack_usage_verifier.rs
index 88fc7e3d9d..b0a84298b2 100644
--- a/language/move-bytecode-verifier/src/stack_usage_verifier.rs
+++ b/language/move-bytecode-verifier/src/stack_usage_verifier.rs
@@ -9,6 +9,7 @@
 //! the stack height by the number of values returned by the function as indicated in its
 //! signature. Additionally, the stack height must not dip below that at the beginning of the
 //! block for any basic block.
+use crate::{meter::Meter, VerifierConfig};
 use move_binary_format::{
     binary_views::{BinaryIndexedView, FunctionView},
     control_flow_graph::{BlockId, ControlFlowGraph},
@@ -26,8 +27,10 @@ pub(crate) struct StackUsageVerifier<'a> {
 
 impl<'a> StackUsageVerifier<'a> {
     pub(crate) fn verify(
+        config: &VerifierConfig,
         resolver: &'a BinaryIndexedView<'a>,
         function_view: &'a FunctionView,
+        _meter: &mut impl Meter, // TODO: metering
     ) -> PartialVMResult<()> {
         let verifier = Self {
             resolver,
@@ -37,17 +40,35 @@ impl<'a> StackUsageVerifier<'a> {
         };
 
         for block_id in function_view.cfg().blocks() {
-            verifier.verify_block(block_id, function_view.cfg())?
+            verifier.verify_block(config, block_id, function_view.cfg())?
         }
         Ok(())
     }
 
-    fn verify_block(&self, block_id: BlockId, cfg: &dyn ControlFlowGraph) -> PartialVMResult<()> {
+    fn verify_block(
+        &self,
+        config: &VerifierConfig,
+        block_id: BlockId,
+        cfg: &dyn ControlFlowGraph,
+    ) -> PartialVMResult<()> {
         let code = &self.code.code;
         let mut stack_size_increment = 0;
         let block_start = cfg.block_start(block_id);
+        let mut overall_push = 0;
         for i in block_start..=cfg.block_end(block_id) {
             let (num_pops, num_pushes) = self.instruction_effect(&code[i as usize])?;
+            if let Some(new_pushes) = u64::checked_add(overall_push, num_pushes) {
+                overall_push = new_pushes
+            };
+
+            // Check that the accumulated pushes does not exceed a pre-defined max size
+            if let Some(max_push_size) = config.max_push_size {
+                if overall_push > max_push_size as u64 {
+                    return Err(PartialVMError::new(StatusCode::VALUE_STACK_PUSH_OVERFLOW)
+                        .at_code_offset(self.current_function(), block_start));
+                }
+            }
+
             // Check that the stack height is sufficient to accommodate the number
             // of pops this instruction does
             if stack_size_increment < num_pops {
@@ -56,8 +77,27 @@ impl<'a> StackUsageVerifier<'a> {
                         .at_code_offset(self.current_function(), block_start),
                 );
             }
-            stack_size_increment -= num_pops;
-            stack_size_increment += num_pushes;
+            if let Some(new_incr) = u64::checked_sub(stack_size_increment, num_pops) {
+                stack_size_increment = new_incr
+            } else {
+                return Err(
+                    PartialVMError::new(StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK)
+                        .at_code_offset(self.current_function(), block_start),
+                );
+            };
+            if let Some(new_incr) = u64::checked_add(stack_size_increment, num_pushes) {
+                stack_size_increment = new_incr
+            } else {
+                return Err(
+                    PartialVMError::new(StatusCode::POSITIVE_STACK_SIZE_AT_BLOCK_END)
+                        .at_code_offset(self.current_function(), block_start),
+                );
+            };
+
+            if stack_size_increment > config.max_value_stack_size as u64 {
+                return Err(PartialVMError::new(StatusCode::VALUE_STACK_OVERFLOW)
+                    .at_code_offset(self.current_function(), block_start));
+            }
         }
 
         if stack_size_increment == 0 {
@@ -84,8 +124,11 @@ impl<'a> StackUsageVerifier<'a> {
 
             // Instructions that push, but don't pop
             Bytecode::LdU8(_)
+            | Bytecode::LdU16(_)
+            | Bytecode::LdU32(_)
             | Bytecode::LdU64(_)
             | Bytecode::LdU128(_)
+            | Bytecode::LdU256(_)
             | Bytecode::LdTrue
             | Bytecode::LdFalse
             | Bytecode::LdConst(_)
@@ -111,8 +154,11 @@ impl<'a> StackUsageVerifier<'a> {
             | Bytecode::MoveFrom(_)
             | Bytecode::MoveFromGeneric(_)
             | Bytecode::CastU8
+            | Bytecode::CastU16
+            | Bytecode::CastU32
             | Bytecode::CastU64
             | Bytecode::CastU128
+            | Bytecode::CastU256
             | Bytecode::VecLen(_)
             | Bytecode::VecPopBack(_) => (1, 1),
 
diff --git a/language/move-bytecode-verifier/src/struct_defs.rs b/language/move-bytecode-verifier/src/struct_defs.rs
index e23f2e408d..00c9746863 100644
--- a/language/move-bytecode-verifier/src/struct_defs.rs
+++ b/language/move-bytecode-verifier/src/struct_defs.rs
@@ -105,7 +105,16 @@ impl<'a> StructDefGraphBuilder<'a> {
     ) -> PartialVMResult<()> {
         use SignatureToken as T;
         Ok(match token {
-            T::Bool | T::U8 | T::U64 | T::U128 | T::Address | T::Signer | T::TypeParameter(_) => (),
+            T::Bool
+            | T::U8
+            | T::U16
+            | T::U32
+            | T::U64
+            | T::U128
+            | T::U256
+            | T::Address
+            | T::Signer
+            | T::TypeParameter(_) => (),
             T::Reference(_) | T::MutableReference(_) => {
                 return Err(
                     PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
diff --git a/language/move-bytecode-verifier/src/type_safety.rs b/language/move-bytecode-verifier/src/type_safety.rs
index 09f743e7bc..ee0f95b739 100644
--- a/language/move-bytecode-verifier/src/type_safety.rs
+++ b/language/move-bytecode-verifier/src/type_safety.rs
@@ -5,6 +5,7 @@
 //! This module defines the transfer functions for verifying type safety of a procedure body.
 //! It does not utilize control flow, but does check each block independently
 
+use crate::meter::{Meter, Scope};
 use move_binary_format::{
     binary_views::{BinaryIndexedView, FunctionView},
     control_flow_graph::ControlFlowGraph,
@@ -14,6 +15,7 @@ use move_binary_format::{
         FunctionHandle, LocalIndex, Signature, SignatureToken, SignatureToken as ST,
         StructDefinition, StructDefinitionIndex, StructFieldInformation, StructHandleIndex,
     },
+    safe_unwrap,
 };
 use move_core_types::vm_status::StatusCode;
 
@@ -23,6 +25,8 @@ struct Locals<'a> {
     locals: &'a Signature,
 }
 
+const TYPE_NODE_COST: u128 = 30;
+
 impl<'a> Locals<'a> {
     fn new(parameters: &'a Signature, locals: &'a Signature) -> Self {
         Self {
@@ -77,18 +81,44 @@ impl<'a> TypeSafetyChecker<'a> {
             offset,
         )
     }
+
+    fn push(&mut self, meter: &mut impl Meter, ty: SignatureToken) -> PartialVMResult<()> {
+        self.charge_ty(meter, &ty)?;
+        self.stack.push(ty);
+        Ok(())
+    }
+
+    fn charge_ty(&mut self, meter: &mut impl Meter, ty: &SignatureToken) -> PartialVMResult<()> {
+        meter.add_items(
+            Scope::Function,
+            TYPE_NODE_COST,
+            ty.preorder_traversal().count(),
+        )
+    }
+
+    fn charge_tys(
+        &mut self,
+        meter: &mut impl Meter,
+        tys: &[SignatureToken],
+    ) -> PartialVMResult<()> {
+        for ty in tys {
+            self.charge_ty(meter, ty)?
+        }
+        Ok(())
+    }
 }
 
 pub(crate) fn verify<'a>(
     resolver: &'a BinaryIndexedView<'a>,
     function_view: &'a FunctionView<'a>,
+    meter: &mut impl Meter,
 ) -> PartialVMResult<()> {
     let verifier = &mut TypeSafetyChecker::new(resolver, function_view);
 
     for block_id in function_view.cfg().blocks() {
         for offset in function_view.cfg().instr_indexes(block_id) {
             let instr = &verifier.function_view.code().code[offset as usize];
-            verify_instr(verifier, instr, offset)?
+            verify_instr(verifier, instr, offset, meter)?
         }
     }
 
@@ -98,13 +128,14 @@ pub(crate) fn verify<'a>(
 // helper for both `ImmBorrowField` and `MutBorrowField`
 fn borrow_field(
     verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
     offset: CodeOffset,
     mut_: bool,
     field_handle_index: FieldHandleIndex,
     type_args: &Signature,
 ) -> PartialVMResult<()> {
     // load operand and check mutability constraints
-    let operand = verifier.stack.pop().unwrap();
+    let operand = safe_unwrap!(verifier.stack.pop());
     if mut_ && !operand.is_mutable_reference() {
         return Err(verifier.error(StatusCode::BORROWFIELD_TYPE_MISMATCH_ERROR, offset));
     }
@@ -132,17 +163,21 @@ fn borrow_field(
         }
     };
     let field_type = Box::new(instantiate(&field_def.signature.0, type_args));
-    verifier.stack.push(if mut_ {
-        ST::MutableReference(field_type)
-    } else {
-        ST::Reference(field_type)
-    });
+    verifier.push(
+        meter,
+        if mut_ {
+            ST::MutableReference(field_type)
+        } else {
+            ST::Reference(field_type)
+        },
+    )?;
     Ok(())
 }
 
 // helper for both `ImmBorrowLoc` and `MutBorrowLoc`
 fn borrow_loc(
     verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
     offset: CodeOffset,
     mut_: bool,
     idx: LocalIndex,
@@ -153,23 +188,27 @@ fn borrow_loc(
         return Err(verifier.error(StatusCode::BORROWLOC_REFERENCE_ERROR, offset));
     }
 
-    verifier.stack.push(if mut_ {
-        ST::MutableReference(Box::new(loc_signature))
-    } else {
-        ST::Reference(Box::new(loc_signature))
-    });
+    verifier.push(
+        meter,
+        if mut_ {
+            ST::MutableReference(Box::new(loc_signature))
+        } else {
+            ST::Reference(Box::new(loc_signature))
+        },
+    )?;
     Ok(())
 }
 
 fn borrow_global(
     verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
     offset: CodeOffset,
     mut_: bool,
     idx: StructDefinitionIndex,
     type_args: &Signature,
 ) -> PartialVMResult<()> {
     // check and consume top of stack
-    let operand = verifier.stack.pop().unwrap();
+    let operand = safe_unwrap!(verifier.stack.pop());
     if operand != ST::Address {
         return Err(verifier.error(StatusCode::BORROWGLOBAL_TYPE_MISMATCH_ERROR, offset));
     }
@@ -181,35 +220,42 @@ fn borrow_global(
     }
 
     let struct_type = materialize_type(struct_def.struct_handle, type_args);
-    verifier.stack.push(if mut_ {
-        ST::MutableReference(Box::new(struct_type))
-    } else {
-        ST::Reference(Box::new(struct_type))
-    });
+    verifier.push(
+        meter,
+        if mut_ {
+            ST::MutableReference(Box::new(struct_type))
+        } else {
+            ST::Reference(Box::new(struct_type))
+        },
+    )?;
     Ok(())
 }
 
 fn call(
     verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
     offset: CodeOffset,
     function_handle: &FunctionHandle,
     type_actuals: &Signature,
 ) -> PartialVMResult<()> {
     let parameters = verifier.resolver.signature_at(function_handle.parameters);
     for parameter in parameters.0.iter().rev() {
-        let arg = verifier.stack.pop().unwrap();
-        if arg != instantiate(parameter, type_actuals) {
+        let arg = safe_unwrap!(verifier.stack.pop());
+        if (type_actuals.is_empty() && &arg != parameter)
+            || (!type_actuals.is_empty() && arg != instantiate(parameter, type_actuals))
+        {
             return Err(verifier.error(StatusCode::CALL_TYPE_MISMATCH_ERROR, offset));
         }
     }
     for return_type in &verifier.resolver.signature_at(function_handle.return_).0 {
-        verifier.stack.push(instantiate(return_type, type_actuals))
+        verifier.push(meter, instantiate(return_type, type_actuals))?
     }
     Ok(())
 }
 
 fn type_fields_signature(
     verifier: &mut TypeSafetyChecker,
+    _meter: &mut impl Meter, // TODO: metering
     offset: CodeOffset,
     struct_def: &StructDefinition,
     type_args: &Signature,
@@ -231,25 +277,27 @@ fn type_fields_signature(
 
 fn pack(
     verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
     offset: CodeOffset,
     struct_def: &StructDefinition,
     type_args: &Signature,
 ) -> PartialVMResult<()> {
     let struct_type = materialize_type(struct_def.struct_handle, type_args);
-    let field_sig = type_fields_signature(verifier, offset, struct_def, type_args)?;
+    let field_sig = type_fields_signature(verifier, meter, offset, struct_def, type_args)?;
     for sig in field_sig.0.iter().rev() {
-        let arg = verifier.stack.pop().unwrap();
+        let arg = safe_unwrap!(verifier.stack.pop());
         if &arg != sig {
             return Err(verifier.error(StatusCode::PACK_TYPE_MISMATCH_ERROR, offset));
         }
     }
 
-    verifier.stack.push(struct_type);
+    verifier.push(meter, struct_type)?;
     Ok(())
 }
 
 fn unpack(
     verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
     offset: CodeOffset,
     struct_def: &StructDefinition,
     type_args: &Signature,
@@ -258,20 +306,21 @@ fn unpack(
 
     // Pop an abstract value from the stack and check if its type is equal to the one
     // declared.
-    let arg = verifier.stack.pop().unwrap();
+    let arg = safe_unwrap!(verifier.stack.pop());
     if arg != struct_type {
         return Err(verifier.error(StatusCode::UNPACK_TYPE_MISMATCH_ERROR, offset));
     }
 
-    let field_sig = type_fields_signature(verifier, offset, struct_def, type_args)?;
+    let field_sig = type_fields_signature(verifier, meter, offset, struct_def, type_args)?;
     for sig in field_sig.0 {
-        verifier.stack.push(sig)
+        verifier.push(meter, sig)?
     }
     Ok(())
 }
 
 fn exists(
     verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
     offset: CodeOffset,
     struct_def: &StructDefinition,
     type_args: &Signature,
@@ -284,7 +333,7 @@ fn exists(
         ));
     }
 
-    let operand = verifier.stack.pop().unwrap();
+    let operand = safe_unwrap!(verifier.stack.pop());
     if operand != ST::Address {
         // TODO better error here
         return Err(verifier.error(
@@ -293,12 +342,13 @@ fn exists(
         ));
     }
 
-    verifier.stack.push(ST::Bool);
+    verifier.push(meter, ST::Bool)?;
     Ok(())
 }
 
 fn move_from(
     verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
     offset: CodeOffset,
     struct_def: &StructDefinition,
     type_args: &Signature,
@@ -309,12 +359,12 @@ fn move_from(
     }
 
     let struct_type = materialize_type(struct_def.struct_handle, type_args);
-    let operand = verifier.stack.pop().unwrap();
+    let operand = safe_unwrap!(verifier.stack.pop());
     if operand != ST::Address {
         return Err(verifier.error(StatusCode::MOVEFROM_TYPE_MISMATCH_ERROR, offset));
     }
 
-    verifier.stack.push(struct_type);
+    verifier.push(meter, struct_type)?;
     Ok(())
 }
 
@@ -330,8 +380,8 @@ fn move_to(
     }
 
     let struct_type = materialize_type(struct_def.struct_handle, type_args);
-    let key_struct_operand = verifier.stack.pop().unwrap();
-    let signer_reference_operand = verifier.stack.pop().unwrap();
+    let key_struct_operand = safe_unwrap!(verifier.stack.pop());
+    let signer_reference_operand = safe_unwrap!(verifier.stack.pop());
     if key_struct_operand != struct_type {
         return Err(verifier.error(StatusCode::MOVETO_TYPE_MISMATCH_ERROR, offset));
     }
@@ -346,12 +396,13 @@ fn move_to(
 
 fn borrow_vector_element(
     verifier: &mut TypeSafetyChecker,
+    meter: &mut impl Meter,
     declared_element_type: &SignatureToken,
     offset: CodeOffset,
     mut_ref_only: bool,
 ) -> PartialVMResult<()> {
-    let operand_idx = verifier.stack.pop().unwrap();
-    let operand_vec = verifier.stack.pop().unwrap();
+    let operand_idx = safe_unwrap!(verifier.stack.pop());
+    let operand_vec = safe_unwrap!(verifier.stack.pop());
 
     // check index
     if operand_idx != ST::U64 {
@@ -368,7 +419,7 @@ fn borrow_vector_element(
     } else {
         ST::Reference(Box::new(element_type))
     };
-    verifier.stack.push(element_ref_type);
+    verifier.push(meter, element_ref_type)?;
 
     Ok(())
 }
@@ -377,10 +428,11 @@ fn verify_instr(
     verifier: &mut TypeSafetyChecker,
     bytecode: &Bytecode,
     offset: CodeOffset,
+    meter: &mut impl Meter,
 ) -> PartialVMResult<()> {
     match bytecode {
         Bytecode::Pop => {
-            let operand = verifier.stack.pop().unwrap();
+            let operand = safe_unwrap!(verifier.stack.pop());
             let abilities = verifier
                 .resolver
                 .abilities(&operand, verifier.function_view.type_parameters());
@@ -390,21 +442,21 @@ fn verify_instr(
         }
 
         Bytecode::BrTrue(_) | Bytecode::BrFalse(_) => {
-            let operand = verifier.stack.pop().unwrap();
+            let operand = safe_unwrap!(verifier.stack.pop());
             if operand != ST::Bool {
                 return Err(verifier.error(StatusCode::BR_TYPE_MISMATCH_ERROR, offset));
             }
         }
 
         Bytecode::StLoc(idx) => {
-            let operand = verifier.stack.pop().unwrap();
+            let operand = safe_unwrap!(verifier.stack.pop());
             if &operand != verifier.local_at(*idx) {
                 return Err(verifier.error(StatusCode::STLOC_TYPE_MISMATCH_ERROR, offset));
             }
         }
 
         Bytecode::Abort => {
-            let operand = verifier.stack.pop().unwrap();
+            let operand = safe_unwrap!(verifier.stack.pop());
             if operand != ST::U64 {
                 return Err(verifier.error(StatusCode::ABORT_TYPE_MISMATCH_ERROR, offset));
             }
@@ -413,7 +465,7 @@ fn verify_instr(
         Bytecode::Ret => {
             let return_ = &verifier.function_view.return_().0;
             for return_type in return_.iter().rev() {
-                let operand = verifier.stack.pop().unwrap();
+                let operand = safe_unwrap!(verifier.stack.pop());
                 if &operand != return_type {
                     return Err(verifier.error(StatusCode::RET_TYPE_MISMATCH_ERROR, offset));
                 }
@@ -423,15 +475,16 @@ fn verify_instr(
         Bytecode::Branch(_) | Bytecode::Nop => (),
 
         Bytecode::FreezeRef => {
-            let operand = verifier.stack.pop().unwrap();
+            let operand = safe_unwrap!(verifier.stack.pop());
             match operand {
-                ST::MutableReference(inner) => verifier.stack.push(ST::Reference(inner)),
+                ST::MutableReference(inner) => verifier.push(meter, ST::Reference(inner))?,
                 _ => return Err(verifier.error(StatusCode::FREEZEREF_TYPE_MISMATCH_ERROR, offset)),
             }
         }
 
         Bytecode::MutBorrowField(field_handle_index) => borrow_field(
             verifier,
+            meter,
             offset,
             true,
             *field_handle_index,
@@ -443,11 +496,13 @@ fn verify_instr(
                 .resolver
                 .field_instantiation_at(*field_inst_index)?;
             let type_inst = verifier.resolver.signature_at(field_inst.type_parameters);
-            borrow_field(verifier, offset, true, field_inst.handle, type_inst)?
+            verifier.charge_tys(meter, &type_inst.0)?;
+            borrow_field(verifier, meter, offset, true, field_inst.handle, type_inst)?
         }
 
         Bytecode::ImmBorrowField(field_handle_index) => borrow_field(
             verifier,
+            meter,
             offset,
             false,
             *field_handle_index,
@@ -459,28 +514,41 @@ fn verify_instr(
                 .resolver
                 .field_instantiation_at(*field_inst_index)?;
             let type_inst = verifier.resolver.signature_at(field_inst.type_parameters);
-            borrow_field(verifier, offset, false, field_inst.handle, type_inst)?
+            verifier.charge_tys(meter, &type_inst.0)?;
+            borrow_field(verifier, meter, offset, false, field_inst.handle, type_inst)?
         }
 
         Bytecode::LdU8(_) => {
-            verifier.stack.push(ST::U8);
+            verifier.push(meter, ST::U8)?;
+        }
+
+        Bytecode::LdU16(_) => {
+            verifier.push(meter, ST::U16)?;
+        }
+
+        Bytecode::LdU32(_) => {
+            verifier.push(meter, ST::U32)?;
         }
 
         Bytecode::LdU64(_) => {
-            verifier.stack.push(ST::U64);
+            verifier.push(meter, ST::U64)?;
         }
 
         Bytecode::LdU128(_) => {
-            verifier.stack.push(ST::U128);
+            verifier.push(meter, ST::U128)?;
+        }
+
+        Bytecode::LdU256(_) => {
+            verifier.push(meter, ST::U256)?;
         }
 
         Bytecode::LdConst(idx) => {
             let signature = verifier.resolver.constant_at(*idx).type_.clone();
-            verifier.stack.push(signature);
+            verifier.push(meter, signature)?;
         }
 
         Bytecode::LdTrue | Bytecode::LdFalse => {
-            verifier.stack.push(ST::Bool);
+            verifier.push(meter, ST::Bool)?;
         }
 
         Bytecode::CopyLoc(idx) => {
@@ -492,56 +560,71 @@ fn verify_instr(
             {
                 return Err(verifier.error(StatusCode::COPYLOC_WITHOUT_COPY_ABILITY, offset));
             }
-            verifier.stack.push(local_signature)
+            verifier.push(meter, local_signature)?
         }
 
         Bytecode::MoveLoc(idx) => {
             let local_signature = verifier.local_at(*idx).clone();
-            verifier.stack.push(local_signature)
+            verifier.push(meter, local_signature)?
         }
 
-        Bytecode::MutBorrowLoc(idx) => borrow_loc(verifier, offset, true, *idx)?,
+        Bytecode::MutBorrowLoc(idx) => borrow_loc(verifier, meter, offset, true, *idx)?,
 
-        Bytecode::ImmBorrowLoc(idx) => borrow_loc(verifier, offset, false, *idx)?,
+        Bytecode::ImmBorrowLoc(idx) => borrow_loc(verifier, meter, offset, false, *idx)?,
 
         Bytecode::Call(idx) => {
             let function_handle = verifier.resolver.function_handle_at(*idx);
-            call(verifier, offset, function_handle, &Signature(vec![]))?
+            call(verifier, meter, offset, function_handle, &Signature(vec![]))?
         }
 
         Bytecode::CallGeneric(idx) => {
             let func_inst = verifier.resolver.function_instantiation_at(*idx);
             let func_handle = verifier.resolver.function_handle_at(func_inst.handle);
             let type_args = &verifier.resolver.signature_at(func_inst.type_parameters);
-            call(verifier, offset, func_handle, type_args)?
+            verifier.charge_tys(meter, &type_args.0)?;
+            call(verifier, meter, offset, func_handle, type_args)?
         }
 
         Bytecode::Pack(idx) => {
             let struct_definition = verifier.resolver.struct_def_at(*idx)?;
-            pack(verifier, offset, struct_definition, &Signature(vec![]))?
+            pack(
+                verifier,
+                meter,
+                offset,
+                struct_definition,
+                &Signature(vec![]),
+            )?
         }
 
         Bytecode::PackGeneric(idx) => {
             let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
             let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
             let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
-            pack(verifier, offset, struct_def, type_args)?
+            verifier.charge_tys(meter, &type_args.0)?;
+            pack(verifier, meter, offset, struct_def, type_args)?
         }
 
         Bytecode::Unpack(idx) => {
             let struct_definition = verifier.resolver.struct_def_at(*idx)?;
-            unpack(verifier, offset, struct_definition, &Signature(vec![]))?
+            unpack(
+                verifier,
+                meter,
+                offset,
+                struct_definition,
+                &Signature(vec![]),
+            )?
         }
 
         Bytecode::UnpackGeneric(idx) => {
             let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
             let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
             let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
-            unpack(verifier, offset, struct_def, type_args)?
+            verifier.charge_tys(meter, &type_args.0)?;
+            unpack(verifier, meter, offset, struct_def, type_args)?
         }
 
         Bytecode::ReadRef => {
-            let operand = verifier.stack.pop().unwrap();
+            let operand = safe_unwrap!(verifier.stack.pop());
             match operand {
                 ST::Reference(inner) | ST::MutableReference(inner) => {
                     if !verifier.abilities(&inner)?.has_copy() {
@@ -549,15 +632,15 @@ fn verify_instr(
                             verifier.error(StatusCode::READREF_WITHOUT_COPY_ABILITY, offset)
                         );
                     }
-                    verifier.stack.push(*inner);
+                    verifier.push(meter, *inner)?;
                 }
                 _ => return Err(verifier.error(StatusCode::READREF_TYPE_MISMATCH_ERROR, offset)),
             }
         }
 
         Bytecode::WriteRef => {
-            let ref_operand = verifier.stack.pop().unwrap();
-            let val_operand = verifier.stack.pop().unwrap();
+            let ref_operand = safe_unwrap!(verifier.stack.pop());
+            let val_operand = safe_unwrap!(verifier.stack.pop());
             let ref_inner_signature = match ref_operand {
                 ST::MutableReference(inner) => *inner,
                 _ => {
@@ -576,25 +659,25 @@ fn verify_instr(
         }
 
         Bytecode::CastU8 => {
-            let operand = verifier.stack.pop().unwrap();
+            let operand = safe_unwrap!(verifier.stack.pop());
             if !operand.is_integer() {
                 return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
             }
-            verifier.stack.push(ST::U8);
+            verifier.push(meter, ST::U8)?;
         }
         Bytecode::CastU64 => {
-            let operand = verifier.stack.pop().unwrap();
+            let operand = safe_unwrap!(verifier.stack.pop());
             if !operand.is_integer() {
                 return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
             }
-            verifier.stack.push(ST::U64);
+            verifier.push(meter, ST::U64)?;
         }
         Bytecode::CastU128 => {
-            let operand = verifier.stack.pop().unwrap();
+            let operand = safe_unwrap!(verifier.stack.pop());
             if !operand.is_integer() {
                 return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
             }
-            verifier.stack.push(ST::U128);
+            verifier.push(meter, ST::U128)?;
         }
 
         Bytecode::Add
@@ -605,106 +688,110 @@ fn verify_instr(
         | Bytecode::BitOr
         | Bytecode::BitAnd
         | Bytecode::Xor => {
-            let operand1 = verifier.stack.pop().unwrap();
-            let operand2 = verifier.stack.pop().unwrap();
+            let operand1 = safe_unwrap!(verifier.stack.pop());
+            let operand2 = safe_unwrap!(verifier.stack.pop());
             if operand1.is_integer() && operand1 == operand2 {
-                verifier.stack.push(operand1);
+                verifier.push(meter, operand1)?;
             } else {
                 return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
             }
         }
 
         Bytecode::Shl | Bytecode::Shr => {
-            let operand1 = verifier.stack.pop().unwrap();
-            let operand2 = verifier.stack.pop().unwrap();
+            let operand1 = safe_unwrap!(verifier.stack.pop());
+            let operand2 = safe_unwrap!(verifier.stack.pop());
             if operand2.is_integer() && operand1 == ST::U8 {
-                verifier.stack.push(operand2);
+                verifier.push(meter, operand2)?;
             } else {
                 return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
             }
         }
 
         Bytecode::Or | Bytecode::And => {
-            let operand1 = verifier.stack.pop().unwrap();
-            let operand2 = verifier.stack.pop().unwrap();
+            let operand1 = safe_unwrap!(verifier.stack.pop());
+            let operand2 = safe_unwrap!(verifier.stack.pop());
             if operand1 == ST::Bool && operand2 == ST::Bool {
-                verifier.stack.push(ST::Bool);
+                verifier.push(meter, ST::Bool)?;
             } else {
                 return Err(verifier.error(StatusCode::BOOLEAN_OP_TYPE_MISMATCH_ERROR, offset));
             }
         }
 
         Bytecode::Not => {
-            let operand = verifier.stack.pop().unwrap();
+            let operand = safe_unwrap!(verifier.stack.pop());
             if operand == ST::Bool {
-                verifier.stack.push(ST::Bool);
+                verifier.push(meter, ST::Bool)?;
             } else {
                 return Err(verifier.error(StatusCode::BOOLEAN_OP_TYPE_MISMATCH_ERROR, offset));
             }
         }
 
         Bytecode::Eq | Bytecode::Neq => {
-            let operand1 = verifier.stack.pop().unwrap();
-            let operand2 = verifier.stack.pop().unwrap();
+            let operand1 = safe_unwrap!(verifier.stack.pop());
+            let operand2 = safe_unwrap!(verifier.stack.pop());
             if verifier.abilities(&operand1)?.has_drop() && operand1 == operand2 {
-                verifier.stack.push(ST::Bool);
+                verifier.push(meter, ST::Bool)?;
             } else {
                 return Err(verifier.error(StatusCode::EQUALITY_OP_TYPE_MISMATCH_ERROR, offset));
             }
         }
 
         Bytecode::Lt | Bytecode::Gt | Bytecode::Le | Bytecode::Ge => {
-            let operand1 = verifier.stack.pop().unwrap();
-            let operand2 = verifier.stack.pop().unwrap();
+            let operand1 = safe_unwrap!(verifier.stack.pop());
+            let operand2 = safe_unwrap!(verifier.stack.pop());
             if operand1.is_integer() && operand1 == operand2 {
-                verifier.stack.push(ST::Bool)
+                verifier.push(meter, ST::Bool)?
             } else {
                 return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
             }
         }
 
         Bytecode::MutBorrowGlobal(idx) => {
-            borrow_global(verifier, offset, true, *idx, &Signature(vec![]))?
+            borrow_global(verifier, meter, offset, true, *idx, &Signature(vec![]))?
         }
 
         Bytecode::MutBorrowGlobalGeneric(idx) => {
             let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
             let type_inst = verifier.resolver.signature_at(struct_inst.type_parameters);
-            borrow_global(verifier, offset, true, struct_inst.def, type_inst)?
+            verifier.charge_tys(meter, &type_inst.0)?;
+            borrow_global(verifier, meter, offset, true, struct_inst.def, type_inst)?
         }
 
         Bytecode::ImmBorrowGlobal(idx) => {
-            borrow_global(verifier, offset, false, *idx, &Signature(vec![]))?
+            borrow_global(verifier, meter, offset, false, *idx, &Signature(vec![]))?
         }
 
         Bytecode::ImmBorrowGlobalGeneric(idx) => {
             let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
             let type_inst = verifier.resolver.signature_at(struct_inst.type_parameters);
-            borrow_global(verifier, offset, false, struct_inst.def, type_inst)?
+            verifier.charge_tys(meter, &type_inst.0)?;
+            borrow_global(verifier, meter, offset, false, struct_inst.def, type_inst)?
         }
 
         Bytecode::Exists(idx) => {
             let struct_def = verifier.resolver.struct_def_at(*idx)?;
-            exists(verifier, offset, struct_def, &Signature(vec![]))?
+            exists(verifier, meter, offset, struct_def, &Signature(vec![]))?
         }
 
         Bytecode::ExistsGeneric(idx) => {
             let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
             let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
             let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
-            exists(verifier, offset, struct_def, type_args)?
+            verifier.charge_tys(meter, &type_args.0)?;
+            exists(verifier, meter, offset, struct_def, type_args)?
         }
 
         Bytecode::MoveFrom(idx) => {
             let struct_def = verifier.resolver.struct_def_at(*idx)?;
-            move_from(verifier, offset, struct_def, &Signature(vec![]))?
+            move_from(verifier, meter, offset, struct_def, &Signature(vec![]))?
         }
 
         Bytecode::MoveFromGeneric(idx) => {
             let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
             let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
             let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
-            move_from(verifier, offset, struct_def, type_args)?
+            verifier.charge_tys(meter, &type_args.0)?;
+            move_from(verifier, meter, offset, struct_def, type_args)?
         }
 
         Bytecode::MoveTo(idx) => {
@@ -716,13 +803,17 @@ fn verify_instr(
             let struct_inst = verifier.resolver.struct_instantiation_at(*idx)?;
             let struct_def = verifier.resolver.struct_def_at(struct_inst.def)?;
             let type_args = verifier.resolver.signature_at(struct_inst.type_parameters);
+            verifier.charge_tys(meter, &type_args.0)?;
             move_to(verifier, offset, struct_def, type_args)?
         }
 
         Bytecode::VecPack(idx, num) => {
             let element_type = &verifier.resolver.signature_at(*idx).0[0];
             for _ in 0..*num {
-                verifier.stack.pop().unwrap();
+                let operand_type = safe_unwrap!(verifier.stack.pop());
+                if element_type != &operand_type {
+                    return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
+                }
             }
             verifier
                 .stack
@@ -730,11 +821,11 @@ fn verify_instr(
         }
 
         Bytecode::VecLen(idx) => {
-            let operand = verifier.stack.pop().unwrap();
+            let operand = safe_unwrap!(verifier.stack.pop());
             let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
             match get_vector_element_type(operand, false) {
                 Some(derived_element_type) if &derived_element_type == declared_element_type => {
-                    verifier.stack.push(ST::U64);
+                    verifier.push(meter, ST::U64)?;
                 }
                 _ => return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset)),
             };
@@ -742,16 +833,16 @@ fn verify_instr(
 
         Bytecode::VecImmBorrow(idx) => {
             let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
-            borrow_vector_element(verifier, declared_element_type, offset, false)?
+            borrow_vector_element(verifier, meter, declared_element_type, offset, false)?
         }
         Bytecode::VecMutBorrow(idx) => {
             let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
-            borrow_vector_element(verifier, declared_element_type, offset, true)?
+            borrow_vector_element(verifier, meter, declared_element_type, offset, true)?
         }
 
         Bytecode::VecPushBack(idx) => {
-            let operand_elem = verifier.stack.pop().unwrap();
-            let operand_vec = verifier.stack.pop().unwrap();
+            let operand_elem = safe_unwrap!(verifier.stack.pop());
+            let operand_vec = safe_unwrap!(verifier.stack.pop());
             let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
             if declared_element_type != &operand_elem {
                 return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
@@ -763,31 +854,31 @@ fn verify_instr(
         }
 
         Bytecode::VecPopBack(idx) => {
-            let operand_vec = verifier.stack.pop().unwrap();
+            let operand_vec = safe_unwrap!(verifier.stack.pop());
             let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
             match get_vector_element_type(operand_vec, true) {
                 Some(derived_element_type) if &derived_element_type == declared_element_type => {
-                    verifier.stack.push(derived_element_type);
+                    verifier.push(meter, derived_element_type)?;
                 }
                 _ => return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset)),
             };
         }
 
         Bytecode::VecUnpack(idx, num) => {
-            let operand_vec = verifier.stack.pop().unwrap();
+            let operand_vec = safe_unwrap!(verifier.stack.pop());
             let declared_element_type = &verifier.resolver.signature_at(*idx).0[0];
             if operand_vec != ST::Vector(Box::new(declared_element_type.clone())) {
                 return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
             }
             for _ in 0..*num {
-                verifier.stack.push(declared_element_type.clone());
+                verifier.push(meter, declared_element_type.clone())?;
             }
         }
 
         Bytecode::VecSwap(idx) => {
-            let operand_idx2 = verifier.stack.pop().unwrap();
-            let operand_idx1 = verifier.stack.pop().unwrap();
-            let operand_vec = verifier.stack.pop().unwrap();
+            let operand_idx2 = safe_unwrap!(verifier.stack.pop());
+            let operand_idx1 = safe_unwrap!(verifier.stack.pop());
+            let operand_vec = safe_unwrap!(verifier.stack.pop());
             if operand_idx1 != ST::U64 || operand_idx2 != ST::U64 {
                 return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
             }
@@ -797,6 +888,27 @@ fn verify_instr(
                 _ => return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset)),
             };
         }
+        Bytecode::CastU16 => {
+            let operand = safe_unwrap!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U16)?;
+        }
+        Bytecode::CastU32 => {
+            let operand = safe_unwrap!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U32)?;
+        }
+        Bytecode::CastU256 => {
+            let operand = safe_unwrap!(verifier.stack.pop());
+            if !operand.is_integer() {
+                return Err(verifier.error(StatusCode::INTEGER_OP_TYPE_MISMATCH_ERROR, offset));
+            }
+            verifier.push(meter, ST::U256)?;
+        }
     };
     Ok(())
 }
@@ -816,11 +928,18 @@ fn materialize_type(struct_handle: StructHandleIndex, type_args: &Signature) ->
 fn instantiate(token: &SignatureToken, subst: &Signature) -> SignatureToken {
     use SignatureToken::*;
 
+    if subst.0.is_empty() {
+        return token.clone();
+    }
+
     match token {
         Bool => Bool,
         U8 => U8,
+        U16 => U16,
+        U32 => U32,
         U64 => U64,
         U128 => U128,
+        U256 => U256,
         Address => Address,
         Signer => Signer,
         Vector(ty) => Vector(Box::new(instantiate(ty, subst))),
diff --git a/language/move-bytecode-verifier/src/verifier.rs b/language/move-bytecode-verifier/src/verifier.rs
index 2e9326b5b6..c1dafda57f 100644
--- a/language/move-bytecode-verifier/src/verifier.rs
+++ b/language/move-bytecode-verifier/src/verifier.rs
@@ -7,14 +7,37 @@ use crate::{
     ability_field_requirements, check_duplication::DuplicationChecker,
     code_unit_verifier::CodeUnitVerifier, constants, friends,
     instantiation_loops::InstantiationLoopChecker, instruction_consistency::InstructionConsistency,
-    script_signature, script_signature::no_additional_script_signature_checks,
-    signature::SignatureChecker, struct_defs::RecursiveStructDefChecker,
+    limits::LimitsVerifier, script_signature,
+    script_signature::no_additional_script_signature_checks, signature::SignatureChecker,
+    struct_defs::RecursiveStructDefChecker,
 };
 use move_binary_format::{
     check_bounds::BoundsChecker,
-    errors::{Location, VMResult},
+    errors::{Location, PartialVMError, VMResult},
     file_format::{CompiledModule, CompiledScript},
 };
+use move_core_types::{state::VMState, vm_status::StatusCode};
+use std::time::Instant;
+
+#[derive(Debug, Clone)]
+pub struct VerifierConfig {
+    pub max_loop_depth: Option<usize>,
+    pub max_function_parameters: Option<usize>,
+    pub max_generic_instantiation_length: Option<usize>,
+    pub max_basic_blocks: Option<usize>,
+    pub max_value_stack_size: usize,
+    pub max_type_nodes: Option<usize>,
+    pub max_push_size: Option<usize>,
+    pub max_dependency_depth: Option<usize>,
+    pub max_struct_definitions: Option<usize>,
+    pub max_fields_in_struct: Option<usize>,
+    pub max_function_definitions: Option<usize>,
+    pub max_back_edges_per_function: Option<usize>,
+    pub max_back_edges_per_module: Option<usize>,
+    pub max_basic_blocks_in_script: Option<usize>,
+    pub max_per_fun_meter_units: Option<u128>,
+    pub max_per_mod_meter_units: Option<u128>,
+}
 
 /// Helper for a "canonical" verification of a module.
 ///
@@ -27,21 +50,72 @@ use move_binary_format::{
 /// minimize the code locations that need to be updated should a new checker
 /// is introduced.
 pub fn verify_module(module: &CompiledModule) -> VMResult<()> {
-    BoundsChecker::verify_module(module).map_err(|e| {
-        // We can't point the error at the module, because if bounds-checking
-        // failed, we cannot safely index into module's handle to itself.
-        e.finish(Location::Undefined)
-    })?;
-    DuplicationChecker::verify_module(module)?;
-    SignatureChecker::verify_module(module)?;
-    InstructionConsistency::verify_module(module)?;
-    constants::verify_module(module)?;
-    friends::verify_module(module)?;
-    ability_field_requirements::verify_module(module)?;
-    RecursiveStructDefChecker::verify_module(module)?;
-    InstantiationLoopChecker::verify_module(module)?;
-    CodeUnitVerifier::verify_module(module)?;
-    script_signature::verify_module(module, no_additional_script_signature_checks)
+    verify_module_with_config(&VerifierConfig::default(), module)
+}
+
+pub fn verify_module_with_config_for_test(
+    name: &str,
+    config: &VerifierConfig,
+    module: &CompiledModule,
+) -> VMResult<()> {
+    const MAX_MODULE_SIZE: usize = 65355;
+    let mut bytes = vec![];
+    module.serialize(&mut bytes).unwrap();
+    let now = Instant::now();
+    let result = verify_module_with_config(config, module);
+    eprintln!(
+        "--> {}: verification time: {:.3}ms, result: {}, size: {}kb",
+        name,
+        (now.elapsed().as_micros() as f64) / 1000.0,
+        if let Err(e) = &result {
+            format!("{:?}", e.major_status())
+        } else {
+            "Ok".to_string()
+        },
+        bytes.len() / 1000
+    );
+    // Also check whether the module actually fits into our payload size
+    assert!(
+        bytes.len() <= MAX_MODULE_SIZE,
+        "test module exceeds size limit {} (given size {})",
+        MAX_MODULE_SIZE,
+        bytes.len()
+    );
+    result
+}
+
+pub fn verify_module_with_config(config: &VerifierConfig, module: &CompiledModule) -> VMResult<()> {
+    let prev_state = move_core_types::state::set_state(VMState::VERIFIER);
+    let result = std::panic::catch_unwind(|| {
+        BoundsChecker::verify_module(module).map_err(|e| {
+            // We can't point the error at the module, because if bounds-checking
+            // failed, we cannot safely index into module's handle to itself.
+            e.finish(Location::Undefined)
+        })?;
+        LimitsVerifier::verify_module(config, module)?;
+        DuplicationChecker::verify_module(module)?;
+        SignatureChecker::verify_module(module)?;
+        InstructionConsistency::verify_module(module)?;
+        constants::verify_module(module)?;
+        friends::verify_module(module)?;
+        ability_field_requirements::verify_module(module)?;
+        RecursiveStructDefChecker::verify_module(module)?;
+        InstantiationLoopChecker::verify_module(module)?;
+        CodeUnitVerifier::verify_module(config, module)?;
+
+        // Add the failpoint injection to test the catch_unwind behavior.
+        fail::fail_point!("verifier-failpoint-panic");
+
+        script_signature::verify_module(module, no_additional_script_signature_checks)
+    })
+    .unwrap_or_else(|_| {
+        Err(
+            PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION)
+                .finish(Location::Undefined),
+        )
+    });
+    move_core_types::state::set_state(prev_state);
+    result
 }
 
 /// Helper for a "canonical" verification of a script.
@@ -55,11 +129,76 @@ pub fn verify_module(module: &CompiledModule) -> VMResult<()> {
 /// minimize the code locations that need to be updated should a new checker
 /// is introduced.
 pub fn verify_script(script: &CompiledScript) -> VMResult<()> {
-    BoundsChecker::verify_script(script).map_err(|e| e.finish(Location::Script))?;
-    DuplicationChecker::verify_script(script)?;
-    SignatureChecker::verify_script(script)?;
-    InstructionConsistency::verify_script(script)?;
-    constants::verify_script(script)?;
-    CodeUnitVerifier::verify_script(script)?;
-    script_signature::verify_script(script, no_additional_script_signature_checks)
+    verify_script_with_config(&VerifierConfig::default(), script)
+}
+
+pub fn verify_script_with_config(config: &VerifierConfig, script: &CompiledScript) -> VMResult<()> {
+    let prev_state = move_core_types::state::set_state(VMState::VERIFIER);
+    let result = std::panic::catch_unwind(|| {
+        BoundsChecker::verify_script(script).map_err(|e| e.finish(Location::Script))?;
+        LimitsVerifier::verify_script(config, script)?;
+        DuplicationChecker::verify_script(script)?;
+        SignatureChecker::verify_script(script)?;
+        InstructionConsistency::verify_script(script)?;
+        constants::verify_script(script)?;
+        CodeUnitVerifier::verify_script(config, script)?;
+        script_signature::verify_script(script, no_additional_script_signature_checks)
+    })
+    .unwrap_or_else(|_| {
+        Err(
+            PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION)
+                .finish(Location::Undefined),
+        )
+    });
+    move_core_types::state::set_state(prev_state);
+
+    result
+}
+
+impl Default for VerifierConfig {
+    fn default() -> Self {
+        Self {
+            max_loop_depth: None,
+            max_function_parameters: None,
+            max_generic_instantiation_length: None,
+            max_basic_blocks: None,
+            max_type_nodes: None,
+            // Max size set to 1024 to match the size limit in the interpreter.
+            max_value_stack_size: 1024,
+            // Max number of pushes in one function
+            max_push_size: None,
+            // Max depth in dependency tree for both direct and friend dependencies
+            max_dependency_depth: None,
+            // Max count of structs in a module
+            max_struct_definitions: None,
+            // Max count of fields in a struct
+            max_fields_in_struct: None,
+            // Max count of functions in a module
+            max_function_definitions: None,
+            // Max size set to 10000 to restrict number of pushes in one function
+            // max_push_size: Some(10000),
+            // max_dependency_depth: Some(100),
+            // max_struct_definitions: Some(200),
+            // max_fields_in_struct: Some(30),
+            // max_function_definitions: Some(1000),
+            max_back_edges_per_function: None,
+            max_back_edges_per_module: None,
+            max_basic_blocks_in_script: None,
+            /// General metering for the verifier. This defaults to a bound which should align
+            /// with production, so all existing test cases apply it.
+            max_per_fun_meter_units: Some(1000 * 8000),
+            max_per_mod_meter_units: Some(1000 * 8000),
+        }
+    }
+}
+
+impl VerifierConfig {
+    /// Returns truly unbounded config, even relaxing metering.
+    pub fn unbounded() -> Self {
+        Self {
+            max_per_fun_meter_units: None,
+            max_per_mod_meter_units: None,
+            ..VerifierConfig::default()
+        }
+    }
 }
diff --git a/language/move-bytecode-verifier/transactional-tests/Cargo.toml b/language/move-bytecode-verifier/transactional-tests/Cargo.toml
index 403f8f1b8f..e30e2600e0 100644
--- a/language/move-bytecode-verifier/transactional-tests/Cargo.toml
+++ b/language/move-bytecode-verifier/transactional-tests/Cargo.toml
@@ -3,7 +3,7 @@ name = "bytecode-verifier-transactional-tests"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dev-dependencies]
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/check_bounds/128_params_and_128_locals.exp b/language/move-bytecode-verifier/transactional-tests/tests/check_bounds/128_params_and_128_locals.exp
index 6cd67db3f6..1d0b5ce3de 100644
--- a/language/move-bytecode-verifier/transactional-tests/tests/check_bounds/128_params_and_128_locals.exp
+++ b/language/move-bytecode-verifier/transactional-tests/tests/check_bounds/128_params_and_128_locals.exp
@@ -1 +1,10 @@
 processed 1 task
+
+task 0 'publish'. lines 1-265:
+Error: Unable to publish module '00000000000000000000000000000001::M'. Got VMError: {
+    major_status: TOO_MANY_LOCALS,
+    sub_status: None,
+    location: undefined,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/check_bounds/128_params_and_128_locals.mvir b/language/move-bytecode-verifier/transactional-tests/tests/check_bounds/128_params_and_128_locals.mvir
index 1cfe87425c..409900827e 100644
--- a/language/move-bytecode-verifier/transactional-tests/tests/check_bounds/128_params_and_128_locals.mvir
+++ b/language/move-bytecode-verifier/transactional-tests/tests/check_bounds/128_params_and_128_locals.mvir
@@ -262,4 +262,4 @@ module 0x1.M {
         return;
     }
 }
-// check: "Keep(EXECUTED)"
+// check: TOO_MANY_LOCALS
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/check_bounds/1_param_and_255_locals.exp b/language/move-bytecode-verifier/transactional-tests/tests/check_bounds/1_param_and_255_locals.exp
index 6cd67db3f6..6227c6fe82 100644
--- a/language/move-bytecode-verifier/transactional-tests/tests/check_bounds/1_param_and_255_locals.exp
+++ b/language/move-bytecode-verifier/transactional-tests/tests/check_bounds/1_param_and_255_locals.exp
@@ -1 +1,10 @@
 processed 1 task
+
+task 0 'publish'. lines 1-264:
+Error: Unable to publish module '00000000000000000000000000000001::M'. Got VMError: {
+    major_status: TOO_MANY_LOCALS,
+    sub_status: None,
+    location: undefined,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [],
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/check_bounds/1_param_and_255_locals.mvir b/language/move-bytecode-verifier/transactional-tests/tests/check_bounds/1_param_and_255_locals.mvir
index da743b8bd5..654674e5bb 100644
--- a/language/move-bytecode-verifier/transactional-tests/tests/check_bounds/1_param_and_255_locals.mvir
+++ b/language/move-bytecode-verifier/transactional-tests/tests/check_bounds/1_param_and_255_locals.mvir
@@ -260,3 +260,5 @@ module 0x1.M {
         return;
     }
 }
+
+// check: TOO_MANY_LOCALS
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/control_flow/last_jump_unconditional_drop.exp b/language/move-bytecode-verifier/transactional-tests/tests/control_flow/last_jump_unconditional_drop.exp
new file mode 100644
index 0000000000..bd81405081
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/control_flow/last_jump_unconditional_drop.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 17-5495:
+Error: Script execution failed with VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 65530)],
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/control_flow/last_jump_unconditional_drop.mvir b/language/move-bytecode-verifier/transactional-tests/tests/control_flow/last_jump_unconditional_drop.mvir
new file mode 100644
index 0000000000..d68b9be8b4
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/control_flow/last_jump_unconditional_drop.mvir
@@ -0,0 +1,5495 @@
+//# publish
+module 0x1.test {
+    struct HotPotato { value: u64 }
+    public get_hot_potato(): Self.HotPotato {
+        label l0:
+        return HotPotato { value: 42 };
+    }
+
+    public destroy_hot_potato(potato: Self.HotPotato) {
+        label l0:
+        HotPotato {} = move(potato);
+        _ = ();
+        return;
+    }
+}
+
+//# run --check-runtime-types
+import 0x1.test;
+// check valid breaks in control flow check
+main() {
+    let hot_potato_1: test.HotPotato;
+    let hot_potato_2: test.HotPotato;
+label start:
+    jump end;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return;
+label code:
+    hot_potato_1 = test.get_hot_potato();
+    hot_potato_2 = test.get_hot_potato();
+    hot_potato_1 = move(hot_potato_2);
+    test.destroy_hot_potato(move(hot_potato_1));
+    return;
+label end:
+    jump code;
+
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/control_flow/last_jump_unconditional_reference.exp b/language/move-bytecode-verifier/transactional-tests/tests/control_flow/last_jump_unconditional_reference.exp
new file mode 100644
index 0000000000..a87801b7ee
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/control_flow/last_jump_unconditional_reference.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-5478:
+Error: Script execution failed with VMError: {
+    major_status: VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 65529)],
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/control_flow/last_jump_unconditional_reference.mvir b/language/move-bytecode-verifier/transactional-tests/tests/control_flow/last_jump_unconditional_reference.mvir
new file mode 100644
index 0000000000..987f40b445
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/control_flow/last_jump_unconditional_reference.mvir
@@ -0,0 +1,5478 @@
+//# run
+// check valid breaks in control flow check
+main() {
+    let v: vector<u64>;
+    let vref: &mut vector<u64>;
+    let r: &mut u64;
+label start:
+    jump end;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return; return; return;
+    return; return; return; return; return; return; return; return; return; return;
+label code:
+    v = vec_pack_1<u64>(0);
+    vref = &mut v;
+    r = vec_mut_borrow<u64>(copy(vref), 0);
+    _ = vec_pop_back<u64>(copy(vref));
+    *copy(r) = 1;
+label end:
+    jump code;
+
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/control_flow/regression_test_496.exp b/language/move-bytecode-verifier/transactional-tests/tests/control_flow/regression_test_496.exp
new file mode 100644
index 0000000000..6cd67db3f6
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/control_flow/regression_test_496.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/control_flow/regression_test_496.move b/language/move-bytecode-verifier/transactional-tests/tests/control_flow/regression_test_496.move
new file mode 100644
index 0000000000..d172306744
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/control_flow/regression_test_496.move
@@ -0,0 +1,18 @@
+//# publish
+module 0x42::test_case {
+    public fun test_loop(a: u64): u64 {
+        if (a == 2) {
+            1
+        } else if (a == 3) {
+            let i = 0;
+            let ret = 0;
+            while (i < a) {
+                ret = ret + i;
+                i = i + 1;
+            };
+            ret
+        } else {
+            abort 10000
+        }
+    }
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/control_flow/regression_test_678.exp b/language/move-bytecode-verifier/transactional-tests/tests/control_flow/regression_test_678.exp
new file mode 100644
index 0000000000..6cd67db3f6
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/control_flow/regression_test_678.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/control_flow/regression_test_678.move b/language/move-bytecode-verifier/transactional-tests/tests/control_flow/regression_test_678.move
new file mode 100644
index 0000000000..cba6f80987
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/control_flow/regression_test_678.move
@@ -0,0 +1,22 @@
+//# publish
+module 0x42::test_case {
+    struct Foo has drop {}
+
+    fun bar(_foo: &mut Foo) {
+        /* ... */
+    }
+
+    fun remove_tx(foo: &mut Foo) {
+        let i = 0;
+        while (i < 64) {
+            i = i + 1;
+
+            bar(foo);
+            if (i < 30) {
+                continue
+            };
+
+            break
+        }
+    }
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/dependencies/call_integers_valid.exp b/language/move-bytecode-verifier/transactional-tests/tests/dependencies/call_integers_valid.exp
new file mode 100644
index 0000000000..5d92c423f3
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/dependencies/call_integers_valid.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/dependencies/call_integers_valid.move b/language/move-bytecode-verifier/transactional-tests/tests/dependencies/call_integers_valid.move
new file mode 100644
index 0000000000..96a8df3108
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/dependencies/call_integers_valid.move
@@ -0,0 +1,22 @@
+//# publish
+module 0x42::m {
+public fun plus8(a: u8): u8 { a + 1 }
+public fun plus16(a: u16): u16 { a + 1 }
+public fun plus32(a: u32): u32 { a + 1 }
+public fun plus64(a: u64): u64 { a + 1 }
+public fun plus128(a: u128): u128 { a + 1 }
+public fun plus256(a: u256): u256 { a + 1 }
+}
+
+
+//# publish
+module 0x42::m_test {
+use 0x42::m;
+public fun test8() { m::plus8(1u8); }
+public fun test16() { m::plus16(1u16); }
+public fun test32() { m::plus32(1u32); }
+public fun test64() { m::plus64(1u64); }
+public fun test128() { m::plus128(1u128); }
+public fun test256() { m::plus256(1u256); }
+
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_in_loop.exp b/language/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_in_loop.exp
new file mode 100644
index 0000000000..6cd67db3f6
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_in_loop.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_in_loop.mvir b/language/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_in_loop.mvir
new file mode 100644
index 0000000000..ddc4f15afe
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/reference_safety/borrow_in_loop.mvir
@@ -0,0 +1,12 @@
+
+//# publish
+module 0x42.m {
+foo() {
+    let x: u64;
+    let r: &u64;
+    label l0:
+    x = 0;
+    r = &x;
+    jump l0;
+}
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/reference_safety/call_function_with_many_acquires.exp b/language/move-bytecode-verifier/transactional-tests/tests/reference_safety/call_function_with_many_acquires.exp
new file mode 100644
index 0000000000..1755644123
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/reference_safety/call_function_with_many_acquires.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'publish'. lines 2-416:
+Error: Unable to publish module '00000000000000000000000000000042::pwn'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::pwn,
+    indices: [(FunctionDefinition, 2)],
+    offsets: [],
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/reference_safety/call_function_with_many_acquires.move b/language/move-bytecode-verifier/transactional-tests/tests/reference_safety/call_function_with_many_acquires.move
new file mode 100644
index 0000000000..ad72e381c0
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/reference_safety/call_function_with_many_acquires.move
@@ -0,0 +1,416 @@
+// See also: github.com/aptos-labs/aptos-core/security/advisories/GHSA-7v29-m9hj-jxjf
+//# publish
+module 0x42::pwn {
+    struct R1 has key {f:u8}
+    struct R2 has key {f:u8}
+    struct R3 has key {f:u8}
+    struct R4 has key {f:u8}
+    struct R5 has key {f:u8}
+    struct R6 has key {f:u8}
+    struct R7 has key {f:u8}
+    struct R8 has key {f:u8}
+    struct R9 has key {f:u8}
+    struct R10 has key {f:u8}
+    struct R11 has key {f:u8}
+    struct R12 has key {f:u8}
+    struct R13 has key {f:u8}
+    struct R14 has key {f:u8}
+    struct R15 has key {f:u8}
+    struct R16 has key {f:u8}
+    struct R17 has key {f:u8}
+    struct R18 has key {f:u8}
+    struct R19 has key {f:u8}
+    struct R20 has key {f:u8}
+    struct R21 has key {f:u8}
+    struct R22 has key {f:u8}
+    struct R23 has key {f:u8}
+    struct R24 has key {f:u8}
+    struct R25 has key {f:u8}
+    struct R26 has key {f:u8}
+    struct R27 has key {f:u8}
+    struct R28 has key {f:u8}
+    struct R29 has key {f:u8}
+    struct R30 has key {f:u8}
+    struct R31 has key {f:u8}
+    struct R32 has key {f:u8}
+    struct R33 has key {f:u8}
+    struct R34 has key {f:u8}
+    struct R35 has key {f:u8}
+    struct R36 has key {f:u8}
+    struct R37 has key {f:u8}
+    struct R38 has key {f:u8}
+    struct R39 has key {f:u8}
+    struct R40 has key {f:u8}
+    struct R41 has key {f:u8}
+    struct R42 has key {f:u8}
+    struct R43 has key {f:u8}
+    struct R44 has key {f:u8}
+    struct R45 has key {f:u8}
+    struct R46 has key {f:u8}
+    struct R47 has key {f:u8}
+    struct R48 has key {f:u8}
+    struct R49 has key {f:u8}
+    struct R50 has key {f:u8}
+    struct R51 has key {f:u8}
+    struct R52 has key {f:u8}
+    struct R53 has key {f:u8}
+    struct R54 has key {f:u8}
+    struct R55 has key {f:u8}
+    struct R56 has key {f:u8}
+    struct R57 has key {f:u8}
+    struct R58 has key {f:u8}
+    struct R59 has key {f:u8}
+    struct R60 has key {f:u8}
+    struct R61 has key {f:u8}
+    struct R62 has key {f:u8}
+    struct R63 has key {f:u8}
+    struct R64 has key {f:u8}
+    struct R65 has key {f:u8}
+    struct R66 has key {f:u8}
+    struct R67 has key {f:u8}
+    struct R68 has key {f:u8}
+    struct R69 has key {f:u8}
+    struct R70 has key {f:u8}
+    struct R71 has key {f:u8}
+    struct R72 has key {f:u8}
+    struct R73 has key {f:u8}
+    struct R74 has key {f:u8}
+    struct R75 has key {f:u8}
+    struct R76 has key {f:u8}
+    struct R77 has key {f:u8}
+    struct R78 has key {f:u8}
+    struct R79 has key {f:u8}
+    struct R80 has key {f:u8}
+    struct R81 has key {f:u8}
+    struct R82 has key {f:u8}
+    struct R83 has key {f:u8}
+    struct R84 has key {f:u8}
+    struct R85 has key {f:u8}
+    struct R86 has key {f:u8}
+    struct R87 has key {f:u8}
+    struct R88 has key {f:u8}
+    struct R89 has key {f:u8}
+    struct R90 has key {f:u8}
+    struct R91 has key {f:u8}
+    struct R92 has key {f:u8}
+    struct R93 has key {f:u8}
+    struct R94 has key {f:u8}
+    struct R95 has key {f:u8}
+    struct R96 has key {f:u8}
+    struct R97 has key {f:u8}
+    struct R98 has key {f:u8}
+    struct R99 has key {f:u8}
+    struct R100 has key {f:u8}
+    struct R101 has key {f:u8}
+    struct R102 has key {f:u8}
+    struct R103 has key {f:u8}
+    struct R104 has key {f:u8}
+    struct R105 has key {f:u8}
+    struct R106 has key {f:u8}
+    struct R107 has key {f:u8}
+    struct R108 has key {f:u8}
+    struct R109 has key {f:u8}
+    struct R110 has key {f:u8}
+    struct R111 has key {f:u8}
+    struct R112 has key {f:u8}
+    struct R113 has key {f:u8}
+    struct R114 has key {f:u8}
+    struct R115 has key {f:u8}
+    struct R116 has key {f:u8}
+    struct R117 has key {f:u8}
+    struct R118 has key {f:u8}
+    struct R119 has key {f:u8}
+    struct R120 has key {f:u8}
+    struct R121 has key {f:u8}
+    struct R122 has key {f:u8}
+    struct R123 has key {f:u8}
+    struct R124 has key {f:u8}
+    struct R125 has key {f:u8}
+    struct R126 has key {f:u8}
+    struct R127 has key {f:u8}
+    struct R128 has key {f:u8}
+    struct R129 has key {f:u8}
+    struct R130 has key {f:u8}
+    struct R131 has key {f:u8}
+    struct R132 has key {f:u8}
+    struct R133 has key {f:u8}
+    struct R134 has key {f:u8}
+    struct R135 has key {f:u8}
+    struct R136 has key {f:u8}
+    struct R137 has key {f:u8}
+    struct R138 has key {f:u8}
+    struct R139 has key {f:u8}
+    struct R140 has key {f:u8}
+    struct R141 has key {f:u8}
+    struct R142 has key {f:u8}
+    struct R143 has key {f:u8}
+    struct R144 has key {f:u8}
+    struct R145 has key {f:u8}
+    struct R146 has key {f:u8}
+    struct R147 has key {f:u8}
+    struct R148 has key {f:u8}
+    struct R149 has key {f:u8}
+    struct R150 has key {f:u8}
+    struct R151 has key {f:u8}
+    struct R152 has key {f:u8}
+    struct R153 has key {f:u8}
+    struct R154 has key {f:u8}
+    struct R155 has key {f:u8}
+    struct R156 has key {f:u8}
+    struct R157 has key {f:u8}
+    struct R158 has key {f:u8}
+    struct R159 has key {f:u8}
+    struct R160 has key {f:u8}
+    struct R161 has key {f:u8}
+    struct R162 has key {f:u8}
+    struct R163 has key {f:u8}
+    struct R164 has key {f:u8}
+    struct R165 has key {f:u8}
+    struct R166 has key {f:u8}
+    struct R167 has key {f:u8}
+    struct R168 has key {f:u8}
+    struct R169 has key {f:u8}
+    struct R170 has key {f:u8}
+    struct R171 has key {f:u8}
+    struct R172 has key {f:u8}
+    struct R173 has key {f:u8}
+    struct R174 has key {f:u8}
+    struct R175 has key {f:u8}
+    struct R176 has key {f:u8}
+    struct R177 has key {f:u8}
+    struct R178 has key {f:u8}
+    struct R179 has key {f:u8}
+    struct R180 has key {f:u8}
+    struct R181 has key {f:u8}
+    struct R182 has key {f:u8}
+    struct R183 has key {f:u8}
+    struct R184 has key {f:u8}
+    struct R185 has key {f:u8}
+    struct R186 has key {f:u8}
+    struct R187 has key {f:u8}
+    struct R188 has key {f:u8}
+    struct R189 has key {f:u8}
+    struct R190 has key {f:u8}
+    struct R191 has key {f:u8}
+    struct R192 has key {f:u8}
+    struct R193 has key {f:u8}
+    struct R194 has key {f:u8}
+    struct R195 has key {f:u8}
+    struct R196 has key {f:u8}
+    struct R197 has key {f:u8}
+    struct R198 has key {f:u8}
+    struct R199 has key {f:u8}
+
+    const ADDRESS: address = @0x0;
+
+    public fun get_address(): address {
+        ADDRESS
+    }
+
+    public fun f() acquires R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16, R17, R18, R19, R20, R21, R22, R23, R24, R25, R26, R27, R28, R29, R30, R31, R32, R33, R34, R35, R36, R37, R38, R39, R40, R41, R42, R43, R44, R45, R46, R47, R48, R49, R50, R51, R52, R53, R54, R55, R56, R57, R58, R59, R60, R61, R62, R63, R64, R65, R66, R67, R68, R69, R70, R71, R72, R73, R74, R75, R76, R77, R78, R79, R80, R81, R82, R83, R84, R85, R86, R87, R88, R89, R90, R91, R92, R93, R94, R95, R96, R97, R98, R99, R100, R101, R102, R103, R104, R105, R106, R107, R108, R109, R110, R111, R112, R113, R114, R115, R116, R117, R118, R119, R120, R121, R122, R123, R124, R125, R126, R127, R128, R129, R130, R131, R132, R133, R134, R135, R136, R137, R138, R139, R140, R141, R142, R143, R144, R145, R146, R147, R148, R149, R150, R151, R152, R153, R154, R155, R156, R157, R158, R159, R160, R161, R162, R163, R164, R165, R166, R167, R168, R169, R170, R171, R172, R173, R174, R175, R176, R177, R178, R179, R180, R181, R182, R183, R184, R185, R186, R187, R188, R189, R190, R191, R192, R193, R194, R195, R196, R197, R198, R199 {
+        let a = get_address();
+        borrow_global<R1>(a).f;
+        borrow_global<R2>(a).f;
+        borrow_global<R3>(a).f;
+        borrow_global<R4>(a).f;
+        borrow_global<R5>(a).f;
+        borrow_global<R6>(a).f;
+        borrow_global<R7>(a).f;
+        borrow_global<R8>(a).f;
+        borrow_global<R9>(a).f;
+        borrow_global<R10>(a).f;
+        borrow_global<R11>(a).f;
+        borrow_global<R12>(a).f;
+        borrow_global<R13>(a).f;
+        borrow_global<R14>(a).f;
+        borrow_global<R15>(a).f;
+        borrow_global<R16>(a).f;
+        borrow_global<R17>(a).f;
+        borrow_global<R18>(a).f;
+        borrow_global<R19>(a).f;
+        borrow_global<R20>(a).f;
+        borrow_global<R21>(a).f;
+        borrow_global<R22>(a).f;
+        borrow_global<R23>(a).f;
+        borrow_global<R24>(a).f;
+        borrow_global<R25>(a).f;
+        borrow_global<R26>(a).f;
+        borrow_global<R27>(a).f;
+        borrow_global<R28>(a).f;
+        borrow_global<R29>(a).f;
+        borrow_global<R30>(a).f;
+        borrow_global<R31>(a).f;
+        borrow_global<R32>(a).f;
+        borrow_global<R33>(a).f;
+        borrow_global<R34>(a).f;
+        borrow_global<R35>(a).f;
+        borrow_global<R36>(a).f;
+        borrow_global<R37>(a).f;
+        borrow_global<R38>(a).f;
+        borrow_global<R39>(a).f;
+        borrow_global<R40>(a).f;
+        borrow_global<R41>(a).f;
+        borrow_global<R42>(a).f;
+        borrow_global<R43>(a).f;
+        borrow_global<R44>(a).f;
+        borrow_global<R45>(a).f;
+        borrow_global<R46>(a).f;
+        borrow_global<R47>(a).f;
+        borrow_global<R48>(a).f;
+        borrow_global<R49>(a).f;
+        borrow_global<R50>(a).f;
+        borrow_global<R51>(a).f;
+        borrow_global<R52>(a).f;
+        borrow_global<R53>(a).f;
+        borrow_global<R54>(a).f;
+        borrow_global<R55>(a).f;
+        borrow_global<R56>(a).f;
+        borrow_global<R57>(a).f;
+        borrow_global<R58>(a).f;
+        borrow_global<R59>(a).f;
+        borrow_global<R60>(a).f;
+        borrow_global<R61>(a).f;
+        borrow_global<R62>(a).f;
+        borrow_global<R63>(a).f;
+        borrow_global<R64>(a).f;
+        borrow_global<R65>(a).f;
+        borrow_global<R66>(a).f;
+        borrow_global<R67>(a).f;
+        borrow_global<R68>(a).f;
+        borrow_global<R69>(a).f;
+        borrow_global<R70>(a).f;
+        borrow_global<R71>(a).f;
+        borrow_global<R72>(a).f;
+        borrow_global<R73>(a).f;
+        borrow_global<R74>(a).f;
+        borrow_global<R75>(a).f;
+        borrow_global<R76>(a).f;
+        borrow_global<R77>(a).f;
+        borrow_global<R78>(a).f;
+        borrow_global<R79>(a).f;
+        borrow_global<R80>(a).f;
+        borrow_global<R81>(a).f;
+        borrow_global<R82>(a).f;
+        borrow_global<R83>(a).f;
+        borrow_global<R84>(a).f;
+        borrow_global<R85>(a).f;
+        borrow_global<R86>(a).f;
+        borrow_global<R87>(a).f;
+        borrow_global<R88>(a).f;
+        borrow_global<R89>(a).f;
+        borrow_global<R90>(a).f;
+        borrow_global<R91>(a).f;
+        borrow_global<R92>(a).f;
+        borrow_global<R93>(a).f;
+        borrow_global<R94>(a).f;
+        borrow_global<R95>(a).f;
+        borrow_global<R96>(a).f;
+        borrow_global<R97>(a).f;
+        borrow_global<R98>(a).f;
+        borrow_global<R99>(a).f;
+        borrow_global<R100>(a).f;
+        borrow_global<R101>(a).f;
+        borrow_global<R102>(a).f;
+        borrow_global<R103>(a).f;
+        borrow_global<R104>(a).f;
+        borrow_global<R105>(a).f;
+        borrow_global<R106>(a).f;
+        borrow_global<R107>(a).f;
+        borrow_global<R108>(a).f;
+        borrow_global<R109>(a).f;
+        borrow_global<R110>(a).f;
+        borrow_global<R111>(a).f;
+        borrow_global<R112>(a).f;
+        borrow_global<R113>(a).f;
+        borrow_global<R114>(a).f;
+        borrow_global<R115>(a).f;
+        borrow_global<R116>(a).f;
+        borrow_global<R117>(a).f;
+        borrow_global<R118>(a).f;
+        borrow_global<R119>(a).f;
+        borrow_global<R120>(a).f;
+        borrow_global<R121>(a).f;
+        borrow_global<R122>(a).f;
+        borrow_global<R123>(a).f;
+        borrow_global<R124>(a).f;
+        borrow_global<R125>(a).f;
+        borrow_global<R126>(a).f;
+        borrow_global<R127>(a).f;
+        borrow_global<R128>(a).f;
+        borrow_global<R129>(a).f;
+        borrow_global<R130>(a).f;
+        borrow_global<R131>(a).f;
+        borrow_global<R132>(a).f;
+        borrow_global<R133>(a).f;
+        borrow_global<R134>(a).f;
+        borrow_global<R135>(a).f;
+        borrow_global<R136>(a).f;
+        borrow_global<R137>(a).f;
+        borrow_global<R138>(a).f;
+        borrow_global<R139>(a).f;
+        borrow_global<R140>(a).f;
+        borrow_global<R141>(a).f;
+        borrow_global<R142>(a).f;
+        borrow_global<R143>(a).f;
+        borrow_global<R144>(a).f;
+        borrow_global<R145>(a).f;
+        borrow_global<R146>(a).f;
+        borrow_global<R147>(a).f;
+        borrow_global<R148>(a).f;
+        borrow_global<R149>(a).f;
+        borrow_global<R150>(a).f;
+        borrow_global<R151>(a).f;
+        borrow_global<R152>(a).f;
+        borrow_global<R153>(a).f;
+        borrow_global<R154>(a).f;
+        borrow_global<R155>(a).f;
+        borrow_global<R156>(a).f;
+        borrow_global<R157>(a).f;
+        borrow_global<R158>(a).f;
+        borrow_global<R159>(a).f;
+        borrow_global<R160>(a).f;
+        borrow_global<R161>(a).f;
+        borrow_global<R162>(a).f;
+        borrow_global<R163>(a).f;
+        borrow_global<R164>(a).f;
+        borrow_global<R165>(a).f;
+        borrow_global<R166>(a).f;
+        borrow_global<R167>(a).f;
+        borrow_global<R168>(a).f;
+        borrow_global<R169>(a).f;
+        borrow_global<R170>(a).f;
+        borrow_global<R171>(a).f;
+        borrow_global<R172>(a).f;
+        borrow_global<R173>(a).f;
+        borrow_global<R174>(a).f;
+        borrow_global<R175>(a).f;
+        borrow_global<R176>(a).f;
+        borrow_global<R177>(a).f;
+        borrow_global<R178>(a).f;
+        borrow_global<R179>(a).f;
+        borrow_global<R180>(a).f;
+        borrow_global<R181>(a).f;
+        borrow_global<R182>(a).f;
+        borrow_global<R183>(a).f;
+        borrow_global<R184>(a).f;
+        borrow_global<R185>(a).f;
+        borrow_global<R186>(a).f;
+        borrow_global<R187>(a).f;
+        borrow_global<R188>(a).f;
+        borrow_global<R189>(a).f;
+        borrow_global<R190>(a).f;
+        borrow_global<R191>(a).f;
+        borrow_global<R192>(a).f;
+        borrow_global<R193>(a).f;
+        borrow_global<R194>(a).f;
+        borrow_global<R195>(a).f;
+        borrow_global<R196>(a).f;
+        borrow_global<R197>(a).f;
+        borrow_global<R198>(a).f;
+        borrow_global<R199>(a).f;
+    }
+
+    public fun pwn() acquires R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16, R17, R18, R19, R20, R21, R22, R23, R24, R25, R26, R27, R28, R29, R30, R31, R32, R33, R34, R35, R36, R37, R38, R39, R40, R41, R42, R43, R44, R45, R46, R47, R48, R49, R50, R51, R52, R53, R54, R55, R56, R57, R58, R59, R60, R61, R62, R63, R64, R65, R66, R67, R68, R69, R70, R71, R72, R73, R74, R75, R76, R77, R78, R79, R80, R81, R82, R83, R84, R85, R86, R87, R88, R89, R90, R91, R92, R93, R94, R95, R96, R97, R98, R99, R100, R101, R102, R103, R104, R105, R106, R107, R108, R109, R110, R111, R112, R113, R114, R115, R116, R117, R118, R119, R120, R121, R122, R123, R124, R125, R126, R127, R128, R129, R130, R131, R132, R133, R134, R135, R136, R137, R138, R139, R140, R141, R142, R143, R144, R145, R146, R147, R148, R149, R150, R151, R152, R153, R154, R155, R156, R157, R158, R159, R160, R161, R162, R163, R164, R165, R166, R167, R168, R169, R170, R171, R172, R173, R174, R175, R176, R177, R178, R179, R180, R181, R182, R183, R184, R185, R186, R187, R188, R189, R190, R191, R192, R193, R194, R195, R196, R197, R198, R199 {
+        f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();f();
+    }
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/cast_negative_stack.exp b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/cast_negative_stack.exp
new file mode 100644
index 0000000000..fb39cf47b3
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/cast_negative_stack.exp
@@ -0,0 +1,55 @@
+processed 6 tasks
+
+task 0 'run'. lines 1-6:
+Error: Script execution failed with VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 1 'run'. lines 8-13:
+Error: Script execution failed with VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 2 'run'. lines 15-20:
+Error: Script execution failed with VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 3 'run'. lines 22-27:
+Error: Script execution failed with VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 4 'run'. lines 29-34:
+Error: Script execution failed with VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 5 'run'. lines 36-41:
+Error: Script execution failed with VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/cast_negative_stack.mvir b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/cast_negative_stack.mvir
new file mode 100644
index 0000000000..096075ebc7
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/cast_negative_stack.mvir
@@ -0,0 +1,41 @@
+//# run
+main() {
+label b0:
+    to_u8(());
+    return;
+}
+
+//# run
+main() {
+label b0:
+    to_u16(());
+    return;
+}
+
+//# run
+main() {
+label b0:
+    to_u32(());
+    return;
+}
+
+//# run
+main() {
+label b0:
+    to_u64(());
+    return;
+}
+
+//# run
+main() {
+label b0:
+    to_u128(());
+    return;
+}
+
+//# run
+main() {
+label b0:
+    to_u256(());
+    return;
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/cast_positive_stack.exp b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/cast_positive_stack.exp
new file mode 100644
index 0000000000..7537209e31
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/cast_positive_stack.exp
@@ -0,0 +1,55 @@
+processed 6 tasks
+
+task 0 'run'. lines 1-7:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 1 'run'. lines 9-15:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 2 'run'. lines 17-23:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 3 'run'. lines 25-31:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 4 'run'. lines 33-39:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 5 'run'. lines 41-47:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/cast_positive_stack.mvir b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/cast_positive_stack.mvir
new file mode 100644
index 0000000000..0fc217a463
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/cast_positive_stack.mvir
@@ -0,0 +1,47 @@
+//# run
+main() {
+label b0:
+    (3);
+    to_u8(());
+    return;
+}
+
+//# run
+main() {
+label b0:
+    (3);
+    to_u16(());
+    return;
+}
+
+//# run
+main() {
+label b0:
+    (3);
+    to_u32(());
+    return;
+}
+
+//# run
+main() {
+label b0:
+    (3);
+    to_u64(());
+    return;
+}
+
+//# run
+main() {
+label b0:
+    (3);
+    to_u128(());
+    return;
+}
+
+//# run
+main() {
+label b0:
+    (3);
+    to_u256(());
+    return;
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/consume_stack.mvir b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/consume_stack.mvir
index 435c8993a2..df9f0b724e 100644
--- a/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/consume_stack.mvir
+++ b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/consume_stack.mvir
@@ -18,7 +18,7 @@ module 0x1.M {
     }
 
     // ImmBorrowLoc(0),
-    // LdAddr(1),
+    // LdConst(1),
     // ImmBorrowGlobal(StructDefinitionIndex(4)),
     // ImmBorrowField(FieldHandleIndex(0)),
     // Call(45),
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_balanced.exp b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_balanced.exp
new file mode 100644
index 0000000000..2301000e50
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_balanced.exp
@@ -0,0 +1 @@
+processed 6 tasks
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_balanced.mvir b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_balanced.mvir
new file mode 100644
index 0000000000..e660d0b6f2
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_balanced.mvir
@@ -0,0 +1,90 @@
+//# publish
+module 0x1.A {
+    two(): u8 * u8{
+    label b0:
+        return 0u8, 255u8;
+    }
+
+    pop() {
+    label b0:
+        // balance stack, equal pops and values
+        _, _  = Self.two();
+        return;
+    }
+}
+
+
+//# publish
+module 0x1.A {
+    two(): u16 * u16{
+    label b0:
+        return 0u16, 65535u16;
+    }
+
+    pop() {
+    label b0:
+        // balance stack, equal pops and values
+        _, _ = Self.two();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    two(): u32 * u32{
+    label b0:
+        return 0u32, 4294967295u32;
+    }
+
+    pop() {
+    label b0:
+        // balance stack, equal pops and values
+        _, _ = Self.two();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    two(): u64 * u64{
+    label b0:
+        return 0u64, 18446744073709551615u64;
+    }
+
+    pop() {
+    label b0:
+        // balance stack, equal pops and values
+        _, _ = Self.two();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    two(): u128 * u128{
+    label b0:
+        return 0u128, 340282366920938463463374607431768211455u128;
+    }
+
+    pop() {
+    label b0:
+        // balance stack, equal pops and values
+        _, _ = Self.two();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    two(): u256 * u256{
+    label b0:
+        return 0u256, 115792089237316195423570985008687907853269984665640564039457584007913129639935u256;
+    }
+
+    pop() {
+    label b0:
+        // balance stack, equal pops and values
+        _, _ = Self.two();
+        return;
+    }
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_negative.exp b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_negative.exp
new file mode 100644
index 0000000000..b7484b65db
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_negative.exp
@@ -0,0 +1,55 @@
+processed 6 tasks
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '00000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 1 'publish'. lines 17-30:
+Error: Unable to publish module '00000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 2 'publish'. lines 32-45:
+Error: Unable to publish module '00000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 3 'publish'. lines 47-60:
+Error: Unable to publish module '00000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 4 'publish'. lines 62-75:
+Error: Unable to publish module '00000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 5 'publish'. lines 77-90:
+Error: Unable to publish module '00000000000000000000000000000001::A'. Got VMError: {
+    major_status: NEGATIVE_STACK_SIZE_WITHIN_BLOCK,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_negative.mvir b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_negative.mvir
new file mode 100644
index 0000000000..3c79aa5384
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_negative.mvir
@@ -0,0 +1,90 @@
+//# publish
+module 0x1.A {
+    three(): u8 * u8{
+    label b0:
+        return 0u8, 255u8;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, extra pop
+        _, _, _  = Self.three();
+        return;
+    }
+}
+
+
+//# publish
+module 0x1.A {
+    three(): u16 * u16{
+    label b0:
+        return 0u16, 65535u16;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, extra pop
+        _, _, _  = Self.three();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    three(): u32 * u32{
+    label b0:
+        return 0u32, 4294967295u32;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, extra pop
+        _, _, _  = Self.three();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    three(): u64 * u64{
+    label b0:
+        return 0u64, 18446744073709551615u64;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, extra pop
+        _, _, _  = Self.three();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    three(): u128 * u128{
+    label b0:
+        return 0u128, 340282366920938463463374607431768211455u128;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, extra pop
+        _, _, _  = Self.three();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    three(): u256 * u256{
+    label b0:
+        return 0u256, 115792089237316195423570985008687907853269984665640564039457584007913129639935u256;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, extra pop
+        _, _, _  = Self.three();
+        return;
+    }
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_positive.exp b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_positive.exp
new file mode 100644
index 0000000000..7ac4a0d57f
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_positive.exp
@@ -0,0 +1,55 @@
+processed 6 tasks
+
+task 0 'publish'. lines 1-14:
+Error: Unable to publish module '00000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 1 'publish'. lines 17-30:
+Error: Unable to publish module '00000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 2 'publish'. lines 32-45:
+Error: Unable to publish module '00000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 3 'publish'. lines 47-60:
+Error: Unable to publish module '00000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 4 'publish'. lines 62-75:
+Error: Unable to publish module '00000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
+
+task 5 'publish'. lines 77-90:
+Error: Unable to publish module '00000000000000000000000000000001::A'. Got VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: 0x1::A,
+    indices: [(FunctionDefinition, 1)],
+    offsets: [(FunctionDefinitionIndex(1), 0)],
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_positive.mvir b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_positive.mvir
new file mode 100644
index 0000000000..d852de8a76
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/integer_stack_positive.mvir
@@ -0,0 +1,90 @@
+//# publish
+module 0x1.A {
+    two(): u8 * u8{
+    label b0:
+        return 0u8, 255u8;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, missing pop
+        _  = Self.two();
+        return;
+    }
+}
+
+
+//# publish
+module 0x1.A {
+    two(): u16 * u16{
+    label b0:
+        return 0u16, 65535u16;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, missing pop
+        _ = Self.two();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    two(): u32 * u32{
+    label b0:
+        return 0u32, 4294967295u32;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, missing pop
+        _ = Self.two();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    two(): u64 * u64{
+    label b0:
+        return 0u64, 18446744073709551615u64;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, missing pop
+        _ = Self.two();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    two(): u128 * u128{
+    label b0:
+        return 0u128, 340282366920938463463374607431768211455u128;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, missing pop
+        _ = Self.two();
+        return;
+    }
+}
+
+//# publish
+module 0x1.A {
+    two(): u256 * u256{
+    label b0:
+        return 0u256, 115792089237316195423570985008687907853269984665640564039457584007913129639935u256;
+    }
+
+    pop() {
+    label b0:
+        // negative stack size, missing pop
+        _ = Self.two();
+        return;
+    }
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/load_positive_stack.exp b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/load_positive_stack.exp
new file mode 100644
index 0000000000..01c291322c
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/load_positive_stack.exp
@@ -0,0 +1,55 @@
+processed 6 tasks
+
+task 0 'run'. lines 1-6:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 1 'run'. lines 8-13:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 2 'run'. lines 15-20:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 3 'run'. lines 22-27:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 4 'run'. lines 29-34:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
+
+task 5 'run'. lines 36-41:
+Error: Script execution failed with VMError: {
+    major_status: POSITIVE_STACK_SIZE_AT_BLOCK_END,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/load_positive_stack.mvir b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/load_positive_stack.mvir
new file mode 100644
index 0000000000..fc903b2d55
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/stack_usage_verifier/load_positive_stack.mvir
@@ -0,0 +1,41 @@
+//# run
+main() {
+label b0:
+    (3u8);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    (3u16);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    (3u32);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    (3u64);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    (3u128);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    (3u256);
+    return;
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/struct_defs/ref_in_struct.exp b/language/move-bytecode-verifier/transactional-tests/tests/struct_defs/ref_in_struct.exp
new file mode 100644
index 0000000000..a8003f372c
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/struct_defs/ref_in_struct.exp
@@ -0,0 +1,37 @@
+processed 4 tasks
+
+task 0 'publish'. lines 1-4:
+Error: Unable to publish module '00000000000000000000000000000042::M1'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x42::M1,
+    indices: [(FieldDefinition, 0), (StructDefinition, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 6-9:
+Error: Unable to publish module '00000000000000000000000000000042::M2'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x42::M2,
+    indices: [(FieldDefinition, 0), (StructDefinition, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 11-14:
+Error: Unable to publish module '00000000000000000000000000000042::M3'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x42::M3,
+    indices: [(FieldDefinition, 0), (StructDefinition, 0)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 16-19:
+Error: Unable to publish module '00000000000000000000000000000042::M4'. Got VMError: {
+    major_status: INVALID_SIGNATURE_TOKEN,
+    sub_status: None,
+    location: 0x42::M4,
+    indices: [(FieldDefinition, 0), (StructDefinition, 0)],
+    offsets: [],
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/struct_defs/ref_in_struct.mvir b/language/move-bytecode-verifier/transactional-tests/tests/struct_defs/ref_in_struct.mvir
new file mode 100644
index 0000000000..94d8606e15
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/struct_defs/ref_in_struct.mvir
@@ -0,0 +1,19 @@
+//# publish
+module 0x42.M1 {
+    struct S { x: &u64 }
+}
+
+//# publish
+module 0x42.M2 {
+    struct S { x: &mut u64 }
+}
+
+//# publish
+module 0x42.M3 {
+    struct S<T> { t: &T }
+}
+
+//# publish
+module 0x42.M4 {
+    struct S<T> { t: &mut T }
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/type_safety/casting_operators_types_mismatch.exp b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/casting_operators_types_mismatch.exp
index d04156a190..7d839a0fce 100644
--- a/language/move-bytecode-verifier/transactional-tests/tests/type_safety/casting_operators_types_mismatch.exp
+++ b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/casting_operators_types_mismatch.exp
@@ -1,4 +1,4 @@
-processed 9 tasks
+processed 18 tasks
 
 task 0 'run'. lines 1-7:
 Error: Script execution failed with VMError: {
@@ -27,7 +27,7 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 3 'run'. lines 25-30:
+task 3 'run'. lines 23-28:
 Error: Script execution failed with VMError: {
     major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
     sub_status: None,
@@ -36,7 +36,7 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 4 'run'. lines 32-37:
+task 4 'run'. lines 30-35:
 Error: Script execution failed with VMError: {
     major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
     sub_status: None,
@@ -45,7 +45,7 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 5 'run'. lines 39-44:
+task 5 'run'. lines 37-42:
 Error: Script execution failed with VMError: {
     major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
     sub_status: None,
@@ -54,7 +54,88 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 6 'publish'. lines 48-56:
+task 6 'run'. lines 45-50:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 7 'run'. lines 52-57:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 8 'run'. lines 59-64:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 9 'run'. lines 66-71:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 10 'run'. lines 73-78:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 11 'run'. lines 80-85:
+Error: Script execution failed with VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 12 'publish'. lines 88-96:
+Error: Unable to publish module '00000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 13 'publish'. lines 98-106:
+Error: Unable to publish module '00000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'publish'. lines 108-116:
+Error: Unable to publish module '00000000000000000000000000000042::M'. Got VMError: {
+    major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'publish'. lines 118-126:
 Error: Unable to publish module '00000000000000000000000000000042::M'. Got VMError: {
     major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
     sub_status: None,
@@ -63,7 +144,7 @@ Error: Unable to publish module '00000000000000000000000000000042::M'. Got VMErr
     offsets: [(FunctionDefinitionIndex(0), 2)],
 }
 
-task 7 'publish'. lines 58-66:
+task 16 'publish'. lines 128-136:
 Error: Unable to publish module '00000000000000000000000000000042::M'. Got VMError: {
     major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
     sub_status: None,
@@ -72,7 +153,7 @@ Error: Unable to publish module '00000000000000000000000000000042::M'. Got VMErr
     offsets: [(FunctionDefinitionIndex(0), 2)],
 }
 
-task 8 'publish'. lines 68-76:
+task 17 'publish'. lines 138-146:
 Error: Unable to publish module '00000000000000000000000000000042::M'. Got VMError: {
     major_status: INTEGER_OP_TYPE_MISMATCH_ERROR,
     sub_status: None,
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/type_safety/casting_operators_types_mismatch.mvir b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/casting_operators_types_mismatch.mvir
index ef3c2853f8..735595ee6f 100644
--- a/language/move-bytecode-verifier/transactional-tests/tests/type_safety/casting_operators_types_mismatch.mvir
+++ b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/casting_operators_types_mismatch.mvir
@@ -20,6 +20,26 @@ label b0:
     return;
 }
 
+//# run
+main() {
+label b0:
+    _ = to_u16(true);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = to_u32(true);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = to_u256(true);
+    return;
+}
 
 
 //# run
@@ -43,6 +63,26 @@ label b0:
     return;
 }
 
+//# run
+main() {
+label b0:
+    _ = to_u16(0x0);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = to_u32(0x0);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = to_u256(0x0);
+    return;
+}
 
 
 //# publish
@@ -74,3 +114,33 @@ module 0x42.M {
         return;
     }
 }
+
+//# publish
+module 0x42.M {
+    struct S { x: bool }
+    f() {
+    label b0:
+        _ = to_u16(S { x: true });
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct S { x: bool }
+    g() {
+    label b0:
+        _ = to_u32(S { x: true });
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    struct S { x: bool }
+    h() {
+    label b0:
+        _ = to_u256(S { x: true });
+        return;
+    }
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/type_safety/integers_valid.exp b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/integers_valid.exp
new file mode 100644
index 0000000000..2301000e50
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/integers_valid.exp
@@ -0,0 +1 @@
+processed 6 tasks
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/type_safety/integers_valid.mvir b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/integers_valid.mvir
new file mode 100644
index 0000000000..3738c081c0
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/integers_valid.mvir
@@ -0,0 +1,125 @@
+//# publish
+module 0x42.tu8 {
+test() {
+let x: u8;
+label l0:
+    x = 0u8;
+    x = 100u8;
+    x = 1u8 + 1u8;
+    x = 1u8 - 1u8;
+    x = 1u8 * 1u8;
+    x = 1u8 / 1u8;
+    x = 1u8 % 1u8;
+    x = 1u8 & 1u8;
+    x = 1u8 | 1u8;
+    x = 1u8 ^ 1u8;
+    x = 1u8 << 1u8;
+    x = 1u8 >> 1u8;
+    return;
+}
+}
+
+//# publish
+module 0x42.tu16 {
+test() {
+let x: u16;
+label l0:
+  x = 0u16;
+  x = 100u16;
+  x = 1u16 + 1u16;
+  x = 1u16 - 1u16;
+  x = 1u16 * 1u16;
+  x = 1u16 / 1u16;
+  x = 1u16 % 1u16;
+  x = 1u16 & 1u16;
+  x = 1u16 | 1u16;
+  x = 1u16 ^ 1u16;
+  x = 1u16 << 1u8;
+  x = 1u16 >> 1u8;
+  return;
+}
+}
+
+//# publish
+module 0x42.tu32 {
+test() {
+let x: u32;
+label l0:
+    x = 0u32;
+    x = 100u32;
+    x = 1u32 + 1u32;
+    x = 1u32 - 1u32;
+    x = 1u32 * 1u32;
+    x = 1u32 / 1u32;
+    x = 1u32 % 1u32;
+    x = 1u32 & 1u32;
+    x = 1u32 | 1u32;
+    x = 1u32 ^ 1u32;
+    x = 1u32 << 1u8;
+    x = 1u32 >> 1u8;
+    return;
+}
+}
+
+//# publish
+module 0x42.tu64 {
+test() {
+let x: u64;
+label l0:
+  x = 0u64;
+  x = 100u64;
+  x = 1u64 + 1u64;
+  x = 1u64 - 1u64;
+  x = 1u64 * 1u64;
+  x = 1u64 / 1u64;
+  x = 1u64 % 1u64;
+  x = 1u64 & 1u64;
+  x = 1u64 | 1u64;
+  x = 1u64 ^ 1u64;
+  x = 1u64 << 1u8;
+  x = 1u64 >> 1u8;
+  return;
+}
+}
+
+//# publish
+module 0x42.tu128 {
+test() {
+let x: u128;
+label l0:
+    x = 0u128;
+    x = 100u128;
+    x = 1u128 + 1u128;
+    x = 1u128 - 1u128;
+    x = 1u128 * 1u128;
+    x = 1u128 / 1u128;
+    x = 1u128 % 1u128;
+    x = 1u128 & 1u128;
+    x = 1u128 | 1u128;
+    x = 1u128 ^ 1u128;
+    x = 1u128 << 1u8;
+    x = 1u128 >> 1u8;
+    return;
+}
+}
+
+//# publish
+module 0x42.tu256 {
+test() {
+let x: u256;
+label l0:
+    x = 0u256;
+    x = 100u256;
+    x = 1u256 + 1u256;
+    x = 1u256 - 1u256;
+    x = 1u256 * 1u256;
+    x = 1u256 / 1u256;
+    x = 1u256 % 1u256;
+    x = 1u256 & 1u256;
+    x = 1u256 | 1u256;
+    x = 1u256 ^ 1u256;
+    x = 1u256 << 1u8;
+    x = 1u256 >> 1u8;
+    return;
+}
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param.exp b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param.exp
new file mode 100644
index 0000000000..7bb3249af0
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param.exp
@@ -0,0 +1,37 @@
+processed 4 tasks
+
+task 0 'publish'. lines 1-10:
+Error: Unable to publish module '00000000000000000000000000000042::M1'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M1,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 12-21:
+Error: Unable to publish module '00000000000000000000000000000042::M2'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M2,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 23-32:
+Error: Unable to publish module '00000000000000000000000000000042::M3'. Got VMError: {
+    major_status: NUMBER_OF_TYPE_ARGUMENTS_MISMATCH,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 3 'publish'. lines 34-44:
+Error: Unable to publish module '00000000000000000000000000000042::M4'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M4,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param.mvir b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param.mvir
new file mode 100644
index 0000000000..c4c7b958ee
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param.mvir
@@ -0,0 +1,44 @@
+//# publish
+module 0x42.M1 {
+    struct S<T: copy> { t: T }
+
+    // should get flagged w/ constraint not satisfied--T does not have copy
+    public bad_sig<T>(s: &Self.S<T>) {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M2 {
+    struct S<T: copy> { t: T }
+
+    // should get flagged w/ constraint not satisfied--T does not have copy
+    public bad_sig<T>(s: &mut Self.S<T>) {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M3 {
+    struct S<T: copy> { t: T }
+
+    // should get flagged--missing type argument
+    public bad_sig<T>(s: &Self.S) {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M4 {
+    struct Box<T> { t: T }
+    struct S<T: copy> { t: T }
+
+    // should be rejected
+    public bad_sig<T>(v: Self.Box<Self.S<T>>): Self.Box<Self.S<T>> {
+    label b0:
+        return move(v);
+    }
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param_exploits.exp b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param_exploits.exp
new file mode 100644
index 0000000000..55ebe6b94c
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param_exploits.exp
@@ -0,0 +1,46 @@
+processed 5 tasks
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '00000000000000000000000000000042::M1'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M1,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 13-23:
+Error: Unable to publish module '00000000000000000000000000000042::M2'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M2,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 25-36:
+Error: Unable to publish module '00000000000000000000000000000042::M3'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M3,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 38-54:
+Error: Unable to publish module '00000000000000000000000000000042::M4'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M4,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 4 'publish'. lines 56-72:
+Error: Unable to publish module '00000000000000000000000000000042::M5'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M5,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param_exploits.mvir b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param_exploits.mvir
new file mode 100644
index 0000000000..0eafaeb052
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param_exploits.mvir
@@ -0,0 +1,72 @@
+//# publish
+module 0x42.M1 {
+    struct S<T: copy> { t: T }
+
+    // note: T does not have copy
+    // if this worked, it would be very bad because `T` can be (e.g.) a Coin
+    public copy_inner<T>(s: &Self.S<T>): T { // should get flagged w/ constraint not satisfied
+    label b0:
+        return *&move(s).S<T>::t;
+    }
+}
+
+//# publish
+module 0x42.M2 {
+    struct S<T: copy> has copy { t: T }
+
+    // note: T does not have copy
+    // if this worked, it would be very bad because `T` can be (e.g.) a Coin
+    public copy_direct<T>(s: &Self.S<T>): Self.S<T> { // should get flagged w/ constraint not satisfied
+    label b0:
+        return *move(s);
+    }
+}
+
+//# publish
+module 0x42.M3 {
+    struct S<T: store> has store { t: T }
+
+    // note: T does not have store
+    // if this worked, it would be very bad because `T` can be (e.g.) a hot potato
+    public store_inner<T>(s: &mut Self.S<T>, t: T) { // should get flagged w/ constraint not satisfied
+    label b0:
+        *&mut move(s).S<T>::t = move(t);
+        return;
+    }
+}
+
+//# publish
+module 0x42.M4 {
+    struct S<T: copy> { t: T }
+
+    public bad_sig<T>(s: &Self.S<T>) { // should get flagged w/ constraint not satisfied
+    label b0:
+        return;
+    }
+
+    public call(): Self.S<u64> {
+    let x: Self.S<u64>;
+    label b0:
+        x = S<u64> { t: 10 };
+        Self.bad_sig(&x);
+        return move(x);
+    }
+}
+
+//# publish
+module 0x42.M5 {
+    struct S<T: copy> { t: T }
+
+    public bad_sig<T>(s: &Self.S<T>) { // should get flagged w/ constraint not satisfied
+    label b0:
+        return;
+    }
+
+    public call(s: signer): Self.S<signer> {
+    let x: Self.S<signer>;
+    label b0:
+        x = S<u64> { t: move(s) };
+        Self.bad_sig(&x);
+        return move(x);
+    }
+}
diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.compile b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param_explots.exp
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.compile
rename to language/move-bytecode-verifier/transactional-tests/tests/type_safety/ref_type_param_explots.exp
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_ops_type_mismatch.exp b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_ops_type_mismatch.exp
index 55f5e1b257..375939935e 100644
--- a/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_ops_type_mismatch.exp
+++ b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_ops_type_mismatch.exp
@@ -1,4 +1,4 @@
-processed 6 tasks
+processed 8 tasks
 
 task 0 'run'. lines 1-7:
 Error: Script execution failed with VMError: {
@@ -45,7 +45,7 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 6)],
 }
 
-task 5 'run'. lines 61-75:
+task 5 'run'. lines 61-77:
 Error: Script execution failed with VMError: {
     major_status: STLOC_TYPE_MISMATCH_ERROR,
     sub_status: None,
@@ -53,3 +53,21 @@ Error: Script execution failed with VMError: {
     indices: [],
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
+
+task 6 'run'. lines 78-86:
+Error: Script execution failed with VMError: {
+    major_status: TYPE_MISMATCH,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 7 'run'. lines 87-96:
+Error: Script execution failed with VMError: {
+    major_status: TYPE_MISMATCH,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_ops_type_mismatch.mvir b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_ops_type_mismatch.mvir
index f867610846..2c991021a3 100644
--- a/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_ops_type_mismatch.mvir
+++ b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_ops_type_mismatch.mvir
@@ -73,3 +73,24 @@ label b0:
 
     return;
 }
+
+// push int on the stack, then try to pack into vector of the wrong type
+//# run
+main() {
+    let v: vector<bool>;
+label b0:
+    v = vec_pack_1<bool>(28u8);
+    return;
+}
+
+// create vector<T>, try to unpack into different type
+//# run
+main() {
+    let v: vector<u8>;
+    let x: bool;
+    let y: bool;
+label b0:
+    v = vec_pack_2<u8>(1u8, 0u8);
+    x, y = vec_unpack_2<bool>(move(v));
+    return;
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_type_param.exp b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_type_param.exp
new file mode 100644
index 0000000000..9311643175
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_type_param.exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'publish'. lines 1-10:
+Error: Unable to publish module '00000000000000000000000000000042::M1'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M1,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 12-21:
+Error: Unable to publish module '00000000000000000000000000000042::M2'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M2,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 23-32:
+Error: Unable to publish module '00000000000000000000000000000042::M3'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M3,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_type_param.mvir b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_type_param.mvir
new file mode 100644
index 0000000000..4568022f97
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_type_param.mvir
@@ -0,0 +1,32 @@
+//# publish
+module 0x42.M1 {
+    struct S<T: copy> { t: T }
+
+    // should get flagged w/ constraint not satisfied--T does not have copy
+    public bad_sig<T>(v: vector<Self.S<T>>): vector<Self.S<T>> {
+    label b0:
+        return move(v);
+    }
+}
+
+//# publish
+module 0x42.M2 {
+    struct S<T: copy> { t: T }
+
+    // should get flagged w/ constraint not satisfied--T does not have copy
+    public bad_sig<T>(v: &vector<Self.S<T>>) {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M3 {
+    struct S<T: copy> { t: T }
+
+    // should get flagged w/ constraint not satisfied--T does not have copy
+    public bad_sig<T>(v: &mut vector<Self.S<T>>) {
+    label b0:
+        return;
+    }
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_type_param_exploits.exp b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_type_param_exploits.exp
new file mode 100644
index 0000000000..b0d408c1db
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_type_param_exploits.exp
@@ -0,0 +1,37 @@
+processed 4 tasks
+
+task 0 'publish'. lines 1-11:
+Error: Unable to publish module '00000000000000000000000000000042::M1'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M1,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 1 'publish'. lines 13-22:
+Error: Unable to publish module '00000000000000000000000000000042::M2'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M2,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 2 'publish'. lines 24-40:
+Error: Unable to publish module '00000000000000000000000000000042::M3'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M3,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
+
+task 3 'publish'. lines 42-58:
+Error: Unable to publish module '00000000000000000000000000000042::M4'. Got VMError: {
+    major_status: CONSTRAINT_NOT_SATISFIED,
+    sub_status: None,
+    location: 0x42::M4,
+    indices: [(Signature, 0), (FunctionHandle, 0)],
+    offsets: [],
+}
diff --git a/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_type_param_exploits.mvir b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_type_param_exploits.mvir
new file mode 100644
index 0000000000..85de858a94
--- /dev/null
+++ b/language/move-bytecode-verifier/transactional-tests/tests/type_safety/vector_type_param_exploits.mvir
@@ -0,0 +1,58 @@
+//# publish
+module 0x42.M1 {
+    struct S<T: copy + drop> has copy, drop { t: T }
+
+    // it would be bad if this worked because T could be (e.g.) a coin
+    // should get flagged w/ constraint not satisfied--T does not have copy
+    public bad_sig<T>(v: vector<Self.S<T>>): vector<Self.S<T>> {
+    label b0:
+        return copy(v);
+    }
+}
+
+//# publish
+module 0x42.M2 {
+    struct S<T: drop> has drop { t: T }
+
+    // it would be bad if this worked because T could be (e.g.) a hot potato
+    public bad_sig<T>(v: vector<Self.S<T>>) {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M3 {
+    struct S<T: copy> { t: T }
+
+    public bad_sig<T>(s: vector<Self.S<T>>) { // should get flagged w/ constraint not satisfied
+    label b0:
+        return;
+    }
+
+    public call(): vector<Self.S<u64>> {
+    let x: vector<Self.S<u64>>;
+    label b0:
+        x = vec_pack_0<Self.S<u64>>();
+        Self.bad_sig(&x);
+        return move(x);
+    }
+}
+
+//# publish
+module 0x42.M4 {
+    struct S<T: copy> { t: T }
+
+    public bad_sig<T>(s: vector<Self.S<T>>) { // should get flagged w/ constraint not satisfied
+    label b0:
+        return;
+    }
+
+    public call(): vector<Self.S<signer>> {
+    let x: vector<Self.S<signer>>;
+    label b0:
+        x = vec_pack_0<Self.S<signer>>();
+        Self.bad_sig(&x);
+        return move(x);
+    }
+}
diff --git a/language/move-command-line-common/Cargo.toml b/language/move-command-line-common/Cargo.toml
index b46997d364..4fb12ae3a1 100644
--- a/language/move-command-line-common/Cargo.toml
+++ b/language/move-command-line-common/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
@@ -16,6 +16,8 @@ walkdir = "2.3.1"
 sha2 = "0.9.3"
 hex = "0.4.3"
 num-bigint = "0.4.0"
+once_cell = "1.7.2"
 serde = { version = "1.0.124", features = ["derive"] }
+dirs-next = "2.0.0"
 
 move-core-types = { path = "../move-core/types" }
diff --git a/language/move-command-line-common/src/env.rs b/language/move-command-line-common/src/env.rs
index 888a01cca3..f4a433a16b 100644
--- a/language/move-command-line-common/src/env.rs
+++ b/language/move-command-line-common/src/env.rs
@@ -2,16 +2,24 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use once_cell::sync::Lazy;
+
 /// An environment variable which can be set to cause the move compiler to generate
 /// file formats at a given version. Only version v5 and greater are supported.
 const BYTECODE_VERSION_ENV_VAR: &str = "MOVE_BYTECODE_VERSION";
 
 /// Get the bytecode version from the environment variable.
 // TODO: This should be configurable via toml and command line flags. See also #129.
-pub fn get_bytecode_version_from_env() -> Option<u32> {
-    std::env::var(BYTECODE_VERSION_ENV_VAR)
-        .ok()
-        .and_then(|s| s.parse::<u32>().ok())
+pub fn get_bytecode_version_from_env(from_input: Option<u32>) -> Option<u32> {
+    // This allows for bytecode version to come from command line flags and
+    // other input locations, falls back to bytecode version if not provided
+    if from_input.is_some() {
+        from_input
+    } else {
+        std::env::var(BYTECODE_VERSION_ENV_VAR)
+            .ok()
+            .and_then(|s| s.parse::<u32>().ok())
+    }
 }
 
 pub fn read_env_var(v: &str) -> String {
@@ -22,3 +30,15 @@ pub fn read_bool_env_var(v: &str) -> bool {
     let val = read_env_var(v).to_lowercase();
     val.parse::<bool>() == Ok(true) || val.parse::<usize>() == Ok(1)
 }
+
+pub static MOVE_HOME: Lazy<String> = Lazy::new(|| {
+    std::env::var("MOVE_HOME").unwrap_or_else(|_| {
+        format!(
+            "{}/.move",
+            dirs_next::home_dir()
+                .expect("user's home directory not found")
+                .to_str()
+                .unwrap()
+        )
+    })
+});
diff --git a/language/move-command-line-common/src/parser.rs b/language/move-command-line-common/src/parser.rs
index 8062e56809..9bde26e52e 100644
--- a/language/move-command-line-common/src/parser.rs
+++ b/language/move-command-line-common/src/parser.rs
@@ -1,16 +1,18 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use anyhow::{anyhow, bail, Result};
-use move_core_types::account_address::AccountAddress;
-use num_bigint::BigUint;
-use std::{collections::BTreeMap, fmt::Display, iter::Peekable, num::ParseIntError};
-
 use crate::{
     address::{NumericalAddress, ParsedAddress},
     types::{ParsedStructType, ParsedType, TypeToken},
     values::{ParsableValue, ParsedValue, ValueToken},
 };
+use anyhow::{anyhow, bail, Result};
+use move_core_types::{
+    account_address::AccountAddress,
+    u256::{U256FromStrError, U256},
+};
+use num_bigint::BigUint;
+use std::{collections::BTreeMap, fmt::Display, iter::Peekable, num::ParseIntError};
 
 pub trait Token: Display + Copy + Eq {
     fn is_whitespace(&self) -> bool;
@@ -133,8 +135,11 @@ impl<'a, I: Iterator<Item = (TypeToken, &'a str)>> Parser<'a, TypeToken, I> {
         let (tok, contents) = self.advance_any()?;
         Ok(match (tok, contents) {
             (TypeToken::Ident, "u8") => ParsedType::U8,
+            (TypeToken::Ident, "u16") => ParsedType::U16,
+            (TypeToken::Ident, "u32") => ParsedType::U32,
             (TypeToken::Ident, "u64") => ParsedType::U64,
             (TypeToken::Ident, "u128") => ParsedType::U128,
+            (TypeToken::Ident, "u256") => ParsedType::U256,
             (TypeToken::Ident, "bool") => ParsedType::Bool,
             (TypeToken::Ident, "address") => ParsedType::Address,
             (TypeToken::Ident, "signer") => ParsedType::Signer,
@@ -189,19 +194,28 @@ impl<'a, I: Iterator<Item = (ValueToken, &'a str)>> Parser<'a, ValueToken, I> {
         let (tok, contents) = self.advance_any()?;
         Ok(match tok {
             ValueToken::Number if !matches!(self.peek_tok(), Some(ValueToken::ColonColon)) => {
-                let (u, _) = parse_u128(contents)?;
+                let (u, _) = parse_u256(contents)?;
                 ParsedValue::InferredNum(u)
             }
             ValueToken::NumberTyped => {
                 if let Some(s) = contents.strip_suffix("u8") {
                     let (u, _) = parse_u8(s)?;
                     ParsedValue::U8(u)
+                } else if let Some(s) = contents.strip_suffix("u16") {
+                    let (u, _) = parse_u16(s)?;
+                    ParsedValue::U16(u)
+                } else if let Some(s) = contents.strip_suffix("u32") {
+                    let (u, _) = parse_u32(s)?;
+                    ParsedValue::U32(u)
                 } else if let Some(s) = contents.strip_suffix("u64") {
                     let (u, _) = parse_u64(s)?;
                     ParsedValue::U64(u)
-                } else {
-                    let (u, _) = parse_u128(contents.strip_suffix("u128").unwrap())?;
+                } else if let Some(s) = contents.strip_suffix("u128") {
+                    let (u, _) = parse_u128(s)?;
                     ParsedValue::U128(u)
+                } else {
+                    let (u, _) = parse_u256(contents.strip_suffix("u256").unwrap())?;
+                    ParsedValue::U256(u)
                 }
             }
             ValueToken::True => ParsedValue::Bool(true),
@@ -211,7 +225,7 @@ impl<'a, I: Iterator<Item = (ValueToken, &'a str)>> Parser<'a, ValueToken, I> {
                 let contents = contents
                     .strip_prefix("b\"")
                     .unwrap()
-                    .strip_suffix("\"")
+                    .strip_suffix('\"')
                     .unwrap();
                 ParsedValue::Vector(
                     contents
@@ -226,7 +240,7 @@ impl<'a, I: Iterator<Item = (ValueToken, &'a str)>> Parser<'a, ValueToken, I> {
                 let contents = contents
                     .strip_prefix("x\"")
                     .unwrap()
-                    .strip_suffix("\"")
+                    .strip_suffix('\"')
                     .unwrap()
                     .to_ascii_lowercase();
                 ParsedValue::Vector(
@@ -237,6 +251,21 @@ impl<'a, I: Iterator<Item = (ValueToken, &'a str)>> Parser<'a, ValueToken, I> {
                         .collect(),
                 )
             }
+            ValueToken::Utf8String => {
+                let contents = contents
+                    .strip_prefix('\"')
+                    .unwrap()
+                    .strip_suffix('\"')
+                    .unwrap();
+                ParsedValue::Vector(
+                    contents
+                        .as_bytes()
+                        .iter()
+                        .copied()
+                        .map(ParsedValue::U8)
+                        .collect(),
+                )
+            }
 
             ValueToken::AtSign => ParsedValue::Address(self.parse_address()?),
 
@@ -326,19 +355,55 @@ pub(crate) fn determine_num_text_and_base(s: &str) -> (&str, NumberFormat) {
 // Parse a u8 from a decimal or hex encoding
 pub fn parse_u8(s: &str) -> Result<(u8, NumberFormat), ParseIntError> {
     let (txt, base) = determine_num_text_and_base(s);
-    Ok((u8::from_str_radix(txt, base as u32)?, base))
+    Ok((
+        u8::from_str_radix(&txt.replace('_', ""), base as u32)?,
+        base,
+    ))
+}
+
+// Parse a u16 from a decimal or hex encoding
+pub fn parse_u16(s: &str) -> Result<(u16, NumberFormat), ParseIntError> {
+    let (txt, base) = determine_num_text_and_base(s);
+    Ok((
+        u16::from_str_radix(&txt.replace('_', ""), base as u32)?,
+        base,
+    ))
+}
+
+// Parse a u32 from a decimal or hex encoding
+pub fn parse_u32(s: &str) -> Result<(u32, NumberFormat), ParseIntError> {
+    let (txt, base) = determine_num_text_and_base(s);
+    Ok((
+        u32::from_str_radix(&txt.replace('_', ""), base as u32)?,
+        base,
+    ))
 }
 
 // Parse a u64 from a decimal or hex encoding
 pub fn parse_u64(s: &str) -> Result<(u64, NumberFormat), ParseIntError> {
     let (txt, base) = determine_num_text_and_base(s);
-    Ok((u64::from_str_radix(txt, base as u32)?, base))
+    Ok((
+        u64::from_str_radix(&txt.replace('_', ""), base as u32)?,
+        base,
+    ))
 }
 
 // Parse a u128 from a decimal or hex encoding
 pub fn parse_u128(s: &str) -> Result<(u128, NumberFormat), ParseIntError> {
     let (txt, base) = determine_num_text_and_base(s);
-    Ok((u128::from_str_radix(txt, base as u32)?, base))
+    Ok((
+        u128::from_str_radix(&txt.replace('_', ""), base as u32)?,
+        base,
+    ))
+}
+
+// Parse a u256 from a decimal or hex encoding
+pub fn parse_u256(s: &str) -> Result<(U256, NumberFormat), U256FromStrError> {
+    let (txt, base) = determine_num_text_and_base(s);
+    Ok((
+        U256::from_str_radix(&txt.replace('_', ""), base as u32)?,
+        base,
+    ))
 }
 
 // Parse an address from a decimal or hex encoding
@@ -367,7 +432,7 @@ mod tests {
         types::{ParsedStructType, ParsedType},
         values::ParsedValue,
     };
-    use move_core_types::account_address::AccountAddress;
+    use move_core_types::{account_address::AccountAddress, u256::U256};
 
     #[allow(clippy::unreadable_literal)]
     #[test]
@@ -376,15 +441,34 @@ mod tests {
         let cases: &[(&str, V)] = &[
             ("  0u8", V::U8(0)),
             ("0u8", V::U8(0)),
+            ("0xF_Fu8", V::U8(255)),
+            ("0xF__FF__Eu16", V::U16(u16::MAX - 1)),
+            ("0xFFF_FF__FF_Cu32", V::U32(u32::MAX - 3)),
             ("255u8", V::U8(255)),
-            ("0", V::InferredNum(0)),
-            ("0123", V::InferredNum(123)),
-            ("0xFF", V::InferredNum(0xFF)),
+            ("255u256", V::U256(U256::from(255u64))),
+            ("0", V::InferredNum(U256::from(0u64))),
+            ("0123", V::InferredNum(U256::from(123u64))),
+            ("0xFF", V::InferredNum(U256::from(0xFFu64))),
+            ("0xF_F", V::InferredNum(U256::from(0xFFu64))),
+            ("0xFF__", V::InferredNum(U256::from(0xFFu64))),
+            (
+                "0x12_34__ABCD_FF",
+                V::InferredNum(U256::from(0x1234ABCDFFu64)),
+            ),
             ("0u64", V::U64(0)),
             ("0x0u64", V::U64(0)),
-            ("18446744073709551615", V::InferredNum(18446744073709551615)),
+            (
+                "18446744073709551615",
+                V::InferredNum(U256::from(18446744073709551615u128)),
+            ),
             ("18446744073709551615u64", V::U64(18446744073709551615)),
             ("0u128", V::U128(0)),
+            ("1_0u8", V::U8(1_0)),
+            ("10_u8", V::U8(10)),
+            ("1_000u64", V::U64(1_000)),
+            ("1_000", V::InferredNum(U256::from(1_000u32))),
+            ("1_0_0_0u64", V::U64(1_000)),
+            ("1_000_000u128", V::U128(1_000_000)),
             (
                 "340282366920938463463374607431768211455u128",
                 V::U128(340282366920938463463374607431768211455),
@@ -438,22 +522,36 @@ mod tests {
 
     #[test]
     fn tests_parse_value_negative() {
-        for s in &[
+        /// Test cases for the parser that should always fail.
+        const PARSE_VALUE_NEGATIVE_TEST_CASES: &[&str] = &[
             "-3",
             "0u42",
             "0u645",
             "0u64x",
             "0u6 4",
             "0u",
+            "_10",
+            "_10_u8",
+            "_10__u8",
+            "10_u8__",
+            "0xFF_u8_",
+            "0xF_u8__",
+            "0x_F_u8__",
+            "_",
+            "__",
+            "__4",
+            "_u8",
+            "5_bool",
             "256u8",
+            "4294967296u32",
+            "65536u16",
             "18446744073709551616u64",
             "340282366920938463463374607431768211456u128",
+            "340282366920938463463374607431768211456340282366920938463463374607431768211456340282366920938463463374607431768211456340282366920938463463374607431768211456u256",
             "0xg",
             "0x00g0",
             "0x",
             "0x_",
-            "0XFF",
-            "0X0",
             "",
             "@@",
             "()",
@@ -467,7 +565,11 @@ mod tests {
             "3false",
             "3 false",
             "",
-        ] {
+            "0XFF",
+            "0X0",
+        ];
+
+        for s in PARSE_VALUE_NEGATIVE_TEST_CASES {
             assert!(
                 ParsedValue::<()>::parse(s).is_err(),
                 "Unexpectedly succeeded in parsing: {}",
@@ -512,8 +614,11 @@ mod tests {
             "0x1::Foo::Foo<0x1::ABC::ABC>",
             "0x1::Foo::Foo<0x1::ABC::ABC_Type>",
             "0x1::Foo::Foo<u8>",
+            "0x1::Foo::Foo<u16>",
+            "0x1::Foo::Foo<u32>",
             "0x1::Foo::Foo<u64>",
             "0x1::Foo::Foo<u128>",
+            "0x1::Foo::Foo<u256>",
             "0x1::Foo::Foo<bool>",
             "0x1::Foo::Foo<address>",
             "0x1::Foo::Foo<signer>",
diff --git a/language/move-command-line-common/src/types.rs b/language/move-command-line-common/src/types.rs
index d6ec68d836..af67e687d5 100644
--- a/language/move-command-line-common/src/types.rs
+++ b/language/move-command-line-common/src/types.rs
@@ -34,8 +34,11 @@ pub struct ParsedStructType {
 #[derive(Eq, PartialEq, Debug, Clone)]
 pub enum ParsedType {
     U8,
+    U16,
+    U32,
     U64,
     U128,
+    U256,
     Bool,
     Address,
     Signer,
@@ -81,9 +84,11 @@ impl Token for TypeToken {
             '0' if matches!(chars.peek(), Some('x') | Some('X')) => {
                 chars.next().unwrap();
                 match chars.next() {
-                    Some(c) if c.is_ascii_hexdigit() => {
+                    Some(c) if c.is_ascii_hexdigit() || c == '_' => {
                         // 0x + c + remaining
-                        let len = 3 + chars.take_while(char::is_ascii_hexdigit).count();
+                        let len = 3 + chars
+                            .take_while(|q| char::is_ascii_hexdigit(q) || *q == '_')
+                            .count();
                         (Self::AddressIdent, len)
                     }
                     _ => bail!("unrecognized token: {}", s),
@@ -141,13 +146,16 @@ impl ParsedType {
     ) -> anyhow::Result<TypeTag> {
         Ok(match self {
             ParsedType::U8 => TypeTag::U8,
+            ParsedType::U16 => TypeTag::U16,
+            ParsedType::U32 => TypeTag::U32,
             ParsedType::U64 => TypeTag::U64,
             ParsedType::U128 => TypeTag::U128,
+            ParsedType::U256 => TypeTag::U256,
             ParsedType::Bool => TypeTag::Bool,
             ParsedType::Address => TypeTag::Address,
             ParsedType::Signer => TypeTag::Signer,
             ParsedType::Vector(inner) => TypeTag::Vector(Box::new(inner.into_type_tag(mapping)?)),
-            ParsedType::Struct(s) => TypeTag::Struct(s.into_struct_tag(mapping)?),
+            ParsedType::Struct(s) => TypeTag::Struct(Box::new(s.into_struct_tag(mapping)?)),
         })
     }
 }
diff --git a/language/move-command-line-common/src/values.rs b/language/move-command-line-common/src/values.rs
index 60a4dc02ed..f319f4d68c 100644
--- a/language/move-command-line-common/src/values.rs
+++ b/language/move-command-line-common/src/values.rs
@@ -24,6 +24,7 @@ pub enum ValueToken {
     False,
     ByteString,
     HexString,
+    Utf8String,
     Ident,
     AtSign,
     LBrace,
@@ -41,10 +42,13 @@ pub enum ValueToken {
 #[derive(Eq, PartialEq, Debug, Clone)]
 pub enum ParsedValue<Extra: ParsableValue = ()> {
     Address(ParsedAddress),
-    InferredNum(u128),
+    InferredNum(move_core_types::u256::U256),
     U8(u8),
+    U16(u16),
+    U32(u32),
     U64(u64),
     U128(u128),
+    U256(move_core_types::u256::U256),
     Bool(bool),
     Vector(Vec<ParsedValue<Extra>>),
     Struct(
@@ -120,6 +124,7 @@ impl Display for ValueToken {
             ValueToken::True => "true",
             ValueToken::False => "false",
             ValueToken::ByteString => "[byte string]",
+            ValueToken::Utf8String => "[utf8 string]",
             ValueToken::HexString => "[hex string]",
             ValueToken::Whitespace => "[whitespace]",
             ValueToken::Ident => "[identifier]",
@@ -148,9 +153,10 @@ impl Token for ValueToken {
             let rest = &text[num_text_len..];
             if rest.starts_with("u8") {
                 (ValueToken::NumberTyped, num_text_len + 2)
-            } else if rest.starts_with("u64") {
+            } else if rest.starts_with("u64") || rest.starts_with("u16") || rest.starts_with("u32")
+            {
                 (ValueToken::NumberTyped, num_text_len + 3)
-            } else if rest.starts_with("u128") {
+            } else if rest.starts_with("u128") || rest.starts_with("u256") {
                 (ValueToken::NumberTyped, num_text_len + 4)
             } else {
                 // No typed suffix
@@ -184,7 +190,9 @@ impl Token for ValueToken {
                 chars.next().unwrap();
                 match chars.next() {
                     Some(c) if c.is_ascii_hexdigit() => {
-                        let len = 3 + chars.take_while(char::is_ascii_hexdigit).count();
+                        let len = 3 + chars
+                            .take_while(|c| char::is_ascii_hexdigit(c) || *c == '_')
+                            .count();
                         number_maybe_with_suffix(s, len)
                     }
                     _ => bail!("unrecognized token: {}", s),
@@ -242,9 +250,34 @@ impl Token for ValueToken {
                 }
                 (ValueToken::HexString, len)
             }
+            '"' => {
+                // there is no need to check if a given char is valid UTF8 as it is already
+                // guaranteed; from the Rust docs
+                // (https://doc.rust-lang.org/std/primitive.char.html): "char values are USVs and
+                // str values are valid UTF-8, it is safe to store any char in a str or read any
+                // character from a str as a char"; this means that while not every char is valid
+                // UTF8, those stored in &str are
+                let end_quote_byte_offset = match s[1..].find('"') {
+                    Some(o) => o,
+                    None => bail!("Unexpected end of string before end quote: {}", s),
+                };
+                // the length of the token (which we need in bytes rather than chars as s is sliced
+                // in parser and slicing str uses byte indexes) is the same as position of the
+                // ending double quote (in the whole string) plus 1
+                let len = s[..1].len() + end_quote_byte_offset + 1;
+                if s[..len].chars().any(|c| c == '\\') {
+                    bail!(
+                        "Escape characters not yet supported in utf8 string: {}",
+                        &s[..len]
+                    )
+                }
+                (ValueToken::Utf8String, len)
+            }
             c if c.is_ascii_digit() => {
                 // c + remaining
-                let len = 1 + chars.take_while(char::is_ascii_digit).count();
+                let len = 1 + chars
+                    .take_while(|c| char::is_ascii_digit(c) || *c == '_')
+                    .count();
                 number_maybe_with_suffix(s, len)
             }
             c if c.is_ascii_whitespace() => {
@@ -275,12 +308,15 @@ impl<Extra: ParsableValue> ParsedValue<Extra> {
                 a.into_account_address(mapping)?,
             )),
             ParsedValue::U8(u) => Extra::move_value_into_concrete(MoveValue::U8(u)),
+            ParsedValue::U16(u) => Extra::move_value_into_concrete(MoveValue::U16(u)),
+            ParsedValue::U32(u) => Extra::move_value_into_concrete(MoveValue::U32(u)),
             ParsedValue::U64(u) => Extra::move_value_into_concrete(MoveValue::U64(u)),
-            ParsedValue::InferredNum(u) if u <= (u64::MAX as u128) => {
-                Extra::move_value_into_concrete(MoveValue::U64(u as u64))
+            ParsedValue::InferredNum(u) if u <= (u64::MAX.into()) => {
+                Extra::move_value_into_concrete(MoveValue::U64(u.try_into()?))
             }
-            ParsedValue::InferredNum(u) | ParsedValue::U128(u) => {
-                Extra::move_value_into_concrete(MoveValue::U128(u))
+            ParsedValue::U128(u) => Extra::move_value_into_concrete(MoveValue::U128(u)),
+            ParsedValue::InferredNum(u) | ParsedValue::U256(u) => {
+                Extra::move_value_into_concrete(MoveValue::U256(u))
             }
             ParsedValue::Bool(b) => Extra::move_value_into_concrete(MoveValue::Bool(b)),
             ParsedValue::Vector(values) => Extra::concrete_vector(
diff --git a/language/move-compiler/Cargo.toml b/language/move-compiler/Cargo.toml
index 320cfdc27f..e84b44da13 100644
--- a/language/move-compiler/Cargo.toml
+++ b/language/move-compiler/Cargo.toml
@@ -4,14 +4,14 @@ version = "0.0.1"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "The definition of the Move source language, and its compiler"
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
 anyhow = "1.0.52"
 codespan-reporting = "0.11.1"
 hex = "0.4.3"
-regex = "1.4.3"
+regex = "1.5.5"
 clap = { version = "3.1.8", features = ["derive"] }
 difference = "2.0.0"
 petgraph = "0.5.1"
@@ -21,6 +21,8 @@ once_cell = "1.7.2"
 num-bigint = "0.4.0"
 sha3 = "0.9.1"
 
+bcs.workspace = true
+
 move-binary-format = { path = "../move-binary-format" }
 move-core-types = { path = "../move-core/types" }
 move-bytecode-verifier = { path = "../move-bytecode-verifier" }
@@ -29,7 +31,6 @@ move-ir-types = { path = "../move-ir/types" }
 move-ir-to-bytecode = { path = "../move-ir-compiler/move-ir-to-bytecode" }
 move-borrow-graph = { path = "../move-borrow-graph" }
 move-bytecode-source-map = { path = "../move-ir-compiler/move-bytecode-source-map" }
-bcs = "0.1.2"
 move-command-line-common = { path = "../move-command-line-common" }
 
 [dev-dependencies]
@@ -39,3 +40,7 @@ datatest-stable = "0.1.1"
 [[test]]
 name = "move_check_testsuite"
 harness = false
+
+[features]
+address20 = ["move-core-types/address20"]
+address32 = ["move-core-types/address32"]
diff --git a/language/move-compiler/src/attr_derivation/async_deriver.rs b/language/move-compiler/src/attr_derivation/async_deriver.rs
index 7a4bd06f39..4d5feb96c5 100644
--- a/language/move-compiler/src/attr_derivation/async_deriver.rs
+++ b/language/move-compiler/src/attr_derivation/async_deriver.rs
@@ -5,12 +5,12 @@
 use crate::{
     attr_derivation::{
         find_attr_slice, new_borrow_exp, new_call_exp, new_full_name, new_fun, new_simple_name_exp,
-        new_simple_type, new_u64, new_var,
+        new_simple_type, new_struct, new_u64, new_var,
     },
     diag,
     parser::ast::{
-        Definition, Exp, Exp_, Function, FunctionName, LeadingNameAccess_, ModuleDefinition,
-        ModuleMember, NameAccessChain_, StructName, Type, Type_, Visibility,
+        Definition, Exp, Exp_, Field, Function, FunctionName, LeadingNameAccess_, ModuleDefinition,
+        ModuleMember, NameAccessChain_, StructFields, StructName, Type, Type_, Visibility,
     },
     shared::{CompilationEnv, NamedAddressMap},
 };
@@ -50,6 +50,7 @@ fn derive_module_for_async(
 
     // Go over the functions marked as #[message]
     let mut new_funs = vec![];
+    let mut new_structs = vec![];
     for mem in &mod_def.members {
         if let ModuleMember::Function(fun_def) = mem {
             if let Some(attr) = find_attr_slice(&fun_def.attributes, MESSAGE_ATTR) {
@@ -61,6 +62,7 @@ fn derive_module_for_async(
                 // Replace the first parameter which is a reference to the actor state with an
                 // actor address.
                 let mut sign = fun_def.signature.clone();
+                let mut fields = vec![];
                 if sign.parameters.is_empty() {
                     env.add_diag(diag!(
                         Derivation::DeriveFailed,
@@ -76,6 +78,10 @@ fn derive_module_for_async(
                     new_var(loc, "actor"),
                     new_simple_type(loc, "address", vec![]),
                 );
+                fields.push((
+                    Field(sp(loc, Symbol::from("actor"))),
+                    new_simple_type(loc, "address", vec![]),
+                ));
 
                 // Create a call `Actor::send__<N>(actor, message_hash, BCS::to_bytes(&arg1), ..)`.
                 let param_count = sign.parameters.len() - 1;
@@ -93,6 +99,11 @@ fn derive_module_for_async(
                 }
                 let mut args = vec![new_simple_name_exp(loc, sp(loc, Symbol::from("actor")))];
                 args.push(message_hash(env, address_map, loc, mod_def, fun_def));
+                fields.push((
+                    Field(sp(loc, Symbol::from("message_hash"))),
+                    new_simple_type(loc, "u64", vec![]),
+                ));
+
                 for i in 0..param_count {
                     let name_exp = new_simple_name_exp(loc, sign.parameters[i + 1].0 .0);
                     args.push(new_call_exp(
@@ -100,6 +111,9 @@ fn derive_module_for_async(
                         new_full_name(loc, "std", "bcs", "to_bytes"),
                         vec![new_borrow_exp(loc, name_exp)],
                     ));
+                    let var = &sign.parameters[i + 1].0;
+                    let ty = &sign.parameters[i + 1].1;
+                    fields.push((Field(sp(loc, var.0.value)), ty.clone()));
                 }
                 let internal_send_name = format!("send__{}", param_count);
                 let send_call = new_call_exp(
@@ -117,12 +131,23 @@ fn derive_module_for_async(
                     sign,
                     send_call,
                 ));
+
+                let mut struct_name = fun_def.name.to_string();
+                struct_name.replace_range(0..1, &struct_name[0..1].to_uppercase());
+                new_structs.push(new_struct(
+                    loc,
+                    StructName(sp(loc, Symbol::from(struct_name))),
+                    StructFields::Defined(fields),
+                ));
             }
         }
     }
     for fun_def in new_funs {
         mod_def.members.push(ModuleMember::Function(fun_def))
     }
+    for st_def in new_structs {
+        mod_def.members.push(ModuleMember::Struct(st_def))
+    }
 }
 
 fn check_state(env: &mut CompilationEnv, mod_def: &ModuleDefinition) -> Option<StructName> {
diff --git a/language/move-compiler/src/attr_derivation/mod.rs b/language/move-compiler/src/attr_derivation/mod.rs
index 3b85b044ed..3b1e65bafa 100644
--- a/language/move-compiler/src/attr_derivation/mod.rs
+++ b/language/move-compiler/src/attr_derivation/mod.rs
@@ -10,7 +10,8 @@ use crate::{
     parser::ast::{
         Attribute, AttributeValue, Attribute_, Attributes, Definition, Exp, Exp_, Function,
         FunctionBody_, FunctionName, FunctionSignature, LeadingNameAccess_, NameAccessChain,
-        NameAccessChain_, Type, Type_, Value_, Var, Visibility,
+        NameAccessChain_, StructDefinition, StructFields, StructName, Type, Type_, Value_, Var,
+        Visibility,
     },
     shared::{CompilationEnv, Name, NamedAddressMap},
 };
@@ -21,6 +22,8 @@ mod evm_deriver;
 const EVM_FLAVOR: &str = "evm";
 const ASYNC_FLAVOR: &str = "async";
 
+const EVENT_ATTR: &str = "event";
+
 /// Entry point for deriving definitions from attributes for the given module. Depending on the
 /// flavor specified via the flags, this is dispatching to the according attribute processor.
 pub fn derive_from_attributes(
@@ -72,7 +75,7 @@ pub fn attr_params(attr: &Attribute) -> Vec<&Attribute> {
 pub fn attr_value(attr: &Attribute) -> Option<(&Name, Option<&AttributeValue>)> {
     match &attr.value {
         Attribute_::Name(n) => Some((n, None)),
-        Attribute_::Assigned(n, v) => Some((n, Some(&*v))),
+        Attribute_::Assigned(n, v) => Some((n, Some(v))),
         _ => None,
     }
 }
@@ -133,6 +136,22 @@ pub fn new_fun(
     }
 }
 
+/// Helper to create a new struct declaration.
+pub fn new_struct(loc: Loc, name: StructName, fields: StructFields) -> StructDefinition {
+    StructDefinition {
+        attributes: vec![sp(
+            // #[event]
+            loc,
+            vec![new_attr(loc, EVENT_ATTR, vec![])],
+        )],
+        loc,
+        abilities: vec![],
+        name,
+        type_parameters: vec![],
+        fields,
+    }
+}
+
 /// Helper to create a new named variable.
 pub fn new_var(loc: Loc, name: &str) -> Var {
     Var(sp(loc, Symbol::from(name)))
diff --git a/language/move-compiler/src/cfgir/absint.rs b/language/move-compiler/src/cfgir/absint.rs
index 1ad6c3ff63..35a8ba4050 100644
--- a/language/move-compiler/src/cfgir/absint.rs
+++ b/language/move-compiler/src/cfgir/absint.rs
@@ -120,13 +120,14 @@ pub trait AbstractInterpreter: TransferFunctions {
                                 // the same post
                             }
                             JoinResult::Changed => {
+                                // Pre has changed, the post condition is now unknown for the block
+                                next_block_invariant.post = BlockPostcondition::Unprocessed;
                                 // If the cur->successor is a back edge, jump back to the beginning
                                 // of the loop, instead of the normal next block
                                 if cfg.is_back_edge(block_label, *next_block_id) {
                                     next_block_candidate = Some(*next_block_id);
+                                    break;
                                 }
-                                // Pre has changed, the post condition is now unknown for the block
-                                next_block_invariant.post = BlockPostcondition::Unprocessed
                             }
                         }
                     }
diff --git a/language/move-compiler/src/cfgir/ast.rs b/language/move-compiler/src/cfgir/ast.rs
index 049361c898..2cc9c1ef94 100644
--- a/language/move-compiler/src/cfgir/ast.rs
+++ b/language/move-compiler/src/cfgir/ast.rs
@@ -64,7 +64,7 @@ pub struct ModuleDefinition {
 // Constants
 //**************************************************************************************************
 
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
 pub struct Constant {
     pub attributes: Attributes,
     pub loc: Loc,
@@ -292,8 +292,11 @@ impl AstDebug for MoveValue {
         use MoveValue as V;
         match self {
             V::U8(u) => w.write(&format!("{}", u)),
+            V::U16(u) => w.write(&format!("{}", u)),
+            V::U32(u) => w.write(&format!("{}", u)),
             V::U64(u) => w.write(&format!("{}", u)),
             V::U128(u) => w.write(&format!("{}", u)),
+            V::U256(u) => w.write(&format!("{}", u)),
             V::Bool(b) => w.write(&format!("{}", b)),
             V::Address(a) => w.write(&format!("{}", a)),
             V::Vector(vs) => {
diff --git a/language/move-compiler/src/cfgir/borrows/mod.rs b/language/move-compiler/src/cfgir/borrows/mod.rs
index 788d0bab28..fca4ed805e 100644
--- a/language/move-compiler/src/cfgir/borrows/mod.rs
+++ b/language/move-compiler/src/cfgir/borrows/mod.rs
@@ -86,8 +86,9 @@ pub fn verify(
     locals: &UniqueMap<Var, SingleType>,
     cfg: &super::cfg::BlockCFG,
 ) -> BTreeMap<Label, BorrowState> {
-    let mut initial_state =
-        BorrowState::initial(locals, acquires.clone(), compilation_env.has_diags());
+    // check for existing errors
+    let has_errors = compilation_env.has_errors();
+    let mut initial_state = BorrowState::initial(locals, acquires.clone(), has_errors);
     initial_state.bind_arguments(&signature.parameters);
     let mut safety = BorrowSafety::new(locals);
     initial_state.canonicalize_locals(&safety.local_numbers);
@@ -139,7 +140,6 @@ fn command(context: &mut Context, sp!(loc, cmd_): &Command) {
 }
 
 fn lvalues(context: &mut Context, ls: &[LValue], values: Values) {
-    assert!(ls.len() == values.len());
     ls.iter()
         .zip(values)
         .for_each(|(l, value)| lvalue(context, l, value))
diff --git a/language/move-compiler/src/cfgir/borrows/state.rs b/language/move-compiler/src/cfgir/borrows/state.rs
index 16aba4d281..81f326c067 100644
--- a/language/move-compiler/src/cfgir/borrows/state.rs
+++ b/language/move-compiler/src/cfgir/borrows/state.rs
@@ -41,7 +41,7 @@ pub enum Value {
 }
 pub type Values = Vec<Value>;
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct BorrowState {
     locals: UniqueMap<Var, Value>,
     acquired_resources: BTreeMap<StructName, Loc>,
diff --git a/language/move-compiler/src/cfgir/cfg.rs b/language/move-compiler/src/cfgir/cfg.rs
index e7328d5bd2..7a8218a471 100644
--- a/language/move-compiler/src/cfgir/cfg.rs
+++ b/language/move-compiler/src/cfgir/cfg.rs
@@ -172,7 +172,7 @@ impl<'a> BlockCFG<'a> {
     }
 
     pub fn blocks_mut(&mut self) -> &mut BasicBlocks {
-        &mut self.blocks
+        self.blocks
     }
 
     pub fn block(&self, label: Label) -> &BasicBlock {
diff --git a/language/move-compiler/src/cfgir/mod.rs b/language/move-compiler/src/cfgir/mod.rs
index 797ae399b0..2a1490f4ea 100644
--- a/language/move-compiler/src/cfgir/mod.rs
+++ b/language/move-compiler/src/cfgir/mod.rs
@@ -6,15 +6,13 @@ mod absint;
 pub mod ast;
 mod borrows;
 pub(crate) mod cfg;
-mod constant_fold;
-mod eliminate_locals;
-mod inline_blocks;
 mod liveness;
 mod locals;
 mod remove_no_ops;
-mod simplify_jumps;
 pub(crate) mod translate;
 
+mod optimize;
+
 use crate::{
     expansion::ast::{AbilitySet, ModuleIdent},
     hlir::ast::*,
@@ -23,6 +21,7 @@ use crate::{
 };
 use cfg::*;
 use move_ir_types::location::*;
+use optimize::optimize;
 use std::collections::{BTreeMap, BTreeSet};
 
 pub fn refine_inference_and_verify(
@@ -47,21 +46,3 @@ pub fn refine_inference_and_verify(
     liveness::release_dead_refs(&locals_states, locals, cfg, infinite_loop_starts);
     borrows::verify(compilation_env, signature, acquires, locals, cfg);
 }
-
-pub fn optimize(
-    signature: &FunctionSignature,
-    _locals: &UniqueMap<Var, SingleType>,
-    cfg: &mut BlockCFG,
-) {
-    loop {
-        let mut changed = false;
-        changed |= eliminate_locals::optimize(signature, cfg);
-        changed |= constant_fold::optimize(cfg);
-        changed |= simplify_jumps::optimize(cfg);
-        changed |= inline_blocks::optimize(cfg);
-
-        if !changed {
-            break;
-        }
-    }
-}
diff --git a/language/move-compiler/src/cfgir/constant_fold.rs b/language/move-compiler/src/cfgir/optimize/constant_fold.rs
similarity index 71%
rename from language/move-compiler/src/cfgir/constant_fold.rs
rename to language/move-compiler/src/cfgir/optimize/constant_fold.rs
index 32d3e73ed7..5cb9cd88e8 100644
--- a/language/move-compiler/src/cfgir/constant_fold.rs
+++ b/language/move-compiler/src/cfgir/optimize/constant_fold.rs
@@ -2,20 +2,25 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use super::cfg::BlockCFG;
 use crate::{
+    cfgir::cfg::BlockCFG,
     hlir::ast::{
-        BaseType, BaseType_, Command, Command_, Exp, ExpListItem, TypeName, TypeName_,
-        UnannotatedExp_, Value, Value_,
+        BaseType, BaseType_, Command, Command_, Exp, ExpListItem, FunctionSignature, SingleType,
+        TypeName, TypeName_, UnannotatedExp_, Value, Value_,
     },
     naming::ast::{BuiltinTypeName, BuiltinTypeName_},
-    parser::ast::{BinOp, BinOp_, UnaryOp, UnaryOp_},
+    parser::ast::{BinOp, BinOp_, UnaryOp, UnaryOp_, Var},
+    shared::unique_map::UniqueMap,
 };
 use move_ir_types::location::*;
 use std::convert::TryFrom;
 
 /// returns true if anything changed
-pub fn optimize(cfg: &mut BlockCFG) -> bool {
+pub fn optimize(
+    _signature: &FunctionSignature,
+    _locals: &UniqueMap<Var, SingleType>,
+    cfg: &mut BlockCFG,
+) -> bool {
     let mut changed = false;
     for block_ref in cfg.blocks_mut().values_mut() {
         let block = std::mem::take(block_ref);
@@ -196,7 +201,9 @@ fn is_valid_const_type_name(sp!(_, tn_): &TypeName) -> bool {
 fn is_valid_const_builtin_type(sp!(_, bt_): &BuiltinTypeName) -> bool {
     use BuiltinTypeName_ as N;
     match bt_ {
-        N::Address | N::U8 | N::U64 | N::U128 | N::Vector | N::Bool => true,
+        N::Address | N::U8 | N::U16 | N::U32 | N::U64 | N::U128 | N::U256 | N::Vector | N::Bool => {
+            true
+        }
         N::Signer => false,
     }
 }
@@ -228,47 +235,77 @@ fn fold_binary_op(
         // Checked arith
         //************************************
         (B::Add, V::U8(u1), V::U8(u2)) => V::U8(u1.checked_add(u2)?),
+        (B::Add, V::U16(u1), V::U16(u2)) => V::U16(u1.checked_add(u2)?),
+        (B::Add, V::U32(u1), V::U32(u2)) => V::U32(u1.checked_add(u2)?),
         (B::Add, V::U64(u1), V::U64(u2)) => V::U64(u1.checked_add(u2)?),
         (B::Add, V::U128(u1), V::U128(u2)) => V::U128(u1.checked_add(u2)?),
+        (B::Add, V::U256(u1), V::U256(u2)) => V::U256(u1.checked_add(u2)?),
 
         (B::Sub, V::U8(u1), V::U8(u2)) => V::U8(u1.checked_sub(u2)?),
+        (B::Sub, V::U16(u1), V::U16(u2)) => V::U16(u1.checked_sub(u2)?),
+        (B::Sub, V::U32(u1), V::U32(u2)) => V::U32(u1.checked_sub(u2)?),
         (B::Sub, V::U64(u1), V::U64(u2)) => V::U64(u1.checked_sub(u2)?),
         (B::Sub, V::U128(u1), V::U128(u2)) => V::U128(u1.checked_sub(u2)?),
+        (B::Sub, V::U256(u1), V::U256(u2)) => V::U256(u1.checked_sub(u2)?),
 
         (B::Mul, V::U8(u1), V::U8(u2)) => V::U8(u1.checked_mul(u2)?),
+        (B::Mul, V::U16(u1), V::U16(u2)) => V::U16(u1.checked_mul(u2)?),
+        (B::Mul, V::U32(u1), V::U32(u2)) => V::U32(u1.checked_mul(u2)?),
         (B::Mul, V::U64(u1), V::U64(u2)) => V::U64(u1.checked_mul(u2)?),
         (B::Mul, V::U128(u1), V::U128(u2)) => V::U128(u1.checked_mul(u2)?),
+        (B::Mul, V::U256(u1), V::U256(u2)) => V::U256(u1.checked_mul(u2)?),
 
         (B::Mod, V::U8(u1), V::U8(u2)) => V::U8(u1.checked_rem(u2)?),
+        (B::Mod, V::U16(u1), V::U16(u2)) => V::U16(u1.checked_rem(u2)?),
+        (B::Mod, V::U32(u1), V::U32(u2)) => V::U32(u1.checked_rem(u2)?),
         (B::Mod, V::U64(u1), V::U64(u2)) => V::U64(u1.checked_rem(u2)?),
         (B::Mod, V::U128(u1), V::U128(u2)) => V::U128(u1.checked_rem(u2)?),
+        (B::Mod, V::U256(u1), V::U256(u2)) => V::U256(u1.checked_rem(u2)?),
 
         (B::Div, V::U8(u1), V::U8(u2)) => V::U8(u1.checked_div(u2)?),
+        (B::Div, V::U16(u1), V::U16(u2)) => V::U16(u1.checked_div(u2)?),
+        (B::Div, V::U32(u1), V::U32(u2)) => V::U32(u1.checked_div(u2)?),
         (B::Div, V::U64(u1), V::U64(u2)) => V::U64(u1.checked_div(u2)?),
         (B::Div, V::U128(u1), V::U128(u2)) => V::U128(u1.checked_div(u2)?),
+        (B::Div, V::U256(u1), V::U256(u2)) => V::U256(u1.checked_div(u2)?),
 
         (B::Shl, V::U8(u1), V::U8(u2)) => V::U8(u1.checked_shl(u2 as u32)?),
+        (B::Shl, V::U16(u1), V::U8(u2)) => V::U16(u1.checked_shl(u2 as u32)?),
+        (B::Shl, V::U32(u1), V::U8(u2)) => V::U32(u1.checked_shl(u2 as u32)?),
         (B::Shl, V::U64(u1), V::U8(u2)) => V::U64(u1.checked_shl(u2 as u32)?),
         (B::Shl, V::U128(u1), V::U8(u2)) => V::U128(u1.checked_shl(u2 as u32)?),
+        (B::Shl, V::U256(u1), V::U8(u2)) => V::U256(u1.checked_shl(u2 as u32)?),
 
         (B::Shr, V::U8(u1), V::U8(u2)) => V::U8(u1.checked_shr(u2 as u32)?),
+        (B::Shr, V::U16(u1), V::U8(u2)) => V::U16(u1.checked_shr(u2 as u32)?),
+        (B::Shr, V::U32(u1), V::U8(u2)) => V::U32(u1.checked_shr(u2 as u32)?),
         (B::Shr, V::U64(u1), V::U8(u2)) => V::U64(u1.checked_shr(u2 as u32)?),
         (B::Shr, V::U128(u1), V::U8(u2)) => V::U128(u1.checked_shr(u2 as u32)?),
+        (B::Shr, V::U256(u1), V::U8(u2)) => V::U256(u1.checked_shr(u2 as u32)?),
 
         //************************************
         // Pure arith
         //************************************
         (B::BitOr, V::U8(u1), V::U8(u2)) => V::U8(u1 | u2),
+        (B::BitOr, V::U16(u1), V::U16(u2)) => V::U16(u1 | u2),
+        (B::BitOr, V::U32(u1), V::U32(u2)) => V::U32(u1 | u2),
         (B::BitOr, V::U64(u1), V::U64(u2)) => V::U64(u1 | u2),
         (B::BitOr, V::U128(u1), V::U128(u2)) => V::U128(u1 | u2),
+        (B::BitOr, V::U256(u1), V::U256(u2)) => V::U256(u1 | u2),
 
         (B::BitAnd, V::U8(u1), V::U8(u2)) => V::U8(u1 & u2),
+        (B::BitAnd, V::U16(u1), V::U16(u2)) => V::U16(u1 & u2),
+        (B::BitAnd, V::U32(u1), V::U32(u2)) => V::U32(u1 & u2),
         (B::BitAnd, V::U64(u1), V::U64(u2)) => V::U64(u1 & u2),
         (B::BitAnd, V::U128(u1), V::U128(u2)) => V::U128(u1 & u2),
+        (B::BitAnd, V::U256(u1), V::U256(u2)) => V::U256(u1 & u2),
 
         (B::Xor, V::U8(u1), V::U8(u2)) => V::U8(u1 ^ u2),
+        (B::Xor, V::U16(u1), V::U16(u2)) => V::U16(u1 ^ u2),
+        (B::Xor, V::U32(u1), V::U32(u2)) => V::U32(u1 ^ u2),
         (B::Xor, V::U64(u1), V::U64(u2)) => V::U64(u1 ^ u2),
         (B::Xor, V::U128(u1), V::U128(u2)) => V::U128(u1 ^ u2),
+        (B::Xor, V::U256(u1), V::U256(u2)) => V::U256(u1 ^ u2),
 
         //************************************
         // Logical
@@ -280,20 +317,32 @@ fn fold_binary_op(
         // Comparisons
         //************************************
         (B::Lt, V::U8(u1), V::U8(u2)) => V::Bool(u1 < u2),
+        (B::Lt, V::U16(u1), V::U16(u2)) => V::Bool(u1 < u2),
+        (B::Lt, V::U32(u1), V::U32(u2)) => V::Bool(u1 < u2),
         (B::Lt, V::U64(u1), V::U64(u2)) => V::Bool(u1 < u2),
         (B::Lt, V::U128(u1), V::U128(u2)) => V::Bool(u1 < u2),
+        (B::Lt, V::U256(u1), V::U256(u2)) => V::Bool(u1 < u2),
 
         (B::Gt, V::U8(u1), V::U8(u2)) => V::Bool(u1 > u2),
+        (B::Gt, V::U16(u1), V::U16(u2)) => V::Bool(u1 > u2),
+        (B::Gt, V::U32(u1), V::U32(u2)) => V::Bool(u1 > u2),
         (B::Gt, V::U64(u1), V::U64(u2)) => V::Bool(u1 > u2),
         (B::Gt, V::U128(u1), V::U128(u2)) => V::Bool(u1 > u2),
+        (B::Gt, V::U256(u1), V::U256(u2)) => V::Bool(u1 > u2),
 
         (B::Le, V::U8(u1), V::U8(u2)) => V::Bool(u1 <= u2),
+        (B::Le, V::U16(u1), V::U16(u2)) => V::Bool(u1 <= u2),
+        (B::Le, V::U32(u1), V::U32(u2)) => V::Bool(u1 <= u2),
         (B::Le, V::U64(u1), V::U64(u2)) => V::Bool(u1 <= u2),
         (B::Le, V::U128(u1), V::U128(u2)) => V::Bool(u1 <= u2),
+        (B::Le, V::U256(u1), V::U256(u2)) => V::Bool(u1 <= u2),
 
         (B::Ge, V::U8(u1), V::U8(u2)) => V::Bool(u1 >= u2),
+        (B::Ge, V::U16(u1), V::U16(u2)) => V::Bool(u1 >= u2),
+        (B::Ge, V::U32(u1), V::U32(u2)) => V::Bool(u1 >= u2),
         (B::Ge, V::U64(u1), V::U64(u2)) => V::Bool(u1 >= u2),
         (B::Ge, V::U128(u1), V::U128(u2)) => V::Bool(u1 >= u2),
+        (B::Ge, V::U256(u1), V::U256(u2)) => V::Bool(u1 >= u2),
 
         (B::Eq, v1, v2) => V::Bool(v1 == v2),
         (B::Neq, v1, v2) => V::Bool(v1 != v2),
@@ -311,17 +360,46 @@ fn fold_cast(loc: Loc, sp!(_, bt_): &BuiltinTypeName, v: Value_) -> Option<Unann
     use Value_ as V;
     let cast = match (bt_, v) {
         (BT::U8, V::U8(u)) => V::U8(u),
+        (BT::U8, V::U16(u)) => V::U8(u8::try_from(u).ok()?),
+        (BT::U8, V::U32(u)) => V::U8(u8::try_from(u).ok()?),
         (BT::U8, V::U64(u)) => V::U8(u8::try_from(u).ok()?),
         (BT::U8, V::U128(u)) => V::U8(u8::try_from(u).ok()?),
+        (BT::U8, V::U256(u)) => V::U8(u8::try_from(u).ok()?),
+
+        (BT::U16, V::U8(u)) => V::U16(u as u16),
+        (BT::U16, V::U16(u)) => V::U16(u),
+        (BT::U16, V::U32(u)) => V::U16(u16::try_from(u).ok()?),
+        (BT::U16, V::U64(u)) => V::U16(u16::try_from(u).ok()?),
+        (BT::U16, V::U128(u)) => V::U16(u16::try_from(u).ok()?),
+        (BT::U16, V::U256(u)) => V::U16(u16::try_from(u).ok()?),
+
+        (BT::U32, V::U8(u)) => V::U32(u as u32),
+        (BT::U32, V::U16(u)) => V::U32(u as u32),
+        (BT::U32, V::U32(u)) => V::U32(u),
+        (BT::U32, V::U64(u)) => V::U32(u32::try_from(u).ok()?),
+        (BT::U32, V::U128(u)) => V::U32(u32::try_from(u).ok()?),
+        (BT::U32, V::U256(u)) => V::U32(u32::try_from(u).ok()?),
 
         (BT::U64, V::U8(u)) => V::U64(u as u64),
+        (BT::U64, V::U16(u)) => V::U64(u as u64),
+        (BT::U64, V::U32(u)) => V::U64(u as u64),
         (BT::U64, V::U64(u)) => V::U64(u),
         (BT::U64, V::U128(u)) => V::U64(u64::try_from(u).ok()?),
+        (BT::U64, V::U256(u)) => V::U64(u64::try_from(u).ok()?),
 
         (BT::U128, V::U8(u)) => V::U128(u as u128),
+        (BT::U128, V::U16(u)) => V::U128(u as u128),
+        (BT::U128, V::U32(u)) => V::U128(u as u128),
         (BT::U128, V::U64(u)) => V::U128(u as u128),
         (BT::U128, V::U128(u)) => V::U128(u),
-
+        (BT::U128, V::U256(u)) => V::U128(u128::try_from(u).ok()?),
+
+        (BT::U256, V::U8(u)) => V::U256(u.into()),
+        (BT::U256, V::U16(u)) => V::U256(u.into()),
+        (BT::U256, V::U32(u)) => V::U256(u.into()),
+        (BT::U256, V::U64(u)) => V::U256(u.into()),
+        (BT::U256, V::U128(u)) => V::U256(u.into()),
+        (BT::U256, V::U256(u)) => V::U256(u),
         (_, v) => panic!("ICE unexpected cast while folding: {:?} as {:?}", v, bt_),
     };
     Some(evalue_(loc, cast))
diff --git a/language/move-compiler/src/cfgir/eliminate_locals.rs b/language/move-compiler/src/cfgir/optimize/eliminate_locals.rs
similarity index 95%
rename from language/move-compiler/src/cfgir/eliminate_locals.rs
rename to language/move-compiler/src/cfgir/optimize/eliminate_locals.rs
index 8a8051cdcc..4667f903c7 100644
--- a/language/move-compiler/src/cfgir/eliminate_locals.rs
+++ b/language/move-compiler/src/cfgir/optimize/eliminate_locals.rs
@@ -2,27 +2,33 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use super::cfg::BlockCFG;
-use crate::{hlir::ast::FunctionSignature, parser::ast::Var};
+use crate::{
+    cfgir::{cfg::BlockCFG, remove_no_ops},
+    hlir::ast::{FunctionSignature, SingleType},
+    parser::ast::Var,
+    shared::unique_map::UniqueMap,
+};
 use std::collections::BTreeSet;
 
 /// returns true if anything changed
-pub fn optimize(signature: &FunctionSignature, cfg: &mut BlockCFG) -> bool {
-    let mut changed = super::remove_no_ops::optimize(cfg);
-    loop {
-        let ssa_temps = {
-            let s = count(signature, cfg);
-            if s.is_empty() {
-                break changed;
-            }
-            s
-        };
+pub fn optimize(
+    signature: &FunctionSignature,
+    _locals: &UniqueMap<Var, SingleType>,
+    cfg: &mut BlockCFG,
+) -> bool {
+    let changed = remove_no_ops::optimize(cfg);
+    let ssa_temps = {
+        let s = count(signature, cfg);
+        if s.is_empty() {
+            return changed;
+        }
+        s
+    };
 
-        // `eliminate` always removes if `ssa_temps` is not empty
-        changed = true;
-        eliminate(cfg, ssa_temps);
-        super::remove_no_ops::optimize(cfg);
-    }
+    // `eliminate` always removes if `ssa_temps` is not empty
+    eliminate(cfg, ssa_temps);
+    remove_no_ops::optimize(cfg);
+    true
 }
 
 //**************************************************************************************************
diff --git a/language/move-compiler/src/cfgir/inline_blocks.rs b/language/move-compiler/src/cfgir/optimize/inline_blocks.rs
similarity index 92%
rename from language/move-compiler/src/cfgir/inline_blocks.rs
rename to language/move-compiler/src/cfgir/optimize/inline_blocks.rs
index b003fb1d2a..eb8bdb3c69 100644
--- a/language/move-compiler/src/cfgir/inline_blocks.rs
+++ b/language/move-compiler/src/cfgir/optimize/inline_blocks.rs
@@ -2,15 +2,23 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use super::cfg::{BlockCFG, CFG};
 use crate::{
-    cfgir::ast::remap_labels,
-    hlir::ast::{BasicBlocks, Command_, Label},
+    cfgir::{
+        ast::remap_labels,
+        cfg::{BlockCFG, CFG},
+    },
+    hlir::ast::{BasicBlocks, Command_, FunctionSignature, Label, SingleType},
+    parser::ast::Var,
+    shared::unique_map::UniqueMap,
 };
 use std::collections::{BTreeMap, BTreeSet};
 
 /// returns true if anything changed
-pub fn optimize(cfg: &mut BlockCFG) -> bool {
+pub fn optimize(
+    _signature: &FunctionSignature,
+    _locals: &UniqueMap<Var, SingleType>,
+    cfg: &mut BlockCFG,
+) -> bool {
     let changed = optimize_(cfg.start_block(), cfg.blocks_mut());
     if changed {
         let dead_blocks = cfg.recompute();
diff --git a/language/move-compiler/src/cfgir/optimize/mod.rs b/language/move-compiler/src/cfgir/optimize/mod.rs
new file mode 100644
index 0000000000..f9ef1d5ac4
--- /dev/null
+++ b/language/move-compiler/src/cfgir/optimize/mod.rs
@@ -0,0 +1,41 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod constant_fold;
+mod eliminate_locals;
+mod inline_blocks;
+mod simplify_jumps;
+
+use crate::{cfgir::cfg::BlockCFG, hlir::ast::*, parser::ast::Var, shared::unique_map::UniqueMap};
+
+pub type Optimization = fn(&FunctionSignature, &UniqueMap<Var, SingleType>, &mut BlockCFG) -> bool;
+
+const OPTIMIZATIONS: &[Optimization] = &[
+    eliminate_locals::optimize,
+    constant_fold::optimize,
+    simplify_jumps::optimize,
+    inline_blocks::optimize,
+];
+
+pub fn optimize(
+    signature: &FunctionSignature,
+    locals: &UniqueMap<Var, SingleType>,
+    cfg: &mut BlockCFG,
+) {
+    let mut count = 0;
+    for optimization in OPTIMIZATIONS.iter().cycle() {
+        // if we have fully cycled through the list of optimizations without a change,
+        // it is safe to stop
+        if count >= OPTIMIZATIONS.len() {
+            debug_assert_eq!(count, OPTIMIZATIONS.len());
+            break;
+        }
+
+        // reset the count if something has changed
+        if optimization(signature, locals, cfg) {
+            count = 0
+        } else {
+            count += 1
+        }
+    }
+}
diff --git a/language/move-compiler/src/cfgir/simplify_jumps.rs b/language/move-compiler/src/cfgir/optimize/simplify_jumps.rs
similarity index 75%
rename from language/move-compiler/src/cfgir/simplify_jumps.rs
rename to language/move-compiler/src/cfgir/optimize/simplify_jumps.rs
index 49453b3974..c8468bc36b 100644
--- a/language/move-compiler/src/cfgir/simplify_jumps.rs
+++ b/language/move-compiler/src/cfgir/optimize/simplify_jumps.rs
@@ -2,11 +2,19 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use super::cfg::BlockCFG;
-use crate::hlir::ast::{Command, Command_, Exp, UnannotatedExp_, Value_};
+use crate::{
+    cfgir::cfg::BlockCFG,
+    hlir::ast::{Command, Command_, Exp, FunctionSignature, SingleType, UnannotatedExp_, Value_},
+    parser::ast::Var,
+    shared::unique_map::UniqueMap,
+};
 
 /// returns true if anything changed
-pub fn optimize(cfg: &mut BlockCFG) -> bool {
+pub fn optimize(
+    _signature: &FunctionSignature,
+    _locals: &UniqueMap<Var, SingleType>,
+    cfg: &mut BlockCFG,
+) -> bool {
     let mut changed = false;
     for block in cfg.blocks_mut().values_mut() {
         for cmd in block {
diff --git a/language/move-compiler/src/cfgir/translate.rs b/language/move-compiler/src/cfgir/translate.rs
index 2b6b4b5c33..7763321052 100644
--- a/language/move-compiler/src/cfgir/translate.rs
+++ b/language/move-compiler/src/cfgir/translate.rs
@@ -368,8 +368,11 @@ pub(crate) fn move_value_from_value_(v_: Value_) -> MoveValue {
     match v_ {
         V::Address(a) => MV::Address(MoveAddress::new(a.into_bytes())),
         V::U8(u) => MV::U8(u),
+        V::U16(u) => MV::U16(u),
+        V::U32(u) => MV::U32(u),
         V::U64(u) => MV::U64(u),
         V::U128(u) => MV::U128(u),
+        V::U256(u) => MV::U256(u),
         V::Bool(b) => MV::Bool(b),
         V::Vector(_, vs) => MV::Vector(vs.into_iter().map(move_value_from_value).collect()),
     }
@@ -434,7 +437,8 @@ fn function_body(
                 &mut cfg,
                 &infinite_loop_starts,
             );
-            if !context.env.has_diags() {
+            // do not optimize if there are errors, warnings are okay
+            if !context.env.has_errors() {
                 cfgir::optimize(signature, &locals, &mut cfg);
             }
 
diff --git a/language/move-compiler/src/command_line/compiler.rs b/language/move-compiler/src/command_line/compiler.rs
index 2f66658853..060a191ecd 100644
--- a/language/move-compiler/src/command_line/compiler.rs
+++ b/language/move-compiler/src/command_line/compiler.rs
@@ -14,7 +14,7 @@ use crate::{
         CompilationEnv, Flags, IndexedPackagePath, NamedAddressMap, NamedAddressMaps,
         NumericalAddress, PackagePaths,
     },
-    to_bytecode, typing, unit_test,
+    to_bytecode, typing, unit_test, verification,
 };
 use move_command_line_common::files::{
     extension_equals, find_filenames, MOVE_COMPILED_EXTENSION, MOVE_EXTENSION, SOURCE_MAP_EXTENSION,
@@ -441,22 +441,16 @@ pub fn construct_pre_compiled_lib<Paths: Into<Symbol>, NamedAddress: Into<Symbol
     let mut cfgir = None;
     let mut compiled = None;
 
-    let save_result = |cur: &PassResult, env: &CompilationEnv| match cur {
+    let save_result = |cur: &PassResult, _env: &CompilationEnv| match cur {
         PassResult::Parser(prog) => {
             assert!(parser.is_none());
             parser = Some(prog.clone())
         }
         PassResult::Expansion(eprog) => {
-            if env.has_diags() {
-                return;
-            }
             assert!(expansion.is_none());
             expansion = Some(eprog.clone())
         }
         PassResult::Naming(nprog) => {
-            if env.has_diags() {
-                return;
-            }
             assert!(naming.is_none());
             naming = Some(nprog.clone())
         }
@@ -465,9 +459,6 @@ pub fn construct_pre_compiled_lib<Paths: Into<Symbol>, NamedAddress: Into<Symbol
             typing = Some(tprog.clone())
         }
         PassResult::HLIR(hprog) => {
-            if env.has_diags() {
-                return;
-            }
             assert!(hlir.is_none());
             hlir = Some(hprog.clone());
         }
@@ -607,6 +598,8 @@ fn generate_interface_files_for_deps(
     let interface_files_paths =
         generate_interface_files(deps, interface_files_dir_opt, module_to_named_address, true)?;
     deps.extend(interface_files_paths);
+    // Remove bytecode files
+    deps.retain(|p| !p.path.as_str().ends_with(MOVE_COMPILED_EXTENSION));
     Ok(())
 }
 
@@ -716,12 +709,12 @@ fn has_compiled_module_magic_number(path: &str) -> bool {
         Err(_) => return false,
         Ok(f) => f,
     };
-    let mut magic = [0u8; BinaryConstants::DIEM_MAGIC_SIZE];
+    let mut magic = [0u8; BinaryConstants::MOVE_MAGIC_SIZE];
     let num_bytes_read = match file.read(&mut magic) {
         Err(_) => return false,
         Ok(n) => n,
     };
-    num_bytes_read == BinaryConstants::DIEM_MAGIC_SIZE && magic == BinaryConstants::DIEM_MAGIC
+    num_bytes_read == BinaryConstants::MOVE_MAGIC_SIZE && magic == BinaryConstants::MOVE_MAGIC
 }
 
 //**************************************************************************************************
@@ -762,6 +755,7 @@ fn run(
         PassResult::Parser(prog) => {
             let prog = parser::merge_spec_modules::program(compilation_env, prog);
             let prog = unit_test::filter_test_members::program(compilation_env, prog);
+            let prog = verification::ast_filter::program(compilation_env, prog);
             let eprog = expansion::translate::program(compilation_env, pre_compiled_lib, prog);
             compilation_env.check_diags_at_or_above_severity(Severity::Bug)?;
             run(
diff --git a/language/move-compiler/src/command_line/mod.rs b/language/move-compiler/src/command_line/mod.rs
index 4de12e8450..f305e20bc3 100644
--- a/language/move-compiler/src/command_line/mod.rs
+++ b/language/move-compiler/src/command_line/mod.rs
@@ -23,6 +23,9 @@ pub const SOURCE_MAP_SHORT: char = 'm';
 pub const TEST: &str = "test";
 pub const TEST_SHORT: char = 't';
 
+pub const VERIFY: &str = "verify";
+pub const VERIFY_SHORT: char = 'v';
+
 pub const FLAVOR: &str = "flavor";
 
 pub const BYTECODE_VERSION: &str = "bytecode-version";
diff --git a/language/move-compiler/src/compiled_unit.rs b/language/move-compiler/src/compiled_unit.rs
index ecf5fd0293..31c70e9482 100644
--- a/language/move-compiler/src/compiled_unit.rs
+++ b/language/move-compiler/src/compiled_unit.rs
@@ -5,7 +5,7 @@
 use crate::{
     diag,
     diagnostics::Diagnostics,
-    expansion::ast::{ModuleIdent, ModuleIdent_, SpecId},
+    expansion::ast::{Attributes, ModuleIdent, ModuleIdent_, SpecId},
     hlir::ast as H,
     parser::ast::{FunctionName, ModuleName, Var},
     shared::{unique_map::UniqueMap, Name, NumericalAddress},
@@ -41,6 +41,7 @@ pub struct SpecInfo {
 pub struct FunctionInfo {
     pub spec_info: BTreeMap<SpecId, SpecInfo>,
     pub parameters: Vec<(Var, VarInfo)>,
+    pub attributes: Attributes,
 }
 
 #[derive(Debug, Clone)]
diff --git a/language/move-compiler/src/diagnostics/codes.rs b/language/move-compiler/src/diagnostics/codes.rs
index 6803ae08a3..f7b0b0c290 100644
--- a/language/move-compiler/src/diagnostics/codes.rs
+++ b/language/move-compiler/src/diagnostics/codes.rs
@@ -216,7 +216,8 @@ codes!(
         Assignment: { msg: "unused assignment", severity: Warning },
         TrailingSemi: { msg: "unnecessary trailing semicolon", severity: Warning },
         DeadCode: { msg: "dead or unreachable code", severity: Warning },
-        StructTypeParam: { msg: "unused struct type parameter", severity: Warning }
+        StructTypeParam: { msg: "unused struct type parameter", severity: Warning },
+        Attribute: { msg: "unused attribute", severity: Warning },
     ],
     Attributes: [
         Duplicate: { msg: "invalid duplicate attribute", severity: NonblockingError },
@@ -226,6 +227,7 @@ codes!(
         InvalidTest: { msg: "unable to generate test", severity: NonblockingError },
         InvalidBytecodeInst:
             { msg: "unknown bytecode instruction function", severity: NonblockingError },
+        ValueWarning: { msg: "potential issue with attribute value", severity: Warning }
     ],
     Tests: [
         TestFailed: { msg: "test failure", severity: BlockingError },
diff --git a/language/move-compiler/src/diagnostics/mod.rs b/language/move-compiler/src/diagnostics/mod.rs
index 166699ad00..ae49b4c061 100644
--- a/language/move-compiler/src/diagnostics/mod.rs
+++ b/language/move-compiler/src/diagnostics/mod.rs
@@ -320,8 +320,8 @@ impl Diagnostic {
 macro_rules! diag {
     ($code: expr, $primary: expr $(,)?) => {{
         #[allow(unused)]
-        use crate::diagnostics::codes::*;
-        crate::diagnostics::Diagnostic::new(
+        use $crate::diagnostics::codes::*;
+        $crate::diagnostics::Diagnostic::new(
             $code,
             $primary,
             std::iter::empty::<(move_ir_types::location::Loc, String)>(),
@@ -330,8 +330,8 @@ macro_rules! diag {
     }};
     ($code: expr, $primary: expr, $($secondary: expr),+ $(,)?) => {{
         #[allow(unused)]
-        use crate::diagnostics::codes::*;
-        crate::diagnostics::Diagnostic::new(
+        use $crate::diagnostics::codes::*;
+        $crate::diagnostics::Diagnostic::new(
             $code,
             $primary,
             vec![$($secondary, )*],
diff --git a/language/move-compiler/src/expansion/ast.rs b/language/move-compiler/src/expansion/ast.rs
index b262a41201..7b73e17cc9 100644
--- a/language/move-compiler/src/expansion/ast.rs
+++ b/language/move-compiler/src/expansion/ast.rs
@@ -38,6 +38,7 @@ pub struct Program {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum AttributeValue_ {
     Value(Value),
+    Module(ModuleIdent),
     ModuleAccess(ModuleAccess),
 }
 pub type AttributeValue = Spanned<AttributeValue_>;
@@ -144,7 +145,7 @@ pub enum Neighbor {
 
 pub type Fields<T> = UniqueMap<Field, (usize, T)>;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct StructTypeParameter {
     pub is_phantom: bool,
     pub name: Name,
@@ -170,7 +171,7 @@ pub enum StructFields {
 // Functions
 //**************************************************************************************************
 
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
 pub enum Visibility {
     Public(Loc),
     Friend(Loc),
@@ -286,7 +287,7 @@ pub enum SpecBlockMember_ {
 }
 pub type SpecBlockMember = Spanned<SpecBlockMember_>;
 
-#[derive(PartialEq, Clone, Debug)]
+#[derive(PartialEq, Eq, Clone, Debug)]
 pub enum SpecConditionKind_ {
     Assert,
     Assume,
@@ -304,14 +305,14 @@ pub enum SpecConditionKind_ {
 }
 pub type SpecConditionKind = Spanned<SpecConditionKind_>;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct PragmaProperty_ {
     pub name: Name,
     pub value: Option<PragmaValue>,
 }
 pub type PragmaProperty = Spanned<PragmaProperty_>;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum PragmaValue {
     Literal(Value),
     Ident(ModuleAccess),
@@ -325,6 +326,7 @@ pub enum PragmaValue {
 pub struct AbilitySet(UniqueSet<Ability>);
 
 #[derive(Debug, Clone, PartialEq, Eq)]
+#[allow(clippy::large_enum_variant)]
 pub enum ModuleAccess_ {
     Name(Name),
     ModuleAccess(ModuleIdent, Name),
@@ -374,13 +376,19 @@ pub enum Value_ {
     // 0x<hex representation up to 64 digits with padding 0s>
     Address(Address),
     // <num>
-    InferredNum(u128),
+    InferredNum(move_core_types::u256::U256),
     // <num>u8
     U8(u8),
+    // <num>u16
+    U16(u16),
+    // <num>u32
+    U32(u32),
     // <num>u64
     U64(u64),
     // <num>u128
     U128(u128),
+    // <num>u256
+    U256(move_core_types::u256::U256),
     // true
     // false
     Bool(bool),
@@ -586,7 +594,7 @@ impl AbilitySet {
         Ability_::Store,
         Ability_::Key,
     ];
-    /// Abilities for bool, u8, u64, u128, and address
+    /// Abilities for bool, u8, u16, u32, u64, u128, u256 and address
     pub const PRIMITIVES: [Ability_; 3] = [Ability_::Copy, Ability_::Drop, Ability_::Store];
     /// Abilities for &_ and &mut _
     pub const REFERENCES: [Ability_; 2] = [Ability_::Copy, Ability_::Drop];
@@ -725,7 +733,7 @@ impl Iterator for AbilitySetIntoIter {
     }
 }
 
-impl<'a> IntoIterator for AbilitySet {
+impl IntoIterator for AbilitySet {
     type Item = Ability;
     type IntoIter = AbilitySetIntoIter;
 
@@ -853,6 +861,7 @@ impl AstDebug for AttributeValue_ {
     fn ast_debug(&self, w: &mut AstWriter) {
         match self {
             AttributeValue_::Value(v) => v.ast_debug(w),
+            AttributeValue_::Module(m) => w.write(&format!("{}", m)),
             AttributeValue_::ModuleAccess(n) => n.ast_debug(w),
         }
     }
@@ -1046,7 +1055,7 @@ impl AstDebug for SpecBlockTarget_ {
             SpecBlockTarget_::Code => {}
             SpecBlockTarget_::Module => w.write("module "),
             SpecBlockTarget_::Member(name, sign_opt) => {
-                w.write(&name.value);
+                w.write(name.value);
                 if let Some(sign) = sign_opt {
                     sign.ast_debug(w);
                 }
@@ -1205,7 +1214,7 @@ impl AstDebug for SpecBlockMember_ {
 
 impl AstDebug for PragmaProperty_ {
     fn ast_debug(&self, w: &mut AstWriter) {
-        w.write(&self.name.value);
+        w.write(self.name.value);
         if let Some(value) = &self.value {
             w.write(" = ");
             match value {
@@ -1365,7 +1374,7 @@ pub fn ability_constraints_ast_debug(w: &mut AstWriter, abilities: &AbilitySet)
 impl AstDebug for (Name, AbilitySet) {
     fn ast_debug(&self, w: &mut AstWriter) {
         let (n, abilities) = self;
-        w.write(&n.value);
+        w.write(n.value);
         ability_constraints_ast_debug(w, abilities)
     }
 }
@@ -1380,7 +1389,7 @@ impl AstDebug for StructTypeParameter {
         if *is_phantom {
             w.write("phantom ");
         }
-        w.write(&name.value);
+        w.write(name.value);
         ability_constraints_ast_debug(w, constraints)
     }
 }
@@ -1435,8 +1444,11 @@ impl AstDebug for Value_ {
             V::Address(addr) => w.write(&format!("@{}", addr)),
             V::InferredNum(u) => w.write(&format!("{}", u)),
             V::U8(u) => w.write(&format!("{}u8", u)),
+            V::U16(u) => w.write(&format!("{}u16", u)),
+            V::U32(u) => w.write(&format!("{}u32", u)),
             V::U64(u) => w.write(&format!("{}u64", u)),
             V::U128(u) => w.write(&format!("{}u128", u)),
+            V::U256(u) => w.write(&format!("{}u256", u)),
             V::Bool(b) => w.write(&format!("{}", b)),
             V::Bytearray(v) => w.write(&format!("{:?}", v)),
         }
diff --git a/language/move-compiler/src/expansion/dependency_ordering.rs b/language/move-compiler/src/expansion/dependency_ordering.rs
index 3d336d9f35..4836efceb0 100644
--- a/language/move-compiler/src/expansion/dependency_ordering.rs
+++ b/language/move-compiler/src/expansion/dependency_ordering.rs
@@ -78,6 +78,7 @@ enum DepType {
 }
 
 #[derive(Clone, Eq, PartialEq, Ord, PartialOrd)]
+#[allow(clippy::large_enum_variant)]
 enum NodeIdent {
     Module(ModuleIdent),
     Script(Symbol),
diff --git a/language/move-compiler/src/expansion/hex_string.rs b/language/move-compiler/src/expansion/hex_string.rs
index 3b4d9e1fb1..774f78614a 100644
--- a/language/move-compiler/src/expansion/hex_string.rs
+++ b/language/move-compiler/src/expansion/hex_string.rs
@@ -5,7 +5,7 @@
 use crate::{diag, diagnostics::Diagnostic, parser::syntax::make_loc};
 use move_ir_types::location::*;
 
-pub fn decode(loc: Loc, s: &str) -> Result<Vec<u8>, Diagnostic> {
+pub fn decode(loc: Loc, s: &str) -> Result<Vec<u8>, Box<Diagnostic>> {
     match hex::decode(s) {
         Ok(vec) => Ok(vec),
         Err(hex::FromHexError::InvalidHexCharacter { c, index }) => {
@@ -13,12 +13,12 @@ pub fn decode(loc: Loc, s: &str) -> Result<Vec<u8>, Diagnostic> {
             let start_offset = loc.start() as usize;
             let offset = start_offset + 2 + index;
             let loc = make_loc(filename, offset, offset);
-            Err(diag!(
+            Err(Box::new(diag!(
                 Syntax::InvalidHexString,
                 (loc, format!("Invalid hexadecimal character: '{}'", c)),
-            ))
+            )))
         }
-        Err(hex::FromHexError::OddLength) => Err(diag!(
+        Err(hex::FromHexError::OddLength) => Err(Box::new(diag!(
             Syntax::InvalidHexString,
             (
                 loc,
@@ -26,7 +26,7 @@ pub fn decode(loc: Loc, s: &str) -> Result<Vec<u8>, Diagnostic> {
                  byte"
                     .to_string(),
             )
-        )),
+        ))),
         Err(_) => unreachable!("unexpected error parsing hex byte string value"),
     }
 }
diff --git a/language/move-compiler/src/expansion/translate.rs b/language/move-compiler/src/expansion/translate.rs
index 1a891fddfc..880f5b1a12 100644
--- a/language/move-compiler/src/expansion/translate.rs
+++ b/language/move-compiler/src/expansion/translate.rs
@@ -16,6 +16,7 @@ use crate::{
     shared::{known_attributes::AttributePosition, unique_map::UniqueMap, *},
     FullyCompiledProgram,
 };
+use move_command_line_common::parser::{parse_u16, parse_u256, parse_u32};
 use move_ir_types::location::*;
 use move_symbol_pool::Symbol;
 use std::{
@@ -353,7 +354,7 @@ fn module(
     module_address: Option<Spanned<Address>>,
     module_def: P::ModuleDefinition,
 ) {
-    assert!(context.address == None);
+    assert!(context.address.is_none());
     let (mident, mod_) = module_(context, package_name, module_address, module_def);
     if let Err((mident, old_loc)) = module_map.add(mident, mod_) {
         duplicate_module(context, module_map, mident, old_loc)
@@ -399,8 +400,8 @@ fn module_(
         members,
     } = mdef;
     let attributes = flatten_attributes(context, AttributePosition::Module, attributes);
-    assert!(context.address == None);
-    assert!(address == None);
+    assert!(context.address.is_none());
+    assert!(address.is_none());
     set_sender_address(context, &name, module_address);
     let _ = check_restricted_name_all_cases(context, NameCase::Module, &name.0);
     if name.value().starts_with(|c| c == '_') {
@@ -478,7 +479,7 @@ fn script(
 }
 
 fn script_(context: &mut Context, package_name: Option<Symbol>, pscript: P::Script) -> E::Script {
-    assert!(context.address == None);
+    assert!(context.address.is_none());
     assert!(context.is_source_definition);
     let P::Script {
         attributes,
@@ -652,11 +653,56 @@ fn attribute_value(
     sp!(loc, avalue_): P::AttributeValue,
 ) -> Option<E::AttributeValue> {
     use E::AttributeValue_ as EV;
-    use P::AttributeValue_ as PV;
+    use P::{AttributeValue_ as PV, LeadingNameAccess_ as LN, NameAccessChain_ as PN};
     Some(sp(
         loc,
         match avalue_ {
             PV::Value(v) => EV::Value(value(context, v)?),
+            PV::ModuleAccess(sp!(ident_loc, PN::Two(sp!(aloc, LN::AnonymousAddress(a)), n))) => {
+                let addr = Address::Numerical(None, sp(aloc, a));
+                let mident = sp(ident_loc, ModuleIdent_::new(addr, ModuleName(n)));
+                if context.module_members.get(&mident).is_none() {
+                    context.env.add_diag(diag!(
+                        NameResolution::UnboundModule,
+                        (ident_loc, format!("Unbound module '{}'", mident))
+                    ));
+                }
+                EV::Module(mident)
+            }
+            // bit wonky, but this is the only spot currently where modules and expressions exist
+            // in the same namespace.
+            // TODO consider if we want to just force all of these checks into the well-known
+            // attribute setup
+            PV::ModuleAccess(sp!(ident_loc, PN::One(n)))
+                if context.aliases.module_alias_get(&n).is_some() =>
+            {
+                let sp!(_, mident_) = context.aliases.module_alias_get(&n).unwrap();
+                let mident = sp(ident_loc, mident_);
+                if context.module_members.get(&mident).is_none() {
+                    context.env.add_diag(diag!(
+                        NameResolution::UnboundModule,
+                        (ident_loc, format!("Unbound module '{}'", mident))
+                    ));
+                }
+                EV::Module(mident)
+            }
+            PV::ModuleAccess(sp!(ident_loc, PN::Two(sp!(aloc, LN::Name(n1)), n2)))
+                if context
+                    .named_address_mapping
+                    .as_ref()
+                    .map(|m| m.contains_key(&n1.value))
+                    .unwrap_or(false) =>
+            {
+                let addr = address(context, false, sp(aloc, LN::Name(n1)));
+                let mident = sp(ident_loc, ModuleIdent_::new(addr, ModuleName(n2)));
+                if context.module_members.get(&mident).is_none() {
+                    context.env.add_diag(diag!(
+                        NameResolution::UnboundModule,
+                        (ident_loc, format!("Unbound module '{}'", mident))
+                    ));
+                }
+                EV::Module(mident)
+            }
             PV::ModuleAccess(ma) => EV::ModuleAccess(name_access_chain(context, Access::Type, ma)?),
         },
     ))
@@ -992,7 +1038,7 @@ fn struct_def(
 ) {
     let (sname, sdef) = struct_def_(context, pstruct);
     if let Err(_old_loc) = structs.add(sname, sdef) {
-        assert!(context.env.has_diags())
+        assert!(context.env.has_errors())
     }
 }
 
@@ -1080,7 +1126,7 @@ fn friend(
                 ));
             }
         },
-        None => assert!(context.env.has_diags()),
+        None => assert!(context.env.has_errors()),
     };
 }
 
@@ -1107,7 +1153,7 @@ fn constant(
 ) {
     let (name, constant) = constant_(context, pconstant);
     if let Err(_old_loc) = constants.add(name, constant) {
-        assert!(context.env.has_diags())
+        assert!(context.env.has_errors())
     }
 }
 
@@ -1144,7 +1190,7 @@ fn function(
 ) {
     let (fname, fdef) = function_(context, pfunction);
     if let Err(_old_loc) = functions.add(fname, fdef) {
-        assert!(context.env.has_diags())
+        assert!(context.env.has_errors())
     }
 }
 
@@ -1187,7 +1233,7 @@ fn visibility(context: &mut Context, pvisibility: P::Visibility) -> E::Visibilit
     match pvisibility {
         P::Visibility::Public(loc) => E::Visibility::Public(loc),
         P::Visibility::Script(loc) => {
-            debug_assert!(context.env.has_diags());
+            assert!(!context.env.has_errors());
             E::Visibility::Public(loc)
         }
         P::Visibility::Friend(loc) => E::Visibility::Friend(loc),
@@ -1534,7 +1580,7 @@ fn type_(context: &mut Context, sp!(loc, pt_): P::Type) -> E::Type {
             let tyargs = types(context, ptyargs);
             match name_access_chain(context, Access::Type, *pn) {
                 None => {
-                    assert!(context.env.has_diags());
+                    assert!(context.env.has_errors());
                     ET::UnresolvedError
                 }
                 Some(n) => ET::Apply(n, tyargs),
@@ -1720,7 +1766,7 @@ fn sequence_item(context: &mut Context, sp!(loc, pitem_): P::SequenceItem) -> E:
             let ty_opt = pty_opt.map(|t| type_(context, t));
             match b_opt {
                 None => {
-                    assert!(context.env.has_diags());
+                    assert!(context.env.has_errors());
                     ES::Seq(sp(loc, E::Exp_::UnresolvedError))
                 }
                 Some(b) => ES::Declare(b, ty_opt),
@@ -1736,7 +1782,7 @@ fn sequence_item(context: &mut Context, sp!(loc, pitem_): P::SequenceItem) -> E:
             };
             match b_opt {
                 None => {
-                    assert!(context.env.has_diags());
+                    assert!(context.env.has_errors());
                     ES::Seq(sp(loc, E::Exp_::UnresolvedError))
                 }
                 Some(b) => ES::Bind(b, e),
@@ -1762,7 +1808,7 @@ fn exp_(context: &mut Context, sp!(loc, pe_): P::Exp) -> E::Exp {
         PE::Value(pv) => match value(context, pv) {
             Some(v) => EE::Value(v),
             None => {
-                assert!(context.env.has_diags());
+                assert!(context.env.has_errors());
                 EE::UnresolvedError
             }
         },
@@ -1785,7 +1831,7 @@ fn exp_(context: &mut Context, sp!(loc, pe_): P::Exp) -> E::Exp {
             match en_opt {
                 Some(en) => EE::Name(en, tys_opt),
                 None => {
-                    assert!(context.env.has_diags());
+                    assert!(context.env.has_errors());
                     EE::UnresolvedError
                 }
             }
@@ -1797,7 +1843,7 @@ fn exp_(context: &mut Context, sp!(loc, pe_): P::Exp) -> E::Exp {
             match en_opt {
                 Some(en) => EE::Call(en, is_macro, tys_opt, ers),
                 None => {
-                    assert!(context.env.has_diags());
+                    assert!(context.env.has_errors());
                     EE::UnresolvedError
                 }
             }
@@ -1813,7 +1859,7 @@ fn exp_(context: &mut Context, sp!(loc, pe_): P::Exp) -> E::Exp {
             match en_opt {
                 Some(en) => EE::Pack(en, tys_opt, efields),
                 None => {
-                    assert!(context.env.has_diags());
+                    assert!(context.env.has_errors());
                     EE::UnresolvedError
                 }
             }
@@ -1848,7 +1894,7 @@ fn exp_(context: &mut Context, sp!(loc, pe_): P::Exp) -> E::Exp {
                 match bs_opt {
                     Some(bs) => EE::Lambda(bs, Box::new(e)),
                     None => {
-                        assert!(context.env.has_diags());
+                        assert!(context.env.has_errors());
                         EE::UnresolvedError
                     }
                 }
@@ -1872,7 +1918,7 @@ fn exp_(context: &mut Context, sp!(loc, pe_): P::Exp) -> E::Exp {
                 match rs_opt {
                     Some(rs) => EE::Quant(k, rs, rtrs, rc, Box::new(re)),
                     None => {
-                        assert!(context.env.has_diags());
+                        assert!(context.env.has_errors());
                         EE::UnresolvedError
                     }
                 }
@@ -1888,7 +1934,7 @@ fn exp_(context: &mut Context, sp!(loc, pe_): P::Exp) -> E::Exp {
             let er = exp(context, *rhs);
             match l_opt {
                 None => {
-                    assert!(context.env.has_diags());
+                    assert!(context.env.has_errors());
                     EE::UnresolvedError
                 }
                 Some(LValue::Assigns(al)) => EE::Assign(al, er),
@@ -1926,7 +1972,7 @@ fn exp_(context: &mut Context, sp!(loc, pe_): P::Exp) -> E::Exp {
         pdotted_ @ PE::Dot(_, _) => match exp_dotted(context, sp(loc, pdotted_)) {
             Some(edotted) => EE::ExpDotted(Box::new(edotted)),
             None => {
-                assert!(context.env.has_diags());
+                assert!(context.env.has_errors());
                 EE::UnresolvedError
             }
         },
@@ -1987,6 +2033,20 @@ fn value(context: &mut Context, sp!(loc, pvalue_): P::Value) -> Option<E::Value>
                 return None;
             }
         },
+        PV::Num(s) if s.ends_with("u16") => match parse_u16(&s[..s.len() - 3]) {
+            Ok((u, _format)) => EV::U16(u),
+            Err(_) => {
+                context.env.add_diag(num_too_big_error(loc, "'u16'"));
+                return None;
+            }
+        },
+        PV::Num(s) if s.ends_with("u32") => match parse_u32(&s[..s.len() - 3]) {
+            Ok((u, _format)) => EV::U32(u),
+            Err(_) => {
+                context.env.add_diag(num_too_big_error(loc, "'u32'"));
+                return None;
+            }
+        },
         PV::Num(s) if s.ends_with("u64") => match parse_u64(&s[..s.len() - 3]) {
             Ok((u, _format)) => EV::U64(u),
             Err(_) => {
@@ -2001,12 +2061,20 @@ fn value(context: &mut Context, sp!(loc, pvalue_): P::Value) -> Option<E::Value>
                 return None;
             }
         },
-        PV::Num(s) => match parse_u128(&s) {
+        PV::Num(s) if s.ends_with("u256") => match parse_u256(&s[..s.len() - 4]) {
+            Ok((u, _format)) => EV::U256(u),
+            Err(_) => {
+                context.env.add_diag(num_too_big_error(loc, "'u256'"));
+                return None;
+            }
+        },
+
+        PV::Num(s) => match parse_u256(&s) {
             Ok((u, _format)) => EV::InferredNum(u),
             Err(_) => {
                 context.env.add_diag(num_too_big_error(
                     loc,
-                    "the largest possible integer type, 'u128'",
+                    "the largest possible integer type, 'u256'",
                 ));
                 return None;
             }
@@ -2015,7 +2083,7 @@ fn value(context: &mut Context, sp!(loc, pvalue_): P::Value) -> Option<E::Value>
         PV::HexString(s) => match hex_string::decode(loc, &s) {
             Ok(v) => EV::Bytearray(v),
             Err(e) => {
-                context.env.add_diag(e);
+                context.env.add_diag(*e);
                 return None;
             }
         },
diff --git a/language/move-compiler/src/hlir/ast.rs b/language/move-compiler/src/hlir/ast.rs
index f5be5826b4..fb8b509c7e 100644
--- a/language/move-compiler/src/hlir/ast.rs
+++ b/language/move-compiler/src/hlir/ast.rs
@@ -66,7 +66,7 @@ pub struct ModuleDefinition {
 // Structs
 //**************************************************************************************************
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub struct StructDefinition {
     pub attributes: Attributes,
     pub abilities: AbilitySet,
@@ -74,7 +74,7 @@ pub struct StructDefinition {
     pub fields: StructFields,
 }
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub enum StructFields {
     Defined(Vec<(Field, BaseType)>),
     Native(Loc),
@@ -96,7 +96,7 @@ pub struct Constant {
 // Functions
 //**************************************************************************************************
 
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
 pub struct FunctionSignature {
     pub type_parameters: Vec<TParam>,
     pub parameters: Vec<(Var, SingleType)>,
@@ -145,14 +145,14 @@ pub enum BaseType_ {
 }
 pub type BaseType = Spanned<BaseType_>;
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub enum SingleType_ {
     Base(BaseType),
     Ref(bool, BaseType),
 }
 pub type SingleType = Spanned<SingleType_>;
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 #[allow(clippy::large_enum_variant)]
 pub enum Type_ {
     Unit,
@@ -238,7 +238,7 @@ pub type LValue = Spanned<LValue_>;
 // Expressions
 //**************************************************************************************************
 
-#[derive(Debug, PartialEq, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub enum UnitCase {
     Trailing,
     Implicit,
@@ -254,7 +254,7 @@ pub struct ModuleCall {
     pub acquires: BTreeMap<StructName, Loc>,
 }
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub enum BuiltinFunction_ {
     MoveTo(BaseType),
     MoveFrom(BaseType),
@@ -269,10 +269,16 @@ pub enum Value_ {
     Address(NumericalAddress),
     // <num>u8
     U8(u8),
+    // <num>u16
+    U16(u16),
+    // <num>u32
+    U32(u32),
     // <num>u64
     U64(u64),
     // <num>u128
     U128(u128),
+    // <num>u256
+    U256(move_core_types::u256::U256),
     // true
     // false
     Bool(bool),
@@ -281,7 +287,7 @@ pub enum Value_ {
 }
 pub type Value = Spanned<Value_>;
 
-#[derive(Debug, PartialEq, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub enum MoveOpAnnotation {
     // 'move' annotated by the user
     FromUser,
@@ -431,7 +437,7 @@ impl BaseType_ {
         use BuiltinTypeName_::*;
 
         let kind = match b_ {
-            U8 | U64 | U128 | Bool | Address => AbilitySet::primitives(loc),
+            U8 | U16 | U32 | U64 | U128 | U256 | Bool | Address => AbilitySet::primitives(loc),
             Signer => AbilitySet::signer(loc),
             Vector => {
                 let declared_abilities = AbilitySet::collection(loc);
@@ -472,6 +478,14 @@ impl BaseType_ {
         Self::builtin(loc, BuiltinTypeName_::U8, vec![])
     }
 
+    pub fn u16(loc: Loc) -> BaseType {
+        Self::builtin(loc, BuiltinTypeName_::U16, vec![])
+    }
+
+    pub fn u32(loc: Loc) -> BaseType {
+        Self::builtin(loc, BuiltinTypeName_::U32, vec![])
+    }
+
     pub fn u64(loc: Loc) -> BaseType {
         Self::builtin(loc, BuiltinTypeName_::U64, vec![])
     }
@@ -479,6 +493,10 @@ impl BaseType_ {
     pub fn u128(loc: Loc) -> BaseType {
         Self::builtin(loc, BuiltinTypeName_::U128, vec![])
     }
+
+    pub fn u256(loc: Loc) -> BaseType {
+        Self::builtin(loc, BuiltinTypeName_::U256, vec![])
+    }
 }
 
 impl SingleType_ {
@@ -498,6 +516,14 @@ impl SingleType_ {
         Self::base(BaseType_::u8(loc))
     }
 
+    pub fn u16(loc: Loc) -> SingleType {
+        Self::base(BaseType_::u16(loc))
+    }
+
+    pub fn u32(loc: Loc) -> SingleType {
+        Self::base(BaseType_::u32(loc))
+    }
+
     pub fn u64(loc: Loc) -> SingleType {
         Self::base(BaseType_::u64(loc))
     }
@@ -506,6 +532,10 @@ impl SingleType_ {
         Self::base(BaseType_::u128(loc))
     }
 
+    pub fn u256(loc: Loc) -> SingleType {
+        Self::base(BaseType_::u256(loc))
+    }
+
     pub fn abilities(&self, loc: Loc) -> AbilitySet {
         match self {
             SingleType_::Ref(_, _) => AbilitySet::references(loc),
@@ -535,6 +565,14 @@ impl Type_ {
         Self::single(SingleType_::u8(loc))
     }
 
+    pub fn u16(loc: Loc) -> Type {
+        Self::single(SingleType_::u16(loc))
+    }
+
+    pub fn u32(loc: Loc) -> Type {
+        Self::single(SingleType_::u32(loc))
+    }
+
     pub fn u64(loc: Loc) -> Type {
         Self::single(SingleType_::u64(loc))
     }
@@ -543,6 +581,10 @@ impl Type_ {
         Self::single(SingleType_::u128(loc))
     }
 
+    pub fn u256(loc: Loc) -> Type {
+        Self::single(SingleType_::u256(loc))
+    }
+
     pub fn type_at_index(&self, idx: usize) -> &SingleType {
         match self {
             Type_::Unit => panic!("ICE type mismatch on index lookup"),
@@ -990,8 +1032,11 @@ impl AstDebug for Value_ {
         match self {
             V::Address(addr) => w.write(&format!("@{}", addr)),
             V::U8(u) => w.write(&format!("{}u8", u)),
+            V::U16(u) => w.write(&format!("{}u16", u)),
+            V::U32(u) => w.write(&format!("{}u32", u)),
             V::U64(u) => w.write(&format!("{}u64", u)),
             V::U128(u) => w.write(&format!("{}u128", u)),
+            V::U256(u) => w.write(&format!("{}u256", u)),
             V::Bool(b) => w.write(&format!("{}", b)),
             V::Vector(ty, elems) => {
                 w.write("vector#value");
diff --git a/language/move-compiler/src/hlir/translate.rs b/language/move-compiler/src/hlir/translate.rs
index 76c52e28e8..b10ab61f57 100644
--- a/language/move-compiler/src/hlir/translate.rs
+++ b/language/move-compiler/src/hlir/translate.rs
@@ -62,7 +62,7 @@ pub fn display_var(s: Symbol) -> DisplayVar {
 
 struct Context<'env> {
     env: &'env mut CompilationEnv,
-    structs: UniqueMap<StructName, UniqueMap<Field, usize>>,
+    structs: UniqueMap<ModuleIdent, UniqueMap<StructName, UniqueMap<Field, usize>>>,
     function_locals: UniqueMap<Var, H::SingleType>,
     local_scope: UniqueMap<Var, Var>,
     used_locals: BTreeSet<Var>,
@@ -71,10 +71,44 @@ struct Context<'env> {
 }
 
 impl<'env> Context<'env> {
-    pub fn new(env: &'env mut CompilationEnv) -> Self {
+    pub fn new(
+        env: &'env mut CompilationEnv,
+        pre_compiled_lib_opt: Option<&FullyCompiledProgram>,
+        prog: &T::Program,
+    ) -> Self {
+        fn add_struct_fields(
+            structs: &mut UniqueMap<ModuleIdent, UniqueMap<StructName, UniqueMap<Field, usize>>>,
+            mident: ModuleIdent,
+            struct_defs: &UniqueMap<StructName, N::StructDefinition>,
+        ) {
+            let mut cur_structs = UniqueMap::new();
+            for (sname, sdef) in struct_defs.key_cloned_iter() {
+                let mut fields = UniqueMap::new();
+                let field_map = match &sdef.fields {
+                    N::StructFields::Native(_) => continue,
+                    N::StructFields::Defined(m) => m,
+                };
+                for (field, (idx, _)) in field_map.key_cloned_iter() {
+                    fields.add(field, *idx).unwrap();
+                }
+                cur_structs.add(sname, fields).unwrap();
+            }
+            structs.remove(&mident);
+            structs.add(mident, cur_structs).unwrap();
+        }
+
+        let mut structs = UniqueMap::new();
+        if let Some(pre_compiled_lib) = pre_compiled_lib_opt {
+            for (mident, mdef) in pre_compiled_lib.typing.modules.key_cloned_iter() {
+                add_struct_fields(&mut structs, mident, &mdef.structs)
+            }
+        }
+        for (mident, mdef) in prog.modules.key_cloned_iter() {
+            add_struct_fields(&mut structs, mident, &mdef.structs)
+        }
         Context {
             env,
-            structs: UniqueMap::new(),
+            structs,
             function_locals: UniqueMap::new(),
             local_scope: UniqueMap::new(),
             used_locals: BTreeSet::new(),
@@ -121,26 +155,18 @@ impl<'env> Context<'env> {
         remapped
     }
 
-    pub fn add_struct_fields(&mut self, structs: &UniqueMap<StructName, H::StructDefinition>) {
-        assert!(self.structs.is_empty());
-        for (sname, sdef) in structs.key_cloned_iter() {
-            let mut fields = UniqueMap::new();
-            let field_map = match &sdef.fields {
-                H::StructFields::Native(_) => continue,
-                H::StructFields::Defined(m) => m,
-            };
-            for (idx, (field, _)) in field_map.iter().enumerate() {
-                fields.add(*field, idx).unwrap();
-            }
-            self.structs.add(sname, fields).unwrap();
-        }
-    }
-
-    pub fn fields(&self, struct_name: &StructName) -> Option<&UniqueMap<Field, usize>> {
-        let fields = self.structs.get(struct_name);
+    pub fn fields(
+        &self,
+        module: &ModuleIdent,
+        struct_name: &StructName,
+    ) -> Option<&UniqueMap<Field, usize>> {
+        let fields = self
+            .structs
+            .get(module)
+            .and_then(|structs| structs.get(struct_name));
         // if fields are none, the struct must be defined in another module,
         // in that case, there should be errors
-        assert!(fields.is_some() || self.env.has_diags());
+        assert!(fields.is_some() || self.env.has_errors());
         fields
     }
 
@@ -156,10 +182,10 @@ impl<'env> Context<'env> {
 
 pub fn program(
     compilation_env: &mut CompilationEnv,
-    _pre_compiled_lib: Option<&FullyCompiledProgram>,
+    pre_compiled_lib: Option<&FullyCompiledProgram>,
     prog: T::Program,
 ) -> H::Program {
-    let mut context = Context::new(compilation_env);
+    let mut context = Context::new(compilation_env, pre_compiled_lib, &prog);
     let T::Program {
         modules: tmodules,
         scripts: tscripts,
@@ -197,12 +223,9 @@ fn module(
     } = mdef;
 
     let structs = tstructs.map(|name, s| struct_def(context, name, s));
-    context.add_struct_fields(&structs);
 
     let constants = tconstants.map(|name, c| constant(context, name, c));
     let functions = tfunctions.map(|name, f| function(context, name, f));
-
-    context.structs = UniqueMap::new();
     (
         module_ident,
         H::ModuleDefinition {
@@ -663,7 +686,7 @@ fn assign_command(
     let mut after = Block::new();
     for (idx, a) in assigns.into_iter().enumerate() {
         let a_ty = rvalue.ty.value.type_at_index(idx);
-        let (ls, mut af) = assign(context, result, a, a_ty);
+        let (ls, mut af) = assign(context, a, a_ty);
 
         lvalues.push(ls);
         after.append(&mut af);
@@ -677,7 +700,6 @@ fn assign_command(
 
 fn assign(
     context: &mut Context,
-    result: &mut Block,
     sp!(loc, ta_): T::LValue,
     rvalue_ty: &H::SingleType,
 ) -> (H::LValue, Block) {
@@ -690,20 +712,20 @@ fn assign(
             context.remapped_local(v),
             Box::new(single_type(context, *st)),
         ),
-        A::Unpack(_m, s, tbs, tfields) => {
+        A::Unpack(m, s, tbs, tfields) => {
             let bs = base_types(context, tbs);
 
             let mut fields = vec![];
-            for (decl_idx, f, bt, tfa) in assign_fields(context, &s, tfields) {
+            for (decl_idx, f, bt, tfa) in assign_fields(context, &m, &s, tfields) {
                 assert!(fields.len() == decl_idx);
                 let st = &H::SingleType_::base(bt);
-                let (fa, mut fafter) = assign(context, result, tfa, st);
+                let (fa, mut fafter) = assign(context, tfa, st);
                 after.append(&mut fafter);
                 fields.push((f, fa))
             }
             L::Unpack(s, bs, fields)
         }
-        A::BorrowUnpack(mut_, _m, s, _tss, tfields) => {
+        A::BorrowUnpack(mut_, m, s, _tss, tfields) => {
             let tmp = context.new_temp(loc, rvalue_ty.clone());
             let copy_tmp = || {
                 let copy_tmp_ = E::Copy {
@@ -712,7 +734,9 @@ fn assign(
                 };
                 H::exp(H::Type_::single(rvalue_ty.clone()), sp(loc, copy_tmp_))
             };
-            let fields = assign_fields(context, &s, tfields).into_iter().enumerate();
+            let fields = assign_fields(context, &m, &s, tfields)
+                .into_iter()
+                .enumerate();
             for (idx, (decl_idx, f, bt, tfa)) in fields {
                 assert!(idx == decl_idx);
                 let floc = tfa.loc;
@@ -729,10 +753,11 @@ fn assign(
 
 fn assign_fields(
     context: &Context,
+    m: &ModuleIdent,
     s: &StructName,
     tfields: Fields<(N::Type, T::LValue)>,
 ) -> Vec<(usize, Field, H::BaseType, T::LValue)> {
-    let decl_fields = context.fields(s);
+    let decl_fields = context.fields(m, s);
     let mut count = 0;
     let mut decl_field = |f: &Field| -> usize {
         match decl_fields {
@@ -1189,14 +1214,14 @@ fn exp_impl(
             HE::UnaryExp(op, e)
         }
 
-        TE::Pack(_, s, tbs, tfields) => {
+        TE::Pack(m, s, tbs, tfields) => {
             let bs = base_types(context, tbs);
 
-            let decl_fields = context.fields(&s);
+            let decl_fields = context.fields(&m, &s);
             let mut count = 0;
             let mut decl_field = |f: &Field| -> usize {
                 match decl_fields {
-                    Some(m) => *m.get(f).unwrap(),
+                    Some(field_map) => *field_map.get(f).unwrap(),
                     None => {
                         // none can occur with errors in typing
                         let i = count;
@@ -1240,8 +1265,8 @@ fn exp_impl(
                 let mut fields = (0..num_fields).map(|_| None).collect::<Vec<_>>();
                 for (decl_idx, f, _exp_idx, bt, tf) in texp_fields {
                     // Might have too many arguments, there will be an error from typing
-                    if decl_idx > fields.len() {
-                        debug_assert!(context.env.has_diags());
+                    if decl_idx >= fields.len() {
+                        debug_assert!(context.env.has_errors());
                         break;
                     }
                     let bt = base_type(context, bt);
@@ -1256,7 +1281,7 @@ fn exp_impl(
                     .into_iter()
                     .filter_map(|o| {
                         // if o is None, context should have errors
-                        debug_assert!(o.is_some() || context.env.has_diags());
+                        debug_assert!(o.is_some() || context.env.has_errors());
                         o
                     })
                     .collect()
@@ -1316,8 +1341,11 @@ fn exp_impl(
             let e = exp(context, result, None, *te);
             let bt = match rhs_ty.value.builtin_name() {
                 Some(bt @ sp!(_, BT::U8))
+                | Some(bt @ sp!(_, BT::U16))
+                | Some(bt @ sp!(_, BT::U32))
                 | Some(bt @ sp!(_, BT::U64))
-                | Some(bt @ sp!(_, BT::U128)) => bt.clone(),
+                | Some(bt @ sp!(_, BT::U128))
+                | Some(bt @ sp!(_, BT::U256)) => bt.clone(),
                 _ => panic!("ICE typing failed for cast"),
             };
             HE::Cast(e, bt)
@@ -1338,7 +1366,7 @@ fn exp_impl(
             HE::Spec(u, used_locals)
         }
         TE::UnresolvedError => {
-            assert!(context.env.has_diags());
+            assert!(context.env.has_errors());
             HE::UnresolvedError
         }
 
@@ -1530,8 +1558,11 @@ fn value(_context: &mut Context, sp!(loc, ev_): E::Value) -> H::Value {
         EV::InferredNum(_) => panic!("ICE should have been expanded"),
         EV::Address(a) => HV::Address(a.into_addr_bytes()),
         EV::U8(u) => HV::U8(u),
+        EV::U16(u) => HV::U16(u),
+        EV::U32(u) => HV::U32(u),
         EV::U64(u) => HV::U64(u),
         EV::U128(u) => HV::U128(u),
+        EV::U256(u) => HV::U256(u),
         EV::Bool(u) => HV::Bool(u),
         EV::Bytearray(bytes) => HV::Vector(
             Box::new(H::BaseType_::u8(loc)),
@@ -1578,7 +1609,7 @@ fn needs_freeze(context: &Context, sp!(_, actual): &H::Type, sp!(_, expected): &
             }
         }
         (_actual, _expected) => {
-            assert!(context.env.has_diags());
+            assert!(context.env.has_errors());
             Freeze::NotNeeded
         }
     }
diff --git a/language/move-compiler/src/interface_generator.rs b/language/move-compiler/src/interface_generator.rs
index 03444da7ca..bd37bf2967 100644
--- a/language/move-compiler/src/interface_generator.rs
+++ b/language/move-compiler/src/interface_generator.rs
@@ -15,6 +15,8 @@ use move_binary_format::{
 use move_core_types::language_storage::ModuleId;
 use std::{collections::BTreeMap, fs};
 
+pub const NATIVE_INTERFACE: &str = "native_interface";
+
 macro_rules! push_line {
     ($s:ident, $e:expr) => {{
         $s = format!("{}{}\n", $s, $e);
@@ -88,6 +90,7 @@ pub fn write_module_to_string(
         members.push(format!("    {}", DISCLAIMER));
     }
     for fdef in externally_visible_funs {
+        members.push(format!("    #[{}]", NATIVE_INTERFACE));
         members.push(write_function_def(&mut context, fdef));
     }
     if has_externally_visible_funs {
@@ -343,8 +346,11 @@ fn write_signature_token(ctx: &mut Context, t: &SignatureToken) -> String {
     match t {
         SignatureToken::Bool => "bool".to_string(),
         SignatureToken::U8 => "u8".to_string(),
+        SignatureToken::U16 => "u16".to_string(),
+        SignatureToken::U32 => "u32".to_string(),
         SignatureToken::U64 => "u64".to_string(),
         SignatureToken::U128 => "u128".to_string(),
+        SignatureToken::U256 => "u256".to_string(),
         SignatureToken::Address => "address".to_string(),
         SignatureToken::Signer => "signer".to_string(),
         SignatureToken::Vector(inner) => format!("vector<{}>", write_signature_token(ctx, inner)),
diff --git a/language/move-compiler/src/lib.rs b/language/move-compiler/src/lib.rs
index 2aaa108c12..11cbb16168 100644
--- a/language/move-compiler/src/lib.rs
+++ b/language/move-compiler/src/lib.rs
@@ -22,6 +22,7 @@ pub mod shared;
 mod to_bytecode;
 pub mod typing;
 pub mod unit_test;
+pub mod verification;
 
 pub use command_line::{
     compiler::{
diff --git a/language/move-compiler/src/naming/ast.rs b/language/move-compiler/src/naming/ast.rs
index fa210cfe44..8aca308fe6 100644
--- a/language/move-compiler/src/naming/ast.rs
+++ b/language/move-compiler/src/naming/ast.rs
@@ -68,7 +68,7 @@ pub struct ModuleDefinition {
 // Structs
 //**************************************************************************************************
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub struct StructDefinition {
     pub attributes: Attributes,
     pub abilities: AbilitySet,
@@ -76,13 +76,13 @@ pub struct StructDefinition {
     pub fields: StructFields,
 }
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub struct StructTypeParameter {
     pub param: TParam,
     pub is_phantom: bool,
 }
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub enum StructFields {
     Defined(Fields<Type>),
     Native(Loc),
@@ -92,7 +92,7 @@ pub enum StructFields {
 // Functions
 //**************************************************************************************************
 
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
 pub struct FunctionSignature {
     pub type_parameters: Vec<TParam>,
     pub parameters: Vec<(Var, Type)>,
@@ -140,10 +140,16 @@ pub enum BuiltinTypeName_ {
     Signer,
     // u8
     U8,
+    // u16
+    U16,
+    // u32
+    U32,
     // u64
     U64,
     // u128
     U128,
+    // u256
+    U256,
     // Vector
     Vector,
     // bool
@@ -209,7 +215,7 @@ pub enum ExpDotted_ {
 }
 pub type ExpDotted = Spanned<ExpDotted_>;
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 #[allow(clippy::large_enum_variant)]
 pub enum BuiltinFunction_ {
     MoveTo(Option<Type>),
@@ -293,8 +299,11 @@ static BUILTIN_TYPE_ALL_NAMES: Lazy<BTreeSet<Symbol>> = Lazy::new(|| {
         BuiltinTypeName_::ADDRESS,
         BuiltinTypeName_::SIGNER,
         BuiltinTypeName_::U_8,
+        BuiltinTypeName_::U_16,
+        BuiltinTypeName_::U_32,
         BuiltinTypeName_::U_64,
         BuiltinTypeName_::U_128,
+        BuiltinTypeName_::U_256,
         BuiltinTypeName_::BOOL,
         BuiltinTypeName_::VECTOR,
     ]
@@ -306,8 +315,11 @@ static BUILTIN_TYPE_ALL_NAMES: Lazy<BTreeSet<Symbol>> = Lazy::new(|| {
 static BUILTIN_TYPE_NUMERIC: Lazy<BTreeSet<BuiltinTypeName_>> = Lazy::new(|| {
     [
         BuiltinTypeName_::U8,
+        BuiltinTypeName_::U16,
+        BuiltinTypeName_::U32,
         BuiltinTypeName_::U64,
         BuiltinTypeName_::U128,
+        BuiltinTypeName_::U256,
     ]
     .iter()
     .cloned()
@@ -324,25 +336,28 @@ impl BuiltinTypeName_ {
     pub const ADDRESS: &'static str = "address";
     pub const SIGNER: &'static str = "signer";
     pub const U_8: &'static str = "u8";
+    pub const U_16: &'static str = "u16";
+    pub const U_32: &'static str = "u32";
     pub const U_64: &'static str = "u64";
     pub const U_128: &'static str = "u128";
+    pub const U_256: &'static str = "u256";
     pub const BOOL: &'static str = "bool";
     pub const VECTOR: &'static str = "vector";
 
     pub fn all_names() -> &'static BTreeSet<Symbol> {
-        &*BUILTIN_TYPE_ALL_NAMES
+        &BUILTIN_TYPE_ALL_NAMES
     }
 
     pub fn numeric() -> &'static BTreeSet<BuiltinTypeName_> {
-        &*BUILTIN_TYPE_NUMERIC
+        &BUILTIN_TYPE_NUMERIC
     }
 
     pub fn bits() -> &'static BTreeSet<BuiltinTypeName_> {
-        &*BUILTIN_TYPE_BITS
+        &BUILTIN_TYPE_BITS
     }
 
     pub fn ordered() -> &'static BTreeSet<BuiltinTypeName_> {
-        &*BUILTIN_TYPE_ORDERED
+        &BUILTIN_TYPE_ORDERED
     }
 
     pub fn is_numeric(&self) -> bool {
@@ -355,8 +370,11 @@ impl BuiltinTypeName_ {
             BT::ADDRESS => Some(BT::Address),
             BT::SIGNER => Some(BT::Signer),
             BT::U_8 => Some(BT::U8),
+            BT::U_16 => Some(BT::U16),
+            BT::U_32 => Some(BT::U32),
             BT::U_64 => Some(BT::U64),
             BT::U_128 => Some(BT::U128),
+            BT::U_256 => Some(BT::U256),
             BT::BOOL => Some(BT::Bool),
             BT::VECTOR => Some(BT::Vector),
             _ => None,
@@ -367,7 +385,9 @@ impl BuiltinTypeName_ {
         use BuiltinTypeName_ as B;
         // Match here to make sure this function is fixed when collections are added
         match self {
-            B::Address | B::U8 | B::U64 | B::U128 | B::Bool => AbilitySet::primitives(loc),
+            B::Address | B::U8 | B::U16 | B::U32 | B::U64 | B::U128 | B::U256 | B::Bool => {
+                AbilitySet::primitives(loc)
+            }
             B::Signer => AbilitySet::signer(loc),
             B::Vector => AbilitySet::collection(loc),
         }
@@ -377,7 +397,15 @@ impl BuiltinTypeName_ {
         use BuiltinTypeName_ as B;
         // Match here to make sure this function is fixed when collections are added
         match self {
-            B::Address | B::Signer | B::U8 | B::U64 | B::U128 | B::Bool => vec![],
+            B::Address
+            | B::Signer
+            | B::U8
+            | B::U16
+            | B::U32
+            | B::U64
+            | B::U128
+            | B::U256
+            | B::Bool => vec![],
             B::Vector => vec![AbilitySet::empty()],
         }
     }
@@ -420,7 +448,7 @@ impl BuiltinFunction_ {
     pub const ASSERT_MACRO: &'static str = "assert";
 
     pub fn all_names() -> &'static BTreeSet<Symbol> {
-        &*BUILTIN_FUNCTION_ALL_NAMES
+        &BUILTIN_FUNCTION_ALL_NAMES
     }
 
     pub fn resolve(name_str: &str, arg: Option<Type>) -> Option<Self> {
@@ -454,7 +482,9 @@ impl Type_ {
     pub fn builtin_(b: BuiltinTypeName, ty_args: Vec<Type>) -> Type_ {
         use BuiltinTypeName_ as B;
         let abilities = match &b.value {
-            B::Address | B::U8 | B::U64 | B::U128 | B::Bool => Some(AbilitySet::primitives(b.loc)),
+            B::Address | B::U8 | B::U16 | B::U32 | B::U64 | B::U128 | B::U256 | B::Bool => {
+                Some(AbilitySet::primitives(b.loc))
+            }
             B::Signer => Some(AbilitySet::signer(b.loc)),
             B::Vector => None,
         };
@@ -482,6 +512,14 @@ impl Type_ {
         Self::builtin(loc, sp(loc, BuiltinTypeName_::U8), vec![])
     }
 
+    pub fn u16(loc: Loc) -> Type {
+        Self::builtin(loc, sp(loc, BuiltinTypeName_::U16), vec![])
+    }
+
+    pub fn u32(loc: Loc) -> Type {
+        Self::builtin(loc, sp(loc, BuiltinTypeName_::U32), vec![])
+    }
+
     pub fn u64(loc: Loc) -> Type {
         Self::builtin(loc, sp(loc, BuiltinTypeName_::U64), vec![])
     }
@@ -490,6 +528,10 @@ impl Type_ {
         Self::builtin(loc, sp(loc, BuiltinTypeName_::U128), vec![])
     }
 
+    pub fn u256(loc: Loc) -> Type {
+        Self::builtin(loc, sp(loc, BuiltinTypeName_::U256), vec![])
+    }
+
     pub fn vector(loc: Loc, elem: Type) -> Type {
         Self::builtin(loc, sp(loc, BuiltinTypeName_::Vector), vec![elem])
     }
@@ -521,8 +563,11 @@ impl Value_ {
             Address(_) => Type_::address(loc),
             InferredNum(_) => return None,
             U8(_) => Type_::u8(loc),
+            U16(_) => Type_::u16(loc),
+            U32(_) => Type_::u32(loc),
             U64(_) => Type_::u64(loc),
             U128(_) => Type_::u128(loc),
+            U256(_) => Type_::u256(loc),
             Bool(_) => Type_::bool(loc),
             Bytearray(_) => Type_::vector(loc, Type_::u8(loc)),
         })
@@ -543,8 +588,11 @@ impl fmt::Display for BuiltinTypeName_ {
                 BT::Address => BT::ADDRESS,
                 BT::Signer => BT::SIGNER,
                 BT::U8 => BT::U_8,
+                BT::U16 => BT::U_16,
+                BT::U32 => BT::U_32,
                 BT::U64 => BT::U_64,
                 BT::U128 => BT::U_128,
+                BT::U256 => BT::U_256,
                 BT::Bool => BT::BOOL,
                 BT::Vector => BT::VECTOR,
             }
diff --git a/language/move-compiler/src/naming/fake_natives.rs b/language/move-compiler/src/naming/fake_natives.rs
index 414907d638..40562b580f 100644
--- a/language/move-compiler/src/naming/fake_natives.rs
+++ b/language/move-compiler/src/naming/fake_natives.rs
@@ -5,6 +5,7 @@
 //! as 'native`, but do not appear in the compiled module. For developer sanity, they must be marked
 //! with the `FAKE_NATIVE_ATTR`
 
+use move_core_types::account_address::AccountAddress;
 use std::convert::TryInto;
 
 use crate::{
@@ -86,37 +87,26 @@ pub fn resolve_builtin(
     function: &FunctionName,
 ) -> Option<fn(Vec<IR::Type>) -> IR::Bytecode_> {
     let sp!(_, ModuleIdent_ { address, module }) = module;
-    let addr_name = match address {
-        Address::Numerical(Some(sp!(_, n_)), _) | Address::NamedUnassigned(sp!(_, n_)) => n_,
-        _ => return None,
+    // Only resolve if either (a) the address is named "std" or (b) its value is 0x1
+    match address {
+        Address::Numerical(Some(sp!(_, n)), _) | Address::NamedUnassigned(sp!(_, n))
+            if n.as_str() == "std" => {}
+        Address::Numerical(_, sp!(_, a)) if a.into_inner() == AccountAddress::ONE => {}
+        _ => {
+            return None;
+        }
     };
-    Some(
-        match (
-            addr_name.as_str(),
-            module.value().as_str(),
-            function.value().as_str(),
-        ) {
-            ("std", "vector", "empty") => |tys| IR::Bytecode_::VecPack(expect_one_ty_arg(tys), 0),
-            ("std", "vector", "length") => |tys| IR::Bytecode_::VecLen(expect_one_ty_arg(tys)),
-            ("std", "vector", "borrow") => {
-                |tys| IR::Bytecode_::VecImmBorrow(expect_one_ty_arg(tys))
-            }
-            ("std", "vector", "push_back") => {
-                |tys| IR::Bytecode_::VecPushBack(expect_one_ty_arg(tys))
-            }
-            ("std", "vector", "borrow_mut") => {
-                |tys| IR::Bytecode_::VecMutBorrow(expect_one_ty_arg(tys))
-            }
-            ("std", "vector", "pop_back") => {
-                |tys| IR::Bytecode_::VecPopBack(expect_one_ty_arg(tys))
-            }
-            ("std", "vector", "destroy_empty") => {
-                |tys| IR::Bytecode_::VecUnpack(expect_one_ty_arg(tys), 0)
-            }
-            ("std", "vector", "swap") => |tys| IR::Bytecode_::VecSwap(expect_one_ty_arg(tys)),
-            _ => return None,
-        },
-    )
+    Some(match (module.value().as_str(), function.value().as_str()) {
+        ("vector", "empty") => |tys| IR::Bytecode_::VecPack(expect_one_ty_arg(tys), 0),
+        ("vector", "length") => |tys| IR::Bytecode_::VecLen(expect_one_ty_arg(tys)),
+        ("vector", "borrow") => |tys| IR::Bytecode_::VecImmBorrow(expect_one_ty_arg(tys)),
+        ("vector", "push_back") => |tys| IR::Bytecode_::VecPushBack(expect_one_ty_arg(tys)),
+        ("vector", "borrow_mut") => |tys| IR::Bytecode_::VecMutBorrow(expect_one_ty_arg(tys)),
+        ("vector", "pop_back") => |tys| IR::Bytecode_::VecPopBack(expect_one_ty_arg(tys)),
+        ("vector", "destroy_empty") => |tys| IR::Bytecode_::VecUnpack(expect_one_ty_arg(tys), 0),
+        ("vector", "swap") => |tys| IR::Bytecode_::VecSwap(expect_one_ty_arg(tys)),
+        _ => return None,
+    })
 }
 
 fn expect_one_ty_arg(ty_args: Vec<IR::Type>) -> IR::Type {
diff --git a/language/move-compiler/src/naming/translate.rs b/language/move-compiler/src/naming/translate.rs
index 353274b3f4..0220d9f753 100644
--- a/language/move-compiler/src/naming/translate.rs
+++ b/language/move-compiler/src/naming/translate.rs
@@ -250,7 +250,7 @@ impl<'env> Context<'env> {
         match ma_ {
             EA::Name(n) => match self.resolve_unscoped_type(&n) {
                 None => {
-                    assert!(self.env.has_diags());
+                    assert!(self.env.has_errors());
                     None
                 }
                 Some(rt) => {
@@ -264,7 +264,7 @@ impl<'env> Context<'env> {
             },
             EA::ModuleAccess(m, n) => match self.resolve_module_type(nloc, &m, &n) {
                 None => {
-                    assert!(self.env.has_diags());
+                    assert!(self.env.has_errors());
                     None
                 }
                 Some((_, _, _, arity)) => {
@@ -297,7 +297,7 @@ impl<'env> Context<'env> {
             },
             EA::ModuleAccess(m, n) => match self.resolve_module_constant(loc, &m, n) {
                 None => {
-                    assert!(self.env.has_diags());
+                    assert!(self.env.has_errors());
                     None
                 }
                 Some(cname) => Some((Some(m), cname)),
@@ -470,7 +470,7 @@ fn friend(context: &mut Context, mident: ModuleIdent, friend: E::Friend) -> Opti
     } else if context.resolve_module(&mident) {
         Some(friend)
     } else {
-        assert!(context.env.has_diags());
+        assert!(context.env.has_errors());
         None
     }
 }
@@ -506,7 +506,7 @@ fn function(
         acquires,
         body,
     };
-    fake_natives::function(&mut context.env, module_opt, name, &f);
+    fake_natives::function(context.env, module_opt, name, &f);
     f
 }
 
@@ -751,12 +751,12 @@ fn type_(context: &mut Context, sp!(loc, ety_): E::Type) -> N::Type {
         }
         ET::Ref(mut_, inner) => NT::Ref(mut_, Box::new(type_(context, *inner))),
         ET::UnresolvedError => {
-            assert!(context.env.has_diags());
+            assert!(context.env.has_errors());
             NT::UnresolvedError
         }
         ET::Apply(sp!(_, EN::Name(n)), tys) => match context.resolve_unscoped_type(&n) {
             None => {
-                assert!(context.env.has_diags());
+                assert!(context.env.has_errors());
                 NT::UnresolvedError
             }
             Some(RT::BuiltinType) => {
@@ -782,7 +782,7 @@ fn type_(context: &mut Context, sp!(loc, ety_): E::Type) -> N::Type {
         ET::Apply(sp!(nloc, EN::ModuleAccess(m, n)), tys) => {
             match context.resolve_module_type(nloc, &m, &n) {
                 None => {
-                    assert!(context.env.has_diags());
+                    assert!(context.env.has_errors());
                     NT::UnresolvedError
                 }
                 Some((_, _, _, arity)) => {
@@ -852,7 +852,7 @@ fn sequence_item(context: &mut Context, sp!(loc, ns_): E::SequenceItem) -> N::Se
             let tys = ty_opt.map(|t| type_(context, t));
             match bind_opt {
                 None => {
-                    assert!(context.env.has_diags());
+                    assert!(context.env.has_errors());
                     NS::Seq(sp(loc, N::Exp_::UnresolvedError))
                 }
                 Some(bind) => NS::Declare(bind, tys),
@@ -863,7 +863,7 @@ fn sequence_item(context: &mut Context, sp!(loc, ns_): E::SequenceItem) -> N::Se
             let e = exp_(context, e);
             match bind_opt {
                 None => {
-                    assert!(context.env.has_diags());
+                    assert!(context.env.has_errors());
                     NS::Seq(sp(loc, N::Exp_::UnresolvedError))
                 }
                 Some(bind) => NS::Bind(bind, e),
@@ -915,7 +915,7 @@ fn exp_(context: &mut Context, e: E::Exp) -> N::Exp {
             let ne = exp(context, *e);
             match na_opt {
                 None => {
-                    assert!(context.env.has_diags());
+                    assert!(context.env.has_errors());
                     NE::UnresolvedError
                 }
                 Some(na) => NE::Assign(na, ne),
@@ -926,7 +926,7 @@ fn exp_(context: &mut Context, e: E::Exp) -> N::Exp {
             let ner = exp(context, *er);
             match ndot_opt {
                 None => {
-                    assert!(context.env.has_diags());
+                    assert!(context.env.has_errors());
                     NE::UnresolvedError
                 }
                 Some(ndot) => NE::FieldMutate(ndot, ner),
@@ -950,7 +950,7 @@ fn exp_(context: &mut Context, e: E::Exp) -> N::Exp {
         EE::Pack(tn, etys_opt, efields) => {
             match context.resolve_struct_name(eloc, "construction", tn, etys_opt) {
                 None => {
-                    assert!(context.env.has_diags());
+                    assert!(context.env.has_errors());
                     NE::UnresolvedError
                 }
                 Some((m, sn, tys_opt)) => NE::Pack(
@@ -969,7 +969,7 @@ fn exp_(context: &mut Context, e: E::Exp) -> N::Exp {
         EE::Borrow(mut_, inner) => match *inner {
             sp!(_, EE::ExpDotted(edot)) => match dotted(context, *edot) {
                 None => {
-                    assert!(context.env.has_diags());
+                    assert!(context.env.has_errors());
                     NE::UnresolvedError
                 }
                 Some(d) => NE::Borrow(mut_, d),
@@ -982,7 +982,7 @@ fn exp_(context: &mut Context, e: E::Exp) -> N::Exp {
 
         EE::ExpDotted(edot) => match dotted(context, *edot) {
             None => {
-                assert!(context.env.has_diags());
+                assert!(context.env.has_errors());
                 NE::UnresolvedError
             }
             Some(d) => NE::DerefBorrow(d),
@@ -1017,7 +1017,7 @@ fn exp_(context: &mut Context, e: E::Exp) -> N::Exp {
                 EA::Name(n) if N::BuiltinFunction_::all_names().contains(&n.value) => {
                     match resolve_builtin_function(context, eloc, &n, ty_args) {
                         None => {
-                            assert!(context.env.has_diags());
+                            assert!(context.env.has_errors());
                             NE::UnresolvedError
                         }
                         Some(f) => NE::Builtin(sp(mloc, f), nes),
@@ -1033,7 +1033,7 @@ fn exp_(context: &mut Context, e: E::Exp) -> N::Exp {
                 }
                 EA::ModuleAccess(m, n) => match context.resolve_module_function(mloc, &m, &n) {
                     None => {
-                        assert!(context.env.has_diags());
+                        assert!(context.env.has_errors());
                         NE::UnresolvedError
                     }
                     Some(_) => NE::ModuleCall(m, FunctionName(n), ty_args, nes),
@@ -1064,7 +1064,7 @@ fn exp_(context: &mut Context, e: E::Exp) -> N::Exp {
             NE::Spec(u, used_locals)
         }
         EE::UnresolvedError => {
-            assert!(context.env.has_diags());
+            assert!(context.env.has_errors());
             NE::UnresolvedError
         }
         // `Name` matches name variants only allowed in specs (we handle the allowed ones above)
@@ -1078,7 +1078,7 @@ fn exp_(context: &mut Context, e: E::Exp) -> N::Exp {
 fn access_constant(context: &mut Context, ma: E::ModuleAccess) -> N::Exp_ {
     match context.resolve_constant(ma) {
         None => {
-            assert!(context.env.has_diags());
+            assert!(context.env.has_errors());
             N::Exp_::UnresolvedError
         }
         Some((m, c)) => N::Exp_::Constant(m, c),
diff --git a/language/move-compiler/src/parser/ast.rs b/language/move-compiler/src/parser/ast.rs
index f0809b7851..1a1612a070 100644
--- a/language/move-compiler/src/parser/ast.rs
+++ b/language/move-compiler/src/parser/ast.rs
@@ -201,7 +201,7 @@ new_name!(StructName);
 
 pub type ResourceLoc = Option<Loc>;
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub struct StructTypeParameter {
     pub is_phantom: bool,
     pub name: Name,
@@ -240,7 +240,7 @@ pub struct FunctionSignature {
     pub return_type: Type,
 }
 
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
 pub enum Visibility {
     Public(Loc),
     Script(Loc),
@@ -312,13 +312,13 @@ pub enum SpecBlockTarget_ {
 
 pub type SpecBlockTarget = Spanned<SpecBlockTarget_>;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct PragmaProperty_ {
     pub name: Name,
     pub value: Option<PragmaValue>,
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum PragmaValue {
     Literal(Value),
     Ident(NameAccessChain),
@@ -326,7 +326,7 @@ pub enum PragmaValue {
 
 pub type PragmaProperty = Spanned<PragmaProperty_>;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct SpecApplyPattern_ {
     pub visibility: Option<Visibility>,
     pub name_pattern: Vec<SpecApplyFragment>,
@@ -335,7 +335,7 @@ pub struct SpecApplyPattern_ {
 
 pub type SpecApplyPattern = Spanned<SpecApplyPattern_>;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum SpecApplyFragment_ {
     Wildcard,
     NamePart(Name),
@@ -391,7 +391,7 @@ pub enum SpecBlockMember_ {
 pub type SpecBlockMember = Spanned<SpecBlockMember_>;
 
 // Specification condition kind.
-#[derive(PartialEq, Clone, Debug)]
+#[derive(PartialEq, Eq, Clone, Debug)]
 pub enum SpecConditionKind_ {
     Assert,
     Assume,
@@ -478,7 +478,7 @@ pub type BindWithRangeList = Spanned<Vec<BindWithRange>>;
 pub enum Value_ {
     // @<num>
     Address(LeadingNameAccess),
-    // <num>(u8|u64|u128)?
+    // <num>(u8|u16|u32|u64|u128|u256)?
     Num(Symbol),
     // false
     Bool(bool),
@@ -489,14 +489,14 @@ pub enum Value_ {
 }
 pub type Value = Spanned<Value_>;
 
-#[derive(Debug, PartialEq, Copy, Clone)]
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
 pub enum UnaryOp_ {
     // !
     Not,
 }
 pub type UnaryOp = Spanned<UnaryOp_>;
 
-#[derive(Debug, PartialEq, Copy, Clone)]
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
 pub enum BinOp_ {
     // Int ops
     // +
@@ -548,7 +548,7 @@ pub enum BinOp_ {
 }
 pub type BinOp = Spanned<BinOp_>;
 
-#[derive(Debug, PartialEq, Copy, Clone)]
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
 pub enum QuantKind_ {
     Forall,
     Exists,
@@ -1261,7 +1261,7 @@ impl AstDebug for SpecBlockTarget_ {
             SpecBlockTarget_::Code => {}
             SpecBlockTarget_::Module => w.write("module "),
             SpecBlockTarget_::Member(name, sign_opt) => {
-                w.write(&name.value);
+                w.write(name.value);
                 if let Some(sign) = sign_opt {
                     sign.ast_debug(w);
                 }
@@ -1437,14 +1437,14 @@ impl AstDebug for SpecApplyFragment_ {
     fn ast_debug(&self, w: &mut AstWriter) {
         match self {
             SpecApplyFragment_::Wildcard => w.write("*"),
-            SpecApplyFragment_::NamePart(n) => w.write(&n.value),
+            SpecApplyFragment_::NamePart(n) => w.write(n.value),
         }
     }
 }
 
 impl AstDebug for PragmaProperty_ {
     fn ast_debug(&self, w: &mut AstWriter) {
-        w.write(&self.name.value);
+        w.write(self.name.value);
         if let Some(value) = &self.value {
             w.write(" = ");
             match value {
@@ -1545,7 +1545,7 @@ impl AstDebug for Vec<(Name, Vec<Ability>)> {
 impl AstDebug for (Name, Vec<Ability>) {
     fn ast_debug(&self, w: &mut AstWriter) {
         let (n, abilities) = self;
-        w.write(&n.value);
+        w.write(n.value);
         ability_constraints_ast_debug(w, abilities);
     }
 }
@@ -1570,7 +1570,7 @@ impl AstDebug for StructTypeParameter {
         if *is_phantom {
             w.write("phantom ");
         }
-        w.write(&name.value);
+        w.write(name.value);
         ability_constraints_ast_debug(w, constraints);
     }
 }
diff --git a/language/move-compiler/src/parser/filter.rs b/language/move-compiler/src/parser/filter.rs
new file mode 100644
index 0000000000..a7e24daeba
--- /dev/null
+++ b/language/move-compiler/src/parser/filter.rs
@@ -0,0 +1,322 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_ir_types::location::sp;
+
+use crate::parser::ast as P;
+
+/// A trait that decides whether to include a parsed element in the compilation
+pub trait FilterContext {
+    /// Attribute-based node removal
+    fn should_remove_by_attributes(
+        &mut self,
+        _attrs: &[P::Attributes],
+        _is_source_def: bool,
+    ) -> bool {
+        false
+    }
+
+    fn filter_map_address(
+        &mut self,
+        address_def: P::AddressDefinition,
+        is_source_def: bool,
+    ) -> Option<P::AddressDefinition> {
+        if self.should_remove_by_attributes(&address_def.attributes, is_source_def) {
+            None
+        } else {
+            Some(address_def)
+        }
+    }
+
+    fn filter_map_module(
+        &mut self,
+        module_def: P::ModuleDefinition,
+        is_source_def: bool,
+    ) -> Option<P::ModuleDefinition> {
+        if self.should_remove_by_attributes(&module_def.attributes, is_source_def) {
+            None
+        } else {
+            Some(module_def)
+        }
+    }
+
+    fn filter_map_script(
+        &mut self,
+        script_def: P::Script,
+        is_source_def: bool,
+    ) -> Option<P::Script> {
+        if self.should_remove_by_attributes(&script_def.attributes, is_source_def) {
+            None
+        } else {
+            Some(script_def)
+        }
+    }
+
+    fn filter_map_function(
+        &mut self,
+        function_def: P::Function,
+        is_source_def: bool,
+    ) -> Option<P::Function> {
+        if self.should_remove_by_attributes(&function_def.attributes, is_source_def) {
+            None
+        } else {
+            Some(function_def)
+        }
+    }
+
+    fn filter_map_struct(
+        &mut self,
+        struct_def: P::StructDefinition,
+        is_source_def: bool,
+    ) -> Option<P::StructDefinition> {
+        if self.should_remove_by_attributes(&struct_def.attributes, is_source_def) {
+            None
+        } else {
+            Some(struct_def)
+        }
+    }
+
+    fn filter_map_spec(
+        &mut self,
+        spec: P::SpecBlock_,
+        is_source_def: bool,
+    ) -> Option<P::SpecBlock_> {
+        if self.should_remove_by_attributes(&spec.attributes, is_source_def) {
+            None
+        } else {
+            Some(spec)
+        }
+    }
+
+    fn filter_map_use(&mut self, use_decl: P::UseDecl, is_source_def: bool) -> Option<P::UseDecl> {
+        if self.should_remove_by_attributes(&use_decl.attributes, is_source_def) {
+            None
+        } else {
+            Some(use_decl)
+        }
+    }
+
+    fn filter_map_friend(
+        &mut self,
+        friend_decl: P::FriendDecl,
+        is_source_def: bool,
+    ) -> Option<P::FriendDecl> {
+        if self.should_remove_by_attributes(&friend_decl.attributes, is_source_def) {
+            None
+        } else {
+            Some(friend_decl)
+        }
+    }
+
+    fn filter_map_constant(
+        &mut self,
+        constant: P::Constant,
+        is_source_def: bool,
+    ) -> Option<P::Constant> {
+        if self.should_remove_by_attributes(&constant.attributes, is_source_def) {
+            None
+        } else {
+            Some(constant)
+        }
+    }
+}
+
+/// This filters out module member from `prog` based on supplied `FilterContext` implementation
+pub fn filter_program<T: FilterContext>(context: &mut T, prog: P::Program) -> P::Program {
+    let P::Program {
+        named_address_maps,
+        source_definitions,
+        lib_definitions,
+    } = prog;
+
+    let lib_definitions: Vec<_> = lib_definitions
+        .into_iter()
+        .filter_map(
+            |P::PackageDefinition {
+                 package,
+                 named_address_map,
+                 def,
+             }| {
+                Some(P::PackageDefinition {
+                    package,
+                    named_address_map,
+                    def: filter_definition(context, def, false)?,
+                })
+            },
+        )
+        .collect();
+
+    let source_definitions: Vec<_> = source_definitions
+        .into_iter()
+        .filter_map(
+            |P::PackageDefinition {
+                 package,
+                 named_address_map,
+                 def,
+             }| {
+                Some(P::PackageDefinition {
+                    package,
+                    named_address_map,
+                    def: filter_definition(context, def, true)?,
+                })
+            },
+        )
+        .collect();
+
+    P::Program {
+        named_address_maps,
+        source_definitions,
+        lib_definitions,
+    }
+}
+
+fn filter_definition<T: FilterContext>(
+    context: &mut T,
+    def: P::Definition,
+    is_source_def: bool,
+) -> Option<P::Definition> {
+    match def {
+        P::Definition::Module(m) => {
+            filter_module(context, m, is_source_def).map(P::Definition::Module)
+        }
+        P::Definition::Address(a) => {
+            filter_address(context, a, is_source_def).map(P::Definition::Address)
+        }
+        P::Definition::Script(s) => {
+            filter_script(context, s, is_source_def).map(P::Definition::Script)
+        }
+    }
+}
+
+fn filter_address<T: FilterContext>(
+    context: &mut T,
+    address_def: P::AddressDefinition,
+    is_source_def: bool,
+) -> Option<P::AddressDefinition> {
+    let address_def = context.filter_map_address(address_def, is_source_def)?;
+
+    let P::AddressDefinition {
+        addr,
+        attributes,
+        loc,
+        modules,
+    } = address_def;
+
+    let modules = modules
+        .into_iter()
+        .filter_map(|m| filter_module(context, m, is_source_def))
+        .collect();
+
+    Some(P::AddressDefinition {
+        attributes,
+        loc,
+        addr,
+        modules,
+    })
+}
+
+fn filter_script<T: FilterContext>(
+    context: &mut T,
+    script_def: P::Script,
+    is_source_def: bool,
+) -> Option<P::Script> {
+    let script_def = context.filter_map_script(script_def, is_source_def)?;
+
+    let P::Script {
+        attributes,
+        uses,
+        constants,
+        function,
+        specs,
+        loc,
+    } = script_def;
+
+    // This is a bit weird, if the only function in the script is filtered, we consider
+    // the whole script is filtered as well
+    let new_function = context.filter_map_function(function, is_source_def)?;
+
+    let new_uses = uses
+        .into_iter()
+        .filter_map(|use_decl| context.filter_map_use(use_decl, is_source_def))
+        .collect();
+    let new_constants = constants
+        .into_iter()
+        .filter_map(|constant| context.filter_map_constant(constant, is_source_def))
+        .collect();
+    let new_specs = specs
+        .into_iter()
+        .filter_map(|sp!(spec_loc, spec)| {
+            context
+                .filter_map_spec(spec, is_source_def)
+                .map(|new_spec| sp(spec_loc, new_spec))
+        })
+        .collect();
+
+    Some(P::Script {
+        attributes,
+        function: new_function,
+        uses: new_uses,
+        constants: new_constants,
+        specs: new_specs,
+        loc,
+    })
+}
+
+fn filter_module<T: FilterContext>(
+    context: &mut T,
+    module_def: P::ModuleDefinition,
+    is_source_def: bool,
+) -> Option<P::ModuleDefinition> {
+    let module_def = context.filter_map_module(module_def, is_source_def)?;
+
+    let P::ModuleDefinition {
+        attributes,
+        loc,
+        address,
+        name,
+        is_spec_module,
+        members,
+    } = module_def;
+
+    let new_members: Vec<_> = members
+        .into_iter()
+        .filter_map(|member| filter_module_member(context, member, is_source_def))
+        .collect();
+
+    Some(P::ModuleDefinition {
+        attributes,
+        loc,
+        address,
+        name,
+        is_spec_module,
+        members: new_members,
+    })
+}
+
+fn filter_module_member<T: FilterContext>(
+    context: &mut T,
+    module_member: P::ModuleMember,
+    is_source_def: bool,
+) -> Option<P::ModuleMember> {
+    use P::ModuleMember as PM;
+
+    match module_member {
+        PM::Function(func_def) => context
+            .filter_map_function(func_def, is_source_def)
+            .map(PM::Function),
+        PM::Struct(struct_def) => context
+            .filter_map_struct(struct_def, is_source_def)
+            .map(PM::Struct),
+        PM::Spec(sp!(spec_loc, spec)) => context
+            .filter_map_spec(spec, is_source_def)
+            .map(|new_spec| PM::Spec(sp(spec_loc, new_spec))),
+        PM::Use(use_decl) => context.filter_map_use(use_decl, is_source_def).map(PM::Use),
+        PM::Friend(friend_decl) => context
+            .filter_map_friend(friend_decl, is_source_def)
+            .map(PM::Friend),
+        PM::Constant(constant) => context
+            .filter_map_constant(constant, is_source_def)
+            .map(PM::Constant),
+    }
+}
diff --git a/language/move-compiler/src/parser/keywords.rs b/language/move-compiler/src/parser/keywords.rs
index ceaff4dd92..dae3cc77ef 100644
--- a/language/move-compiler/src/parser/keywords.rs
+++ b/language/move-compiler/src/parser/keywords.rs
@@ -65,6 +65,8 @@ pub const CONTEXTUAL_KEYWORDS: &[&str] = &[
     "with",
 ];
 
+pub const PRIMITIVE_TYPES: &[&str] = &["u8", "u16", "u32", "u64", "u128", "u256", "bool", "vector"];
+
 pub const BUILTINS: &[&str] = &[
     "assert",
     "borrow_global",
diff --git a/language/move-compiler/src/parser/lexer.rs b/language/move-compiler/src/parser/lexer.rs
index e770a15380..b1095d8518 100644
--- a/language/move-compiler/src/parser/lexer.rs
+++ b/language/move-compiler/src/parser/lexer.rs
@@ -214,7 +214,10 @@ impl<'input> Lexer<'input> {
     /// (`/// .. <newline>` and `/** .. */`) will be not included in extracted comment string. The
     /// span in the returned map, however, covers the whole region of the comment, including the
     /// delimiters.
-    fn trim_whitespace_and_comments(&mut self, offset: usize) -> Result<&'input str, Diagnostic> {
+    fn trim_whitespace_and_comments(
+        &mut self,
+        offset: usize,
+    ) -> Result<&'input str, Box<Diagnostic>> {
         let mut text = &self.text[offset..];
 
         // A helper function to compute the index of the start of the given substring.
@@ -243,10 +246,10 @@ impl<'input> Lexer<'input> {
                         // otherwise.
                         let location =
                             make_loc(self.file_hash, loc.0, loc.0 + if loc.1 { 3 } else { 2 });
-                        return Err(diag!(
+                        return Err(Box::new(diag!(
                             Syntax::InvalidDocComment,
                             (location, "Unclosed block comment"),
-                        ));
+                        )));
                     } else if text.starts_with("/*") {
                         // We've found a (perhaps nested) multi-line comment.
                         let start = get_offset(text);
@@ -313,7 +316,7 @@ impl<'input> Lexer<'input> {
 
     // Look ahead to the next token after the current one and return it, and its starting offset,
     // without advancing the state of the lexer.
-    pub fn lookahead_with_start_loc(&mut self) -> Result<(Tok, usize), Diagnostic> {
+    pub fn lookahead_with_start_loc(&mut self) -> Result<(Tok, usize), Box<Diagnostic>> {
         let text = self.trim_whitespace_and_comments(self.cur_end)?;
         let next_start = self.text.len() - text.len();
         let (tok, _) = find_token(self.file_hash, text, next_start)?;
@@ -322,13 +325,13 @@ impl<'input> Lexer<'input> {
 
     // Look ahead to the next token after the current one and return it without advancing
     // the state of the lexer.
-    pub fn lookahead(&mut self) -> Result<Tok, Diagnostic> {
+    pub fn lookahead(&mut self) -> Result<Tok, Box<Diagnostic>> {
         Ok(self.lookahead_with_start_loc()?.0)
     }
 
     // Look ahead to the next two tokens after the current one and return them without advancing
     // the state of the lexer.
-    pub fn lookahead2(&mut self) -> Result<(Tok, Tok), Diagnostic> {
+    pub fn lookahead2(&mut self) -> Result<(Tok, Tok), Box<Diagnostic>> {
         let text = self.trim_whitespace_and_comments(self.cur_end)?;
         let offset = self.text.len() - text.len();
         let (first, length) = find_token(self.file_hash, text, offset)?;
@@ -385,7 +388,7 @@ impl<'input> Lexer<'input> {
         std::mem::take(&mut self.matched_doc_comments)
     }
 
-    pub fn advance(&mut self) -> Result<(), Diagnostic> {
+    pub fn advance(&mut self) -> Result<(), Box<Diagnostic>> {
         self.prev_end = self.cur_end;
         let text = self.trim_whitespace_and_comments(self.cur_end)?;
         self.cur_start = self.text.len() - text.len();
@@ -409,7 +412,7 @@ fn find_token(
     file_hash: FileHash,
     text: &str,
     start_offset: usize,
-) -> Result<(Tok, usize), Diagnostic> {
+) -> Result<(Tok, usize), Box<Diagnostic>> {
     let c: char = match text.chars().next() {
         Some(next_char) => next_char,
         None => {
@@ -438,14 +441,14 @@ fn find_token(
                     Some(last_quote) => (Tok::ByteStringValue, 2 + last_quote + 1),
                     None => {
                         let loc = make_loc(file_hash, start_offset, start_offset + line.len() + 2);
-                        return Err(diag!(
+                        return Err(Box::new(diag!(
                             if is_hex {
                                 Syntax::InvalidHexString
                             } else {
                                 Syntax::InvalidByteString
                             },
                             (loc, "Missing closing quote (\") after byte string")
-                        ));
+                        )));
                     }
                 }
             } else {
@@ -537,10 +540,10 @@ fn find_token(
         '@' => (Tok::AtSign, 1),
         _ => {
             let loc = make_loc(file_hash, start_offset, start_offset);
-            return Err(diag!(
+            return Err(Box::new(diag!(
                 Syntax::InvalidCharacter,
                 (loc, format!("Invalid character: '{}'", c))
-            ));
+            )));
         }
     };
 
@@ -560,7 +563,7 @@ fn get_name_len(text: &str) -> usize {
 fn get_decimal_number(text: &str) -> (Tok, usize) {
     let num_text_len = text
         .chars()
-        .position(|c| !matches!(c, '0'..='9'))
+        .position(|c| !matches!(c, '0'..='9' | '_'))
         .unwrap_or(text.len());
     get_number_maybe_with_suffix(text, num_text_len)
 }
@@ -568,7 +571,7 @@ fn get_decimal_number(text: &str) -> (Tok, usize) {
 // Return the length of the substring containing characters in [0-9a-fA-F].
 fn get_hex_number(text: &str) -> (Tok, usize) {
     let num_text_len = text
-        .find(|c| !matches!(c, 'a'..='f' | 'A'..='F' | '0'..='9'))
+        .find(|c| !matches!(c, 'a'..='f' | 'A'..='F' | '0'..='9'| '_'))
         .unwrap_or(text.len());
     get_number_maybe_with_suffix(text, num_text_len)
 }
@@ -579,9 +582,9 @@ fn get_number_maybe_with_suffix(text: &str, num_text_len: usize) -> (Tok, usize)
     let rest = &text[num_text_len..];
     if rest.starts_with("u8") {
         (Tok::NumTypedValue, num_text_len + 2)
-    } else if rest.starts_with("u64") {
+    } else if rest.starts_with("u64") || rest.starts_with("u16") || rest.starts_with("u32") {
         (Tok::NumTypedValue, num_text_len + 3)
-    } else if rest.starts_with("u128") {
+    } else if rest.starts_with("u128") || rest.starts_with("u256") {
         (Tok::NumTypedValue, num_text_len + 4)
     } else {
         // No typed suffix
diff --git a/language/move-compiler/src/parser/mod.rs b/language/move-compiler/src/parser/mod.rs
index 593ed9baff..0bafa60c21 100644
--- a/language/move-compiler/src/parser/mod.rs
+++ b/language/move-compiler/src/parser/mod.rs
@@ -2,13 +2,13 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-pub mod lexer;
-pub(crate) mod syntax;
-
 pub mod ast;
 pub mod comments;
+pub(crate) mod filter;
 pub mod keywords;
+pub mod lexer;
 pub(crate) mod merge_spec_modules;
+pub(crate) mod syntax;
 
 use crate::{
     attr_derivation,
diff --git a/language/move-compiler/src/parser/syntax.rs b/language/move-compiler/src/parser/syntax.rs
index 4910e464f9..dc5ea401b2 100644
--- a/language/move-compiler/src/parser/syntax.rs
+++ b/language/move-compiler/src/parser/syntax.rs
@@ -41,7 +41,7 @@ fn current_token_error_string(tokens: &Lexer) -> String {
     }
 }
 
-fn unexpected_token_error(tokens: &Lexer, expected: &str) -> Diagnostic {
+fn unexpected_token_error(tokens: &Lexer, expected: &str) -> Box<Diagnostic> {
     unexpected_token_error_(tokens, tokens.start_loc(), expected)
 }
 
@@ -49,7 +49,7 @@ fn unexpected_token_error_(
     tokens: &Lexer,
     expected_start_loc: usize,
     expected: &str,
-) -> Diagnostic {
+) -> Box<Diagnostic> {
     let unexpected_loc = current_token_loc(tokens);
     let unexpected = current_token_error_string(tokens);
     let expected_loc = if expected_start_loc < tokens.start_loc() {
@@ -61,14 +61,14 @@ fn unexpected_token_error_(
     } else {
         unexpected_loc
     };
-    diag!(
+    Box::new(diag!(
         Syntax::UnexpectedToken,
         (unexpected_loc, format!("Unexpected {}", unexpected)),
         (expected_loc, format!("Expected {}", expected)),
-    )
+    ))
 }
 
-fn add_type_args_ambiguity_label(loc: Loc, mut diag: Diagnostic) -> Diagnostic {
+fn add_type_args_ambiguity_label(loc: Loc, mut diag: Box<Diagnostic>) -> Box<Diagnostic> {
     const MSG: &str = "Perhaps you need a blank space before this '<' operator?";
     diag.add_secondary_label((loc, MSG));
     diag
@@ -100,7 +100,7 @@ fn spanned<T>(file_hash: FileHash, start: usize, end: usize, value: T) -> Spanne
 
 // Check for the specified token and consume it if it matches.
 // Returns true if the token matches.
-fn match_token(tokens: &mut Lexer, tok: Tok) -> Result<bool, Diagnostic> {
+fn match_token(tokens: &mut Lexer, tok: Tok) -> Result<bool, Box<Diagnostic>> {
     if tokens.peek() == tok {
         tokens.advance()?;
         Ok(true)
@@ -110,7 +110,7 @@ fn match_token(tokens: &mut Lexer, tok: Tok) -> Result<bool, Diagnostic> {
 }
 
 // Check for the specified token and return an error if it does not match.
-fn consume_token(tokens: &mut Lexer, tok: Tok) -> Result<(), Diagnostic> {
+fn consume_token(tokens: &mut Lexer, tok: Tok) -> Result<(), Box<Diagnostic>> {
     consume_token_(tokens, tok, tokens.start_loc(), "")
 }
 
@@ -119,7 +119,7 @@ fn consume_token_(
     tok: Tok,
     expected_start_loc: usize,
     expected_case: &str,
-) -> Result<(), Diagnostic> {
+) -> Result<(), Box<Diagnostic>> {
     if tokens.peek() == tok {
         tokens.advance()?;
         Ok(())
@@ -142,7 +142,7 @@ fn consume_token_(
 // Err(vec![(unexp_loc, unexp_msg), (addr_loc, exp_msg)])
 
 // Check for the identifier token with specified value and return an error if it does not match.
-fn consume_identifier(tokens: &mut Lexer, value: &str) -> Result<(), Diagnostic> {
+fn consume_identifier(tokens: &mut Lexer, value: &str) -> Result<(), Box<Diagnostic>> {
     if tokens.peek() == Tok::Identifier && tokens.content() == value {
         tokens.advance()
     } else {
@@ -156,7 +156,7 @@ fn consume_identifier(tokens: &mut Lexer, value: &str) -> Result<(), Diagnostic>
 fn consume_optional_token_with_loc(
     tokens: &mut Lexer,
     tok: Tok,
-) -> Result<Option<Loc>, Diagnostic> {
+) -> Result<Option<Loc>, Box<Diagnostic>> {
     if tokens.peek() == tok {
         let start_loc = tokens.start_loc();
         tokens.advance()?;
@@ -185,9 +185,9 @@ fn parse_comma_list<F, R>(
     end_token: Tok,
     parse_list_item: F,
     item_description: &str,
-) -> Result<Vec<R>, Diagnostic>
+) -> Result<Vec<R>, Box<Diagnostic>>
 where
-    F: Fn(&mut Context) -> Result<R, Diagnostic>,
+    F: Fn(&mut Context) -> Result<R, Box<Diagnostic>>,
 {
     let start_loc = context.tokens.start_loc();
     consume_token(context.tokens, start_token)?;
@@ -210,9 +210,9 @@ fn parse_comma_list_after_start<F, R>(
     end_token: Tok,
     parse_list_item: F,
     item_description: &str,
-) -> Result<Vec<R>, Diagnostic>
+) -> Result<Vec<R>, Box<Diagnostic>>
 where
-    F: Fn(&mut Context) -> Result<R, Diagnostic>,
+    F: Fn(&mut Context) -> Result<R, Box<Diagnostic>>,
 {
     adjust_token(context.tokens, end_token);
     if match_token(context.tokens, end_token)? {
@@ -223,10 +223,10 @@ where
         if context.tokens.peek() == Tok::Comma {
             let current_loc = context.tokens.start_loc();
             let loc = make_loc(context.tokens.file_hash(), current_loc, current_loc);
-            return Err(diag!(
+            return Err(Box::new(diag!(
                 Syntax::UnexpectedToken,
                 (loc, format!("Expected {}", item_description))
-            ));
+            )));
         }
         v.push(parse_list_item(context)?);
         adjust_token(context.tokens, end_token);
@@ -237,11 +237,11 @@ where
             let current_loc = context.tokens.start_loc();
             let loc = make_loc(context.tokens.file_hash(), current_loc, current_loc);
             let loc2 = make_loc(context.tokens.file_hash(), start_loc, start_loc);
-            return Err(diag!(
+            return Err(Box::new(diag!(
                 Syntax::UnexpectedToken,
                 (loc, format!("Expected '{}'", end_token)),
                 (loc2, format!("To match this '{}'", start_token)),
-            ));
+            )));
         }
         adjust_token(context.tokens, end_token);
         if match_token(context.tokens, end_token)? {
@@ -256,10 +256,10 @@ fn parse_list<C, F, R>(
     context: &mut Context,
     mut parse_list_continue: C,
     parse_list_item: F,
-) -> Result<Vec<R>, Diagnostic>
+) -> Result<Vec<R>, Box<Diagnostic>>
 where
-    C: FnMut(&mut Context) -> Result<bool, Diagnostic>,
-    F: Fn(&mut Context) -> Result<R, Diagnostic>,
+    C: FnMut(&mut Context) -> Result<bool, Box<Diagnostic>>,
+    F: Fn(&mut Context) -> Result<R, Box<Diagnostic>>,
 {
     let mut v = vec![];
     loop {
@@ -276,7 +276,7 @@ where
 
 // Parse an identifier:
 //      Identifier = <IdentifierValue>
-fn parse_identifier(context: &mut Context) -> Result<Name, Diagnostic> {
+fn parse_identifier(context: &mut Context) -> Result<Name, Box<Diagnostic>> {
     if context.tokens.peek() != Tok::Identifier {
         return Err(unexpected_token_error(context.tokens, "an identifier"));
     }
@@ -289,7 +289,9 @@ fn parse_identifier(context: &mut Context) -> Result<Name, Diagnostic> {
 
 // Parse a numerical address value
 //     NumericalAddress = <Number>
-fn parse_address_bytes(context: &mut Context) -> Result<Spanned<NumericalAddress>, Diagnostic> {
+fn parse_address_bytes(
+    context: &mut Context,
+) -> Result<Spanned<NumericalAddress>, Box<Diagnostic>> {
     let loc = current_token_loc(context.tokens);
     let addr_res = NumericalAddress::parse_str(context.tokens.content());
     consume_token(context.tokens, Tok::NumValue)?;
@@ -307,7 +309,7 @@ fn parse_address_bytes(context: &mut Context) -> Result<Spanned<NumericalAddress
 
 // Parse the beginning of an access, either an address or an identifier:
 //      LeadingNameAccess = <NumericalAddress> | <Identifier>
-fn parse_leading_name_access(context: &mut Context) -> Result<LeadingNameAccess, Diagnostic> {
+fn parse_leading_name_access(context: &mut Context) -> Result<LeadingNameAccess, Box<Diagnostic>> {
     parse_leading_name_access_(context, || "an address or an identifier")
 }
 
@@ -315,7 +317,7 @@ fn parse_leading_name_access(context: &mut Context) -> Result<LeadingNameAccess,
 fn parse_leading_name_access_<'a, F: FnOnce() -> &'a str>(
     context: &mut Context,
     item_description: F,
-) -> Result<LeadingNameAccess, Diagnostic> {
+) -> Result<LeadingNameAccess, Box<Diagnostic>> {
     match context.tokens.peek() {
         Tok::Identifier => {
             let loc = current_token_loc(context.tokens);
@@ -332,25 +334,25 @@ fn parse_leading_name_access_<'a, F: FnOnce() -> &'a str>(
 
 // Parse a variable name:
 //      Var = <Identifier>
-fn parse_var(context: &mut Context) -> Result<Var, Diagnostic> {
+fn parse_var(context: &mut Context) -> Result<Var, Box<Diagnostic>> {
     Ok(Var(parse_identifier(context)?))
 }
 
 // Parse a field name:
 //      Field = <Identifier>
-fn parse_field(context: &mut Context) -> Result<Field, Diagnostic> {
+fn parse_field(context: &mut Context) -> Result<Field, Box<Diagnostic>> {
     Ok(Field(parse_identifier(context)?))
 }
 
 // Parse a module name:
 //      ModuleName = <Identifier>
-fn parse_module_name(context: &mut Context) -> Result<ModuleName, Diagnostic> {
+fn parse_module_name(context: &mut Context) -> Result<ModuleName, Box<Diagnostic>> {
     Ok(ModuleName(parse_identifier(context)?))
 }
 
 // Parse a module identifier:
 //      ModuleIdent = <LeadingNameAccess> "::" <ModuleName>
-fn parse_module_ident(context: &mut Context) -> Result<ModuleIdent, Diagnostic> {
+fn parse_module_ident(context: &mut Context) -> Result<ModuleIdent, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let address = parse_leading_name_access(context)?;
 
@@ -371,7 +373,7 @@ fn parse_module_ident(context: &mut Context) -> Result<ModuleIdent, Diagnostic>
 fn parse_name_access_chain<'a, F: FnOnce() -> &'a str>(
     context: &mut Context,
     item_description: F,
-) -> Result<NameAccessChain, Diagnostic> {
+) -> Result<NameAccessChain, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let access = parse_name_access_chain_(context, item_description)?;
     let end_loc = context.tokens.previous_end_loc();
@@ -387,7 +389,7 @@ fn parse_name_access_chain<'a, F: FnOnce() -> &'a str>(
 fn parse_name_access_chain_<'a, F: FnOnce() -> &'a str>(
     context: &mut Context,
     item_description: F,
-) -> Result<NameAccessChain_, Diagnostic> {
+) -> Result<NameAccessChain_, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let ln = parse_leading_name_access_(context, item_description)?;
     let ln = match ln {
@@ -444,7 +446,7 @@ impl Modifiers {
 //      ModuleMemberModifier = <Visibility> | "native"
 // ModuleMemberModifiers checks for uniqueness, meaning each individual ModuleMemberModifier can
 // appear only once
-fn parse_module_member_modifiers(context: &mut Context) -> Result<Modifiers, Diagnostic> {
+fn parse_module_member_modifiers(context: &mut Context) -> Result<Modifiers, Box<Diagnostic>> {
     let mut mods = Modifiers::empty();
     loop {
         match context.tokens.peek() {
@@ -497,7 +499,7 @@ fn parse_module_member_modifiers(context: &mut Context) -> Result<Modifiers, Dia
 
 // Parse a function visibility modifier:
 //      Visibility = "public" ( "(" "script" | "friend" ")" )?
-fn parse_visibility(context: &mut Context) -> Result<Visibility, Diagnostic> {
+fn parse_visibility(context: &mut Context) -> Result<Visibility, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     consume_token(context.tokens, Tok::Public)?;
     let sub_public_vis = if match_token(context.tokens, Tok::LParen)? {
@@ -523,7 +525,7 @@ fn parse_visibility(context: &mut Context) -> Result<Visibility, Diagnostic> {
                 Visibility::PUBLIC,
                 Visibility::FRIEND
             );
-            return Err(diag!(Syntax::UnexpectedToken, (loc, msg)));
+            return Err(Box::new(diag!(Syntax::UnexpectedToken, (loc, msg))));
         }
     })
 }
@@ -531,7 +533,7 @@ fn parse_visibility(context: &mut Context) -> Result<Visibility, Diagnostic> {
 //      AttributeValue =
 //          <Value>
 //          | <NameAccessChain>
-fn parse_attribute_value(context: &mut Context) -> Result<AttributeValue, Diagnostic> {
+fn parse_attribute_value(context: &mut Context) -> Result<AttributeValue, Box<Diagnostic>> {
     if let Some(v) = maybe_parse_value(context)? {
         return Ok(sp(v.loc, AttributeValue_::Value(v)));
     }
@@ -545,7 +547,7 @@ fn parse_attribute_value(context: &mut Context) -> Result<AttributeValue, Diagno
 //          <Identifier>
 //          | <Identifier> "=" <AttributeValue>
 //          | <Identifier> "(" Comma<Attribute> ")"
-fn parse_attribute(context: &mut Context) -> Result<Attribute, Diagnostic> {
+fn parse_attribute(context: &mut Context) -> Result<Attribute, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let n = parse_identifier(context)?;
     let attr_ = match context.tokens.peek() {
@@ -580,7 +582,7 @@ fn parse_attribute(context: &mut Context) -> Result<Attribute, Diagnostic> {
 
 // Parse attributes. Used to annotate a variety of AST nodes
 //      Attributes = ("#" "[" Comma<Attribute> "]")*
-fn parse_attributes(context: &mut Context) -> Result<Vec<Attributes>, Diagnostic> {
+fn parse_attributes(context: &mut Context) -> Result<Vec<Attributes>, Box<Diagnostic>> {
     let mut attributes_vec = vec![];
     while let Tok::NumSign = context.tokens.peek() {
         let start_loc = context.tokens.start_loc();
@@ -609,7 +611,7 @@ fn parse_attributes(context: &mut Context) -> Result<Vec<Attributes>, Diagnostic
 
 // Parse a field name optionally followed by a colon and an expression argument:
 //      ExpField = <Field> <":" <Exp>>?
-fn parse_exp_field(context: &mut Context) -> Result<(Field, Exp), Diagnostic> {
+fn parse_exp_field(context: &mut Context) -> Result<(Field, Exp), Box<Diagnostic>> {
     let f = parse_field(context)?;
     let arg = if match_token(context.tokens, Tok::Colon)? {
         parse_exp(context)?
@@ -627,7 +629,7 @@ fn parse_exp_field(context: &mut Context) -> Result<(Field, Exp), Diagnostic> {
 //
 // If the binding is not specified, the default is to use a variable
 // with the same name as the field.
-fn parse_bind_field(context: &mut Context) -> Result<(Field, Bind), Diagnostic> {
+fn parse_bind_field(context: &mut Context) -> Result<(Field, Bind), Box<Diagnostic>> {
     let f = parse_field(context)?;
     let arg = if match_token(context.tokens, Tok::Colon)? {
         parse_bind(context)?
@@ -642,7 +644,7 @@ fn parse_bind_field(context: &mut Context) -> Result<(Field, Bind), Diagnostic>
 //      Bind =
 //          <Var>
 //          | <NameAccessChain> <OptionalTypeArgs> "{" Comma<BindField> "}"
-fn parse_bind(context: &mut Context) -> Result<Bind, Diagnostic> {
+fn parse_bind(context: &mut Context) -> Result<Bind, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     if context.tokens.peek() == Tok::Identifier {
         let next_tok = context.tokens.lookahead()?;
@@ -681,7 +683,7 @@ fn parse_bind(context: &mut Context) -> Result<Bind, Diagnostic> {
 //
 // The list is enclosed in parenthesis, except that the parenthesis are
 // optional if there is a single Bind.
-fn parse_bind_list(context: &mut Context) -> Result<BindList, Diagnostic> {
+fn parse_bind_list(context: &mut Context) -> Result<BindList, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let b = if context.tokens.peek() != Tok::LParen {
         vec![parse_bind(context)?]
@@ -701,7 +703,7 @@ fn parse_bind_list(context: &mut Context) -> Result<BindList, Diagnostic> {
 // Parse a list of bindings for lambda.
 //      LambdaBindList =
 //          "|" Comma<Bind> "|"
-fn parse_lambda_bind_list(context: &mut Context) -> Result<BindList, Diagnostic> {
+fn parse_lambda_bind_list(context: &mut Context) -> Result<BindList, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let b = parse_comma_list(
         context,
@@ -720,7 +722,7 @@ fn parse_lambda_bind_list(context: &mut Context) -> Result<BindList, Diagnostic>
 
 // Parse a byte string:
 //      ByteString = <ByteStringValue>
-fn parse_byte_string(context: &mut Context) -> Result<Value_, Diagnostic> {
+fn parse_byte_string(context: &mut Context) -> Result<Value_, Box<Diagnostic>> {
     if context.tokens.peek() != Tok::ByteStringValue {
         return Err(unexpected_token_error(
             context.tokens,
@@ -747,7 +749,7 @@ fn parse_byte_string(context: &mut Context) -> Result<Value_, Diagnostic> {
 //          | <Number>
 //          | <NumberTyped>
 //          | <ByteString>
-fn maybe_parse_value(context: &mut Context) -> Result<Option<Value>, Diagnostic> {
+fn maybe_parse_value(context: &mut Context) -> Result<Option<Value>, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let val = match context.tokens.peek() {
         Tok::AtSign => {
@@ -790,7 +792,7 @@ fn maybe_parse_value(context: &mut Context) -> Result<Option<Value>, Diagnostic>
     )))
 }
 
-fn parse_value(context: &mut Context) -> Result<Value, Diagnostic> {
+fn parse_value(context: &mut Context) -> Result<Value, Box<Diagnostic>> {
     Ok(maybe_parse_value(context)?.expect("parse_value called with invalid token"))
 }
 
@@ -802,7 +804,7 @@ fn parse_value(context: &mut Context) -> Result<Value, Diagnostic> {
 //      SequenceItem =
 //          <Exp>
 //          | "let" <BindList> (":" <Type>)? ("=" <Exp>)?
-fn parse_sequence_item(context: &mut Context) -> Result<SequenceItem, Diagnostic> {
+fn parse_sequence_item(context: &mut Context) -> Result<SequenceItem, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let item = if match_token(context.tokens, Tok::Let)? {
         let b = parse_bind_list(context)?;
@@ -835,7 +837,7 @@ fn parse_sequence_item(context: &mut Context) -> Result<SequenceItem, Diagnostic
 //
 // Note that this does not include the opening brace of a block but it
 // does consume the closing right brace.
-fn parse_sequence(context: &mut Context) -> Result<Sequence, Diagnostic> {
+fn parse_sequence(context: &mut Context) -> Result<Sequence, Box<Diagnostic>> {
     let mut uses = vec![];
     while context.tokens.peek() == Tok::Use {
         uses.push(parse_use_decl(vec![], context)?);
@@ -877,19 +879,43 @@ fn parse_sequence(context: &mut Context) -> Result<Sequence, Diagnostic> {
 //      Term =
 //          "break"
 //          | "continue"
-//          | "vector" ("<" Comma<Type> ">")? "[" Comma<Exp> "]"
+//          | "vector" ('<' Comma<Type> ">")? "[" Comma<Exp> "]"
 //          | <Value>
 //          | "(" Comma<Exp> ")"
 //          | "(" <Exp> ":" <Type> ")"
 //          | "(" <Exp> "as" <Type> ")"
 //          | "{" <Sequence>
-fn parse_term(context: &mut Context) -> Result<Exp, Diagnostic> {
+//          | "if" "(" <Exp> ")" <Exp> "else" "{" <Exp> "}"
+//          | "if" "(" <Exp> ")" "{" <Exp> "}"
+//          | "if" "(" <Exp> ")" <Exp> ("else" <Exp>)?
+//          | "while" "(" <Exp> ")" "{" <Exp> "}"
+//          | "while" "(" <Exp> ")" <Exp> (SpecBlock)?
+//          | "loop" <Exp>
+//          | "loop" "{" <Exp> "}"
+//          | "return" "{" <Exp> "}"
+//          | "return" <Exp>?
+//          | "abort" "{" <Exp> "}"
+//          | "abort" <Exp>
+fn parse_term(context: &mut Context) -> Result<Exp, Box<Diagnostic>> {
     const VECTOR_IDENT: &str = "vector";
 
     let start_loc = context.tokens.start_loc();
     let term = match context.tokens.peek() {
+        tok if is_control_exp(tok) => {
+            let (control_exp, ends_in_block) = parse_control_exp(context)?;
+            if !ends_in_block || at_end_of_exp(context) {
+                return Ok(control_exp);
+            }
+
+            return parse_binop_exp(context, control_exp, /* min_prec */ 1);
+        }
         Tok::Break => {
             context.tokens.advance()?;
+            if at_start_of_exp(context) {
+                let mut diag = unexpected_token_error(context.tokens, "the end of an expression");
+                diag.add_note("'break' with a value is not yet supported");
+                return Err(diag);
+            }
             Exp_::Break
         }
 
@@ -1010,20 +1036,133 @@ fn parse_term(context: &mut Context) -> Result<Exp, Diagnostic> {
     ))
 }
 
+fn is_control_exp(tok: Tok) -> bool {
+    matches!(
+        tok,
+        Tok::If | Tok::While | Tok::Loop | Tok::Return | Tok::Abort
+    )
+}
+
+// if there is a block, only parse the block, not any subsequent tokens
+// e.g.           if (cond) e1 else { e2 } + 1
+// should be,    (if (cond) e1 else { e2 }) + 1
+// AND NOT,       if (cond) e1 else ({ e2 } + 1)
+// But otherwise, if (cond) e1 else e2 + 1
+// should be,     if (cond) e1 else (e2 + 1)
+fn parse_control_exp(context: &mut Context) -> Result<(Exp, bool), Box<Diagnostic>> {
+    fn parse_exp_or_sequence(context: &mut Context) -> Result<(Exp, bool), Box<Diagnostic>> {
+        match context.tokens.peek() {
+            Tok::LBrace => {
+                let block_start_loc = context.tokens.start_loc();
+                context.tokens.advance()?; // consume the LBrace
+                let block_ = Exp_::Block(parse_sequence(context)?);
+                let block_end_loc = context.tokens.previous_end_loc();
+                let exp = spanned(
+                    context.tokens.file_hash(),
+                    block_start_loc,
+                    block_end_loc,
+                    block_,
+                );
+                Ok((exp, true))
+            }
+            _ => Ok((parse_exp(context)?, false)),
+        }
+    }
+    let start_loc = context.tokens.start_loc();
+    let (exp_, ends_in_block) = match context.tokens.peek() {
+        Tok::If => {
+            context.tokens.advance()?;
+            consume_token(context.tokens, Tok::LParen)?;
+            let eb = Box::new(parse_exp(context)?);
+            consume_token(context.tokens, Tok::RParen)?;
+            let (et, ends_in_block) = parse_exp_or_sequence(context)?;
+            let (ef, ends_in_block) = if match_token(context.tokens, Tok::Else)? {
+                let (ef, ends_in_block) = parse_exp_or_sequence(context)?;
+                (Some(Box::new(ef)), ends_in_block)
+            } else {
+                (None, ends_in_block)
+            };
+            (Exp_::IfElse(eb, Box::new(et), ef), ends_in_block)
+        }
+        Tok::While => {
+            context.tokens.advance()?;
+            consume_token(context.tokens, Tok::LParen)?;
+            let econd = parse_exp(context)?;
+            consume_token(context.tokens, Tok::RParen)?;
+            let (eloop, ends_in_block) = parse_exp_or_sequence(context)?;
+            let (econd, ends_in_block) = if context.tokens.peek() == Tok::Spec {
+                // Parse a loop invariant. Also validate that only `invariant`
+                // properties are contained in the spec block. This is
+                // transformed into `while ({spec { .. }; cond) body`.
+                let spec = parse_spec_block(vec![], context)?;
+                for member in &spec.value.members {
+                    match member.value {
+                        // Ok
+                        SpecBlockMember_::Condition {
+                            kind: sp!(_, SpecConditionKind_::Invariant(..)),
+                            ..
+                        } => (),
+                        _ => {
+                            return Err(Box::new(diag!(
+                                Syntax::InvalidSpecBlockMember,
+                                (member.loc, "only 'invariant' allowed here")
+                            )))
+                        }
+                    }
+                }
+                let spec_seq = sp(
+                    spec.loc,
+                    SequenceItem_::Seq(Box::new(sp(spec.loc, Exp_::Spec(spec)))),
+                );
+                let loc = econd.loc;
+                let spec_block = Exp_::Block((vec![], vec![spec_seq], None, Box::new(Some(econd))));
+                (sp(loc, spec_block), true)
+            } else {
+                (econd, ends_in_block)
+            };
+            (Exp_::While(Box::new(econd), Box::new(eloop)), ends_in_block)
+        }
+        Tok::Loop => {
+            context.tokens.advance()?;
+            let (eloop, ends_in_block) = parse_exp_or_sequence(context)?;
+            (Exp_::Loop(Box::new(eloop)), ends_in_block)
+        }
+        Tok::Return => {
+            context.tokens.advance()?;
+            let (e, ends_in_block) = if !at_start_of_exp(context) {
+                (None, false)
+            } else {
+                let (e, ends_in_block) = parse_exp_or_sequence(context)?;
+                (Some(Box::new(e)), ends_in_block)
+            };
+            (Exp_::Return(e), ends_in_block)
+        }
+        Tok::Abort => {
+            context.tokens.advance()?;
+            let (e, ends_in_block) = parse_exp_or_sequence(context)?;
+            (Exp_::Abort(Box::new(e)), ends_in_block)
+        }
+        _ => unreachable!(),
+    };
+    let end_loc = context.tokens.previous_end_loc();
+    let exp = spanned(context.tokens.file_hash(), start_loc, end_loc, exp_);
+    Ok((exp, ends_in_block))
+}
+
 // Parse a pack, call, or other reference to a name:
 //      NameExp =
 //          <NameAccessChain> <OptionalTypeArgs> "{" Comma<ExpField> "}"
 //          | <NameAccessChain> <OptionalTypeArgs> "(" Comma<Exp> ")"
 //          | <NameAccessChain> "!" "(" Comma<Exp> ")"
 //          | <NameAccessChain> <OptionalTypeArgs>
-fn parse_name_exp(context: &mut Context) -> Result<Exp_, Diagnostic> {
+fn parse_name_exp(context: &mut Context) -> Result<Exp_, Box<Diagnostic>> {
     let n = parse_name_access_chain(context, || {
         panic!("parse_name_exp with something other than a ModuleAccess")
     })?;
 
-    // There's an ambiguity if the name is followed by a "<". If there is no whitespace
+    // There's an ambiguity if the name is followed by a '<'. If there is no whitespace
     // after the name, treat it as the start of a list of type arguments. Otherwise
-    // assume that the "<" is a boolean operator.
+    // assume that the '<' is a boolean operator.
     let mut tys = None;
     let start_loc = context.tokens.start_loc();
     if context.tokens.peek() == Tok::Exclaim {
@@ -1065,7 +1204,7 @@ fn parse_name_exp(context: &mut Context) -> Result<Exp_, Diagnostic> {
 }
 
 // Parse the arguments to a call: "(" Comma<Exp> ")"
-fn parse_call_args(context: &mut Context) -> Result<Spanned<Vec<Exp>>, Diagnostic> {
+fn parse_call_args(context: &mut Context) -> Result<Spanned<Vec<Exp>>, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let args = parse_comma_list(
         context,
@@ -1096,18 +1235,42 @@ fn at_end_of_exp(context: &mut Context) -> bool {
     )
 }
 
+fn at_start_of_exp(context: &mut Context) -> bool {
+    matches!(
+        context.tokens.peek(),
+        // value
+        Tok::NumValue
+            | Tok::NumTypedValue
+            | Tok::ByteStringValue
+            | Tok::Identifier
+            | Tok::AtSign
+            | Tok::Copy
+            | Tok::Move
+            | Tok::False
+            | Tok::True
+            | Tok::Amp
+            | Tok::AmpMut
+            | Tok::Star
+            | Tok::Exclaim
+            | Tok::LParen
+            | Tok::LBrace
+            | Tok::Abort
+            | Tok::Break
+            | Tok::Continue
+            | Tok::If
+            | Tok::Loop
+            | Tok::Return
+            | Tok::While
+    )
+}
+
 // Parse an expression:
 //      Exp =
 //            <LambdaBindList> <Exp>        spec only
 //          | <Quantifier>                  spec only
-//          | "if" "(" <Exp> ")" <Exp> ("else" <Exp>)?
-//          | "while" "(" <Exp> ")" <Exp> (SpecBlock)?
-//          | "loop" <Exp>
-//          | "return" <Exp>?
-//          | "abort" <Exp>
 //          | <BinOpExp>
 //          | <UnaryExp> "=" <Exp>
-fn parse_exp(context: &mut Context) -> Result<Exp, Diagnostic> {
+fn parse_exp(context: &mut Context) -> Result<Exp, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let exp = match context.tokens.peek() {
         Tok::Pipe => {
@@ -1116,82 +1279,6 @@ fn parse_exp(context: &mut Context) -> Result<Exp, Diagnostic> {
             Exp_::Lambda(bindings, body)
         }
         Tok::Identifier if is_quant(context) => parse_quant(context)?,
-        Tok::If => {
-            context.tokens.advance()?;
-            consume_token(context.tokens, Tok::LParen)?;
-            let eb = Box::new(parse_exp(context)?);
-            consume_token(context.tokens, Tok::RParen)?;
-            let et = Box::new(parse_exp(context)?);
-            let ef = if match_token(context.tokens, Tok::Else)? {
-                Some(Box::new(parse_exp(context)?))
-            } else {
-                None
-            };
-            Exp_::IfElse(eb, et, ef)
-        }
-        Tok::While => {
-            context.tokens.advance()?;
-            consume_token(context.tokens, Tok::LParen)?;
-            let econd = parse_exp(context)?;
-            consume_token(context.tokens, Tok::RParen)?;
-            let eloop = Box::new(parse_exp(context)?);
-            let econd = if context.tokens.peek() == Tok::Spec {
-                // Parse a loop invariant. Also validate that only `invariant`
-                // properties are contained in the spec block. This is
-                // transformed into `while ({spec { .. }; cond) body`.
-                let spec = parse_spec_block(vec![], context)?;
-                for member in &spec.value.members {
-                    match member.value {
-                        SpecBlockMember_::Condition {
-                            kind: sp!(_, SpecConditionKind_::Invariant(..)),
-                            ..
-                        } => {
-                            // Ok
-                        }
-                        _ => {
-                            return Err(diag!(
-                                Syntax::InvalidSpecBlockMember,
-                                (member.loc, "only 'invariant' allowed here")
-                            ))
-                        }
-                    }
-                }
-                sp(
-                    econd.loc,
-                    Exp_::Block((
-                        vec![],
-                        vec![sp(
-                            spec.loc,
-                            SequenceItem_::Seq(Box::new(sp(spec.loc, Exp_::Spec(spec)))),
-                        )],
-                        None,
-                        Box::new(Some(econd)),
-                    )),
-                )
-            } else {
-                econd
-            };
-            Exp_::While(Box::new(econd), eloop)
-        }
-        Tok::Loop => {
-            context.tokens.advance()?;
-            let eloop = Box::new(parse_exp(context)?);
-            Exp_::Loop(eloop)
-        }
-        Tok::Return => {
-            context.tokens.advance()?;
-            let e = if at_end_of_exp(context) {
-                None
-            } else {
-                Some(Box::new(parse_exp(context)?))
-            };
-            Exp_::Return(e)
-        }
-        Tok::Abort => {
-            context.tokens.advance()?;
-            let e = Box::new(parse_exp(context)?);
-            Exp_::Abort(e)
-        }
         _ => {
             // This could be either an assignment or a binary operator
             // expression.
@@ -1249,7 +1336,7 @@ fn get_precedence(token: Tok) -> u32 {
 //          "==>"                                       spec only
 //          | "||"
 //          | "&&"
-//          | "==" | "!=" | "<" | ">" | "<=" | ">="
+//          | "==" | "!=" | '<' | ">" | "<=" | ">="
 //          | ".."                                      spec only
 //          | "|"
 //          | "^"
@@ -1261,7 +1348,7 @@ fn get_precedence(token: Tok) -> u32 {
 // This function takes the LHS of the expression as an argument, and it
 // continues parsing binary expressions as long as they have at least the
 // specified "min_prec" minimum precedence.
-fn parse_binop_exp(context: &mut Context, lhs: Exp, min_prec: u32) -> Result<Exp, Diagnostic> {
+fn parse_binop_exp(context: &mut Context, lhs: Exp, min_prec: u32) -> Result<Exp, Box<Diagnostic>> {
     let mut result = lhs;
     let mut next_tok_prec = get_precedence(context.tokens.peek());
 
@@ -1327,7 +1414,7 @@ fn parse_binop_exp(context: &mut Context, lhs: Exp, min_prec: u32) -> Result<Exp
 //          | "move" <Var>
 //          | "copy" <Var>
 //          | <DotOrIndexChain>
-fn parse_unary_exp(context: &mut Context) -> Result<Exp, Diagnostic> {
+fn parse_unary_exp(context: &mut Context) -> Result<Exp, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let exp = match context.tokens.peek() {
         Tok::Exclaim => {
@@ -1378,7 +1465,7 @@ fn parse_unary_exp(context: &mut Context) -> Result<Exp, Diagnostic> {
 //          <DotOrIndexChain> "." <Identifier>
 //          | <DotOrIndexChain> "[" <Exp> "]"                      spec only
 //          | <Term>
-fn parse_dot_or_index_chain(context: &mut Context) -> Result<Exp, Diagnostic> {
+fn parse_dot_or_index_chain(context: &mut Context) -> Result<Exp, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let mut lhs = parse_term(context)?;
     loop {
@@ -1431,7 +1518,7 @@ fn is_quant(context: &mut Context) -> bool {
 //   <QuantifierBindings> = <QuantifierBind> ("," <QuantifierBind>)*
 //   <QuantifierBind> = <Identifier> ":" <Type> | <Identifier> "in" <Exp>
 //
-fn parse_quant(context: &mut Context) -> Result<Exp_, Diagnostic> {
+fn parse_quant(context: &mut Context) -> Result<Exp_, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let kind = match context.tokens.content() {
         "exists" => {
@@ -1541,7 +1628,7 @@ fn parse_quant(context: &mut Context) -> Result<Exp_, Diagnostic> {
 }
 
 // Parses one quantifier binding.
-fn parse_quant_binding(context: &mut Context) -> Result<Spanned<(Bind, Exp)>, Diagnostic> {
+fn parse_quant_binding(context: &mut Context) -> Result<Spanned<(Bind, Exp)>, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let ident = parse_identifier(context)?;
     let bind = spanned(
@@ -1581,12 +1668,12 @@ fn make_builtin_call(loc: Loc, name: Symbol, type_args: Option<Vec<Type>>, args:
 
 // Parse a Type:
 //      Type =
-//          <NameAccessChain> ("<" Comma<Type> ">")?
+//          <NameAccessChain> ('<' Comma<Type> ">")?
 //          | "&" <Type>
 //          | "&mut" <Type>
 //          | "|" Comma<Type> "|" Type   (spec only)
 //          | "(" Comma<Type> ")"
-fn parse_type(context: &mut Context) -> Result<Type, Diagnostic> {
+fn parse_type(context: &mut Context) -> Result<Type, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let t = match context.tokens.peek() {
         Tok::LParen => {
@@ -1632,8 +1719,8 @@ fn parse_type(context: &mut Context) -> Result<Type, Diagnostic> {
 }
 
 // Parse an optional list of type arguments.
-//    OptionalTypeArgs = "<" Comma<Type> ">" | <empty>
-fn parse_optional_type_args(context: &mut Context) -> Result<Option<Vec<Type>>, Diagnostic> {
+//    OptionalTypeArgs = '<' Comma<Type> ">" | <empty>
+fn parse_optional_type_args(context: &mut Context) -> Result<Option<Vec<Type>>, Box<Diagnostic>> {
     if context.tokens.peek() == Tok::Less {
         Ok(Some(parse_comma_list(
             context,
@@ -1663,7 +1750,7 @@ fn token_to_ability(token: Tok, content: &str) -> Option<Ability_> {
 //          | "drop"
 //          | "store"
 //          | "key"
-fn parse_ability(context: &mut Context) -> Result<Ability, Diagnostic> {
+fn parse_ability(context: &mut Context) -> Result<Ability, Box<Diagnostic>> {
     let loc = current_token_loc(context.tokens);
     match token_to_ability(context.tokens.peek(), context.tokens.content()) {
         Some(ability) => {
@@ -1675,7 +1762,7 @@ fn parse_ability(context: &mut Context) -> Result<Ability, Diagnostic> {
                 "Unexpected {}. Expected a type ability, one of: 'copy', 'drop', 'store', or 'key'",
                 current_token_error_string(context.tokens)
             );
-            Err(diag!(Syntax::UnexpectedToken, (loc, msg),))
+            Err(Box::new(diag!(Syntax::UnexpectedToken, (loc, msg))))
         }
     }
 }
@@ -1685,7 +1772,7 @@ fn parse_ability(context: &mut Context) -> Result<Ability, Diagnostic> {
 //          <Identifier> <Constraint>?
 //      Constraint =
 //          ":" <Ability> (+ <Ability>)*
-fn parse_type_parameter(context: &mut Context) -> Result<(Name, Vec<Ability>), Diagnostic> {
+fn parse_type_parameter(context: &mut Context) -> Result<(Name, Vec<Ability>), Box<Diagnostic>> {
     let n = parse_identifier(context)?;
 
     let ability_constraints = if match_token(context.tokens, Tok::Colon)? {
@@ -1719,7 +1806,7 @@ fn parse_type_parameter(context: &mut Context) -> Result<(Name, Vec<Ability>), D
 //   TypeParameterWithPhantomDecl = "phantom"? <TypeParameter>
 fn parse_type_parameter_with_phantom_decl(
     context: &mut Context,
-) -> Result<StructTypeParameter, Diagnostic> {
+) -> Result<StructTypeParameter, Box<Diagnostic>> {
     let is_phantom =
         if context.tokens.peek() == Tok::Identifier && context.tokens.content() == "phantom" {
             context.tokens.advance()?;
@@ -1736,10 +1823,10 @@ fn parse_type_parameter_with_phantom_decl(
 }
 
 // Parse optional type parameter list.
-//    OptionalTypeParameters = "<" Comma<TypeParameter> ">" | <empty>
+//    OptionalTypeParameters = '<' Comma<TypeParameter> ">" | <empty>
 fn parse_optional_type_parameters(
     context: &mut Context,
-) -> Result<Vec<(Name, Vec<Ability>)>, Diagnostic> {
+) -> Result<Vec<(Name, Vec<Ability>)>, Box<Diagnostic>> {
     if context.tokens.peek() == Tok::Less {
         parse_comma_list(
             context,
@@ -1754,10 +1841,10 @@ fn parse_optional_type_parameters(
 }
 
 // Parse optional struct type parameters:
-//    StructTypeParameter = "<" Comma<TypeParameterWithPhantomDecl> ">" | <empty>
+//    StructTypeParameter = '<' Comma<TypeParameterWithPhantomDecl> ">" | <empty>
 fn parse_struct_type_parameters(
     context: &mut Context,
-) -> Result<Vec<StructTypeParameter>, Diagnostic> {
+) -> Result<Vec<StructTypeParameter>, Box<Diagnostic>> {
     if context.tokens.peek() == Tok::Less {
         parse_comma_list(
             context,
@@ -1788,7 +1875,7 @@ fn parse_function_decl(
     start_loc: usize,
     modifiers: Modifiers,
     context: &mut Context,
-) -> Result<Function, Diagnostic> {
+) -> Result<Function, Box<Diagnostic>> {
     let Modifiers {
         visibility,
         mut entry,
@@ -1892,7 +1979,7 @@ fn parse_function_decl(
 
 // Parse a function parameter:
 //      Parameter = <Var> ":" <Type>
-fn parse_parameter(context: &mut Context) -> Result<(Var, Type), Diagnostic> {
+fn parse_parameter(context: &mut Context) -> Result<(Var, Type), Box<Diagnostic>> {
     let v = parse_var(context)?;
     consume_token(context.tokens, Tok::Colon)?;
     let t = parse_type(context)?;
@@ -1914,7 +2001,7 @@ fn parse_struct_decl(
     start_loc: usize,
     modifiers: Modifiers,
     context: &mut Context,
-) -> Result<StructDefinition, Diagnostic> {
+) -> Result<StructDefinition, Box<Diagnostic>> {
     let Modifiers {
         visibility,
         entry,
@@ -2007,7 +2094,7 @@ fn parse_struct_decl(
 
 // Parse a field annotated with a type:
 //      FieldAnnot = <DocComments> <Field> ":" <Type>
-fn parse_field_annot(context: &mut Context) -> Result<(Field, Type), Diagnostic> {
+fn parse_field_annot(context: &mut Context) -> Result<(Field, Type), Box<Diagnostic>> {
     context.tokens.match_doc_comments();
     let f = parse_field(context)?;
     consume_token(context.tokens, Tok::Colon)?;
@@ -2026,7 +2113,7 @@ fn parse_constant_decl(
     start_loc: usize,
     modifiers: Modifiers,
     context: &mut Context,
-) -> Result<Constant, Diagnostic> {
+) -> Result<Constant, Box<Diagnostic>> {
     let Modifiers {
         visibility,
         entry,
@@ -2087,7 +2174,7 @@ fn parse_constant_decl(
 fn parse_address_block(
     attributes: Vec<Attributes>,
     context: &mut Context,
-) -> Result<AddressDefinition, Diagnostic> {
+) -> Result<AddressDefinition, Box<Diagnostic>> {
     const UNEXPECTED_TOKEN: &str = "Invalid code unit. Expected 'address', 'module', or 'script'";
     if context.tokens.peek() != Tok::Identifier {
         let start = context.tokens.start_loc();
@@ -2098,12 +2185,15 @@ fn parse_address_block(
             UNEXPECTED_TOKEN,
             current_token_error_string(context.tokens)
         );
-        return Err(diag!(Syntax::UnexpectedToken, (loc, msg)));
+        return Err(Box::new(diag!(Syntax::UnexpectedToken, (loc, msg))));
     }
     let addr_name = parse_identifier(context)?;
     if addr_name.value.as_str() != "address" {
         let msg = format!("{}. Got '{}'", UNEXPECTED_TOKEN, addr_name.value);
-        return Err(diag!(Syntax::UnexpectedToken, (addr_name.loc, msg)));
+        return Err(Box::new(diag!(
+            Syntax::UnexpectedToken,
+            (addr_name.loc, msg)
+        )));
     }
     let start_loc = context.tokens.start_loc();
     let addr = parse_leading_name_access(context)?;
@@ -2142,7 +2232,7 @@ fn parse_address_block(
 fn parse_friend_decl(
     attributes: Vec<Attributes>,
     context: &mut Context,
-) -> Result<FriendDecl, Diagnostic> {
+) -> Result<FriendDecl, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     consume_token(context.tokens, Tok::Friend)?;
     let friend = parse_name_access_chain(context, || "a friend declaration")?;
@@ -2171,7 +2261,7 @@ fn parse_friend_decl(
 fn parse_use_decl(
     attributes: Vec<Attributes>,
     context: &mut Context,
-) -> Result<UseDecl, Diagnostic> {
+) -> Result<UseDecl, Box<Diagnostic>> {
     consume_token(context.tokens, Tok::Use)?;
     let ident = parse_module_ident(context)?;
     let alias_opt = parse_use_alias(context)?;
@@ -2198,7 +2288,7 @@ fn parse_use_decl(
 
 // Parse an alias for a module member:
 //      UseMember = <Identifier> <UseAlias>
-fn parse_use_member(context: &mut Context) -> Result<(Name, Option<Name>), Diagnostic> {
+fn parse_use_member(context: &mut Context) -> Result<(Name, Option<Name>), Box<Diagnostic>> {
     let member = parse_identifier(context)?;
     let alias_opt = parse_use_alias(context)?;
     Ok((member, alias_opt))
@@ -2206,7 +2296,7 @@ fn parse_use_member(context: &mut Context) -> Result<(Name, Option<Name>), Diagn
 
 // Parse an 'as' use alias:
 //      UseAlias = ("as" <Identifier>)?
-fn parse_use_alias(context: &mut Context) -> Result<Option<Name>, Diagnostic> {
+fn parse_use_alias(context: &mut Context) -> Result<Option<Name>, Box<Diagnostic>> {
     Ok(if context.tokens.peek() == Tok::As {
         context.tokens.advance()?;
         Some(parse_identifier(context)?)
@@ -2228,7 +2318,7 @@ fn parse_use_alias(context: &mut Context) -> Result<Option<Name>, Diagnostic> {
 fn parse_module(
     attributes: Vec<Attributes>,
     context: &mut Context,
-) -> Result<ModuleDefinition, Diagnostic> {
+) -> Result<ModuleDefinition, Box<Diagnostic>> {
     context.tokens.match_doc_comments();
     let start_loc = context.tokens.start_loc();
 
@@ -2363,7 +2453,7 @@ fn parse_module(
 fn parse_script(
     script_attributes: Vec<Attributes>,
     context: &mut Context,
-) -> Result<Script, Diagnostic> {
+) -> Result<Script, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
 
     consume_token(context.tokens, Tok::Script)?;
@@ -2403,7 +2493,7 @@ fn parse_script(
     if context.tokens.peek() != Tok::RBrace {
         let loc = current_token_loc(context.tokens);
         let msg = "Unexpected characters after end of 'script' function";
-        return Err(diag!(Syntax::UnexpectedToken, (loc, msg)));
+        return Err(Box::new(diag!(Syntax::UnexpectedToken, (loc, msg))));
     }
     consume_token(context.tokens, Tok::RBrace)?;
 
@@ -2438,7 +2528,7 @@ fn parse_script(
 fn parse_spec_block(
     attributes: Vec<Attributes>,
     context: &mut Context,
-) -> Result<SpecBlock, Diagnostic> {
+) -> Result<SpecBlock, Box<Diagnostic>> {
     context.tokens.match_doc_comments();
     let start_loc = context.tokens.start_loc();
     consume_token(context.tokens, Tok::Spec)?;
@@ -2515,7 +2605,7 @@ fn parse_spec_block(
 fn parse_spec_target_signature_opt(
     loc: &Loc,
     context: &mut Context,
-) -> Result<Option<Box<FunctionSignature>>, Diagnostic> {
+) -> Result<Option<Box<FunctionSignature>>, Box<Diagnostic>> {
     match context.tokens.peek() {
         Tok::Less | Tok::LParen => {
             let type_parameters = parse_optional_type_parameters(context)?;
@@ -2547,7 +2637,7 @@ fn parse_spec_target_signature_opt(
 //    SpecBlockMember = <DocComments> ( <Invariant> | <Condition> | <SpecFunction> | <SpecVariable>
 //                                   | <SpecInclude> | <SpecApply> | <SpecPragma> | <SpecLet>
 //                                   | <SpecUpdate> | <SpecAxiom> )
-fn parse_spec_block_member(context: &mut Context) -> Result<SpecBlockMember, Diagnostic> {
+fn parse_spec_block_member(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
     context.tokens.match_doc_comments();
     match context.tokens.peek() {
         Tok::Invariant => parse_invariant(context),
@@ -2584,7 +2674,7 @@ fn parse_spec_block_member(context: &mut Context) -> Result<SpecBlockMember, Dia
 //      | "aborts_with" <ConditionProperties> <Exp> [Comma <Exp>]* ";"
 //      | "decreases" <ConditionProperties> <Exp> ";"
 //      | "emits" <ConditionProperties> <Exp> "to" <Exp> [If <Exp>] ";"
-fn parse_condition(context: &mut Context) -> Result<SpecBlockMember, Diagnostic> {
+fn parse_condition(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let kind_ = match context.tokens.content() {
         "assert" => SpecConditionKind_::Assert,
@@ -2659,7 +2749,9 @@ fn parse_condition(context: &mut Context) -> Result<SpecBlockMember, Diagnostic>
 
 // Parse properties in a condition.
 //   ConditionProperties = ( "[" Comma<SpecPragmaProperty> "]" )?
-fn parse_condition_properties(context: &mut Context) -> Result<Vec<PragmaProperty>, Diagnostic> {
+fn parse_condition_properties(
+    context: &mut Context,
+) -> Result<Vec<PragmaProperty>, Box<Diagnostic>> {
     let properties = if context.tokens.peek() == Tok::LBracket {
         parse_comma_list(
             context,
@@ -2676,7 +2768,7 @@ fn parse_condition_properties(context: &mut Context) -> Result<Vec<PragmaPropert
 
 // Parse an axiom:
 //     a = "axiom" <OptionalTypeParameters> <ConditionProperties> <Exp> ";"
-fn parse_axiom(context: &mut Context) -> Result<SpecBlockMember, Diagnostic> {
+fn parse_axiom(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     consume_identifier(context.tokens, "axiom")?;
     let type_parameters = parse_optional_type_parameters(context)?;
@@ -2704,7 +2796,7 @@ fn parse_axiom(context: &mut Context) -> Result<SpecBlockMember, Diagnostic> {
 
 // Parse an invariant:
 //     Invariant = "invariant" <OptionalTypeParameters> [ "update" ] <ConditionProperties> <Exp> ";"
-fn parse_invariant(context: &mut Context) -> Result<SpecBlockMember, Diagnostic> {
+fn parse_invariant(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     consume_token(context.tokens, Tok::Invariant)?;
     let type_parameters = parse_optional_type_parameters(context)?;
@@ -2742,7 +2834,7 @@ fn parse_invariant(context: &mut Context) -> Result<SpecBlockMember, Diagnostic>
 //                  | "native" "define" <SpecFunctionSignature> ";"
 //     SpecFunctionSignature =
 //         <Identifier> <OptionalTypeParameters> "(" Comma<Parameter> ")" ":" <Type>
-fn parse_spec_function(context: &mut Context) -> Result<SpecBlockMember, Diagnostic> {
+fn parse_spec_function(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let native_opt = consume_optional_token_with_loc(context.tokens, Tok::Native)?;
     consume_token(context.tokens, Tok::Fun)?;
@@ -2803,7 +2895,7 @@ fn parse_spec_function(context: &mut Context) -> Result<SpecBlockMember, Diagnos
 //                    ":" <Type>
 //                    [ "=" Exp ]  // global only
 //                    ";"
-fn parse_spec_variable(context: &mut Context) -> Result<SpecBlockMember, Diagnostic> {
+fn parse_spec_variable(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let is_global = match context.tokens.content() {
         "global" => {
@@ -2844,7 +2936,7 @@ fn parse_spec_variable(context: &mut Context) -> Result<SpecBlockMember, Diagnos
 
 // Parse a specification update.
 //     SpecUpdate = "update" <Exp> = <Exp> ";"
-fn parse_spec_update(context: &mut Context) -> Result<SpecBlockMember, Diagnostic> {
+fn parse_spec_update(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     consume_token(context.tokens, Tok::Identifier)?;
     let lhs = parse_unary_exp(context)?;
@@ -2861,7 +2953,7 @@ fn parse_spec_update(context: &mut Context) -> Result<SpecBlockMember, Diagnosti
 
 // Parse a specification let.
 //     SpecLet =  "let" [ "post" ] <Identifier> "=" <Exp> ";"
-fn parse_spec_let(context: &mut Context) -> Result<SpecBlockMember, Diagnostic> {
+fn parse_spec_let(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     context.tokens.advance()?;
     let post_state =
@@ -2889,7 +2981,7 @@ fn parse_spec_let(context: &mut Context) -> Result<SpecBlockMember, Diagnostic>
 
 // Parse a specification schema include.
 //    SpecInclude = "include" <Exp>
-fn parse_spec_include(context: &mut Context) -> Result<SpecBlockMember, Diagnostic> {
+fn parse_spec_include(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     consume_identifier(context.tokens, "include")?;
     let properties = parse_condition_properties(context)?;
@@ -2906,7 +2998,7 @@ fn parse_spec_include(context: &mut Context) -> Result<SpecBlockMember, Diagnost
 // Parse a specification schema apply.
 //    SpecApply = "apply" <Exp> "to" Comma<SpecApplyPattern>
 //                                   ( "except" Comma<SpecApplyPattern> )? ";"
-fn parse_spec_apply(context: &mut Context) -> Result<SpecBlockMember, Diagnostic> {
+fn parse_spec_apply(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     consume_identifier(context.tokens, "apply")?;
     let exp = parse_exp(context)?;
@@ -2948,7 +3040,7 @@ fn parse_spec_apply(context: &mut Context) -> Result<SpecBlockMember, Diagnostic
 
 // Parse a function pattern:
 //     SpecApplyPattern = <SpecApplyFragment>+ <OptionalTypeArgs>
-fn parse_spec_apply_pattern(context: &mut Context) -> Result<SpecApplyPattern, Diagnostic> {
+fn parse_spec_apply_pattern(context: &mut Context) -> Result<SpecApplyPattern, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     // TODO: update the visibility parsing in the spec as well
     let public_opt = consume_optional_token_with_loc(context.tokens, Tok::Public)?;
@@ -2990,7 +3082,7 @@ fn parse_spec_apply_pattern(context: &mut Context) -> Result<SpecApplyPattern, D
 
 // Parse a name pattern fragment
 //     SpecApplyFragment = <Identifier> | "*"
-fn parse_spec_apply_fragment(context: &mut Context) -> Result<SpecApplyFragment, Diagnostic> {
+fn parse_spec_apply_fragment(context: &mut Context) -> Result<SpecApplyFragment, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let fragment = match context.tokens.peek() {
         Tok::Identifier => SpecApplyFragment_::NamePart(parse_identifier(context)?),
@@ -3015,7 +3107,7 @@ fn parse_spec_apply_fragment(context: &mut Context) -> Result<SpecApplyFragment,
 
 // Parse a specification pragma:
 //    SpecPragma = "pragma" Comma<SpecPragmaProperty> ";"
-fn parse_spec_pragma(context: &mut Context) -> Result<SpecBlockMember, Diagnostic> {
+fn parse_spec_pragma(context: &mut Context) -> Result<SpecBlockMember, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     consume_identifier(context.tokens, "pragma")?;
     let properties = parse_comma_list_after_start(
@@ -3036,7 +3128,7 @@ fn parse_spec_pragma(context: &mut Context) -> Result<SpecBlockMember, Diagnosti
 
 // Parse a specification pragma property:
 //    SpecPragmaProperty = <Identifier> ( "=" <Value> | <NameAccessChain> )?
-fn parse_spec_property(context: &mut Context) -> Result<PragmaProperty, Diagnostic> {
+fn parse_spec_property(context: &mut Context) -> Result<PragmaProperty, Box<Diagnostic>> {
     let start_loc = context.tokens.start_loc();
     let name = match consume_optional_token_with_loc(context.tokens, Tok::Friend)? {
         // special treatment for `pragma friend = ...` as friend is a keyword
@@ -3083,8 +3175,8 @@ fn singleton_module_spec_block(
     context: &mut Context,
     start_loc: usize,
     attributes: Vec<Attributes>,
-    member_parser: impl Fn(&mut Context) -> Result<SpecBlockMember, Diagnostic>,
-) -> Result<SpecBlock, Diagnostic> {
+    member_parser: impl Fn(&mut Context) -> Result<SpecBlockMember, Box<Diagnostic>>,
+) -> Result<SpecBlock, Box<Diagnostic>> {
     let member = member_parser(context)?;
     let end_loc = context.tokens.previous_end_loc();
     Ok(spanned(
@@ -3112,7 +3204,7 @@ fn singleton_module_spec_block(
 // Parse a file:
 //      File =
 //          (<Attributes> (<AddressBlock> | <Module> | <Script>))*
-fn parse_file(context: &mut Context) -> Result<Vec<Definition>, Diagnostic> {
+fn parse_file(context: &mut Context) -> Result<Vec<Definition>, Box<Diagnostic>> {
     let mut defs = vec![];
     while context.tokens.peek() != Tok::EOF {
         let attributes = parse_attributes(context)?;
@@ -3135,11 +3227,11 @@ pub fn parse_file_string(
 ) -> Result<(Vec<Definition>, MatchedFileCommentMap), Diagnostics> {
     let mut tokens = Lexer::new(input, file_hash);
     match tokens.advance() {
-        Err(err) => Err(Diagnostics::from(vec![err])),
+        Err(err) => Err(Diagnostics::from(vec![*err])),
         Ok(..) => Ok(()),
     }?;
     match parse_file(&mut Context::new(env, &mut tokens)) {
-        Err(err) => Err(Diagnostics::from(vec![err])),
+        Err(err) => Err(Diagnostics::from(vec![*err])),
         Ok(def) => Ok((def, tokens.check_and_get_doc_comments(env))),
     }
 }
diff --git a/language/move-compiler/src/shared/mod.rs b/language/move-compiler/src/shared/mod.rs
index ea745b3943..ff6c825f24 100644
--- a/language/move-compiler/src/shared/mod.rs
+++ b/language/move-compiler/src/shared/mod.rs
@@ -28,7 +28,8 @@ pub mod unique_set;
 //**************************************************************************************************
 
 pub use move_command_line_common::parser::{
-    parse_address_number as parse_address, parse_u128, parse_u64, parse_u8, NumberFormat,
+    parse_address_number as parse_address, parse_u128, parse_u16, parse_u256, parse_u32, parse_u64,
+    parse_u8, NumberFormat,
 };
 
 //**************************************************************************************************
@@ -193,21 +194,34 @@ impl CompilationEnv {
         self.diags.extend(diags)
     }
 
-    pub fn has_diags(&self) -> bool {
+    pub fn has_warnings_or_errors(&self) -> bool {
         !self.diags.is_empty()
     }
 
+    pub fn has_errors(&self) -> bool {
+        // Non-blocking Error is the min level considered an error
+        self.has_diags_at_or_above_severity(Severity::NonblockingError)
+    }
+
     pub fn count_diags(&self) -> usize {
         self.diags.len()
     }
 
+    pub fn has_diags_at_or_above_severity(&self, threshold: Severity) -> bool {
+        match self.diags.max_severity() {
+            Some(max) if max >= threshold => true,
+            Some(_) | None => false,
+        }
+    }
+
     pub fn check_diags_at_or_above_severity(
         &mut self,
         threshold: Severity,
     ) -> Result<(), Diagnostics> {
-        match self.diags.max_severity() {
-            Some(max) if max >= threshold => Err(std::mem::take(&mut self.diags)),
-            Some(_) | None => Ok(()),
+        if self.has_diags_at_or_above_severity(threshold) {
+            Err(std::mem::take(&mut self.diags))
+        } else {
+            Ok(())
         }
     }
 
@@ -270,6 +284,13 @@ pub struct Flags {
     )]
     test: bool,
 
+    /// Compile in verification mode
+    #[clap(
+    short = cli::VERIFY_SHORT,
+    long = cli::VERIFY,
+    )]
+    verify: bool,
+
     /// Compilation flavor.
     #[clap(
         long = cli::FLAVOR,
@@ -301,6 +322,7 @@ impl Flags {
     pub fn empty() -> Self {
         Self {
             test: false,
+            verify: false,
             shadow: false,
             flavor: "".to_string(),
             bytecode_version: None,
@@ -311,6 +333,7 @@ impl Flags {
     pub fn testing() -> Self {
         Self {
             test: true,
+            verify: false,
             shadow: false,
             flavor: "".to_string(),
             bytecode_version: None,
@@ -318,6 +341,17 @@ impl Flags {
         }
     }
 
+    pub fn verification() -> Self {
+        Self {
+            test: false,
+            verify: true,
+            shadow: true, // allows overlapping between sources and deps
+            flavor: "".to_string(),
+            bytecode_version: None,
+            keep_testing_functions: false,
+        }
+    }
+
     pub fn set_flavor(self, flavor: impl ToString) -> Self {
         Self {
             flavor: flavor.to_string(),
@@ -351,6 +385,10 @@ impl Flags {
         self.test || self.keep_testing_functions
     }
 
+    pub fn is_verification(&self) -> bool {
+        self.verify
+    }
+
     pub fn sources_shadow_deps(&self) -> bool {
         self.shadow
     }
@@ -388,6 +426,7 @@ pub mod known_attributes {
     #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
     pub enum KnownAttribute {
         Testing(TestingAttribute),
+        Verification(VerificationAttribute),
         Native(NativeAttribute),
     }
 
@@ -401,6 +440,12 @@ pub mod known_attributes {
         ExpectedFailure,
     }
 
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+    pub enum VerificationAttribute {
+        // The associated AST node will be included in the compilation in prove mode
+        VerifyOnly,
+    }
+
     #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
     pub enum NativeAttribute {
         // It is a fake native function that actually compiles to a bytecode instruction
@@ -431,6 +476,9 @@ pub mod known_attributes {
                 TestingAttribute::EXPECTED_FAILURE => {
                     Self::Testing(TestingAttribute::ExpectedFailure)
                 }
+                VerificationAttribute::VERIFY_ONLY => {
+                    Self::Verification(VerificationAttribute::VerifyOnly)
+                }
                 NativeAttribute::BYTECODE_INSTRUCTION => {
                     Self::Native(NativeAttribute::BytecodeInstruction)
                 }
@@ -441,6 +489,7 @@ pub mod known_attributes {
         pub const fn name(&self) -> &str {
             match self {
                 Self::Testing(a) => a.name(),
+                Self::Verification(a) => a.name(),
                 Self::Native(a) => a.name(),
             }
         }
@@ -448,6 +497,7 @@ pub mod known_attributes {
         pub fn expected_positions(&self) -> &'static BTreeSet<AttributePosition> {
             match self {
                 Self::Testing(a) => a.expected_positions(),
+                Self::Verification(a) => a.expected_positions(),
                 Self::Native(a) => a.expected_positions(),
             }
         }
@@ -457,7 +507,13 @@ pub mod known_attributes {
         pub const TEST: &'static str = "test";
         pub const EXPECTED_FAILURE: &'static str = "expected_failure";
         pub const TEST_ONLY: &'static str = "test_only";
-        pub const CODE_ASSIGNMENT_NAME: &'static str = "abort_code";
+        pub const ABORT_CODE_NAME: &'static str = "abort_code";
+        pub const ARITHMETIC_ERROR_NAME: &'static str = "arithmetic_error";
+        pub const VECTOR_ERROR_NAME: &'static str = "vector_error";
+        pub const OUT_OF_GAS_NAME: &'static str = "out_of_gas";
+        pub const MAJOR_STATUS_NAME: &'static str = "major_status";
+        pub const MINOR_STATUS_NAME: &'static str = "minor_status";
+        pub const ERROR_LOCATION: &'static str = "location";
 
         pub const fn name(&self) -> &str {
             match self {
@@ -485,9 +541,47 @@ pub mod known_attributes {
             static EXPECTED_FAILURE_POSITIONS: Lazy<BTreeSet<AttributePosition>> =
                 Lazy::new(|| IntoIterator::into_iter([AttributePosition::Function]).collect());
             match self {
-                TestingAttribute::TestOnly => &*TEST_ONLY_POSITIONS,
-                TestingAttribute::Test => &*TEST_POSITIONS,
-                TestingAttribute::ExpectedFailure => &*EXPECTED_FAILURE_POSITIONS,
+                TestingAttribute::TestOnly => &TEST_ONLY_POSITIONS,
+                TestingAttribute::Test => &TEST_POSITIONS,
+                TestingAttribute::ExpectedFailure => &EXPECTED_FAILURE_POSITIONS,
+            }
+        }
+
+        pub fn expected_failure_cases() -> &'static [&'static str] {
+            &[
+                Self::ABORT_CODE_NAME,
+                Self::ARITHMETIC_ERROR_NAME,
+                Self::VECTOR_ERROR_NAME,
+                Self::OUT_OF_GAS_NAME,
+                Self::MAJOR_STATUS_NAME,
+            ]
+        }
+    }
+
+    impl VerificationAttribute {
+        pub const VERIFY_ONLY: &'static str = "verify_only";
+
+        pub const fn name(&self) -> &str {
+            match self {
+                Self::VerifyOnly => Self::VERIFY_ONLY,
+            }
+        }
+
+        pub fn expected_positions(&self) -> &'static BTreeSet<AttributePosition> {
+            static VERIFY_ONLY_POSITIONS: Lazy<BTreeSet<AttributePosition>> = Lazy::new(|| {
+                IntoIterator::into_iter([
+                    AttributePosition::AddressBlock,
+                    AttributePosition::Module,
+                    AttributePosition::Use,
+                    AttributePosition::Friend,
+                    AttributePosition::Constant,
+                    AttributePosition::Struct,
+                    AttributePosition::Function,
+                ])
+                .collect()
+            });
+            match self {
+                Self::VerifyOnly => &VERIFY_ONLY_POSITIONS,
             }
         }
     }
@@ -505,7 +599,7 @@ pub mod known_attributes {
             static BYTECODE_INSTRUCTION_POSITIONS: Lazy<BTreeSet<AttributePosition>> =
                 Lazy::new(|| IntoIterator::into_iter([AttributePosition::Function]).collect());
             match self {
-                NativeAttribute::BytecodeInstruction => &*BYTECODE_INSTRUCTION_POSITIONS,
+                NativeAttribute::BytecodeInstruction => &BYTECODE_INSTRUCTION_POSITIONS,
             }
         }
     }
diff --git a/language/move-compiler/src/to_bytecode/mod.rs b/language/move-compiler/src/to_bytecode/mod.rs
index d6077e04d1..d39e16d78b 100644
--- a/language/move-compiler/src/to_bytecode/mod.rs
+++ b/language/move-compiler/src/to_bytecode/mod.rs
@@ -4,22 +4,5 @@
 
 #[macro_use]
 mod context;
-mod remove_fallthrough_jumps;
+mod optimize;
 pub mod translate;
-
-use move_ir_types::ast as IR;
-use std::collections::HashMap;
-
-fn remap_labels(blocks: &mut IR::BytecodeBlocks, map: &HashMap<IR::BlockLabel_, IR::BlockLabel_>) {
-    use IR::Bytecode_ as B;
-    for (_, block) in blocks {
-        for instr in block {
-            match &mut instr.value {
-                B::Branch(lbl) | B::BrTrue(lbl) | B::BrFalse(lbl) => {
-                    *lbl = map[lbl].clone();
-                }
-                _ => (),
-            }
-        }
-    }
-}
diff --git a/language/move-compiler/src/to_bytecode/optimize/mod.rs b/language/move-compiler/src/to_bytecode/optimize/mod.rs
new file mode 100644
index 0000000000..3dc46c0e47
--- /dev/null
+++ b/language/move-compiler/src/to_bytecode/optimize/mod.rs
@@ -0,0 +1,63 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+mod remove_fallthrough_jumps;
+mod remove_nop_store;
+mod remove_unused_locals;
+mod remove_write_back;
+
+use crate::parser::ast::FunctionName;
+use move_ir_types::ast::{self as IR};
+use std::collections::{BTreeSet, HashMap};
+
+pub type Optimization = fn(
+    &FunctionName,
+    &BTreeSet<IR::BlockLabel_>,
+    &mut Vec<(IR::Var, IR::Type)>,
+    &mut IR::BytecodeBlocks,
+) -> bool;
+
+const OPTIMIZATIONS: &[Optimization] = &[
+    remove_fallthrough_jumps::optimize,
+    remove_nop_store::optimize,
+    remove_write_back::optimize,
+    remove_unused_locals::optimize,
+];
+
+pub(crate) fn code(
+    f: &FunctionName,
+    loop_heads: &BTreeSet<IR::BlockLabel_>,
+    locals: &mut Vec<(IR::Var, IR::Type)>,
+    blocks: &mut IR::BytecodeBlocks,
+) {
+    let mut count = 0;
+    for optimization in OPTIMIZATIONS.iter().cycle() {
+        // if we have fully cycled through the list of optimizations without a change,
+        // it is safe to stop
+        if count >= OPTIMIZATIONS.len() {
+            debug_assert_eq!(count, OPTIMIZATIONS.len());
+            break;
+        }
+
+        // reset the count if something has changed
+        if optimization(f, loop_heads, locals, blocks) {
+            count = 0
+        } else {
+            count += 1
+        }
+    }
+}
+
+fn remap_labels(blocks: &mut IR::BytecodeBlocks, map: &HashMap<IR::BlockLabel_, IR::BlockLabel_>) {
+    use IR::Bytecode_ as B;
+    for (_, block) in blocks {
+        for instr in block {
+            match &mut instr.value {
+                B::Branch(lbl) | B::BrTrue(lbl) | B::BrFalse(lbl) => {
+                    *lbl = map[lbl].clone();
+                }
+                _ => (),
+            }
+        }
+    }
+}
diff --git a/language/move-compiler/src/to_bytecode/remove_fallthrough_jumps.rs b/language/move-compiler/src/to_bytecode/optimize/remove_fallthrough_jumps.rs
similarity index 78%
rename from language/move-compiler/src/to_bytecode/remove_fallthrough_jumps.rs
rename to language/move-compiler/src/to_bytecode/optimize/remove_fallthrough_jumps.rs
index 837c0ad8c4..763e83cbbd 100644
--- a/language/move-compiler/src/to_bytecode/remove_fallthrough_jumps.rs
+++ b/language/move-compiler/src/to_bytecode/optimize/remove_fallthrough_jumps.rs
@@ -2,20 +2,24 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use move_ir_types::ast as IR;
+use crate::parser::ast::FunctionName;
+use move_ir_types::ast::{self as IR};
 use std::collections::{BTreeSet, HashMap};
 
 // Removes any "fall through jumps", i.e. this a is a jump directly to the next instruction.
 // Iterates to find a fixpoint as it might create empty blocks which could create more jumps to
 // clean up
 
-pub fn code(loop_heads: &BTreeSet<IR::BlockLabel_>, blocks: &mut IR::BytecodeBlocks) {
-    let mut changed = true;
-    while changed {
-        let fall_through_removed = remove_fall_through(loop_heads, blocks);
-        let block_removed = remove_empty_blocks(blocks);
-        changed = fall_through_removed || block_removed;
-    }
+#[allow(clippy::ptr_arg)]
+pub fn optimize(
+    _f: &FunctionName,
+    loop_heads: &BTreeSet<IR::BlockLabel_>,
+    _locals: &mut Vec<(IR::Var, IR::Type)>,
+    blocks: &mut IR::BytecodeBlocks,
+) -> bool {
+    let fall_through_removed = remove_fall_through(loop_heads, blocks);
+    let block_removed = remove_empty_blocks(blocks);
+    fall_through_removed || block_removed
 }
 
 fn remove_fall_through(
diff --git a/language/move-compiler/src/to_bytecode/optimize/remove_nop_store.rs b/language/move-compiler/src/to_bytecode/optimize/remove_nop_store.rs
new file mode 100644
index 0000000000..3f37dcf7c7
--- /dev/null
+++ b/language/move-compiler/src/to_bytecode/optimize/remove_nop_store.rs
@@ -0,0 +1,39 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::parser::ast::FunctionName;
+use move_ir_types::ast as IR;
+use std::collections::BTreeSet;
+
+// Removes any unnecessary storing to a local just to move the value out.
+
+#[allow(clippy::ptr_arg)]
+pub fn optimize(
+    _f: &FunctionName,
+    _loop_heads: &BTreeSet<IR::BlockLabel_>,
+    _locals: &mut Vec<(IR::Var, IR::Type)>,
+    blocks: &mut IR::BytecodeBlocks,
+) -> bool {
+    let mut changed = false;
+    for (_lbl, block) in blocks {
+        let mut new_block = vec![];
+        let mut i = 0;
+        while i < block.len() {
+            match (&block[i], block.get(i + 1)) {
+                (sp!(_, IR::Bytecode_::StLoc(v1)), Some(sp!(_, IR::Bytecode_::MoveLoc(v2))))
+                    if v1 == v2 =>
+                {
+                    changed = true;
+                    i += 2
+                }
+                (instr, _) => {
+                    new_block.push(instr.clone());
+                    i += 1
+                }
+            }
+        }
+        *block = new_block;
+    }
+
+    changed
+}
diff --git a/language/move-compiler/src/to_bytecode/optimize/remove_unused_locals.rs b/language/move-compiler/src/to_bytecode/optimize/remove_unused_locals.rs
new file mode 100644
index 0000000000..bf13d738d2
--- /dev/null
+++ b/language/move-compiler/src/to_bytecode/optimize/remove_unused_locals.rs
@@ -0,0 +1,42 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::parser::ast::FunctionName;
+use move_ir_types::ast as IR;
+use std::collections::BTreeSet;
+
+// Removes any unused locals. Most likely generated from other optimizations
+
+pub fn optimize(
+    _f: &FunctionName,
+    _loop_heads: &BTreeSet<IR::BlockLabel_>,
+    locals: &mut Vec<(IR::Var, IR::Type)>,
+    blocks: &mut IR::BytecodeBlocks,
+) -> bool {
+    let mut unused = locals
+        .iter()
+        .map(|(sp!(_, v_), _)| v_.clone())
+        .collect::<BTreeSet<_>>();
+    for (_lbl, block) in blocks {
+        for sp!(_, instr_) in block {
+            match instr_ {
+                IR::Bytecode_::CopyLoc(sp!(_, v_))
+                | IR::Bytecode_::MoveLoc(sp!(_, v_))
+                | IR::Bytecode_::StLoc(sp!(_, v_))
+                | IR::Bytecode_::MutBorrowLoc(sp!(_, v_))
+                | IR::Bytecode_::ImmBorrowLoc(sp!(_, v_)) => {
+                    unused.remove(v_);
+                }
+                _ => (),
+            }
+        }
+    }
+    if unused.is_empty() {
+        return false;
+    }
+    *locals = std::mem::take(locals)
+        .into_iter()
+        .filter(|(sp!(_, v_), _)| !unused.contains(v_))
+        .collect();
+    true
+}
diff --git a/language/move-compiler/src/to_bytecode/optimize/remove_write_back.rs b/language/move-compiler/src/to_bytecode/optimize/remove_write_back.rs
new file mode 100644
index 0000000000..7832db108d
--- /dev/null
+++ b/language/move-compiler/src/to_bytecode/optimize/remove_write_back.rs
@@ -0,0 +1,39 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::parser::ast::FunctionName;
+use move_ir_types::ast as IR;
+use std::collections::BTreeSet;
+
+// Removes any unnecessary moving/copying a value out of a local just to reassign the value back.
+#[allow(clippy::ptr_arg)]
+pub fn optimize(
+    _f: &FunctionName,
+    _loop_heads: &BTreeSet<IR::BlockLabel_>,
+    _locals: &mut Vec<(IR::Var, IR::Type)>,
+    blocks: &mut IR::BytecodeBlocks,
+) -> bool {
+    let mut changed = false;
+    for (_lbl, block) in blocks {
+        let mut new_block = vec![];
+        let mut i = 0;
+        while i < block.len() {
+            match (&block[i], block.get(i + 1)) {
+                (sp!(_, IR::Bytecode_::CopyLoc(v1)), Some(sp!(_, IR::Bytecode_::StLoc(v2))))
+                | (sp!(_, IR::Bytecode_::MoveLoc(v1)), Some(sp!(_, IR::Bytecode_::StLoc(v2))))
+                    if v1 == v2 =>
+                {
+                    changed = true;
+                    i += 2
+                }
+                (instr, _) => {
+                    new_block.push(instr.clone());
+                    i += 1
+                }
+            }
+        }
+        *block = new_block;
+    }
+
+    changed
+}
diff --git a/language/move-compiler/src/to_bytecode/translate.rs b/language/move-compiler/src/to_bytecode/translate.rs
index 608f99d3aa..042a80a27d 100644
--- a/language/move-compiler/src/to_bytecode/translate.rs
+++ b/language/move-compiler/src/to_bytecode/translate.rs
@@ -2,12 +2,14 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use super::{context::*, remove_fallthrough_jumps};
+use super::{context::*, optimize};
 use crate::{
     cfgir::{ast as G, translate::move_value_from_value_},
     compiled_unit::*,
     diag,
-    expansion::ast::{AbilitySet, Address, ModuleIdent, ModuleIdent_, SpecId, Visibility},
+    expansion::ast::{
+        AbilitySet, Address, Attributes, ModuleIdent, ModuleIdent_, SpecId, Visibility,
+    },
     hlir::{
         ast::{self as H, Value_},
         translate::{display_var, DisplayVar},
@@ -37,6 +39,7 @@ type CollectedInfos = UniqueMap<FunctionName, CollectedInfo>;
 type CollectedInfo = (
     Vec<(Var, H::SingleType)>,
     BTreeMap<SpecId, (IR::NopLabel, BTreeMap<Var, H::SingleType>)>,
+    Attributes,
 );
 
 fn extract_decls(
@@ -371,7 +374,7 @@ fn function_info_map(
         .into_iter()
         .map(|(n, v)| (Symbol::from(n.as_str()), v))
         .collect();
-    let (params, specs) = collected_function_infos.get_(&name).unwrap();
+    let (params, specs, attributes) = collected_function_infos.get_(&name).unwrap();
     let parameters = params
         .iter()
         .map(|(v, ty)| var_info(&local_map, *v, ty.clone()))
@@ -391,6 +394,7 @@ fn function_info_map(
     let function_info = FunctionInfo {
         spec_info,
         parameters,
+        attributes: attributes.clone(),
     };
 
     let name_loc = *collected_function_infos.get_loc_(&name).unwrap();
@@ -398,7 +402,10 @@ fn function_info_map(
     (function_name, function_info)
 }
 
-fn script_function_info(source_map: &SourceMap, (params, specs): CollectedInfo) -> FunctionInfo {
+fn script_function_info(
+    source_map: &SourceMap,
+    (params, specs, attributes): CollectedInfo,
+) -> FunctionInfo {
     let idx = F::FunctionDefinitionIndex(0);
     let function_source_map = source_map.get_function_source_map(idx).unwrap();
     let local_map = function_source_map
@@ -425,6 +432,7 @@ fn script_function_info(source_map: &SourceMap, (params, specs): CollectedInfo)
     FunctionInfo {
         spec_info,
         parameters,
+        attributes,
     }
 }
 
@@ -544,7 +552,7 @@ fn function(
     fdef: G::Function,
 ) -> ((IR::FunctionName, IR::Function), CollectedInfo) {
     let G::Function {
-        attributes: _attributes,
+        attributes,
         visibility: v,
         entry,
         signature,
@@ -568,6 +576,7 @@ fn function(
         } => {
             let (locals, code) = function_body(
                 context,
+                &f,
                 parameters.clone(),
                 locals,
                 loop_heads,
@@ -589,7 +598,7 @@ fn function(
     };
     (
         (name, sp(loc, ir_function)),
-        (parameters, context.finish_function()),
+        (parameters, context.finish_function(), attributes),
     )
 }
 
@@ -665,6 +674,7 @@ fn seen_structs_base_type(
 
 fn function_body(
     context: &mut Context,
+    f: &FunctionName,
     parameters: Vec<(Var, H::SingleType)>,
     mut locals_map: UniqueMap<Var, H::SingleType>,
     loop_heads: BTreeSet<H::Label>,
@@ -674,7 +684,7 @@ fn function_body(
     parameters
         .iter()
         .for_each(|(var, _)| assert!(locals_map.remove(var).is_some()));
-    let locals = locals_map
+    let mut locals = locals_map
         .into_iter()
         .filter(|(_, ty)| {
             // filter out any locals generated for unreachable code
@@ -702,7 +712,7 @@ fn function_body(
     }
 
     let loop_heads = loop_heads.into_iter().map(label).collect();
-    remove_fallthrough_jumps::code(&loop_heads, &mut bytecode_blocks);
+    optimize::code(f, &loop_heads, &mut locals, &mut bytecode_blocks);
 
     (locals, bytecode_blocks)
 }
@@ -808,8 +818,11 @@ fn base_type(context: &mut Context, sp!(_, bt_): H::BaseType) -> IR::Type {
         B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::Address))), _) => IRT::Address,
         B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::Signer))), _) => IRT::Signer,
         B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::U8))), _) => IRT::U8,
+        B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::U16))), _) => IRT::U16,
+        B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::U32))), _) => IRT::U32,
         B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::U64))), _) => IRT::U64,
         B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::U128))), _) => IRT::U128,
+        B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::U256))), _) => IRT::U256,
 
         B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::Bool))), _) => IRT::Bool,
         B::Apply(_, sp!(_, TN::Builtin(sp!(_, BT::Vector))), mut args) => {
@@ -891,8 +904,8 @@ fn command(context: &mut Context, code: &mut IR::BytecodeBlock, sp!(loc, cmd_):
             if_false,
         } => {
             exp_(context, code, cond);
-            code.push(sp(loc, B::BrTrue(label(if_true))));
-            code.push(sp(loc, B::Branch(label(if_false))));
+            code.push(sp(loc, B::BrFalse(label(if_false))));
+            code.push(sp(loc, B::Branch(label(if_true))));
         }
         C::Break | C::Continue => panic!("ICE break/continue not translated to jumps"),
     }
@@ -960,8 +973,11 @@ fn exp_(context: &mut Context, code: &mut IR::BytecodeBlock, e: H::Exp) {
         E::Value(sp!(_, v_)) => {
             let ld_value = match v_ {
                 V::U8(u) => B::LdU8(u),
+                V::U16(u) => B::LdU16(u),
+                V::U32(u) => B::LdU32(u),
                 V::U64(u) => B::LdU64(u),
                 V::U128(u) => B::LdU128(u),
+                V::U256(u) => B::LdU256(u),
                 V::Bool(b) => {
                     if b {
                         B::LdTrue
@@ -1082,9 +1098,14 @@ fn exp_(context: &mut Context, code: &mut IR::BytecodeBlock, e: H::Exp) {
             exp(context, code, el);
             let instr = match bt_ {
                 BT::U8 => B::CastU8,
+                BT::U16 => B::CastU16,
+                BT::U32 => B::CastU32,
                 BT::U64 => B::CastU64,
                 BT::U128 => B::CastU128,
-                _ => panic!("ICE type checking failed. unexpected cast"),
+                BT::U256 => B::CastU256,
+                BT::Address | BT::Signer | BT::Vector | BT::Bool => {
+                    panic!("ICE type checking failed. unexpected cast")
+                }
             };
             code.push(sp(loc, instr));
         }
diff --git a/language/move-compiler/src/typing/ast.rs b/language/move-compiler/src/typing/ast.rs
index bf43a29286..fbeb0a5fe1 100644
--- a/language/move-compiler/src/typing/ast.rs
+++ b/language/move-compiler/src/typing/ast.rs
@@ -125,7 +125,7 @@ pub struct ModuleCall {
     pub acquires: BTreeMap<StructName, Loc>,
 }
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 #[allow(clippy::large_enum_variant)]
 pub enum BuiltinFunction_ {
     MoveTo(Type),
diff --git a/language/move-compiler/src/typing/core.rs b/language/move-compiler/src/typing/core.rs
index 61673ea2e8..623f3e320a 100644
--- a/language/move-compiler/src/typing/core.rs
+++ b/language/move-compiler/src/typing/core.rs
@@ -340,7 +340,7 @@ impl<'env> Context<'env> {
     pub fn get_break_type(&self) -> Option<&Type> {
         match &self.loop_info.0 {
             LoopInfo_::NotInLoop | LoopInfo_::BreakTypeUnknown => None,
-            LoopInfo_::BreakType(t) => Some(&*t),
+            LoopInfo_::BreakType(t) => Some(t),
         }
     }
 
@@ -1010,6 +1010,10 @@ fn solve_builtin_type_constraint(
         )
     };
     match &t.value {
+        // already failed, ignore
+        UnresolvedError => (),
+        // Will fail later in compiling, either through dead code, or unknown type variable
+        Anything => (),
         Apply(abilities_opt, sp!(_, Builtin(sp!(_, b))), args) if builtin_set.contains(b) => {
             if let Some(abilities) = abilities_opt {
                 assert!(
@@ -1577,11 +1581,11 @@ fn join_bind_tvar(subst: &mut Subst, loc: Loc, tvar: TVar, ty: Type) -> Result<b
     Ok(true)
 }
 
-fn check_num_tvar(subst: &Subst, loc: Loc, tvar: TVar, ty: &Type) -> bool {
-    !subst.is_num_var(tvar) || check_num_tvar_(subst, loc, ty)
+fn check_num_tvar(subst: &Subst, _loc: Loc, tvar: TVar, ty: &Type) -> bool {
+    !subst.is_num_var(tvar) || check_num_tvar_(subst, ty)
 }
 
-fn check_num_tvar_(subst: &Subst, loc: Loc, ty: &Type) -> bool {
+fn check_num_tvar_(subst: &Subst, ty: &Type) -> bool {
     use Type_::*;
     match &ty.value {
         UnresolvedError | Anything => true,
@@ -1592,7 +1596,7 @@ fn check_num_tvar_(subst: &Subst, loc: Loc, ty: &Type) -> bool {
             match subst.get(last_tvar) {
                 Some(sp!(_, Var(_))) => unreachable!(),
                 None => subst.is_num_var(last_tvar),
-                Some(t) => check_num_tvar_(subst, loc, t),
+                Some(t) => check_num_tvar_(subst, t),
             }
         }
         _ => false,
diff --git a/language/move-compiler/src/typing/expand.rs b/language/move-compiler/src/typing/expand.rs
index f7c2ff75d4..6fcb3752dd 100644
--- a/language/move-compiler/src/typing/expand.rs
+++ b/language/move-compiler/src/typing/expand.rs
@@ -10,8 +10,8 @@ use crate::{
     parser::ast::Ability_,
     typing::ast as T,
 };
+use move_core_types::u256::U256;
 use move_ir_types::location::*;
-use std::convert::TryInto;
 
 //**************************************************************************************************
 // Functions
@@ -157,26 +157,39 @@ pub fn exp(context: &mut Context, e: &mut T::Exp) {
                 _ => panic!("ICE inferred num failed {:?}", &e.ty.value),
             };
             let v = *v;
-            let u8_max = std::u8::MAX as u128;
-            let u64_max = std::u64::MAX as u128;
-            let u128_max = std::u128::MAX;
+            let u8_max = U256::from(std::u8::MAX);
+            let u16_max = U256::from(std::u16::MAX);
+            let u32_max = U256::from(std::u32::MAX);
+            let u64_max = U256::from(std::u64::MAX);
+            let u128_max = U256::from(std::u128::MAX);
+            let u256_max = U256::max_value();
             let max = match bt {
                 BT::U8 => u8_max,
+                BT::U16 => u16_max,
+                BT::U32 => u32_max,
                 BT::U64 => u64_max,
                 BT::U128 => u128_max,
-                _ => unreachable!(),
+                BT::U256 => u256_max,
+                BT::Address | BT::Signer | BT::Vector | BT::Bool => unreachable!(),
             };
             let new_exp = if v > max {
                 let msg = format!(
                     "Expected a literal of type '{}', but the value is too large.",
                     bt
                 );
-                let fix_bt = if v > u64_max {
+                let fix_bt = if v > u128_max {
+                    BT::U256
+                } else if v > u64_max {
                     BT::U128
+                } else if v > u32_max {
+                    BT::U64
+                } else if v > u16_max {
+                    BT::U32
                 } else {
                     assert!(v > u8_max);
-                    BT::U64
+                    BT::U16
                 };
+
                 let fix = format!(
                     "Annotating the literal might help inference: '{value}{type}'",
                     value=v,
@@ -191,10 +204,13 @@ pub fn exp(context: &mut Context, e: &mut T::Exp) {
                 E::UnresolvedError
             } else {
                 let value_ = match bt {
-                    BT::U8 => Value_::U8(v.try_into().unwrap()),
-                    BT::U64 => Value_::U64(v.try_into().unwrap()),
-                    BT::U128 => Value_::U128(v),
-                    _ => unreachable!(),
+                    BT::U8 => Value_::U8(v.down_cast_lossy()),
+                    BT::U16 => Value_::U16(v.down_cast_lossy()),
+                    BT::U32 => Value_::U32(v.down_cast_lossy()),
+                    BT::U64 => Value_::U64(v.down_cast_lossy()),
+                    BT::U128 => Value_::U128(v.down_cast_lossy()),
+                    BT::U256 => Value_::U256(v),
+                    BT::Address | BT::Signer | BT::Vector | BT::Bool => unreachable!(),
                 };
                 E::Value(sp(*vloc, value_))
             };
diff --git a/language/move-compiler/src/typing/globals.rs b/language/move-compiler/src/typing/globals.rs
index 1774d8230d..9ade083dc6 100644
--- a/language/move-compiler/src/typing/globals.rs
+++ b/language/move-compiler/src/typing/globals.rs
@@ -270,14 +270,14 @@ where
         }
         T::Ref(_, _) | T::Unit => {
             // Key ability is checked by constraints, and these types do not have Key
-            assert!(context.env.has_diags());
+            assert!(context.env.has_errors());
             return None;
         }
         T::Apply(Some(abilities), sp!(_, TN::Multiple(_)), _)
         | T::Apply(Some(abilities), sp!(_, TN::Builtin(_)), _) => {
             // Key ability is checked by constraints
             assert!(!abilities.has_ability_(Ability_::Key));
-            assert!(context.env.has_diags());
+            assert!(context.env.has_errors());
             return None;
         }
         T::Param(_) => {
diff --git a/language/move-compiler/src/typing/recursive_structs.rs b/language/move-compiler/src/typing/recursive_structs.rs
index 05c3060ac4..8eb42b0597 100644
--- a/language/move-compiler/src/typing/recursive_structs.rs
+++ b/language/move-compiler/src/typing/recursive_structs.rs
@@ -79,7 +79,10 @@ fn module(compilation_env: &mut CompilationEnv, mname: ModuleIdent, module: &T::
 }
 
 fn struct_def(context: &mut Context, sname: StructName, sdef: &N::StructDefinition) {
-    assert!(context.current_struct == None, "ICE struct name not unset");
+    assert!(
+        context.current_struct.is_none(),
+        "ICE struct name not unset"
+    );
     context.current_struct = Some(sname);
     match &sdef.fields {
         N::StructFields::Native(_) => (),
diff --git a/language/move-compiler/src/typing/translate.rs b/language/move-compiler/src/typing/translate.rs
index cdf28ff5de..8b5e01fb1c 100644
--- a/language/move-compiler/src/typing/translate.rs
+++ b/language/move-compiler/src/typing/translate.rs
@@ -304,8 +304,11 @@ mod check_valid_constant {
 
         let mut acceptable_types = vec![
             Type_::u8(loc),
+            Type_::u16(loc),
+            Type_::u32(loc),
             Type_::u64(loc),
             Type_::u128(loc),
+            Type_::u256(loc),
             Type_::bool(loc),
             Type_::address(loc),
         ];
@@ -510,6 +513,16 @@ fn struct_def(context: &mut Context, s: &mut N::StructDefinition) {
         N::StructFields::Defined(m) => m,
     };
 
+    // instantiate types and check constraints
+    for (_field_loc, _field, idx_ty) in field_map.iter() {
+        let loc = idx_ty.1.loc;
+        let inst_ty = core::instantiate(context, idx_ty.1.clone());
+        context.add_base_type_constraint(loc, "Invalid field type", inst_ty.clone());
+    }
+    core::solve_constraints(context);
+
+    // substitute the declared type parameters with an Any type to check for ability field
+    // requirements
     let declared_abilities = &s.abilities;
     let tparam_subst = &core::make_tparam_subst(
         s.type_parameters.iter().map(|tp| &tp.param),
@@ -520,8 +533,6 @@ fn struct_def(context: &mut Context, s: &mut N::StructDefinition) {
     for (_field_loc, _field, idx_ty) in field_map.iter() {
         let loc = idx_ty.1.loc;
         let subst_ty = core::subst_tparams(tparam_subst, idx_ty.1.clone());
-        let inst_ty = core::instantiate(context, subst_ty);
-        context.add_base_type_constraint(loc, "Invalid field type", inst_ty.clone());
         for declared_ability in declared_abilities {
             let required = declared_ability.value.requires();
             let msg = format!(
@@ -529,7 +540,7 @@ fn struct_def(context: &mut Context, s: &mut N::StructDefinition) {
                  require the ability '{}'",
                 declared_ability, required
             );
-            context.add_ability_constraint(loc, Some(msg), inst_ty.clone(), required)
+            context.add_ability_constraint(loc, Some(msg), subst_ty.clone(), required)
         }
     }
     core::solve_constraints(context);
@@ -740,7 +751,8 @@ fn typing_error<T: ToString, F: FnOnce() -> T>(
     use super::core::TypingError::*;
     let msg = mk_msg().to_string();
     let subst = &context.subst;
-    let diag = match e {
+
+    match e {
         SubtypeError(t1, t2) => {
             let loc1 = core::best_loc(subst, &t1);
             let loc2 = core::best_loc(subst, &t2);
@@ -809,8 +821,7 @@ fn typing_error<T: ToString, F: FnOnce() -> T>(
             (loc, msg),
             (rloc, "Unable to infer the type. Recursive type found."),
         ),
-    };
-    diag
+    }
 }
 
 fn subtype_no_report(
@@ -1489,7 +1500,7 @@ fn exp_inner(context: &mut Context, sp!(eloc, ne_): N::Exp) -> T::Exp {
             (sp(eloc, Type_::Unit), TE::Spec(u, used_local_types))
         }
         NE::UnresolvedError => {
-            assert!(context.env.has_diags());
+            assert!(context.env.has_errors());
             (context.error_type(eloc), TE::UnresolvedError)
         }
 
diff --git a/language/move-compiler/src/unit_test/filter_test_members.rs b/language/move-compiler/src/unit_test/filter_test_members.rs
index 4470c43bc4..6311533c3e 100644
--- a/language/move-compiler/src/unit_test/filter_test_members.rs
+++ b/language/move-compiler/src/unit_test/filter_test_members.rs
@@ -2,13 +2,17 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use move_ir_types::location::{sp, Loc};
+
 use crate::{
     diag,
     diagnostics::Diagnostics,
-    parser::ast as P,
+    parser::{
+        ast as P,
+        filter::{filter_program, FilterContext},
+    },
     shared::{known_attributes, CompilationEnv},
 };
-use move_ir_types::location::{sp, Loc};
 
 struct Context<'env> {
     env: &'env mut CompilationEnv,
@@ -22,6 +26,75 @@ impl<'env> Context<'env> {
     }
 }
 
+impl FilterContext for Context<'_> {
+    fn should_remove_by_attributes(
+        &mut self,
+        attrs: &[P::Attributes],
+        is_source_def: bool,
+    ) -> bool {
+        should_remove_node(self.env, attrs, is_source_def)
+    }
+
+    fn filter_map_module(
+        &mut self,
+        mut module_def: P::ModuleDefinition,
+        is_source_def: bool,
+    ) -> Option<P::ModuleDefinition> {
+        if self.should_remove_by_attributes(&module_def.attributes, is_source_def) {
+            return None;
+        }
+
+        // instrument the test poison
+        if !self.env.flags().is_testing() {
+            return Some(module_def);
+        }
+
+        let poison_function = create_test_poison(module_def.loc);
+        module_def.members.push(poison_function);
+        Some(module_def)
+    }
+
+    fn filter_map_script(
+        &mut self,
+        script_def: P::Script,
+        _is_source_def: bool,
+    ) -> Option<P::Script> {
+        // extra sanity check on scripts
+        let P::Script {
+            attributes,
+            uses,
+            constants,
+            function,
+            specs,
+            loc: _,
+        } = &script_def;
+
+        let script_attributes = attributes
+            .iter()
+            .chain(uses.iter().flat_map(|use_decl| &use_decl.attributes))
+            .chain(constants.iter().flat_map(|constant| &constant.attributes))
+            .chain(function.attributes.iter())
+            .chain(specs.iter().flat_map(|spec| &spec.value.attributes));
+
+        let diags: Diagnostics = script_attributes
+            .flat_map(|attr| {
+                test_attributes(attr).into_iter().map(|(loc, _)| {
+                    let msg = "Testing attributes are not allowed in scripts.";
+                    diag!(Attributes::InvalidTest, (loc, msg))
+                })
+            })
+            .collect();
+
+        // filter the script based on whether there are error messages
+        if diags.is_empty() {
+            Some(script_def)
+        } else {
+            self.env.add_diags(diags);
+            None
+        }
+    }
+}
+
 //***************************************************************************
 // Filtering of test-annotated module members
 //***************************************************************************
@@ -33,60 +106,16 @@ const STDLIB_ADDRESS_NAME: &str = "std";
 // in `compilation_env` is not set. If the test flag is set, no filtering is performed, and instead
 // a test plan is created for use by the testing framework.
 pub fn program(compilation_env: &mut CompilationEnv, prog: P::Program) -> P::Program {
-    let mut context = Context::new(compilation_env);
-
-    if !check_has_unit_test_module(&mut context, &prog) {
+    if !check_has_unit_test_module(compilation_env, &prog) {
         return prog;
     }
 
-    let P::Program {
-        named_address_maps,
-        source_definitions,
-        lib_definitions,
-    } = prog;
-
-    let lib_definitions: Vec<_> = lib_definitions
-        .into_iter()
-        .filter_map(
-            |P::PackageDefinition {
-                 package,
-                 named_address_map,
-                 def,
-             }| {
-                Some(P::PackageDefinition {
-                    package,
-                    named_address_map,
-                    def: filter_tests_from_definition(&mut context, def, false)?,
-                })
-            },
-        )
-        .collect();
-
-    let source_definitions: Vec<_> = source_definitions
-        .into_iter()
-        .filter_map(
-            |P::PackageDefinition {
-                 package,
-                 named_address_map,
-                 def,
-             }| {
-                Some(P::PackageDefinition {
-                    package,
-                    named_address_map,
-                    def: filter_tests_from_definition(&mut context, def, true)?,
-                })
-            },
-        )
-        .collect();
-
-    P::Program {
-        named_address_maps,
-        source_definitions,
-        lib_definitions,
-    }
+    // filter and instrument the parsed AST
+    let mut context = Context::new(compilation_env);
+    filter_program(&mut context, prog)
 }
 
-fn check_has_unit_test_module(context: &mut Context, prog: &P::Program) -> bool {
+fn check_has_unit_test_module(compilation_env: &mut CompilationEnv, prog: &P::Program) -> bool {
     let has_unit_test_module = prog
         .lib_definitions
         .iter()
@@ -106,7 +135,7 @@ fn check_has_unit_test_module(context: &mut Context, prog: &P::Program) -> bool
             _ => false,
         });
 
-    if !has_unit_test_module && context.env.flags().is_testing() {
+    if !has_unit_test_module && compilation_env.flags().is_testing() {
         if let Some(P::PackageDefinition { def, .. }) = prog
             .source_definitions
             .iter()
@@ -118,7 +147,7 @@ fn check_has_unit_test_module(context: &mut Context, prog: &P::Program) -> bool
                 P::Definition::Address(P::AddressDefinition { loc, .. })
                 | P::Definition::Script(P::Script { loc, .. }) => *loc,
             };
-            context.env.add_diag(diag!(
+            compilation_env.add_diag(diag!(
                 Attributes::InvalidTest,
                 (
                     loc,
@@ -133,122 +162,12 @@ fn check_has_unit_test_module(context: &mut Context, prog: &P::Program) -> bool
     true
 }
 
-fn filter_tests_from_definition(
-    context: &mut Context,
-    def: P::Definition,
-    is_source_def: bool,
-) -> Option<P::Definition> {
-    match def {
-        P::Definition::Module(m) => {
-            filter_tests_from_module(context, m, is_source_def).map(P::Definition::Module)
-        }
-        P::Definition::Address(a) => {
-            let P::AddressDefinition {
-                addr,
-                attributes,
-                loc,
-                modules,
-            } = a;
-            if !should_remove_node(context.env, &attributes, is_source_def) {
-                let modules = modules
-                    .into_iter()
-                    .filter_map(|m| filter_tests_from_module(context, m, is_source_def))
-                    .collect();
-                Some(P::Definition::Address(P::AddressDefinition {
-                    attributes,
-                    loc,
-                    addr,
-                    modules,
-                }))
-            } else {
-                None
-            }
-        }
-        P::Definition::Script(P::Script {
-            attributes,
-            uses,
-            constants,
-            function,
-            specs,
-            loc,
-        }) => {
-            let script_attributes = attributes
-                .iter()
-                .chain(uses.iter().flat_map(|use_decl| &use_decl.attributes))
-                .chain(function.attributes.iter())
-                .chain(specs.iter().flat_map(|spec| &spec.value.attributes));
-
-            let diags: Diagnostics = script_attributes
-                .flat_map(|attr| {
-                    test_attributes(attr).into_iter().map(|(loc, _)| {
-                        let msg = "Testing attributes are not allowed in scripts.";
-                        diag!(Attributes::InvalidTest, (loc, msg))
-                    })
-                })
-                .collect();
-
-            if diags.is_empty() {
-                Some(P::Definition::Script(P::Script {
-                    attributes,
-                    loc,
-                    uses,
-                    constants,
-                    function,
-                    specs,
-                }))
-            } else {
-                context.env.add_diags(diags);
-                None
-            }
-        }
-    }
-}
-
-fn filter_tests_from_module(
-    context: &mut Context,
-    module_def: P::ModuleDefinition,
-    is_source_def: bool,
-) -> Option<P::ModuleDefinition> {
-    if should_remove_node(context.env, &module_def.attributes, is_source_def) {
-        return None;
-    }
-
-    let P::ModuleDefinition {
-        attributes,
-        loc,
-        address,
-        name,
-        is_spec_module,
-        members,
-    } = module_def;
-
-    let mut new_members: Vec<_> = members
-        .into_iter()
-        .filter_map(|member| filter_tests_from_module_member(context, member, is_source_def))
-        .collect();
-
-    insert_test_poison(context, loc, &mut new_members);
-
-    Some(P::ModuleDefinition {
-        attributes,
-        loc,
-        address,
-        name,
-        is_spec_module,
-        members: new_members,
-    })
-}
-
-/// If a module is being compiled in test mode, this inserts a function that calls a native
+/// If a module is being compiled in test mode, create a dummy function that calls a native
 /// function `0x1::UnitTest::create_signers_for_testing` that only exists if the VM is being run
 /// with the "unit_test" feature flag set. This will then cause the module to fail to link if
 /// an attempt is made to publish a module that has been compiled in test mode on a VM that is not
 /// running in test mode.
-fn insert_test_poison(context: &mut Context, mloc: Loc, members: &mut Vec<P::ModuleMember>) {
-    if !context.env.flags().is_testing() {
-        return;
-    }
-
+fn create_test_poison(mloc: Loc) -> P::ModuleMember {
     let signature = P::FunctionSignature {
         type_parameters: vec![],
         parameters: vec![],
@@ -275,7 +194,7 @@ fn insert_test_poison(context: &mut Context, mloc: Loc, members: &mut Vec<P::Mod
     );
 
     // fun unit_test_poison() { 0x1::UnitTest::create_signers_for_testing(0); () }
-    let function = P::Function {
+    P::ModuleMember::Function(P::Function {
         attributes: vec![],
         loc: mloc,
         visibility: P::Visibility::Internal,
@@ -295,31 +214,7 @@ fn insert_test_poison(context: &mut Context, mloc: Loc, members: &mut Vec<P::Mod
                 Box::new(Some(sp(mloc, P::Exp_::Unit))),
             )),
         ),
-    };
-
-    members.push(P::ModuleMember::Function(function));
-}
-
-fn filter_tests_from_module_member(
-    context: &mut Context,
-    module_member: P::ModuleMember,
-    is_source_def: bool,
-) -> Option<P::ModuleMember> {
-    use P::ModuleMember as PM;
-    let attrs = match &module_member {
-        PM::Function(func) => &func.attributes,
-        PM::Struct(strct) => &strct.attributes,
-        PM::Spec(sp!(_, spec)) => &spec.attributes,
-        PM::Use(use_decl) => &use_decl.attributes,
-        PM::Friend(friend_decl) => &friend_decl.attributes,
-        PM::Constant(constant) => &constant.attributes,
-    };
-
-    if should_remove_node(context.env, attrs, is_source_def) {
-        None
-    } else {
-        Some(module_member)
-    }
+    })
 }
 
 // A module member should be removed if:
@@ -344,9 +239,9 @@ fn test_attributes(attrs: &P::Attributes) -> Vec<(Loc, known_attributes::Testing
         .value
         .iter()
         .filter_map(
-            |attr| match KnownAttribute::resolve(&attr.value.attribute_name().value)? {
+            |attr| match KnownAttribute::resolve(attr.value.attribute_name().value)? {
                 KnownAttribute::Testing(test_attr) => Some((attr.loc, test_attr)),
-                KnownAttribute::Native(_) => None,
+                KnownAttribute::Verification(_) | KnownAttribute::Native(_) => None,
             },
         )
         .collect()
diff --git a/language/move-compiler/src/unit_test/mod.rs b/language/move-compiler/src/unit_test/mod.rs
index faa896759f..ca43e210df 100644
--- a/language/move-compiler/src/unit_test/mod.rs
+++ b/language/move-compiler/src/unit_test/mod.rs
@@ -9,9 +9,9 @@ use crate::{
 };
 use move_core_types::{
     account_address::AccountAddress, identifier::Identifier, language_storage::ModuleId,
-    value::MoveValue,
+    value::MoveValue, vm_status::StatusCode,
 };
-use std::collections::BTreeMap;
+use std::{collections::BTreeMap, fmt};
 
 pub mod filter_test_members;
 pub mod plan_builder;
@@ -40,10 +40,24 @@ pub struct TestCase {
 
 #[derive(Debug, Clone)]
 pub enum ExpectedFailure {
-    // expected failure, but abort code not checked
+    // expected failure, but codes are not checked
     Expected,
-    // expected failure, abort code checked
-    ExpectedWithCode(u64),
+    // expected failure, abort code checked but without the module specified
+    ExpectedWithCodeDEPRECATED(u64),
+    // expected failure, abort code with the module specified
+    ExpectedWithError(ExpectedMoveError),
+}
+
+#[derive(Debug, Clone, Ord, PartialOrd, PartialEq, Eq)]
+pub struct ExpectedMoveError(
+    pub StatusCode,
+    pub Option<u64>,
+    pub move_binary_format::errors::Location,
+);
+
+pub struct ExpectedMoveErrorDisplay<'a> {
+    error: &'a ExpectedMoveError,
+    is_past_tense: bool,
 }
 
 impl ModuleTestPlan {
@@ -91,3 +105,55 @@ impl TestPlan {
         }
     }
 }
+
+impl ExpectedMoveError {
+    pub fn verbiage(&self, is_past_tense: bool) -> ExpectedMoveErrorDisplay {
+        ExpectedMoveErrorDisplay {
+            error: self,
+            is_past_tense,
+        }
+    }
+}
+
+impl<'a> fmt::Display for ExpectedMoveErrorDisplay<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        use move_binary_format::errors::Location;
+        let Self {
+            error: ExpectedMoveError(status, sub_status, location),
+            is_past_tense,
+        } = self;
+        let status_val: u64 = (*status).into();
+        if *is_past_tense {
+            match status {
+                StatusCode::ABORTED => write!(f, "aborted")?,
+                StatusCode::ARITHMETIC_ERROR => write!(f, "gave an arithmetic error")?,
+                StatusCode::VECTOR_OPERATION_ERROR => write!(f, "gave a vector operation error")?,
+                StatusCode::OUT_OF_GAS => write!(f, "ran out of gas")?,
+                _ => write!(f, "gave a {status:?} (code {status_val}) error")?,
+            };
+        } else {
+            match status {
+                StatusCode::ABORTED => write!(f, "to abort")?,
+                StatusCode::ARITHMETIC_ERROR => write!(f, "to give an arithmetic error")?,
+                StatusCode::VECTOR_OPERATION_ERROR => {
+                    write!(f, "to give a vector operation error")?
+                }
+                StatusCode::OUT_OF_GAS => write!(f, "to run out of gas")?,
+                _ => write!(f, "to give a {status:?} (code {status_val}) error")?,
+            };
+        }
+        if status == &StatusCode::ABORTED {
+            write!(f, " with code {}", sub_status.unwrap())?
+        } else if let Some(code) = sub_status {
+            write!(f, " with sub-status {code}")?
+        };
+        if status != &StatusCode::OUT_OF_GAS {
+            write!(f, " originating")?;
+        }
+        match location {
+            Location::Undefined => write!(f, " in an unknown location"),
+            Location::Script => write!(f, " in the script"),
+            Location::Module(id) => write!(f, " in the module {id}"),
+        }
+    }
+}
diff --git a/language/move-compiler/src/unit_test/plan_builder.rs b/language/move-compiler/src/unit_test/plan_builder.rs
index f15d7ed198..829d29603c 100644
--- a/language/move-compiler/src/unit_test/plan_builder.rs
+++ b/language/move-compiler/src/unit_test/plan_builder.rs
@@ -5,32 +5,54 @@
 use crate::{
     cfgir::ast as G,
     diag,
-    expansion::ast::{self as E, Address, ModuleIdent, ModuleIdent_},
+    expansion::ast::{
+        self as E, Address, Attribute, AttributeValue, ModuleAccess_, ModuleIdent, ModuleIdent_,
+    },
+    parser::ast::ConstantName,
     shared::{
         known_attributes::{KnownAttribute, TestingAttribute},
+        unique_map::UniqueMap,
         CompilationEnv, Identifier, NumericalAddress,
     },
-    unit_test::{ExpectedFailure, ModuleTestPlan, TestCase},
+    unit_test::{ExpectedFailure, ExpectedMoveError, ModuleTestPlan, TestCase},
+};
+use move_core_types::{
+    account_address::AccountAddress as MoveAddress, language_storage::ModuleId, u256::U256,
+    value::MoveValue, vm_status::StatusCode,
 };
-use move_core_types::{account_address::AccountAddress as MoveAddress, value::MoveValue};
 use move_ir_types::location::Loc;
 use move_symbol_pool::Symbol;
 use std::collections::BTreeMap;
 
 struct Context<'env> {
     env: &'env mut CompilationEnv,
+    constants: UniqueMap<ModuleIdent, UniqueMap<ConstantName, (Loc, Option<u64>)>>,
 }
 
 impl<'env> Context<'env> {
-    fn new(compilation_env: &'env mut CompilationEnv) -> Self {
+    fn new(compilation_env: &'env mut CompilationEnv, prog: &G::Program) -> Self {
+        let constants = prog.modules.ref_map(|_mident, module| {
+            module.constants.ref_map(|_name, constant| {
+                let v_opt = constant.value.as_ref().and_then(|v| match v {
+                    MoveValue::U64(u) => Some(*u),
+                    _ => None,
+                });
+                (constant.loc, v_opt)
+            })
+        });
         Self {
             env: compilation_env,
+            constants,
         }
     }
 
     fn resolve_address(&self, addr: &Address) -> NumericalAddress {
         (*addr).into_addr_bytes()
     }
+
+    fn constants(&self) -> &UniqueMap<ModuleIdent, UniqueMap<ConstantName, (Loc, Option<u64>)>> {
+        &self.constants
+    }
 }
 
 //***************************************************************************
@@ -47,7 +69,8 @@ pub fn construct_test_plan(
     if !compilation_env.flags().is_testing() {
         return None;
     }
-    let mut context = Context::new(compilation_env);
+
+    let mut context = Context::new(compilation_env, prog);
     Some(
         prog.modules
             .key_cloned_iter()
@@ -228,11 +251,14 @@ fn parse_test_attribute(
     }
 }
 
+const BAD_ABORT_VALUE_WARNING: &str = "WARNING: passes for an abort from any module.";
+const INVALID_VALUE: &str = "Invalid value in attribute assignment";
+
 fn parse_failure_attribute(
     context: &mut Context,
     sp!(aloc, expected_attr): &E::Attribute,
 ) -> Option<ExpectedFailure> {
-    use E::{AttributeValue_ as EAV, Attribute_ as EA, Value_ as EV};
+    use E::Attribute_ as EA;
     match expected_attr {
         EA::Name(nm) => {
             assert!(
@@ -244,10 +270,8 @@ fn parse_failure_attribute(
         EA::Assigned(_, value) => {
             let assign_loc = value.loc;
             let invalid_assignment_msg = "Invalid expected failure code assignment";
-            let expected_msg = format!(
-                "Expect an #[expected_failure({}=...)] attribute for abort code assignment",
-                TestingAttribute::CODE_ASSIGNMENT_NAME
-            );
+            let expected_msg =
+                "Expect an #[expected_failure(...)] attribute for error specification";
             context.env.add_diag(diag!(
                 Attributes::InvalidValue,
                 (assign_loc, invalid_assignment_msg),
@@ -256,78 +280,386 @@ fn parse_failure_attribute(
             None
         }
         EA::Parameterized(sp!(_, nm), attrs) => {
-            let mut attrs_vec = attrs.iter().map(|(_, _, attr)| attr).collect::<Vec<_>>();
-            if attrs_vec.len() != 1 {
+            assert!(
+                nm.as_str() == TestingAttribute::ExpectedFailure.name(),
+                "ICE: expected failure attribute must have the right name"
+            );
+            let mut attrs: BTreeMap<String, (Loc, Attribute)> = attrs
+                .key_cloned_iter()
+                .map(|(sp!(kloc, k_), v)| (k_.to_string(), (kloc, v.clone())))
+                .collect();
+            let mut expected_failure_kind_vec = TestingAttribute::expected_failure_cases()
+                .iter()
+                .filter_map(|k| {
+                    let k = k.to_string();
+                    let attr_opt = attrs.remove(&k)?;
+                    Some((k, attr_opt))
+                })
+                .collect::<Vec<_>>();
+            if expected_failure_kind_vec.len() != 1 {
                 let invalid_attr_msg = format!(
-                    "Invalid #[expected_failure(...)] attribute, expected 1 argument but found {}",
-                    attrs_vec.len()
+                    "Invalid #[expected_failure(...)] attribute, expected 1 failure kind but found {}. Expected one of: {}",
+                    expected_failure_kind_vec.len(),
+                    TestingAttribute::expected_failure_cases().to_vec().join(", ")
                 );
                 context
                     .env
                     .add_diag(diag!(Attributes::InvalidValue, (*aloc, invalid_attr_msg)));
                 return None;
             }
-            assert!(
-                nm.as_str() == TestingAttribute::ExpectedFailure.name(),
-                "ICE: expected failure attribute must have the right name"
-            );
-            let attr = attrs_vec.pop().unwrap();
-            match attr {
-                sp!(assign_loc, EA::Assigned(sp!(_, nm), value))
-                    if nm.as_str() == TestingAttribute::CODE_ASSIGNMENT_NAME =>
-                {
-                    match &**value {
-                        sp!(_, EAV::Value(sp!(_, EV::InferredNum(u))))
-                            if *u <= std::u64::MAX as u128 =>
-                        {
-                            Some(ExpectedFailure::ExpectedWithCode(*u as u64))
-                        }
-                        sp!(_, EAV::Value(sp!(_, EV::U64(u)))) => {
-                            Some(ExpectedFailure::ExpectedWithCode(*u))
-                        }
-                        sp!(vloc, EAV::Value(sp!(_, EV::U8(_))))
-                        | sp!(vloc, EAV::Value(sp!(_, EV::U128(_)))) => {
-                            let msg = "Invalid value in expected failure code assignment";
-                            context.env.add_diag(diag!(
-                                Attributes::InvalidValue,
-                                (*assign_loc, msg),
-                                (*vloc, "Annotated non-u64 literals are not permitted"),
-                            ));
-                            None
-                        }
-                        sp!(vloc, _) => {
-                            context.env.add_diag(diag!(
-                                Attributes::InvalidValue,
-                                (*vloc, "Invalid value in expected failure code assignment"),
-                                (*assign_loc, "Unsupported value in this assignment"),
-                            ));
-                            None
-                        }
-                    }
+            let (expected_failure_kind, (attr_loc, attr)) =
+                expected_failure_kind_vec.pop().unwrap();
+            let location_opt = attrs.remove(TestingAttribute::ERROR_LOCATION);
+            let (status_code, sub_status_code, location) = match expected_failure_kind.as_str() {
+                TestingAttribute::ABORT_CODE_NAME => {
+                    let (value_name_loc, attr_value) = get_assigned_attribute(
+                        context,
+                        TestingAttribute::ABORT_CODE_NAME,
+                        attr_loc,
+                        attr,
+                    )?;
+                    let (value_loc, const_location_opt, u) =
+                        convert_constant_value_u64_constant_or_value(
+                            context,
+                            value_name_loc,
+                            &attr_value,
+                        )?;
+                    let location = if let Some((location_loc, location_attr)) = location_opt {
+                        convert_location(context, location_loc, location_attr)?
+                    } else if let Some(location) = const_location_opt {
+                        location
+                    } else {
+                        let tip = format!(
+                            "Replace value with constant from expected module or add `{}=...` \
+                            attribute.",
+                            TestingAttribute::ERROR_LOCATION
+                        );
+                        context.env.add_diag(diag!(
+                            Attributes::ValueWarning,
+                            (attr_loc, BAD_ABORT_VALUE_WARNING),
+                            (value_loc, tip)
+                        ));
+                        return Some(ExpectedFailure::ExpectedWithCodeDEPRECATED(u));
+                    };
+                    (StatusCode::ABORTED, Some(u), location)
                 }
-                sp!(assign_loc, EA::Assigned(sp!(nmloc, _), _)) => {
-                    let invalid_name_msg = format!(
-                        "Invalid name in expected failure code assignment. Did you mean to use \
-                         '{}'?",
-                        TestingAttribute::CODE_ASSIGNMENT_NAME
-                    );
-                    context.env.add_diag(diag!(
-                        Attributes::InvalidName,
-                        (*nmloc, invalid_name_msg),
-                        (*assign_loc, "Invalid name in this assignment"),
-                    ));
-                    None
+                TestingAttribute::ARITHMETIC_ERROR_NAME => {
+                    check_attribute_unassigned(
+                        context,
+                        TestingAttribute::ARITHMETIC_ERROR_NAME,
+                        attr_loc,
+                        attr,
+                    )?;
+                    let (location_loc, location_attr) = check_location(
+                        context,
+                        attr_loc,
+                        TestingAttribute::ARITHMETIC_ERROR_NAME,
+                        location_opt,
+                    )?;
+                    let location = convert_location(context, location_loc, location_attr)?;
+                    (StatusCode::ARITHMETIC_ERROR, None, location)
                 }
-                sp!(loc, _) => {
-                    let msg = "Unsupported attribute value for expected failure attribute";
-                    context.env.add_diag(diag!(
-                        Attributes::InvalidValue,
-                        (*aloc, msg),
-                        (*loc, "Unsupported value in this assignment")
-                    ));
-                    None
+                TestingAttribute::OUT_OF_GAS_NAME => {
+                    check_attribute_unassigned(
+                        context,
+                        TestingAttribute::OUT_OF_GAS_NAME,
+                        attr_loc,
+                        attr,
+                    )?;
+                    let (location_loc, location_attr) = check_location(
+                        context,
+                        attr_loc,
+                        TestingAttribute::OUT_OF_GAS_NAME,
+                        location_opt,
+                    )?;
+                    let location = convert_location(context, location_loc, location_attr)?;
+                    (StatusCode::OUT_OF_GAS, None, location)
+                }
+                TestingAttribute::VECTOR_ERROR_NAME => {
+                    check_attribute_unassigned(
+                        context,
+                        TestingAttribute::VECTOR_ERROR_NAME,
+                        attr_loc,
+                        attr,
+                    )?;
+                    let minor_attr_opt = attrs.remove(TestingAttribute::MINOR_STATUS_NAME);
+                    let minor_status = if let Some((minor_loc, minor_attr)) = minor_attr_opt {
+                        let (minor_value_loc, minor_value) = get_assigned_attribute(
+                            context,
+                            TestingAttribute::MINOR_STATUS_NAME,
+                            minor_loc,
+                            minor_attr,
+                        )?;
+                        let (_, _, minor_status) = convert_constant_value_u64_constant_or_value(
+                            context,
+                            minor_value_loc,
+                            &minor_value,
+                        )?;
+                        Some(minor_status)
+                    } else {
+                        None
+                    };
+                    let (location_loc, location_attr) = check_location(
+                        context,
+                        attr_loc,
+                        TestingAttribute::VECTOR_ERROR_NAME,
+                        location_opt,
+                    )?;
+                    let location = convert_location(context, location_loc, location_attr)?;
+                    (StatusCode::VECTOR_OPERATION_ERROR, minor_status, location)
                 }
+                TestingAttribute::MAJOR_STATUS_NAME => {
+                    let (value_name_loc, attr_value) = get_assigned_attribute(
+                        context,
+                        TestingAttribute::MAJOR_STATUS_NAME,
+                        attr_loc,
+                        attr,
+                    )?;
+                    let (major_value_loc, _, major_status_u64) =
+                        convert_constant_value_u64_constant_or_value(
+                            context,
+                            value_name_loc,
+                            &attr_value,
+                        )?;
+                    let major_status = if let Ok(c) = StatusCode::try_from(major_status_u64) {
+                        c
+                    } else {
+                        let bad_value = format!(
+                            "Invalid value for '{}'",
+                            TestingAttribute::MAJOR_STATUS_NAME,
+                        );
+                        let no_code =
+                            format!("No status code associated with value '{major_status_u64}'");
+                        context.env.add_diag(diag!(
+                            Attributes::InvalidValue,
+                            (value_name_loc, bad_value),
+                            (major_value_loc, no_code)
+                        ));
+                        return None;
+                    };
+                    let minor_attr_opt = attrs.remove(TestingAttribute::MINOR_STATUS_NAME);
+                    let minor_status = if let Some((minor_loc, minor_attr)) = minor_attr_opt {
+                        let (minor_value_loc, minor_value) = get_assigned_attribute(
+                            context,
+                            TestingAttribute::MINOR_STATUS_NAME,
+                            minor_loc,
+                            minor_attr,
+                        )?;
+                        let (_, _, minor_status) = convert_constant_value_u64_constant_or_value(
+                            context,
+                            minor_value_loc,
+                            &minor_value,
+                        )?;
+                        Some(minor_status)
+                    } else {
+                        None
+                    };
+                    let (location_loc, location_attr) = check_location(
+                        context,
+                        attr_loc,
+                        TestingAttribute::MAJOR_STATUS_NAME,
+                        location_opt,
+                    )?;
+                    let location = convert_location(context, location_loc, location_attr)?;
+                    (major_status, minor_status, location)
+                }
+                _ => unreachable!(),
+            };
+            // warn for any remaining attrs
+            for (_, (loc, _)) in attrs {
+                let msg = format!(
+                    "Unused attribute for {}",
+                    TestingAttribute::ExpectedFailure.name()
+                );
+                context
+                    .env
+                    .add_diag(diag!(UnusedItem::Attribute, (loc, msg)));
             }
+            Some(ExpectedFailure::ExpectedWithError(ExpectedMoveError(
+                status_code,
+                sub_status_code,
+                move_binary_format::errors::Location::Module(location),
+            )))
+        }
+    }
+}
+
+fn check_attribute_unassigned(
+    context: &mut Context,
+    kind: &str,
+    attr_loc: Loc,
+    attr: Attribute,
+) -> Option<()> {
+    use E::Attribute_ as EA;
+    match attr {
+        sp!(_, EA::Name(sp!(_, nm))) => {
+            assert!(nm.as_str() == kind);
+            Some(())
+        }
+        sp!(loc, _) => {
+            let msg = format!(
+                "Expected no assigned value, e.g. '{}', for expected failure attribute",
+                kind
+            );
+            context.env.add_diag(diag!(
+                Attributes::InvalidValue,
+                (attr_loc, "Unsupported attribute in this location"),
+                (loc, msg)
+            ));
+            None
+        }
+    }
+}
+
+fn get_assigned_attribute(
+    context: &mut Context,
+    kind: &str,
+    attr_loc: Loc,
+    attr: Attribute,
+) -> Option<(Loc, AttributeValue)> {
+    use E::Attribute_ as EA;
+    match attr {
+        sp!(assign_loc, EA::Assigned(sp!(_, nm), value)) => {
+            assert!(nm.as_str() == kind);
+            Some((assign_loc, *value))
+        }
+        sp!(loc, _) => {
+            let msg = format!(
+                "Expected assigned value, e.g. '{}=...', for expected failure attribute",
+                kind
+            );
+            context.env.add_diag(diag!(
+                Attributes::InvalidValue,
+                (attr_loc, "Unsupported attribute in this location"),
+                (loc, msg)
+            ));
+            None
+        }
+    }
+}
+
+fn convert_location(context: &mut Context, attr_loc: Loc, attr: Attribute) -> Option<ModuleId> {
+    use E::AttributeValue_ as EAV;
+    let (loc, value) =
+        get_assigned_attribute(context, TestingAttribute::ERROR_LOCATION, attr_loc, attr)?;
+    match value {
+        sp!(vloc, EAV::Module(module)) => convert_module_id(context, vloc, &module),
+        sp!(vloc, _) => {
+            context.env.add_diag(diag!(
+                Attributes::InvalidValue,
+                (loc, INVALID_VALUE),
+                (vloc, "Expected a module identifier, e.g. 'std::vector'")
+            ));
+            None
+        }
+    }
+}
+
+fn convert_constant_value_u64_constant_or_value(
+    context: &mut Context,
+    loc: Loc,
+    value: &AttributeValue,
+) -> Option<(Loc, Option<ModuleId>, u64)> {
+    use E::AttributeValue_ as EAV;
+    let (vloc, module, member) = match value {
+        sp!(
+            vloc,
+            EAV::ModuleAccess(sp!(_, ModuleAccess_::ModuleAccess(m, n)))
+        ) => (*vloc, m, n),
+        _ => {
+            let (vloc, u) = convert_attribute_value_u64(context, loc, value)?;
+            return Some((vloc, None, u));
+        }
+    };
+    let module_id = convert_module_id(context, vloc, module)?;
+    let modules_constants = context.constants().get(module).unwrap();
+    let constant = match modules_constants.get_(&member.value) {
+        None => {
+            context.env.add_diag(diag!(
+                Attributes::InvalidValue,
+                (vloc, INVALID_VALUE),
+                (
+                    module.loc,
+                    format!("Unbound constant '{member}' in module '{module}'")
+                ),
+            ));
+            return None;
+        }
+        Some(c) => c,
+    };
+    match constant {
+        (cloc, None) => {
+            let msg = format!(
+                "Constant '{module}::{member}' has a non-u64 value. \
+                Only 'u64' values are permitted"
+            );
+            context.env.add_diag(diag!(
+                Attributes::InvalidValue,
+                (vloc, INVALID_VALUE),
+                (*cloc, msg),
+            ));
+            None
+        }
+        (_, Some(u)) => Some((vloc, Some(module_id), *u)),
+    }
+}
+
+fn convert_module_id(context: &mut Context, vloc: Loc, module: &ModuleIdent) -> Option<ModuleId> {
+    if !context.constants.contains_key(module) {
+        context.env.add_diag(diag!(
+            Attributes::InvalidValue,
+            (vloc, INVALID_VALUE),
+            (module.loc, format!("Unbound module '{module}'")),
+        ));
+        return None;
+    }
+    let sp!(mloc, ModuleIdent_ { address, module }) = module;
+    let addr = match address {
+        Address::Numerical(_, sp!(_, a)) => a.into_inner(),
+        Address::NamedUnassigned(addr) => {
+            context.env.add_diag(diag!(
+                Attributes::InvalidValue,
+                (vloc, INVALID_VALUE),
+                (*mloc, format!("Unbound address '{addr}'")),
+            ));
+            return None;
+        }
+    };
+    let mname = move_core_types::identifier::Identifier::new(module.value().to_string()).unwrap();
+    let mid = ModuleId::new(addr, mname);
+    Some(mid)
+}
+
+fn convert_attribute_value_u64(
+    context: &mut Context,
+    loc: Loc,
+    value: &AttributeValue,
+) -> Option<(Loc, u64)> {
+    use E::{AttributeValue_ as EAV, Value_ as EV};
+    match value {
+        sp!(vloc, EAV::Value(sp!(_, EV::InferredNum(u)))) if *u <= U256::from(std::u64::MAX) => {
+            Some((*vloc, u.down_cast_lossy()))
+        }
+        sp!(vloc, EAV::Value(sp!(_, EV::U64(u)))) => Some((*vloc, *u)),
+        sp!(vloc, EAV::Value(sp!(_, EV::U8(_))))
+        | sp!(vloc, EAV::Value(sp!(_, EV::U16(_))))
+        | sp!(vloc, EAV::Value(sp!(_, EV::U32(_))))
+        | sp!(vloc, EAV::Value(sp!(_, EV::U128(_))))
+        | sp!(vloc, EAV::Value(sp!(_, EV::U256(_)))) => {
+            context.env.add_diag(diag!(
+                Attributes::InvalidValue,
+                (loc, INVALID_VALUE),
+                (*vloc, "Annotated non-u64 literals are not permitted"),
+            ));
+            None
+        }
+        sp!(vloc, _) => {
+            context.env.add_diag(diag!(
+                Attributes::InvalidValue,
+                (loc, INVALID_VALUE),
+                (*vloc, "Unsupported value in this assignment"),
+            ));
+            None
         }
     }
 }
@@ -345,3 +677,21 @@ fn convert_attribute_value_to_move_value(
         _ => None,
     }
 }
+
+fn check_location<T>(
+    context: &mut Context,
+    loc: Loc,
+    attr: &str,
+    location: Option<T>,
+) -> Option<T> {
+    if location.is_none() {
+        let msg = format!(
+            "Expected '{}' following '{attr}'",
+            TestingAttribute::ERROR_LOCATION
+        );
+        context
+            .env
+            .add_diag(diag!(Attributes::InvalidUsage, (loc, msg)));
+    }
+    location
+}
diff --git a/language/move-compiler/src/verification/ast_filter.rs b/language/move-compiler/src/verification/ast_filter.rs
new file mode 100644
index 0000000000..9edd6a1834
--- /dev/null
+++ b/language/move-compiler/src/verification/ast_filter.rs
@@ -0,0 +1,74 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_ir_types::location::Loc;
+
+use crate::{
+    parser::{
+        ast as P,
+        filter::{filter_program, FilterContext},
+    },
+    shared::{known_attributes, CompilationEnv},
+};
+
+struct Context<'env> {
+    env: &'env mut CompilationEnv,
+}
+
+impl<'env> Context<'env> {
+    fn new(compilation_env: &'env mut CompilationEnv) -> Self {
+        Self {
+            env: compilation_env,
+        }
+    }
+}
+
+impl FilterContext for Context<'_> {
+    fn should_remove_by_attributes(
+        &mut self,
+        attrs: &[P::Attributes],
+        _is_source_def: bool,
+    ) -> bool {
+        should_remove_node(self.env, attrs)
+    }
+}
+
+//***************************************************************************
+// Filtering of verification-annotated module members
+//***************************************************************************
+
+// This filters out all AST elements annotated with verify-only annotated from `prog`
+// if the `verify` flag in `compilation_env` is not set. If the `verify` flag is set,
+// no filtering is performed.
+pub fn program(compilation_env: &mut CompilationEnv, prog: P::Program) -> P::Program {
+    let mut context = Context::new(compilation_env);
+    filter_program(&mut context, prog)
+}
+
+// An AST element should be removed if:
+// * It is annotated #[verify_only] and verify mode is not set
+fn should_remove_node(env: &CompilationEnv, attrs: &[P::Attributes]) -> bool {
+    use known_attributes::VerificationAttribute;
+    let flattened_attrs: Vec<_> = attrs.iter().flat_map(verification_attributes).collect();
+    let is_verify_only = flattened_attrs
+        .iter()
+        .any(|attr| matches!(attr.1, VerificationAttribute::VerifyOnly));
+    is_verify_only && !env.flags().is_verification()
+}
+
+fn verification_attributes(
+    attrs: &P::Attributes,
+) -> Vec<(Loc, known_attributes::VerificationAttribute)> {
+    use known_attributes::KnownAttribute;
+    attrs
+        .value
+        .iter()
+        .filter_map(
+            |attr| match KnownAttribute::resolve(attr.value.attribute_name().value)? {
+                KnownAttribute::Verification(verify_attr) => Some((attr.loc, verify_attr)),
+                KnownAttribute::Testing(_) | KnownAttribute::Native(_) => None,
+            },
+        )
+        .collect()
+}
diff --git a/language/tools/move-cli/src/package/mod.rs b/language/move-compiler/src/verification/mod.rs
similarity index 80%
rename from language/tools/move-cli/src/package/mod.rs
rename to language/move-compiler/src/verification/mod.rs
index d2e24bf0b4..8d45d8fb0a 100644
--- a/language/tools/move-cli/src/package/mod.rs
+++ b/language/move-compiler/src/verification/mod.rs
@@ -2,5 +2,4 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-pub mod cli;
-pub mod prover;
+pub mod ast_filter;
diff --git a/language/move-compiler/tests/move_check/borrows/unused_ref.exp b/language/move-compiler/tests/move_check/borrows/unused_ref.exp
new file mode 100644
index 0000000000..eab735f329
--- /dev/null
+++ b/language/move-compiler/tests/move_check/borrows/unused_ref.exp
@@ -0,0 +1,9 @@
+error[E04017]: too many arguments
+   ┌─ tests/move_check/borrows/unused_ref.move:28:5
+   │
+28 │     borrow<u64, u64>(&mut x, 0, 0);
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │     │               │
+   │     │               Found 3 argument(s) here
+   │     Invalid call of '0x42::m::borrow'. The call expected 2 argument(s) but got 3
+
diff --git a/language/move-compiler/tests/move_check/borrows/unused_ref.move b/language/move-compiler/tests/move_check/borrows/unused_ref.move
new file mode 100644
index 0000000000..9301e29a7f
--- /dev/null
+++ b/language/move-compiler/tests/move_check/borrows/unused_ref.move
@@ -0,0 +1,32 @@
+module 0x42::m {
+
+struct Txn { sender: address }
+struct X {}
+
+fun begin(sender: address): Txn {
+    Txn { sender }
+}
+
+fun new(_: &mut Txn): X {
+    X {}
+}
+
+fun add<K: copy + drop + store, V: store>(_x: &mut X, _k: K, _v: V) {
+    abort 0
+}
+
+
+fun borrow<K: copy + drop + store, V: store>(_x: &X, _k: K): &V {
+    abort 0
+}
+
+fun borrow_wrong_type() {
+    let sender = @0x0;
+    let scenario = begin(sender);
+    let x = new(&mut scenario);
+    add(&mut x, 0, 0);
+    borrow<u64, u64>(&mut x, 0, 0);
+    abort 42
+}
+
+}
diff --git a/language/move-compiler/tests/move_check/expansion/number_literal_too_long.exp b/language/move-compiler/tests/move_check/expansion/number_literal_too_long.exp
index 1d667f603a..8795e64f37 100644
--- a/language/move-compiler/tests/move_check/expansion/number_literal_too_long.exp
+++ b/language/move-compiler/tests/move_check/expansion/number_literal_too_long.exp
@@ -1,12 +1,12 @@
 error[E01006]: invalid number literal
   ┌─ tests/move_check/expansion/number_literal_too_long.move:3:9
   │
-3 │         0x1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF;
-  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid number literal. The given literal is too large to fit into the largest possible integer type, 'u128'
+3 │         0x1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF;
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid number literal. The given literal is too large to fit into the largest possible integer type, 'u256'
 
 error[E01006]: invalid number literal
   ┌─ tests/move_check/expansion/number_literal_too_long.move:4:9
   │
-4 │         340282366920938463463374607431768211456;
-  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid number literal. The given literal is too large to fit into the largest possible integer type, 'u128'
+4 │         340282366920938463463374607431768211456340282366920938463463374607431768211456340282366920938463463374607431768211456;
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid number literal. The given literal is too large to fit into the largest possible integer type, 'u256'
 
diff --git a/language/move-compiler/tests/move_check/expansion/number_literal_too_long.move b/language/move-compiler/tests/move_check/expansion/number_literal_too_long.move
index 7293c24ecf..2abb369f03 100644
--- a/language/move-compiler/tests/move_check/expansion/number_literal_too_long.move
+++ b/language/move-compiler/tests/move_check/expansion/number_literal_too_long.move
@@ -1,6 +1,6 @@
 module 0x42::M {
     fun foo() {
-        0x1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF;
-        340282366920938463463374607431768211456;
+        0x1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF;
+        340282366920938463463374607431768211456340282366920938463463374607431768211456340282366920938463463374607431768211456;
     }
 }
diff --git a/language/move-compiler/tests/move_check/folding/unfoldable_constants.exp b/language/move-compiler/tests/move_check/folding/unfoldable_constants.exp
index 2c0a9933b1..e10ac06669 100644
--- a/language/move-compiler/tests/move_check/folding/unfoldable_constants.exp
+++ b/language/move-compiler/tests/move_check/folding/unfoldable_constants.exp
@@ -17,104 +17,218 @@ error[E08001]: cannot compute constant value
   │                        ^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-  ┌─ tests/move_check/folding/unfoldable_constants.move:7:22
+  ┌─ tests/move_check/folding/unfoldable_constants.move:6:23
   │
-7 │     const SHR0: u8 = 0 >> 8;
-  │                      ^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+6 │     const SHL3: u16 = 1 << 16;
+  │                       ^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-  ┌─ tests/move_check/folding/unfoldable_constants.move:8:23
+  ┌─ tests/move_check/folding/unfoldable_constants.move:7:23
   │
-8 │     const SHR1: u64 = 0 >> 64;
+7 │     const SHL4: u32 = 1 << 32;
   │                       ^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-  ┌─ tests/move_check/folding/unfoldable_constants.move:9:24
+  ┌─ tests/move_check/folding/unfoldable_constants.move:9:22
   │
-9 │     const SHR2: u128 = 0 >> 128;
-  │                        ^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+9 │     const SHR0: u8 = 0 >> 8;
+  │                      ^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-   ┌─ tests/move_check/folding/unfoldable_constants.move:11:22
+   ┌─ tests/move_check/folding/unfoldable_constants.move:10:23
    │
-11 │     const DIV0: u8 = 1 / 0;
-   │                      ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+10 │     const SHR1: u64 = 0 >> 64;
+   │                       ^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:11:24
+   │
+11 │     const SHR2: u128 = 0 >> 128;
+   │                        ^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
    ┌─ tests/move_check/folding/unfoldable_constants.move:12:23
    │
-12 │     const DIV1: u64 = 1 / 0;
-   │                       ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+12 │     const SHR3: u16 = 0 >> 16;
+   │                       ^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-   ┌─ tests/move_check/folding/unfoldable_constants.move:13:24
+   ┌─ tests/move_check/folding/unfoldable_constants.move:13:23
    │
-13 │     const DIV2: u128 = 1 / 0;
-   │                        ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+13 │     const SHR4: u32 = 0 >> 32;
+   │                       ^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
    ┌─ tests/move_check/folding/unfoldable_constants.move:15:22
    │
-15 │     const MOD0: u8 = 1 % 0;
+15 │     const DIV0: u8 = 1 / 0;
    │                      ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
    ┌─ tests/move_check/folding/unfoldable_constants.move:16:23
    │
-16 │     const MOD1: u64 = 1 % 0;
+16 │     const DIV1: u64 = 1 / 0;
    │                       ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
    ┌─ tests/move_check/folding/unfoldable_constants.move:17:24
    │
-17 │     const MOD2: u128 = 1 % 0;
+17 │     const DIV2: u128 = 1 / 0;
+   │                        ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:18:23
+   │
+18 │     const DIV3: u16 = 1 / 0;
+   │                       ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:19:23
+   │
+19 │     const DIV4: u32 = 1 / 0;
+   │                       ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:20:24
+   │
+20 │     const DIV5: u256 = 1 / 0;
+   │                        ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:22:22
+   │
+22 │     const MOD0: u8 = 1 % 0;
+   │                      ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:23:23
+   │
+23 │     const MOD1: u64 = 1 % 0;
+   │                       ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:24:24
+   │
+24 │     const MOD2: u128 = 1 % 0;
+   │                        ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:25:23
+   │
+25 │     const MOD3: u16 = 1 % 0;
+   │                       ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:26:23
+   │
+26 │     const MOD4: u32 = 1 % 0;
+   │                       ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:27:24
+   │
+27 │     const MOD5: u256 = 1 % 0;
    │                        ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-   ┌─ tests/move_check/folding/unfoldable_constants.move:19:22
+   ┌─ tests/move_check/folding/unfoldable_constants.move:29:22
    │
-19 │     const ADD0: u8 = 255 + 255;
+29 │     const ADD0: u8 = 255 + 255;
    │                      ^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-   ┌─ tests/move_check/folding/unfoldable_constants.move:20:23
+   ┌─ tests/move_check/folding/unfoldable_constants.move:30:23
    │
-20 │     const ADD1: u64 = 18446744073709551615 + 18446744073709551615;
+30 │     const ADD1: u64 = 18446744073709551615 + 18446744073709551615;
    │                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-   ┌─ tests/move_check/folding/unfoldable_constants.move:22:9
+   ┌─ tests/move_check/folding/unfoldable_constants.move:32:9
    │
-22 │         340282366920938463463374607431768211450 + 340282366920938463463374607431768211450;
+32 │         340282366920938463463374607431768211450 + 340282366920938463463374607431768211450;
    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-   ┌─ tests/move_check/folding/unfoldable_constants.move:24:22
+   ┌─ tests/move_check/folding/unfoldable_constants.move:33:23
+   │
+33 │     const ADD3: u16 = 65535 + 65535;
+   │                       ^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:34:23
+   │
+34 │     const ADD4: u32 = 4294967295 + 4294967295;
+   │                       ^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:36:9
+   │
+36 │         115792089237316195423570985008687907853269984665640564039457584007913129639935 + 115792089237316195423570985008687907853269984665640564039457584007913129639935;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:38:22
    │
-24 │     const SUB0: u8 = 0 - 1;
+38 │     const SUB0: u8 = 0 - 1;
    │                      ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-   ┌─ tests/move_check/folding/unfoldable_constants.move:25:23
+   ┌─ tests/move_check/folding/unfoldable_constants.move:39:23
    │
-25 │     const SUB1: u64 = 0 - 1;
+39 │     const SUB1: u64 = 0 - 1;
    │                       ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-   ┌─ tests/move_check/folding/unfoldable_constants.move:26:24
+   ┌─ tests/move_check/folding/unfoldable_constants.move:40:24
    │
-26 │     const SUB2: u128 = 0 - 1;
+40 │     const SUB2: u128 = 0 - 1;
    │                        ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-   ┌─ tests/move_check/folding/unfoldable_constants.move:28:23
+   ┌─ tests/move_check/folding/unfoldable_constants.move:41:23
    │
-28 │     const CAST0: u8 = ((256: u64) as u8);
+41 │     const SUB3: u16 = 0 - 1;
+   │                       ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:42:23
+   │
+42 │     const SUB4: u32 = 0 - 1;
+   │                       ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:43:24
+   │
+43 │     const SUB5: u256 = 0 - 1;
+   │                        ^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:45:23
+   │
+45 │     const CAST0: u8 = ((256: u64) as u8);
    │                       ^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-   ┌─ tests/move_check/folding/unfoldable_constants.move:29:24
+   ┌─ tests/move_check/folding/unfoldable_constants.move:46:24
    │
-29 │     const CAST1: u64 = ((340282366920938463463374607431768211450: u128) as u64);
+46 │     const CAST1: u64 = ((340282366920938463463374607431768211450: u128) as u64);
    │                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:47:25
+   │
+47 │     const CAST4: u128 = ((340282366920938463463374607431768211456: u256) as u128);
+   │                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:48:24
+   │
+48 │     const CAST2: u16 = ((65536: u64) as u16);
+   │                        ^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants.move:49:24
+   │
+49 │     const CAST3: u32 = ((4294967296: u128) as u32);
+   │                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
diff --git a/language/move-compiler/tests/move_check/folding/unfoldable_constants.move b/language/move-compiler/tests/move_check/folding/unfoldable_constants.move
index fd10262b7c..2d3dc1ea9a 100644
--- a/language/move-compiler/tests/move_check/folding/unfoldable_constants.move
+++ b/language/move-compiler/tests/move_check/folding/unfoldable_constants.move
@@ -3,29 +3,49 @@ module M {
     const SHL0: u8 = 1 << 8;
     const SHL1: u64 = 1 << 64;
     const SHL2: u128 = 1 << 128;
+    const SHL3: u16 = 1 << 16;
+    const SHL4: u32 = 1 << 32;
 
     const SHR0: u8 = 0 >> 8;
     const SHR1: u64 = 0 >> 64;
     const SHR2: u128 = 0 >> 128;
+    const SHR3: u16 = 0 >> 16;
+    const SHR4: u32 = 0 >> 32;
 
     const DIV0: u8 = 1 / 0;
     const DIV1: u64 = 1 / 0;
     const DIV2: u128 = 1 / 0;
+    const DIV3: u16 = 1 / 0;
+    const DIV4: u32 = 1 / 0;
+    const DIV5: u256 = 1 / 0;
 
     const MOD0: u8 = 1 % 0;
     const MOD1: u64 = 1 % 0;
     const MOD2: u128 = 1 % 0;
+    const MOD3: u16 = 1 % 0;
+    const MOD4: u32 = 1 % 0;
+    const MOD5: u256 = 1 % 0;
 
     const ADD0: u8 = 255 + 255;
     const ADD1: u64 = 18446744073709551615 + 18446744073709551615;
     const ADD2: u128 =
         340282366920938463463374607431768211450 + 340282366920938463463374607431768211450;
+    const ADD3: u16 = 65535 + 65535;
+    const ADD4: u32 = 4294967295 + 4294967295;
+    const ADD5: u256 =
+        115792089237316195423570985008687907853269984665640564039457584007913129639935 + 115792089237316195423570985008687907853269984665640564039457584007913129639935;
 
     const SUB0: u8 = 0 - 1;
     const SUB1: u64 = 0 - 1;
     const SUB2: u128 = 0 - 1;
+    const SUB3: u16 = 0 - 1;
+    const SUB4: u32 = 0 - 1;
+    const SUB5: u256 = 0 - 1;
 
     const CAST0: u8 = ((256: u64) as u8);
     const CAST1: u64 = ((340282366920938463463374607431768211450: u128) as u64);
+    const CAST4: u128 = ((340282366920938463463374607431768211456: u256) as u128);
+    const CAST2: u16 = ((65536: u64) as u16);
+    const CAST3: u32 = ((4294967296: u128) as u32);
 }
 }
diff --git a/language/move-compiler/tests/move_check/folding/unfoldable_constants_blocks.exp b/language/move-compiler/tests/move_check/folding/unfoldable_constants_blocks.exp
index 07ab9bfd90..2465f6cedf 100644
--- a/language/move-compiler/tests/move_check/folding/unfoldable_constants_blocks.exp
+++ b/language/move-compiler/tests/move_check/folding/unfoldable_constants_blocks.exp
@@ -17,104 +17,218 @@ error[E08001]: cannot compute constant value
   │         ^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-  ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:8:9
+  ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:7:9
   │
-8 │         (0: u8) >> 8;
-  │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+7 │         (1: u16) << 16;
+  │         ^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-  ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:9:9
+  ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:8:9
   │
-9 │         (0: u64) >> 64;
+8 │         (1: u32) << 32;
   │         ^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
    ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:10:9
    │
-10 │         (0: u128) >> 128;
-   │         ^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+10 │         (0: u8) >> 8;
+   │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:11:9
+   │
+11 │         (0: u64) >> 64;
+   │         ^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
    ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:12:9
    │
-12 │         (1: u8) / 0;
-   │         ^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+12 │         (0: u128) >> 128;
+   │         ^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
    ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:13:9
    │
-13 │         (1: u64) / 0;
-   │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+13 │         (0: u16) >> 16;
+   │         ^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
    ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:14:9
    │
-14 │         (1: u128) / 0;
-   │         ^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+14 │         (0: u32) >> 32;
+   │         ^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
    ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:16:9
    │
-16 │         (1: u8) % 0;
+16 │         (1: u8) / 0;
    │         ^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
    ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:17:9
    │
-17 │         (1: u64) % 0;
+17 │         (1: u64) / 0;
    │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
    ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:18:9
    │
-18 │         (1: u128) % 0;
+18 │         (1: u128) / 0;
    │         ^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:19:9
+   │
+19 │         (1: u16) / 0;
+   │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
 error[E08001]: cannot compute constant value
    ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:20:9
    │
-20 │         (255: u8) + 255;
-   │         ^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+20 │         (1: u32) / 0;
+   │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
    ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:21:9
    │
-21 │         (18446744073709551615: u64) + 18446744073709551615;
+21 │         (1: u256) / 0;
+   │         ^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:23:9
+   │
+23 │         (1: u8) % 0;
+   │         ^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:24:9
+   │
+24 │         (1: u64) % 0;
+   │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:25:9
+   │
+25 │         (1: u128) % 0;
+   │         ^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:26:9
+   │
+26 │         (1: u16) % 0;
+   │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:27:9
+   │
+27 │         (1: u32) % 0;
+   │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:28:9
+   │
+28 │         (1: u256) % 0;
+   │         ^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:30:9
+   │
+30 │         (255: u8) + 255;
+   │         ^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:31:9
+   │
+31 │         (18446744073709551615: u64) + 18446744073709551615;
    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:22:9
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:32:9
    │
-22 │         (340282366920938463463374607431768211450: u128) + 340282366920938463463374607431768211450;
+32 │         (340282366920938463463374607431768211450: u128) + 340282366920938463463374607431768211450;
    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:24:9
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:33:9
    │
-24 │         (0: u8) - 1;
+33 │         (65535: u16) + 65535;
+   │         ^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:34:9
+   │
+34 │         (4294967295: u32) + 4294967295;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:35:9
+   │
+35 │         (115792089237316195423570985008687907853269984665640564039457584007913129639935: u256) + 115792089237316195423570985008687907853269984665640564039457584007913129639935;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:37:9
+   │
+37 │         (0: u8) - 1;
    │         ^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:25:9
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:38:9
    │
-25 │         (0: u64) - 1;
+38 │         (0: u64) - 1;
    │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:26:9
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:39:9
    │
-26 │         (0: u128) - 1;
+39 │         (0: u128) - 1;
    │         ^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:28:9
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:40:9
+   │
+40 │         (0: u16) - 1;
+   │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:41:9
+   │
+41 │         (0: u32) - 1;
+   │         ^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:42:9
+   │
+42 │         (0: u256) - 1;
+   │         ^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:44:9
    │
-28 │         ((256: u64) as u8);
+44 │         ((256: u64) as u8);
    │         ^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
 error[E08001]: cannot compute constant value
-   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:29:9
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:45:9
    │
-29 │         ((340282366920938463463374607431768211450: u128) as u64);
+45 │         ((340282366920938463463374607431768211450: u128) as u64);
    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
 
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:46:9
+   │
+46 │         ((340282366920938463463374607431768211456: u256) as u128);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:47:9
+   │
+47 │         ((65536: u64) as u16);
+   │         ^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
+error[E08001]: cannot compute constant value
+   ┌─ tests/move_check/folding/unfoldable_constants_blocks.move:48:9
+   │
+48 │         ((4294967296: u128) as u32);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid expression in 'const'. This expression could not be evaluated to a value
+
diff --git a/language/move-compiler/tests/move_check/folding/unfoldable_constants_blocks.move b/language/move-compiler/tests/move_check/folding/unfoldable_constants_blocks.move
index fc17a03f78..de6dbdfe03 100644
--- a/language/move-compiler/tests/move_check/folding/unfoldable_constants_blocks.move
+++ b/language/move-compiler/tests/move_check/folding/unfoldable_constants_blocks.move
@@ -4,29 +4,48 @@ module M {
         (1: u8) << 8;
         (1: u64) << 64;
         (1: u128) << 128;
+        (1: u16) << 16;
+        (1: u32) << 32;
 
         (0: u8) >> 8;
         (0: u64) >> 64;
         (0: u128) >> 128;
+        (0: u16) >> 16;
+        (0: u32) >> 32;
 
         (1: u8) / 0;
         (1: u64) / 0;
         (1: u128) / 0;
+        (1: u16) / 0;
+        (1: u32) / 0;
+        (1: u256) / 0;
 
         (1: u8) % 0;
         (1: u64) % 0;
         (1: u128) % 0;
+        (1: u16) % 0;
+        (1: u32) % 0;
+        (1: u256) % 0;
 
         (255: u8) + 255;
         (18446744073709551615: u64) + 18446744073709551615;
         (340282366920938463463374607431768211450: u128) + 340282366920938463463374607431768211450;
+        (65535: u16) + 65535;
+        (4294967295: u32) + 4294967295;
+        (115792089237316195423570985008687907853269984665640564039457584007913129639935: u256) + 115792089237316195423570985008687907853269984665640564039457584007913129639935;
 
         (0: u8) - 1;
         (0: u64) - 1;
         (0: u128) - 1;
+        (0: u16) - 1;
+        (0: u32) - 1;
+        (0: u256) - 1;
 
         ((256: u64) as u8);
         ((340282366920938463463374607431768211450: u128) as u64);
+        ((340282366920938463463374607431768211456: u256) as u128);
+        ((65536: u64) as u16);
+        ((4294967296: u128) as u32);
 
         0
     };
diff --git a/language/move-compiler/tests/move_check/parser/break_with_value.exp b/language/move-compiler/tests/move_check/parser/break_with_value.exp
new file mode 100644
index 0000000000..47d6c036f5
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/break_with_value.exp
@@ -0,0 +1,11 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/break_with_value.move:3:22
+  │
+3 │         loop { break 0 };
+  │                      ^
+  │                      │
+  │                      Unexpected '0'
+  │                      Expected the end of an expression
+  │
+  = 'break' with a value is not yet supported
+
diff --git a/language/move-compiler/tests/move_check/parser/break_with_value.move b/language/move-compiler/tests/move_check/parser/break_with_value.move
new file mode 100644
index 0000000000..c37d4dd02f
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/break_with_value.move
@@ -0,0 +1,5 @@
+module 0x42::M {
+    fun t(cond: bool) {
+        loop { break 0 };
+    }
+}
diff --git a/language/move-compiler/tests/move_check/parser/constant_values.move b/language/move-compiler/tests/move_check/parser/constant_values.move
index 02fee2c9a2..34db1a5471 100644
--- a/language/move-compiler/tests/move_check/parser/constant_values.move
+++ b/language/move-compiler/tests/move_check/parser/constant_values.move
@@ -8,4 +8,13 @@ module 0x8675309::M {
     fun int128(): u128 {
         4u128
     }
+    fun int16(): u16 {
+        123u16
+    }
+    fun int32(): u32 {
+        84 + 53u32
+    }
+    fun int256(): u256 {
+        4u256
+    }
 }
diff --git a/language/move-compiler/tests/move_check/parser/constants_blocks.exp b/language/move-compiler/tests/move_check/parser/constants_blocks.exp
index 71d09e8c19..85db8c1774 100644
--- a/language/move-compiler/tests/move_check/parser/constants_blocks.exp
+++ b/language/move-compiler/tests/move_check/parser/constants_blocks.exp
@@ -29,7 +29,7 @@ error[E04012]: invalid type for constant
    │               ^^
    │               │
    │               Unpermitted constant type
-   │               Found: '()'. But expected one of: 'u8', 'u64', 'u128', 'bool', 'address', 'vector<_>'
+   │               Found: '()'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
 
 error[E04013]: invalid statement or expression in constant
    ┌─ tests/move_check/parser/constants_blocks.move:12:9
diff --git a/language/move-compiler/tests/move_check/parser/constants_simple.move b/language/move-compiler/tests/move_check/parser/constants_simple.move
index 995c255fa4..dc5e980cf6 100644
--- a/language/move-compiler/tests/move_check/parser/constants_simple.move
+++ b/language/move-compiler/tests/move_check/parser/constants_simple.move
@@ -8,5 +8,9 @@ module M {
     const C4: u8 = if (cond) 0 else 1;
     const C5: vector<vector<bool>> = abort 0;
     const C6: u128 = 0;
+    const C7: u256 = 4 / 3 + 4 - 1 << 143;
+    const C8: u16 = 123;
+    const C9: u32 = (453 as u32);
+
 }
 }
diff --git a/language/move-compiler/tests/move_check/parser/control_exp_as_term.exp b/language/move-compiler/tests/move_check/parser/control_exp_as_term.exp
new file mode 100644
index 0000000000..dc746b0d7f
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/control_exp_as_term.exp
@@ -0,0 +1,36 @@
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/parser/control_exp_as_term.move:7:13
+  │
+7 │         1 + loop {} + 2;
+  │             ^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/parser/control_exp_as_term.move:8:13
+  │
+8 │         1 + return + 0;
+  │             ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_as_term.move:10:14
+   │
+10 │         foo(&if (cond) 0 else 1);
+   │              ^^^^^^^^^^^^^^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_as_term.move:11:14
+   │
+11 │         foo(&loop {});
+   │              ^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_as_term.move:12:14
+   │
+12 │         foo(&return);
+   │              ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_as_term.move:13:14
+   │
+13 │         foo(&abort 0);
+   │              ^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
diff --git a/language/move-compiler/tests/move_check/parser/control_exp_as_term.move b/language/move-compiler/tests/move_check/parser/control_exp_as_term.move
new file mode 100644
index 0000000000..4b6193fbe5
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/control_exp_as_term.move
@@ -0,0 +1,15 @@
+module 0x42::M {
+
+    fun foo(_: &u64) {}
+
+    fun t(cond: bool) {
+        1 + if (cond) 0 else { 1 } + 2;
+        1 + loop {} + 2;
+        1 + return + 0;
+
+        foo(&if (cond) 0 else 1);
+        foo(&loop {});
+        foo(&return);
+        foo(&abort 0);
+    }
+}
diff --git a/language/move-compiler/tests/move_check/parser/control_exp_associativity.move b/language/move-compiler/tests/move_check/parser/control_exp_associativity.move
new file mode 100644
index 0000000000..c9f44701b3
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/control_exp_associativity.move
@@ -0,0 +1,10 @@
+// tests that control structures are right associative when not immediately followed by a block
+
+module 0x42::M {
+    fun t(cond: bool) {
+        let _: u64 = 1 + if (cond) 0 else 10 + 10;
+        let _: bool = true || if (cond) false else 10 == 10;
+        let _: bool = if (cond) 10 else { 10 } == 10;
+        let _: u64 = if (cond) 0 else { 10 } + 1;
+    }
+}
diff --git a/language/move-compiler/tests/move_check/parser/control_exp_associativity_else_after_if_block.exp b/language/move-compiler/tests/move_check/parser/control_exp_associativity_else_after_if_block.exp
new file mode 100644
index 0000000000..a05e423d0d
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/control_exp_associativity_else_after_if_block.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+   ┌─ tests/move_check/parser/control_exp_associativity_else_after_if_block.move:13:28
+   │
+13 │         if (cond) { s1 }.f else s2.f
+   │                            ^^^^
+   │                            │
+   │                            Unexpected 'else'
+   │                            Expected ';'
+
diff --git a/language/move-compiler/tests/move_check/parser/control_exp_associativity_else_after_if_block.move b/language/move-compiler/tests/move_check/parser/control_exp_associativity_else_after_if_block.move
new file mode 100644
index 0000000000..cf1c1d789c
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/control_exp_associativity_else_after_if_block.move
@@ -0,0 +1,17 @@
+// tests that control structures are right associative when not immediately followed by a block
+
+module 0x42::M {
+
+    struct S has copy, drop { f: u64 }
+
+    fun t(cond: bool, s1: S, s2: S) {
+        // (if (cond) s1 else s2).f
+        let _: u64 = if (cond) { s1 } else { s2 }.f;
+
+        // (if (cond) s1).f else (s2.f)
+        // so parsing error
+        if (cond) { s1 }.f else s2.f
+
+
+    }
+}
diff --git a/language/move-compiler/tests/move_check/parser/control_exp_associativity_field_access.move b/language/move-compiler/tests/move_check/parser/control_exp_associativity_field_access.move
new file mode 100644
index 0000000000..8581cea7fd
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/control_exp_associativity_field_access.move
@@ -0,0 +1,16 @@
+// tests that control structures are right associative when not immediately followed by a block
+
+// valid usage with field access
+
+module 0x42::M {
+
+    struct S has copy, drop { f: u64 }
+
+    fun t(cond: bool, s1: S, s2: S) {
+        let _: u64 = if (cond) 0 else s2.f;
+        let _: u64 = if (cond) s1.f else s2.f;
+        let _: u64 = if (cond) s1 else { s2 }.f;
+        let _: u64 = if (cond) { s1 } else { s2 }.f;
+    }
+
+}
diff --git a/language/move-compiler/tests/move_check/parser/control_exp_associativity_typing_invalid.exp b/language/move-compiler/tests/move_check/parser/control_exp_associativity_typing_invalid.exp
new file mode 100644
index 0000000000..789d0a379b
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/control_exp_associativity_typing_invalid.exp
@@ -0,0 +1,88 @@
+error[E04007]: incompatible types
+   ┌─ tests/move_check/parser/control_exp_associativity_typing_invalid.move:12:9
+   │
+ 7 │     fun bar(): u64 { 0 }
+   │                --- Found: 'u64'. It is not compatible with the other type.
+   ·
+12 │         if (cond) bar() + 1;
+   │         ^^^^^^^^^^^^^^^^^^^
+   │         │
+   │         Incompatible branches
+   │         Found: '()'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/parser/control_exp_associativity_typing_invalid.move:15:9
+   │
+15 │         if (cond) { foo() } + 1;
+   │         ^^^^^^^^^^^^^^^^^^^
+   │         │
+   │         Invalid argument to '+'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/parser/control_exp_associativity_typing_invalid.move:15:29
+   │
+15 │         if (cond) { foo() } + 1;
+   │         ------------------- ^ - Found: integer. It is not compatible with the other type.
+   │         │                   │  
+   │         │                   Incompatible arguments to '+'
+   │         Found: '()'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/parser/control_exp_associativity_typing_invalid.move:15:31
+   │
+15 │         if (cond) { foo() } + 1;
+   │         -------------------   ^ Invalid argument to '+'
+   │         │                      
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/parser/control_exp_associativity_typing_invalid.move:19:22
+   │
+ 7 │     fun bar(): u64 { 0 }
+   │                --- Given: 'u64'
+   ·
+19 │         while (cond) bar() + 2;
+   │                      ^^^^^^^^^
+   │                      │
+   │                      Invalid loop body
+   │                      Expected: '()'
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/parser/control_exp_associativity_typing_invalid.move:22:9
+   │
+22 │         while (cond) { foo() } + 2;
+   │         ^^^^^^^^^^^^^^^^^^^^^^
+   │         │
+   │         Invalid argument to '+'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/parser/control_exp_associativity_typing_invalid.move:22:32
+   │
+22 │         while (cond) { foo() } + 2;
+   │         ---------------------- ^ - Found: integer. It is not compatible with the other type.
+   │         │                      │  
+   │         │                      Incompatible arguments to '+'
+   │         Found: '()'. It is not compatible with the other type.
+
+error[E04003]: built-in operation not supported
+   ┌─ tests/move_check/parser/control_exp_associativity_typing_invalid.move:22:34
+   │
+22 │         while (cond) { foo() } + 2;
+   │         ----------------------   ^ Invalid argument to '+'
+   │         │                         
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
+
+error[E04007]: incompatible types
+   ┌─ tests/move_check/parser/control_exp_associativity_typing_invalid.move:26:14
+   │
+ 7 │     fun bar(): u64 { 0 }
+   │                --- Given: 'u64'
+   ·
+26 │         loop bar() + 2;
+   │              ^^^^^^^^^
+   │              │
+   │              Invalid loop body
+   │              Expected: '()'
+
diff --git a/language/move-compiler/tests/move_check/parser/control_exp_associativity_typing_invalid.move b/language/move-compiler/tests/move_check/parser/control_exp_associativity_typing_invalid.move
new file mode 100644
index 0000000000..69b19a99d0
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/control_exp_associativity_typing_invalid.move
@@ -0,0 +1,29 @@
+// tests that control structures are right associative when not immediately followed by a block
+
+// these cases do not type check
+
+module 0x42::M {
+    fun foo() {}
+    fun bar(): u64 { 0 }
+
+    fun t(cond: bool) {
+        // if (cond) (bar() + 1);
+        // so error about incompatible branches
+        if (cond) bar() + 1;
+        // (if (cond) bar()) + 1;
+        // so error about wrong argument to +
+        if (cond) { foo() } + 1;
+
+        // while (cond) (bar() + 1);
+        // so error about invalid loop body type
+        while (cond) bar() + 2;
+        // (while (cond) foo()) + 2
+        // so error about wrong argument to +
+        while (cond) { foo() } + 2;
+
+        // loop (bar() + 1);
+        // so error about invalid loop body type
+        loop bar() + 2;
+        // loop { foo() } + 2; would type check
+    }
+}
diff --git a/language/move-compiler/tests/move_check/parser/control_exp_associativity_unreachable_code.exp b/language/move-compiler/tests/move_check/parser/control_exp_associativity_unreachable_code.exp
new file mode 100644
index 0000000000..71648f2d2d
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/control_exp_associativity_unreachable_code.exp
@@ -0,0 +1,72 @@
+warning[W09002]: unused variable
+  ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:9:11
+  │
+9 │     fun t(cond: bool): u64 {
+  │           ^^^^ Unused parameter 'cond'. Consider removing or prefixing with an underscore: '_cond'
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:11:13
+   │
+11 │         1 + loop { foo() } + 2;
+   │             ^^^^^^^^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:12:13
+   │
+12 │         1 + loop foo();
+   │             ^^^^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:12:18
+   │
+12 │         1 + loop foo();
+   │                  ^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:13:9
+   │
+13 │         loop { foo() } + 1;
+   │         ^^^^^^^^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:13:16
+   │
+13 │         loop { foo() } + 1;
+   │                ^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:17:9
+   │
+17 │         return { 1 + 2 };
+   │         ^^^^^^^^^^^^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:18:9
+   │
+18 │         return { 1 } && false;
+   │         ^^^^^^^^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:18:9
+   │
+18 │         return { 1 } && false;
+   │         ^^^^^^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:22:9
+   │
+22 │         abort { 1 + 2 };
+   │         ^^^^^^^^^^^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:23:9
+   │
+23 │         abort { 1 } && false;
+   │         ^^^^^^^^^^^ Unreachable code. This statement (and any following statements) will not be executed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/control_exp_associativity_unreachable_code.move:23:9
+   │
+23 │         abort { 1 } && false;
+   │         ^^^^^^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
diff --git a/language/move-compiler/tests/move_check/parser/control_exp_associativity_unreachable_code.move b/language/move-compiler/tests/move_check/parser/control_exp_associativity_unreachable_code.move
new file mode 100644
index 0000000000..e7f8b2cab4
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/control_exp_associativity_unreachable_code.move
@@ -0,0 +1,27 @@
+// tests that control structures are right associative when not immediately followed by a block
+
+// these cases type check, but have dead code
+
+module 0x42::M {
+    fun foo() {}
+    fun bar(): u64 { 0 }
+
+    fun t(cond: bool): u64 {
+        // loop
+        1 + loop { foo() } + 2;
+        1 + loop foo();
+        loop { foo() } + 1;
+
+        // return
+        return 1 + 2;
+        return { 1 + 2 };
+        return { 1 } && false;
+
+        // abort
+        abort 1 + 2;
+        abort { 1 + 2 };
+        abort { 1 } && false;
+
+        0
+    }
+}
diff --git a/language/move-compiler/tests/move_check/parser/less_than_space.move b/language/move-compiler/tests/move_check/parser/less_than_space.move
index 618bafecc3..0638e4ac42 100644
--- a/language/move-compiler/tests/move_check/parser/less_than_space.move
+++ b/language/move-compiler/tests/move_check/parser/less_than_space.move
@@ -1,7 +1,7 @@
 module 0x42::M {
     fun f(v: u64): u64 {
         if (v < 5) return 5;
-	// Check for a useful diagnostic message when missing a space before "<"
+	// Check for a useful diagnostic message when missing a space before '<'
         if (v< 10) return v;
         0
     }
diff --git a/language/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading.exp b/language/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading.exp
new file mode 100644
index 0000000000..38bc61d77e
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading.exp
@@ -0,0 +1,6 @@
+error[E03009]: unbound variable
+  ┌─ tests/move_check/parser/num_hex_literal_underscore_leading.move:4:17
+  │
+4 │         let _ = _0x0u8;
+  │                 ^^^^^^ Invalid variable usage. Unbound variable '_0x0u8'
+
diff --git a/language/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading.move b/language/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading.move
new file mode 100644
index 0000000000..3022ad9d64
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading.move
@@ -0,0 +1,6 @@
+module 0x42::M {
+    fun t() {
+        // Leading underscore not allowed
+        let _ = _0x0u8;
+    }
+}
diff --git a/language/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading_no_type_suffix.exp b/language/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading_no_type_suffix.exp
new file mode 100644
index 0000000000..e1a9f747de
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading_no_type_suffix.exp
@@ -0,0 +1,6 @@
+error[E03009]: unbound variable
+  ┌─ tests/move_check/parser/num_hex_literal_underscore_leading_no_type_suffix.move:4:17
+  │
+4 │         let _ = _0x76;
+  │                 ^^^^^ Invalid variable usage. Unbound variable '_0x76'
+
diff --git a/language/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading_no_type_suffix.move b/language/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading_no_type_suffix.move
new file mode 100644
index 0000000000..521d669858
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/num_hex_literal_underscore_leading_no_type_suffix.move
@@ -0,0 +1,6 @@
+module 0x42::M {
+    fun t() {
+        // Leading underscore not allowed
+        let _ = _0x76;
+    }
+}
diff --git a/language/move-compiler/tests/move_check/parser/num_hex_literal_underscore_trailing.exp b/language/move-compiler/tests/move_check/parser/num_hex_literal_underscore_trailing.exp
new file mode 100644
index 0000000000..04b118fd53
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/num_hex_literal_underscore_trailing.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/num_hex_literal_underscore_trailing.move:4:22
+  │
+4 │         let _ = 0x0u8_;
+  │                      ^
+  │                      │
+  │                      Unexpected '_'
+  │                      Expected ';'
+
diff --git a/language/move-compiler/tests/move_check/parser/num_hex_literal_underscore_trailing.move b/language/move-compiler/tests/move_check/parser/num_hex_literal_underscore_trailing.move
new file mode 100644
index 0000000000..c6d4a0abee
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/num_hex_literal_underscore_trailing.move
@@ -0,0 +1,6 @@
+module 0x42::M {
+    fun t() {
+        // Trailing underscore after bit-width suffix not allowed
+        let _ = 0x0u8_;
+    }
+}
diff --git a/language/move-compiler/tests/move_check/parser/num_literal_underscore.move b/language/move-compiler/tests/move_check/parser/num_literal_underscore.move
new file mode 100644
index 0000000000..12173339df
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/num_literal_underscore.move
@@ -0,0 +1,43 @@
+module 0x42::M {
+    fun t() {
+        // Single underscore separations allowed
+        let _ = 8_5u128;
+        let _ = 8_5;
+        let _: u8 = 8_5;
+        let _ = 0x8_5u128;
+        let _ = 0x8_5;
+        let _: u8 = 0x8_5;
+
+        // Multiple underscore separations allowed
+        let _ = 02345677_15463636363_36464784848_456847568568775u256;
+        let _ = 0_1_3_4;
+        let _: u64 = 0_1_3_4;
+        let _ = 0x02345677_15463636363_36464784848_456847568568775u256;
+        let _ = 0x0_1_3_4;
+        let _: u64 = 0x0_1_3_4;
+
+        // Single trailing allowed
+        let _ = 567_u64;
+        let _ = 567_;
+        let _: u64 = 5_6_7;
+        let _ = 0x567_u64;
+        let _ = 0x567_;
+        let _: u64 = 0x5_6_7;
+
+        // Multiple trailing allowed
+        let _ = 567___u32;
+        let _ = 567___;
+        let _: u64 = 567___;
+        let _ = 0x567___u32;
+        let _ = 0x567___;
+        let _: u64 = 0x567___;
+
+        // Multiple underscore in tandem allowed
+        let _ = 0__8u16;
+        let _ = 0__8;
+        let _: u8 = 0__8;
+        let _ = 0x0__8u16;
+        let _ = 0x0__8;
+        let _: u8 = 0x0__8;
+    }
+}
diff --git a/language/move-compiler/tests/move_check/parser/num_literal_underscore_leading.exp b/language/move-compiler/tests/move_check/parser/num_literal_underscore_leading.exp
new file mode 100644
index 0000000000..c957990525
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/num_literal_underscore_leading.exp
@@ -0,0 +1,6 @@
+error[E03009]: unbound variable
+  ┌─ tests/move_check/parser/num_literal_underscore_leading.move:4:17
+  │
+4 │         let _ = _0u8;
+  │                 ^^^^ Invalid variable usage. Unbound variable '_0u8'
+
diff --git a/language/move-compiler/tests/move_check/parser/num_literal_underscore_leading.move b/language/move-compiler/tests/move_check/parser/num_literal_underscore_leading.move
new file mode 100644
index 0000000000..556ebaffcf
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/num_literal_underscore_leading.move
@@ -0,0 +1,6 @@
+module 0x42::M {
+    fun t() {
+        // Leading underscore not allowed
+        let _ = _0u8;
+    }
+}
diff --git a/language/move-compiler/tests/move_check/parser/num_literal_underscore_leading_no_type_suffix.exp b/language/move-compiler/tests/move_check/parser/num_literal_underscore_leading_no_type_suffix.exp
new file mode 100644
index 0000000000..83138513ed
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/num_literal_underscore_leading_no_type_suffix.exp
@@ -0,0 +1,6 @@
+error[E03009]: unbound variable
+  ┌─ tests/move_check/parser/num_literal_underscore_leading_no_type_suffix.move:4:17
+  │
+4 │         let _ = _76;
+  │                 ^^^ Invalid variable usage. Unbound variable '_76'
+
diff --git a/language/move-compiler/tests/move_check/parser/num_literal_underscore_leading_no_type_suffix.move b/language/move-compiler/tests/move_check/parser/num_literal_underscore_leading_no_type_suffix.move
new file mode 100644
index 0000000000..5c26884a47
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/num_literal_underscore_leading_no_type_suffix.move
@@ -0,0 +1,6 @@
+module 0x42::M {
+    fun t() {
+        // Leading underscore not allowed
+        let _ = _76;
+    }
+}
diff --git a/language/move-compiler/tests/move_check/parser/num_literal_underscore_trailing.exp b/language/move-compiler/tests/move_check/parser/num_literal_underscore_trailing.exp
new file mode 100644
index 0000000000..9a2c332fd3
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/num_literal_underscore_trailing.exp
@@ -0,0 +1,9 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_check/parser/num_literal_underscore_trailing.move:4:20
+  │
+4 │         let _ = 0u8_;
+  │                    ^
+  │                    │
+  │                    Unexpected '_'
+  │                    Expected ';'
+
diff --git a/language/move-compiler/tests/move_check/parser/num_literal_underscore_trailing.move b/language/move-compiler/tests/move_check/parser/num_literal_underscore_trailing.move
new file mode 100644
index 0000000000..f464a0c1af
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/num_literal_underscore_trailing.move
@@ -0,0 +1,6 @@
+module 0x42::M {
+    fun t() {
+        // Trailing underscore after bit-width suffix not allowed
+        let _ = 0u8_;
+    }
+}
diff --git a/language/move-compiler/tests/move_check/parser/return_in_binop.exp b/language/move-compiler/tests/move_check/parser/return_in_binop.exp
new file mode 100644
index 0000000000..2be1774be5
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/return_in_binop.exp
@@ -0,0 +1,96 @@
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/parser/return_in_binop.move:3:9
+  │
+3 │         return >> 0;
+  │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/parser/return_in_binop.move:4:9
+  │
+4 │         return << 0;
+  │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/parser/return_in_binop.move:5:9
+  │
+5 │         return || false;
+  │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/parser/return_in_binop.move:6:9
+  │
+6 │         return && false;
+  │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/parser/return_in_binop.move:7:9
+  │
+7 │         return + 0;
+  │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/parser/return_in_binop.move:8:9
+  │
+8 │         return - 0;
+  │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+  ┌─ tests/move_check/parser/return_in_binop.move:9:9
+  │
+9 │         return % 0;
+  │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/return_in_binop.move:10:9
+   │
+10 │         return / 1;
+   │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/return_in_binop.move:11:9
+   │
+11 │         return < 0;
+   │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/return_in_binop.move:12:9
+   │
+12 │         return > 0;
+   │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/return_in_binop.move:13:9
+   │
+13 │         return <= 0;
+   │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/return_in_binop.move:14:9
+   │
+14 │         return == 0;
+   │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/return_in_binop.move:15:9
+   │
+15 │         return >= 0;
+   │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/return_in_binop.move:16:9
+   │
+16 │         return != 0;
+   │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/return_in_binop.move:17:9
+   │
+17 │         return | 0;
+   │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
+warning[W09005]: dead or unreachable code
+   ┌─ tests/move_check/parser/return_in_binop.move:18:9
+   │
+18 │         return ^ 0;
+   │         ^^^^^^ Invalid use of a divergent expression. The code following the evaluation of this expression will be dead and should be removed.
+
diff --git a/language/move-compiler/tests/move_check/parser/return_in_binop.move b/language/move-compiler/tests/move_check/parser/return_in_binop.move
new file mode 100644
index 0000000000..9cdee087b0
--- /dev/null
+++ b/language/move-compiler/tests/move_check/parser/return_in_binop.move
@@ -0,0 +1,20 @@
+module 0x42::M {
+    fun t() {
+        return >> 0;
+        return << 0;
+        return || false;
+        return && false;
+        return + 0;
+        return - 0;
+        return % 0;
+        return / 1;
+        return < 0;
+        return > 0;
+        return <= 0;
+        return == 0;
+        return >= 0;
+        return != 0;
+        return | 0;
+        return ^ 0;
+    }
+}
diff --git a/language/move-compiler/tests/move_check/parser/spec_parsing_inside_fun.exp b/language/move-compiler/tests/move_check/parser/spec_parsing_inside_fun.exp
index 71114b8f10..bbf44aced1 100644
--- a/language/move-compiler/tests/move_check/parser/spec_parsing_inside_fun.exp
+++ b/language/move-compiler/tests/move_check/parser/spec_parsing_inside_fun.exp
@@ -5,7 +5,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^^
    │         │
    │         Invalid argument to '+'
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/parser/spec_parsing_inside_fun.move:32:17
@@ -22,7 +22,7 @@ error[E04003]: built-in operation not supported
 32 │         spec {} + 1;
    │         -------   ^ Invalid argument to '+'
    │         │          
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/parser/spec_parsing_inside_fun.move:33:9
diff --git a/language/move-compiler/tests/move_check/parser/vector_conditional_keyword.exp b/language/move-compiler/tests/move_check/parser/vector_conditional_keyword.exp
index 60462e49ba..07f2d83953 100644
--- a/language/move-compiler/tests/move_check/parser/vector_conditional_keyword.exp
+++ b/language/move-compiler/tests/move_check/parser/vector_conditional_keyword.exp
@@ -11,7 +11,7 @@ error[E04003]: built-in operation not supported
   │                 ^^^^^^
   │                 │
   │                 Invalid argument to '<'
-  │                 Found: '_'. But expected: 'u8', 'u64', 'u128'
+  │                 Found: '_'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/parser/vector_conditional_keyword.move:4:26
@@ -19,5 +19,5 @@ error[E04003]: built-in operation not supported
 4 │         let a = vector < 100;
   │                 ------   ^^^ Invalid argument to '<'
   │                 │         
-  │                 Found: '_'. But expected: 'u8', 'u64', 'u128'
+  │                 Found: '_'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
diff --git a/language/move-compiler/tests/move_check/translated_ir_tests/move/commands/consume_stack.move b/language/move-compiler/tests/move_check/translated_ir_tests/move/commands/consume_stack.move
index 76ca588725..3abe2fb0a4 100644
--- a/language/move-compiler/tests/move_check/translated_ir_tests/move/commands/consume_stack.move
+++ b/language/move-compiler/tests/move_check/translated_ir_tests/move/commands/consume_stack.move
@@ -10,7 +10,7 @@ module 0x8675309::M {
     }
 
     // ImmBorrowLoc(0),
-    // LdAddr(1),
+    // LdConst(1),
     // ImmBorrowGlobal(StructDefinitionIndex(4)),
     // ImmBorrowField(FieldHandleIndex(0)),
     // Call(45),
diff --git a/language/move-compiler/tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.exp b/language/move-compiler/tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.exp
index 55d6c4cd45..6a2928ae95 100644
--- a/language/move-compiler/tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.exp
+++ b/language/move-compiler/tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.exp
@@ -5,7 +5,7 @@ error[E04003]: built-in operation not supported
   │          ^^^^^^^^^^^^^
   │          │
   │          Invalid argument to 'as'
-  │          Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+  │          Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.move:5:10
@@ -14,7 +14,7 @@ error[E04003]: built-in operation not supported
   │          ^^^^^^^^^^^^^
   │          │
   │          Invalid argument to 'as'
-  │          Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+  │          Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.move:6:10
@@ -23,7 +23,7 @@ error[E04003]: built-in operation not supported
   │          ^^^^^^^^^^^^^
   │          │
   │          Invalid argument to 'as'
-  │          Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+  │          Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.move:7:10
@@ -32,7 +32,7 @@ error[E04003]: built-in operation not supported
   │          ^^^^
   │          │
   │          Invalid argument to 'as'
-  │          Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │          Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.move:8:10
@@ -41,7 +41,7 @@ error[E04003]: built-in operation not supported
   │          ^^^^
   │          │
   │          Invalid argument to 'as'
-  │          Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │          Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.move:9:10
@@ -50,7 +50,7 @@ error[E04003]: built-in operation not supported
   │          ^^^^
   │          │
   │          Invalid argument to 'as'
-  │          Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │          Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.move:10:10
@@ -59,7 +59,7 @@ error[E04003]: built-in operation not supported
    │          ^^^^
    │          │
    │          Invalid argument to 'as'
-   │          Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │          Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/translated_ir_tests/move/operators/casting_operators_types_mismatch.move:11:10
@@ -68,5 +68,5 @@ error[E04003]: built-in operation not supported
    │          ^^^^
    │          │
    │          Invalid argument to 'as'
-   │          Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │          Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
diff --git a/language/move-compiler/tests/move_check/typing/ability_constraint_generic_in_field.exp b/language/move-compiler/tests/move_check/typing/ability_constraint_generic_in_field.exp
new file mode 100644
index 0000000000..28ae29e45e
--- /dev/null
+++ b/language/move-compiler/tests/move_check/typing/ability_constraint_generic_in_field.exp
@@ -0,0 +1,26 @@
+error[E05001]: ability constraint not satisfied
+  ┌─ tests/move_check/typing/ability_constraint_generic_in_field.move:3:22
+  │
+2 │     struct S<T: copy> { v: T }
+  │                 ---- 'copy' constraint declared here
+3 │     struct B<T> { v: S<T> }
+  │              -       ^^^^
+  │              │       │ │
+  │              │       │ The type 'T' does not have the ability 'copy'
+  │              │       'copy' constraint not satisifed
+  │              To satisfy the constraint, the 'copy' ability would need to be added here
+
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/ability_constraint_generic_in_field.move:10:22
+   │
+ 7 │     struct A<T: copy> has copy { a: T }
+   │                 ---- 'copy' constraint declared here
+ 8 │ 
+ 9 │     struct B<T> has copy {
+   │              - To satisfy the constraint, the 'copy' ability would need to be added here
+10 │         data: vector<A<T>>
+   │                      ^^^^
+   │                      │ │
+   │                      │ The type 'T' does not have the ability 'copy'
+   │                      'copy' constraint not satisifed
+
diff --git a/language/move-compiler/tests/move_check/typing/ability_constraint_generic_in_field.move b/language/move-compiler/tests/move_check/typing/ability_constraint_generic_in_field.move
new file mode 100644
index 0000000000..4c5ec887a7
--- /dev/null
+++ b/language/move-compiler/tests/move_check/typing/ability_constraint_generic_in_field.move
@@ -0,0 +1,12 @@
+module 0x42::m {
+    struct S<T: copy> { v: T }
+    struct B<T> { v: S<T> }
+}
+
+module 0x42::n {
+    struct A<T: copy> has copy { a: T }
+
+    struct B<T> has copy {
+        data: vector<A<T>>
+    }
+}
diff --git a/language/move-compiler/tests/move_check/typing/bad_type_argument_arity_const.exp b/language/move-compiler/tests/move_check/typing/bad_type_argument_arity_const.exp
index 52888ead7f..3f5bf93e58 100644
--- a/language/move-compiler/tests/move_check/typing/bad_type_argument_arity_const.exp
+++ b/language/move-compiler/tests/move_check/typing/bad_type_argument_arity_const.exp
@@ -11,7 +11,7 @@ error[E04012]: invalid type for constant
   │               ^
   │               │
   │               Unpermitted constant type
-  │               Found: '0x42::M::S<_>'. But expected one of: 'u8', 'u64', 'u128', 'bool', 'address', 'vector<_>'
+  │               Found: '0x42::M::S<_>'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
 
 error[E04013]: invalid statement or expression in constant
   ┌─ tests/move_check/typing/bad_type_argument_arity_const.move:6:19
@@ -32,7 +32,7 @@ error[E04012]: invalid type for constant
   │               ^^^
   │               │
   │               Unpermitted constant type
-  │               Found: '0x42::M::S<_>'. But expected one of: 'u8', 'u64', 'u128', 'bool', 'address', 'vector<_>'
+  │               Found: '0x42::M::S<_>'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
 
 error[E04013]: invalid statement or expression in constant
   ┌─ tests/move_check/typing/bad_type_argument_arity_const.move:7:21
@@ -53,7 +53,7 @@ error[E04012]: invalid type for constant
   │               ^^^^^^^^^^^^
   │               │
   │               Unpermitted constant type
-  │               Found: '0x42::M::S<_>'. But expected one of: 'u8', 'u64', 'u128', 'bool', 'address', 'vector<_>'
+  │               Found: '0x42::M::S<_>'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
 
 error[E04013]: invalid statement or expression in constant
   ┌─ tests/move_check/typing/bad_type_argument_arity_const.move:8:30
@@ -68,7 +68,7 @@ error[E04012]: invalid type for constant
   │               ^^^^^^^^^^^^^^^
   │               │
   │               Unpermitted constant type
-  │               Found: '0x42::M::S<_>'. But expected one of: 'u8', 'u64', 'u128', 'bool', 'address', 'vector<_>'
+  │               Found: '0x42::M::S<_>'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
 
 error[E03007]: too many type arguments
   ┌─ tests/move_check/typing/bad_type_argument_arity_const.move:9:17
diff --git a/language/move-compiler/tests/move_check/typing/binary_add_invalid.exp b/language/move-compiler/tests/move_check/typing/binary_add_invalid.exp
index e4d687ea49..b8c49938a4 100644
--- a/language/move-compiler/tests/move_check/typing/binary_add_invalid.exp
+++ b/language/move-compiler/tests/move_check/typing/binary_add_invalid.exp
@@ -5,7 +5,7 @@ error[E04003]: built-in operation not supported
   │         ^^^^^
   │         │
   │         Invalid argument to '+'
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/typing/binary_add_invalid.move:8:17
@@ -13,7 +13,7 @@ error[E04003]: built-in operation not supported
 8 │         false + true;
   │         -----   ^^^^ Invalid argument to '+'
   │         │        
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
   ┌─ tests/move_check/typing/binary_add_invalid.move:9:11
@@ -31,7 +31,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^
    │         │
    │         Invalid argument to '+'
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_add_invalid.move:10:15
@@ -48,7 +48,7 @@ error[E04003]: built-in operation not supported
 10 │         false + 1;
    │         -----   ^ Invalid argument to '+'
    │         │        
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_add_invalid.move:11:9
@@ -57,7 +57,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^
    │         │
    │         Invalid argument to '+'
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_add_invalid.move:11:16
@@ -65,7 +65,7 @@ error[E04003]: built-in operation not supported
 11 │         @0x0 + @0x1;
    │         ----   ^^^^ Invalid argument to '+'
    │         │       
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_add_invalid.move:12:17
@@ -80,7 +80,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_add_invalid.move:13:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r + r;
    │         ^ Invalid argument to '+'
@@ -101,7 +101,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_add_invalid.move:13:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r + r;
    │             ^ Invalid argument to '+'
@@ -110,7 +110,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_add_invalid.move:14:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s + s;
    │         ^ Invalid argument to '+'
@@ -119,27 +119,18 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_add_invalid.move:14:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s + s;
    │             ^ Invalid argument to '+'
 
-error[E04003]: built-in operation not supported
-   ┌─ tests/move_check/typing/binary_add_invalid.move:15:9
-   │
-15 │         1 + false + @0x0 + 0;
-   │         ^^^^^^^^^
-   │         │ │
-   │         │ Found: '_'. But expected: 'u8', 'u64', 'u128'
-   │         Invalid argument to '+'
-
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_add_invalid.move:15:9
    │
 15 │         1 + false + @0x0 + 0;
    │         ^^^^^^^^^^^^^^^^
    │         │           │
-   │         │           Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         │           Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    │         Invalid argument to '+'
 
 error[E04007]: incompatible types
@@ -151,14 +142,6 @@ error[E04007]: incompatible types
    │         │ Incompatible arguments to '+'
    │         Found: integer. It is not compatible with the other type.
 
-error[E04003]: built-in operation not supported
-   ┌─ tests/move_check/typing/binary_add_invalid.move:15:21
-   │
-15 │         1 + false + @0x0 + 0;
-   │           -         ^^^^ Invalid argument to '+'
-   │           │          
-   │           Found: '_'. But expected: 'u8', 'u64', 'u128'
-
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_add_invalid.move:15:26
    │
@@ -174,7 +157,7 @@ error[E04003]: built-in operation not supported
 15 │         1 + false + @0x0 + 0;
    │                     ----   ^ Invalid argument to '+'
    │                     │       
-   │                     Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │                     Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_add_invalid.move:16:9
@@ -183,7 +166,7 @@ error[E04003]: built-in operation not supported
    │         ^^
    │         │
    │         Invalid argument to '+'
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_add_invalid.move:16:14
@@ -191,7 +174,7 @@ error[E04003]: built-in operation not supported
 16 │         () + ();
    │         --   ^^ Invalid argument to '+'
    │         │     
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_add_invalid.move:17:11
@@ -209,7 +192,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '+'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_add_invalid.move:18:16
@@ -226,7 +209,7 @@ error[E04003]: built-in operation not supported
 18 │         (0, 1) + (0, 1, 2);
    │         ------   ^^^^^^^^^ Invalid argument to '+'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_add_invalid.move:19:9
@@ -235,7 +218,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '+'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_add_invalid.move:19:18
@@ -243,5 +226,5 @@ error[E04003]: built-in operation not supported
 19 │         (1, 2) + (0, 1);
    │         ------   ^^^^^^ Invalid argument to '+'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
diff --git a/language/move-compiler/tests/move_check/typing/binary_bit_and_invalid.exp b/language/move-compiler/tests/move_check/typing/binary_bit_and_invalid.exp
index 7a90b89b36..d2d94c85d0 100644
--- a/language/move-compiler/tests/move_check/typing/binary_bit_and_invalid.exp
+++ b/language/move-compiler/tests/move_check/typing/binary_bit_and_invalid.exp
@@ -5,7 +5,7 @@ error[E04003]: built-in operation not supported
   │         ^^^^^
   │         │
   │         Invalid argument to '&'
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:8:17
@@ -13,7 +13,7 @@ error[E04003]: built-in operation not supported
 8 │         false & true;
   │         -----   ^^^^ Invalid argument to '&'
   │         │        
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:9:11
@@ -31,7 +31,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^
    │         │
    │         Invalid argument to '&'
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_bit_and_invalid.move:10:15
@@ -48,7 +48,7 @@ error[E04003]: built-in operation not supported
 10 │         false & 1;
    │         -----   ^ Invalid argument to '&'
    │         │        
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_and_invalid.move:11:9
@@ -57,7 +57,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^
    │         │
    │         Invalid argument to '&'
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_and_invalid.move:11:16
@@ -65,7 +65,7 @@ error[E04003]: built-in operation not supported
 11 │         @0x0 & @0x1;
    │         ----   ^^^^ Invalid argument to '&'
    │         │       
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_bit_and_invalid.move:12:17
@@ -80,7 +80,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_and_invalid.move:13:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r & r;
    │         ^ Invalid argument to '&'
@@ -101,7 +101,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_and_invalid.move:13:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r & r;
    │             ^ Invalid argument to '&'
@@ -110,7 +110,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_and_invalid.move:14:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s & s;
    │         ^ Invalid argument to '&'
@@ -119,27 +119,18 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_and_invalid.move:14:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s & s;
    │             ^ Invalid argument to '&'
 
-error[E04003]: built-in operation not supported
-   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:15:9
-   │
-15 │         1 & false & @0x0 & 0;
-   │         ^^^^^^^^^
-   │         │ │
-   │         │ Found: '_'. But expected: 'u8', 'u64', 'u128'
-   │         Invalid argument to '&'
-
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_and_invalid.move:15:9
    │
 15 │         1 & false & @0x0 & 0;
    │         ^^^^^^^^^^^^^^^^
    │         │           │
-   │         │           Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         │           Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    │         Invalid argument to '&'
 
 error[E04007]: incompatible types
@@ -151,14 +142,6 @@ error[E04007]: incompatible types
    │         │ Incompatible arguments to '&'
    │         Found: integer. It is not compatible with the other type.
 
-error[E04003]: built-in operation not supported
-   ┌─ tests/move_check/typing/binary_bit_and_invalid.move:15:21
-   │
-15 │         1 & false & @0x0 & 0;
-   │           -         ^^^^ Invalid argument to '&'
-   │           │          
-   │           Found: '_'. But expected: 'u8', 'u64', 'u128'
-
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_bit_and_invalid.move:15:26
    │
@@ -174,7 +157,7 @@ error[E04003]: built-in operation not supported
 15 │         1 & false & @0x0 & 0;
    │                     ----   ^ Invalid argument to '&'
    │                     │       
-   │                     Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │                     Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_and_invalid.move:16:9
@@ -183,7 +166,7 @@ error[E04003]: built-in operation not supported
    │         ^^
    │         │
    │         Invalid argument to '&'
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_and_invalid.move:16:14
@@ -191,7 +174,7 @@ error[E04003]: built-in operation not supported
 16 │         () & ();
    │         --   ^^ Invalid argument to '&'
    │         │     
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_bit_and_invalid.move:17:11
@@ -209,7 +192,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '&'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_bit_and_invalid.move:18:16
@@ -226,7 +209,7 @@ error[E04003]: built-in operation not supported
 18 │         (0, 1) & (0, 1, 2);
    │         ------   ^^^^^^^^^ Invalid argument to '&'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_and_invalid.move:19:9
@@ -235,7 +218,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '&'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_and_invalid.move:19:18
@@ -243,5 +226,5 @@ error[E04003]: built-in operation not supported
 19 │         (1, 2) & (0, 1);
    │         ------   ^^^^^^ Invalid argument to '&'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
diff --git a/language/move-compiler/tests/move_check/typing/binary_bit_or_invalid.exp b/language/move-compiler/tests/move_check/typing/binary_bit_or_invalid.exp
index 0af829c164..99b7839fc3 100644
--- a/language/move-compiler/tests/move_check/typing/binary_bit_or_invalid.exp
+++ b/language/move-compiler/tests/move_check/typing/binary_bit_or_invalid.exp
@@ -5,7 +5,7 @@ error[E04003]: built-in operation not supported
   │         ^^^^^
   │         │
   │         Invalid argument to '|'
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:8:17
@@ -13,7 +13,7 @@ error[E04003]: built-in operation not supported
 8 │         false | true;
   │         -----   ^^^^ Invalid argument to '|'
   │         │        
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:9:11
@@ -31,7 +31,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^
    │         │
    │         Invalid argument to '|'
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_bit_or_invalid.move:10:15
@@ -48,7 +48,7 @@ error[E04003]: built-in operation not supported
 10 │         false | 1;
    │         -----   ^ Invalid argument to '|'
    │         │        
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_or_invalid.move:11:9
@@ -57,7 +57,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^
    │         │
    │         Invalid argument to '|'
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_or_invalid.move:11:16
@@ -65,7 +65,7 @@ error[E04003]: built-in operation not supported
 11 │         @0x0 | @0x1;
    │         ----   ^^^^ Invalid argument to '|'
    │         │       
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_bit_or_invalid.move:12:17
@@ -80,7 +80,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_or_invalid.move:13:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r | r;
    │         ^ Invalid argument to '|'
@@ -101,7 +101,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_or_invalid.move:13:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r | r;
    │             ^ Invalid argument to '|'
@@ -110,7 +110,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_or_invalid.move:14:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s | s;
    │         ^ Invalid argument to '|'
@@ -119,27 +119,18 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_or_invalid.move:14:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s | s;
    │             ^ Invalid argument to '|'
 
-error[E04003]: built-in operation not supported
-   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:15:9
-   │
-15 │         1 | false | @0x0 | 0;
-   │         ^^^^^^^^^
-   │         │ │
-   │         │ Found: '_'. But expected: 'u8', 'u64', 'u128'
-   │         Invalid argument to '|'
-
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_or_invalid.move:15:9
    │
 15 │         1 | false | @0x0 | 0;
    │         ^^^^^^^^^^^^^^^^
    │         │           │
-   │         │           Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         │           Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    │         Invalid argument to '|'
 
 error[E04007]: incompatible types
@@ -151,14 +142,6 @@ error[E04007]: incompatible types
    │         │ Incompatible arguments to '|'
    │         Found: integer. It is not compatible with the other type.
 
-error[E04003]: built-in operation not supported
-   ┌─ tests/move_check/typing/binary_bit_or_invalid.move:15:21
-   │
-15 │         1 | false | @0x0 | 0;
-   │           -         ^^^^ Invalid argument to '|'
-   │           │          
-   │           Found: '_'. But expected: 'u8', 'u64', 'u128'
-
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_bit_or_invalid.move:15:26
    │
@@ -174,7 +157,7 @@ error[E04003]: built-in operation not supported
 15 │         1 | false | @0x0 | 0;
    │                     ----   ^ Invalid argument to '|'
    │                     │       
-   │                     Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │                     Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_or_invalid.move:16:9
@@ -183,7 +166,7 @@ error[E04003]: built-in operation not supported
    │         ^^
    │         │
    │         Invalid argument to '|'
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_or_invalid.move:16:14
@@ -191,7 +174,7 @@ error[E04003]: built-in operation not supported
 16 │         () | ();
    │         --   ^^ Invalid argument to '|'
    │         │     
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_bit_or_invalid.move:17:11
@@ -209,7 +192,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '|'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_bit_or_invalid.move:18:16
@@ -226,7 +209,7 @@ error[E04003]: built-in operation not supported
 18 │         (0, 1) | (0, 1, 2);
    │         ------   ^^^^^^^^^ Invalid argument to '|'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_or_invalid.move:19:9
@@ -235,7 +218,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '|'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_or_invalid.move:19:18
@@ -243,5 +226,5 @@ error[E04003]: built-in operation not supported
 19 │         (1, 2) | (0, 1);
    │         ------   ^^^^^^ Invalid argument to '|'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
diff --git a/language/move-compiler/tests/move_check/typing/binary_bit_xor_invalid.exp b/language/move-compiler/tests/move_check/typing/binary_bit_xor_invalid.exp
index 9ccab2aa65..85add00616 100644
--- a/language/move-compiler/tests/move_check/typing/binary_bit_xor_invalid.exp
+++ b/language/move-compiler/tests/move_check/typing/binary_bit_xor_invalid.exp
@@ -5,7 +5,7 @@ error[E04003]: built-in operation not supported
   │         ^^^^^
   │         │
   │         Invalid argument to '^'
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:8:17
@@ -13,7 +13,7 @@ error[E04003]: built-in operation not supported
 8 │         false ^ true;
   │         -----   ^^^^ Invalid argument to '^'
   │         │        
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:9:11
@@ -31,7 +31,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^
    │         │
    │         Invalid argument to '^'
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:10:15
@@ -48,7 +48,7 @@ error[E04003]: built-in operation not supported
 10 │         false ^ 1;
    │         -----   ^ Invalid argument to '^'
    │         │        
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:11:9
@@ -57,7 +57,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^
    │         │
    │         Invalid argument to '^'
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:11:16
@@ -65,7 +65,7 @@ error[E04003]: built-in operation not supported
 11 │         @0x0 ^ @0x1;
    │         ----   ^^^^ Invalid argument to '^'
    │         │       
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:12:17
@@ -80,7 +80,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:13:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r ^ r;
    │         ^ Invalid argument to '^'
@@ -101,7 +101,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:13:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r ^ r;
    │             ^ Invalid argument to '^'
@@ -110,7 +110,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:14:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s ^ s;
    │         ^ Invalid argument to '^'
@@ -119,27 +119,18 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:14:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s ^ s;
    │             ^ Invalid argument to '^'
 
-error[E04003]: built-in operation not supported
-   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:15:9
-   │
-15 │         1 ^ false ^ @0x0 ^ 0;
-   │         ^^^^^^^^^
-   │         │ │
-   │         │ Found: '_'. But expected: 'u8', 'u64', 'u128'
-   │         Invalid argument to '^'
-
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:15:9
    │
 15 │         1 ^ false ^ @0x0 ^ 0;
    │         ^^^^^^^^^^^^^^^^
    │         │           │
-   │         │           Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         │           Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    │         Invalid argument to '^'
 
 error[E04007]: incompatible types
@@ -151,14 +142,6 @@ error[E04007]: incompatible types
    │         │ Incompatible arguments to '^'
    │         Found: integer. It is not compatible with the other type.
 
-error[E04003]: built-in operation not supported
-   ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:15:21
-   │
-15 │         1 ^ false ^ @0x0 ^ 0;
-   │           -         ^^^^ Invalid argument to '^'
-   │           │          
-   │           Found: '_'. But expected: 'u8', 'u64', 'u128'
-
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:15:26
    │
@@ -174,7 +157,7 @@ error[E04003]: built-in operation not supported
 15 │         1 ^ false ^ @0x0 ^ 0;
    │                     ----   ^ Invalid argument to '^'
    │                     │       
-   │                     Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │                     Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:16:9
@@ -183,7 +166,7 @@ error[E04003]: built-in operation not supported
    │         ^^
    │         │
    │         Invalid argument to '^'
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:16:14
@@ -191,7 +174,7 @@ error[E04003]: built-in operation not supported
 16 │         () ^ ();
    │         --   ^^ Invalid argument to '^'
    │         │     
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:17:11
@@ -209,7 +192,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '^'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:18:16
@@ -226,7 +209,7 @@ error[E04003]: built-in operation not supported
 18 │         (0, 1) ^ (0, 1, 2);
    │         ------   ^^^^^^^^^ Invalid argument to '^'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:19:9
@@ -235,7 +218,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '^'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_bit_xor_invalid.move:19:18
@@ -243,5 +226,5 @@ error[E04003]: built-in operation not supported
 19 │         (1, 2) ^ (0, 1);
    │         ------   ^^^^^^ Invalid argument to '^'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
diff --git a/language/move-compiler/tests/move_check/typing/binary_div_invalid.exp b/language/move-compiler/tests/move_check/typing/binary_div_invalid.exp
index 321224d60e..599f76f2eb 100644
--- a/language/move-compiler/tests/move_check/typing/binary_div_invalid.exp
+++ b/language/move-compiler/tests/move_check/typing/binary_div_invalid.exp
@@ -5,7 +5,7 @@ error[E04003]: built-in operation not supported
   │         ^^^^^
   │         │
   │         Invalid argument to '/'
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/typing/binary_div_invalid.move:8:17
@@ -13,7 +13,7 @@ error[E04003]: built-in operation not supported
 8 │         false / true;
   │         -----   ^^^^ Invalid argument to '/'
   │         │        
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
   ┌─ tests/move_check/typing/binary_div_invalid.move:9:11
@@ -31,7 +31,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^
    │         │
    │         Invalid argument to '/'
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_div_invalid.move:10:15
@@ -48,7 +48,7 @@ error[E04003]: built-in operation not supported
 10 │         false / 1;
    │         -----   ^ Invalid argument to '/'
    │         │        
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_div_invalid.move:11:9
@@ -57,7 +57,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^
    │         │
    │         Invalid argument to '/'
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_div_invalid.move:11:16
@@ -65,7 +65,7 @@ error[E04003]: built-in operation not supported
 11 │         @0x0 / @0x1;
    │         ----   ^^^^ Invalid argument to '/'
    │         │       
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_div_invalid.move:12:17
@@ -80,7 +80,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_div_invalid.move:13:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r / r;
    │         ^ Invalid argument to '/'
@@ -101,7 +101,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_div_invalid.move:13:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r / r;
    │             ^ Invalid argument to '/'
@@ -110,7 +110,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_div_invalid.move:14:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s / s;
    │         ^ Invalid argument to '/'
@@ -119,27 +119,18 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_div_invalid.move:14:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s / s;
    │             ^ Invalid argument to '/'
 
-error[E04003]: built-in operation not supported
-   ┌─ tests/move_check/typing/binary_div_invalid.move:15:9
-   │
-15 │         1 / false / @0x0 / 0;
-   │         ^^^^^^^^^
-   │         │ │
-   │         │ Found: '_'. But expected: 'u8', 'u64', 'u128'
-   │         Invalid argument to '/'
-
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_div_invalid.move:15:9
    │
 15 │         1 / false / @0x0 / 0;
    │         ^^^^^^^^^^^^^^^^
    │         │           │
-   │         │           Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         │           Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    │         Invalid argument to '/'
 
 error[E04007]: incompatible types
@@ -151,14 +142,6 @@ error[E04007]: incompatible types
    │         │ Incompatible arguments to '/'
    │         Found: integer. It is not compatible with the other type.
 
-error[E04003]: built-in operation not supported
-   ┌─ tests/move_check/typing/binary_div_invalid.move:15:21
-   │
-15 │         1 / false / @0x0 / 0;
-   │           -         ^^^^ Invalid argument to '/'
-   │           │          
-   │           Found: '_'. But expected: 'u8', 'u64', 'u128'
-
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_div_invalid.move:15:26
    │
@@ -174,7 +157,7 @@ error[E04003]: built-in operation not supported
 15 │         1 / false / @0x0 / 0;
    │                     ----   ^ Invalid argument to '/'
    │                     │       
-   │                     Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │                     Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_div_invalid.move:16:9
@@ -183,7 +166,7 @@ error[E04003]: built-in operation not supported
    │         ^^
    │         │
    │         Invalid argument to '/'
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_div_invalid.move:16:14
@@ -191,7 +174,7 @@ error[E04003]: built-in operation not supported
 16 │         () / ();
    │         --   ^^ Invalid argument to '/'
    │         │     
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_div_invalid.move:17:11
@@ -209,7 +192,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '/'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_div_invalid.move:18:16
@@ -226,7 +209,7 @@ error[E04003]: built-in operation not supported
 18 │         (0, 1) / (0, 1, 2);
    │         ------   ^^^^^^^^^ Invalid argument to '/'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_div_invalid.move:19:9
@@ -235,7 +218,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '/'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_div_invalid.move:19:18
@@ -243,5 +226,5 @@ error[E04003]: built-in operation not supported
 19 │         (1, 2) / (0, 1);
    │         ------   ^^^^^^ Invalid argument to '/'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
diff --git a/language/move-compiler/tests/move_check/typing/binary_geq_invalid.exp b/language/move-compiler/tests/move_check/typing/binary_geq_invalid.exp
index d27444f521..968eb0ba4b 100644
--- a/language/move-compiler/tests/move_check/typing/binary_geq_invalid.exp
+++ b/language/move-compiler/tests/move_check/typing/binary_geq_invalid.exp
@@ -5,7 +5,7 @@ error[E04003]: built-in operation not supported
   │         ^^^^^
   │         │
   │         Invalid argument to '>='
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/typing/binary_geq_invalid.move:8:18
@@ -13,7 +13,7 @@ error[E04003]: built-in operation not supported
 8 │         false >= true;
   │         -----    ^^^^ Invalid argument to '>='
   │         │         
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
   ┌─ tests/move_check/typing/binary_geq_invalid.move:9:11
@@ -31,7 +31,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^
    │         │
    │         Invalid argument to '>='
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_geq_invalid.move:10:15
@@ -48,7 +48,7 @@ error[E04003]: built-in operation not supported
 10 │         false >= 1;
    │         -----    ^ Invalid argument to '>='
    │         │         
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_geq_invalid.move:11:9
@@ -57,7 +57,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^
    │         │
    │         Invalid argument to '>='
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_geq_invalid.move:11:17
@@ -65,7 +65,7 @@ error[E04003]: built-in operation not supported
 11 │         @0x0 >= @0x1;
    │         ----    ^^^^ Invalid argument to '>='
    │         │        
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_geq_invalid.move:12:17
@@ -80,7 +80,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_geq_invalid.move:13:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r >= r;
    │         ^ Invalid argument to '>='
@@ -89,7 +89,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_geq_invalid.move:13:14
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r >= r;
    │              ^ Invalid argument to '>='
@@ -98,7 +98,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_geq_invalid.move:14:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s >= s;
    │         ^ Invalid argument to '>='
@@ -107,7 +107,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_geq_invalid.move:14:14
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s >= s;
    │              ^ Invalid argument to '>='
@@ -119,7 +119,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '>='
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_geq_invalid.move:15:16
@@ -136,7 +136,7 @@ error[E04003]: built-in operation not supported
 15 │         0 >= 1 >= 2;
    │         ------    ^ Invalid argument to '>='
    │         │          
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_geq_invalid.move:16:12
@@ -154,7 +154,7 @@ error[E04003]: built-in operation not supported
    │                          ^^^^
    │                          │
    │                          Invalid argument to '>='
-   │                          Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │                          Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_geq_invalid.move:16:31
@@ -171,7 +171,7 @@ error[E04003]: built-in operation not supported
 16 │         (1 >= false) && (@0x0 >= 0);
    │                          ----    ^ Invalid argument to '>='
    │                          │        
-   │                          Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │                          Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_geq_invalid.move:17:9
@@ -180,7 +180,7 @@ error[E04003]: built-in operation not supported
    │         ^^
    │         │
    │         Invalid argument to '>='
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_geq_invalid.move:17:15
@@ -188,7 +188,7 @@ error[E04003]: built-in operation not supported
 17 │         () >= ();
    │         --    ^^ Invalid argument to '>='
    │         │      
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_geq_invalid.move:18:11
@@ -206,7 +206,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '>='
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_geq_invalid.move:19:16
@@ -223,7 +223,7 @@ error[E04003]: built-in operation not supported
 19 │         (0, 1) >= (0, 1, 2);
    │         ------    ^^^^^^^^^ Invalid argument to '>='
    │         │          
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_geq_invalid.move:20:9
@@ -232,7 +232,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '>='
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_geq_invalid.move:20:19
@@ -240,5 +240,5 @@ error[E04003]: built-in operation not supported
 20 │         (1, 2) >= (0, 1);
    │         ------    ^^^^^^ Invalid argument to '>='
    │         │          
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
diff --git a/language/move-compiler/tests/move_check/typing/binary_gt_invalid.exp b/language/move-compiler/tests/move_check/typing/binary_gt_invalid.exp
index aa83f4eede..54280800ba 100644
--- a/language/move-compiler/tests/move_check/typing/binary_gt_invalid.exp
+++ b/language/move-compiler/tests/move_check/typing/binary_gt_invalid.exp
@@ -5,7 +5,7 @@ error[E04003]: built-in operation not supported
   │         ^^^^^
   │         │
   │         Invalid argument to '>'
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/typing/binary_gt_invalid.move:8:17
@@ -13,7 +13,7 @@ error[E04003]: built-in operation not supported
 8 │         false > true;
   │         -----   ^^^^ Invalid argument to '>'
   │         │        
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
   ┌─ tests/move_check/typing/binary_gt_invalid.move:9:11
@@ -31,7 +31,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^
    │         │
    │         Invalid argument to '>'
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_gt_invalid.move:10:15
@@ -48,7 +48,7 @@ error[E04003]: built-in operation not supported
 10 │         false > 1;
    │         -----   ^ Invalid argument to '>'
    │         │        
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_gt_invalid.move:11:9
@@ -57,7 +57,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^
    │         │
    │         Invalid argument to '>'
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_gt_invalid.move:11:16
@@ -65,7 +65,7 @@ error[E04003]: built-in operation not supported
 11 │         @0x0 > @0x1;
    │         ----   ^^^^ Invalid argument to '>'
    │         │       
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_gt_invalid.move:12:17
@@ -80,7 +80,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_gt_invalid.move:13:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r > r;
    │         ^ Invalid argument to '>'
@@ -89,7 +89,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_gt_invalid.move:13:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r > r;
    │             ^ Invalid argument to '>'
@@ -98,7 +98,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_gt_invalid.move:14:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s > s;
    │         ^ Invalid argument to '>'
@@ -107,7 +107,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_gt_invalid.move:14:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s > s;
    │             ^ Invalid argument to '>'
@@ -119,7 +119,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^
    │         │
    │         Invalid argument to '>'
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_gt_invalid.move:15:15
@@ -136,7 +136,7 @@ error[E04003]: built-in operation not supported
 15 │         0 > 1 > 2;
    │         -----   ^ Invalid argument to '>'
    │         │        
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_gt_invalid.move:16:12
@@ -154,7 +154,7 @@ error[E04003]: built-in operation not supported
    │                         ^^^^
    │                         │
    │                         Invalid argument to '>'
-   │                         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │                         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_gt_invalid.move:16:30
@@ -171,7 +171,7 @@ error[E04003]: built-in operation not supported
 16 │         (1 > false) && (@0x0 > 0);
    │                         ----   ^ Invalid argument to '>'
    │                         │       
-   │                         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │                         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_gt_invalid.move:17:9
@@ -180,7 +180,7 @@ error[E04003]: built-in operation not supported
    │         ^^
    │         │
    │         Invalid argument to '>'
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_gt_invalid.move:17:14
@@ -188,7 +188,7 @@ error[E04003]: built-in operation not supported
 17 │         () > ();
    │         --   ^^ Invalid argument to '>'
    │         │     
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_gt_invalid.move:18:11
@@ -206,7 +206,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '>'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_gt_invalid.move:19:16
@@ -223,7 +223,7 @@ error[E04003]: built-in operation not supported
 19 │         (0, 1) > (0, 1, 2);
    │         ------   ^^^^^^^^^ Invalid argument to '>'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_gt_invalid.move:20:9
@@ -232,7 +232,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '>'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_gt_invalid.move:20:18
@@ -240,5 +240,5 @@ error[E04003]: built-in operation not supported
 20 │         (1, 2) > (0, 1);
    │         ------   ^^^^^^ Invalid argument to '>'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
diff --git a/language/move-compiler/tests/move_check/typing/binary_leq_invalid.exp b/language/move-compiler/tests/move_check/typing/binary_leq_invalid.exp
index f7263c94ff..da3ad6aa8c 100644
--- a/language/move-compiler/tests/move_check/typing/binary_leq_invalid.exp
+++ b/language/move-compiler/tests/move_check/typing/binary_leq_invalid.exp
@@ -5,7 +5,7 @@ error[E04003]: built-in operation not supported
   │         ^^^^^
   │         │
   │         Invalid argument to '<='
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/typing/binary_leq_invalid.move:8:18
@@ -13,7 +13,7 @@ error[E04003]: built-in operation not supported
 8 │         false <= true;
   │         -----    ^^^^ Invalid argument to '<='
   │         │         
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
   ┌─ tests/move_check/typing/binary_leq_invalid.move:9:11
@@ -31,7 +31,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^
    │         │
    │         Invalid argument to '<='
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_leq_invalid.move:10:15
@@ -48,7 +48,7 @@ error[E04003]: built-in operation not supported
 10 │         false <= 1;
    │         -----    ^ Invalid argument to '<='
    │         │         
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_leq_invalid.move:11:9
@@ -57,7 +57,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^
    │         │
    │         Invalid argument to '<='
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_leq_invalid.move:11:17
@@ -65,7 +65,7 @@ error[E04003]: built-in operation not supported
 11 │         @0x0 <= @0x1;
    │         ----    ^^^^ Invalid argument to '<='
    │         │        
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_leq_invalid.move:12:17
@@ -80,7 +80,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_leq_invalid.move:13:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r <= r;
    │         ^ Invalid argument to '<='
@@ -89,7 +89,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_leq_invalid.move:13:14
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r <= r;
    │              ^ Invalid argument to '<='
@@ -98,7 +98,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_leq_invalid.move:14:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s <= s;
    │         ^ Invalid argument to '<='
@@ -107,7 +107,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_leq_invalid.move:14:14
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s <= s;
    │              ^ Invalid argument to '<='
@@ -119,7 +119,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '<='
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_leq_invalid.move:15:16
@@ -136,7 +136,7 @@ error[E04003]: built-in operation not supported
 15 │         0 <= 1 <= 2;
    │         ------    ^ Invalid argument to '<='
    │         │          
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_leq_invalid.move:16:12
@@ -154,7 +154,7 @@ error[E04003]: built-in operation not supported
    │                          ^^^^
    │                          │
    │                          Invalid argument to '<='
-   │                          Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │                          Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_leq_invalid.move:16:31
@@ -171,7 +171,7 @@ error[E04003]: built-in operation not supported
 16 │         (1 <= false) && (@0x0 <= 0);
    │                          ----    ^ Invalid argument to '<='
    │                          │        
-   │                          Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │                          Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_leq_invalid.move:17:9
@@ -180,7 +180,7 @@ error[E04003]: built-in operation not supported
    │         ^^
    │         │
    │         Invalid argument to '<='
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_leq_invalid.move:17:15
@@ -188,7 +188,7 @@ error[E04003]: built-in operation not supported
 17 │         () <= ();
    │         --    ^^ Invalid argument to '<='
    │         │      
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_leq_invalid.move:18:11
@@ -206,7 +206,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '<='
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_leq_invalid.move:19:16
@@ -223,7 +223,7 @@ error[E04003]: built-in operation not supported
 19 │         (0, 1) <= (0, 1, 2);
    │         ------    ^^^^^^^^^ Invalid argument to '<='
    │         │          
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_leq_invalid.move:20:9
@@ -232,7 +232,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '<='
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_leq_invalid.move:20:19
@@ -240,5 +240,5 @@ error[E04003]: built-in operation not supported
 20 │         (1, 2) <= (0, 1);
    │         ------    ^^^^^^ Invalid argument to '<='
    │         │          
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
diff --git a/language/move-compiler/tests/move_check/typing/binary_lt_invalid.exp b/language/move-compiler/tests/move_check/typing/binary_lt_invalid.exp
index 6f0bc9f77e..03386cc844 100644
--- a/language/move-compiler/tests/move_check/typing/binary_lt_invalid.exp
+++ b/language/move-compiler/tests/move_check/typing/binary_lt_invalid.exp
@@ -5,7 +5,7 @@ error[E04003]: built-in operation not supported
   │         ^^^^^
   │         │
   │         Invalid argument to '<'
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/typing/binary_lt_invalid.move:8:17
@@ -13,7 +13,7 @@ error[E04003]: built-in operation not supported
 8 │         false < true;
   │         -----   ^^^^ Invalid argument to '<'
   │         │        
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
   ┌─ tests/move_check/typing/binary_lt_invalid.move:9:11
@@ -31,7 +31,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^
    │         │
    │         Invalid argument to '<'
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_lt_invalid.move:10:15
@@ -48,7 +48,7 @@ error[E04003]: built-in operation not supported
 10 │         false < 1;
    │         -----   ^ Invalid argument to '<'
    │         │        
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_lt_invalid.move:11:9
@@ -57,7 +57,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^
    │         │
    │         Invalid argument to '<'
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_lt_invalid.move:11:16
@@ -65,7 +65,7 @@ error[E04003]: built-in operation not supported
 11 │         @0x0 < @0x1;
    │         ----   ^^^^ Invalid argument to '<'
    │         │       
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_lt_invalid.move:12:17
@@ -80,7 +80,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_lt_invalid.move:13:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r < r;
    │         ^ Invalid argument to '<'
@@ -89,7 +89,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_lt_invalid.move:13:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r < r;
    │             ^ Invalid argument to '<'
@@ -98,7 +98,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_lt_invalid.move:14:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s < s;
    │         ^ Invalid argument to '<'
@@ -107,7 +107,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_lt_invalid.move:14:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s < s;
    │             ^ Invalid argument to '<'
@@ -119,7 +119,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^
    │         │
    │         Invalid argument to '<'
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_lt_invalid.move:15:15
@@ -136,7 +136,7 @@ error[E04003]: built-in operation not supported
 15 │         0 < 1 < 2;
    │         -----   ^ Invalid argument to '<'
    │         │        
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_lt_invalid.move:16:12
@@ -154,7 +154,7 @@ error[E04003]: built-in operation not supported
    │                         ^^^^
    │                         │
    │                         Invalid argument to '<'
-   │                         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │                         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_lt_invalid.move:16:30
@@ -171,7 +171,7 @@ error[E04003]: built-in operation not supported
 16 │         (1 < false) && (@0x0 < 0);
    │                         ----   ^ Invalid argument to '<'
    │                         │       
-   │                         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │                         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_lt_invalid.move:17:9
@@ -180,7 +180,7 @@ error[E04003]: built-in operation not supported
    │         ^^
    │         │
    │         Invalid argument to '<'
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_lt_invalid.move:17:14
@@ -188,7 +188,7 @@ error[E04003]: built-in operation not supported
 17 │         () < ();
    │         --   ^^ Invalid argument to '<'
    │         │     
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_lt_invalid.move:18:11
@@ -206,7 +206,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '<'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_lt_invalid.move:19:16
@@ -223,7 +223,7 @@ error[E04003]: built-in operation not supported
 19 │         (0, 1) < (0, 1, 2);
    │         ------   ^^^^^^^^^ Invalid argument to '<'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_lt_invalid.move:20:9
@@ -232,7 +232,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '<'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_lt_invalid.move:20:18
@@ -240,5 +240,5 @@ error[E04003]: built-in operation not supported
 20 │         (1, 2) < (0, 1);
    │         ------   ^^^^^^ Invalid argument to '<'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
diff --git a/language/move-compiler/tests/move_check/typing/binary_mod_invalid.exp b/language/move-compiler/tests/move_check/typing/binary_mod_invalid.exp
index b0b2eda8a0..9d69253139 100644
--- a/language/move-compiler/tests/move_check/typing/binary_mod_invalid.exp
+++ b/language/move-compiler/tests/move_check/typing/binary_mod_invalid.exp
@@ -5,7 +5,7 @@ error[E04003]: built-in operation not supported
   │         ^^^^^
   │         │
   │         Invalid argument to '%'
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/typing/binary_mod_invalid.move:8:17
@@ -13,7 +13,7 @@ error[E04003]: built-in operation not supported
 8 │         false % true;
   │         -----   ^^^^ Invalid argument to '%'
   │         │        
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
   ┌─ tests/move_check/typing/binary_mod_invalid.move:9:11
@@ -31,7 +31,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^
    │         │
    │         Invalid argument to '%'
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_mod_invalid.move:10:15
@@ -48,7 +48,7 @@ error[E04003]: built-in operation not supported
 10 │         false % 1;
    │         -----   ^ Invalid argument to '%'
    │         │        
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mod_invalid.move:11:9
@@ -57,7 +57,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^
    │         │
    │         Invalid argument to '%'
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mod_invalid.move:11:16
@@ -65,7 +65,7 @@ error[E04003]: built-in operation not supported
 11 │         @0x0 % @0x1;
    │         ----   ^^^^ Invalid argument to '%'
    │         │       
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_mod_invalid.move:12:17
@@ -80,7 +80,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mod_invalid.move:13:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r % r;
    │         ^ Invalid argument to '%'
@@ -101,7 +101,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mod_invalid.move:13:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r % r;
    │             ^ Invalid argument to '%'
@@ -110,7 +110,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mod_invalid.move:14:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s % s;
    │         ^ Invalid argument to '%'
@@ -119,27 +119,18 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mod_invalid.move:14:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s % s;
    │             ^ Invalid argument to '%'
 
-error[E04003]: built-in operation not supported
-   ┌─ tests/move_check/typing/binary_mod_invalid.move:15:9
-   │
-15 │         1 % false % @0x0 % 0;
-   │         ^^^^^^^^^
-   │         │ │
-   │         │ Found: '_'. But expected: 'u8', 'u64', 'u128'
-   │         Invalid argument to '%'
-
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mod_invalid.move:15:9
    │
 15 │         1 % false % @0x0 % 0;
    │         ^^^^^^^^^^^^^^^^
    │         │           │
-   │         │           Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         │           Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    │         Invalid argument to '%'
 
 error[E04007]: incompatible types
@@ -151,14 +142,6 @@ error[E04007]: incompatible types
    │         │ Incompatible arguments to '%'
    │         Found: integer. It is not compatible with the other type.
 
-error[E04003]: built-in operation not supported
-   ┌─ tests/move_check/typing/binary_mod_invalid.move:15:21
-   │
-15 │         1 % false % @0x0 % 0;
-   │           -         ^^^^ Invalid argument to '%'
-   │           │          
-   │           Found: '_'. But expected: 'u8', 'u64', 'u128'
-
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_mod_invalid.move:15:26
    │
@@ -174,7 +157,7 @@ error[E04003]: built-in operation not supported
 15 │         1 % false % @0x0 % 0;
    │                     ----   ^ Invalid argument to '%'
    │                     │       
-   │                     Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │                     Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mod_invalid.move:16:9
@@ -183,7 +166,7 @@ error[E04003]: built-in operation not supported
    │         ^^
    │         │
    │         Invalid argument to '%'
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mod_invalid.move:16:14
@@ -191,7 +174,7 @@ error[E04003]: built-in operation not supported
 16 │         () % ();
    │         --   ^^ Invalid argument to '%'
    │         │     
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_mod_invalid.move:17:11
@@ -209,7 +192,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '%'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_mod_invalid.move:18:16
@@ -226,7 +209,7 @@ error[E04003]: built-in operation not supported
 18 │         (0, 1) % (0, 1, 2);
    │         ------   ^^^^^^^^^ Invalid argument to '%'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mod_invalid.move:19:9
@@ -235,7 +218,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '%'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mod_invalid.move:19:18
@@ -243,5 +226,5 @@ error[E04003]: built-in operation not supported
 19 │         (1, 2) % (0, 1);
    │         ------   ^^^^^^ Invalid argument to '%'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
diff --git a/language/move-compiler/tests/move_check/typing/binary_mul_invalid.exp b/language/move-compiler/tests/move_check/typing/binary_mul_invalid.exp
index 478aa8d768..d4d378992e 100644
--- a/language/move-compiler/tests/move_check/typing/binary_mul_invalid.exp
+++ b/language/move-compiler/tests/move_check/typing/binary_mul_invalid.exp
@@ -5,7 +5,7 @@ error[E04003]: built-in operation not supported
   │         ^^^^^
   │         │
   │         Invalid argument to '*'
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/typing/binary_mul_invalid.move:8:17
@@ -13,7 +13,7 @@ error[E04003]: built-in operation not supported
 8 │         false * true;
   │         -----   ^^^^ Invalid argument to '*'
   │         │        
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
   ┌─ tests/move_check/typing/binary_mul_invalid.move:9:11
@@ -31,7 +31,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^
    │         │
    │         Invalid argument to '*'
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_mul_invalid.move:10:15
@@ -48,7 +48,7 @@ error[E04003]: built-in operation not supported
 10 │         false * 1;
    │         -----   ^ Invalid argument to '*'
    │         │        
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mul_invalid.move:11:9
@@ -57,7 +57,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^
    │         │
    │         Invalid argument to '*'
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mul_invalid.move:11:16
@@ -65,7 +65,7 @@ error[E04003]: built-in operation not supported
 11 │         @0x0 * @0x1;
    │         ----   ^^^^ Invalid argument to '*'
    │         │       
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_mul_invalid.move:12:17
@@ -80,7 +80,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mul_invalid.move:13:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r * r;
    │         ^ Invalid argument to '*'
@@ -101,7 +101,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mul_invalid.move:13:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r * r;
    │             ^ Invalid argument to '*'
@@ -110,7 +110,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mul_invalid.move:14:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s * s;
    │         ^ Invalid argument to '*'
@@ -119,27 +119,18 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mul_invalid.move:14:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s * s;
    │             ^ Invalid argument to '*'
 
-error[E04003]: built-in operation not supported
-   ┌─ tests/move_check/typing/binary_mul_invalid.move:15:9
-   │
-15 │         1 * false * @0x0 * 0;
-   │         ^^^^^^^^^
-   │         │ │
-   │         │ Found: '_'. But expected: 'u8', 'u64', 'u128'
-   │         Invalid argument to '*'
-
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mul_invalid.move:15:9
    │
 15 │         1 * false * @0x0 * 0;
    │         ^^^^^^^^^^^^^^^^
    │         │           │
-   │         │           Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         │           Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    │         Invalid argument to '*'
 
 error[E04007]: incompatible types
@@ -151,14 +142,6 @@ error[E04007]: incompatible types
    │         │ Incompatible arguments to '*'
    │         Found: integer. It is not compatible with the other type.
 
-error[E04003]: built-in operation not supported
-   ┌─ tests/move_check/typing/binary_mul_invalid.move:15:21
-   │
-15 │         1 * false * @0x0 * 0;
-   │           -         ^^^^ Invalid argument to '*'
-   │           │          
-   │           Found: '_'. But expected: 'u8', 'u64', 'u128'
-
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_mul_invalid.move:15:26
    │
@@ -174,7 +157,7 @@ error[E04003]: built-in operation not supported
 15 │         1 * false * @0x0 * 0;
    │                     ----   ^ Invalid argument to '*'
    │                     │       
-   │                     Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │                     Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mul_invalid.move:16:9
@@ -183,7 +166,7 @@ error[E04003]: built-in operation not supported
    │         ^^
    │         │
    │         Invalid argument to '*'
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mul_invalid.move:16:14
@@ -191,7 +174,7 @@ error[E04003]: built-in operation not supported
 16 │         () * ();
    │         --   ^^ Invalid argument to '*'
    │         │     
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_mul_invalid.move:17:11
@@ -209,7 +192,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '*'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_mul_invalid.move:18:16
@@ -226,7 +209,7 @@ error[E04003]: built-in operation not supported
 18 │         (0, 1) * (0, 1, 2);
    │         ------   ^^^^^^^^^ Invalid argument to '*'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mul_invalid.move:19:9
@@ -235,7 +218,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '*'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_mul_invalid.move:19:18
@@ -243,5 +226,5 @@ error[E04003]: built-in operation not supported
 19 │         (1, 2) * (0, 1);
    │         ------   ^^^^^^ Invalid argument to '*'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
diff --git a/language/move-compiler/tests/move_check/typing/binary_shl_invalid.exp b/language/move-compiler/tests/move_check/typing/binary_shl_invalid.exp
index 6eac896071..18ba091697 100644
--- a/language/move-compiler/tests/move_check/typing/binary_shl_invalid.exp
+++ b/language/move-compiler/tests/move_check/typing/binary_shl_invalid.exp
@@ -5,7 +5,7 @@ error[E04003]: built-in operation not supported
   │         ^^^^^
   │         │
   │         Invalid argument to '<<'
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
   ┌─ tests/move_check/typing/binary_shl_invalid.move:8:18
@@ -34,7 +34,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^
    │         │
    │         Invalid argument to '<<'
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_shl_invalid.move:11:9
@@ -43,7 +43,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^
    │         │
    │         Invalid argument to '<<'
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_shl_invalid.move:11:17
@@ -69,7 +69,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_shl_invalid.move:13:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r << r;
    │         ^ Invalid argument to '<<'
@@ -102,7 +102,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_shl_invalid.move:14:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s << s;
    │         ^ Invalid argument to '<<'
@@ -146,7 +146,7 @@ error[E04003]: built-in operation not supported
    │         ^^
    │         │
    │         Invalid argument to '<<'
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_shl_invalid.move:16:15
@@ -175,7 +175,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '<<'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_shl_invalid.move:18:19
@@ -194,7 +194,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '<<'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_shl_invalid.move:19:19
diff --git a/language/move-compiler/tests/move_check/typing/binary_shr_invalid.exp b/language/move-compiler/tests/move_check/typing/binary_shr_invalid.exp
index 27f5f90bb6..326fbc2fa2 100644
--- a/language/move-compiler/tests/move_check/typing/binary_shr_invalid.exp
+++ b/language/move-compiler/tests/move_check/typing/binary_shr_invalid.exp
@@ -5,7 +5,7 @@ error[E04003]: built-in operation not supported
   │         ^^^^^
   │         │
   │         Invalid argument to '>>'
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
   ┌─ tests/move_check/typing/binary_shr_invalid.move:8:18
@@ -34,7 +34,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^
    │         │
    │         Invalid argument to '>>'
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_shr_invalid.move:11:9
@@ -43,7 +43,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^
    │         │
    │         Invalid argument to '>>'
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_shr_invalid.move:11:17
@@ -69,7 +69,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_shr_invalid.move:13:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r >> r;
    │         ^ Invalid argument to '>>'
@@ -102,7 +102,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_shr_invalid.move:14:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s >> s;
    │         ^ Invalid argument to '>>'
@@ -146,7 +146,7 @@ error[E04003]: built-in operation not supported
    │         ^^
    │         │
    │         Invalid argument to '>>'
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_shr_invalid.move:16:15
@@ -175,7 +175,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '>>'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_shr_invalid.move:18:19
@@ -194,7 +194,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '>>'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_shr_invalid.move:19:19
diff --git a/language/move-compiler/tests/move_check/typing/binary_sub_invalid.exp b/language/move-compiler/tests/move_check/typing/binary_sub_invalid.exp
index 5a638109b6..cd7f1c2c95 100644
--- a/language/move-compiler/tests/move_check/typing/binary_sub_invalid.exp
+++ b/language/move-compiler/tests/move_check/typing/binary_sub_invalid.exp
@@ -5,7 +5,7 @@ error[E04003]: built-in operation not supported
   │         ^^^^^
   │         │
   │         Invalid argument to '-'
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/typing/binary_sub_invalid.move:8:17
@@ -13,7 +13,7 @@ error[E04003]: built-in operation not supported
 8 │         false - true;
   │         -----   ^^^^ Invalid argument to '-'
   │         │        
-  │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
   ┌─ tests/move_check/typing/binary_sub_invalid.move:9:11
@@ -31,7 +31,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^
    │         │
    │         Invalid argument to '-'
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_sub_invalid.move:10:15
@@ -48,7 +48,7 @@ error[E04003]: built-in operation not supported
 10 │         false - 1;
    │         -----   ^ Invalid argument to '-'
    │         │        
-   │         Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_sub_invalid.move:11:9
@@ -57,7 +57,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^
    │         │
    │         Invalid argument to '-'
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_sub_invalid.move:11:16
@@ -65,7 +65,7 @@ error[E04003]: built-in operation not supported
 11 │         @0x0 - @0x1;
    │         ----   ^^^^ Invalid argument to '-'
    │         │       
-   │         Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_sub_invalid.move:12:17
@@ -80,7 +80,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_sub_invalid.move:13:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r - r;
    │         ^ Invalid argument to '-'
@@ -101,7 +101,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_sub_invalid.move:13:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                       - Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 13 │         r - r;
    │             ^ Invalid argument to '-'
@@ -110,7 +110,7 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_sub_invalid.move:14:9
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s - s;
    │         ^ Invalid argument to '-'
@@ -119,27 +119,18 @@ error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_sub_invalid.move:14:13
    │
  7 │     fun t0(x: u64, r: R, s: S) {
-   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u64', 'u128'
+   │                             - Found: '0x8675309::M::S'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    ·
 14 │         s - s;
    │             ^ Invalid argument to '-'
 
-error[E04003]: built-in operation not supported
-   ┌─ tests/move_check/typing/binary_sub_invalid.move:15:9
-   │
-15 │         1 - false - @0x0 - 0;
-   │         ^^^^^^^^^
-   │         │ │
-   │         │ Found: '_'. But expected: 'u8', 'u64', 'u128'
-   │         Invalid argument to '-'
-
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_sub_invalid.move:15:9
    │
 15 │         1 - false - @0x0 - 0;
    │         ^^^^^^^^^^^^^^^^
    │         │           │
-   │         │           Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │         │           Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
    │         Invalid argument to '-'
 
 error[E04007]: incompatible types
@@ -151,14 +142,6 @@ error[E04007]: incompatible types
    │         │ Incompatible arguments to '-'
    │         Found: integer. It is not compatible with the other type.
 
-error[E04003]: built-in operation not supported
-   ┌─ tests/move_check/typing/binary_sub_invalid.move:15:21
-   │
-15 │         1 - false - @0x0 - 0;
-   │           -         ^^^^ Invalid argument to '-'
-   │           │          
-   │           Found: '_'. But expected: 'u8', 'u64', 'u128'
-
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_sub_invalid.move:15:26
    │
@@ -174,7 +157,7 @@ error[E04003]: built-in operation not supported
 15 │         1 - false - @0x0 - 0;
    │                     ----   ^ Invalid argument to '-'
    │                     │       
-   │                     Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │                     Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_sub_invalid.move:16:9
@@ -183,7 +166,7 @@ error[E04003]: built-in operation not supported
    │         ^^
    │         │
    │         Invalid argument to '-'
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_sub_invalid.move:16:14
@@ -191,7 +174,7 @@ error[E04003]: built-in operation not supported
 16 │         () - ();
    │         --   ^^ Invalid argument to '-'
    │         │     
-   │         Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_sub_invalid.move:17:11
@@ -209,7 +192,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '-'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04007]: incompatible types
    ┌─ tests/move_check/typing/binary_sub_invalid.move:18:16
@@ -226,7 +209,7 @@ error[E04003]: built-in operation not supported
 18 │         (0, 1) - (0, 1, 2);
    │         ------   ^^^^^^^^^ Invalid argument to '-'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_sub_invalid.move:19:9
@@ -235,7 +218,7 @@ error[E04003]: built-in operation not supported
    │         ^^^^^^
    │         │
    │         Invalid argument to '-'
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/binary_sub_invalid.move:19:18
@@ -243,5 +226,5 @@ error[E04003]: built-in operation not supported
 19 │         (1, 2) - (0, 1);
    │         ------   ^^^^^^ Invalid argument to '-'
    │         │         
-   │         Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │         Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
diff --git a/language/move-compiler/tests/move_check/typing/cast_invalid.exp b/language/move-compiler/tests/move_check/typing/cast_invalid.exp
index e588451610..ddede58f84 100644
--- a/language/move-compiler/tests/move_check/typing/cast_invalid.exp
+++ b/language/move-compiler/tests/move_check/typing/cast_invalid.exp
@@ -5,7 +5,7 @@ error[E04003]: built-in operation not supported
   │          ^^^^^
   │          │
   │          Invalid argument to 'as'
-  │          Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │          Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/typing/cast_invalid.move:7:10
@@ -14,7 +14,7 @@ error[E04003]: built-in operation not supported
   │          ^^^^
   │          │
   │          Invalid argument to 'as'
-  │          Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+  │          Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
   ┌─ tests/move_check/typing/cast_invalid.move:9:10
@@ -23,7 +23,7 @@ error[E04003]: built-in operation not supported
   │          ^^
   │          │
   │          Invalid argument to 'as'
-  │          Found: '()'. But expected: 'u8', 'u64', 'u128'
+  │          Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/cast_invalid.move:10:10
@@ -32,7 +32,7 @@ error[E04003]: built-in operation not supported
    │          ^^^^^^
    │          │
    │          Invalid argument to 'as'
-   │          Found: '(u64, u64)'. But expected: 'u8', 'u64', 'u128'
+   │          Found: '(u64, u64)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/cast_invalid.move:12:15
@@ -41,7 +41,7 @@ error[E04003]: built-in operation not supported
    │               ^^^^
    │               │
    │               Invalid argument to 'as'
-   │               Found: 'bool'. But expected: 'u8', 'u64', 'u128'
+   │               Found: 'bool'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/cast_invalid.move:13:15
@@ -50,7 +50,7 @@ error[E04003]: built-in operation not supported
    │               ^^^^^^^
    │               │
    │               Invalid argument to 'as'
-   │               Found: 'address'. But expected: 'u8', 'u64', 'u128'
+   │               Found: 'address'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/cast_invalid.move:14:21
@@ -59,7 +59,7 @@ error[E04003]: built-in operation not supported
    │                     ^
    │                     │
    │                     Invalid argument to 'as'
-   │                     Found: '0x8675309::M::R'. But expected: 'u8', 'u64', 'u128'
+   │                     Found: '0x8675309::M::R'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/cast_invalid.move:15:15
@@ -68,7 +68,7 @@ error[E04003]: built-in operation not supported
    │               ^^^^^^^
    │               │
    │               Invalid argument to 'as'
-   │               Found: '0x8675309::M::Cup<u8>'. But expected: 'u8', 'u64', 'u128'
+   │               Found: '0x8675309::M::Cup<u8>'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/cast_invalid.move:16:15
@@ -77,7 +77,7 @@ error[E04003]: built-in operation not supported
    │               ^^
    │               │
    │               Invalid argument to 'as'
-   │               Found: '()'. But expected: 'u8', 'u64', 'u128'
+   │               Found: '()'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/cast_invalid.move:17:15
@@ -86,7 +86,7 @@ error[E04003]: built-in operation not supported
    │               ^^^^^^^^^
    │               │
    │               Invalid argument to 'as'
-   │               Found: '(u64, u8)'. But expected: 'u8', 'u64', 'u128'
+   │               Found: '(u64, u8)'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
 error[E04003]: built-in operation not supported
    ┌─ tests/move_check/typing/cast_invalid.move:19:3
@@ -95,5 +95,5 @@ error[E04003]: built-in operation not supported
    │      ^^^^^^^
    │      │
    │      Invalid argument to 'as'
-   │      Found: 'vector<u8>'. But expected: 'u8', 'u64', 'u128'
+   │      Found: 'vector<u8>'. But expected: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'
 
diff --git a/language/move-compiler/tests/move_check/typing/constant_invalid_base_type.exp b/language/move-compiler/tests/move_check/typing/constant_invalid_base_type.exp
index 8baae85764..399e471cd6 100644
--- a/language/move-compiler/tests/move_check/typing/constant_invalid_base_type.exp
+++ b/language/move-compiler/tests/move_check/typing/constant_invalid_base_type.exp
@@ -5,7 +5,7 @@ error[E04012]: invalid type for constant
   │               ^^^^^^
   │               │
   │               Unpermitted constant type
-  │               Found: 'signer'. But expected one of: 'u8', 'u64', 'u128', 'bool', 'address', 'vector<_>'
+  │               Found: 'signer'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
 
 error[E04013]: invalid statement or expression in constant
   ┌─ tests/move_check/typing/constant_invalid_base_type.move:6:24
@@ -20,7 +20,7 @@ error[E04012]: invalid type for constant
   │               ^
   │               │
   │               Unpermitted constant type
-  │               Found: '0x42::M::S'. But expected one of: 'u8', 'u64', 'u128', 'bool', 'address', 'vector<_>'
+  │               Found: '0x42::M::S'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
 
 error[E04013]: invalid statement or expression in constant
   ┌─ tests/move_check/typing/constant_invalid_base_type.move:7:19
@@ -35,7 +35,7 @@ error[E04012]: invalid type for constant
   │               ^
   │               │
   │               Unpermitted constant type
-  │               Found: '0x42::M::R'. But expected one of: 'u8', 'u64', 'u128', 'bool', 'address', 'vector<_>'
+  │               Found: '0x42::M::R'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
 
 error[E04013]: invalid statement or expression in constant
   ┌─ tests/move_check/typing/constant_invalid_base_type.move:8:19
@@ -49,7 +49,7 @@ error[E04012]: invalid type for constant
 9 │     const C4: vector<S> = abort 0;
   │               ^^^^^^^^^
   │               │      │
-  │               │      Found: '0x42::M::S'. But expected one of: 'u8', 'u64', 'u128', 'bool', 'address', 'vector<_>'
+  │               │      Found: '0x42::M::S'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
   │               Unpermitted constant type
 
 error[E04013]: invalid statement or expression in constant
@@ -64,7 +64,7 @@ error[E04012]: invalid type for constant
 10 │     const C5: vector<R> = abort 0;
    │               ^^^^^^^^^
    │               │      │
-   │               │      Found: '0x42::M::R'. But expected one of: 'u8', 'u64', 'u128', 'bool', 'address', 'vector<_>'
+   │               │      Found: '0x42::M::R'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
    │               Unpermitted constant type
 
 error[E04013]: invalid statement or expression in constant
@@ -79,7 +79,7 @@ error[E04012]: invalid type for constant
 11 │     const C6: vector<vector<S>> = abort 0;
    │               ^^^^^^^^^^^^^^^^^
    │               │             │
-   │               │             Found: '0x42::M::S'. But expected one of: 'u8', 'u64', 'u128', 'bool', 'address', 'vector<_>'
+   │               │             Found: '0x42::M::S'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
    │               Unpermitted constant type
 
 error[E04013]: invalid statement or expression in constant
@@ -94,7 +94,7 @@ error[E04012]: invalid type for constant
 12 │     const C7: vector<vector<R>> = abort 0;
    │               ^^^^^^^^^^^^^^^^^
    │               │             │
-   │               │             Found: '0x42::M::R'. But expected one of: 'u8', 'u64', 'u128', 'bool', 'address', 'vector<_>'
+   │               │             Found: '0x42::M::R'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
    │               Unpermitted constant type
 
 error[E04013]: invalid statement or expression in constant
diff --git a/language/move-compiler/tests/move_check/typing/constant_non_base_type.exp b/language/move-compiler/tests/move_check/typing/constant_non_base_type.exp
index ddae69f551..dbc957ec77 100644
--- a/language/move-compiler/tests/move_check/typing/constant_non_base_type.exp
+++ b/language/move-compiler/tests/move_check/typing/constant_non_base_type.exp
@@ -5,7 +5,7 @@ error[E04012]: invalid type for constant
   │               ^^^^
   │               │
   │               Unpermitted constant type
-  │               Found: '&u64'. But expected one of: 'u8', 'u64', 'u128', 'bool', 'address', 'vector<_>'
+  │               Found: '&u64'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
 
 error[E04013]: invalid statement or expression in constant
   ┌─ tests/move_check/typing/constant_non_base_type.move:3:22
@@ -20,7 +20,7 @@ error[E04012]: invalid type for constant
   │               ^^^^^^^^
   │               │
   │               Unpermitted constant type
-  │               Found: '&mut u64'. But expected one of: 'u8', 'u64', 'u128', 'bool', 'address', 'vector<_>'
+  │               Found: '&mut u64'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
 
 error[E04006]: invalid subtype
   ┌─ tests/move_check/typing/constant_non_base_type.move:4:15
@@ -44,7 +44,7 @@ error[E04012]: invalid type for constant
   │               ^^
   │               │
   │               Unpermitted constant type
-  │               Found: '()'. But expected one of: 'u8', 'u64', 'u128', 'bool', 'address', 'vector<_>'
+  │               Found: '()'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
 
 error[E04012]: invalid type for constant
   ┌─ tests/move_check/typing/constant_non_base_type.move:6:15
@@ -53,5 +53,5 @@ error[E04012]: invalid type for constant
   │               ^^^^^^^^^^^^^^^
   │               │
   │               Unpermitted constant type
-  │               Found: '(_, _)'. But expected one of: 'u8', 'u64', 'u128', 'bool', 'address', 'vector<_>'
+  │               Found: '(_, _)'. But expected one of: 'u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'address', 'vector<_>'
 
diff --git a/language/move-compiler/tests/move_check/typing/number_literal_too_large.exp b/language/move-compiler/tests/move_check/typing/number_literal_too_large.exp
index 0450d4711a..1a676a9b12 100644
--- a/language/move-compiler/tests/move_check/typing/number_literal_too_large.exp
+++ b/language/move-compiler/tests/move_check/typing/number_literal_too_large.exp
@@ -60,5 +60,33 @@ error[E04021]: invalid number after type inference
    │          ^^^  -- Expected a literal of type 'u8', but the value is too large.
    │          │     
    │          Invalid numerical literal
-   │          Annotating the literal might help inference: '256u64'
+   │          Annotating the literal might help inference: '256u16'
+
+error[E04021]: invalid number after type inference
+   ┌─ tests/move_check/typing/number_literal_too_large.move:19:10
+   │
+19 │         (3402534025: u16);
+   │          ^^^^^^^^^^  --- Expected a literal of type 'u16', but the value is too large.
+   │          │            
+   │          Invalid numerical literal
+   │          Annotating the literal might help inference: '3402534025u32'
+
+error[E04021]: invalid number after type inference
+   ┌─ tests/move_check/typing/number_literal_too_large.move:22:10
+   │
+22 │         (3402534025534025: u32);
+   │          ^^^^^^^^^^^^^^^^  --- Expected a literal of type 'u32', but the value is too large.
+   │          │                  
+   │          Invalid numerical literal
+   │          Annotating the literal might help inference: '3402534025534025u64'
+
+error[E04021]: invalid number after type inference
+   ┌─ tests/move_check/typing/number_literal_too_large.move:24:9
+   │
+24 │         340282366920938463463374607431768211455607431768211455;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │         │
+   │         Invalid numerical literal
+   │         Annotating the literal might help inference: '340282366920938463463374607431768211455607431768211455u256'
+   │         Expected a literal of type 'u64', but the value is too large.
 
diff --git a/language/move-compiler/tests/move_check/typing/number_literal_too_large.move b/language/move-compiler/tests/move_check/typing/number_literal_too_large.move
index 5dea14adfb..cad6ab85c6 100644
--- a/language/move-compiler/tests/move_check/typing/number_literal_too_large.move
+++ b/language/move-compiler/tests/move_check/typing/number_literal_too_large.move
@@ -11,5 +11,16 @@ module 0x8675309::M {
         (18446744073709551615: u8);
 
         (256: u8);
+
+        34025;
+        (34025: u16);
+
+        3402534025;
+        (3402534025: u16);
+
+        3402534025534025;
+        (3402534025534025: u32);
+
+        340282366920938463463374607431768211455607431768211455;
     }
 }
diff --git a/language/move-compiler/tests/move_check/typing/pack_private_with_field.exp b/language/move-compiler/tests/move_check/typing/pack_private_with_field.exp
new file mode 100644
index 0000000000..abfe6082a2
--- /dev/null
+++ b/language/move-compiler/tests/move_check/typing/pack_private_with_field.exp
@@ -0,0 +1,13 @@
+error[E04001]: restricted visibility
+   ┌─ tests/move_check/typing/pack_private_with_field.move:19:11
+   │  
+19 │     let s = S {
+   │ ╭───────────^
+20 │ │     f1: 0,
+21 │ │     f4: 0,
+22 │ │     f2: 0,
+23 │ │     f3: 0,
+24 │ │   };
+   │ ╰───^ Invalid instantiation of '0x42::m::S'.
+All structs can only be constructed in the module in which they are declared
+
diff --git a/language/move-compiler/tests/move_check/typing/pack_private_with_field.move b/language/move-compiler/tests/move_check/typing/pack_private_with_field.move
new file mode 100644
index 0000000000..fb46af0a1b
--- /dev/null
+++ b/language/move-compiler/tests/move_check/typing/pack_private_with_field.move
@@ -0,0 +1,28 @@
+module 0x42::m {
+
+struct S {
+    f1: u64,
+    f2: u64,
+    f3: u64,
+    f4: u64,
+}
+
+public fun consume(_: S) { abort 0 }
+
+}
+
+module 0x42::n {
+
+use 0x42::m::S;
+
+fun f() {
+  let s = S {
+    f1: 0,
+    f4: 0,
+    f2: 0,
+    f3: 0,
+  };
+  0x42::m::consume(s);
+}
+
+}
diff --git a/language/move-compiler/tests/move_check/typing/phantom_param_struct_decl_invalid.exp b/language/move-compiler/tests/move_check/typing/phantom_param_struct_decl_invalid.exp
index 6faa447b2c..ac8f85e668 100644
--- a/language/move-compiler/tests/move_check/typing/phantom_param_struct_decl_invalid.exp
+++ b/language/move-compiler/tests/move_check/typing/phantom_param_struct_decl_invalid.exp
@@ -41,3 +41,16 @@ error[E02013]: invalid phantom type parameter usage
 23 │         b: T2,
    │            ^^ Phantom type parameter cannot be used as a field type
 
+error[E05001]: ability constraint not satisfied
+   ┌─ tests/move_check/typing/phantom_param_struct_decl_invalid.move:30:12
+   │
+28 │     struct S6<phantom T: copy> { a: bool }
+   │                          ---- 'copy' constraint declared here
+29 │     struct S7<phantom T> {
+   │                       - To satisfy the constraint, the 'copy' ability would need to be added here
+30 │         a: S6<T>
+   │            ^^^^^
+   │            │  │
+   │            │  The type 'T' does not have the ability 'copy'
+   │            'copy' constraint not satisifed
+
diff --git a/language/move-compiler/tests/move_check/unit_test/attribute_location.move b/language/move-compiler/tests/move_check/unit_test/attribute_location.move
index 4652c3f640..2ece812bb8 100644
--- a/language/move-compiler/tests/move_check/unit_test/attribute_location.move
+++ b/language/move-compiler/tests/move_check/unit_test/attribute_location.move
@@ -28,6 +28,6 @@ module 0x42::N {
 
 module 0x42::Z {
     #[test]
-    #[expected_failure(abort_code = 0)]
+    #[expected_failure(abort_code = 0, location = 0x42::Z )]
     fun foo() { abort 0 }
 }
diff --git a/language/move-compiler/tests/move_check/unit_test/expected_failure_bad_value.unit_test.exp b/language/move-compiler/tests/move_check/unit_test/expected_failure_bad_value.unit_test.exp
index 558b9ab2de..aa00a53a2e 100644
--- a/language/move-compiler/tests/move_check/unit_test/expected_failure_bad_value.unit_test.exp
+++ b/language/move-compiler/tests/move_check/unit_test/expected_failure_bad_value.unit_test.exp
@@ -1,45 +1,45 @@
 error[E10003]: invalid attribute value
-  ┌─ tests/move_check/unit_test/expected_failure_bad_value.move:7:35
+  ┌─ tests/move_check/unit_test/expected_failure_bad_value.move:7:24
   │
 7 │     #[expected_failure(abort_code=true)]
-  │                        -----------^^^^
+  │                        ^^^^^^^^^^^^^^^
   │                        │          │
-  │                        │          Invalid value in expected failure code assignment
-  │                        Unsupported value in this assignment
+  │                        │          Unsupported value in this assignment
+  │                        Invalid value in attribute assignment
 
 error[E10003]: invalid attribute value
-   ┌─ tests/move_check/unit_test/expected_failure_bad_value.move:11:35
+   ┌─ tests/move_check/unit_test/expected_failure_bad_value.move:11:24
    │
 11 │     #[expected_failure(abort_code=x"")]
-   │                        -----------^^^
+   │                        ^^^^^^^^^^^^^^
    │                        │          │
-   │                        │          Invalid value in expected failure code assignment
-   │                        Unsupported value in this assignment
+   │                        │          Unsupported value in this assignment
+   │                        Invalid value in attribute assignment
 
 error[E10003]: invalid attribute value
-   ┌─ tests/move_check/unit_test/expected_failure_bad_value.move:15:35
+   ┌─ tests/move_check/unit_test/expected_failure_bad_value.move:15:24
    │
 15 │     #[expected_failure(abort_code=b"")]
-   │                        -----------^^^
+   │                        ^^^^^^^^^^^^^^
    │                        │          │
-   │                        │          Invalid value in expected failure code assignment
-   │                        Unsupported value in this assignment
+   │                        │          Unsupported value in this assignment
+   │                        Invalid value in attribute assignment
 
 error[E10003]: invalid attribute value
    ┌─ tests/move_check/unit_test/expected_failure_bad_value.move:19:35
    │
+ 2 │ module 0x1::A {
+   │             - Unbound constant 'Foo' in module '0x1::A'
+   ·
 19 │     #[expected_failure(abort_code=Foo)]
-   │                        -----------^^^
-   │                        │          │
-   │                        │          Invalid value in expected failure code assignment
-   │                        Unsupported value in this assignment
+   │                                   ^^^ Invalid value in attribute assignment
 
 error[E10003]: invalid attribute value
-   ┌─ tests/move_check/unit_test/expected_failure_bad_value.move:23:35
+   ┌─ tests/move_check/unit_test/expected_failure_bad_value.move:23:24
    │
 23 │     #[expected_failure(abort_code=@0xC0FFEE)]
-   │                        -----------^^^^^^^^^
+   │                        ^^^^^^^^^^^^^^^^^^^^
    │                        │          │
-   │                        │          Invalid value in expected failure code assignment
-   │                        Unsupported value in this assignment
+   │                        │          Unsupported value in this assignment
+   │                        Invalid value in attribute assignment
 
diff --git a/language/move-compiler/tests/move_check/unit_test/expected_failure_constants.move b/language/move-compiler/tests/move_check/unit_test/expected_failure_constants.move
new file mode 100644
index 0000000000..3ecbcdeddb
--- /dev/null
+++ b/language/move-compiler/tests/move_check/unit_test/expected_failure_constants.move
@@ -0,0 +1,33 @@
+module 0x2::m {
+    const C: u64 = 0 + 1 + 2;
+}
+
+// check that constants can be used
+module 0x1::A {
+    #[test_only]
+    use 0x2::m as x;
+
+    const C0: u64 = 0;
+    #[test_only]
+    const C1: u64 = 0;
+
+    #[test]
+    #[expected_failure(abort_code=C0)]
+    fun use_c0() { }
+
+    #[test]
+    #[expected_failure(abort_code=C1)]
+    fun use_c1() { }
+
+    #[test]
+    #[expected_failure(abort_code=x::C)]
+    fun use_through_alias() { }
+
+    #[test]
+    #[expected_failure(abort_code=0x1::A::C0)]
+    fun use_explicit_internal() { }
+
+    #[test]
+    #[expected_failure(abort_code=0x2::m::C)]
+    fun use_explicit_external() { }
+}
diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.compile b/language/move-compiler/tests/move_check/unit_test/expected_failure_constants.unit_test
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.compile
rename to language/move-compiler/tests/move_check/unit_test/expected_failure_constants.unit_test
diff --git a/language/move-compiler/tests/move_check/unit_test/expected_failure_constants_invalid.move b/language/move-compiler/tests/move_check/unit_test/expected_failure_constants_invalid.move
new file mode 100644
index 0000000000..60c3aac522
--- /dev/null
+++ b/language/move-compiler/tests/move_check/unit_test/expected_failure_constants_invalid.move
@@ -0,0 +1,19 @@
+module 0x2::m {
+    const C: u8 = 0 + 1 + 2;
+}
+
+// check invalid constant usage
+module 0x1::A {
+
+    #[test]
+    #[expected_failure(abort_code=0x2::m::C)]
+    fun not_u64() { }
+
+    #[test]
+    #[expected_failure(abort_code=0x2::x::C)]
+    fun unbound_module() { }
+
+    #[test]
+    #[expected_failure(abort_code=0x1::A::C0)]
+    fun unbound_constant() { }
+}
diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.compile b/language/move-compiler/tests/move_check/unit_test/expected_failure_constants_invalid.unit_test
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.compile
rename to language/move-compiler/tests/move_check/unit_test/expected_failure_constants_invalid.unit_test
diff --git a/language/move-compiler/tests/move_check/unit_test/expected_failure_constants_invalid.unit_test.exp b/language/move-compiler/tests/move_check/unit_test/expected_failure_constants_invalid.unit_test.exp
new file mode 100644
index 0000000000..c4d55c45eb
--- /dev/null
+++ b/language/move-compiler/tests/move_check/unit_test/expected_failure_constants_invalid.unit_test.exp
@@ -0,0 +1,27 @@
+error[E10003]: invalid attribute value
+  ┌─ tests/move_check/unit_test/expected_failure_constants_invalid.move:9:35
+  │
+2 │     const C: u8 = 0 + 1 + 2;
+  │     ------------------------ Constant '0x2::m::C' has a non-u64 value. Only 'u64' values are permitted
+  ·
+9 │     #[expected_failure(abort_code=0x2::m::C)]
+  │                                   ^^^^^^^^^ Invalid value in attribute assignment
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/expected_failure_constants_invalid.move:13:35
+   │
+13 │     #[expected_failure(abort_code=0x2::x::C)]
+   │                                   ^^^^^^^^^
+   │                                   │
+   │                                   Invalid value in attribute assignment
+   │                                   Unbound module '0x2::x'
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/expected_failure_constants_invalid.move:17:35
+   │
+17 │     #[expected_failure(abort_code=0x1::A::C0)]
+   │                                   ^^^^^^^^^^
+   │                                   │
+   │                                   Invalid value in attribute assignment
+   │                                   Unbound constant 'C0' in module '0x1::A'
+
diff --git a/language/move-compiler/tests/move_check/unit_test/expected_failure_invalid_literals.move b/language/move-compiler/tests/move_check/unit_test/expected_failure_invalid_literals.move
index e8855bb204..511dd24586 100644
--- a/language/move-compiler/tests/move_check/unit_test/expected_failure_invalid_literals.move
+++ b/language/move-compiler/tests/move_check/unit_test/expected_failure_invalid_literals.move
@@ -3,19 +3,19 @@
 address 0x1 {
 module M {
     #[test]
-    #[expected_failure(abort_code=0)]
+    #[expected_failure(abort_code=0, location=0x1::M)]
     fun ok1() { }
 
     #[test]
-    #[expected_failure(abort_code=0u64)]
+    #[expected_failure(abort_code=0u64, location=0x1::M)]
     fun ok2() { }
 
     #[test]
-    #[expected_failure(abort_code=0u8)]
+    #[expected_failure(abort_code=0u8, location=0x1::M)]
     fun fail_annot1() { }
 
     #[test]
-    #[expected_failure(abort_code=0u128)]
+    #[expected_failure(abort_code=0u128, location=0x1::M)]
     fun fail_annot3() { }
 }
 }
diff --git a/language/move-compiler/tests/move_check/unit_test/expected_failure_invalid_literals.unit_test.exp b/language/move-compiler/tests/move_check/unit_test/expected_failure_invalid_literals.unit_test.exp
index 8a6090bb7b..be8293fc8b 100644
--- a/language/move-compiler/tests/move_check/unit_test/expected_failure_invalid_literals.unit_test.exp
+++ b/language/move-compiler/tests/move_check/unit_test/expected_failure_invalid_literals.unit_test.exp
@@ -1,18 +1,18 @@
 error[E10003]: invalid attribute value
    ┌─ tests/move_check/unit_test/expected_failure_invalid_literals.move:14:24
    │
-14 │     #[expected_failure(abort_code=0u8)]
+14 │     #[expected_failure(abort_code=0u8, location=0x1::M)]
    │                        ^^^^^^^^^^^^^^
    │                        │          │
    │                        │          Annotated non-u64 literals are not permitted
-   │                        Invalid value in expected failure code assignment
+   │                        Invalid value in attribute assignment
 
 error[E10003]: invalid attribute value
    ┌─ tests/move_check/unit_test/expected_failure_invalid_literals.move:18:24
    │
-18 │     #[expected_failure(abort_code=0u128)]
+18 │     #[expected_failure(abort_code=0u128, location=0x1::M)]
    │                        ^^^^^^^^^^^^^^^^
    │                        │          │
    │                        │          Annotated non-u64 literals are not permitted
-   │                        Invalid value in expected failure code assignment
+   │                        Invalid value in attribute assignment
 
diff --git a/language/move-compiler/tests/move_check/unit_test/expected_failure_out_of_range_value.unit_test.exp b/language/move-compiler/tests/move_check/unit_test/expected_failure_out_of_range_value.unit_test.exp
index 6c58bd5c05..1d04558851 100644
--- a/language/move-compiler/tests/move_check/unit_test/expected_failure_out_of_range_value.unit_test.exp
+++ b/language/move-compiler/tests/move_check/unit_test/expected_failure_out_of_range_value.unit_test.exp
@@ -1,9 +1,25 @@
+warning[W10007]: potential issue with attribute value
+  ┌─ tests/move_check/unit_test/expected_failure_out_of_range_value.move:6:24
+  │
+6 │     #[expected_failure(abort_code=18446744073709551614)]
+  │                        ^^^^^^^^^^ -------------------- Replace value with constant from expected module or add `location=...` attribute.
+  │                        │           
+  │                        WARNING: passes for an abort from any module.
+
+warning[W10007]: potential issue with attribute value
+   ┌─ tests/move_check/unit_test/expected_failure_out_of_range_value.move:11:24
+   │
+11 │     #[expected_failure(abort_code=18446744073709551615)]
+   │                        ^^^^^^^^^^ -------------------- Replace value with constant from expected module or add `location=...` attribute.
+   │                        │           
+   │                        WARNING: passes for an abort from any module.
+
 error[E10003]: invalid attribute value
-   ┌─ tests/move_check/unit_test/expected_failure_out_of_range_value.move:16:35
+   ┌─ tests/move_check/unit_test/expected_failure_out_of_range_value.move:16:24
    │
 16 │     #[expected_failure(abort_code=18446744073709551616)]
-   │                        -----------^^^^^^^^^^^^^^^^^^^^
+   │                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    │                        │          │
-   │                        │          Invalid value in expected failure code assignment
-   │                        Unsupported value in this assignment
+   │                        │          Unsupported value in this assignment
+   │                        Invalid value in attribute assignment
 
diff --git a/language/move-compiler/tests/move_check/unit_test/extra_attributes.move b/language/move-compiler/tests/move_check/unit_test/extra_attributes.move
new file mode 100644
index 0000000000..33bf5eda30
--- /dev/null
+++ b/language/move-compiler/tests/move_check/unit_test/extra_attributes.move
@@ -0,0 +1,27 @@
+// tests non-abort related execution failures
+module 0x1::n {}
+module 0x1::m {
+    #[test_only]
+    use 0x1::n;
+
+    #[test]
+    #[expected_failure(vector_error, location=std::vector, hello=0)]
+    fun t0() { }
+
+    #[test]
+    #[expected_failure(arithmetic_error, location=n, wowza)]
+    fun t1() { }
+
+    #[test]
+    #[expected_failure(out_of_gas, location=Self, so_many_attrs)]
+    fun t2() { }
+
+    #[test]
+    #[expected_failure(major_status=4004, an_attr_here_is_unused, location=Self)]
+    fun t3() { }
+
+    #[test]
+    #[expected_failure(major_status=4016, minor_code=0, location=Self)]
+    fun t4() { }
+
+}
diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.compile b/language/move-compiler/tests/move_check/unit_test/extra_attributes.unit_test
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.compile
rename to language/move-compiler/tests/move_check/unit_test/extra_attributes.unit_test
diff --git a/language/move-compiler/tests/move_check/unit_test/extra_attributes.unit_test.exp b/language/move-compiler/tests/move_check/unit_test/extra_attributes.unit_test.exp
new file mode 100644
index 0000000000..70f6d4bad2
--- /dev/null
+++ b/language/move-compiler/tests/move_check/unit_test/extra_attributes.unit_test.exp
@@ -0,0 +1,30 @@
+warning[W09007]: unused attribute
+  ┌─ tests/move_check/unit_test/extra_attributes.move:8:60
+  │
+8 │     #[expected_failure(vector_error, location=std::vector, hello=0)]
+  │                                                            ^^^^^ Unused attribute for expected_failure
+
+warning[W09007]: unused attribute
+   ┌─ tests/move_check/unit_test/extra_attributes.move:12:54
+   │
+12 │     #[expected_failure(arithmetic_error, location=n, wowza)]
+   │                                                      ^^^^^ Unused attribute for expected_failure
+
+warning[W09007]: unused attribute
+   ┌─ tests/move_check/unit_test/extra_attributes.move:16:51
+   │
+16 │     #[expected_failure(out_of_gas, location=Self, so_many_attrs)]
+   │                                                   ^^^^^^^^^^^^^ Unused attribute for expected_failure
+
+warning[W09007]: unused attribute
+   ┌─ tests/move_check/unit_test/extra_attributes.move:20:43
+   │
+20 │     #[expected_failure(major_status=4004, an_attr_here_is_unused, location=Self)]
+   │                                           ^^^^^^^^^^^^^^^^^^^^^^ Unused attribute for expected_failure
+
+warning[W09007]: unused attribute
+   ┌─ tests/move_check/unit_test/extra_attributes.move:24:43
+   │
+24 │     #[expected_failure(major_status=4016, minor_code=0, location=Self)]
+   │                                           ^^^^^^^^^^ Unused attribute for expected_failure
+
diff --git a/language/move-compiler/tests/move_check/unit_test/invalid_expected_code_name.unit_test.exp b/language/move-compiler/tests/move_check/unit_test/invalid_expected_code_name.unit_test.exp
index 5a3c547f27..e74424e0e2 100644
--- a/language/move-compiler/tests/move_check/unit_test/invalid_expected_code_name.unit_test.exp
+++ b/language/move-compiler/tests/move_check/unit_test/invalid_expected_code_name.unit_test.exp
@@ -1,27 +1,18 @@
-error[E10002]: invalid attribute name
-  ┌─ tests/move_check/unit_test/invalid_expected_code_name.move:4:24
+error[E10003]: invalid attribute value
+  ┌─ tests/move_check/unit_test/invalid_expected_code_name.move:4:7
   │
 4 │     #[expected_failure(cod=1)]
-  │                        ^^^--
-  │                        │
-  │                        Invalid name in this assignment
-  │                        Invalid name in expected failure code assignment. Did you mean to use 'abort_code'?
+  │       ^^^^^^^^^^^^^^^^^^^^^^^ Invalid #[expected_failure(...)] attribute, expected 1 failure kind but found 0. Expected one of: abort_code, arithmetic_error, vector_error, out_of_gas, major_status
 
-error[E10002]: invalid attribute name
-  ┌─ tests/move_check/unit_test/invalid_expected_code_name.move:8:24
+error[E10003]: invalid attribute value
+  ┌─ tests/move_check/unit_test/invalid_expected_code_name.move:8:7
   │
 8 │     #[expected_failure(code=1)]
-  │                        ^^^^--
-  │                        │
-  │                        Invalid name in this assignment
-  │                        Invalid name in expected failure code assignment. Did you mean to use 'abort_code'?
+  │       ^^^^^^^^^^^^^^^^^^^^^^^^ Invalid #[expected_failure(...)] attribute, expected 1 failure kind but found 0. Expected one of: abort_code, arithmetic_error, vector_error, out_of_gas, major_status
 
-error[E10002]: invalid attribute name
-   ┌─ tests/move_check/unit_test/invalid_expected_code_name.move:12:24
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/invalid_expected_code_name.move:12:7
    │
 12 │     #[expected_failure(abort_cod=1)]
-   │                        ^^^^^^^^^--
-   │                        │
-   │                        Invalid name in this assignment
-   │                        Invalid name in expected failure code assignment. Did you mean to use 'abort_code'?
+   │       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid #[expected_failure(...)] attribute, expected 1 failure kind but found 0. Expected one of: abort_code, arithmetic_error, vector_error, out_of_gas, major_status
 
diff --git a/language/move-compiler/tests/move_check/unit_test/invalid_expected_failure_name.unit_test.exp b/language/move-compiler/tests/move_check/unit_test/invalid_expected_failure_name.unit_test.exp
index 840dcda959..ddc82bdea8 100644
--- a/language/move-compiler/tests/move_check/unit_test/invalid_expected_failure_name.unit_test.exp
+++ b/language/move-compiler/tests/move_check/unit_test/invalid_expected_failure_name.unit_test.exp
@@ -5,5 +5,5 @@ error[E10003]: invalid attribute value
   │       -----------------^
   │       │                │
   │       │                Invalid expected failure code assignment
-  │       Expect an #[expected_failure(abort_code=...)] attribute for abort code assignment
+  │       Expect an #[expected_failure(...)] attribute for error specification
 
diff --git a/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_assignment.move b/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_assignment.move
new file mode 100644
index 0000000000..ce61415284
--- /dev/null
+++ b/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_assignment.move
@@ -0,0 +1,32 @@
+// tests non-abort related execution failures
+// invalid assignment
+module 0x1::n {}
+module 0x1::m {
+    #[test_only]
+    use 0x1::n;
+
+    #[test]
+    #[expected_failure(vector_error=0, location=std::vector)]
+    fun t0() { }
+
+    #[test]
+    #[expected_failure(vector_error, minor_status=x"", location=std::vector)]
+    fun t1() { }
+
+    #[test]
+    #[expected_failure(arithmetic_error=@0, location=n)]
+    fun t2() { }
+
+    #[test]
+    #[expected_failure(out_of_gas=bool, location=Self)]
+    fun t3() { }
+
+    #[test]
+    #[expected_failure(major_status=4004u128, location=Self)]
+    fun t4() { }
+
+    #[test]
+    #[expected_failure(major_status=4016, minor_status=b"", location=Self)]
+    fun t5() { }
+
+}
diff --git a/language/tools/move-package/tests/test_sources/compilation/case_insensitive_check/Move.compile b/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_assignment.unit_test
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/case_insensitive_check/Move.compile
rename to language/move-compiler/tests/move_check/unit_test/other_failures_invalid_assignment.unit_test
diff --git a/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_assignment.unit_test.exp b/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_assignment.unit_test.exp
new file mode 100644
index 0000000000..e4f196f2e5
--- /dev/null
+++ b/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_assignment.unit_test.exp
@@ -0,0 +1,54 @@
+error[E10003]: invalid attribute value
+  ┌─ tests/move_check/unit_test/other_failures_invalid_assignment.move:9:24
+  │
+9 │     #[expected_failure(vector_error=0, location=std::vector)]
+  │                        ^^^^^^^^^^^^--
+  │                        │
+  │                        Expected no assigned value, e.g. 'vector_error', for expected failure attribute
+  │                        Unsupported attribute in this location
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/other_failures_invalid_assignment.move:13:38
+   │
+13 │     #[expected_failure(vector_error, minor_status=x"", location=std::vector)]
+   │                                      ^^^^^^^^^^^^^^^^
+   │                                      │            │
+   │                                      │            Unsupported value in this assignment
+   │                                      Invalid value in attribute assignment
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/other_failures_invalid_assignment.move:17:24
+   │
+17 │     #[expected_failure(arithmetic_error=@0, location=n)]
+   │                        ^^^^^^^^^^^^^^^^---
+   │                        │
+   │                        Expected no assigned value, e.g. 'arithmetic_error', for expected failure attribute
+   │                        Unsupported attribute in this location
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/other_failures_invalid_assignment.move:21:24
+   │
+21 │     #[expected_failure(out_of_gas=bool, location=Self)]
+   │                        ^^^^^^^^^^-----
+   │                        │
+   │                        Expected no assigned value, e.g. 'out_of_gas', for expected failure attribute
+   │                        Unsupported attribute in this location
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/other_failures_invalid_assignment.move:25:24
+   │
+25 │     #[expected_failure(major_status=4004u128, location=Self)]
+   │                        ^^^^^^^^^^^^^^^^^^^^^
+   │                        │            │
+   │                        │            Annotated non-u64 literals are not permitted
+   │                        Invalid value in attribute assignment
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/other_failures_invalid_assignment.move:29:43
+   │
+29 │     #[expected_failure(major_status=4016, minor_status=b"", location=Self)]
+   │                                           ^^^^^^^^^^^^^^^^
+   │                                           │            │
+   │                                           │            Unsupported value in this assignment
+   │                                           Invalid value in attribute assignment
+
diff --git a/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_location.move b/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_location.move
new file mode 100644
index 0000000000..7866522481
--- /dev/null
+++ b/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_location.move
@@ -0,0 +1,41 @@
+// tests non-abort related execution failures
+// missing or invalid location
+module 0x1::m {
+
+    #[test]
+    #[expected_failure(vector_error)]
+    fun t0() { }
+
+    #[test]
+    #[expected_failure(arithmetic_error)]
+    fun t1() { }
+
+    #[test]
+    #[expected_failure(out_of_gas)]
+    fun t2() { }
+
+    #[test]
+    #[expected_failure(major_status=4004)]
+    fun t3() { }
+
+    #[test]
+    #[expected_failure(major_status=4016, minor_code=0)]
+    fun t4() { }
+
+    #[test]
+    #[expected_failure(vector_error, location=x)]
+    fun u0() { }
+
+    #[test]
+    #[expected_failure(out_of_gas, location=0x1::m::t0)]
+    fun u2() { }
+
+    #[test]
+    #[expected_failure(major_status=4004, location=self)]
+    fun u3() { }
+
+    #[test]
+    #[expected_failure(major_status=4016, minor_status=0, location=0)]
+    fun u4() { }
+
+}
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.compile b/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_location.unit_test
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.compile
rename to language/move-compiler/tests/move_check/unit_test/other_failures_invalid_location.unit_test
diff --git a/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_location.unit_test.exp b/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_location.unit_test.exp
new file mode 100644
index 0000000000..af555fa5a2
--- /dev/null
+++ b/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_location.unit_test.exp
@@ -0,0 +1,66 @@
+error[E10004]: invalid usage of known attribute
+  ┌─ tests/move_check/unit_test/other_failures_invalid_location.move:6:24
+  │
+6 │     #[expected_failure(vector_error)]
+  │                        ^^^^^^^^^^^^ Expected 'location' following 'vector_error'
+
+error[E10004]: invalid usage of known attribute
+   ┌─ tests/move_check/unit_test/other_failures_invalid_location.move:10:24
+   │
+10 │     #[expected_failure(arithmetic_error)]
+   │                        ^^^^^^^^^^^^^^^^ Expected 'location' following 'arithmetic_error'
+
+error[E10004]: invalid usage of known attribute
+   ┌─ tests/move_check/unit_test/other_failures_invalid_location.move:14:24
+   │
+14 │     #[expected_failure(out_of_gas)]
+   │                        ^^^^^^^^^^ Expected 'location' following 'out_of_gas'
+
+error[E10004]: invalid usage of known attribute
+   ┌─ tests/move_check/unit_test/other_failures_invalid_location.move:18:24
+   │
+18 │     #[expected_failure(major_status=4004)]
+   │                        ^^^^^^^^^^^^ Expected 'location' following 'major_status'
+
+error[E10004]: invalid usage of known attribute
+   ┌─ tests/move_check/unit_test/other_failures_invalid_location.move:22:24
+   │
+22 │     #[expected_failure(major_status=4016, minor_code=0)]
+   │                        ^^^^^^^^^^^^ Expected 'location' following 'major_status'
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/other_failures_invalid_location.move:26:38
+   │
+26 │     #[expected_failure(vector_error, location=x)]
+   │                                      ^^^^^^^^^^
+   │                                      │        │
+   │                                      │        Expected a module identifier, e.g. 'std::vector'
+   │                                      Invalid value in attribute assignment
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/other_failures_invalid_location.move:30:36
+   │
+30 │     #[expected_failure(out_of_gas, location=0x1::m::t0)]
+   │                                    ^^^^^^^^^^^^^^^^^^^
+   │                                    │        │
+   │                                    │        Expected a module identifier, e.g. 'std::vector'
+   │                                    Invalid value in attribute assignment
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/other_failures_invalid_location.move:34:43
+   │
+34 │     #[expected_failure(major_status=4004, location=self)]
+   │                                           ^^^^^^^^^^^^^
+   │                                           │        │
+   │                                           │        Expected a module identifier, e.g. 'std::vector'
+   │                                           Invalid value in attribute assignment
+
+error[E10003]: invalid attribute value
+   ┌─ tests/move_check/unit_test/other_failures_invalid_location.move:38:59
+   │
+38 │     #[expected_failure(major_status=4016, minor_status=0, location=0)]
+   │                                                           ^^^^^^^^^^
+   │                                                           │        │
+   │                                                           │        Expected a module identifier, e.g. 'std::vector'
+   │                                                           Invalid value in attribute assignment
+
diff --git a/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_location_module.move b/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_location_module.move
new file mode 100644
index 0000000000..7b5cd5a42b
--- /dev/null
+++ b/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_location_module.move
@@ -0,0 +1,9 @@
+// tests non-abort related execution failures
+// invalid module in location
+module 0x1::m {
+
+    #[test]
+    #[expected_failure(arithmetic_error, location=0x2::m)]
+    fun u1() { }
+
+}
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.compile b/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_location_module.unit_test
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.compile
rename to language/move-compiler/tests/move_check/unit_test/other_failures_invalid_location_module.unit_test
diff --git a/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_location_module.unit_test.exp b/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_location_module.unit_test.exp
new file mode 100644
index 0000000000..4fb767ca4e
--- /dev/null
+++ b/language/move-compiler/tests/move_check/unit_test/other_failures_invalid_location_module.unit_test.exp
@@ -0,0 +1,6 @@
+error[E03002]: unbound module
+  ┌─ tests/move_check/unit_test/other_failures_invalid_location_module.move:6:51
+  │
+6 │     #[expected_failure(arithmetic_error, location=0x2::m)]
+  │                                                   ^^^^^^ Unbound module '0x2::m'
+
diff --git a/language/move-compiler/tests/move_check/unit_test/other_failures_valid.move b/language/move-compiler/tests/move_check/unit_test/other_failures_valid.move
new file mode 100644
index 0000000000..c04e9d5c31
--- /dev/null
+++ b/language/move-compiler/tests/move_check/unit_test/other_failures_valid.move
@@ -0,0 +1,27 @@
+// tests non-abort related execution failures
+module 0x1::n {}
+module 0x1::m {
+    #[test_only]
+    use 0x1::n;
+
+    #[test]
+    #[expected_failure(vector_error, location=std::vector)]
+    fun t0() { }
+
+    #[test]
+    #[expected_failure(arithmetic_error, location=n)]
+    fun t1() { }
+
+    #[test]
+    #[expected_failure(out_of_gas, location=Self)]
+    fun t2() { }
+
+    #[test]
+    #[expected_failure(major_status=4004, location=Self)]
+    fun t3() { }
+
+    #[test]
+    #[expected_failure(major_status=4016, minor_status=0, location=Self)]
+    fun t4() { }
+
+}
diff --git a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.compile b/language/move-compiler/tests/move_check/unit_test/other_failures_valid.unit_test
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.compile
rename to language/move-compiler/tests/move_check/unit_test/other_failures_valid.unit_test
diff --git a/language/move-compiler/tests/move_check/unit_test/valid_test_module.move b/language/move-compiler/tests/move_check/unit_test/valid_test_module.move
index fecac7f036..29a0388023 100644
--- a/language/move-compiler/tests/move_check/unit_test/valid_test_module.move
+++ b/language/move-compiler/tests/move_check/unit_test/valid_test_module.move
@@ -19,7 +19,7 @@ module 0x1::M {
     public fun a(_a: signer) { }
 
     // multiple signers are supported
-    #[test(_a=0x1, _b=@0x2)]
+    #[test(_a=@0x1, _b=@0x2)]
     public fun b(_a: signer, _b: signer) { }
 
     // multiple attributes are supported in the same annotation
@@ -33,15 +33,15 @@ module 0x1::M {
 
     // Can assign abort codes
     #[test(_a=@0x1, _b=@0x2)]
-    #[expected_failure(abort_code=5)]
+    #[expected_failure(abort_code=5, location=0x1::M)]
     public fun e(_a: signer, _b: signer) { }
 
     // singe annotation with multiple attributes and an abort code assignment
-    #[test(_a=@0x1, _b=@0x2), expected_failure(abort_code=5)]
+    #[test(_a=@0x1, _b=@0x2), expected_failure(abort_code=5, location=0x1::M)]
     public fun g(_a: signer, _b: signer) { }
 
     // single annotation without any arguments and an abort code assignment
-    #[test, expected_failure(abort_code=5)]
+    #[test, expected_failure(abort_code=5, location=0x1::M)]
     public fun h() { }
 
     // single annotation with no arguments and no abort code annotation
diff --git a/language/move-compiler/tests/move_check/unit_test/valid_test_module.unit_test.exp b/language/move-compiler/tests/move_check/unit_test/valid_test_module.unit_test.exp
deleted file mode 100644
index 0737b4ab11..0000000000
--- a/language/move-compiler/tests/move_check/unit_test/valid_test_module.unit_test.exp
+++ /dev/null
@@ -1,19 +0,0 @@
-error[E10005]: unable to generate test
-   ┌─ tests/move_check/unit_test/valid_test_module.move:22:7
-   │
-22 │     #[test(_a=0x1, _b=@0x2)]
-   │       ^^^^^^^^^^^^^^^^^^^^^ Missing test parameter assignment in test. Expected a parameter to be assigned in this attribute
-23 │     public fun b(_a: signer, _b: signer) { }
-   │                - -- Corresponding to this parameter
-   │                │  
-   │                Error found in this test
-
-error[E10003]: invalid attribute value
-   ┌─ tests/move_check/unit_test/valid_test_module.move:22:15
-   │
-22 │     #[test(_a=0x1, _b=@0x2)]
-   │            ---^^^
-   │            │  │
-   │            │  Unsupported attribute value
-   │            Assigned in this attribute
-
diff --git a/language/move-compiler/tests/move_check/verification/cross_module_invalid.exp b/language/move-compiler/tests/move_check/verification/cross_module_invalid.exp
new file mode 100644
index 0000000000..b2f6304e5b
--- /dev/null
+++ b/language/move-compiler/tests/move_check/verification/cross_module_invalid.exp
@@ -0,0 +1,12 @@
+error[E03004]: unbound type
+   ┌─ tests/move_check/verification/cross_module_invalid.move:22:23
+   │
+22 │     public fun bad(): Foo {
+   │                       ^^^ Unbound type 'Foo' in current scope
+
+error[E03002]: unbound module
+   ┌─ tests/move_check/verification/cross_module_invalid.move:23:9
+   │
+23 │         A::build_foo()
+   │         ^ Unbound module alias 'A'
+
diff --git a/language/move-compiler/tests/move_check/verification/cross_module_invalid.move b/language/move-compiler/tests/move_check/verification/cross_module_invalid.move
new file mode 100644
index 0000000000..9d78d065a3
--- /dev/null
+++ b/language/move-compiler/tests/move_check/verification/cross_module_invalid.move
@@ -0,0 +1,26 @@
+// check that `use`'s are filtered out correctly
+address 0x1 {
+module A {
+    struct Foo has drop {}
+
+    public fun build_foo(): Foo { Foo {} }
+}
+
+module B {
+    #[verify_only]
+    use 0x1::A::{Self, Foo};
+
+    #[verify_only]
+    fun x(_: Foo) { }
+
+    #[verify_only]
+    fun tester() {
+        x(A::build_foo())
+    }
+
+    // this should fail
+    public fun bad(): Foo {
+        A::build_foo()
+    }
+}
+}
diff --git a/language/move-compiler/tests/move_check/verification/cross_module_valid.move b/language/move-compiler/tests/move_check/verification/cross_module_valid.move
new file mode 100644
index 0000000000..c141dc283e
--- /dev/null
+++ b/language/move-compiler/tests/move_check/verification/cross_module_valid.move
@@ -0,0 +1,24 @@
+// Check that verify_only filtering and calling is supported across modules and
+// different types of module members
+address 0x1 {
+module A {
+    #[verify_only]
+    struct Foo has drop {}
+
+    #[verify_only]
+    public fun build_foo(): Foo { Foo {} }
+}
+
+module B {
+    #[verify_only]
+    use 0x1::A::{Self, Foo};
+
+    #[verify_only]
+    fun x(_: Foo) { }
+
+    #[verify_only]
+    fun tester() {
+        x(A::build_foo())
+    }
+}
+}
diff --git a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.compile b/language/move-compiler/tests/move_check/verification/cross_module_valid.verification
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.compile
rename to language/move-compiler/tests/move_check/verification/cross_module_valid.verification
diff --git a/language/move-compiler/tests/move_check/verification/double_annotation.move b/language/move-compiler/tests/move_check/verification/double_annotation.move
new file mode 100644
index 0000000000..60f63be52a
--- /dev/null
+++ b/language/move-compiler/tests/move_check/verification/double_annotation.move
@@ -0,0 +1,21 @@
+address 0x1 {
+module M {
+    #[verify_only]
+    struct Foo {}
+
+    // failure: double annotation
+    #[verify_only]
+    #[verify_only]
+    struct Bar {}
+
+    public fun foo() { }
+
+    #[verify_only]
+    public fun bar() { }
+
+    // failure: double annotation
+    #[verify_only]
+    #[verify_only]
+    public fun d(_a: signer, _b: signer) { }
+}
+}
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep/Move.compile b/language/move-compiler/tests/move_check/verification/double_annotation.verification
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep/Move.compile
rename to language/move-compiler/tests/move_check/verification/double_annotation.verification
diff --git a/language/move-compiler/tests/move_check/verification/double_annotation.verification.exp b/language/move-compiler/tests/move_check/verification/double_annotation.verification.exp
new file mode 100644
index 0000000000..8329be3105
--- /dev/null
+++ b/language/move-compiler/tests/move_check/verification/double_annotation.verification.exp
@@ -0,0 +1,16 @@
+error[E02001]: duplicate declaration, item, or annotation
+  ┌─ tests/move_check/verification/double_annotation.move:8:7
+  │
+7 │     #[verify_only]
+  │       ----------- Attribute previously given here
+8 │     #[verify_only]
+  │       ^^^^^^^^^^^ Duplicate attribute 'verify_only' attached to the same item
+
+error[E02001]: duplicate declaration, item, or annotation
+   ┌─ tests/move_check/verification/double_annotation.move:18:7
+   │
+17 │     #[verify_only]
+   │       ----------- Attribute previously given here
+18 │     #[verify_only]
+   │       ^^^^^^^^^^^ Duplicate attribute 'verify_only' attached to the same item
+
diff --git a/language/move-compiler/tests/move_check/verification/single_module_invalid.exp b/language/move-compiler/tests/move_check/verification/single_module_invalid.exp
new file mode 100644
index 0000000000..f0daf039c1
--- /dev/null
+++ b/language/move-compiler/tests/move_check/verification/single_module_invalid.exp
@@ -0,0 +1,18 @@
+error[E03004]: unbound type
+  ┌─ tests/move_check/verification/single_module_invalid.move:8:23
+  │
+8 │     public fun foo(): Foo {
+  │                       ^^^ Unbound type 'Foo' in current scope
+
+error[E03004]: unbound type
+  ┌─ tests/move_check/verification/single_module_invalid.move:9:9
+  │
+9 │         Foo {}
+  │         ^^^ Unbound type 'Foo' in current scope
+
+error[E03005]: unbound unscoped name
+   ┌─ tests/move_check/verification/single_module_invalid.move:17:24
+   │
+17 │     public fun baz() { bar() }
+   │                        ^^^ Unbound function 'bar' in current scope
+
diff --git a/language/move-compiler/tests/move_check/verification/single_module_invalid.move b/language/move-compiler/tests/move_check/verification/single_module_invalid.move
new file mode 100644
index 0000000000..06043755f6
--- /dev/null
+++ b/language/move-compiler/tests/move_check/verification/single_module_invalid.move
@@ -0,0 +1,19 @@
+address 0x1 {
+module M {
+    #[verify_only]
+    struct Foo {}
+
+    // This should cause an unbound type error in non-verify mode
+    // as the Foo struct declaration was filtered out
+    public fun foo(): Foo {
+        Foo {}
+    }
+
+    #[verify_only]
+    public fun bar() { }
+
+    // This should cause an unbound function error in non-verify mode
+    // as `bar` was filtered out
+    public fun baz() { bar() }
+}
+}
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.compile b/language/move-compiler/tests/move_check/verification/single_module_invalid.verification
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.compile
rename to language/move-compiler/tests/move_check/verification/single_module_invalid.verification
diff --git a/language/move-compiler/tests/move_check/verification/single_module_valid.move b/language/move-compiler/tests/move_check/verification/single_module_valid.move
new file mode 100644
index 0000000000..a50d4ab3cf
--- /dev/null
+++ b/language/move-compiler/tests/move_check/verification/single_module_valid.move
@@ -0,0 +1,16 @@
+// Make sure that legal usage is allowed
+module 0x1::M {
+    // verify-only struct
+    #[verify_only]
+    struct Foo {}
+
+    public fun foo() { }
+
+    // verify-only struct used in a verify-only function
+    #[verify_only]
+    public fun bar(): Foo { Foo{} }
+
+    // verify-only function used in a verify-only function
+    #[verify_only]
+    public fun baz(): Foo { bar() }
+}
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.compile b/language/move-compiler/tests/move_check/verification/single_module_valid.verification
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.compile
rename to language/move-compiler/tests/move_check/verification/single_module_valid.verification
diff --git a/language/move-compiler/tests/move_check_testsuite.rs b/language/move-compiler/tests/move_check_testsuite.rs
index b74221a598..f95f9e8b6a 100644
--- a/language/move-compiler/tests/move_check_testsuite.rs
+++ b/language/move-compiler/tests/move_check_testsuite.rs
@@ -2,6 +2,8 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use std::{collections::BTreeMap, fs, path::Path};
+
 use move_command_line_common::{
     env::read_bool_env_var,
     testing::{add_update_baseline_fix, format_diff, read_env_update_baseline, EXP_EXT, OUT_EXT},
@@ -12,12 +14,12 @@ use move_compiler::{
     shared::{Flags, NumericalAddress},
     unit_test, CommentMap, Compiler, SteppedCompiler, PASS_CFGIR, PASS_PARSER,
 };
-use std::{collections::BTreeMap, fs, path::Path};
 
 /// Shared flag to keep any temporary results of the test
 const KEEP_TMP: &str = "KEEP";
 
 const TEST_EXT: &str = "unit_test";
+const VERIFICATION_EXT: &str = "verification";
 
 /// Root of tests which require to set flavor flags.
 const FLAVOR_PATH: &str = "flavors/";
@@ -59,6 +61,27 @@ fn move_check_testsuite(path: &Path) -> datatest_stable::Result<()> {
         )?;
     }
 
+    // A verification case is marked that it should also be compiled in verification mode by having
+    // a `path.verification` file.
+    if path.with_extension(VERIFICATION_EXT).exists() {
+        let verification_exp_path = format!(
+            "{}.verification.{}",
+            path.with_extension("").to_string_lossy(),
+            EXP_EXT
+        );
+        let verification_out_path = format!(
+            "{}.verification.{}",
+            path.with_extension("").to_string_lossy(),
+            OUT_EXT
+        );
+        run_test(
+            path,
+            Path::new(&verification_exp_path),
+            Path::new(&verification_out_path),
+            Flags::verification(),
+        )?;
+    }
+
     let exp_path = path.with_extension(EXP_EXT);
     let out_path = path.with_extension(OUT_EXT);
 
diff --git a/language/move-compiler/transactional-tests/Cargo.toml b/language/move-compiler/transactional-tests/Cargo.toml
index deae23755f..241db23c7f 100644
--- a/language/move-compiler/transactional-tests/Cargo.toml
+++ b/language/move-compiler/transactional-tests/Cargo.toml
@@ -3,7 +3,7 @@ name = "move-compiler-transactional-tests"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dev-dependencies]
diff --git a/language/move-compiler/transactional-tests/tests/constants/default_int_size.exp b/language/move-compiler/transactional-tests/tests/constants/default_int_size.exp
new file mode 100644
index 0000000000..f554efbb54
--- /dev/null
+++ b/language/move-compiler/transactional-tests/tests/constants/default_int_size.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 0 'run'. lines 1-14:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
diff --git a/language/move-compiler/transactional-tests/tests/constants/default_int_size.move b/language/move-compiler/transactional-tests/tests/constants/default_int_size.move
new file mode 100644
index 0000000000..06a35f423e
--- /dev/null
+++ b/language/move-compiler/transactional-tests/tests/constants/default_int_size.move
@@ -0,0 +1,53 @@
+//# run
+script {
+    // should fail
+    // Checks that default integers will always be u64 otherwise existing impls might fail
+    // We're going above u64 max
+    fun main() {
+        let i = 1;
+        let j = 1;
+        while (j < 65) {
+            i = 2 * i;
+            j = j + 1;
+        };
+    }
+}
+
+//# run
+script {
+    // Checks that default integers will always be u64 otherwise existing impls might fail
+    fun main() {
+        let i = 1;
+        let j = 1;
+        while (j < 64) {
+            i = 2 * i;
+            j = j + 1;
+        };
+    }
+}
+
+//# run
+script {
+    // Checks that default integers will always be u64 otherwise existing impls might fail
+    fun main() {
+        let i = 256;
+        let j = 1;
+        while (j < (64 - 8)) {
+            i = 2 * i;
+            j = j + 1;
+        };
+    }
+}
+
+//# run
+script {
+    // Checks that default integers will always be u64 otherwise existing impls might fail
+    fun main() {
+        let i = 65536;
+        let j = 1;
+        while (j < (64 - 16)) {
+            i = 2 * i;
+            j = j + 1;
+        };
+    }
+}
diff --git a/language/move-compiler/transactional-tests/tests/constants/folding_complex.move b/language/move-compiler/transactional-tests/tests/constants/folding_complex.move
index 046ef4bdba..b7c7c43b93 100644
--- a/language/move-compiler/transactional-tests/tests/constants/folding_complex.move
+++ b/language/move-compiler/transactional-tests/tests/constants/folding_complex.move
@@ -71,6 +71,11 @@ script {
         255 ^ 255;
         18446744073709551615 ^ 18446744073709551615;
         (340282366920938463463374607431768211455: u128) ^ (340282366920938463463374607431768211455: u128);
+        ((3402823669209384: u256) as u128);
+        (340282366920938463463374607431768211455340282366920938463463374607: u256) - 34;
+        (340282366920938463463374607431768211455340282366920938463463374607: u256) - (340282366920938463463374607431768211455340: u256);
+        (340282366920938463463374607431768211455340282366920938463463374607: u256) ^ (340282366920938463463374607431768211455340: u256);
+        (340282366920938463463374607431768211455340282366920938463463374607: u256) ^ (340282366920938463463374607431768211455: u256);
         0
     };
     const C2: bool = {
diff --git a/language/move-compiler/transactional-tests/tests/constants/folding_numeric.move b/language/move-compiler/transactional-tests/tests/constants/folding_numeric.move
index 49357ea2a2..9dfa3cb73d 100644
--- a/language/move-compiler/transactional-tests/tests/constants/folding_numeric.move
+++ b/language/move-compiler/transactional-tests/tests/constants/folding_numeric.move
@@ -3,47 +3,80 @@ script {
     const SHL0: u8 = 1 << 7;
     const SHL1: u64 = 1 << 63;
     const SHL2: u128 = 1 << 127;
+    const SHL3: u16 = 1 << 15;
+    const SHL4: u32 = 1 << 31;
+    const SHL5: u256 = 1 << 255;
 
     const SHR0: u8 = 128 >> 7;
     const SHR1: u64 = 18446744073709551615 >> 63;
     const SHR2: u128 = 340282366920938463463374607431768211455 >> 127;
+    const SHR3: u16 = 36863 >> 15;
+    const SHR4: u32 = 2415919103 >> 31;
+    const SHR5: u256 = 65133050195990359925758679067386948167464366374422817272194891004451135422463 >> 255;
 
     const DIV0: u8 = 255 / 2;
     const DIV1: u64 = 18446744073709551615 / 2;
     const DIV2: u128 = 340282366920938463463374607431768211455 / 2;
+    const DIV3: u16 = 65535 / 2;
+    const DIV4: u32 = 4294967295 / 2;
+    const DIV5: u256 = 115792089237316195423570985008687907853269984665640564039457584007913129639935 / 2;
 
     const MOD0: u8 = 255 % 2;
     const MOD1: u64 = 18446744073709551615 % 2;
     const MOD2: u128 = 340282366920938463463374607431768211455 % 2;
+    const MOD3: u16 = 65535 % 2;
+    const MOD4: u32 = 4294967295 % 2;
+    const MOD5: u256 = 115792089237316195423570985008687907853269984665640564039457584007913129639935 % 2;
 
     const ADD0: u8 = 254 + 1;
     const ADD1: u64 = 18446744073709551614 + 1;
     const ADD2: u128 = 340282366920938463463374607431768211454 + 1;
+    const ADD3: u16 = 65534 + 1;
+    const ADD4: u32 = 4294967294 + 1;
+    const ADD5: u256 = 115792089237316195423570985008687907853269984665640564039457584007913129639934 + 1;
 
     const SUB0: u8 = 255 - 255;
     const SUB1: u64 = 18446744073709551615 - 18446744073709551615;
     const SUB2: u128 =
         340282366920938463463374607431768211455 - 340282366920938463463374607431768211455;
+    const SUB3: u16 = 65535 - 65535;
+    const SUB4: u32 = 4294967295 - 4294967295;
+    const SUB5: u256 =
+        115792089237316195423570985008687907853269984665640564039457584007913129639935 - 115792089237316195423570985008687907853269984665640564039457584007913129639935;
 
     const CAST0: u8 = ((255: u64) as u8);
     const CAST1: u64 = ((18446744073709551615: u128) as u64);
     const CAST2: u128 = ((1: u8) as u128);
+    const CAST3: u16 = ((65535: u64) as u16);
+    const CAST4: u32 = ((4294967295: u128) as u32);
+    const CAST5: u256 = ((1: u8) as u256);
 
     const BAND0: u8 = 255 & 255;
     const BAND1: u64 = 18446744073709551615 & 18446744073709551615;
-    const BAND2: u128 =
+    const BAND2: u256 =
         340282366920938463463374607431768211455 & 340282366920938463463374607431768211455;
+    const BAND3: u16 = 65535 & 65535;
+    const BAND4: u32 = 4294967295 & 4294967295;
+    const BAND5: u256 =
+        115792089237316195423570985008687907853269984665640564039457584007913129639935 & 115792089237316195423570985008687907853269984665640564039457584007913129639935;
 
     const BOR0: u8 = 255 | 255;
     const BOR1: u64 = 18446744073709551615 | 18446744073709551615;
-    const BOR2: u128 =
+    const BOR2: u256 =
         340282366920938463463374607431768211455 | 340282366920938463463374607431768211455;
+    const BOR3: u16 = 65535 | 65535;
+    const BOR4: u32 = 4294967295 | 4294967295;
+    const BOR5: u256 =
+        115792089237316195423570985008687907853269984665640564039457584007913129639935 | 115792089237316195423570985008687907853269984665640564039457584007913129639935;
 
     const BXOR0: u8 = 255 ^ 255;
     const BXOR1: u64 = 18446744073709551615 ^ 18446744073709551615;
-    const BXOR2: u128 =
+    const BXOR2: u256 =
         340282366920938463463374607431768211455 ^ 340282366920938463463374607431768211455;
-
+    const BXOR3: u16 = 65535 ^ 65535;
+    const BXOR4: u32 = 4294967295 ^ 4294967295;
+    const BXOR5: u256 =
+        115792089237316195423570985008687907853269984665640564039457584007913129639935 ^ 115792089237316195423570985008687907853269984665640564039457584007913129639935;
     fun main() {
         assert!(SHL0 == 128, 42);
         assert!(SHL1 == 9223372036854775808, 42);
@@ -51,6 +84,12 @@ script {
         assert!(SHL0 == 0x80, 42);
         assert!(SHL1 == 0x8000000000000000, 42);
         assert!(SHL2 == 0x80000000000000000000000000000000, 42);
+        assert!(SHL3 == 32768, 42);
+        assert!(SHL4 == 2147483648, 42);
+        assert!(SHL5 == 57896044618658097711785492504343953926634992332820282019728792003956564819968, 42);
+        assert!(SHL3 == 0x8000, 42);
+        assert!(SHL4 == 0x80000000, 42);
+        assert!(SHL5 == 0x8000000000000000000000000000000000000000000000000000000000000000, 42);
 
         assert!(SHR0 == 1, 42);
         assert!(SHR1 == 1, 42);
@@ -58,7 +97,12 @@ script {
         assert!(SHR0 == 0x1, 42);
         assert!(SHR1 == 0x1, 42);
         assert!(SHR2 == 0x1, 42);
-
+        assert!(SHR3 == 1, 42);
+        assert!(SHR4 == 1, 42);
+        assert!(SHR5 == 1, 42);
+        assert!(SHR3 == 0x1, 42);
+        assert!(SHR4 == 0x1, 42);
+        assert!(SHR5 == 0x1, 42);
 
         assert!(DIV0 == 127, 42);
         assert!(DIV1 == 9223372036854775807, 42);
@@ -66,6 +110,12 @@ script {
         assert!(DIV0 == 0x7F, 42);
         assert!(DIV1 == 0x7FFFFFFFFFFFFFFF, 42);
         assert!(DIV2 == 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 42);
+        assert!(DIV3 == 32767, 42);
+        assert!(DIV4 == 2147483647, 42);
+        assert!(DIV5 == 57896044618658097711785492504343953926634992332820282019728792003956564819967, 42);
+        assert!(DIV3 == 0x7FFF, 42);
+        assert!(DIV4 == 0x7FFFFFFF, 42);
+        assert!(DIV5 == 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 42);
 
         assert!(MOD0 == 1, 42);
         assert!(MOD1 == 1, 42);
@@ -73,6 +123,12 @@ script {
         assert!(MOD0 == 0x1, 42);
         assert!(MOD1 == 0x1, 42);
         assert!(MOD2 == 0x1, 42);
+        assert!(MOD3 == 1, 42);
+        assert!(MOD4 == 1, 42);
+        assert!(MOD5 == 1, 42);
+        assert!(MOD3 == 0x1, 42);
+        assert!(MOD4 == 0x1, 42);
+        assert!(MOD5 == 0x1, 42);
 
         assert!(ADD0 == 255, 42);
         assert!(ADD1 == 18446744073709551615, 42);
@@ -80,6 +136,12 @@ script {
         assert!(ADD0 == 0xFF, 42);
         assert!(ADD1 == 0xFFFFFFFFFFFFFFFF, 42);
         assert!(ADD2 == 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 42);
+        assert!(ADD3 == 65535, 42);
+        assert!(ADD4 == 4294967295, 42);
+        assert!(ADD5 == 115792089237316195423570985008687907853269984665640564039457584007913129639935, 42);
+        assert!(ADD3 == 0xFFFF, 42);
+        assert!(ADD4 == 0xFFFFFFFF, 42);
+        assert!(ADD5 == 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 42);
 
         assert!(SUB0 == 0, 42);
         assert!(SUB1 == 0, 42);
@@ -87,6 +149,12 @@ script {
         assert!(SUB0 == 0x0, 42);
         assert!(SUB1 == 0x0, 42);
         assert!(SUB2 == 0x0, 42);
+        assert!(SUB3 == 0, 42);
+        assert!(SUB4 == 0, 42);
+        assert!(SUB5 == 0, 42);
+        assert!(SUB3 == 0x0, 42);
+        assert!(SUB4 == 0x0, 42);
+        assert!(SUB5 == 0x0, 42);
 
         assert!(CAST0 == 255, 42);
         assert!(CAST1 == 18446744073709551615, 42);
@@ -94,6 +162,12 @@ script {
         assert!(CAST0 == 0xFF, 42);
         assert!(CAST1 == 0xFFFFFFFFFFFFFFFF, 42);
         assert!(CAST2 == 0x1, 42);
+        assert!(CAST3 == 65535, 42);
+        assert!(CAST4 == 4294967295, 42);
+        assert!(CAST5 == 1, 42);
+        assert!(CAST3 == 0xFFFF, 42);
+        assert!(CAST4 == 0xFFFFFFFF, 42);
+        assert!(CAST5 == 0x1, 42);
 
         assert!(BAND0 == 255, 42);
         assert!(BAND1 == 18446744073709551615, 42);
@@ -101,6 +175,12 @@ script {
         assert!(BAND0 == 0xFF, 42);
         assert!(BAND1 == 0xFFFFFFFFFFFFFFFF, 42);
         assert!(BAND2 == 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 42);
+        assert!(BAND3 == 65535, 42);
+        assert!(BAND4 == 4294967295, 42);
+        assert!(BAND5 == 115792089237316195423570985008687907853269984665640564039457584007913129639935, 42);
+        assert!(BAND3 == 0xFFFF, 42);
+        assert!(BAND4 == 0xFFFFFFFF, 42);
+        assert!(BAND5 == 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 42);
 
         assert!(BXOR0 == 0, 42);
         assert!(BXOR1 == 0, 42);
@@ -108,5 +188,11 @@ script {
         assert!(BXOR0 == 0x0, 42);
         assert!(BXOR1 == 0x0, 42);
         assert!(BXOR2 == 0x0, 42);
+        assert!(BXOR3 == 0, 42);
+        assert!(BXOR4 == 0, 42);
+        assert!(BXOR5 == 0, 42);
+        assert!(BXOR3 == 0x0, 42);
+        assert!(BXOR4 == 0x0, 42);
+        assert!(BXOR5 == 0x0, 42);
     }
 }
diff --git a/language/move-compiler/transactional-tests/tests/constants/folding_values.move b/language/move-compiler/transactional-tests/tests/constants/folding_values.move
index 0499904b5f..e561ac4cb9 100644
--- a/language/move-compiler/transactional-tests/tests/constants/folding_values.move
+++ b/language/move-compiler/transactional-tests/tests/constants/folding_values.move
@@ -1,8 +1,11 @@
 //# run
 script {
     const U8: u8 = 0;
+    const U16: u16 = 0;
+    const U32: u32 = 0;
     const U64: u64 = 0;
     const U128: u128 = 0;
+    const U256: u256 = 0;
     const BOOL: bool = false;
     const ADDR: address = @0x42;
     const HEX: vector<u8> = x"42";
@@ -12,6 +15,9 @@ script {
         assert!(U8 == 0, 42);
         assert!(U64 == 0, 42);
         assert!(U128 == 0, 42);
+        assert!(U16 == 0, 42);
+        assert!(U32 == 0, 42);
+        assert!(U256 == 0, 42);
         assert!(BOOL == false, 42);
         assert!(ADDR == @0x42, 42);
         assert!(HEX == x"42", 42);
diff --git a/language/move-compiler/transactional-tests/tests/evaluation_order/lazy_assert.exp b/language/move-compiler/transactional-tests/tests/evaluation_order/lazy_assert.exp
index ce1ed2801a..c0ff95eccb 100644
--- a/language/move-compiler/transactional-tests/tests/evaluation_order/lazy_assert.exp
+++ b/language/move-compiler/transactional-tests/tests/evaluation_order/lazy_assert.exp
@@ -15,5 +15,5 @@ Error: Script execution failed with VMError: {
     sub_status: None,
     location: script,
     indices: [],
-    offsets: [(FunctionDefinitionIndex(0), 3)],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
 }
diff --git a/language/move-compiler/transactional-tests/tests/evaluation_order/struct_arguments.exp b/language/move-compiler/transactional-tests/tests/evaluation_order/struct_arguments.exp
index 8adb8a798d..1aa1296eba 100644
--- a/language/move-compiler/transactional-tests/tests/evaluation_order/struct_arguments.exp
+++ b/language/move-compiler/transactional-tests/tests/evaluation_order/struct_arguments.exp
@@ -60,5 +60,5 @@ Error: Script execution failed with VMError: {
     sub_status: None,
     location: 0x42::M,
     indices: [],
-    offsets: [(FunctionDefinitionIndex(1), 7)],
+    offsets: [(FunctionDefinitionIndex(1), 5)],
 }
diff --git a/language/move-compiler/transactional-tests/tests/operators/arithmetic_operators_u16.exp b/language/move-compiler/transactional-tests/tests/operators/arithmetic_operators_u16.exp
new file mode 100644
index 0000000000..61b2ca7d4d
--- /dev/null
+++ b/language/move-compiler/transactional-tests/tests/operators/arithmetic_operators_u16.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-23:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 25-31:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-54:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 56-62:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 79-85:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 87-93:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 112-119:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 121-126:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 128-134:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 152-158:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 160-166:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 168-174:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/language/move-compiler/transactional-tests/tests/operators/arithmetic_operators_u16.move b/language/move-compiler/transactional-tests/tests/operators/arithmetic_operators_u16.move
new file mode 100644
index 0000000000..d0976630d9
--- /dev/null
+++ b/language/move-compiler/transactional-tests/tests/operators/arithmetic_operators_u16.move
@@ -0,0 +1,174 @@
+//# run
+script {
+fun main() {
+    assert!(0u16 + 0u16 == 0u16, 1000);
+    assert!(0u16 + 1u16 == 1u16, 1001);
+    assert!(1u16 + 1u16 == 2u16, 1002);
+
+    assert!(13u16 + 67u16 == 80u16, 1100);
+    assert!(100u16 + 10u16 == 110u16, 1101);
+
+    assert!(0u16 + 65535u16 == 65535u16, 1200);
+    assert!(1u16 + 65534u16 == 65535u16, 1201);
+    assert!(5u16 + 65530u16 == 65535u16, 1202);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    1u16 + 65535u16;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    65135u16 + 6555u16;
+}
+}
+
+//# run
+script {
+fun main() {
+    assert!(0u16 - 0u16 == 0u16, 2000);
+    assert!(1u16 - 0u16 == 1u16, 2001);
+    assert!(1u16 - 1u16 == 0u16, 2002);
+
+    assert!(52u16 - 13u16 == 39u16, 2100);
+    assert!(100u16 - 10u16 == 90u16, 2101);
+
+    assert!(65535u16 - 65535u16 == 0u16, 2200);
+    assert!(5u16 - 1u16 - 4u16 == 0u16, 2201);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    0u16 - 1u16;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    54u16 - 100u16;
+}
+}
+
+
+//# run
+script {
+fun main() {
+    assert!(0u16 * 0u16 == 0u16, 3000);
+    assert!(1u16 * 0u16 == 0u16, 3001);
+    assert!(1u16 * 1u16 == 1u16, 3002);
+
+    assert!(6u16 * 7u16 == 42u16, 3100);
+    assert!(10u16 * 10u16 == 100u16, 3101);
+
+    assert!(32767u16 * 2u16 == 65534u16, 3200);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    32767u16 * 32767u16;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    33767u16 * 2u16;
+}
+}
+
+
+
+//# run
+script {
+fun main() {
+    assert!(0u16 / 1u16 == 0u16, 4000);
+    assert!(1u16 / 1u16 == 1u16, 4001);
+    assert!(1u16 / 2u16 == 0u16, 4002);
+
+    assert!(6u16 / 3u16 == 2u16, 4100);
+    assert!(65535u16 / 13u16 == 5041u16, 4101);
+
+    assert!(65534u16 / 65535u16 == 0u16, 4200);
+    assert!(65535u16 / 65534u16 == 1u16, 4201);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    0u16 / 0u16;
+}
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+script {
+fun main() {
+    1u16 / 0u16;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    65535u16 / 0u16;
+}
+}
+
+
+//# run
+script {
+fun main() {
+    assert!(0u16 % 1u16 == 0u16, 5000);
+    assert!(1u16 % 1u16 == 0u16, 5001);
+    assert!(1u16 % 2u16 == 1u16, 5002);
+
+    assert!(8u16 % 3u16 == 2u16, 5100);
+    assert!(65535u16 % 134u16 == 9u16, 5101);
+
+    assert!(65534u16 % 65535u16 == 65534u16, 5200);
+    assert!(65535u16 % 65535u16 == 0u16, 5201);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    0u16 % 0u16;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    1u16 % 0u16;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    65535u16 % 0u16;
+}
+}
diff --git a/language/move-compiler/transactional-tests/tests/operators/arithmetic_operators_u256.exp b/language/move-compiler/transactional-tests/tests/operators/arithmetic_operators_u256.exp
new file mode 100644
index 0000000000..3a73a6934d
--- /dev/null
+++ b/language/move-compiler/transactional-tests/tests/operators/arithmetic_operators_u256.exp
@@ -0,0 +1,100 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-23:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 25-31:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-54:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 56-62:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 79-85:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 112-119:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 121-126:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 128-134:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 152-158:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 160-166:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 168-174:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/language/move-compiler/transactional-tests/tests/operators/arithmetic_operators_u256.move b/language/move-compiler/transactional-tests/tests/operators/arithmetic_operators_u256.move
new file mode 100644
index 0000000000..1efaaaa5cf
--- /dev/null
+++ b/language/move-compiler/transactional-tests/tests/operators/arithmetic_operators_u256.move
@@ -0,0 +1,174 @@
+//# run
+script {
+fun main() {
+    assert!(0u256 + 0u256 == 0u256, 1000);
+    assert!(0u256 + 1u256 == 1u256, 1001);
+    assert!(1u256 + 1u256 == 2u256, 1002);
+
+    assert!(13u256 + 67u256 == 80u256, 1100);
+    assert!(100u256 + 10u256 == 110u256, 1101);
+
+    assert!(0u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 1200);
+    assert!(1u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639934u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 1201);
+    assert!(5u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639930u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 1202);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    1u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639935u256;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    105792089237316195423570985008687907853269984665640564039457584007913129639935u256 + 105792089237316195423570985008687907853269984665640564039457584007913129639935;
+}
+}
+
+//# run
+script {
+fun main() {
+    assert!(0u256 - 0u256 == 0u256, 2000);
+    assert!(1u256 - 0u256 == 1u256, 2001);
+    assert!(1u256 - 1u256 == 0u256, 2002);
+
+    assert!(52u256 - 13u256 == 39u256, 2100);
+    assert!(100u256 - 10u256 == 90u256, 2101);
+
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 - 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 0u256, 2200);
+    assert!(5u256 - 1u256 - 4u256 == 0u256, 2201);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    0u256 - 1u256;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    54u256 - 100u256;
+}
+}
+
+
+//# run
+script {
+fun main() {
+    assert!(0u256 * 0u256 == 0u256, 3000);
+    assert!(1u256 * 0u256 == 0u256, 3001);
+    assert!(1u256 * 1u256 == 1u256, 3002);
+
+    assert!(6u256 * 7u256 == 42u256, 3100);
+    assert!(10u256 * 10u256 == 100u256, 3101);
+
+    assert!(57896044618658097711785492504343953926634992332820282019728792003956564819967u256 * 2u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639934u256, 3200);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    578960446186580977117853953926634992332820282019728792003956564819967u256 * 57896044618343953926634992332820282019728792003956564819967u256;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    37896044618658097711785492504343953926634992332820282019728792003956564819967u256 * 2u256;
+}
+}
+
+
+
+//# run
+script {
+fun main() {
+    assert!(0u256 / 1u256 == 0u256, 4000);
+    assert!(1u256 / 1u256 == 1u256, 4001);
+    assert!(1u256 / 2u256 == 0u256, 4002);
+
+    assert!(6u256 / 3u256 == 2u256, 4100);
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 / 1234567891234512345678912345u256 == 93791593041942242554519147120179023890934338607714u256, 4101);
+
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639934u256 / 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 0u256, 4200);
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 / 115792089237316195423570985008687907853269984665640564039457584007913129639934u256 == 1u256, 4201);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    0u256 / 0u256;
+}
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+script {
+fun main() {
+    1u256 / 0u256;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    115792089237316195423570985008687907853269984665640564039457584007913129639935u256 / 0u256;
+}
+}
+
+
+//# run
+script {
+fun main() {
+    assert!(0u256 % 1u256 == 0u256, 5000);
+    assert!(1u256 % 1u256 == 0u256, 5001);
+    assert!(1u256 % 2u256 == 1u256, 5002);
+
+    assert!(8u256 % 3u256 == 2u256, 5100);
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 % 1234567891234512345678912345u256 == 440810759282713395982810605u256, 5101);
+
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639934u256 % 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639934u256, 5200);
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639934u256 % 115792089237316195423570985008687907853269984665640564039457584007913129639934u256 == 0u256, 5201);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    0u256 % 0u256;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    1u256 % 0u256;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    4294967294u256 % 0u256;
+}
+}
diff --git a/language/move-compiler/transactional-tests/tests/operators/arithmetic_operators_u32.exp b/language/move-compiler/transactional-tests/tests/operators/arithmetic_operators_u32.exp
new file mode 100644
index 0000000000..3a73a6934d
--- /dev/null
+++ b/language/move-compiler/transactional-tests/tests/operators/arithmetic_operators_u32.exp
@@ -0,0 +1,100 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-23:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 25-31:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-54:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 56-62:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 79-85:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 112-119:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 121-126:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 128-134:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 152-158:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 160-166:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 168-174:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/language/move-compiler/transactional-tests/tests/operators/arithmetic_operators_u32.move b/language/move-compiler/transactional-tests/tests/operators/arithmetic_operators_u32.move
new file mode 100644
index 0000000000..be2cf84cc8
--- /dev/null
+++ b/language/move-compiler/transactional-tests/tests/operators/arithmetic_operators_u32.move
@@ -0,0 +1,174 @@
+//# run
+script {
+fun main() {
+    assert!(0u32 + 0u32 == 0u32, 1000);
+    assert!(0u32 + 1u32 == 1u32, 1001);
+    assert!(1u32 + 1u32 == 2u32, 1002);
+
+    assert!(13u32 + 67u32 == 80u32, 1100);
+    assert!(100u32 + 10u32 == 110u32, 1101);
+
+    assert!(0u32 + 4294967295u32 == 4294967295u32, 1200);
+    assert!(1u32 + 4294967294u32 == 4294967295u32, 1201);
+    assert!(5u32 + 4294967290u32 == 4294967295u32, 1202);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    1u32 + 4294967295u32;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    4294967295u32 + 4294967295u32;
+}
+}
+
+//# run
+script {
+fun main() {
+    assert!(0u32 - 0u32 == 0u32, 2000);
+    assert!(1u32 - 0u32 == 1u32, 2001);
+    assert!(1u32 - 1u32 == 0u32, 2002);
+
+    assert!(52u32 - 13u32 == 39u32, 2100);
+    assert!(100u32 - 10u32 == 90u32, 2101);
+
+    assert!(4294967295u32 - 4294967295u32 == 0u32, 2200);
+    assert!(5u32 - 1u32 - 4u32 == 0u32, 2201);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    0u32 - 1u32;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    54u32 - 100u32;
+}
+}
+
+
+//# run
+script {
+fun main() {
+    assert!(0u32 * 0u32 == 0u32, 3000);
+    assert!(1u32 * 0u32 == 0u32, 3001);
+    assert!(1u32 * 1u32 == 1u32, 3002);
+
+    assert!(6u32 * 7u32 == 42u32, 3100);
+    assert!(10u32 * 10u32 == 100u32, 3101);
+
+    assert!(2147483647u32 * 2u32 == 4294967294u32, 3200);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    1147483647u32 * 2147483647u32;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    1147483647u32 * 2u32;
+}
+}
+
+
+
+//# run
+script {
+fun main() {
+    assert!(0u32 / 1u32 == 0u32, 4000);
+    assert!(1u32 / 1u32 == 1u32, 4001);
+    assert!(1u32 / 2u32 == 0u32, 4002);
+
+    assert!(6u32 / 3u32 == 2u32, 4100);
+    assert!(4294967294u32 / 13u32 == 330382099u32, 4101);
+
+    assert!(4294967294u32 / 4294967295u32 == 0u32, 4200);
+    assert!(4294967295u32 / 4294967294u32 == 1u32, 4201);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    0u32 / 0u32;
+}
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+script {
+fun main() {
+    1u32 / 0u32;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    4294967294u32 / 0u32;
+}
+}
+
+
+//# run
+script {
+fun main() {
+    assert!(0u32 % 1u32 == 0u32, 5000);
+    assert!(1u32 % 1u32 == 0u32, 5001);
+    assert!(1u32 % 2u32 == 1u32, 5002);
+
+    assert!(8u32 % 3u32 == 2u32, 5100);
+    assert!(4294967294u32 % 1234u32 == 678u32, 5101);
+
+    assert!(4294967294u32 % 4294967295u32 == 4294967294u32, 5200);
+    assert!(4294967294u32 % 4294967294u32 == 0u32, 5201);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    0u32 % 0u32;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    1u32 % 0u32;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    4294967294u32 % 0u32;
+}
+}
diff --git a/language/move-compiler/transactional-tests/tests/operators/bitwise_operators.move b/language/move-compiler/transactional-tests/tests/operators/bitwise_operators.move
index 5b5726b6f3..247b401c0f 100644
--- a/language/move-compiler/transactional-tests/tests/operators/bitwise_operators.move
+++ b/language/move-compiler/transactional-tests/tests/operators/bitwise_operators.move
@@ -7,10 +7,19 @@ fun main() {
     assert!(0u8 & 42u8 == 0u8, 1003);
     assert!(0u64 & 42u64 == 0u64, 1004);
     assert!(0u128 & 42u128 == 0u128, 1005);
+    assert!(0u16 & 0u16 == 0u16, 1000);
+    assert!(0u32 & 0u32 == 0u32, 1001);
+    assert!(0u256 & 0u256 == 0u256, 1002);
+    assert!(0u16 & 42u16 == 0u16, 1003);
+    assert!(0u32 & 42u32 == 0u32, 1004);
+    assert!(0u256 & 42u256 == 0u256, 1005);
 
     assert!(43u8 & 43u8 == 43u8, 1100);
     assert!(856776467654u64 & 856776467654u64 == 856776467654u64, 1101);
     assert!(4125423653474658754976595u128 & 4125423653474658754976595u128 == 4125423653474658754976595u128, 1102);
+    assert!(43u16 & 43u16 == 43u16, 1100);
+    assert!(856744u32 & 856744u32 == 856744u32, 1101);
+    assert!(41254236534746587549765954658754976595u256 & 41254236534746587549765954658754976595u256 == 41254236534746587549765954658754976595u256, 1102);
 
     assert!(255u8 & 255u8 == 255u8, 1200);
     assert!(18446744073709551615u64 & 18446744073709551615u64 == 18446744073709551615u64, 1201);
@@ -20,10 +29,21 @@ fun main() {
         340282366920938463463374607431768211455u128,
         1202
     );
+    assert!(65535u16 & 65535u16 == 65535u16, 1200);
+    assert!(4294967295u32 & 4294967295u32 == 4294967295u32, 1201);
+    assert!(
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 &
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ==
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256,
+        1202
+    );
 
     assert!(101u8 & 77u8 == 69u8, 1300);
     assert!(675437u64 & 14235u64 == 1545u64, 1301);
     assert!(534263574563786485434889u128 & 3141524387653489576893u128 == 632665710869872675337u128, 1302);
+    assert!(10186u16 & 717u16 == 712u16, 1300);
+    assert!(675437u32 & 14235u32 == 1545u32, 1301);
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639u256 & 3141524387653489576893u256 == 2366182237060668637861u256, 1302);
 }
 }
 
@@ -37,10 +57,20 @@ fun main() {
     assert!(42u8 | 0u8 == 42u8, 2003);
     assert!(42u64 | 0u64 == 42u64, 2004);
     assert!(42u128 | 0u128 == 42u128, 2005);
+    assert!(0u16 | 0u16 == 0u16, 1000);
+    assert!(0u32 | 0u32 == 0u32, 1001);
+    assert!(0u256 | 0u256 == 0u256, 1002);
+    assert!(0u16 | 42u16 == 42u16, 1003);
+    assert!(0u32 | 42u32 == 42u32, 1004);
+    assert!(0u256 | 42u256 == 42u256, 1005);
+
 
     assert!(43u8 | 43u8 == 43u8, 2100);
     assert!(856776467654u64 | 856776467654u64 == 856776467654u64, 2101);
     assert!(4125423653474658754976595u128 | 4125423653474658754976595u128 == 4125423653474658754976595u128, 2102);
+    assert!(43u16 | 43u16 == 43u16, 1100);
+    assert!(856744u32 | 856744u32 == 856744u32, 1101);
+    assert!(41254236534746587549765954658754976595u256 | 41254236534746587549765954658754976595u256 == 41254236534746587549765954658754976595u256, 1102);
 
     assert!(255u8 | 255u8 == 255u8, 2200);
     assert!(18446744073709551615u64 | 18446744073709551615u64 == 18446744073709551615u64, 2201);
@@ -50,10 +80,21 @@ fun main() {
         340282366920938463463374607431768211455u128,
         2202
     );
+    assert!(65535u16 | 65535u16 == 65535u16, 1200);
+    assert!(4294967295u32 | 4294967295u32 == 4294967295u32, 1201);
+    assert!(
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 |
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ==
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256,
+        1202
+    );
 
     assert!(101u8 | 77u8 == 109u8, 2300);
     assert!(675437u64 | 14235u64 == 688127u64, 2301);
     assert!(534263574563786485434889u128 | 3141524387653489576893u128 == 536772433240570102336445u128, 2302);
+    assert!(10186u16 | 717u16 == 10191u16, 1300);
+    assert!(675437u32 | 14235u32 == 688127u32, 1301);
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639u256 | 3141524387653489576893u256 == 115792089237316195423570985008687907853269984665640564814799734600734068671u256, 1302);
 }
 }
 
@@ -67,10 +108,19 @@ fun main() {
     assert!(13u8 ^ 0u8 == 13u8, 3003);
     assert!(13u64 ^ 0u64 == 13u64, 3004);
     assert!(13u128 ^ 0u128 == 13u128, 3005);
+    assert!(0u16 ^ 0u16 == 0u16, 3000);
+    assert!(0u32 ^ 0u32 == 0u32, 3001);
+    assert!(0u256 ^ 0u256 == 0u256, 3002);
+    assert!(13u16 ^ 0u16 == 13u16, 3003);
+    assert!(13u32 ^ 0u32 == 13u32, 3004);
+    assert!(13u256 ^ 0u256 == 13u256, 3005);
 
     assert!(43u8 ^ 43u8 == 0u8, 3100);
     assert!(856776467654u64 ^ 856776467654u64 == 0u64, 3101);
     assert!(4125423653474658754976595u128 ^ 4125423653474658754976595u128 == 0u128, 3102);
+    assert!(43u16 ^ 43u16 == 0u16, 1100);
+    assert!(856744u32 ^ 856744u32 == 0u32, 1101);
+    assert!(41254236534746587549765954658754976595u256 ^ 41254236534746587549765954658754976595u256 == 0u256, 1102);
 
     assert!(255u8 ^ 255u8 == 0u8, 3200);
     assert!(18446744073709551615u64 ^ 18446744073709551615u64 == 0u64, 3201);
@@ -80,13 +130,27 @@ fun main() {
         0u128,
         3202
     );
+    assert!(65535u16 ^ 65535u16 == 0u16, 1200);
+    assert!(4294967295u32 ^ 4294967295u32 == 0u32, 1201);
+    assert!(
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ^
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ==
+        0u256,
+        1202
+    );
 
     assert!(101u8 ^ 77u8 == 40u8, 3300);
     assert!(675437u64 ^ 14235u64 == 686582u64, 3301);
     assert!(534263574563786485434889u128 ^ 3141524387653489576893u128 == 536139767529700229661108u128, 3302);
+    assert!(10186u16 ^ 717u16 == 9479u16, 1300);
+    assert!(675437u32 ^ 14235u32 == 686582u32, 1301);
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639u256 ^ 3141524387653489576893u256 == 115792089237316195423570985008687907853269984665640562448617497540065430810u256, 1302);
 
     assert!(13u8 ^ 1u8 == 12u8, 3400);
     assert!(13u64 ^ 1u64 == 12u64, 3401);
     assert!(13u128 ^ 1u128 == 12u128, 3402);
+    assert!(13u16 ^ 1u16 == 12u16, 3400);
+    assert!(13u32 ^ 1u32 == 12u32, 3401);
+    assert!(13u256 ^ 1u256 == 12u256, 3402);
 }
 }
diff --git a/language/move-compiler/transactional-tests/tests/operators/casting_operators.exp b/language/move-compiler/transactional-tests/tests/operators/casting_operators.exp
index dd7b5e60b9..11df43aa47 100644
--- a/language/move-compiler/transactional-tests/tests/operators/casting_operators.exp
+++ b/language/move-compiler/transactional-tests/tests/operators/casting_operators.exp
@@ -1,6 +1,6 @@
-processed 12 tasks
+processed 35 tasks
 
-task 3 'run'. lines 66-72:
+task 6 'run'. lines 182-188:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
@@ -9,7 +9,7 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 4 'run'. lines 74-80:
+task 7 'run'. lines 190-196:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
@@ -18,7 +18,7 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 5 'run'. lines 82-88:
+task 8 'run'. lines 198-204:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
@@ -27,7 +27,7 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 6 'run'. lines 90-96:
+task 9 'run'. lines 206-212:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
@@ -36,7 +36,7 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 7 'run'. lines 98-104:
+task 10 'run'. lines 214-220:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
@@ -45,7 +45,7 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 8 'run'. lines 106-114:
+task 11 'run'. lines 222-228:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
@@ -54,7 +54,7 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 9 'run'. lines 115-121:
+task 12 'run'. lines 230-236:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
@@ -63,7 +63,7 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 10 'run'. lines 123-129:
+task 13 'run'. lines 238-244:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
@@ -72,7 +72,178 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 11 'run'. lines 131-137:
+task 14 'run'. lines 246-252:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 15 'run'. lines 254-262:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 16 'run'. lines 263-269:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 17 'run'. lines 271-277:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 18 'run'. lines 279-285:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 19 'run'. lines 287-293:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 20 'run'. lines 295-301:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 21 'run'. lines 303-309:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 22 'run'. lines 311-317:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 23 'run'. lines 319-325:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 24 'run'. lines 327-335:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 25 'run'. lines 336-342:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 27 'run'. lines 352-358:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 28 'run'. lines 360-366:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 29 'run'. lines 368-374:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 30 'run'. lines 376-382:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 31 'run'. lines 384-392:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 32 'run'. lines 393-399:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 33 'run'. lines 401-407:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 34 'run'. lines 409-415:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
diff --git a/language/move-compiler/transactional-tests/tests/operators/casting_operators.move b/language/move-compiler/transactional-tests/tests/operators/casting_operators.move
index c58d575605..929e8620d5 100644
--- a/language/move-compiler/transactional-tests/tests/operators/casting_operators.move
+++ b/language/move-compiler/transactional-tests/tests/operators/casting_operators.move
@@ -1,21 +1,90 @@
-//# run
 // Casting to u8.
+//# run
 script {
 fun main() {
     // 0 remains unchanged.
     assert!((0u8 as u8) == 0u8, 1000);
     assert!((0u64 as u8) == 0u8, 1001);
     assert!((0u128 as u8) == 0u8, 1002);
+    assert!((0u16 as u8) == 0u8, 1000);
+    assert!((0u32 as u8) == 0u8, 1001);
+    assert!((0u256 as u8) == 0u8, 1002);
 
     // Random small number unchanged.
     assert!((21u8 as u8) == 21u8, 1100);
     assert!((21u64 as u8) == 21u8, 1101);
     assert!((21u128 as u8) == 21u8, 1102);
+    assert!((21u16 as u8) == 21u8, 1100);
+    assert!((21u32 as u8) == 21u8, 1101);
+    assert!((21u256 as u8) == 21u8, 1102);
 
     // Max representable values remain unchanged.
     assert!((255u8 as u8) == 255u8, 1200);
     assert!((255u64 as u8) == 255u8, 1201);
     assert!((255u128 as u8) == 255u8, 1202);
+    assert!((255u16 as u8) == 255u8, 1200);
+    assert!((255u32 as u8) == 255u8, 1201);
+    assert!((255u256 as u8) == 255u8, 1202);
+}
+}
+
+// Casting to u16.
+//# run
+script {
+fun main() {
+    // 0 remains unchanged.
+    assert!((0u8 as u16) == 0u16, 1000);
+    assert!((0u64 as u16) == 0u16, 1001);
+    assert!((0u128 as u16) == 0u16, 1002);
+    assert!((0u16 as u16) == 0u16, 1000);
+    assert!((0u32 as u16) == 0u16, 1001);
+    assert!((0u256 as u16) == 0u16, 1002);
+
+    // Random small number unchanged.
+    assert!((21u8 as u16) == 21u16, 1100);
+    assert!((21u64 as u16) == 21u16, 1101);
+    assert!((21u128 as u16) == 21u16, 1102);
+    assert!((21u16 as u16) == 21u16, 1100);
+    assert!((21u32 as u16) == 21u16, 1101);
+    assert!((21u256 as u16) == 21u16, 1102);
+
+    // Max representable values remain unchanged.
+    assert!((255u8 as u16) == 255u16, 1200);
+    assert!((65535u64 as u16) == 65535u16, 1201);
+    assert!((65535u128 as u16) == 65535u16, 1202);
+    assert!((65535u16 as u16) == 65535u16, 1200);
+    assert!((65535u32 as u16) == 65535u16, 1201);
+    assert!((65535u256 as u16) == 65535u16, 1202);
+}
+}
+
+// Casting to u32.
+//# run
+script {
+fun main() {
+    // 0 remains unchanged.
+    assert!((0u8 as u32) == 0u32, 1000);
+    assert!((0u64 as u32) == 0u32, 1001);
+    assert!((0u128 as u32) == 0u32, 1002);
+    assert!((0u16 as u32) == 0u32, 1000);
+    assert!((0u32 as u32) == 0u32, 1001);
+    assert!((0u256 as u32) == 0u32, 1002);
+
+    // Random small number unchanged.
+    assert!((21u8 as u32) == 21u32, 1100);
+    assert!((21u64 as u32) == 21u32, 1101);
+    assert!((21u128 as u32) == 21u32, 1102);
+    assert!((21u16 as u32) == 21u32, 1100);
+    assert!((21u32 as u32) == 21u32, 1101);
+    assert!((21u256 as u32) == 21u32, 1102);
+
+    // Max representable values remain unchanged.
+    assert!((255u8 as u32) == 255u32, 1200);
+    assert!((4294967295u64 as u32) == 4294967295u32, 1201);
+    assert!((4294967295u128 as u32) == 4294967295u32, 1202);
+    assert!((65535u16 as u32) == 65535u32, 1200);
+    assert!((4294967295u32 as u32) == 4294967295u32, 1201);
+    assert!((4294967295u256 as u32) == 4294967295u32, 1202);
 }
 }
 
@@ -27,16 +96,25 @@ fun main() {
     assert!((0u8 as u64) == 0u64, 2000);
     assert!((0u64 as u64) == 0u64, 2001);
     assert!((0u128 as u64) == 0u64, 2002);
+    assert!((0u16 as u64) == 0u64, 2000);
+    assert!((0u32 as u64) == 0u64, 2001);
+    assert!((0u256 as u64) == 0u64, 2002);
 
     // Random small number unchanged.
     assert!((21u8 as u64) == 21u64, 2100);
     assert!((21u64 as u64) == 21u64, 2101);
     assert!((21u128 as u64) == 21u64, 2102);
+    assert!((21u16 as u64) == 21u64, 2100);
+    assert!((21u32 as u64) == 21u64, 2101);
+    assert!((21u256 as u64) == 21u64, 2102);
 
     // Max representable values remain unchanged.
     assert!((255u8 as u64) == 255u64, 2200);
     assert!((18446744073709551615u64 as u64) == 18446744073709551615u64, 2201);
     assert!((18446744073709551615u128 as u64) == 18446744073709551615u64, 2202);
+    assert!((65535u16 as u64) == 65535u64, 2200);
+    assert!((4294967295u32 as u64) == 4294967295u64, 2201);
+    assert!((18446744073709551615u256 as u64) == 18446744073709551615u64, 2202);
 }
 }
 
@@ -48,19 +126,57 @@ fun main() {
     assert!((0u8 as u128) == 0u128, 3000);
     assert!((0u64 as u128) == 0u128, 3001);
     assert!((0u128 as u128) == 0u128, 3002);
+    assert!((0u16 as u128) == 0u128, 3000);
+    assert!((0u32 as u128) == 0u128, 3001);
+    assert!((0u256 as u128) == 0u128, 3002);
 
     // Random small number unchanged.
     assert!((21u8 as u128) == 21u128, 3100);
     assert!((21u64 as u128) == 21u128, 3101);
     assert!((21u128 as u128) == 21u128, 3102);
+    assert!((21u16 as u128) == 21u128, 3100);
+    assert!((21u32 as u128) == 21u128, 3101);
+    assert!((21u256 as u128) == 21u128, 3102);
 
     // Max representable values remain unchanged.
     assert!((255u8 as u128) == 255u128, 3200);
     assert!((18446744073709551615u64 as u128) == 18446744073709551615u128, 3201);
     assert!((340282366920938463463374607431768211455u128 as u128) == 340282366920938463463374607431768211455u128, 3202);
+    assert!((65535u16 as u128) == 65535u128, 2200);
+    assert!((4294967295u32 as u128) == 4294967295u128, 2201);
+    assert!((340282366920938463463374607431768211455u256 as u128) == 340282366920938463463374607431768211455u128, 3202);
 }
 }
 
+// Casting to u256.
+//# run
+script {
+fun main() {
+    // 0 remains unchanged.
+    assert!((0u8 as u256) == 0u256, 3000);
+    assert!((0u64 as u256) == 0u256, 3001);
+    assert!((0u128 as u256) == 0u256, 3002);
+    assert!((0u16 as u256) == 0u256, 3000);
+    assert!((0u32 as u256) == 0u256, 3001);
+    assert!((0u256 as u256) == 0u256, 3002);
+
+    // Random small number unchanged.
+    assert!((21u8 as u256) == 21u256, 3100);
+    assert!((21u64 as u256) == 21u256, 3101);
+    assert!((21u128 as u256) == 21u256, 3102);
+    assert!((21u16 as u256) == 21u256, 3100);
+    assert!((21u32 as u256) == 21u256, 3101);
+    assert!((21u256 as u256) == 21u256, 3102);
+
+    // Max representable values remain unchanged.
+    assert!((255u8 as u256) == 255u256, 3200);
+    assert!((18446744073709551615u64 as u256) == 18446744073709551615u256, 3201);
+    assert!((340282366920938463463374607431768211455u128 as u256) == 340282366920938463463374607431768211455u256, 3202);
+    assert!((65535u16 as u256) == 65535u256, 2200);
+    assert!((4294967295u32 as u256) == 4294967295u256, 2201);
+    assert!((115792089237316195423570985008687907853269984665640564039457584007913129639935u256 as u256) == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 3202);
+}
+}
 
 // Casting to u8, overflowing.
 //# run
@@ -111,6 +227,168 @@ fun main() {
 }
 }
 
+//# run
+script {
+fun main() {
+    // should fail
+    (2561u16 as u8);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    (65532u16 as u8);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    (256123u32 as u8);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    (11579208923731619542357098500868790785326998466564056403945758400791312963993u256 as u8);
+}
+}
+
+// Casting to u16, overflowing.
+//# run
+script {
+fun main() {
+    // should fail
+    (256343532u64 as u16);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    (3564603u64 as u16);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    (256666765790535666u128 as u16);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    (256765735666u128 as u16);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    (18446744073709551615u64 as u16);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    (340282366920938463463374607431768211455u128 as u16);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    (429496729u32 as u16);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    (42949629u32 as u16);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    (115792089237316195423570985008687907853269984665640564039457584007913129639u256 as u16);
+}
+}
+
+// Casting to u32, overflowing.
+//# run
+script {
+fun main() {
+    // should fail
+    (4294967295644u64 as u32);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    (3564699003u64 as u32);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    (256666765790535666u128 as u32);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    (25676573566896u128 as u32);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    (18446744073709551615u64 as u32);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    (340282366920938463463374607431768211455u128 as u32);
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    (115792089237316195423570985008687907853269984665640564039457584007913129639u256 as u32);
+}
+}
+
 // Casting to u64, overflowing.
 //# run
 script {
diff --git a/language/move-compiler/transactional-tests/tests/operators/comparison_operators.move b/language/move-compiler/transactional-tests/tests/operators/comparison_operators.move
index ddfc696c73..54c6d6104b 100644
--- a/language/move-compiler/transactional-tests/tests/operators/comparison_operators.move
+++ b/language/move-compiler/transactional-tests/tests/operators/comparison_operators.move
@@ -4,14 +4,24 @@ fun main() {
     assert!(0u8 == 0u8, 1000);
     assert!(0u64 == 0u64, 1001);
     assert!(0u128 == 0u128, 1002);
+    assert!(0u16 == 0u16, 1003);
+    assert!(0u32 == 0u32, 1004);
+    assert!(0u256 == 0u256, 1005);
 
     assert!(!(0u8 == 1u8), 1100);
     assert!(!(0u64 == 1u64), 1101);
     assert!(!(0u128 == 1u128), 1102);
+    assert!(!(0u16 == 1u16), 1103);
+    assert!(!(0u32 == 1u32), 1104);
+    assert!(!(0u256 == 1u256), 1105);
+
 
     assert!(!(1u8 == 0u8), 1200);
     assert!(!(1u64 == 0u64), 1201);
     assert!(!(1u128 == 0u128), 1202);
+    assert!(!(1u16 == 0u16), 1203);
+    assert!(!(1u32 == 0u32), 1204);
+    assert!(!(1u256 == 0u256), 1205);
 }
 }
 
@@ -29,6 +39,18 @@ fun main() {
     assert!(!(0u8 != 0u8), 2200);
     assert!(!(0u64 != 0u64), 2201);
     assert!(!(0u128 != 0u128), 2201);
+
+    assert!(0u16 != 1u16, 2000);
+    assert!(0u32 != 1u32, 2001);
+    assert!(0u256 != 1u256, 2001);
+
+    assert!(1u16 != 0u16, 2100);
+    assert!(1u32 != 0u32, 2101);
+    assert!(1u256 != 0u256, 2101);
+
+    assert!(!(0u16 != 0u16), 2200);
+    assert!(!(0u32 != 0u32), 2201);
+    assert!(!(0u256 != 0u256), 2201);
 }
 }
 
@@ -46,6 +68,18 @@ fun main() {
     assert!(!(0u8 < 0u8), 3200);
     assert!(!(0u64 < 0u64), 3201);
     assert!(!(0u128 < 0u128), 3202);
+
+    assert!(0u16 < 1u16, 3000);
+    assert!(0u32 < 1u32, 3001);
+    assert!(0u256 < 1u256, 3002);
+
+    assert!(!(1u16 < 0u16), 3100);
+    assert!(!(1u32 < 0u32), 3101);
+    assert!(!(1u256 < 0u256), 3102);
+
+    assert!(!(0u16 < 0u16), 3200);
+    assert!(!(0u32 < 0u32), 3201);
+    assert!(!(0u256 < 0u256), 3202);
 }
 }
 
@@ -63,6 +97,18 @@ fun main() {
     assert!(!(0u8 > 0u8), 4200);
     assert!(!(0u64 > 0u64), 4201);
     assert!(!(0u128 > 0u128), 4202);
+
+    assert!(1u16 > 0u16, 4000);
+    assert!(1u32 > 0u32, 4001);
+    assert!(1u256 > 0u256, 4002);
+
+    assert!(!(0u16 > 1u16), 4100);
+    assert!(!(0u32 > 1u32), 4101);
+    assert!(!(0u256 > 1u256), 4102);
+
+    assert!(!(0u16 > 0u16), 4200);
+    assert!(!(0u32 > 0u32), 4201);
+    assert!(!(0u256 > 0u256), 4202);
 }
 }
 
@@ -80,6 +126,18 @@ fun main() {
     assert!(0u8 <= 0u8, 5200);
     assert!(0u64 <= 0u64, 5201);
     assert!(0u128 <= 0u128, 5202);
+
+    assert!(0u16 <= 1u16, 5000);
+    assert!(0u32 <= 1u32, 5001);
+    assert!(0u256 <= 1u256, 5002);
+
+    assert!(!(1u16 <= 0u16), 5100);
+    assert!(!(1u32 <= 0u32), 5101);
+    assert!(!(1u256 <= 0u256), 5102);
+
+    assert!(0u16 <= 0u16, 5200);
+    assert!(0u32 <= 0u32, 5201);
+    assert!(0u256 <= 0u256, 5202);
 }
 }
 
@@ -97,5 +155,17 @@ fun main() {
     assert!(0u8 >= 0u8, 6200);
     assert!(0u64 >= 0u64, 6201);
     assert!(0u128 >= 0u128, 6202);
+
+    assert!(1u16 >= 0u16, 6000);
+    assert!(1u32 >= 0u32, 6001);
+    assert!(1u256 >= 0u256, 6002);
+
+    assert!(!(0u16 >= 1u16), 6100);
+    assert!(!(0u32 >= 1u32), 6101);
+    assert!(!(0u256 >= 1u256), 6102);
+
+    assert!(0u16 >= 0u16, 6200);
+    assert!(0u32 >= 0u32, 6201);
+    assert!(0u256 >= 0u256, 6202);
 }
 }
diff --git a/language/move-compiler/transactional-tests/tests/operators/shift_operators.exp b/language/move-compiler/transactional-tests/tests/operators/shift_operators.exp
index 1b2d9a792b..6e7ff29904 100644
--- a/language/move-compiler/transactional-tests/tests/operators/shift_operators.exp
+++ b/language/move-compiler/transactional-tests/tests/operators/shift_operators.exp
@@ -1,4 +1,4 @@
-processed 12 tasks
+processed 16 tasks
 
 task 0 'run'. lines 1-8:
 Error: Script execution failed with VMError: {
@@ -45,7 +45,43 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 2)],
 }
 
-task 5 'run'. lines 42-52:
+task 5 'run'. lines 42-48:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 6 'run'. lines 50-56:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 58-64:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 66-72:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 9 'run'. lines 74-83:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
diff --git a/language/move-compiler/transactional-tests/tests/operators/shift_operators.move b/language/move-compiler/transactional-tests/tests/operators/shift_operators.move
index 4134a28435..57507f7f7d 100644
--- a/language/move-compiler/transactional-tests/tests/operators/shift_operators.move
+++ b/language/move-compiler/transactional-tests/tests/operators/shift_operators.move
@@ -47,6 +47,37 @@ fun main() {
 }
 }
 
+//# run
+script {
+fun main() {
+    // should fail
+    0u16 << 16u8;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    0u32 << 32u8;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    0u16 >> 16u8;
+}
+}
+
+//# run
+script {
+fun main() {
+    // should fail
+    0u32 >> 32u8;
+}
+}
 
 
 // Shifting 0 results in 0.
@@ -56,10 +87,16 @@ fun main() {
     assert!(0u8 << 4u8 == 0u8, 1000);
     assert!(0u64 << 1u8 == 0u64, 1001);
     assert!(0u128 << 127u8 == 0u128, 1002);
+    assert!(0u16 << 15u8 == 0u16, 1003);
+    assert!(0u32 << 4u8 == 0u32, 1004);
+    assert!(0u256 << 255u8 == 0u256, 1005);
 
     assert!(0u8 >> 4u8 == 0u8, 1100);
     assert!(0u64 >> 1u8 == 0u64, 1101);
     assert!(0u128 >> 127u8 == 0u128, 1102);
+    assert!(0u16 >> 15u8 == 0u16, 1103);
+    assert!(0u32 >> 31u8 == 0u32, 1104);
+    assert!(0u256 >> 255u8 == 0u256, 1105);
 }
 }
 
@@ -71,10 +108,15 @@ fun main() {
     assert!(100u8 << 0u8 == 100u8, 2000);
     assert!(43u64 << 0u8 == 43u64, 2001);
     assert!(57348765484584586725315342563424u128 << 0u8 == 57348765484584586725315342563424u128, 2002);
+    assert!(1000u16 << 0u8 == 1000u16, 2003);
+    assert!(10000u32 << 0u8 == 10000u32, 2004);
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 << 0u8 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 2005);
 
     assert!(100u8 >> 0u8 == 100u8, 2100);
     assert!(43u64 >> 0u8 == 43u64, 2101);
-    assert!(57348765484584586725315342563424u128 >> 0u8 == 57348765484584586725315342563424u128, 2102);
+    assert!(1000u16 >> 0u8 == 1000u16, 2103);
+    assert!(10000u32 >> 0u8 == 10000u32, 2104);
+    assert!(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 >> 0u8 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 2105);
 }
 }
 
@@ -87,10 +129,16 @@ fun main() {
     assert!(1u8 << 1u8 == 2u8, 3000);
     assert!(7u64 << 1u8 == 14u64, 3001);
     assert!(1000u128 << 1u8 == 2000u128, 3002);
+    assert!(3u16 << 1u8 == 6u16, 3003);
+    assert!(7u32 << 1u8 == 14u32, 3004);
+    assert!(1000u256 << 1u8 == 2000u256, 3005);
 
     assert!(1u8 >>1u8 == 0u8, 3100);
     assert!(7u64 >> 1u8 == 3u64, 3101);
     assert!(1000u128 >> 1u8 == 500u128, 3102);
+    assert!(3u16 >> 1u8 == 1u16, 3103);
+    assert!(7u32 >> 1u8 == 3u32, 3104);
+    assert!(1000u256 >> 1u8 == 500u256, 3105);
 }
 }
 
@@ -103,6 +151,9 @@ fun main() {
     assert!(1234u64 >> 63u8 == 0u64, 4000);
     assert!(3u8 >> 5u8 == 0u8, 4001);
     assert!(43152365326753472145312542634526753u128 >> 127u8 == 0u128, 4002);
+    assert!(1234u16 >> 15u8 == 0u16, 4003);
+    assert!(123456u32 >> 31u8 == 0u32, 4004);
+    assert!(11579208923731619542357098500868790785326998466564056403945758400791312963993u256 >> 255u8 == 0u256, 4005);
 }
 }
 
@@ -115,6 +166,9 @@ fun main() {
     assert!(7u8 << 7u8 == 128u8, 5000);
     assert!(7u64 << 62u8 == 13835058055282163712u64, 5001);
     assert!(2u128 << 127u8 == 0u128, 5002);
+    assert!(7u16 << 15u8 == 32768u16, 5003);
+    assert!(17u32 << 30u8 == 1073741824u32, 5004);
+    assert!(7u256 << 254u8 == 86844066927987146567678238756515930889952488499230423029593188005934847229952u256, 5005);
 }
 }
 
@@ -136,5 +190,19 @@ fun main() {
     assert!(8629035907847368941279654523567912314u128 << 77u8 == 317056859699765342273530379836650946560u128, 6201);
     assert!(5742389768935678297185789157531u128 << 10u8 == 5880207123390134576318248097311744u128, 6202);
     assert!(295429678238907658936718926478967892769u128 << 83u8 == 78660438169199498567214234129963941888u128, 6203);
+
+    assert!(12u16 << 4u8 == 192u16, 6300);
+    assert!(1234u16 << 12u8 == 8192u16, 6301);
+    assert!(6553u16 << 15u8 == 32768u16, 6302);
+
+    assert!(1234567u32 << 12u8 == 761819136u32, 6400);
+    assert!(1234567u32 << 17u8 == 2903375872u32, 6401);
+    assert!(12345671u32 << 27u8 == 939524096u32, 6402);
+
+    assert!(123u256 << 1u8 == 246u256, 6500);
+    assert!(123453u256 << 13u8 == 1011326976u256, 6501);
+    assert!(123453678909u256 << 76u8 == 9327896247469005265829994770202624u256, 6502);
+    assert!(1234536789093546757803u256 << 168u8 == 461895049882996264654333091841553462264195467433049741837793730775482368u256, 6503);
+    assert!(1234536789093546757803786604381691994985672142341299639418u256 << 202u8 == 33658913632735705985908889087832028406806276615240336691180752852867975479296u256, 6504);
 }
 }
diff --git a/language/move-compiler/transactional-tests/tests/parser/control_exp_associativity.exp b/language/move-compiler/transactional-tests/tests/parser/control_exp_associativity.exp
new file mode 100644
index 0000000000..c1f87c04a8
--- /dev/null
+++ b/language/move-compiler/transactional-tests/tests/parser/control_exp_associativity.exp
@@ -0,0 +1,4 @@
+processed 2 tasks
+
+task 1 'run'. lines 24-24:
+return values: 42
diff --git a/language/move-compiler/transactional-tests/tests/parser/control_exp_associativity.move b/language/move-compiler/transactional-tests/tests/parser/control_exp_associativity.move
new file mode 100644
index 0000000000..de4dfb0616
--- /dev/null
+++ b/language/move-compiler/transactional-tests/tests/parser/control_exp_associativity.move
@@ -0,0 +1,24 @@
+//# publish
+module 0x42::M {
+    fun t(): u64 {
+        // 1 + (if (false) 0 else (10 + 10))
+        let x = 1 + if (false) 0 else 10 + 10;
+        assert!(x == 21, 0);
+        // true && (if (false) false else (10 == 10))
+        let x = true && if (false) false else 10 == 10;
+        assert!(x, 0);
+        // (if (false) 0 else 10 ) == 10
+        let x = if (false) 0 else { 10 } == 10;
+        assert!(x, 0);
+        // (if (true) 0 else 10) + 1
+        let x = if (true) 0 else { 10 } + 1;
+        assert!(x == 1, 0);
+        // if (true) 0 else (10 + 1)
+        let x = if (true) 0 else ({ 10 }) + 1;
+        assert!(x == 0, 0);
+        42
+    }
+
+}
+
+//# run 0x42::M::t
diff --git a/language/move-compiler/transactional-tests/tests/parser/hex_and_decimal_numbers.move b/language/move-compiler/transactional-tests/tests/parser/hex_and_decimal_numbers.move
index b61bd21205..845ece4415 100644
--- a/language/move-compiler/transactional-tests/tests/parser/hex_and_decimal_numbers.move
+++ b/language/move-compiler/transactional-tests/tests/parser/hex_and_decimal_numbers.move
@@ -6,6 +6,24 @@ script {
         assert!(255u8 == 0xFFu8, 42);
         assert!(255u8 == 0x0FFu8, 42);
 
+        assert!(15u16 == 0xFu16, 42);
+        assert!(15u16 == 0x0Fu16, 42);
+        assert!(255u16 == 0xFFu16, 42);
+        assert!(255u16 == 0x0FFu16, 42);
+        assert!(4095u16 == 0xFFFu16, 42);
+        assert!(65535u16 == 0xFFFFu16, 42);
+        assert!(65535u16 == 0x00FFFFu16, 42);
+
+
+        assert!(15u32 == 0xFu32, 42);
+        assert!(15u32 == 0x0Fu32, 42);
+        assert!(255u32 == 0xFFu32, 42);
+        assert!(255u32 == 0x0FFu32, 42);
+        assert!(4095u32 == 0xFFFu32, 42);
+        assert!(65535u32 == 0xFFFFu32, 42);
+        assert!(4294967295u32 == 0xFFFFFFFFu32, 42);
+        assert!(4294967295u32 == 0x00FFFFFFFFu32, 42);
+
         assert!(15u64 == 0xFu64, 42);
         assert!(15u64 == 0x0Fu64, 42);
         assert!(255u64 == 0xFFu64, 42);
@@ -27,5 +45,43 @@ script {
             340282366920938463463374607431768211455u128 == 0x0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFu128,
             42,
         );
+
+        assert!(15u128 == 0xFu128, 42);
+        assert!(15u128 == 0x0Fu128, 42);
+        assert!(255u128 == 0xFFu128, 42);
+        assert!(255u128 == 0x0FFu128, 42);
+        assert!(18446744073709551615u128 == 0xFFFFFFFFFFFFFFFFu128, 42);
+        assert!(18446744073709551615u128 == 0x0FFFFFFFFFFFFFFFFu128, 42);
+        assert!(
+            340282366920938463463374607431768211455u128 == 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFu128,
+            42,
+        );
+        assert!(
+            340282366920938463463374607431768211455u128 == 0x0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFu128,
+            42,
+        );
+
+        assert!(15u256 == 0xFu256, 42);
+        assert!(15u256 == 0x0Fu256, 42);
+        assert!(255u256 == 0xFFu256, 42);
+        assert!(255u256 == 0x0FFu256, 42);
+        assert!(18446744073709551615u256 == 0xFFFFFFFFFFFFFFFFu256, 42);
+        assert!(18446744073709551615u256 == 0x0FFFFFFFFFFFFFFFFu256, 42);
+        assert!(
+            340282366920938463463374607431768211455u256 == 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFu256,
+            42,
+        );
+        assert!(
+            115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFu256,
+            42,
+        );
+        assert!(
+            115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 0x0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFu256,
+            42,
+        );
+        assert!(
+            115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 0x00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFu256,
+            42,
+        );
     }
 }
diff --git a/language/move-compiler/transactional-tests/tests/parser/num_literal_underscore.exp b/language/move-compiler/transactional-tests/tests/parser/num_literal_underscore.exp
new file mode 100644
index 0000000000..6cd67db3f6
--- /dev/null
+++ b/language/move-compiler/transactional-tests/tests/parser/num_literal_underscore.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/language/move-compiler/transactional-tests/tests/parser/num_literal_underscore.move b/language/move-compiler/transactional-tests/tests/parser/num_literal_underscore.move
new file mode 100644
index 0000000000..6ec48a75fe
--- /dev/null
+++ b/language/move-compiler/transactional-tests/tests/parser/num_literal_underscore.move
@@ -0,0 +1,50 @@
+//# run
+script {
+    fun main() {
+        assert!(15u8 == 1_5u8, 15);
+        assert!(15_u8 == 1_5u8, 15);
+        assert!(1__5u8 == 15___u8, 15);
+        assert!(1__500u16 == 1500___u16, 150);
+        assert!(1__5u32 == 15___u32, 15);
+        assert!(1556u64 == 1_5_56u64, 1556);
+        assert!(1_556u128 == 1_5_56__u128, 1556);
+        assert!(015u8 == 1_5u8, 15);
+        assert!(15_0u8 == 1_50u8, 150);
+        assert!(00_1__5u8 == 15___u8, 15);
+        assert!(00_1__5u256 == 15___u256, 15);
+
+        assert!(15u8 == 1_5, 15);
+        assert!(15_u8 == 1_5, 15);
+        assert!(1__5u8 == 15___, 15);
+        assert!(1556u64 == 1_5_56, 1556);
+        assert!(1_556u128 == 1_5_56__, 1556);
+        assert!(015u8 == 1_5, 15);
+        assert!(15_0u8 == 1_50, 150);
+        assert!(00_1__5u8 == 15___, 15);
+        assert!(00_1__5u16 == 15___, 15);
+        assert!(00_1__5u32 == 15___, 15);
+
+        assert!(0x15u8 == 0x1_5u8, 15);
+        assert!(0x15_u8 == 0x1_5u8, 15);
+        assert!(0x1__5u8 == 0x15___u8, 15);
+        assert!(0x1__50u16 == 0x150___u16, 150);
+        assert!(0x1__5u32 == 0x15___u32, 15);
+        assert!(0x1556u64 == 0x1_5_56u64, 1556);
+        assert!(0x1_556u128 == 0x1_5_56__u128, 1556);
+        assert!(0x015u8 == 0x1_5u8, 15);
+        assert!(0x15_u8 == 0x1_5u8, 150);
+        assert!(0x00_1__5u8 == 0x15___u8, 15);
+        assert!(0x00_1__5u256 == 0x15___u256, 15);
+
+        assert!(0x15u8 == 0x1_5, 15);
+        assert!(0x15_u8 == 0x1_5, 15);
+        assert!(0x1__5u8 == 0x15___, 15);
+        assert!(0x1556u64 == 0x1_5_56, 1556);
+        assert!(0x1_556u128 == 0x1_5_56__, 1556);
+        assert!(0x015u8 == 0x1_5, 15);
+        assert!(0x15_u8 == 0x1_5, 150);
+        assert!(0x00_1__5u8 == 0x15___, 15);
+        assert!(0x00_1__5u16 == 0x15___, 15);
+        assert!(0x00_1__5u32 == 0x15___, 15);
+    }
+}
diff --git a/language/move-compiler/transactional-tests/tests/parser/return_not_binary.exp b/language/move-compiler/transactional-tests/tests/parser/return_not_binary.exp
new file mode 100644
index 0000000000..7b8e3b69e2
--- /dev/null
+++ b/language/move-compiler/transactional-tests/tests/parser/return_not_binary.exp
@@ -0,0 +1,7 @@
+processed 3 tasks
+
+task 1 'run'. lines 18-18:
+return values: 0
+
+task 2 'run'. lines 20-20:
+return values: 0
diff --git a/language/move-compiler/transactional-tests/tests/parser/return_not_binary.move b/language/move-compiler/transactional-tests/tests/parser/return_not_binary.move
new file mode 100644
index 0000000000..0ae400d564
--- /dev/null
+++ b/language/move-compiler/transactional-tests/tests/parser/return_not_binary.move
@@ -0,0 +1,20 @@
+// Test returning expressions, that if parsed differently, could be binary operators,
+// where the left argument would be the 'return'
+
+//# publish
+module 0x42::M {
+    struct S { f: u64}
+
+    fun t1(u: &u64): u64 {
+        if (true) return * u;
+        0
+    }
+
+    fun t2(s: &S): &u64 {
+        if (true) return & s.f else & s.f
+    }
+}
+
+//# run 0x42::M::t1 --args 0
+
+//# run 0x42::M::t2 --args 0
diff --git a/language/move-core/types/Cargo.toml b/language/move-core/types/Cargo.toml
index 49815fb706..3faeb6aa35 100644
--- a/language/move-core/types/Cargo.toml
+++ b/language/move-core/types/Cargo.toml
@@ -7,11 +7,10 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = ["crates-io"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
-bcs = "0.1.2"
 hex = "0.4.3"
 once_cell = "1.7.2"
 proptest = { version = "1.0.0", default-features = false, optional = true }
@@ -20,15 +19,23 @@ rand = "0.8.3"
 ref-cast = "1.0.6"
 serde = { version = "1.0.124", default-features = false }
 serde_bytes = "0.11.5"
+primitive-types = {version = "0.10.1", features = ["impl-serde"]}
+uint = "0.9.4"
+num = "0.4.0"
+ethnum = "1.0.4"
+arbitrary = { version = "1.1.7", features = [ "derive_arbitrary"], optional = true }
+
+bcs.workspace = true
 
 [dev-dependencies]
 proptest = "1.0.0"
 proptest-derive = "0.3.0"
-regex = "1.4.3"
+regex = "1.5.5"
 serde_json = "1.0.64"
+arbitrary = { version = "1.1.7", features = [ "derive_arbitrary"] }
 
 [features]
 address20 = []
 address32 = []
 default = []
-fuzzing = ["proptest", "proptest-derive"]
+fuzzing = ["proptest", "proptest-derive", "arbitrary"]
diff --git a/language/move-core/types/src/account_address.rs b/language/move-core/types/src/account_address.rs
index 117fbc8541..61a4889907 100644
--- a/language/move-core/types/src/account_address.rs
+++ b/language/move-core/types/src/account_address.rs
@@ -10,6 +10,7 @@ use std::{convert::TryFrom, fmt, str::FromStr};
 /// A struct that represents an account address.
 #[derive(Ord, PartialOrd, Eq, PartialEq, Hash, Clone, Copy)]
 #[cfg_attr(any(test, feature = "fuzzing"), derive(proptest_derive::Arbitrary))]
+#[cfg_attr(any(test, feature = "fuzzing"), derive(arbitrary::Arbitrary))]
 pub struct AccountAddress([u8; AccountAddress::LENGTH]);
 
 impl AccountAddress {
@@ -33,20 +34,38 @@ impl AccountAddress {
     /// Hex address: 0x1
     pub const ONE: Self = Self::get_hex_address_one();
 
+    /// Hex address: 0x2
+    pub const TWO: Self = Self::get_hex_address_two();
+
     const fn get_hex_address_one() -> Self {
         let mut addr = [0u8; AccountAddress::LENGTH];
         addr[AccountAddress::LENGTH - 1] = 1u8;
         Self(addr)
     }
 
+    const fn get_hex_address_two() -> Self {
+        let mut addr = [0u8; AccountAddress::LENGTH];
+        addr[AccountAddress::LENGTH - 1] = 2u8;
+        Self(addr)
+    }
+
     pub fn random() -> Self {
         let mut rng = OsRng;
         let buf: [u8; Self::LENGTH] = rng.gen();
         Self(buf)
     }
 
+    /// Return a canonical string representation of the address
+    /// Addresses are hex-encoded lowercase values of length ADDRESS_LENGTH (16, 20, or 32 depending on the Move platform)
+    /// e.g., 0000000000000000000000000000000a, *not* 0x0000000000000000000000000000000a, 0xa, or 0xA
+    /// Note: this function is guaranteed to be stable, and this is suitable for use inside
+    /// Move native functions or the VM.
+    pub fn to_canonical_string(&self) -> String {
+        hex::encode(self.0)
+    }
+
     pub fn short_str_lossless(&self) -> String {
-        let hex_str = hex::encode(&self.0).trim_start_matches('0').to_string();
+        let hex_str = hex::encode(self.0).trim_start_matches('0').to_string();
         if hex_str.is_empty() {
             "0".to_string()
         } else {
@@ -119,13 +138,13 @@ impl std::ops::Deref for AccountAddress {
 
 impl fmt::Display for AccountAddress {
     fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
-        write!(f, "{:X}", self)
+        write!(f, "{:x}", self)
     }
 }
 
 impl fmt::Debug for AccountAddress {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{:X}", self)
+        write!(f, "{:x}", self)
     }
 }
 
@@ -223,7 +242,12 @@ impl FromStr for AccountAddress {
     type Err = AccountAddressParseError;
 
     fn from_str(s: &str) -> Result<Self, AccountAddressParseError> {
-        Self::from_hex(s)
+        // Accept 0xADDRESS or ADDRESS
+        if let Ok(address) = AccountAddress::from_hex_literal(s) {
+            Ok(address)
+        } else {
+            Self::from_hex(s)
+        }
     }
 }
 
@@ -234,7 +258,7 @@ impl<'de> Deserialize<'de> for AccountAddress {
     {
         if deserializer.is_human_readable() {
             let s = <String>::deserialize(deserializer)?;
-            AccountAddress::from_hex(s).map_err(D::Error::custom)
+            AccountAddress::from_str(&s).map_err(D::Error::custom)
         } else {
             // In order to preserve the Serde data model and help analysis tools,
             // make sure to wrap our value in a container with the same name
@@ -295,8 +319,8 @@ mod tests {
 
         let address = AccountAddress::from_hex(hex).unwrap();
 
-        assert_eq!(format!("{}", address), upper_hex);
-        assert_eq!(format!("{:?}", address), upper_hex);
+        assert_eq!(format!("{}", address), hex);
+        assert_eq!(format!("{:?}", address), hex);
         assert_eq!(format!("{:X}", address), upper_hex);
         assert_eq!(format!("{:x}", address), hex);
 
diff --git a/language/move-core/types/src/effects.rs b/language/move-core/types/src/effects.rs
index b35d353756..7bec071e3a 100644
--- a/language/move-core/types/src/effects.rs
+++ b/language/move-core/types/src/effects.rs
@@ -7,60 +7,114 @@ use crate::{
     identifier::Identifier,
     language_storage::{ModuleId, StructTag, TypeTag},
 };
-use anyhow::{format_err, Error, Result};
+use anyhow::{bail, Result};
 use std::collections::btree_map::{self, BTreeMap};
 
-/// A collection of changes to modules and resources under a Move account.
+/// A storage operation.
 #[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
-pub struct AccountChangeSet {
-    modules: BTreeMap<Identifier, Option<Vec<u8>>>,
-    resources: BTreeMap<StructTag, Option<Vec<u8>>>,
+pub enum Op<T> {
+    /// Inserts some new data into an empty slot.
+    New(T),
+    /// Modifies some data that currently exists.
+    Modify(T),
+    /// Deletes some data that currently exists.
+    Delete,
 }
 
-fn publish_checked<K, V, F>(map: &mut BTreeMap<K, Option<V>>, k: K, v: V, make_err: F) -> Result<()>
-where
-    K: Ord,
-    F: FnOnce() -> Error,
-{
-    match map.entry(k) {
-        btree_map::Entry::Occupied(entry) => {
-            let r = entry.into_mut();
-            match r {
-                Some(_) => return Err(make_err()),
-                None => *r = Some(v),
-            }
+impl<T> Op<T> {
+    pub fn as_ref(&self) -> Op<&T> {
+        use Op::*;
+
+        match self {
+            New(data) => New(data),
+            Modify(data) => Modify(data),
+            Delete => Delete,
         }
-        btree_map::Entry::Vacant(entry) => {
-            entry.insert(Some(v));
+    }
+
+    pub fn map<F, U>(self, f: F) -> Op<U>
+    where
+        F: FnOnce(T) -> U,
+    {
+        use Op::*;
+
+        match self {
+            New(data) => New(f(data)),
+            Modify(data) => Modify(f(data)),
+            Delete => Delete,
         }
     }
-    Ok(())
+
+    pub fn ok(self) -> Option<T> {
+        use Op::*;
+
+        match self {
+            New(data) | Modify(data) => Some(data),
+            Delete => None,
+        }
+    }
+}
+
+/// A collection of resource and module operations on a Move account.
+#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+pub struct AccountChangeSet {
+    modules: BTreeMap<Identifier, Op<Vec<u8>>>,
+    resources: BTreeMap<StructTag, Op<Vec<u8>>>,
 }
 
-fn unpublish_checked<K, V, F>(map: &mut BTreeMap<K, Option<V>>, k: K, make_err: F) -> Result<()>
+/// This implements an algorithm to squash two change sets together by merging pairs of operations
+/// on the same item together. This is similar to squashing two commits in a version control system.
+///
+/// It should be noted that all operation types have some implied pre and post conditions:
+///   - New
+///     - before: data doesn't exist
+///     - after: data exists (new)
+///   - Modify
+///     - before: data exists
+///     - after: data exists (modified)
+///   - Delete
+///     - before: data exists
+///     - after: data does not exist (deleted)
+///
+/// It is possible to have a pair of operations resulting in conflicting states, in which case the
+/// squash will fail.
+fn squash<K, V>(map: &mut BTreeMap<K, Op<V>>, other: BTreeMap<K, Op<V>>) -> Result<()>
 where
     K: Ord,
-    F: FnOnce() -> Error,
 {
-    match map.entry(k) {
-        btree_map::Entry::Occupied(entry) => {
-            let r = entry.into_mut();
-            match r {
-                Some(_) => *r = None,
-                None => return Err(make_err()),
+    use btree_map::Entry::*;
+    use Op::*;
+
+    for (key, op) in other.into_iter() {
+        match map.entry(key) {
+            Occupied(mut entry) => {
+                let r = entry.get_mut();
+                match (r.as_ref(), op) {
+                    (Modify(_) | New(_), New(_)) | (Delete, Delete | Modify(_)) => {
+                        bail!("The given change sets cannot be squashed")
+                    }
+                    (Modify(_), Modify(data)) => *r = Modify(data),
+                    (New(_), Modify(data)) => *r = New(data),
+                    (Modify(_), Delete) => *r = Delete,
+                    (Delete, New(data)) => *r = Modify(data),
+                    (New(_), Delete) => {
+                        entry.remove();
+                    }
+                }
+            }
+            Vacant(entry) => {
+                entry.insert(op);
             }
-        }
-        btree_map::Entry::Vacant(entry) => {
-            entry.insert(None);
         }
     }
+
     Ok(())
 }
 
 impl AccountChangeSet {
     pub fn from_modules_resources(
-        modules: BTreeMap<Identifier, Option<Vec<u8>>>,
-        resources: BTreeMap<StructTag, Option<Vec<u8>>>,
+        modules: BTreeMap<Identifier, Op<Vec<u8>>>,
+        resources: BTreeMap<StructTag, Op<Vec<u8>>>,
     ) -> Self {
         Self { modules, resources }
     }
@@ -72,28 +126,54 @@ impl AccountChangeSet {
         }
     }
 
+    pub fn add_module_op(&mut self, name: Identifier, op: Op<Vec<u8>>) -> Result<()> {
+        use btree_map::Entry::*;
+
+        match self.modules.entry(name) {
+            Occupied(entry) => bail!("Module {} already exists", entry.key()),
+            Vacant(entry) => {
+                entry.insert(op);
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn add_resource_op(&mut self, struct_tag: StructTag, op: Op<Vec<u8>>) -> Result<()> {
+        use btree_map::Entry::*;
+
+        match self.resources.entry(struct_tag) {
+            Occupied(entry) => bail!("Resource {} already exists", entry.key()),
+            Vacant(entry) => {
+                entry.insert(op);
+            }
+        }
+
+        Ok(())
+    }
+
     pub fn into_inner(
         self,
     ) -> (
-        BTreeMap<Identifier, Option<Vec<u8>>>,
-        BTreeMap<StructTag, Option<Vec<u8>>>,
+        BTreeMap<Identifier, Op<Vec<u8>>>,
+        BTreeMap<StructTag, Op<Vec<u8>>>,
     ) {
         (self.modules, self.resources)
     }
 
-    pub fn into_resources(self) -> BTreeMap<StructTag, Option<Vec<u8>>> {
+    pub fn into_resources(self) -> BTreeMap<StructTag, Op<Vec<u8>>> {
         self.resources
     }
 
-    pub fn into_modules(self) -> BTreeMap<Identifier, Option<Vec<u8>>> {
+    pub fn into_modules(self) -> BTreeMap<Identifier, Op<Vec<u8>>> {
         self.modules
     }
 
-    pub fn modules(&self) -> &BTreeMap<Identifier, Option<Vec<u8>>> {
+    pub fn modules(&self) -> &BTreeMap<Identifier, Op<Vec<u8>>> {
         &self.modules
     }
 
-    pub fn resources(&self) -> &BTreeMap<StructTag, Option<Vec<u8>>> {
+    pub fn resources(&self) -> &BTreeMap<StructTag, Op<Vec<u8>>> {
         &self.resources
     }
 
@@ -102,54 +182,13 @@ impl AccountChangeSet {
     }
 
     pub fn squash(&mut self, other: Self) -> Result<()> {
-        for (name, blob_opt) in other.modules {
-            match blob_opt {
-                Some(blob) => self.publish_module(name, blob)?,
-                None => self.unpublish_module(name)?,
-            }
-        }
-        for (struct_tag, blob_opt) in other.resources {
-            match blob_opt {
-                Some(blob) => self.publish_resource(struct_tag, blob)?,
-                None => self.unpublish_resource(struct_tag)?,
-            }
-        }
-        Ok(())
-    }
-
-    pub fn publish_or_overwrite_module(&mut self, name: Identifier, blob: Vec<u8>) {
-        self.modules.insert(name, Some(blob));
-    }
-
-    pub fn publish_or_overwrite_resource(&mut self, struct_tag: StructTag, blob: Vec<u8>) {
-        self.resources.insert(struct_tag, Some(blob));
-    }
-
-    pub fn publish_module(&mut self, name: Identifier, blob: Vec<u8>) -> Result<()> {
-        publish_checked(&mut self.modules, name, blob, || {
-            format_err!("module already published")
-        })
-    }
-
-    pub fn unpublish_module(&mut self, name: Identifier) -> Result<()> {
-        unpublish_checked(&mut self.modules, name, || {
-            format_err!("module already unpublished")
-        })
-    }
-
-    pub fn publish_resource(&mut self, struct_tag: StructTag, blob: Vec<u8>) -> Result<()> {
-        publish_checked(&mut self.resources, struct_tag, blob, || {
-            format_err!("resource already published")
-        })
-    }
-
-    pub fn unpublish_resource(&mut self, struct_tag: StructTag) -> Result<()> {
-        unpublish_checked(&mut self.resources, struct_tag, || {
-            format_err!("resource already unpublished")
-        })
+        squash(&mut self.modules, other.modules)?;
+        squash(&mut self.resources, other.resources)
     }
 }
 
+// TODO: ChangeSet does not have a canonical representation so the derived Ord is not sound.
+
 /// A collection of changes to a Move state. Each AccountChangeSet in the domain of `accounts`
 /// is guaranteed to be nonempty
 #[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
@@ -164,6 +203,24 @@ impl ChangeSet {
         }
     }
 
+    pub fn add_account_changeset(
+        &mut self,
+        addr: AccountAddress,
+        account_changeset: AccountChangeSet,
+    ) -> Result<()> {
+        match self.accounts.entry(addr) {
+            btree_map::Entry::Occupied(_) => bail!(
+                "Failed to add account change set. Account {} already exists.",
+                addr
+            ),
+            btree_map::Entry::Vacant(entry) => {
+                entry.insert(account_changeset);
+            }
+        }
+
+        Ok(())
+    }
+
     pub fn accounts(&self) -> &BTreeMap<AccountAddress, AccountChangeSet> {
         &self.accounts
     }
@@ -179,61 +236,19 @@ impl ChangeSet {
         }
     }
 
-    pub fn publish_or_overwrite_account_change_set(
-        &mut self,
-        addr: AccountAddress,
-        account_change_set: AccountChangeSet,
-    ) {
-        if !account_change_set.is_empty() {
-            self.accounts.insert(addr, account_change_set);
-        }
-    }
-
-    pub fn publish_or_overwrite_module(&mut self, module_id: ModuleId, blob: Vec<u8>) {
-        let (addr, name) = module_id.into();
-        let account_changeset = self.get_or_insert_account_changeset(addr);
-        account_changeset.publish_or_overwrite_module(name, blob)
-    }
-
-    pub fn publish_module(&mut self, module_id: ModuleId, blob: Vec<u8>) -> Result<()> {
-        let (addr, name) = module_id.into();
-        let account_changeset = self.get_or_insert_account_changeset(addr);
-        account_changeset.publish_module(name, blob)
+    pub fn add_module_op(&mut self, module_id: ModuleId, op: Op<Vec<u8>>) -> Result<()> {
+        let account = self.get_or_insert_account_changeset(*module_id.address());
+        account.add_module_op(module_id.name().to_owned(), op)
     }
 
-    pub fn unpublish_module(&mut self, module_id: ModuleId) -> Result<()> {
-        let (addr, name) = module_id.into();
-        let account_changeset = self.get_or_insert_account_changeset(addr);
-        account_changeset.unpublish_module(name)
-    }
-
-    pub fn publish_or_overwrite_resource(
+    pub fn add_resource_op(
         &mut self,
         addr: AccountAddress,
         struct_tag: StructTag,
-        blob: Vec<u8>,
-    ) {
-        self.get_or_insert_account_changeset(addr)
-            .publish_or_overwrite_resource(struct_tag, blob)
-    }
-
-    pub fn publish_resource(
-        &mut self,
-        addr: AccountAddress,
-        struct_tag: StructTag,
-        blob: Vec<u8>,
+        op: Op<Vec<u8>>,
     ) -> Result<()> {
-        self.get_or_insert_account_changeset(addr)
-            .publish_resource(struct_tag, blob)
-    }
-
-    pub fn unpublish_resource(
-        &mut self,
-        addr: AccountAddress,
-        struct_tag: StructTag,
-    ) -> Result<()> {
-        self.get_or_insert_account_changeset(addr)
-            .unpublish_resource(struct_tag)
+        let account = self.get_or_insert_account_changeset(addr);
+        account.add_resource_op(struct_tag, op)
     }
 
     pub fn squash(&mut self, other: Self) -> Result<()> {
@@ -250,7 +265,7 @@ impl ChangeSet {
         Ok(())
     }
 
-    pub fn into_modules(self) -> impl Iterator<Item = (ModuleId, Option<Vec<u8>>)> {
+    pub fn into_modules(self) -> impl Iterator<Item = (ModuleId, Op<Vec<u8>>)> {
         self.accounts.into_iter().flat_map(|(addr, account)| {
             account
                 .modules
@@ -259,21 +274,23 @@ impl ChangeSet {
         })
     }
 
-    pub fn modules(&self) -> impl Iterator<Item = (AccountAddress, &Identifier, Option<&[u8]>)> {
+    pub fn modules(&self) -> impl Iterator<Item = (AccountAddress, &Identifier, Op<&[u8]>)> {
         self.accounts.iter().flat_map(|(addr, account)| {
             let addr = *addr;
-            account.modules.iter().map(move |(module_name, blob_opt)| {
-                (addr, module_name, blob_opt.as_ref().map(|v| v.as_ref()))
-            })
+            account
+                .modules
+                .iter()
+                .map(move |(module_name, op)| (addr, module_name, op.as_ref().map(|v| v.as_ref())))
         })
     }
 
-    pub fn resources(&self) -> impl Iterator<Item = (AccountAddress, &StructTag, Option<&[u8]>)> {
+    pub fn resources(&self) -> impl Iterator<Item = (AccountAddress, &StructTag, Op<&[u8]>)> {
         self.accounts.iter().flat_map(|(addr, account)| {
             let addr = *addr;
-            account.resources.iter().map(move |(struct_tag, blob_opt)| {
-                (addr, struct_tag, blob_opt.as_ref().map(|v| v.as_ref()))
-            })
+            account
+                .resources
+                .iter()
+                .map(move |(struct_tag, op)| (addr, struct_tag, op.as_ref().map(|v| v.as_ref())))
         })
     }
 }
diff --git a/language/move-core/types/src/errmap.rs b/language/move-core/types/src/errmap.rs
index 06f6055112..19b9d4935f 100644
--- a/language/move-core/types/src/errmap.rs
+++ b/language/move-core/types/src/errmap.rs
@@ -20,7 +20,7 @@ pub struct ErrorDescription {
     pub code_description: String,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct ErrorMapping {
     /// The set of error categories and their descriptions
     pub error_categories: BTreeMap<u64, ErrorDescription>,
@@ -28,15 +28,6 @@ pub struct ErrorMapping {
     pub module_error_maps: BTreeMap<ModuleId, BTreeMap<u64, ErrorDescription>>,
 }
 
-impl Default for ErrorMapping {
-    fn default() -> Self {
-        Self {
-            error_categories: BTreeMap::new(),
-            module_error_maps: BTreeMap::new(),
-        }
-    }
-}
-
 impl ErrorMapping {
     pub fn add_error_category(
         &mut self,
diff --git a/language/move-core/types/src/gas_algebra.rs b/language/move-core/types/src/gas_algebra.rs
new file mode 100644
index 0000000000..06630d1332
--- /dev/null
+++ b/language/move-core/types/src/gas_algebra.rs
@@ -0,0 +1,423 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use serde::{Deserialize, Serialize};
+use std::{
+    cmp::{Eq, Ord, Ordering, PartialEq, PartialOrd},
+    convert::From,
+    fmt::{self, Debug, Display},
+    marker::PhantomData,
+    ops::{Add, AddAssign, Mul},
+};
+
+// TODO(Gas): deprecate the concept of abstract memory size
+
+/***************************************************************************************************
+ * Units of Measurement
+ *
+ **************************************************************************************************/
+/// Unit of internal gas.
+pub enum InternalGasUnit {}
+
+/// Unit for counting bytes.
+pub enum Byte {}
+
+/// Alternative unit for counting bytes. 1 kibibyte = 1024 bytes.
+pub enum KibiByte {}
+
+/// Alternative unit for counting bytes. 1 mebibyte = 1024 kibibytes.
+pub enum MebiByte {}
+
+/// Alternative unit for counting bytes. 1 gibibyte = 1024 mebibytes.
+pub enum GibiByte {}
+
+/// Unit of abstract memory usage in the Move VM.
+pub enum AbstractMemoryUnit {}
+
+/// Unit for counting arguments.
+pub enum Arg {}
+
+/// A derived unit resulted from the division of two given units.
+/// This is used to permit type-safe multiplications.
+///
+/// A real life example: 3 gas units/byte * 5 bytes = 15 gas units
+pub struct UnitDiv<U1, U2> {
+    phantom: PhantomData<(U1, U2)>,
+}
+
+/***************************************************************************************************
+ * Gas Quantities
+ *
+ **************************************************************************************************/
+/// An opaque representation of a certain quantity, with the unit being encoded in the type.
+/// This type implements checked addition and subtraction, and only permits type-safe multiplication.
+#[derive(Serialize, Deserialize)]
+pub struct GasQuantity<U> {
+    val: u64,
+    phantom: PhantomData<U>,
+}
+
+pub type InternalGas = GasQuantity<InternalGasUnit>;
+
+pub type NumBytes = GasQuantity<Byte>;
+
+pub type NumArgs = GasQuantity<Arg>;
+
+/// An abstract measurement of the memory footprint of some Move concept (e.g. value, type etc.)
+/// in the Move VM.
+///
+/// This is a legacy concept that is not well defined and will be deprecated very soon.
+/// New applications should not be using this.
+pub type AbstractMemorySize = GasQuantity<AbstractMemoryUnit>;
+
+pub type InternalGasPerByte = GasQuantity<UnitDiv<InternalGasUnit, Byte>>;
+
+pub type InternalGasPerAbstractMemoryUnit =
+    GasQuantity<UnitDiv<InternalGasUnit, AbstractMemoryUnit>>;
+
+pub type InternalGasPerArg = GasQuantity<UnitDiv<InternalGasUnit, Arg>>;
+
+/***************************************************************************************************
+ * Constructors
+ *
+ **************************************************************************************************/
+impl<U> GasQuantity<U> {
+    pub const fn new(val: u64) -> Self {
+        Self {
+            val,
+            phantom: PhantomData,
+        }
+    }
+
+    pub const fn zero() -> Self {
+        Self::new(0)
+    }
+
+    pub const fn one() -> Self {
+        Self::new(1)
+    }
+
+    pub const fn is_zero(&self) -> bool {
+        self.val == 0
+    }
+}
+
+/***************************************************************************************************
+ * Conversion
+ *
+ **************************************************************************************************/
+impl<U> From<u64> for GasQuantity<U> {
+    fn from(val: u64) -> Self {
+        Self::new(val)
+    }
+}
+
+// TODO(Gas): This allows the gas value to escape the monad, which weakens the type-level
+//            protection it provides. It's currently needed for practical reasons but
+//            we should look for ways to get rid of it.
+impl<U> From<GasQuantity<U>> for u64 {
+    fn from(gas: GasQuantity<U>) -> Self {
+        gas.val
+    }
+}
+
+/***************************************************************************************************
+ * Clone & Copy
+ *
+ **************************************************************************************************/
+impl<U> Clone for GasQuantity<U> {
+    fn clone(&self) -> Self {
+        Self::new(self.val)
+    }
+}
+
+impl<U> Copy for GasQuantity<U> {}
+
+/***************************************************************************************************
+ * Display & Debug
+ *
+ **************************************************************************************************/
+impl<U> Display for GasQuantity<U> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.val)
+    }
+}
+
+impl<U> Debug for GasQuantity<U> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{} ({})", self.val, std::any::type_name::<U>())
+    }
+}
+
+/***************************************************************************************************
+ * Comparison
+ *
+ **************************************************************************************************/
+impl<U> GasQuantity<U> {
+    fn cmp_impl(&self, other: &Self) -> Ordering {
+        self.val.cmp(&other.val)
+    }
+}
+
+impl<U> PartialEq for GasQuantity<U> {
+    fn eq(&self, other: &Self) -> bool {
+        matches!(self.cmp_impl(other), Ordering::Equal)
+    }
+}
+
+impl<U> Eq for GasQuantity<U> {}
+
+impl<U> PartialOrd for GasQuantity<U> {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp_impl(other))
+    }
+}
+
+impl<U> Ord for GasQuantity<U> {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.cmp_impl(other)
+    }
+}
+
+/***************************************************************************************************
+ * Addition & Subtraction
+ *
+ **************************************************************************************************/
+impl<U> Add<GasQuantity<U>> for GasQuantity<U> {
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self::Output {
+        Self::new(self.val.saturating_add(rhs.val))
+    }
+}
+
+impl<U> AddAssign<GasQuantity<U>> for GasQuantity<U> {
+    fn add_assign(&mut self, rhs: GasQuantity<U>) {
+        *self = *self + rhs
+    }
+}
+
+impl<U> GasQuantity<U> {
+    pub fn checked_sub(self, other: Self) -> Option<Self> {
+        self.val.checked_sub(other.val).map(Self::new)
+    }
+}
+
+/***************************************************************************************************
+ * Multiplication
+ *
+ **************************************************************************************************/
+fn mul_impl<U1, U2>(x: GasQuantity<U2>, y: GasQuantity<UnitDiv<U1, U2>>) -> GasQuantity<U1> {
+    GasQuantity::new(x.val.saturating_mul(y.val))
+}
+
+impl<U1, U2> Mul<GasQuantity<UnitDiv<U1, U2>>> for GasQuantity<U2> {
+    type Output = GasQuantity<U1>;
+
+    fn mul(self, rhs: GasQuantity<UnitDiv<U1, U2>>) -> Self::Output {
+        mul_impl(self, rhs)
+    }
+}
+
+impl<U1, U2> Mul<GasQuantity<U2>> for GasQuantity<UnitDiv<U1, U2>> {
+    type Output = GasQuantity<U1>;
+
+    fn mul(self, rhs: GasQuantity<U2>) -> Self::Output {
+        mul_impl(rhs, self)
+    }
+}
+
+/***************************************************************************************************
+ * To Unit
+ *
+ **************************************************************************************************/
+fn apply_ratio_round_down(val: u64, nominator: u64, denominator: u64) -> u64 {
+    assert_ne!(nominator, 0);
+    assert_ne!(denominator, 0);
+
+    let res = val as u128 * nominator as u128 / denominator as u128;
+    if res > u64::MAX as u128 {
+        u64::MAX
+    } else {
+        res as u64
+    }
+}
+
+fn apply_ratio_round_up(val: u64, nominator: u64, denominator: u64) -> u64 {
+    assert_ne!(nominator, 0);
+    assert_ne!(denominator, 0);
+
+    let n = val as u128 * nominator as u128;
+    let d = denominator as u128;
+
+    let res = n / d + if n % d == 0 { 0 } else { 1 };
+    if res > u64::MAX as u128 {
+        u64::MAX
+    } else {
+        res as u64
+    }
+}
+
+/// Trait that defines a conversion from one unit to another, with a statically-determined
+/// integral conversion rate.
+pub trait ToUnit<U> {
+    const MULTIPLIER: u64;
+}
+
+/// Trait that defines a conversion from one unit to another, with a statically-determined
+/// fractional conversion rate.
+pub trait ToUnitFractional<U> {
+    const NOMINATOR: u64;
+    const DENOMINATOR: u64;
+}
+
+impl<U> GasQuantity<U> {
+    /// Convert the quantity to another unit.
+    /// An integral multiplier must have been defined via the `ToUnit` trait.
+    pub fn to_unit<T>(self) -> GasQuantity<T>
+    where
+        U: ToUnit<T>,
+    {
+        assert_ne!(U::MULTIPLIER, 0);
+
+        GasQuantity::new(self.val.saturating_mul(U::MULTIPLIER))
+    }
+
+    /// Convert the quantity to another unit, with the resulting scalar value being rounded down.
+    /// A ratio must have been defined via the `ToUnitFractional` trait.
+    pub fn to_unit_round_down<T>(self) -> GasQuantity<T>
+    where
+        U: ToUnitFractional<T>,
+    {
+        GasQuantity::new(apply_ratio_round_down(
+            self.val,
+            U::NOMINATOR,
+            U::DENOMINATOR,
+        ))
+    }
+
+    /// Convert the quantity to another unit, with the resulting scalar value being rounded up.
+    /// A ratio must have been defined via the `ToUnitFractional` trait.
+    pub fn to_unit_round_up<T>(self) -> GasQuantity<T>
+    where
+        U: ToUnitFractional<T>,
+    {
+        GasQuantity::new(apply_ratio_round_up(self.val, U::NOMINATOR, U::DENOMINATOR))
+    }
+}
+
+impl ToUnit<Byte> for KibiByte {
+    const MULTIPLIER: u64 = 1024;
+}
+
+impl ToUnit<Byte> for MebiByte {
+    const MULTIPLIER: u64 = 1024 * 1024;
+}
+
+impl ToUnit<Byte> for GibiByte {
+    const MULTIPLIER: u64 = 1024 * 1024 * 1024;
+}
+
+impl ToUnit<KibiByte> for MebiByte {
+    const MULTIPLIER: u64 = 1024;
+}
+
+impl ToUnit<KibiByte> for GibiByte {
+    const MULTIPLIER: u64 = 1024 * 1024;
+}
+
+impl ToUnit<MebiByte> for GibiByte {
+    const MULTIPLIER: u64 = 1024;
+}
+
+impl ToUnitFractional<KibiByte> for Byte {
+    const NOMINATOR: u64 = 1;
+    const DENOMINATOR: u64 = 1024;
+}
+
+impl ToUnitFractional<MebiByte> for KibiByte {
+    const NOMINATOR: u64 = 1;
+    const DENOMINATOR: u64 = 1024;
+}
+
+impl ToUnitFractional<MebiByte> for Byte {
+    const NOMINATOR: u64 = 1;
+    const DENOMINATOR: u64 = 1024 * 1024;
+}
+
+impl ToUnitFractional<GibiByte> for MebiByte {
+    const NOMINATOR: u64 = 1;
+    const DENOMINATOR: u64 = 1024;
+}
+
+impl ToUnitFractional<GibiByte> for KibiByte {
+    const NOMINATOR: u64 = 1;
+    const DENOMINATOR: u64 = 1024 * 1024;
+}
+
+impl ToUnitFractional<GibiByte> for Byte {
+    const NOMINATOR: u64 = 1;
+    const DENOMINATOR: u64 = 1024 * 1024 * 1024;
+}
+
+/***************************************************************************************************
+ * To Unit With Params
+ *
+ **************************************************************************************************/
+/// Trait that defines a conversion from one unit to another, with an integral conversion rate
+/// determined from the parameters dynamically.
+pub trait ToUnitWithParams<U> {
+    type Params;
+
+    fn multiplier(params: &Self::Params) -> u64;
+}
+
+/// Trait that defines a conversion from one unit to another, with a fractional conversion rate
+/// determined from the parameters dynamically.
+pub trait ToUnitFractionalWithParams<U> {
+    type Params;
+
+    fn ratio(params: &Self::Params) -> (u64, u64);
+}
+
+impl<U> GasQuantity<U> {
+    /// Convert the quantity to another unit.
+    /// An integral multiplier must have been defined via the `ToUnitWithParams` trait.
+    pub fn to_unit_with_params<T>(
+        self,
+        params: &<U as ToUnitWithParams<T>>::Params,
+    ) -> GasQuantity<T>
+    where
+        U: ToUnitWithParams<T>,
+    {
+        let multiplier = <U as ToUnitWithParams<T>>::multiplier(params);
+        assert_ne!(multiplier, 0);
+        GasQuantity::new(self.val.saturating_mul(multiplier))
+    }
+
+    /// Convert the quantity to another unit, with the resulting scalar value being rounded down.
+    /// A ratio must have been defined via the `ToUnitFractionalWithParams` trait.
+    pub fn to_unit_round_down_with_params<T>(
+        self,
+        params: &<U as ToUnitFractionalWithParams<T>>::Params,
+    ) -> GasQuantity<T>
+    where
+        U: ToUnitFractionalWithParams<T>,
+    {
+        let (n, d) = <U as ToUnitFractionalWithParams<T>>::ratio(params);
+        GasQuantity::new(apply_ratio_round_down(self.val, n, d))
+    }
+
+    /// Convert the quantity to another unit, with the resulting scalar value being rounded up.
+    /// A ratio must have been defined via the `ToUnitFractionalWithParams` trait.
+    pub fn to_unit_round_up_with_params<T>(
+        self,
+        params: &<U as ToUnitFractionalWithParams<T>>::Params,
+    ) -> GasQuantity<T>
+    where
+        U: ToUnitFractionalWithParams<T>,
+    {
+        let (n, d) = <U as ToUnitFractionalWithParams<T>>::ratio(params);
+        GasQuantity::new(apply_ratio_round_up(self.val, n, d))
+    }
+}
diff --git a/language/move-core/types/src/gas_schedule.rs b/language/move-core/types/src/gas_schedule.rs
deleted file mode 100644
index 1d620d05de..0000000000
--- a/language/move-core/types/src/gas_schedule.rs
+++ /dev/null
@@ -1,277 +0,0 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-//! This module lays out the basic abstract costing schedule for bytecode instructions.
-//!
-//! It is important to note that the cost schedule defined in this file does not track hashing
-//! operations or other native operations; the cost of each native operation will be returned by the
-//! native function itself.
-use serde::{Deserialize, Serialize};
-use std::{
-    ops::{Add, Div, Mul, Sub},
-    u64,
-};
-
-/// The underlying carrier for gas-related units and costs. Data with this type should not be
-/// manipulated directly, but instead be manipulated using the newtype wrappers defined around
-/// them and the functions defined in the `GasAlgebra` trait.
-pub type GasCarrier = u64;
-
-/// A trait encoding the operations permitted on the underlying carrier for the gas unit, and how
-/// other gas-related units can interact with other units -- operations can only be performed
-/// across units with the same underlying carrier (i.e. as long as the underlying data is
-/// the same).
-pub trait GasAlgebra<GasCarrier>: Sized
-where
-    GasCarrier: Add<Output = GasCarrier>
-        + Sub<Output = GasCarrier>
-        + Div<Output = GasCarrier>
-        + Mul<Output = GasCarrier>
-        + Copy,
-{
-    /// Project a value into the gas algebra.
-    fn new(carrier: GasCarrier) -> Self;
-
-    /// Get the carrier.
-    fn get(&self) -> GasCarrier;
-
-    /// Map a function `f` of one argument over the underlying data.
-    fn map<F: Fn(GasCarrier) -> GasCarrier>(self, f: F) -> Self {
-        Self::new(f(self.get()))
-    }
-
-    /// Map a function `f` of two arguments over the underlying carrier. Note that this function
-    /// can take two different implementations of the trait -- one for `self` the other for the
-    /// second argument. But, we enforce that they have the same underlying carrier.
-    fn map2<F: Fn(GasCarrier, GasCarrier) -> GasCarrier>(
-        self,
-        other: impl GasAlgebra<GasCarrier>,
-        f: F,
-    ) -> Self {
-        Self::new(f(self.get(), other.get()))
-    }
-
-    /// Apply a function `f` of two arguments to the carrier. Since `f` is not an endomorphism, we
-    /// return the resulting value, as opposed to the result wrapped up in ourselves.
-    fn app<T, F: Fn(GasCarrier, GasCarrier) -> T>(
-        &self,
-        other: &impl GasAlgebra<GasCarrier>,
-        f: F,
-    ) -> T {
-        f(self.get(), other.get())
-    }
-
-    /// We allow casting between GasAlgebras as long as they have the same underlying carrier --
-    /// i.e. they use the same type to store the underlying value.
-    fn unitary_cast<T: GasAlgebra<GasCarrier>>(self) -> T {
-        T::new(self.get())
-    }
-
-    /// Add the two `GasAlgebra`s together.
-    fn add(self, right: impl GasAlgebra<GasCarrier>) -> Self {
-        self.map2(right, Add::add)
-    }
-
-    /// Subtract one `GasAlgebra` from the other.
-    fn sub(self, right: impl GasAlgebra<GasCarrier>) -> Self {
-        self.map2(right, Sub::sub)
-    }
-
-    /// Multiply two `GasAlgebra`s together.
-    fn mul(self, right: impl GasAlgebra<GasCarrier>) -> Self {
-        self.map2(right, Mul::mul)
-    }
-
-    /// Divide one `GasAlgebra` by the other.
-    fn div(self, right: impl GasAlgebra<GasCarrier>) -> Self {
-        self.map2(right, Div::div)
-    }
-}
-
-// We would really like to be able to implement the standard arithmetic traits over the GasAlgebra
-// trait, but that isn't possible.
-macro_rules! define_gas_unit {
-    {
-        name: $name: ident,
-        carrier: $carrier: ty,
-        doc: $comment: literal
-    } => {
-        #[derive(Debug, Hash, Eq, PartialEq, Copy, Clone, Serialize, Deserialize)]
-        #[doc=$comment]
-        pub struct $name<GasCarrier>(GasCarrier);
-        impl GasAlgebra<$carrier> for $name<$carrier> {
-            fn new(c: GasCarrier) -> Self {
-                Self(c)
-            }
-            fn get(&self) -> GasCarrier {
-                self.0
-            }
-        }
-    }
-}
-
-define_gas_unit! {
-    name: AbstractMemorySize,
-    carrier: GasCarrier,
-    doc: "A newtype wrapper that represents the (abstract) memory size that the instruction will take up."
-}
-
-define_gas_unit! {
-    name: GasUnits,
-    carrier: GasCarrier,
-    doc: "Units of gas as seen by clients of the Move VM."
-}
-
-define_gas_unit! {
-    name: InternalGasUnits,
-    carrier: GasCarrier,
-    doc: "Units of gas used within the Move VM, scaled for fine-grained accounting."
-}
-
-define_gas_unit! {
-    name: GasPrice,
-    carrier: GasCarrier,
-    doc: "A newtype wrapper around the gas price for each unit of gas consumed."
-}
-
-/// One unit of gas
-pub const ONE_GAS_UNIT: InternalGasUnits<GasCarrier> = InternalGasUnits(1);
-
-/// The maximum size representable by AbstractMemorySize
-pub const MAX_ABSTRACT_MEMORY_SIZE: AbstractMemorySize<GasCarrier> =
-    AbstractMemorySize(std::u64::MAX);
-
-/// The size in bytes for a non-string or address constant on the stack
-pub const CONST_SIZE: AbstractMemorySize<GasCarrier> = AbstractMemorySize(16);
-
-/// The size in bytes for a reference on the stack
-pub const REFERENCE_SIZE: AbstractMemorySize<GasCarrier> = AbstractMemorySize(8);
-
-/// The size of a struct in bytes
-pub const STRUCT_SIZE: AbstractMemorySize<GasCarrier> = AbstractMemorySize(2);
-
-/// For V1 all accounts will be ~800 bytes
-pub const DEFAULT_ACCOUNT_SIZE: AbstractMemorySize<GasCarrier> = AbstractMemorySize(800);
-
-/// Any transaction over this size will be charged `INTRINSIC_GAS_PER_BYTE` per byte
-pub const LARGE_TRANSACTION_CUTOFF: AbstractMemorySize<GasCarrier> = AbstractMemorySize(600);
-
-/// For exists checks on data that doesn't exists this is the multiplier that is used.
-pub const MIN_EXISTS_DATA_SIZE: AbstractMemorySize<GasCarrier> = AbstractMemorySize(100);
-
-pub const MAX_TRANSACTION_SIZE_IN_BYTES: GasCarrier = 4096;
-
-#[derive(Clone, Debug, Serialize, PartialEq, Deserialize)]
-pub struct GasConstants {
-    /// The cost per-byte read from global storage.
-    pub global_memory_per_byte_cost: InternalGasUnits<GasCarrier>,
-
-    /// The cost per-byte written to storage.
-    pub global_memory_per_byte_write_cost: InternalGasUnits<GasCarrier>,
-
-    /// The flat minimum amount of gas required for any transaction.
-    /// Charged at the start of execution.
-    pub min_transaction_gas_units: InternalGasUnits<GasCarrier>,
-
-    /// Any transaction over this size will be charged an additional amount per byte.
-    pub large_transaction_cutoff: AbstractMemorySize<GasCarrier>,
-
-    /// The units of gas that to be charged per byte over the `large_transaction_cutoff` in addition to
-    /// `min_transaction_gas_units` for transactions whose size exceeds `large_transaction_cutoff`.
-    pub intrinsic_gas_per_byte: InternalGasUnits<GasCarrier>,
-
-    /// ~5 microseconds should equal one unit of computational gas. We bound the maximum
-    /// computational time of any given transaction at roughly 20 seconds. We want this number and
-    /// `MAX_PRICE_PER_GAS_UNIT` to always satisfy the inequality that
-    /// MAXIMUM_NUMBER_OF_GAS_UNITS * MAX_PRICE_PER_GAS_UNIT < min(u64::MAX, GasUnits<GasCarrier>::MAX)
-    /// NB: The bound is set quite high since custom scripts aren't allowed except from predefined
-    /// and vetted senders.
-    pub maximum_number_of_gas_units: GasUnits<GasCarrier>,
-
-    /// The minimum gas price that a transaction can be submitted with.
-    pub min_price_per_gas_unit: GasPrice<GasCarrier>,
-
-    /// The maximum gas unit price that a transaction can be submitted with.
-    pub max_price_per_gas_unit: GasPrice<GasCarrier>,
-
-    pub max_transaction_size_in_bytes: GasCarrier,
-
-    pub gas_unit_scaling_factor: GasCarrier,
-    pub default_account_size: AbstractMemorySize<GasCarrier>,
-}
-
-impl GasConstants {
-    pub fn to_internal_units(&self, units: GasUnits<GasCarrier>) -> InternalGasUnits<GasCarrier> {
-        InternalGasUnits::new(units.get() * self.gas_unit_scaling_factor)
-    }
-
-    pub fn to_external_units(&self, units: InternalGasUnits<GasCarrier>) -> GasUnits<GasCarrier> {
-        GasUnits::new(units.get() / self.gas_unit_scaling_factor)
-    }
-}
-
-impl Default for GasConstants {
-    fn default() -> Self {
-        Self {
-            global_memory_per_byte_cost: InternalGasUnits(4),
-            global_memory_per_byte_write_cost: InternalGasUnits(9),
-            min_transaction_gas_units: InternalGasUnits(600),
-            large_transaction_cutoff: LARGE_TRANSACTION_CUTOFF,
-            intrinsic_gas_per_byte: InternalGasUnits(8),
-            maximum_number_of_gas_units: GasUnits(4_000_000),
-            min_price_per_gas_unit: GasPrice(0),
-            max_price_per_gas_unit: GasPrice(10_000),
-            max_transaction_size_in_bytes: MAX_TRANSACTION_SIZE_IN_BYTES,
-            gas_unit_scaling_factor: 1000,
-            default_account_size: DEFAULT_ACCOUNT_SIZE,
-        }
-    }
-}
-/// The cost tables, keyed by the serialized form of the bytecode instruction.  We use the
-/// serialized form as opposed to the instruction enum itself as the key since this will be the
-/// on-chain representation of bytecode instructions in the future.
-#[derive(Clone, Debug, Serialize, PartialEq, Deserialize)]
-pub struct CostTable {
-    pub instruction_table: Vec<GasCost>,
-    pub native_table: Vec<GasCost>,
-    pub gas_constants: GasConstants,
-}
-
-impl CostTable {
-    #[inline]
-    pub fn instruction_cost(&self, instr_index: u8) -> &GasCost {
-        debug_assert!(instr_index > 0 && instr_index <= (self.instruction_table.len() as u8));
-        &self.instruction_table[(instr_index - 1) as usize]
-    }
-
-    #[inline]
-    pub fn native_cost(&self, native_index: u8) -> &GasCost {
-        debug_assert!(native_index < (self.native_table.len() as u8));
-        &self.native_table[native_index as usize]
-    }
-}
-
-/// The  `GasCost` tracks:
-/// - instruction cost: how much time/computational power is needed to perform the instruction
-/// - memory cost: how much memory is required for the instruction, and storage overhead
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-pub struct GasCost {
-    pub instruction_gas: InternalGasUnits<GasCarrier>,
-    pub memory_gas: InternalGasUnits<GasCarrier>,
-}
-
-impl GasCost {
-    pub fn new(instr_gas: GasCarrier, mem_gas: GasCarrier) -> Self {
-        Self {
-            instruction_gas: InternalGasUnits::new(instr_gas),
-            memory_gas: InternalGasUnits::new(mem_gas),
-        }
-    }
-
-    /// Convert a GasCost to a total gas charge in `InternalGasUnits`.
-    #[inline]
-    pub fn total(&self) -> InternalGasUnits<GasCarrier> {
-        self.instruction_gas.add(self.memory_gas)
-    }
-}
diff --git a/language/move-core/types/src/identifier.rs b/language/move-core/types/src/identifier.rs
index fc8b4a4f1e..486f18d766 100644
--- a/language/move-core/types/src/identifier.rs
+++ b/language/move-core/types/src/identifier.rs
@@ -89,6 +89,7 @@ pub(crate) static ALLOWED_NO_SELF_IDENTIFIERS: &str =
 ///
 /// For more details, see the module level documentation.
 #[derive(Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize, Deserialize)]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct Identifier(Box<str>);
 // An identifier cannot be mutated so use Box<str> instead of String -- it is 1 word smaller.
 
diff --git a/language/move-core/types/src/language_storage.rs b/language/move-core/types/src/language_storage.rs
index 72f168f0da..516436af3c 100644
--- a/language/move-core/types/src/language_storage.rs
+++ b/language/move-core/types/src/language_storage.rs
@@ -5,11 +5,15 @@
 use crate::{
     account_address::AccountAddress,
     identifier::{IdentStr, Identifier},
+    parser::{parse_struct_tag, parse_type_tag},
 };
 #[cfg(any(test, feature = "fuzzing"))]
 use proptest_derive::Arbitrary;
 use serde::{Deserialize, Serialize};
-use std::fmt::{Display, Formatter};
+use std::{
+    fmt::{Display, Formatter},
+    str::FromStr,
+};
 
 pub const CODE_TAG: u8 = 0;
 pub const RESOURCE_TAG: u8 = 1;
@@ -35,7 +39,52 @@ pub enum TypeTag {
     #[serde(rename = "vector", alias = "Vector")]
     Vector(Box<TypeTag>),
     #[serde(rename = "struct", alias = "Struct")]
-    Struct(StructTag),
+    Struct(Box<StructTag>),
+
+    // NOTE: Added in bytecode version v6, do not reorder!
+    #[serde(rename = "u16", alias = "U16")]
+    U16,
+    #[serde(rename = "u32", alias = "U32")]
+    U32,
+    #[serde(rename = "u256", alias = "U256")]
+    U256,
+}
+
+impl TypeTag {
+    /// Return a canonical string representation of the type. All types are represented
+    /// using their source syntax:
+    /// "u8", "u64", "u128", "bool", "address", "vector", "signer" for ground types.
+    /// Struct types are represented as fully qualified type names; e.g.
+    /// `00000000000000000000000000000001::string::String` or
+    /// `0000000000000000000000000000000a::module_name1::type_name1<0000000000000000000000000000000a::module_name2::type_name2<u64>>`
+    /// Addresses are hex-encoded lowercase values of length ADDRESS_LENGTH (16, 20, or 32 depending on the Move platform)
+    /// Note: this function is guaranteed to be stable, and this is suitable for use inside
+    /// Move native functions or the VM. By contrast, the `Display` implementation is subject
+    /// to change and should not be used inside stable code.
+    pub fn to_canonical_string(&self) -> String {
+        use TypeTag::*;
+        match self {
+            Bool => "bool".to_owned(),
+            U8 => "u8".to_owned(),
+            U16 => "u16".to_owned(),
+            U32 => "u32".to_owned(),
+            U64 => "u64".to_owned(),
+            U128 => "u128".to_owned(),
+            U256 => "u256".to_owned(),
+            Address => "address".to_owned(),
+            Signer => "signer".to_owned(),
+            Vector(t) => format!("vector<{}>", t.to_canonical_string()),
+            Struct(s) => s.to_canonical_string(),
+        }
+    }
+}
+
+impl FromStr for TypeTag {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        parse_type_tag(s)
+    }
 }
 
 #[derive(Serialize, Deserialize, Debug, PartialEq, Hash, Eq, Clone, PartialOrd, Ord)]
@@ -43,7 +92,6 @@ pub struct StructTag {
     pub address: AccountAddress,
     pub module: Identifier,
     pub name: Identifier,
-    // TODO: rename to "type_args" (or better "ty_args"?)
     // alias for compatibility with old json serialized data.
     #[serde(rename = "type_args", alias = "type_params")]
     pub type_params: Vec<TypeTag>,
@@ -56,12 +104,65 @@ impl StructTag {
         key
     }
 
+    /// Returns true if this is a `StructTag` for an `std::ascii::String` struct defined in the
+    /// standard library at address `move_std_addr`.
+    pub fn is_ascii_string(&self, move_std_addr: &AccountAddress) -> bool {
+        self.address == *move_std_addr
+            && self.module.as_str().eq("ascii")
+            && self.name.as_str().eq("String")
+    }
+
+    /// Returns true if this is a `StructTag` for an `std::string::String` struct defined in the
+    /// standard library at address `move_std_addr`.
+    pub fn is_std_string(&self, move_std_addr: &AccountAddress) -> bool {
+        self.address == *move_std_addr
+            && self.module.as_str().eq("string")
+            && self.name.as_str().eq("String")
+    }
+
     pub fn module_id(&self) -> ModuleId {
         ModuleId::new(self.address, self.module.to_owned())
     }
+
+    /// Return a canonical string representation of the struct.
+    /// Struct types are represented as fully qualified type names; e.g.
+    /// `00000000000000000000000000000001::string::String`,
+    /// `0000000000000000000000000000000a::module_name1::type_name1<0000000000000000000000000000000a::module_name2::type_name2<u64>>`,
+    /// or `0000000000000000000000000000000a::module_name2::type_name2<bool,u64,u128>.
+    /// Addresses are hex-encoded lowercase values of length ADDRESS_LENGTH (16, 20, or 32 depending on the Move platform)
+    /// Note: this function is guaranteed to be stable, and this is suitable for use inside
+    /// Move native functions or the VM. By contrast, the `Display` implementation is subject
+    /// to change and should not be used inside stable code.
+    pub fn to_canonical_string(&self) -> String {
+        let mut generics = String::new();
+        if let Some(first_ty) = self.type_params.first() {
+            generics.push('<');
+            generics.push_str(&first_ty.to_canonical_string());
+            for ty in self.type_params.iter().skip(1) {
+                generics.push(',');
+                generics.push_str(&ty.to_canonical_string())
+            }
+            generics.push('>');
+        }
+        format!(
+            "{}::{}::{}{}",
+            self.address.to_canonical_string(),
+            self.module,
+            self.name,
+            generics
+        )
+    }
+}
+
+impl FromStr for StructTag {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        parse_struct_tag(s)
+    }
 }
 
-/// Represents the intitial key into global storage where we first index by the address, and then
+/// Represents the initial key into global storage where we first index by the address, and then
 /// the struct tag
 #[derive(Serialize, Deserialize, Debug, PartialEq, Hash, Eq, Clone, PartialOrd, Ord)]
 pub struct ResourceKey {
@@ -160,8 +261,11 @@ impl Display for TypeTag {
             TypeTag::Struct(s) => write!(f, "{}", s),
             TypeTag::Vector(ty) => write!(f, "vector<{}>", ty),
             TypeTag::U8 => write!(f, "u8"),
+            TypeTag::U16 => write!(f, "u16"),
+            TypeTag::U32 => write!(f, "u32"),
             TypeTag::U64 => write!(f, "u64"),
             TypeTag::U128 => write!(f, "u128"),
+            TypeTag::U256 => write!(f, "u256"),
             TypeTag::Address => write!(f, "address"),
             TypeTag::Signer => write!(f, "signer"),
             TypeTag::Bool => write!(f, "bool"),
@@ -177,7 +281,7 @@ impl Display for ResourceKey {
 
 impl From<StructTag> for TypeTag {
     fn from(t: StructTag) -> TypeTag {
-        TypeTag::Struct(t)
+        TypeTag::Struct(Box::new(t))
     }
 }
 
@@ -187,17 +291,19 @@ mod tests {
     use crate::{
         account_address::AccountAddress, identifier::Identifier, language_storage::StructTag,
     };
+    use std::mem;
 
     #[test]
     fn test_type_tag_serde() {
-        let a = TypeTag::Struct(StructTag {
+        let a = TypeTag::Struct(Box::new(StructTag {
             address: AccountAddress::ONE,
             module: Identifier::from_utf8(("abc".as_bytes()).to_vec()).unwrap(),
             name: Identifier::from_utf8(("abc".as_bytes()).to_vec()).unwrap(),
             type_params: vec![TypeTag::U8],
-        });
+        }));
         let b = serde_json::to_string(&a).unwrap();
         let c: TypeTag = serde_json::from_str(&b).unwrap();
-        assert!(a.eq(&c), "Typetag serde error")
+        assert!(a.eq(&c), "Typetag serde error");
+        assert_eq!(mem::size_of::<TypeTag>(), 16);
     }
 }
diff --git a/language/move-core/types/src/lib.rs b/language/move-core/types/src/lib.rs
index 734db67da0..f457d2544f 100644
--- a/language/move-core/types/src/lib.rs
+++ b/language/move-core/types/src/lib.rs
@@ -8,7 +8,7 @@ pub mod abi;
 pub mod account_address;
 pub mod effects;
 pub mod errmap;
-pub mod gas_schedule;
+pub mod gas_algebra;
 pub mod identifier;
 pub mod language_storage;
 pub mod metadata;
@@ -17,7 +17,9 @@ pub mod parser;
 #[cfg(any(test, feature = "fuzzing"))]
 pub mod proptest_types;
 pub mod resolver;
+pub mod state;
 pub mod transaction_argument;
+pub mod u256;
 #[cfg(test)]
 mod unit_tests;
 pub mod value;
diff --git a/language/move-core/types/src/metadata.rs b/language/move-core/types/src/metadata.rs
index be97bfa151..9191615d9c 100644
--- a/language/move-core/types/src/metadata.rs
+++ b/language/move-core/types/src/metadata.rs
@@ -3,6 +3,7 @@
 
 /// Representation of metadata,
 #[derive(Clone, PartialEq, Eq, Debug)]
+#[cfg_attr(feature = "fuzzing", derive(arbitrary::Arbitrary))]
 pub struct Metadata {
     /// The key identifying the type of metadata.
     pub key: Vec<u8>,
diff --git a/language/move-core/types/src/parser.rs b/language/move-core/types/src/parser.rs
index 8ad5cbcecf..525bd1448f 100644
--- a/language/move-core/types/src/parser.rs
+++ b/language/move-core/types/src/parser.rs
@@ -14,8 +14,11 @@ use std::iter::Peekable;
 #[derive(Eq, PartialEq, Debug)]
 enum Token {
     U8Type,
+    U16Type,
+    U32Type,
     U64Type,
     U128Type,
+    U256Type,
     BoolType,
     AddressType,
     VectorType,
@@ -24,8 +27,12 @@ enum Token {
     Name(String),
     Address(String),
     U8(String),
+    U16(String),
+    U32(String),
     U64(String),
     U128(String),
+    U256(String),
+
     Bytes(String),
     True,
     False,
@@ -45,8 +52,11 @@ impl Token {
 fn name_token(s: String) -> Token {
     match s.as_str() {
         "u8" => Token::U8Type,
+        "u16" => Token::U16Type,
+        "u32" => Token::U32Type,
         "u64" => Token::U64Type,
         "u128" => Token::U128Type,
+        "u256" => Token::U256Type,
         "bool" => Token::BoolType,
         "address" => Token::AddressType,
         "vector" => Token::VectorType,
@@ -62,7 +72,7 @@ fn next_number(initial: char, mut it: impl Iterator<Item = char>) -> Result<(Tok
     num.push(initial);
     loop {
         match it.next() {
-            Some(c) if c.is_ascii_digit() => num.push(c),
+            Some(c) if c.is_ascii_digit() || c == '_' => num.push(c),
             Some(c) if c.is_alphanumeric() => {
                 let mut suffix = String::new();
                 suffix.push(c);
@@ -73,8 +83,11 @@ fn next_number(initial: char, mut it: impl Iterator<Item = char>) -> Result<(Tok
                             let len = num.len() + suffix.len();
                             let tok = match suffix.as_str() {
                                 "u8" => Token::U8(num),
+                                "u16" => Token::U16(num),
+                                "u32" => Token::U32(num),
                                 "u64" => Token::U64(num),
                                 "u128" => Token::U128(num),
+                                "u256" => Token::U256(num),
                                 _ => bail!("invalid suffix"),
                             };
                             return Ok((tok, len));
@@ -257,8 +270,11 @@ impl<I: Iterator<Item = Token>> Parser<I> {
     fn parse_type_tag(&mut self) -> Result<TypeTag> {
         Ok(match self.next()? {
             Token::U8Type => TypeTag::U8,
+            Token::U16Type => TypeTag::U16,
+            Token::U32Type => TypeTag::U32,
             Token::U64Type => TypeTag::U64,
             Token::U128Type => TypeTag::U128,
+            Token::U256Type => TypeTag::U256,
             Token::BoolType => TypeTag::Bool,
             Token::AddressType => TypeTag::Address,
             Token::SignerType => TypeTag::Signer,
@@ -287,12 +303,12 @@ impl<I: Iterator<Item = Token>> Parser<I> {
                                 } else {
                                     vec![]
                                 };
-                                TypeTag::Struct(StructTag {
+                                TypeTag::Struct(Box::new(StructTag {
                                     address: AccountAddress::from_hex_literal(&addr)?,
                                     module: Identifier::new(module)?,
                                     name: Identifier::new(name)?,
                                     type_params: ty_args,
-                                })
+                                }))
                             }
                             t => bail!("expected name, got {:?}", t),
                         }
@@ -306,9 +322,12 @@ impl<I: Iterator<Item = Token>> Parser<I> {
 
     fn parse_transaction_argument(&mut self) -> Result<TransactionArgument> {
         Ok(match self.next()? {
-            Token::U8(s) => TransactionArgument::U8(s.parse()?),
-            Token::U64(s) => TransactionArgument::U64(s.parse()?),
-            Token::U128(s) => TransactionArgument::U128(s.parse()?),
+            Token::U8(s) => TransactionArgument::U8(s.replace('_', "").parse()?),
+            Token::U16(s) => TransactionArgument::U16(s.replace('_', "").parse()?),
+            Token::U32(s) => TransactionArgument::U32(s.replace('_', "").parse()?),
+            Token::U64(s) => TransactionArgument::U64(s.replace('_', "").parse()?),
+            Token::U128(s) => TransactionArgument::U128(s.replace('_', "").parse()?),
+            Token::U256(s) => TransactionArgument::U256(s.replace('_', "").parse()?),
             Token::True => TransactionArgument::Bool(true),
             Token::False => TransactionArgument::Bool(false),
             Token::Address(addr) => {
@@ -369,7 +388,7 @@ pub fn parse_struct_tag(s: &str) -> Result<StructTag> {
     let type_tag = parse(s, |parser| parser.parse_type_tag())
         .map_err(|e| format_err!("invalid struct tag: {}, {}", s, e))?;
     if let TypeTag::Struct(struct_tag) = type_tag {
-        Ok(struct_tag)
+        Ok(*struct_tag)
     } else {
         bail!("invalid struct tag: {}", s)
     }
@@ -377,10 +396,13 @@ pub fn parse_struct_tag(s: &str) -> Result<StructTag> {
 
 #[cfg(test)]
 mod tests {
+    use std::str::FromStr;
+
     use crate::{
         account_address::AccountAddress,
         parser::{parse_struct_tag, parse_transaction_argument, parse_type_tag},
         transaction_argument::TransactionArgument,
+        u256,
     };
 
     #[allow(clippy::unreadable_literal)]
@@ -398,10 +420,43 @@ mod tests {
             ("18446744073709551615", T::U64(18446744073709551615)),
             ("18446744073709551615u64", T::U64(18446744073709551615)),
             ("0u128", T::U128(0)),
+            ("1_0u8", T::U8(1_0)),
+            ("10_u8", T::U8(10)),
+            ("10___u8", T::U8(10)),
+            ("1_000u64", T::U64(1_000)),
+            ("1_000", T::U64(1_000)),
+            ("1_0_0_0u64", T::U64(1_000)),
+            ("1_000_000u128", T::U128(1_000_000)),
             (
                 "340282366920938463463374607431768211455u128",
                 T::U128(340282366920938463463374607431768211455),
             ),
+            ("  0u16", T::U16(0)),
+            ("0u16", T::U16(0)),
+            ("532u16", T::U16(532)),
+            ("65535u16", T::U16(65535)),
+            ("0u32", T::U32(0)),
+            ("01239498u32", T::U32(1239498)),
+            ("35366u32", T::U32(35366)),
+            ("4294967295u32", T::U32(4294967295)),
+            ("0u256", T::U256(u256::U256::from(0u8))),
+            ("1_0u16", T::U16(1_0)),
+            ("10_u16", T::U16(10)),
+            ("10___u16", T::U16(10)),
+            ("1_000u32", T::U32(1_000)),
+            ("1_0_00u32", T::U32(1_000)),
+            ("1_0_0_0u32", T::U32(1_000)),
+            ("1_000_000u256", T::U256(u256::U256::from(1_000_000u64))),
+            (
+                "1_000_000_000u256",
+                T::U256(u256::U256::from(1_000_000_000u128)),
+            ),
+            (
+                "3402823669209384634633746074317682114551234u256",
+                T::U256(
+                    u256::U256::from_str("3402823669209384634633746074317682114551234").unwrap(),
+                ),
+            ),
             ("true", T::Bool(true)),
             ("false", T::Bool(false)),
             (
@@ -427,22 +482,35 @@ mod tests {
 
     #[test]
     fn tests_parse_transaction_argument_negative() {
-        for s in &[
+        /// Test cases for the parser that should always fail.
+        const PARSE_VALUE_NEGATIVE_TEST_CASES: &[&str] = &[
             "-3",
             "0u42",
             "0u645",
             "0u64x",
             "0u6 4",
             "0u",
+            "_10",
+            "_10_u8",
+            "_10__u8",
+            "_1014__u32",
+            "10_u8__",
+            "_",
+            "__",
+            "__4",
+            "_u8",
+            "5_bool",
             "256u8",
-            "18446744073709551616",
             "18446744073709551616u64",
             "340282366920938463463374607431768211456u128",
+            "340282366920938463463374607431768211456340282366920938463463374607431768211456340282366920938463463374607431768211456u256",
             "0xg",
             "0x00g0",
             "0x",
             "0x_",
             "",
+            "@@",
+            "()",
             "x\"ffff",
             "x\"a \"",
             "x\" \"",
@@ -453,8 +521,14 @@ mod tests {
             "3false",
             "3 false",
             "",
-        ] {
-            assert!(parse_transaction_argument(s).is_err())
+        ];
+
+        for s in PARSE_VALUE_NEGATIVE_TEST_CASES {
+            assert!(
+                parse_transaction_argument(s).is_err(),
+                "test case unexpectedly succeeded: {}",
+                s
+            )
         }
     }
 
@@ -465,6 +539,14 @@ mod tests {
             "bool",
             "vector<u8>",
             "vector<vector<u64>>",
+            "vector<u16>",
+            "vector<vector<u16>>",
+            "vector<u32>",
+            "vector<vector<u32>>",
+            "vector<u128>",
+            "vector<vector<u128>>",
+            "vector<u256>",
+            "vector<vector<u256>>",
             "signer",
             "0x1::M::S",
             "0x2::M::S_",
@@ -472,11 +554,19 @@ mod tests {
             "0x4::M_::S_",
             "0x00000000004::M::S",
             "0x1::M::S<u64>",
+            "0x1::M::S<u16>",
+            "0x1::M::S<u32>",
+            "0x1::M::S<u256>",
             "0x1::M::S<0x2::P::Q>",
             "vector<0x1::M::S>",
             "vector<0x1::M_::S_>",
             "vector<vector<0x1::M_::S_>>",
             "0x1::M::S<vector<u8>>",
+            "0x1::M::S<vector<u16>>",
+            "0x1::M::S<vector<u32>>",
+            "0x1::M::S<vector<u64>>",
+            "0x1::M::S<vector<u128>>",
+            "0x1::M::S<vector<u256>>",
         ] {
             assert!(parse_type_tag(s).is_ok(), "Failed to parse tag {}", s);
         }
@@ -495,12 +585,19 @@ mod tests {
             "0x1::Diem::Diem<u8>",
             "0x1::Diem::Diem<u64>",
             "0x1::Diem::Diem<u128>",
+            "0x1::Diem::Diem<u16>",
+            "0x1::Diem::Diem<u32>",
+            "0x1::Diem::Diem<u256>",
             "0x1::Diem::Diem<bool>",
             "0x1::Diem::Diem<address>",
             "0x1::Diem::Diem<signer>",
             "0x1::Diem::Diem<vector<0x1::XDX::XDX>>",
             "0x1::Diem::Diem<u8,bool>",
             "0x1::Diem::Diem<u8,   bool>",
+            "0x1::Diem::Diem<u16,bool>",
+            "0x1::Diem::Diem<u32,   bool>",
+            "0x1::Diem::Diem<u128,bool>",
+            "0x1::Diem::Diem<u256,   bool>",
             "0x1::Diem::Diem<u8  ,bool>",
             "0x1::Diem::Diem<u8 , bool  ,    vector<u8>,address,signer>",
             "0x1::Diem::Diem<vector<0x1::Diem::Struct<0x1::XUS::XUS>>>",
@@ -509,8 +606,8 @@ mod tests {
         for text in valid {
             let st = parse_struct_tag(text).expect("valid StructTag");
             assert_eq!(
-                st.to_string().replace(" ", ""),
-                text.replace(" ", ""),
+                st.to_string().replace(' ', ""),
+                text.replace(' ', ""),
                 "text: {:?}, StructTag: {:?}",
                 text,
                 st
diff --git a/language/move-core/types/src/proptest_types.rs b/language/move-core/types/src/proptest_types.rs
index 63a1c8591f..73bb35a71b 100644
--- a/language/move-core/types/src/proptest_types.rs
+++ b/language/move-core/types/src/proptest_types.rs
@@ -18,8 +18,11 @@ impl Arbitrary for TypeTag {
         let leaf = prop_oneof![
             Just(Bool),
             Just(U8),
+            Just(U16),
+            Just(U32),
             Just(U64),
             Just(U128),
+            Just(U256),
             Just(Address),
             Just(Vector(Box::new(Bool))),
         ];
@@ -35,12 +38,12 @@ impl Arbitrary for TypeTag {
                     vec(inner, 0..4),
                 )
                     .prop_map(|(address, module, name, type_params)| {
-                        Struct(StructTag {
+                        Struct(Box::new(StructTag {
                             address,
                             module,
                             name,
                             type_params,
-                        })
+                        }))
                     })
             },
         )
diff --git a/language/move-core/types/src/state.rs b/language/move-core/types/src/state.rs
new file mode 100644
index 0000000000..6d94c574a9
--- /dev/null
+++ b/language/move-core/types/src/state.rs
@@ -0,0 +1,25 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::cell::RefCell;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum VMState {
+    DESERIALIZER,
+    VERIFIER,
+    RUNTIME,
+    OTHER,
+}
+
+thread_local! {
+    static STATE: RefCell<VMState> = RefCell::new(VMState::OTHER);
+}
+
+pub fn set_state(state: VMState) -> VMState {
+    STATE.with(|s| s.replace(state))
+}
+
+pub fn get_state() -> VMState {
+    STATE.with(|s| *s.borrow())
+}
diff --git a/language/move-core/types/src/transaction_argument.rs b/language/move-core/types/src/transaction_argument.rs
index 3d71a26b77..992e53e6b6 100644
--- a/language/move-core/types/src/transaction_argument.rs
+++ b/language/move-core/types/src/transaction_argument.rs
@@ -2,7 +2,7 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{account_address::AccountAddress, value::MoveValue};
+use crate::{account_address::AccountAddress, u256, value::MoveValue};
 use anyhow::{anyhow, Error, Result};
 use serde::{Deserialize, Serialize};
 use std::{convert::TryFrom, fmt};
@@ -15,6 +15,10 @@ pub enum TransactionArgument {
     Address(AccountAddress),
     U8Vector(#[serde(with = "serde_bytes")] Vec<u8>),
     Bool(bool),
+    // NOTE: Added in bytecode version v6, do not reorder!
+    U16(u16),
+    U32(u32),
+    U256(u256::U256),
 }
 
 impl fmt::Debug for TransactionArgument {
@@ -28,6 +32,9 @@ impl fmt::Debug for TransactionArgument {
             TransactionArgument::U8Vector(vector) => {
                 write!(f, "{{U8Vector: 0x{}}}", hex::encode(vector))
             }
+            TransactionArgument::U16(value) => write!(f, "{{U16: {}}}", value),
+            TransactionArgument::U32(value) => write!(f, "{{U32: {}}}", value),
+            TransactionArgument::U256(value) => write!(f, "{{U256: {}}}", value),
         }
     }
 }
@@ -41,6 +48,9 @@ impl From<TransactionArgument> for MoveValue {
             TransactionArgument::Address(a) => MoveValue::Address(a),
             TransactionArgument::Bool(b) => MoveValue::Bool(b),
             TransactionArgument::U8Vector(v) => MoveValue::vector_u8(v),
+            TransactionArgument::U16(i) => MoveValue::U16(i),
+            TransactionArgument::U32(i) => MoveValue::U32(i),
+            TransactionArgument::U256(i) => MoveValue::U256(i),
         }
     }
 }
@@ -68,6 +78,9 @@ impl TryFrom<MoveValue> for TransactionArgument {
             MoveValue::Signer(_) | MoveValue::Struct(_) => {
                 return Err(anyhow!("invalid transaction argument: {:?}", val))
             }
+            MoveValue::U16(i) => TransactionArgument::U16(i),
+            MoveValue::U32(i) => TransactionArgument::U32(i),
+            MoveValue::U256(i) => TransactionArgument::U256(i),
         })
     }
 }
@@ -110,7 +123,7 @@ mod tests {
     use std::convert::{From, TryInto};
 
     use crate::{
-        account_address::AccountAddress, transaction_argument::TransactionArgument,
+        account_address::AccountAddress, transaction_argument::TransactionArgument, u256::U256,
         value::MoveValue,
     };
 
@@ -118,8 +131,11 @@ mod tests {
     fn test_from_and_to_move_value() {
         let vals = vec![
             TransactionArgument::U8(1),
+            TransactionArgument::U16(u16::MAX),
+            TransactionArgument::U32(u32::MAX),
             TransactionArgument::U64(u64::MAX),
             TransactionArgument::U128(u128::MAX),
+            TransactionArgument::U256(U256::max_value()),
             TransactionArgument::Bool(true),
             TransactionArgument::Address(AccountAddress::from_hex_literal("0x1").unwrap()),
             TransactionArgument::U8Vector(vec![1, 2, 3, 4]),
diff --git a/language/move-core/types/src/u256.rs b/language/move-core/types/src/u256.rs
new file mode 100644
index 0000000000..fb240326ce
--- /dev/null
+++ b/language/move-core/types/src/u256.rs
@@ -0,0 +1,720 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use ethnum::U256 as EthnumU256;
+use num::{bigint::Sign, BigInt};
+#[cfg(any(test, feature = "fuzzing"))]
+use proptest::strategy::BoxedStrategy;
+use rand::{
+    distributions::{
+        uniform::{SampleUniform, UniformSampler},
+        Distribution, Standard,
+    },
+    Rng,
+};
+use std::{
+    fmt,
+    mem::size_of,
+    ops::{
+        Add, AddAssign, BitAnd, BitAndAssign, BitOr, BitXor, Div, DivAssign, Mul, MulAssign, Rem,
+        RemAssign, Shl, Shr, Sub, SubAssign,
+    },
+};
+use uint::FromStrRadixErr;
+
+// This U256 impl was chosen for now but we are open to changing it as needed
+use primitive_types::U256 as PrimitiveU256;
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+const NUM_BITS_PER_BYTE: usize = 8;
+const U256_NUM_BITS: usize = 256;
+pub const U256_NUM_BYTES: usize = U256_NUM_BITS / NUM_BITS_PER_BYTE;
+
+#[derive(Debug)]
+pub struct U256FromStrError(FromStrRadixErr);
+
+/// A list of error categories encountered when parsing numbers.
+#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
+pub enum U256CastErrorKind {
+    /// Value too large to fit in U8.
+    TooLargeForU8,
+
+    /// Value too large to fit in U16.
+    TooLargeForU16,
+
+    /// Value too large to fit in U32.
+    TooLargeForU32,
+
+    /// Value too large to fit in U64.
+    TooLargeForU64,
+
+    /// Value too large to fit in U128.
+    TooLargeForU128,
+}
+
+#[derive(Debug)]
+pub struct U256CastError {
+    kind: U256CastErrorKind,
+    val: U256,
+}
+
+impl U256CastError {
+    pub fn new<T: std::convert::Into<U256>>(val: T, kind: U256CastErrorKind) -> Self {
+        Self {
+            kind,
+            val: val.into(),
+        }
+    }
+}
+
+impl std::error::Error for U256CastError {}
+
+impl fmt::Display for U256CastError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let type_str = match self.kind {
+            U256CastErrorKind::TooLargeForU8 => "u8",
+            U256CastErrorKind::TooLargeForU16 => "u16",
+            U256CastErrorKind::TooLargeForU32 => "u32",
+            U256CastErrorKind::TooLargeForU64 => "u64",
+            U256CastErrorKind::TooLargeForU128 => "u128",
+        };
+        let err_str = format!("Cast failed. {} too large for {}.", self.val, type_str);
+        write!(f, "{err_str}")
+    }
+}
+
+impl std::error::Error for U256FromStrError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        self.0.source()
+    }
+}
+
+impl fmt::Display for U256FromStrError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Copy, PartialOrd, Ord, Default)]
+pub struct U256(PrimitiveU256);
+
+impl fmt::Display for U256 {
+    fn fmt(&self, f: &mut fmt::Formatter) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+impl fmt::UpperHex for U256 {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::UpperHex::fmt(&self.0, f)
+    }
+}
+
+impl fmt::LowerHex for U256 {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::LowerHex::fmt(&self.0, f)
+    }
+}
+
+impl std::str::FromStr for U256 {
+    type Err = U256FromStrError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Self::from_str_radix(s, 10)
+    }
+}
+
+impl<'de> Deserialize<'de> for U256 {
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        Ok(U256::from_le_bytes(
+            &(<[u8; U256_NUM_BYTES]>::deserialize(deserializer)?),
+        ))
+    }
+}
+
+impl Serialize for U256 {
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        self.to_le_bytes().serialize(serializer)
+    }
+}
+
+impl Shl<u32> for U256 {
+    type Output = Self;
+
+    fn shl(self, rhs: u32) -> Self::Output {
+        let Self(lhs) = self;
+        Self(lhs << rhs)
+    }
+}
+
+impl Shl<u8> for U256 {
+    type Output = Self;
+
+    fn shl(self, rhs: u8) -> Self::Output {
+        let Self(lhs) = self;
+        Self(lhs << rhs)
+    }
+}
+
+impl Shr<u8> for U256 {
+    type Output = Self;
+
+    fn shr(self, rhs: u8) -> Self::Output {
+        let Self(lhs) = self;
+        Self(lhs >> rhs)
+    }
+}
+
+impl BitOr<U256> for U256 {
+    type Output = Self;
+
+    fn bitor(self, rhs: U256) -> Self::Output {
+        let Self(lhs) = self;
+        let Self(rhs) = rhs;
+        Self(lhs | rhs)
+    }
+}
+
+impl BitAnd<U256> for U256 {
+    type Output = Self;
+
+    fn bitand(self, rhs: U256) -> Self::Output {
+        let Self(lhs) = self;
+        let Self(rhs) = rhs;
+        Self(lhs & rhs)
+    }
+}
+
+impl BitXor<U256> for U256 {
+    type Output = Self;
+
+    fn bitxor(self, rhs: U256) -> Self::Output {
+        let Self(lhs) = self;
+        let Self(rhs) = rhs;
+        Self(lhs ^ rhs)
+    }
+}
+
+impl BitAndAssign<U256> for U256 {
+    fn bitand_assign(&mut self, rhs: U256) {
+        *self = *self & rhs;
+    }
+}
+
+// Ignores overflows
+impl Add<U256> for U256 {
+    type Output = Self;
+
+    fn add(self, rhs: U256) -> Self::Output {
+        self.wrapping_add(rhs)
+    }
+}
+
+impl AddAssign<U256> for U256 {
+    fn add_assign(&mut self, rhs: U256) {
+        *self = *self + rhs;
+    }
+}
+
+// Ignores underflows
+impl Sub<U256> for U256 {
+    type Output = Self;
+
+    fn sub(self, rhs: U256) -> Self::Output {
+        self.wrapping_sub(rhs)
+    }
+}
+
+impl SubAssign<U256> for U256 {
+    fn sub_assign(&mut self, rhs: U256) {
+        *self = *self - rhs;
+    }
+}
+
+// Ignores overflows
+impl Mul<U256> for U256 {
+    type Output = Self;
+
+    fn mul(self, rhs: U256) -> Self::Output {
+        self.wrapping_mul(rhs)
+    }
+}
+
+impl MulAssign<U256> for U256 {
+    fn mul_assign(&mut self, rhs: U256) {
+        *self = *self * rhs;
+    }
+}
+
+impl Div<U256> for U256 {
+    type Output = Self;
+
+    fn div(self, rhs: U256) -> Self::Output {
+        Self(self.0 / rhs.0)
+    }
+}
+
+impl DivAssign<U256> for U256 {
+    fn div_assign(&mut self, rhs: U256) {
+        *self = *self / rhs;
+    }
+}
+
+impl Rem<U256> for U256 {
+    type Output = Self;
+
+    fn rem(self, rhs: U256) -> Self::Output {
+        Self(self.0 % rhs.0)
+    }
+}
+
+impl RemAssign<U256> for U256 {
+    fn rem_assign(&mut self, rhs: U256) {
+        *self = Self(self.0 % rhs.0);
+    }
+}
+
+impl U256 {
+    /// Zero value as U256
+    pub const fn zero() -> Self {
+        Self(PrimitiveU256::zero())
+    }
+
+    /// One value as U256
+    pub const fn one() -> Self {
+        Self(PrimitiveU256::one())
+    }
+
+    /// Max value of U256: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+    pub const fn max_value() -> Self {
+        Self(PrimitiveU256::max_value())
+    }
+
+    /// U256 from string with radix 10 or 16
+    pub fn from_str_radix(src: &str, radix: u32) -> Result<Self, U256FromStrError> {
+        PrimitiveU256::from_str_radix(src.trim_start_matches('0'), radix)
+            .map(Self)
+            .map_err(U256FromStrError)
+    }
+
+    /// U256 from 32 little endian bytes
+    pub fn from_le_bytes(slice: &[u8; U256_NUM_BYTES]) -> Self {
+        Self(PrimitiveU256::from_little_endian(slice))
+    }
+
+    /// U256 to 32 little endian bytes
+    pub fn to_le_bytes(self) -> [u8; U256_NUM_BYTES] {
+        let mut bytes = [0u8; U256_NUM_BYTES];
+        self.0.to_little_endian(&mut bytes);
+        bytes
+    }
+
+    /// Leading zeros of the number
+    pub fn leading_zeros(&self) -> u32 {
+        self.0.leading_zeros()
+    }
+
+    // Unchecked downcasting. Values as truncated if larger than target max
+    pub fn unchecked_as_u8(&self) -> u8 {
+        self.0.low_u128() as u8
+    }
+
+    pub fn unchecked_as_u16(&self) -> u16 {
+        self.0.low_u128() as u16
+    }
+
+    pub fn unchecked_as_u32(&self) -> u32 {
+        self.0.low_u128() as u32
+    }
+
+    pub fn unchecked_as_u64(&self) -> u64 {
+        self.0.low_u128() as u64
+    }
+
+    pub fn unchecked_as_u128(&self) -> u128 {
+        self.0.low_u128()
+    }
+
+    // Check arithmetic
+    /// Checked integer addition. Computes self + rhs, returning None if overflow occurred.
+    pub fn checked_add(self, rhs: Self) -> Option<Self> {
+        self.0.checked_add(rhs.0).map(Self)
+    }
+
+    /// Checked integer subtraction. Computes self - rhs, returning None if overflow occurred.
+    pub fn checked_sub(self, rhs: Self) -> Option<Self> {
+        self.0.checked_sub(rhs.0).map(Self)
+    }
+
+    /// Checked integer multiplication. Computes self * rhs, returning None if overflow occurred.
+    pub fn checked_mul(self, rhs: Self) -> Option<Self> {
+        self.0.checked_mul(rhs.0).map(Self)
+    }
+
+    /// Checked integer division. Computes self / rhs, returning None if rhs == 0.
+    pub fn checked_div(self, rhs: Self) -> Option<Self> {
+        self.0.checked_div(rhs.0).map(Self)
+    }
+
+    /// Checked integer remainder. Computes self % rhs, returning None if rhs == 0.
+    pub fn checked_rem(self, rhs: Self) -> Option<Self> {
+        self.0.checked_rem(rhs.0).map(Self)
+    }
+
+    /// Checked integer remainder. Computes self % rhs, returning None if rhs == 0.
+    pub fn checked_shl(self, rhs: u32) -> Option<Self> {
+        if rhs >= U256_NUM_BITS as u32 {
+            return None;
+        }
+        Some(Self(self.0.shl(rhs)))
+    }
+
+    /// Checked shift right. Computes self >> rhs, returning None if rhs is larger than or equal to the number of bits in self.
+    pub fn checked_shr(self, rhs: u32) -> Option<Self> {
+        if rhs >= U256_NUM_BITS as u32 {
+            return None;
+        }
+        Some(Self(self.0.shr(rhs)))
+    }
+
+    /// Downcast to a an unsigned value of type T
+    /// T must be at most u128
+    pub fn down_cast_lossy<T: std::convert::TryFrom<u128>>(self) -> T {
+        // Size of this type
+        let type_size = size_of::<T>();
+        // Maximum value for this type
+        let max_val: u128 = if type_size < 16 {
+            (1u128 << (NUM_BITS_PER_BYTE * type_size)) - 1u128
+        } else {
+            u128::MAX
+        };
+        // This should never fail
+        match T::try_from(self.0.low_u128() & max_val) {
+            Ok(w) => w,
+            Err(_) => panic!("Fatal! Downcast failed"),
+        }
+    }
+
+    /// Wrapping integer addition. Computes self + rhs,  wrapping around at the boundary of the type.
+    /// By definition in std::instrinsics, a.wrapping_add(b) = (a + b) % (2^N), where N is bit width
+    pub fn wrapping_add(self, rhs: Self) -> Self {
+        Self(self.0.overflowing_add(rhs.0).0)
+    }
+
+    /// Wrapping integer subtraction. Computes self - rhs,  wrapping around at the boundary of the type.
+    /// By definition in std::instrinsics, a.wrapping_add(b) = (a - b) % (2^N), where N is bit width
+    pub fn wrapping_sub(self, rhs: Self) -> Self {
+        Self(self.0.overflowing_sub(rhs.0).0)
+    }
+
+    /// Wrapping integer multiplication. Computes self * rhs,  wrapping around at the boundary of the type.
+    /// By definition in std::instrinsics, a.wrapping_mul(b) = (a * b) % (2^N), where N is bit width
+    pub fn wrapping_mul(self, rhs: Self) -> Self {
+        Self(self.0.overflowing_mul(rhs.0).0)
+    }
+
+    /// Implementation of widenining multiply
+    /// https://github.com/rust-random/rand/blob/master/src/distributions/utils.rs
+    #[inline(always)]
+    fn wmul(self, b: Self) -> (Self, Self) {
+        let half = 128;
+        #[allow(non_snake_case)]
+        let LOWER_MASK: U256 = Self::max_value() >> half;
+
+        let mut low = (self & LOWER_MASK).wrapping_mul(b & LOWER_MASK);
+        let mut t = low >> half;
+        low &= LOWER_MASK;
+        t += (self >> half).wrapping_mul(b & LOWER_MASK);
+        low += (t & LOWER_MASK) << half;
+        let mut high = t >> half;
+        t = low >> half;
+        low &= LOWER_MASK;
+        t += (b >> half).wrapping_mul(self & LOWER_MASK);
+        low += (t & LOWER_MASK) << half;
+        high += t >> half;
+        high += (self >> half).wrapping_mul(b >> half);
+
+        (high, low)
+    }
+}
+
+impl From<u8> for U256 {
+    fn from(n: u8) -> Self {
+        U256(PrimitiveU256::from(n))
+    }
+}
+
+impl From<u16> for U256 {
+    fn from(n: u16) -> Self {
+        U256(PrimitiveU256::from(n))
+    }
+}
+
+impl From<u32> for U256 {
+    fn from(n: u32) -> Self {
+        U256(PrimitiveU256::from(n))
+    }
+}
+
+impl From<u64> for U256 {
+    fn from(n: u64) -> Self {
+        U256(PrimitiveU256::from(n))
+    }
+}
+
+impl From<u128> for U256 {
+    fn from(n: u128) -> Self {
+        U256(PrimitiveU256::from(n))
+    }
+}
+
+/// TODO (ade): Remove conversions and migrate Prover & Move Model code from BigInt
+impl From<&U256> for BigInt {
+    fn from(n: &U256) -> Self {
+        BigInt::from_bytes_le(Sign::Plus, &n.to_le_bytes())
+    }
+}
+
+/// TODO (ade): Remove conversions and migrate Prover & Move Model code from EthnumU256
+impl From<&U256> for EthnumU256 {
+    fn from(n: &U256) -> EthnumU256 {
+        // TODO (ade): use better solution for conversion
+        // Currently using str because EthnumU256 can be little or big endian
+        let num_str = format!("{:X}", n.0);
+        // TODO (ade): remove expect()
+        EthnumU256::from_str_radix(&num_str, 16).expect("Cannot convert to U256")
+    }
+}
+
+impl TryFrom<U256> for u8 {
+    type Error = U256CastError;
+    fn try_from(n: U256) -> Result<Self, Self::Error> {
+        let n = n.0.low_u64();
+        if n > u8::MAX as u64 {
+            Err(U256CastError::new(n, U256CastErrorKind::TooLargeForU8))
+        } else {
+            Ok(n as u8)
+        }
+    }
+}
+
+impl TryFrom<U256> for u16 {
+    type Error = U256CastError;
+
+    fn try_from(n: U256) -> Result<Self, Self::Error> {
+        let n = n.0.low_u64();
+        if n > u16::MAX as u64 {
+            Err(U256CastError::new(n, U256CastErrorKind::TooLargeForU16))
+        } else {
+            Ok(n as u16)
+        }
+    }
+}
+
+impl TryFrom<U256> for u32 {
+    type Error = U256CastError;
+
+    fn try_from(n: U256) -> Result<Self, Self::Error> {
+        let n = n.0.low_u64();
+        if n > u32::MAX as u64 {
+            Err(U256CastError::new(n, U256CastErrorKind::TooLargeForU32))
+        } else {
+            Ok(n as u32)
+        }
+    }
+}
+
+impl TryFrom<U256> for u64 {
+    type Error = U256CastError;
+
+    fn try_from(n: U256) -> Result<Self, Self::Error> {
+        let n = n.0.low_u128();
+        if n > u64::MAX as u128 {
+            Err(U256CastError::new(n, U256CastErrorKind::TooLargeForU64))
+        } else {
+            Ok(n as u64)
+        }
+    }
+}
+
+impl TryFrom<U256> for u128 {
+    type Error = U256CastError;
+
+    fn try_from(n: U256) -> Result<Self, Self::Error> {
+        if n > U256::from(u128::MAX) {
+            Err(U256CastError::new(n, U256CastErrorKind::TooLargeForU128))
+        } else {
+            Ok(n.0.low_u128())
+        }
+    }
+}
+
+impl Distribution<U256> for Standard {
+    #[inline]
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> U256 {
+        let mut dest = [0; U256_NUM_BYTES];
+        rng.fill_bytes(&mut dest);
+        U256::from_le_bytes(&dest)
+    }
+}
+
+// Rand impl below are inspired by u128 impl found in https://rust-random.github.io/rand/src/rand/distributions/uniform.rs.html
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
+pub struct UniformU256 {
+    low: U256,
+    range: U256,
+    z: U256,
+}
+
+impl SampleUniform for U256 {
+    type Sampler = UniformU256;
+}
+
+impl UniformSampler for UniformU256 {
+    type X = U256;
+
+    fn new<B1, B2>(low: B1, high: B2) -> Self
+    where
+        B1: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+        B2: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+    {
+        let low = *low.borrow();
+        let high = *high.borrow();
+        assert!(low < high, "Uniform::new called with `low >= high`");
+        UniformSampler::new_inclusive(low, high - U256::one())
+    }
+
+    fn new_inclusive<B1, B2>(low: B1, high: B2) -> Self
+    where
+        B1: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+        B2: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+    {
+        let low = *low.borrow();
+        let high = *high.borrow();
+        assert!(
+            low <= high,
+            "Uniform::new_inclusive called with `low > high`"
+        );
+        let unsigned_max = U256::max_value();
+
+        let range = high.wrapping_sub(low).wrapping_add(U256::one());
+
+        let ints_to_reject = if range > U256::zero() {
+            (unsigned_max - range) + U256::one() % range
+        } else {
+            U256::zero()
+        };
+
+        UniformU256 {
+            low,
+            range,
+            z: ints_to_reject,
+        }
+    }
+
+    fn sample<R: rand::Rng + ?Sized>(&self, rng: &mut R) -> Self::X {
+        let range = self.range;
+        if range > U256::zero() {
+            let unsigned_max = U256::max_value();
+            let zone = unsigned_max - self.z;
+            loop {
+                let v: U256 = rng.gen();
+                let (hi, lo) = v.wmul(range);
+                if lo <= zone {
+                    return self.low.wrapping_add(hi);
+                }
+            }
+        } else {
+            // Sample from the entire integer range.
+            rng.gen()
+        }
+    }
+
+    fn sample_single<R: rand::Rng + ?Sized, B1, B2>(low: B1, high: B2, rng: &mut R) -> Self::X
+    where
+        B1: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+        B2: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+    {
+        let low = *low.borrow();
+        let high = *high.borrow();
+        assert!(low < high, "UniformSampler::sample_single: low >= high");
+        Self::sample_single_inclusive(low, high - U256::one(), rng)
+    }
+
+    fn sample_single_inclusive<R: rand::Rng + ?Sized, B1, B2>(
+        low: B1,
+        high: B2,
+        rng: &mut R,
+    ) -> Self::X
+    where
+        B1: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+        B2: rand::distributions::uniform::SampleBorrow<Self::X> + Sized,
+    {
+        let low = *low.borrow();
+        let high = *high.borrow();
+        assert!(
+            low <= high,
+            "UniformSampler::sample_single_inclusive: low > high"
+        );
+        let range = high.wrapping_sub(low).wrapping_add(U256::one());
+        // If the above resulted in wrap-around to 0, the range is U256::MIN..=U256::MAX,
+        // and any integer will do.
+        if range == U256::zero() {
+            return rng.gen();
+        }
+        // conservative but fast approximation. `- 1` is necessary to allow the
+        // same comparison without bias.
+        let zone = (range << range.leading_zeros()).wrapping_sub(U256::one());
+
+        loop {
+            let v: U256 = rng.gen();
+            let (hi, lo) = v.wmul(range);
+            if lo <= zone {
+                return low.wrapping_add(hi);
+            }
+        }
+    }
+}
+
+#[cfg(any(test, feature = "fuzzing"))]
+impl proptest::prelude::Arbitrary for U256 {
+    type Strategy = BoxedStrategy<Self>;
+    type Parameters = ();
+    fn arbitrary_with(_params: Self::Parameters) -> Self::Strategy {
+        use proptest::strategy::Strategy as _;
+        proptest::arbitrary::any::<[u8; U256_NUM_BYTES]>()
+            .prop_map(|q| U256::from_le_bytes(&q))
+            .boxed()
+    }
+}
+
+#[cfg(any(test, feature = "fuzzing"))]
+impl<'a> arbitrary::Arbitrary<'a> for U256 {
+    fn arbitrary(u: &mut arbitrary::Unstructured<'a>) -> arbitrary::Result<Self> {
+        let bytes = <[u8; U256_NUM_BYTES]>::arbitrary(u)?;
+        Ok(U256::from_le_bytes(&bytes))
+    }
+}
+
+#[test]
+fn wrapping_add() {
+    // a + b overflows U256::MAX by 100
+    // By definition in std::instrinsics, a.wrapping_add(b) = (a + b) % (2^N), where N is bit width
+
+    let a = U256::from(1234u32);
+    let b = U256::from_str_radix(
+        "115792089237316195423570985008687907853269984665640564039457584007913129638801",
+        10,
+    )
+    .unwrap();
+
+    assert!(a.wrapping_add(b) == U256::from(99u8));
+}
diff --git a/language/move-core/types/src/unit_tests/language_storage_test.rs b/language/move-core/types/src/unit_tests/language_storage_test.rs
index 9c8d59fe49..91ebe774b9 100644
--- a/language/move-core/types/src/unit_tests/language_storage_test.rs
+++ b/language/move-core/types/src/unit_tests/language_storage_test.rs
@@ -25,8 +25,11 @@ fn test_type_tag_deserialize_case_insensitive() {
         name: Identifier::from(IdentStr::new("TestStruct").unwrap()),
         type_params: vec![
             TypeTag::U8,
+            TypeTag::U16,
+            TypeTag::U32,
             TypeTag::U64,
             TypeTag::U128,
+            TypeTag::U256,
             TypeTag::Bool,
             TypeTag::Address,
             TypeTag::Signer,
@@ -36,14 +39,14 @@ fn test_type_tag_deserialize_case_insensitive() {
     let current_json = serde_json::to_string(&org_struct_tag).unwrap();
 
     let upper_case_json = format!(
-        r##"{{"address":"{}","module":"TestModule","name":"TestStruct","type_params":["U8","U64","U128","Bool","Address","Signer"]}}"##,
+        r##"{{"address":"{}","module":"TestModule","name":"TestStruct","type_params":["U8","U16","U32","U64","U128","U256","Bool","Address","Signer"]}}"##,
         AccountAddress::ONE
     );
     let upper_case_decoded = serde_json::from_str(upper_case_json.as_str()).unwrap();
     assert_eq!(org_struct_tag, upper_case_decoded);
 
     let lower_case_json = format!(
-        r##"{{"address":"{}","module":"TestModule","name":"TestStruct","type_args":["u8","u64","u128","bool","address","signer"]}}"##,
+        r##"{{"address":"{}","module":"TestModule","name":"TestStruct","type_args":["u8","u16","u32","u64","u128","u256","bool","address","signer"]}}"##,
         AccountAddress::ONE
     );
     let lower_case_decoded = serde_json::from_str(lower_case_json.as_str()).unwrap();
diff --git a/language/move-core/types/src/unit_tests/value_test.rs b/language/move-core/types/src/unit_tests/value_test.rs
index bc3d4adc64..74c075aeed 100644
--- a/language/move-core/types/src/unit_tests/value_test.rs
+++ b/language/move-core/types/src/unit_tests/value_test.rs
@@ -48,6 +48,40 @@ fn struct_deserialization() {
     );
 }
 
+/// A test which verifies that the BCS representation of
+/// a struct with a single field is equivalent to the BCS
+/// of the value in this field. It also tests
+/// that BCS serialization of utf8 strings is equivalent
+/// to the BCS serialization of vector<u8> of the bytes of
+/// the string.
+#[test]
+fn struct_one_field_equiv_value() {
+    let val = MoveValue::Vector(vec![
+        MoveValue::U8(1),
+        MoveValue::U8(22),
+        MoveValue::U8(13),
+        MoveValue::U8(99),
+    ]);
+    let s1 = MoveValue::Struct(MoveStruct::Runtime(vec![val.clone()]))
+        .simple_serialize()
+        .unwrap();
+    let s2 = val.simple_serialize().unwrap();
+    assert_eq!(s1, s2);
+
+    let utf8_str = "çå∞≠¢õß∂ƒ∫";
+    let vec_u8 = MoveValue::Vector(
+        utf8_str
+            .as_bytes()
+            .iter()
+            .map(|c| MoveValue::U8(*c))
+            .collect(),
+    );
+    assert_eq!(
+        bcs::to_bytes(utf8_str).unwrap(),
+        vec_u8.simple_serialize().unwrap()
+    )
+}
+
 #[test]
 fn nested_typed_struct_deserialization() {
     let struct_type = StructTag {
diff --git a/language/move-core/types/src/value.rs b/language/move-core/types/src/value.rs
index cc7f4aaedc..f721cb9f1e 100644
--- a/language/move-core/types/src/value.rs
+++ b/language/move-core/types/src/value.rs
@@ -6,8 +6,9 @@ use crate::{
     account_address::AccountAddress,
     identifier::Identifier,
     language_storage::{StructTag, TypeTag},
+    u256,
 };
-use anyhow::{bail, Result as AResult};
+use anyhow::{anyhow, bail, Result as AResult};
 use serde::{
     de::Error as DeError,
     ser::{SerializeMap, SerializeSeq, SerializeStruct, SerializeTuple},
@@ -50,6 +51,10 @@ pub enum MoveValue {
     Vector(Vec<MoveValue>),
     Struct(MoveStruct),
     Signer(AccountAddress),
+    // NOTE: Added in bytecode version v6, do not reorder!
+    U16(u16),
+    U32(u32),
+    U256(u256::U256),
 }
 
 /// A layout associated with a named field
@@ -96,6 +101,14 @@ pub enum MoveTypeLayout {
     Struct(MoveStructLayout),
     #[serde(rename(serialize = "signer", deserialize = "signer"))]
     Signer,
+
+    // NOTE: Added in bytecode version v6, do not reorder!
+    #[serde(rename(serialize = "u16", deserialize = "u16"))]
+    U16,
+    #[serde(rename(serialize = "u32", deserialize = "u32"))]
+    U32,
+    #[serde(rename(serialize = "u256", deserialize = "u256"))]
+    U256,
 }
 
 impl MoveValue {
@@ -111,6 +124,27 @@ impl MoveValue {
         MoveValue::Vector(v.into_iter().map(MoveValue::U8).collect())
     }
 
+    /// Converts the `Vec<MoveValue>` to a `Vec<u8>` if the inner `MoveValue` is a `MoveValue::U8`,
+    /// or returns an error otherwise.
+    pub fn vec_to_vec_u8(vec: Vec<MoveValue>) -> AResult<Vec<u8>> {
+        let mut vec_u8 = Vec::with_capacity(vec.len());
+
+        for byte in vec {
+            match byte {
+                MoveValue::U8(u8) => {
+                    vec_u8.push(u8);
+                }
+                _ => {
+                    return Err(anyhow!(
+                        "Expected inner MoveValue in Vec<MoveValue> to be a MoveValue::U8"
+                            .to_string(),
+                    ));
+                }
+            }
+        }
+        Ok(vec_u8)
+    }
+
     pub fn vector_address(v: Vec<AccountAddress>) -> Self {
         MoveValue::Vector(v.into_iter().map(MoveValue::Address).collect())
     }
@@ -273,8 +307,11 @@ impl<'d> serde::de::DeserializeSeed<'d> for &MoveTypeLayout {
         match self {
             MoveTypeLayout::Bool => bool::deserialize(deserializer).map(MoveValue::Bool),
             MoveTypeLayout::U8 => u8::deserialize(deserializer).map(MoveValue::U8),
+            MoveTypeLayout::U16 => u16::deserialize(deserializer).map(MoveValue::U16),
+            MoveTypeLayout::U32 => u32::deserialize(deserializer).map(MoveValue::U32),
             MoveTypeLayout::U64 => u64::deserialize(deserializer).map(MoveValue::U64),
             MoveTypeLayout::U128 => u128::deserialize(deserializer).map(MoveValue::U128),
+            MoveTypeLayout::U256 => u256::U256::deserialize(deserializer).map(MoveValue::U256),
             MoveTypeLayout::Address => {
                 AccountAddress::deserialize(deserializer).map(MoveValue::Address)
             }
@@ -408,8 +445,11 @@ impl serde::Serialize for MoveValue {
             MoveValue::Struct(s) => s.serialize(serializer),
             MoveValue::Bool(b) => serializer.serialize_bool(*b),
             MoveValue::U8(i) => serializer.serialize_u8(*i),
+            MoveValue::U16(i) => serializer.serialize_u16(*i),
+            MoveValue::U32(i) => serializer.serialize_u32(*i),
             MoveValue::U64(i) => serializer.serialize_u64(*i),
             MoveValue::U128(i) => serializer.serialize_u128(*i),
+            MoveValue::U256(i) => i.serialize(serializer),
             MoveValue::Address(a) => a.serialize(serializer),
             MoveValue::Signer(a) => a.serialize(serializer),
             MoveValue::Vector(v) => {
@@ -474,8 +514,11 @@ impl fmt::Display for MoveTypeLayout {
         match self {
             Bool => write!(f, "bool"),
             U8 => write!(f, "u8"),
+            U16 => write!(f, "u16"),
+            U32 => write!(f, "u32"),
             U64 => write!(f, "u64"),
             U128 => write!(f, "u128"),
+            U256 => write!(f, "u256"),
             Address => write!(f, "address"),
             Vector(typ) => write!(f, "vector<{}>", typ),
             Struct(s) => write!(f, "{}", s),
@@ -518,14 +561,17 @@ impl TryInto<TypeTag> for &MoveTypeLayout {
             MoveTypeLayout::Address => TypeTag::Address,
             MoveTypeLayout::Bool => TypeTag::Bool,
             MoveTypeLayout::U8 => TypeTag::U8,
+            MoveTypeLayout::U16 => TypeTag::U16,
+            MoveTypeLayout::U32 => TypeTag::U32,
             MoveTypeLayout::U64 => TypeTag::U64,
             MoveTypeLayout::U128 => TypeTag::U128,
+            MoveTypeLayout::U256 => TypeTag::U256,
             MoveTypeLayout::Signer => TypeTag::Signer,
             MoveTypeLayout::Vector(v) => {
                 let inner_type = &**v;
                 TypeTag::Vector(Box::new(inner_type.try_into()?))
             }
-            MoveTypeLayout::Struct(v) => TypeTag::Struct(v.try_into()?),
+            MoveTypeLayout::Struct(v) => TypeTag::Struct(Box::new(v.try_into()?)),
         })
     }
 }
@@ -548,8 +594,11 @@ impl fmt::Display for MoveValue {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             MoveValue::U8(u) => write!(f, "{}u8", u),
+            MoveValue::U16(u) => write!(f, "{}u16", u),
+            MoveValue::U32(u) => write!(f, "{}u32", u),
             MoveValue::U64(u) => write!(f, "{}u64", u),
             MoveValue::U128(u) => write!(f, "{}u128", u),
+            MoveValue::U256(u) => write!(f, "{}u256", u),
             MoveValue::Bool(false) => write!(f, "false"),
             MoveValue::Bool(true) => write!(f, "true"),
             MoveValue::Address(a) => write!(f, "{}", a.to_hex_literal()),
diff --git a/language/move-core/types/src/vm_status.rs b/language/move-core/types/src/vm_status.rs
index a5868137da..83ca430250 100644
--- a/language/move-core/types/src/vm_status.rs
+++ b/language/move-core/types/src/vm_status.rs
@@ -130,9 +130,6 @@ impl VMStatus {
                 let code = *code;
                 debug_assert!(code != StatusCode::EXECUTED);
                 debug_assert!(code != StatusCode::ABORTED);
-                debug_assert!(
-                    code.status_type() != StatusType::Execution || code == StatusCode::OUT_OF_GAS
-                );
                 code
             }
         }
@@ -162,6 +159,20 @@ impl VMStatus {
                 ..
             }
             | VMStatus::Error(StatusCode::OUT_OF_GAS) => Ok(KeptVMStatus::OutOfGas),
+
+            VMStatus::ExecutionFailure {
+                status_code:
+                    StatusCode::EXECUTION_LIMIT_REACHED
+                    | StatusCode::IO_LIMIT_REACHED
+                    | StatusCode::STORAGE_LIMIT_REACHED,
+                ..
+            }
+            | VMStatus::Error(
+                StatusCode::EXECUTION_LIMIT_REACHED
+                | StatusCode::IO_LIMIT_REACHED
+                | StatusCode::STORAGE_LIMIT_REACHED,
+            ) => Ok(KeptVMStatus::MiscellaneousError),
+
             VMStatus::ExecutionFailure {
                 status_code: _status_code,
                 location,
@@ -487,6 +498,12 @@ pub enum StatusCode {
     SEQUENCE_NONCE_INVALID = 29,
     // There was an error when accessing chain-specific account information
     CHAIN_ACCOUNT_INFO_DOES_NOT_EXIST = 30,
+    // Reserved error code for future use
+    RESERVED_VALIDATION_ERROR_1 = 31,
+    RESERVED_VALIDATION_ERROR_2 = 32,
+    RESERVED_VALIDATION_ERROR_3 = 33,
+    RESERVED_VALIDATION_ERROR_4 = 34,
+    RESERVED_VALIDATION_ERROR_5 = 35,
 
     // When a code module/script is published it is verified. These are the
     // possible errors that can arise from the verification process.
@@ -599,6 +616,25 @@ pub enum StatusCode {
     INVALID_PHANTOM_TYPE_PARAM_POSITION = 1108,
     VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR = 1109,
     VEC_BORROW_ELEMENT_EXISTS_MUTABLE_BORROW_ERROR = 1110,
+    // Loops are too deeply nested.
+    LOOP_MAX_DEPTH_REACHED = 1111,
+    TOO_MANY_TYPE_PARAMETERS = 1112,
+    TOO_MANY_PARAMETERS = 1113,
+    TOO_MANY_BASIC_BLOCKS = 1114,
+    VALUE_STACK_OVERFLOW = 1115,
+    TOO_MANY_TYPE_NODES = 1116,
+    VALUE_STACK_PUSH_OVERFLOW = 1117,
+    MAX_DEPENDENCY_DEPTH_REACHED = 1118,
+    MAX_FUNCTION_DEFINITIONS_REACHED = 1119,
+    MAX_STRUCT_DEFINITIONS_REACHED = 1120,
+    MAX_FIELD_DEFINITIONS_REACHED = 1121,
+    // Reserved error code for future use
+    TOO_MANY_BACK_EDGES = 1122,
+    RESERVED_VERIFICATION_ERROR_1 = 1123,
+    RESERVED_VERIFICATION_ERROR_2 = 1124,
+    RESERVED_VERIFICATION_ERROR_3 = 1125,
+    RESERVED_VERIFICATION_ERROR_4 = 1126,
+    RESERVED_VERIFICATION_ERROR_5 = 1127,
 
     // These are errors that the VM might raise if a violation of internal
     // invariants takes place.
@@ -621,6 +657,12 @@ pub enum StatusCode {
     // Failed to resolve type due to linking being broken after verification
     TYPE_RESOLUTION_FAILURE = 2021,
     DUPLICATE_NATIVE_FUNCTION = 2022,
+    // Reserved error code for future use
+    RESERVED_INVARIANT_VIOLATION_ERROR_1 = 2023,
+    RESERVED_INVARIANT_VIOLATION_ERROR_2 = 2024,
+    RESERVED_INVARIANT_VIOLATION_ERROR_3 = 2025,
+    RESERVED_INVARIANT_VIOLATION_ERROR_4 = 2026,
+    RESERVED_INVARIANT_VIOLATION_ERROR_5 = 2027,
 
     // Errors that can arise from binary decoding (deserialization)
     // Deserializtion Errors: 3000-3999
@@ -637,12 +679,21 @@ pub enum StatusCode {
     DUPLICATE_TABLE = 3010,
     UNKNOWN_ABILITY = 3013,
     UNKNOWN_NATIVE_STRUCT_FLAG = 3014,
+    BAD_U16 = 3017,
+    BAD_U32 = 3018,
     BAD_U64 = 3019,
     BAD_U128 = 3020,
+    BAD_U256 = 3021,
     VALUE_SERIALIZATION_ERROR = 3022,
     VALUE_DESERIALIZATION_ERROR = 3023,
     CODE_DESERIALIZATION_ERROR = 3024,
     INVALID_FLAG_BITS = 3025,
+    // Reserved error code for future use
+    RESERVED_DESERIALIZAION_ERROR_1 = 3026,
+    RESERVED_DESERIALIZAION_ERROR_2 = 3027,
+    RESERVED_DESERIALIZAION_ERROR_3 = 3028,
+    RESERVED_DESERIALIZAION_ERROR_4 = 3029,
+    RESERVED_DESERIALIZAION_ERROR_5 = 3030,
 
     // Errors that can arise at runtime
     // Runtime Errors: 4000-4999
@@ -664,7 +715,18 @@ pub enum StatusCode {
     VM_MAX_TYPE_DEPTH_REACHED = 4024,
     VM_MAX_VALUE_DEPTH_REACHED = 4025,
     VM_EXTENSION_ERROR = 4026,
-
+    STORAGE_WRITE_LIMIT_REACHED = 4027,
+    MEMORY_LIMIT_EXCEEDED = 4028,
+    VM_MAX_TYPE_NODES_REACHED = 4029,
+    EXECUTION_LIMIT_REACHED = 4030,
+    IO_LIMIT_REACHED = 4031,
+    STORAGE_LIMIT_REACHED = 4032,
+    // Reserved error code for future use
+    RESERVED_RUNTIME_ERROR_1 = 4033,
+    RESERVED_RUNTIME_ERROR_2 = 4034,
+    RESERVED_RUNTIME_ERROR_3 = 4035,
+    RESERVED_RUNTIME_ERROR_4 = 4036,
+    RESERVED_RUNTIME_ERROR_5 = 4037,
 
     // A reserved status to represent an unknown vm status.
     // this is std::u64::MAX, but we can't pattern match on that, so put the hardcoded value in
diff --git a/language/move-ir-compiler/Cargo.toml b/language/move-ir-compiler/Cargo.toml
index 79387bae2e..7b183ee239 100644
--- a/language/move-ir-compiler/Cargo.toml
+++ b/language/move-ir-compiler/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
@@ -19,9 +19,10 @@ move-ir-types = { path = "../move-ir/types" }
 move-core-types = { path = "../move-core/types" }
 move-binary-format = { path = "../move-binary-format" }
 move-symbol-pool = { path = "../move-symbol-pool" }
-bcs = "0.1.2"
 clap = { version = "3.1.8", features = ["derive"] }
 serde_json = "1.0.64"
 
+bcs.workspace = true
+
 [features]
 default = []
diff --git a/language/move-ir-compiler/move-bytecode-source-map/Cargo.toml b/language/move-ir-compiler/move-bytecode-source-map/Cargo.toml
index 7a20d53e1c..e7d1dc3c7a 100644
--- a/language/move-ir-compiler/move-bytecode-source-map/Cargo.toml
+++ b/language/move-ir-compiler/move-bytecode-source-map/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
@@ -14,7 +14,8 @@ move-symbol-pool = { path = "../../move-symbol-pool" }
 move-binary-format = { path = "../../move-binary-format" }
 move-command-line-common = { path = "../../move-command-line-common" }
 
-bcs = "0.1.2"
+bcs.workspace = true
+
 serde = { version = "1.0.124", default-features = false }
 
 [features]
diff --git a/language/move-ir-compiler/move-ir-to-bytecode/Cargo.toml b/language/move-ir-compiler/move-ir-to-bytecode/Cargo.toml
index 755d11ef40..51b95fde27 100644
--- a/language/move-ir-compiler/move-ir-to-bytecode/Cargo.toml
+++ b/language/move-ir-compiler/move-ir-to-bytecode/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
diff --git a/language/move-ir-compiler/move-ir-to-bytecode/src/compiler.rs b/language/move-ir-compiler/move-ir-to-bytecode/src/compiler.rs
index e80badc417..ade4aa0ee4 100644
--- a/language/move-ir-compiler/move-ir-to-bytecode/src/compiler.rs
+++ b/language/move-ir-compiler/move-ir-to-bytecode/src/compiler.rs
@@ -27,6 +27,7 @@ use std::{
         hash_map::Entry::{Occupied, Vacant},
         BTreeSet, HashMap, HashSet,
     },
+    fmt::Write,
 };
 
 macro_rules! record_src_loc {
@@ -195,24 +196,26 @@ fn label_verification_error(
 ) -> Result<()> {
     let mut message = "Invalid block labels".to_string();
     if !redeclared.is_empty() {
-        message.push_str(&format!(
+        write!(
+            &mut message,
             ", labels were declared twice ({})",
             redeclared
                 .iter()
                 .map(|l| l.to_string())
                 .collect::<Vec<_>>()
-                .join(", "),
-        ));
+                .join(", ")
+        )?;
     }
     if !undeclared.is_empty() {
-        message.push_str(&format!(
+        write!(
+            &mut message,
             ", labels were used without being declared ({})",
             undeclared
                 .iter()
                 .map(|l| l.to_string())
                 .collect::<Vec<_>>()
-                .join(", "),
-        ));
+                .join(", ")
+        )?;
     }
     bail!(message);
 }
@@ -650,8 +653,11 @@ fn compile_type(
         Type::Address => SignatureToken::Address,
         Type::Signer => SignatureToken::Signer,
         Type::U8 => SignatureToken::U8,
+        Type::U16 => SignatureToken::U16,
+        Type::U32 => SignatureToken::U32,
         Type::U64 => SignatureToken::U64,
         Type::U128 => SignatureToken::U128,
+        Type::U256 => SignatureToken::U256,
         Type::Bool => SignatureToken::Bool,
         Type::Vector(inner_type) => SignatureToken::Vector(Box::new(compile_type(
             context,
@@ -1104,6 +1110,14 @@ fn compile_expression(
                 push_instr!(exp.loc, Bytecode::LdU8(i));
                 function_frame.push()?;
             }
+            CopyableVal_::U16(i) => {
+                push_instr!(exp.loc, Bytecode::LdU16(i));
+                function_frame.push()?;
+            }
+            CopyableVal_::U32(i) => {
+                push_instr!(exp.loc, Bytecode::LdU32(i));
+                function_frame.push()?;
+            }
             CopyableVal_::U64(i) => {
                 push_instr!(exp.loc, Bytecode::LdU64(i));
                 function_frame.push()?;
@@ -1112,6 +1126,10 @@ fn compile_expression(
                 push_instr!(exp.loc, Bytecode::LdU128(i));
                 function_frame.push()?;
             }
+            CopyableVal_::U256(i) => {
+                push_instr!(exp.loc, Bytecode::LdU256(i));
+                function_frame.push()?;
+            }
             CopyableVal_::ByteArray(buf) => {
                 let vec_value = MoveValue::vector_u8(buf);
                 let ty = Type::Vector(Box::new(Type::U8));
@@ -1477,6 +1495,16 @@ fn compile_call(
                     function_frame.pop()?;
                     function_frame.push()?;
                 }
+                Builtin::ToU16 => {
+                    push_instr!(call.loc, Bytecode::CastU16);
+                    function_frame.pop()?;
+                    function_frame.push()?;
+                }
+                Builtin::ToU32 => {
+                    push_instr!(call.loc, Bytecode::CastU32);
+                    function_frame.pop()?;
+                    function_frame.push()?;
+                }
                 Builtin::ToU64 => {
                     push_instr!(call.loc, Bytecode::CastU64);
                     function_frame.pop()?;
@@ -1487,6 +1515,11 @@ fn compile_call(
                     function_frame.pop()?;
                     function_frame.push()?;
                 }
+                Builtin::ToU256 => {
+                    push_instr!(call.loc, Bytecode::CastU256);
+                    function_frame.pop()?;
+                    function_frame.push()?;
+                }
             }
         }
         FunctionCall_::ModuleFunctionCall {
@@ -1521,8 +1554,11 @@ fn compile_constant(_context: &mut Context, ty: Type, value: MoveValue) -> Resul
             Type::Address => MoveTypeLayout::Address,
             Type::Signer => MoveTypeLayout::Signer,
             Type::U8 => MoveTypeLayout::U8,
+            Type::U16 => MoveTypeLayout::U16,
+            Type::U32 => MoveTypeLayout::U32,
             Type::U64 => MoveTypeLayout::U64,
             Type::U128 => MoveTypeLayout::U128,
+            Type::U256 => MoveTypeLayout::U256,
             Type::Bool => MoveTypeLayout::Bool,
             Type::Vector(inner_type) => MoveTypeLayout::Vector(Box::new(type_layout(*inner_type)?)),
             Type::Reference(_, _) => bail!("References are not supported in constant type layouts"),
@@ -1612,11 +1648,17 @@ fn compile_bytecode(
         IRBytecode_::BrFalse(lbl) => Bytecode::BrFalse(context.label_index(lbl)?),
         IRBytecode_::Branch(lbl) => Bytecode::Branch(context.label_index(lbl)?),
         IRBytecode_::LdU8(u) => Bytecode::LdU8(u),
+        IRBytecode_::LdU16(u) => Bytecode::LdU16(u),
+        IRBytecode_::LdU32(u) => Bytecode::LdU32(u),
         IRBytecode_::LdU64(u) => Bytecode::LdU64(u),
         IRBytecode_::LdU128(u) => Bytecode::LdU128(u),
+        IRBytecode_::LdU256(u) => Bytecode::LdU256(u),
         IRBytecode_::CastU8 => Bytecode::CastU8,
+        IRBytecode_::CastU16 => Bytecode::CastU16,
+        IRBytecode_::CastU32 => Bytecode::CastU32,
         IRBytecode_::CastU64 => Bytecode::CastU64,
         IRBytecode_::CastU128 => Bytecode::CastU128,
+        IRBytecode_::CastU256 => Bytecode::CastU256,
         IRBytecode_::LdTrue => Bytecode::LdTrue,
         IRBytecode_::LdFalse => Bytecode::LdFalse,
         IRBytecode_::LdConst(ty, v) => {
diff --git a/language/move-ir-compiler/move-ir-to-bytecode/src/context.rs b/language/move-ir-compiler/move-ir-to-bytecode/src/context.rs
index 9f0f23a69c..8afc1aebf0 100644
--- a/language/move-ir-compiler/move-ir-to-bytecode/src/context.rs
+++ b/language/move-ir-compiler/move-ir-to-bytecode/src/context.rs
@@ -758,8 +758,11 @@ impl<'a> Context<'a> {
         Ok(match orig {
             x @ SignatureToken::Bool
             | x @ SignatureToken::U8
+            | x @ SignatureToken::U16
+            | x @ SignatureToken::U32
             | x @ SignatureToken::U64
             | x @ SignatureToken::U128
+            | x @ SignatureToken::U256
             | x @ SignatureToken::Address
             | x @ SignatureToken::Signer
             | x @ SignatureToken::TypeParameter(_) => x,
diff --git a/language/move-ir-compiler/move-ir-to-bytecode/syntax/Cargo.toml b/language/move-ir-compiler/move-ir-to-bytecode/syntax/Cargo.toml
index 0f5d7a4377..0180317793 100644
--- a/language/move-ir-compiler/move-ir-to-bytecode/syntax/Cargo.toml
+++ b/language/move-ir-compiler/move-ir-to-bytecode/syntax/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
diff --git a/language/move-ir-compiler/move-ir-to-bytecode/syntax/src/lexer.rs b/language/move-ir-compiler/move-ir-to-bytecode/syntax/src/lexer.rs
index 956486477c..8bca7244ca 100644
--- a/language/move-ir-compiler/move-ir-to-bytecode/syntax/src/lexer.rs
+++ b/language/move-ir-compiler/move-ir-to-bytecode/syntax/src/lexer.rs
@@ -11,8 +11,11 @@ pub enum Tok {
     EOF,
     AccountAddressValue,
     U8Value,
+    U16Value,
+    U32Value,
     U64Value,
     U128Value,
+    U256Value,
     NameValue,
     NameBeginTyValue,
     DotNameValue,
@@ -64,8 +67,11 @@ pub enum Tok {
     /// Like exists, but for spec language
     GlobalExists,
     ToU8,
+    ToU16,
+    ToU32,
     ToU64,
     ToU128,
+    ToU256,
     Import,
     /// For spec language
     Invariant,
@@ -408,15 +414,21 @@ fn get_name_len(text: &str) -> usize {
 fn get_decimal_number(text: &str) -> (Tok, usize) {
     let len = text
         .chars()
-        .position(|c| !matches!(c, '0'..='9'))
+        .position(|c| !matches!(c, '0'..='9' | '_'))
         .unwrap_or(text.len());
     let rest = &text[len..];
     if rest.starts_with("u8") {
         (Tok::U8Value, len + 2)
+    } else if rest.starts_with("u16") {
+        (Tok::U16Value, len + 3)
+    } else if rest.starts_with("u32") {
+        (Tok::U32Value, len + 3)
     } else if rest.starts_with("u64") {
         (Tok::U64Value, len + 3)
     } else if rest.starts_with("u128") {
         (Tok::U128Value, len + 4)
+    } else if rest.starts_with("u256") {
+        (Tok::U256Value, len + 4)
     } else {
         (Tok::U64Value, len)
     }
@@ -425,7 +437,7 @@ fn get_decimal_number(text: &str) -> (Tok, usize) {
 // Return the length of the substring containing characters in [0-9a-fA-F].
 fn get_hex_digits_len(text: &str) -> usize {
     text.chars()
-        .position(|c| !matches!(c, 'a'..='f' | 'A'..='F' | '0'..='9'))
+        .position(|c| !matches!(c, 'a'..='f' | 'A'..='F' | '0'..='9' | '_'))
         .unwrap_or(text.len())
 }
 
@@ -455,8 +467,11 @@ fn get_name_token(name: &str) -> Tok {
         "global" => Tok::Global,              // spec language
         "global_exists" => Tok::GlobalExists, // spec language
         "to_u8" => Tok::ToU8,
+        "to_u16" => Tok::ToU16,
+        "to_u32" => Tok::ToU32,
         "to_u64" => Tok::ToU64,
         "to_u128" => Tok::ToU128,
+        "to_u256" => Tok::ToU256,
         "import" => Tok::Import,
         "jump" => Tok::Jump,
         "jump_if" => Tok::JumpIf,
diff --git a/language/move-ir-compiler/move-ir-to-bytecode/syntax/src/lib.rs b/language/move-ir-compiler/move-ir-to-bytecode/syntax/src/lib.rs
index 89abac287d..8fddaa5a65 100644
--- a/language/move-ir-compiler/move-ir-to-bytecode/syntax/src/lib.rs
+++ b/language/move-ir-compiler/move-ir-to-bytecode/syntax/src/lib.rs
@@ -23,8 +23,11 @@
 //! g ∈ GroundType ::=
 //!   | bool
 //!   | u8        // unsigned 8 bit integer
+//!   | u16       // unsigned 16 bit integer
+//!   | u32       // unsigned 32 bit integer
 //!   | u64       // unsigned 64 bit integer
 //!   | u128      // unsigned 128 bit integer
+//!   | u256      // unsigned 256 bit integer
 //!   | address   // 32 byte account address
 //!   | bytearray // immutable, arbitrarily sized array of bytes
 //!
diff --git a/language/move-ir-compiler/move-ir-to-bytecode/syntax/src/syntax.rs b/language/move-ir-compiler/move-ir-to-bytecode/syntax/src/syntax.rs
index 3d381d5d14..1054ca4048 100644
--- a/language/move-ir-compiler/move-ir-to-bytecode/syntax/src/syntax.rs
+++ b/language/move-ir-compiler/move-ir-to-bytecode/syntax/src/syntax.rs
@@ -7,7 +7,7 @@ use std::{collections::BTreeSet, fmt, str::FromStr};
 
 use crate::lexer::*;
 use move_command_line_common::files::FileHash;
-use move_core_types::account_address::AccountAddress;
+use move_core_types::{account_address::AccountAddress, u256};
 use move_ir_types::{ast::*, location::*, spec_language_ast::*};
 use move_symbol_pool::Symbol;
 
@@ -279,6 +279,24 @@ fn parse_copyable_val(tokens: &mut Lexer) -> Result<CopyableVal, ParseError<Loc,
             tokens.advance()?;
             CopyableVal_::U8(i)
         }
+        Tok::U16Value => {
+            let mut s = tokens.content();
+            if s.ends_with("u16") {
+                s = &s[..s.len() - 3]
+            }
+            let i = u16::from_str(s).unwrap();
+            tokens.advance()?;
+            CopyableVal_::U16(i)
+        }
+        Tok::U32Value => {
+            let mut s = tokens.content();
+            if s.ends_with("u32") {
+                s = &s[..s.len() - 3]
+            }
+            let i = u32::from_str(s).unwrap();
+            tokens.advance()?;
+            CopyableVal_::U32(i)
+        }
         Tok::U64Value => {
             let mut s = tokens.content();
             if s.ends_with("u64") {
@@ -297,6 +315,15 @@ fn parse_copyable_val(tokens: &mut Lexer) -> Result<CopyableVal, ParseError<Loc,
             tokens.advance()?;
             CopyableVal_::U128(i)
         }
+        Tok::U256Value => {
+            let mut s = tokens.content();
+            if s.ends_with("256") {
+                s = &s[..s.len() - 4]
+            }
+            let i = u256::U256::from_str(s).unwrap();
+            tokens.advance()?;
+            CopyableVal_::U256(i)
+        }
         Tok::ByteArrayValue => {
             let s = tokens.content();
             let buf = hex::decode(&s[2..s.len() - 1]).unwrap_or_else(|_| {
@@ -441,8 +468,11 @@ fn parse_qualified_function_name(
         | Tok::VecSwap
         | Tok::Freeze
         | Tok::ToU8
+        | Tok::ToU16
+        | Tok::ToU32
         | Tok::ToU64
-        | Tok::ToU128 => {
+        | Tok::ToU128
+        | Tok::ToU256 => {
             let f = parse_builtin(tokens)?;
             FunctionCall_::Builtin(f)
         }
@@ -585,8 +615,11 @@ fn parse_call_or_term_(tokens: &mut Lexer) -> Result<Exp_, ParseError<Loc, anyho
         | Tok::Freeze
         | Tok::DotNameValue
         | Tok::ToU8
+        | Tok::ToU16
+        | Tok::ToU32
         | Tok::ToU64
-        | Tok::ToU128 => {
+        | Tok::ToU128
+        | Tok::ToU256 => {
             let f = parse_qualified_function_name(tokens)?;
             let exp = parse_call_or_term(tokens)?;
             Ok(Exp_::FunctionCall(f, Box::new(exp)))
@@ -666,8 +699,11 @@ fn parse_term_(tokens: &mut Lexer) -> Result<Exp_, ParseError<Loc, anyhow::Error
         | Tok::True
         | Tok::False
         | Tok::U8Value
+        | Tok::U16Value
+        | Tok::U32Value
         | Tok::U64Value
         | Tok::U128Value
+        | Tok::U256Value
         | Tok::ByteArrayValue => Ok(Exp_::Value(parse_copyable_val(tokens)?)),
         Tok::NameValue | Tok::NameBeginTyValue => {
             let (name, type_actuals) = parse_name_and_type_actuals(tokens)?;
@@ -822,6 +858,14 @@ fn parse_builtin(tokens: &mut Lexer) -> Result<Builtin, ParseError<Loc, anyhow::
             tokens.advance()?;
             Ok(Builtin::ToU8)
         }
+        Tok::ToU16 => {
+            tokens.advance()?;
+            Ok(Builtin::ToU16)
+        }
+        Tok::ToU32 => {
+            tokens.advance()?;
+            Ok(Builtin::ToU32)
+        }
         Tok::ToU64 => {
             tokens.advance()?;
             Ok(Builtin::ToU64)
@@ -830,6 +874,10 @@ fn parse_builtin(tokens: &mut Lexer) -> Result<Builtin, ParseError<Loc, anyhow::
             tokens.advance()?;
             Ok(Builtin::ToU128)
         }
+        Tok::ToU256 => {
+            tokens.advance()?;
+            Ok(Builtin::ToU256)
+        }
         t => Err(ParseError::InvalidToken {
             location: current_token_loc(tokens),
             message: format!("unrecognized token kind for builtin {:?}", t),
@@ -1026,8 +1074,11 @@ fn parse_statement_(tokens: &mut Lexer) -> Result<Statement_, ParseError<Loc, an
         | Tok::Freeze
         | Tok::DotNameValue
         | Tok::ToU8
+        | Tok::ToU16
+        | Tok::ToU32
         | Tok::ToU64
-        | Tok::ToU128 => Ok(Statement_::Exp(Box::new(parse_call(tokens)?))),
+        | Tok::ToU128
+        | Tok::ToU256 => Ok(Statement_::Exp(Box::new(parse_call(tokens)?))),
         Tok::LParen => {
             tokens.advance()?;
             let start = tokens.start_loc();
@@ -1195,6 +1246,14 @@ fn parse_type(tokens: &mut Lexer) -> Result<Type, ParseError<Loc, anyhow::Error>
             tokens.advance()?;
             Type::U8
         }
+        Tok::NameValue if matches!(tokens.content(), "u16") => {
+            tokens.advance()?;
+            Type::U16
+        }
+        Tok::NameValue if matches!(tokens.content(), "u32") => {
+            tokens.advance()?;
+            Type::U32
+        }
         Tok::NameValue if matches!(tokens.content(), "u64") => {
             tokens.advance()?;
             Type::U64
@@ -1203,6 +1262,10 @@ fn parse_type(tokens: &mut Lexer) -> Result<Type, ParseError<Loc, anyhow::Error>
             tokens.advance()?;
             Type::U128
         }
+        Tok::NameValue if matches!(tokens.content(), "u256") => {
+            tokens.advance()?;
+            Type::U256
+        }
         Tok::NameValue if matches!(tokens.content(), "bool") => {
             tokens.advance()?;
             Type::Bool
@@ -1306,12 +1369,12 @@ fn parse_type_parameter(
 }
 
 // TypeActuals: Vec<Type> = {
-//     <tys: ("<" <Comma<Type>> ">")?> => { ... }
+//     <tys: ('<' <Comma<Type>> ">")?> => { ... }
 // }
 
 fn parse_type_actuals(tokens: &mut Lexer) -> Result<Vec<Type>, ParseError<Loc, anyhow::Error>> {
     let tys = if tokens.peek() == Tok::Less {
-        tokens.advance()?; // consume the "<"
+        tokens.advance()?; // consume the '<'
         let list = parse_comma_list(tokens, &[Tok::Greater], parse_type, true)?;
         consume_token(tokens, Tok::Greater)?;
         list
@@ -1351,7 +1414,7 @@ where
 }
 
 // NameAndTypeActuals: (String, Vec<Type>) = {
-//     <n: NameBeginTy> "<" <tys: Comma<Type>> ">" => (n, tys),
+//     <n: NameBeginTy> '<' <tys: Comma<Type>> ">" => (n, tys),
 //     <n: Name> => (n, vec![]),
 // }
 
@@ -1513,8 +1576,11 @@ fn parse_unary_spec_exp(tokens: &mut Lexer) -> Result<SpecExp, ParseError<Loc, a
         | Tok::True
         | Tok::False
         | Tok::U8Value
+        | Tok::U16Value
+        | Tok::U32Value
         | Tok::U64Value
         | Tok::U128Value
+        | Tok::U256Value
         | Tok::ByteArrayValue => SpecExp::Constant(parse_copyable_val(tokens)?.value),
         Tok::GlobalExists => {
             consume_token(tokens, Tok::GlobalExists)?;
diff --git a/language/move-ir-compiler/src/lib.rs b/language/move-ir-compiler/src/lib.rs
index b048ade418..030c9e0b86 100644
--- a/language/move-ir-compiler/src/lib.rs
+++ b/language/move-ir-compiler/src/lib.rs
@@ -64,14 +64,14 @@ impl<'a> Compiler<'a> {
     fn compile_script(self, code: &str) -> Result<(CompiledScript, SourceMap)> {
         let parsed_script = parse_script(code)?;
         let (compiled_script, source_map) =
-            compile_script(parsed_script, self.deps.iter().map(|d| &**d))?;
+            compile_script(parsed_script, self.deps.iter().copied())?;
         Ok((compiled_script, source_map))
     }
 
     fn compile_mod(self, code: &str) -> Result<(CompiledModule, SourceMap)> {
         let parsed_module = parse_module(code)?;
         let (compiled_module, source_map) =
-            compile_module(parsed_module, self.deps.iter().map(|d| &**d))?;
+            compile_module(parsed_module, self.deps.iter().copied())?;
         Ok((compiled_module, source_map))
     }
 }
diff --git a/language/move-ir-compiler/src/unit_tests/function_tests.rs b/language/move-ir-compiler/src/unit_tests/function_tests.rs
index 5fa726968e..a5af5b0553 100644
--- a/language/move-ir-compiler/src/unit_tests/function_tests.rs
+++ b/language/move-ir-compiler/src/unit_tests/function_tests.rs
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::unit_tests::testutils::compile_module_string;
+use std::fmt::Write;
 
 fn generate_function(name: &str, num_formals: usize, num_locals: usize) -> String {
     let mut code = format!("public {}(", name);
@@ -10,7 +11,7 @@ fn generate_function(name: &str, num_formals: usize, num_locals: usize) -> Strin
     code.reserve(30 * (num_formals + num_locals));
 
     for i in 0..num_formals {
-        code.push_str(&format!("formal_{}: u64", i));
+        write!(&mut code, "formal_{}: u64", i).unwrap();
         if i < num_formals - 1 {
             code.push_str(", ");
         }
@@ -19,11 +20,11 @@ fn generate_function(name: &str, num_formals: usize, num_locals: usize) -> Strin
     code.push_str(") {\n");
 
     for i in 0..num_locals {
-        code.push_str(&format!("let x_{}: u64;\n", i));
+        writeln!(&mut code, "let x_{}: u64;", i).unwrap();
     }
     code.push_str("label b0:\n");
     for i in 0..num_locals {
-        code.push_str(&format!("x_{} = {};\n", i, i));
+        writeln!(&mut code, "x_{} = {};", i, i).unwrap();
     }
 
     code.push_str("return;");
@@ -42,8 +43,9 @@ fn compile_module_with_large_frame() {
         ",
     );
 
-    // Max number of locals (formals + local variables) is u8::max_value().
-    code.push_str(&generate_function("foo_func", 128, 127));
+    // Default metering in place, so use reasonable values. This may need to be changed
+    // when the metering changes, and gives a useful signal.
+    code.push_str(&generate_function("foo_func", 64, 90));
 
     code.push('}');
 
diff --git a/language/move-ir-compiler/transactional-tests/Cargo.toml b/language/move-ir-compiler/transactional-tests/Cargo.toml
index 0fdf6a8d63..122e04c286 100644
--- a/language/move-ir-compiler/transactional-tests/Cargo.toml
+++ b/language/move-ir-compiler/transactional-tests/Cargo.toml
@@ -3,7 +3,7 @@ name = "move-ir-compiler-transactional-tests"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dev-dependencies]
diff --git a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/declarations/function.exp b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/declarations/function.exp
index 1518ba1967..b1840c7598 100644
--- a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/declarations/function.exp
+++ b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/declarations/function.exp
@@ -1,7 +1,7 @@
 processed 2 tasks
 
 task 0 'print-bytecode'. lines 1-31:
-// Move bytecode v5
+// Move bytecode v6
 module 3d10.Example {
 struct Coin {
 	value: u64
@@ -31,7 +31,7 @@ B0:
 	6: ImmBorrowLoc[1](Arg1: Coin)
 	7: StLoc[4](loc2: &Coin)
 	8: MoveLoc[4](loc2: &Coin)
-	9: Call[0](value(&Coin): u64)
+	9: Call value(&Coin): u64
 	10: StLoc[5](loc3: u64)
 	11: CopyLoc[3](loc1: u64)
 	12: CopyLoc[5](loc3: u64)
@@ -48,7 +48,7 @@ B0:
 }
 
 task 1 'print-bytecode'. lines 33-46:
-// Move bytecode v5
+// Move bytecode v6
 module 4d10.M {
 
 
@@ -58,7 +58,7 @@ B0:
 }
 entry public g() {
 B0:
-	0: Call[0](f())
+	0: Call f()
 	1: Ret
 }
 }
diff --git a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/declarations/let.exp b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/declarations/let.exp
index 0d4fb74930..f5a3574887 100644
--- a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/declarations/let.exp
+++ b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/declarations/let.exp
@@ -1,7 +1,7 @@
 processed 2 tasks
 
 task 0 'print-bytecode'. lines 1-7:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
diff --git a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/binary_add.exp b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/binary_add.exp
index 9d76d85f19..97170bbb48 100644
--- a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/binary_add.exp
+++ b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/binary_add.exp
@@ -1,7 +1,7 @@
 processed 1 task
 
 task 0 'print-bytecode'. lines 1-13:
-// Move bytecode v5
+// Move bytecode v6
 module e.Expressions {
 
 
diff --git a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/borrow.exp b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/borrow.exp
index 44763b8adc..418a61e623 100644
--- a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/borrow.exp
+++ b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/borrow.exp
@@ -1,7 +1,7 @@
 processed 9 tasks
 
 task 0 'print-bytecode'. lines 1-11:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
@@ -20,7 +20,7 @@ B0:
 }
 
 task 1 'print-bytecode'. lines 13-24:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
@@ -40,7 +40,7 @@ B0:
 }
 
 task 2 'print-bytecode'. lines 26-59:
-// Move bytecode v5
+// Move bytecode v6
 module 1d4.M {
 struct T {
 	u: u64
@@ -76,7 +76,7 @@ B0:
 }
 
 task 3 'print-bytecode'. lines 61-80:
-// Move bytecode v5
+// Move bytecode v6
 module 2d4.M {
 struct T<Ty0> {
 	u: Ty0
diff --git a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/borrow_mut.exp b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/borrow_mut.exp
index 71e1899445..588d97d1cf 100644
--- a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/borrow_mut.exp
+++ b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/borrow_mut.exp
@@ -1,7 +1,7 @@
 processed 3 tasks
 
 task 0 'print-bytecode'. lines 1-10:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
@@ -21,7 +21,7 @@ B0:
 }
 
 task 1 'print-bytecode'. lines 12-23:
-// Move bytecode v5
+// Move bytecode v6
 module 3d.Foobar {
 struct FooCoin {
 	value: u64
@@ -39,7 +39,7 @@ B0:
 }
 
 task 2 'print-bytecode'. lines 25-36:
-// Move bytecode v5
+// Move bytecode v6
 module 4d.Foobar {
 struct FooCoin<Ty0> {
 	value: u64
diff --git a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/borrow_global.exp b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/borrow_global.exp
index e85c4d6cef..c5e0a5fc35 100644
--- a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/borrow_global.exp
+++ b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/borrow_global.exp
@@ -1,8 +1,11 @@
 processed 4 tasks
 
 task 0 'print-bytecode'. lines 1-14:
-// Move bytecode v5
+// Move bytecode v6
 module 1d6.M {
+use 00000000000000000000000000000001::signer;
+
+
 struct T has key {
 	b: bool
 }
@@ -10,7 +13,7 @@ struct T has key {
 f(Arg0: signer) {
 B0:
 	0: ImmBorrowLoc[0](Arg0: signer)
-	1: Call[1](address_of(&signer): address)
+	1: Call signer::address_of(&signer): address
 	2: ImmBorrowGlobal[0](T)
 	3: StLoc[1](loc0: &T)
 	4: Ret
diff --git a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/borrow_global_mut.exp b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/borrow_global_mut.exp
index e9e33c45ab..c5321e9161 100644
--- a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/borrow_global_mut.exp
+++ b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/borrow_global_mut.exp
@@ -1,8 +1,11 @@
 processed 4 tasks
 
 task 0 'print-bytecode'. lines 1-14:
-// Move bytecode v5
+// Move bytecode v6
 module 1d6.M {
+use 00000000000000000000000000000001::signer;
+
+
 struct T has key {
 	b: bool
 }
@@ -10,7 +13,7 @@ struct T has key {
 f(Arg0: signer) {
 B0:
 	0: ImmBorrowLoc[0](Arg0: signer)
-	1: Call[1](address_of(&signer): address)
+	1: Call signer::address_of(&signer): address
 	2: MutBorrowGlobal[0](T)
 	3: StLoc[1](loc0: &mut T)
 	4: Ret
diff --git a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/exists.exp b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/exists.exp
index cc653ac720..e1ca1eb93a 100644
--- a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/exists.exp
+++ b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/exists.exp
@@ -1,7 +1,7 @@
 processed 4 tasks
 
 task 0 'print-bytecode'. lines 1-11:
-// Move bytecode v5
+// Move bytecode v6
 module 5d5.M {
 struct T has key {
 	b: bool
diff --git a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/move_to.exp b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/move_to.exp
index 7697250637..af7ebddeb2 100644
--- a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/move_to.exp
+++ b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/move_to.exp
@@ -1,7 +1,7 @@
 processed 4 tasks
 
 task 0 'print-bytecode'. lines 1-16:
-// Move bytecode v5
+// Move bytecode v6
 module 2d6.M {
 struct T has key {
 	b: bool
@@ -16,7 +16,7 @@ B0:
 f(Arg0: signer) {
 B0:
 	0: ImmBorrowLoc[0](Arg0: signer)
-	1: Call[0](new(): T)
+	1: Call new(): T
 	2: MoveTo[0](T)
 	3: Ret
 }
diff --git a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/vector.exp b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/vector.exp
index 6ee59d5353..f7a561a3e8 100644
--- a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/vector.exp
+++ b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/builtins/vector.exp
@@ -1,7 +1,7 @@
 processed 1 task
 
 task 0 'print-bytecode'. lines 1-31:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
diff --git a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/combined.exp b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/combined.exp
index de271bd332..1ea04e354d 100644
--- a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/combined.exp
+++ b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/combined.exp
@@ -1,7 +1,7 @@
 processed 1 task
 
 task 0 'print-bytecode'. lines 1-11:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
diff --git a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/pack.exp b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/pack.exp
index c9397e2f13..de02fcd4ac 100644
--- a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/pack.exp
+++ b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/pack.exp
@@ -1,7 +1,7 @@
 processed 3 tasks
 
 task 0 'print-bytecode'. lines 1-9:
-// Move bytecode v5
+// Move bytecode v6
 module 2d20.M {
 struct T {
 	u: u64
diff --git a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/unpack.exp b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/unpack.exp
index f00261b08b..8d57922ac0 100644
--- a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/unpack.exp
+++ b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/unpack.exp
@@ -1,7 +1,7 @@
 processed 3 tasks
 
 task 0 'print-bytecode'. lines 1-18:
-// Move bytecode v5
+// Move bytecode v6
 module 1d12.M {
 struct T {
 	b: bool
@@ -17,7 +17,7 @@ f() {
 L0:	loc0: T
 L1:	loc1: bool
 B0:
-	0: Call[0](new(): T)
+	0: Call new(): T
 	1: StLoc[0](loc0: T)
 	2: MoveLoc[0](loc0: T)
 	3: Unpack[0](T)
diff --git a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/statements/assert.exp b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/statements/assert.exp
index 4920decd25..d758fb5a8a 100644
--- a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/statements/assert.exp
+++ b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/statements/assert.exp
@@ -1,7 +1,7 @@
 processed 1 task
 
 task 0 'print-bytecode'. lines 1-8:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
diff --git a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/statements/jump.exp b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/statements/jump.exp
index aee3650753..b66d18dfa5 100644
--- a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/statements/jump.exp
+++ b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/statements/jump.exp
@@ -1,7 +1,7 @@
 processed 3 tasks
 
 task 0 'print-bytecode'. lines 1-6:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
@@ -12,7 +12,7 @@ B0:
 }
 
 task 1 'print-bytecode'. lines 8-15:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
diff --git a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/statements/jump_if.exp b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/statements/jump_if.exp
index b9596ab6ba..efc7afc60a 100644
--- a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/statements/jump_if.exp
+++ b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/statements/jump_if.exp
@@ -1,7 +1,7 @@
 processed 4 tasks
 
 task 0 'print-bytecode'. lines 1-22:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
@@ -28,7 +28,7 @@ B4:
 }
 
 task 1 'print-bytecode'. lines 24-41:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
@@ -52,7 +52,7 @@ B3:
 }
 
 task 2 'print-bytecode'. lines 43-59:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
@@ -85,7 +85,7 @@ B5:
 }
 
 task 3 'print-bytecode'. lines 61-74:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
diff --git a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/statements/jump_if_false.exp b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/statements/jump_if_false.exp
index 92b3873907..66798d56ff 100644
--- a/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/statements/jump_if_false.exp
+++ b/language/move-ir-compiler/transactional-tests/tests/bytecode-generation/statements/jump_if_false.exp
@@ -1,7 +1,7 @@
 processed 4 tasks
 
 task 0 'print-bytecode'. lines 1-18:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
@@ -27,7 +27,7 @@ B3:
 }
 
 task 1 'print-bytecode'. lines 20-32:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
@@ -49,7 +49,7 @@ B4:
 }
 
 task 2 'print-bytecode'. lines 34-42:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
@@ -65,7 +65,7 @@ B2:
 }
 
 task 3 'print-bytecode'. lines 44-55:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
diff --git a/language/move-ir-compiler/transactional-tests/tests/parsing/comments.exp b/language/move-ir-compiler/transactional-tests/tests/parsing/comments.exp
index 9adc3af979..a1936eaace 100644
--- a/language/move-ir-compiler/transactional-tests/tests/parsing/comments.exp
+++ b/language/move-ir-compiler/transactional-tests/tests/parsing/comments.exp
@@ -1,7 +1,7 @@
 processed 6 tasks
 
 task 0 'print-bytecode'. lines 1-6:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
@@ -12,7 +12,7 @@ B0:
 }
 
 task 1 'print-bytecode'. lines 8-14:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
@@ -23,7 +23,7 @@ B0:
 }
 
 task 2 'print-bytecode'. lines 16-20:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
@@ -34,7 +34,7 @@ B0:
 }
 
 task 3 'print-bytecode'. lines 22-27:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
@@ -48,7 +48,7 @@ task 4 'print-bytecode'. lines 29-36:
 Error: ParserError: Invalid Token: invalid token kind for statement Slash
 
 task 5 'print-bytecode'. lines 38-46:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
diff --git a/language/move-ir-compiler/transactional-tests/tests/parsing/crlf.exp b/language/move-ir-compiler/transactional-tests/tests/parsing/crlf.exp
index 9adc3af979..a1936eaace 100644
--- a/language/move-ir-compiler/transactional-tests/tests/parsing/crlf.exp
+++ b/language/move-ir-compiler/transactional-tests/tests/parsing/crlf.exp
@@ -1,7 +1,7 @@
 processed 6 tasks
 
 task 0 'print-bytecode'. lines 1-6:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
@@ -12,7 +12,7 @@ B0:
 }
 
 task 1 'print-bytecode'. lines 8-14:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
@@ -23,7 +23,7 @@ B0:
 }
 
 task 2 'print-bytecode'. lines 16-20:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
@@ -34,7 +34,7 @@ B0:
 }
 
 task 3 'print-bytecode'. lines 22-27:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
@@ -48,7 +48,7 @@ task 4 'print-bytecode'. lines 29-36:
 Error: ParserError: Invalid Token: invalid token kind for statement Slash
 
 task 5 'print-bytecode'. lines 38-46:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
diff --git a/language/move-ir/types/Cargo.toml b/language/move-ir/types/Cargo.toml
index 67f9173e89..3839631e1c 100644
--- a/language/move-ir/types/Cargo.toml
+++ b/language/move-ir/types/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/language/move-ir/types/src/ast.rs b/language/move-ir/types/src/ast.rs
index a60a34e897..9368f6cf83 100644
--- a/language/move-ir/types/src/ast.rs
+++ b/language/move-ir/types/src/ast.rs
@@ -124,7 +124,7 @@ pub struct ModuleDependency {
 //**************************************************************************************************
 
 /// A dependency/import declaration
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ImportDefinition {
     /// the dependency
     /// `addr.m`
@@ -181,10 +181,16 @@ pub enum Type {
     Signer,
     /// `u8`
     U8,
+    /// `u16`
+    U16,
+    /// `u32`
+    U32,
     /// `u64`
     U64,
     /// `u128`
     U128,
+    /// `u256`
+    U256,
     /// `bool`
     Bool,
     /// `vector`
@@ -266,7 +272,7 @@ pub struct StructDefinition_ {
 pub type StructDefinition = Spanned<StructDefinition_>;
 
 /// An explicit struct dependency
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct StructDependency {
     /// The declared abilities for the struct
     pub abilities: BTreeSet<Ability>,
@@ -333,7 +339,7 @@ pub struct FunctionDependency {
 }
 
 /// Public or internal modifier for a procedure
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
 pub enum FunctionVisibility {
     /// The procedure can be invoked anywhere
     /// `public`
@@ -429,10 +435,16 @@ pub enum Builtin {
 
     /// Cast an integer into u8.
     ToU8,
+    /// Cast an integer into u16.
+    ToU16,
+    /// Cast an integer into u32.
+    ToU32,
     /// Cast an integer into u64.
     ToU64,
     /// Cast an integer into u128.
     ToU128,
+    /// Cast an integer into u256.
+    ToU256,
 }
 
 /// Enum for different function calls
@@ -506,16 +518,22 @@ pub type Block = Spanned<Block_>;
 
 /// Bottom of the value hierarchy. These values can be trivially copyable and stored in statedb as a
 /// single entry.
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub enum CopyableVal_ {
     /// An address in the global storage
     Address(AccountAddress),
     /// An unsigned 8-bit integer
     U8(u8),
+    /// An unsigned 16-bit integer
+    U16(u16),
+    /// An unsigned 32-bit integer
+    U32(u32),
     /// An unsigned 64-bit integer
     U64(u64),
     /// An unsigned 128-bit integer
     U128(u128),
+    /// An unsigned 256-bit integer
+    U256(move_core_types::u256::U256),
     /// true or false
     Bool(bool),
     /// `b"<bytes>"`
@@ -529,14 +547,14 @@ pub type CopyableVal = Spanned<CopyableVal_>;
 pub type ExpFields = Fields<Exp>;
 
 /// Enum for unary operators
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum UnaryOp {
     /// Boolean negation
     Not,
 }
 
 /// Enum for binary operators
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum BinOp {
     // u64 ops
     /// `+`
@@ -647,11 +665,17 @@ pub enum Bytecode_ {
     BrFalse(BlockLabel_),
     Branch(BlockLabel_),
     LdU8(u8),
+    LdU16(u16),
+    LdU32(u32),
     LdU64(u64),
     LdU128(u128),
+    LdU256(move_core_types::u256::U256),
     CastU8,
+    CastU16,
+    CastU32,
     CastU64,
     CastU128,
+    CastU256,
     LdTrue,
     LdFalse,
     LdConst(Type, MoveValue),
@@ -1442,8 +1466,11 @@ impl fmt::Display for Type {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Type::U8 => write!(f, "u8"),
+            Type::U16 => write!(f, "u16"),
+            Type::U32 => write!(f, "u32"),
             Type::U64 => write!(f, "u64"),
             Type::U128 => write!(f, "u128"),
+            Type::U256 => write!(f, "u256"),
             Type::Bool => write!(f, "bool"),
             Type::Address => write!(f, "address"),
             Type::Signer => write!(f, "signer"),
@@ -1491,8 +1518,11 @@ impl fmt::Display for Builtin {
             Builtin::VecSwap(tys) => write!(f, "vec_swap{}", format_type_actuals(tys)),
             Builtin::Freeze => write!(f, "freeze"),
             Builtin::ToU8 => write!(f, "to_u8"),
+            Builtin::ToU16 => write!(f, "to_u16"),
+            Builtin::ToU32 => write!(f, "to_u32"),
             Builtin::ToU64 => write!(f, "to_u64"),
             Builtin::ToU128 => write!(f, "to_u128"),
+            Builtin::ToU256 => write!(f, "to_u256"),
         }
     }
 }
@@ -1575,8 +1605,11 @@ impl fmt::Display for CopyableVal_ {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             CopyableVal_::U8(v) => write!(f, "{}u8", v),
+            CopyableVal_::U16(v) => write!(f, "{}u16", v),
+            CopyableVal_::U32(v) => write!(f, "{}u32", v),
             CopyableVal_::U64(v) => write!(f, "{}", v),
             CopyableVal_::U128(v) => write!(f, "{}u128", v),
+            CopyableVal_::U256(v) => write!(f, "{}u256", v),
             CopyableVal_::Bool(v) => write!(f, "{}", v),
             CopyableVal_::ByteArray(v) => write!(f, "0b{}", hex::encode(v)),
             CopyableVal_::Address(v) => write!(f, "0x{}", hex::encode(v)),
@@ -1686,11 +1719,17 @@ impl fmt::Display for Bytecode_ {
             Bytecode_::BrFalse(lbl) => write!(f, "BrFalse {}", &lbl.0),
             Bytecode_::Branch(lbl) => write!(f, "Branch {}", &lbl.0),
             Bytecode_::LdU8(u) => write!(f, "LdU8 {}", u),
+            Bytecode_::LdU16(u) => write!(f, "LdU16 {}", u),
+            Bytecode_::LdU32(u) => write!(f, "LdU32 {}", u),
             Bytecode_::LdU64(u) => write!(f, "LdU64 {}", u),
             Bytecode_::LdU128(u) => write!(f, "LdU128 {}", u),
+            Bytecode_::LdU256(u) => write!(f, "LdU256 {}", u),
             Bytecode_::CastU8 => write!(f, "CastU8"),
+            Bytecode_::CastU16 => write!(f, "CastU16"),
+            Bytecode_::CastU32 => write!(f, "CastU32"),
             Bytecode_::CastU64 => write!(f, "CastU64"),
             Bytecode_::CastU128 => write!(f, "CastU128"),
+            Bytecode_::CastU256 => write!(f, "CastU256"),
             Bytecode_::LdTrue => write!(f, "LdTrue"),
             Bytecode_::LdFalse => write!(f, "LdFalse"),
             Bytecode_::LdConst(ty, v) => write!(f, "LdConst<{}> {}", ty, format_move_value(v)),
@@ -1780,5 +1819,8 @@ fn format_move_value(v: &MoveValue) -> String {
         MoveValue::Struct(_) | MoveValue::Signer(_) => {
             panic!("Should be inexpressible as a constant")
         }
+        MoveValue::U16(u) => format!("{}u16", u),
+        MoveValue::U32(u) => format!("{}u32", u),
+        MoveValue::U256(u) => format!("{}u256", u),
     }
 }
diff --git a/language/move-model/Cargo.toml b/language/move-model/Cargo.toml
index 09aeb0d4dc..1204e36927 100644
--- a/language/move-model/Cargo.toml
+++ b/language/move-model/Cargo.toml
@@ -3,7 +3,7 @@ name = "move-model"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
@@ -26,7 +26,7 @@ itertools = "0.10.0"
 log = "0.4.14"
 num = "0.4.0"
 once_cell = "1.7.2"
-regex = "1.4.3"
+regex = "1.5.5"
 anyhow = "1.0.52"
 serde = { version = "1.0.124", features = ["derive"] }
 
diff --git a/language/move-model/src/ast.rs b/language/move-model/src/ast.rs
index b7ab4ae08e..0836b64075 100644
--- a/language/move-model/src/ast.rs
+++ b/language/move-model/src/ast.rs
@@ -6,15 +6,23 @@
 //! Note that in this crate, specs are represented in AST form, whereas code is represented
 //! as bytecodes. Therefore we do not need an AST for the Move code itself.
 
-use num::{BigInt, BigUint, Num};
-
-use move_binary_format::file_format::CodeOffset;
 use std::{
-    collections::{BTreeMap, BTreeSet},
+    borrow::Borrow,
+    cell::RefCell,
+    collections::{BTreeMap, BTreeSet, HashSet},
     fmt,
-    fmt::{Error, Formatter},
+    fmt::{Debug, Error, Formatter},
+    hash::Hash,
+    ops::Deref,
 };
 
+use internment::LocalIntern;
+use itertools::Itertools;
+use num::{BigInt, BigUint, Num};
+use once_cell::sync::Lazy;
+
+use move_binary_format::file_format::CodeOffset;
+
 use crate::{
     exp_rewriter::ExpRewriterFunctions,
     model::{
@@ -25,12 +33,6 @@ use crate::{
     symbol::{Symbol, SymbolPool},
     ty::{Type, TypeDisplayContext},
 };
-use internment::LocalIntern;
-use itertools::Itertools;
-use once_cell::sync::Lazy;
-use std::{
-    borrow::Borrow, cell::RefCell, collections::HashSet, fmt::Debug, hash::Hash, ops::Deref,
-};
 
 // =================================================================================================
 /// # Declarations
@@ -79,7 +81,7 @@ pub enum Attribute {
 // =================================================================================================
 /// # Conditions
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub enum ConditionKind {
     LetPost(Symbol),
     LetPre(Symbol),
@@ -143,7 +145,7 @@ impl ConditionKind {
         use ConditionKind::*;
         matches!(
             self,
-            Assert | Assume | Decreases | LoopInvariant | LetPost(..) | LetPre(..)
+            Assert | Assume | Decreases | LoopInvariant | LetPost(..) | LetPre(..) | Update
         )
     }
 
@@ -535,6 +537,23 @@ impl ExpData {
         vars
     }
 
+    /// Returns the free local variables with node id in this expression
+    pub fn free_local_vars_with_node_id(&self) -> BTreeMap<Symbol, NodeId> {
+        let mut vars = BTreeMap::new();
+        let mut visitor = |up: bool, e: &ExpData| {
+            use ExpData::*;
+            if up {
+                if let LocalVar(id, sym) = e {
+                    if !vars.iter().any(|(s, _)| s == sym) {
+                        vars.insert(*sym, *id);
+                    }
+                }
+            }
+        };
+        self.visit_pre_post(&mut visitor);
+        vars
+    }
+
     /// Returns the used memory of this expression.
     pub fn used_memory(
         &self,
@@ -879,6 +898,7 @@ pub enum Operation {
 
     // Unary operators
     Not,
+    Cast,
 
     // Builtin functions
     Len,
@@ -900,8 +920,13 @@ pub enum Operation {
     InRangeVec,
     RangeVec,
     MaxU8,
+    MaxU16,
+    MaxU32,
     MaxU64,
     MaxU128,
+    MaxU256,
+    Bv2Int,
+    Int2Bv,
 
     // Functions which support the transformation and translation process.
     AbortFlag,
@@ -957,6 +982,8 @@ pub enum Value {
     Number(BigInt),
     Bool(bool),
     ByteArray(Vec<u8>),
+    AddressArray(Vec<BigUint>), // TODO: merge AddressArray to Vector type in the future
+    Vector(Vec<Value>),
 }
 
 impl fmt::Display for Value {
@@ -967,6 +994,8 @@ impl fmt::Display for Value {
             Value::Bool(b) => write!(f, "{}", b),
             // TODO(tzakian): Figure out a better story for byte array displays
             Value::ByteArray(bytes) => write!(f, "{:?}", bytes),
+            Value::AddressArray(array) => write!(f, "{:?}", array),
+            Value::Vector(array) => write!(f, "{:?}", array),
         }
     }
 }
diff --git a/language/move-model/src/builder/exp_translator.rs b/language/move-model/src/builder/exp_translator.rs
index becae37e29..176e264e3b 100644
--- a/language/move-model/src/builder/exp_translator.rs
+++ b/language/move-model/src/builder/exp_translator.rs
@@ -153,6 +153,15 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
         }
     }
 
+    /// Shortcut for reporting an error.
+    pub fn error_with_notes(&self, loc: &Loc, msg: &str, notes: Vec<String>) {
+        if self.translating_fun_as_spec_fun {
+            *self.errors_generated.borrow_mut() = true;
+        } else {
+            self.parent.parent.error_with_notes(loc, msg, notes);
+        }
+    }
+
     /// Creates a fresh type variable.
     fn fresh_type_var(&mut self) -> Type {
         let var = Type::Var(self.type_var_counter);
@@ -518,14 +527,14 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
         use HA::SingleType_::*;
         match &ty.value {
             Ref(is_mut, ty) => {
-                let ty = self.translate_hlir_base_type(&*ty);
+                let ty = self.translate_hlir_base_type(ty);
                 if ty == Type::Error {
                     Type::Error
                 } else {
                     Type::Reference(*is_mut, Box::new(ty))
                 }
             }
-            Base(ty) => self.translate_hlir_base_type(&*ty),
+            Base(ty) => self.translate_hlir_base_type(ty),
         }
     }
 
@@ -547,8 +556,11 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                         Address => Type::new_prim(PrimitiveType::Address),
                         Signer => Type::new_prim(PrimitiveType::Signer),
                         U8 => Type::new_prim(PrimitiveType::U8),
+                        U16 => Type::new_prim(PrimitiveType::U16),
+                        U32 => Type::new_prim(PrimitiveType::U32),
                         U64 => Type::new_prim(PrimitiveType::U64),
                         U128 => Type::new_prim(PrimitiveType::U128),
+                        U256 => Type::new_prim(PrimitiveType::U256),
                         Vector => Type::Vector(Box::new(self.translate_hlir_base_type(&args[0]))),
                         Bool => Type::new_prim(PrimitiveType::Bool),
                     },
@@ -612,10 +624,15 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                             return check_zero_args(self, Type::new_prim(PrimitiveType::Bool));
                         }
                         "u8" => return check_zero_args(self, Type::new_prim(PrimitiveType::U8)),
+                        "u16" => return check_zero_args(self, Type::new_prim(PrimitiveType::U16)),
+                        "u32" => return check_zero_args(self, Type::new_prim(PrimitiveType::U32)),
                         "u64" => return check_zero_args(self, Type::new_prim(PrimitiveType::U64)),
                         "u128" => {
                             return check_zero_args(self, Type::new_prim(PrimitiveType::U128));
                         }
+                        "u256" => {
+                            return check_zero_args(self, Type::new_prim(PrimitiveType::U256))
+                        }
                         "num" => return check_zero_args(self, Type::new_prim(PrimitiveType::Num)),
                         "range" => {
                             return check_zero_args(self, Type::new_prim(PrimitiveType::Range));
@@ -663,10 +680,10 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                     rty
                 }
             }
-            Ref(is_mut, ty) => Type::Reference(*is_mut, Box::new(self.translate_type(&*ty))),
+            Ref(is_mut, ty) => Type::Reference(*is_mut, Box::new(self.translate_type(ty))),
             Fun(args, result) => Type::Fun(
                 self.translate_types(args),
-                Box::new(self.translate_type(&*result)),
+                Box::new(self.translate_type(result)),
             ),
             Unit => Type::Tuple(vec![]),
             Multiple(vst) => Type::Tuple(self.translate_types(vst)),
@@ -684,7 +701,7 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
         tys_opt
             .as_deref()
             .map(|tys| self.translate_types(tys))
-            .unwrap_or_else(Vec::new)
+            .unwrap_or_default()
     }
 }
 
@@ -732,9 +749,9 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                 self.translate_pack(&loc, maccess, generics, fields, expected_type)
             }
             EA::Exp_::IfElse(cond, then, else_) => {
-                let then = self.translate_exp(&*then, expected_type);
-                let else_ = self.translate_exp(&*else_, expected_type);
-                let cond = self.translate_exp(&*cond, &Type::new_prim(PrimitiveType::Bool));
+                let then = self.translate_exp(then, expected_type);
+                let else_ = self.translate_exp(else_, expected_type);
+                let cond = self.translate_exp(cond, &Type::new_prim(PrimitiveType::Bool));
                 let id = self.new_node_id_with_type_loc(expected_type, &loc);
                 ExpData::IfElse(id, cond.into(), then.into_exp(), else_.into_exp())
             }
@@ -812,6 +829,21 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                     self.new_error_exp()
                 }
             }
+            EA::Exp_::Cast(exp, typ) => {
+                let ty = self.translate_type(typ);
+                self.check_type(&loc, &ty, expected_type, "in cast expression");
+                let (exp_ty, exp) = self.translate_exp_free(exp);
+                if !ty.is_number() || !exp_ty.is_number() {
+                    self.error(&loc, "the cast target can only be num types");
+                    self.new_error_exp()
+                } else {
+                    ExpData::Call(
+                        self.new_node_id_with_type_loc(&ty, &loc),
+                        Operation::Cast,
+                        vec![exp.into_exp()],
+                    )
+                }
+            }
             _ => {
                 self.error(&loc, "expression construct not supported in specifications");
                 self.new_error_exp()
@@ -831,14 +863,26 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                 Value::Number(BigInt::from_u8(*x).unwrap()),
                 Type::new_prim(PrimitiveType::U8),
             )),
+            EA::Value_::U16(x) => Some((
+                Value::Number(BigInt::from_u16(*x).unwrap()),
+                Type::new_prim(PrimitiveType::U16),
+            )),
+            EA::Value_::U32(x) => Some((
+                Value::Number(BigInt::from_u32(*x).unwrap()),
+                Type::new_prim(PrimitiveType::U32),
+            )),
             EA::Value_::U64(x) => Some((
                 Value::Number(BigInt::from_u64(*x).unwrap()),
                 Type::new_prim(PrimitiveType::U64),
             )),
-            EA::Value_::InferredNum(x) | EA::Value_::U128(x) => Some((
+            EA::Value_::U128(x) => Some((
                 Value::Number(BigInt::from_u128(*x).unwrap()),
                 Type::new_prim(PrimitiveType::U128),
             )),
+            EA::Value_::InferredNum(x) | EA::Value_::U256(x) => Some((
+                Value::Number(BigInt::from(x)),
+                Type::new_prim(PrimitiveType::U256),
+            )),
             EA::Value_::Bool(x) => Some((Value::Bool(*x), Type::new_prim(PrimitiveType::Bool))),
             EA::Value_::Bytearray(x) => {
                 let ty = Type::Vector(Box::new(Type::new_prim(PrimitiveType::U8)));
@@ -1443,7 +1487,7 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
                             )
                         })
                         .collect_vec();
-                    self.parent.parent.env.error_with_notes(
+                    self.error_with_notes(
                         loc,
                         &format!("no matching declaration of `{}`", display),
                         notes,
@@ -1905,31 +1949,76 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
         result
     }
 
-    pub fn translate_from_move_value(&self, loc: &Loc, value: &MoveValue) -> Value {
-        match value {
-            MoveValue::U8(n) => Value::Number(BigInt::from_u8(*n).unwrap()),
-            MoveValue::U64(n) => Value::Number(BigInt::from_u64(*n).unwrap()),
-            MoveValue::U128(n) => Value::Number(BigInt::from_u128(*n).unwrap()),
-            MoveValue::Bool(b) => Value::Bool(*b),
-            MoveValue::Address(a) => Value::Address(crate::addr_to_big_uint(a)),
-            MoveValue::Signer(a) => Value::Address(crate::addr_to_big_uint(a)),
-            MoveValue::Vector(vs) => {
-                let b = vs
-                    .iter()
-                    .filter_map(|v| match v {
-                        MoveValue::U8(n) => Some(*n),
-                        _ => {
-                            self.error(
-                                loc,
-                                &format!("Not yet supported constant vector value: {:?}", v),
-                            );
-                            None
-                        }
-                    })
-                    .collect::<Vec<u8>>();
-                Value::ByteArray(b)
-            }
-            _ => {
+    pub fn translate_from_move_value(&self, loc: &Loc, ty: &Type, value: &MoveValue) -> Value {
+        match (ty, value) {
+            (_, MoveValue::U8(n)) => Value::Number(BigInt::from_u8(*n).unwrap()),
+            (_, MoveValue::U16(n)) => Value::Number(BigInt::from_u16(*n).unwrap()),
+            (_, MoveValue::U32(n)) => Value::Number(BigInt::from_u32(*n).unwrap()),
+            (_, MoveValue::U64(n)) => Value::Number(BigInt::from_u64(*n).unwrap()),
+            (_, MoveValue::U128(n)) => Value::Number(BigInt::from_u128(*n).unwrap()),
+            (_, MoveValue::U256(n)) => Value::Number(BigInt::from(n)),
+            (_, MoveValue::Bool(b)) => Value::Bool(*b),
+            (_, MoveValue::Address(a)) => Value::Address(crate::addr_to_big_uint(a)),
+            (_, MoveValue::Signer(a)) => Value::Address(crate::addr_to_big_uint(a)),
+            (Type::Vector(inner), MoveValue::Vector(vs)) => match **inner {
+                Type::Primitive(PrimitiveType::U8) => {
+                    let b = vs
+                        .iter()
+                        .filter_map(|v| match v {
+                            MoveValue::U8(n) => Some(*n),
+                            _ => {
+                                self.error(loc, &format!("Expected u8 type, buf found: {:?}", v));
+                                None
+                            }
+                        })
+                        .collect::<Vec<u8>>();
+                    Value::ByteArray(b)
+                }
+                Type::Primitive(PrimitiveType::Address) => {
+                    let b = vs
+                        .iter()
+                        .filter_map(|v| match v {
+                            MoveValue::Address(a) => Some(crate::addr_to_big_uint(a)),
+                            _ => {
+                                self.error(
+                                    loc,
+                                    &format!("Expected address type, but found: {:?}", v),
+                                );
+                                None
+                            }
+                        })
+                        .collect::<Vec<BigUint>>();
+                    Value::AddressArray(b)
+                }
+                _ => {
+                    let b = vs
+                        .iter()
+                        .map(|v| self.translate_from_move_value(loc, inner, v))
+                        .collect::<Vec<Value>>();
+                    Value::Vector(b)
+                }
+            },
+            (Type::Primitive(_), MoveValue::Vector(_))
+            | (Type::Primitive(_), MoveValue::Struct(_))
+            | (Type::Tuple(_), MoveValue::Vector(_))
+            | (Type::Tuple(_), MoveValue::Struct(_))
+            | (Type::Vector(_), MoveValue::Struct(_))
+            | (Type::Struct(_, _, _), MoveValue::Vector(_))
+            | (Type::Struct(_, _, _), MoveValue::Struct(_))
+            | (Type::TypeParameter(_), MoveValue::Vector(_))
+            | (Type::TypeParameter(_), MoveValue::Struct(_))
+            | (Type::Reference(_, _), MoveValue::Vector(_))
+            | (Type::Reference(_, _), MoveValue::Struct(_))
+            | (Type::Fun(_, _), MoveValue::Vector(_))
+            | (Type::Fun(_, _), MoveValue::Struct(_))
+            | (Type::TypeDomain(_), MoveValue::Vector(_))
+            | (Type::TypeDomain(_), MoveValue::Struct(_))
+            | (Type::ResourceDomain(_, _, _), MoveValue::Vector(_))
+            | (Type::ResourceDomain(_, _, _), MoveValue::Struct(_))
+            | (Type::Error, MoveValue::Vector(_))
+            | (Type::Error, MoveValue::Struct(_))
+            | (Type::Var(_), MoveValue::Vector(_))
+            | (Type::Var(_), MoveValue::Struct(_)) => {
                 self.error(
                     loc,
                     &format!("Not yet supported constant value: {:?}", value),
diff --git a/language/move-model/src/builder/model_builder.rs b/language/move-model/src/builder/model_builder.rs
index edfe1bf1da..46f0612986 100644
--- a/language/move-model/src/builder/model_builder.rs
+++ b/language/move-model/src/builder/model_builder.rs
@@ -9,6 +9,7 @@
 
 use std::collections::{BTreeMap, BTreeSet};
 
+use codespan_reporting::diagnostic::Severity;
 #[allow(unused_imports)]
 use log::{debug, info, warn};
 use num::BigUint;
@@ -18,6 +19,7 @@ use move_compiler::{expansion::ast as EA, parser::ast as PA, shared::NumericalAd
 use crate::{
     ast::{Attribute, ModuleName, Operation, QualifiedSymbol, Spec, Value},
     builder::spec_builtins,
+    intrinsics::IntrinsicDecl,
     model::{
         FunId, FunctionVisibility, GlobalEnv, Loc, ModuleId, QualifiedId, SpecFunId, SpecVarId,
         StructId,
@@ -26,7 +28,6 @@ use crate::{
     symbol::Symbol,
     ty::Type,
 };
-use codespan_reporting::diagnostic::Severity;
 
 /// A builder is used to enter a sequence of modules in acyclic dependency order into the model. The
 /// builder maintains the incremental state of this process, such that the various tables
@@ -46,7 +47,7 @@ pub(crate) struct ModelBuilder<'env> {
     /// A symbol table storing unused schemas, used later to generate warnings. All schemas
     /// are initially in the table and are removed when they are used in expressions.
     pub unused_schema_set: BTreeSet<QualifiedSymbol>,
-    // A symbol table for structs.
+    /// A symbol table for structs.
     pub struct_table: BTreeMap<QualifiedSymbol, StructEntry>,
     /// A reverse mapping from ModuleId/StructId pairs to QualifiedSymbol. This
     /// is used for visualization of types in error messages.
@@ -57,6 +58,8 @@ pub(crate) struct ModelBuilder<'env> {
     pub const_table: BTreeMap<QualifiedSymbol, ConstEntry>,
     /// A call graph mapping callers to callees that are Move functions.
     pub move_fun_call_graph: BTreeMap<QualifiedId<SpecFunId>, BTreeSet<QualifiedId<SpecFunId>>>,
+    /// A list of intrinsic declarations
+    pub intrinsics: Vec<IntrinsicDecl>,
 }
 
 /// A declaration of a specification function or operator in the builders state.
@@ -117,7 +120,6 @@ pub(crate) struct StructEntry {
 pub(crate) struct FunEntry {
     pub loc: Loc,
     pub module_id: ModuleId,
-    #[allow(dead_code)]
     pub fun_id: FunId,
     pub visibility: FunctionVisibility,
     pub is_entry: bool,
@@ -149,6 +151,7 @@ impl<'env> ModelBuilder<'env> {
             fun_table: BTreeMap::new(),
             const_table: BTreeMap::new(),
             move_fun_call_graph: BTreeMap::new(),
+            intrinsics: Default::default(),
         };
         spec_builtins::declare_spec_builtins(&mut translator);
         translator
@@ -412,6 +415,14 @@ impl<'env> ModelBuilder<'env> {
             });
         }
     }
+
+    /// Pass model-level information to the global env
+    pub fn populate_env(&mut self) {
+        // register all intrinsic declarations
+        for decl in &self.intrinsics {
+            self.env.intrinsics.add_decl(decl);
+        }
+    }
 }
 
 #[derive(Debug, Clone)]
diff --git a/language/move-model/src/builder/module_builder.rs b/language/move-model/src/builder/module_builder.rs
index 828304666a..81b4adf003 100644
--- a/language/move-model/src/builder/module_builder.rs
+++ b/language/move-model/src/builder/module_builder.rs
@@ -4,9 +4,11 @@
 
 use std::{
     collections::{BTreeMap, BTreeSet},
+    default::Default,
     fmt,
 };
 
+use codespan_reporting::diagnostic::Severity;
 use itertools::Itertools;
 use regex::Regex;
 
@@ -36,6 +38,7 @@ use crate::{
         model_builder::{ConstEntry, LocalVarEntry, ModelBuilder, SpecFunEntry},
     },
     exp_rewriter::{ExpRewriter, ExpRewriterFunctions, RewriteTarget},
+    intrinsics::process_intrinsic_declaration,
     model::{
         AbilityConstraint, FieldId, FunId, FunctionData, FunctionVisibility, Loc, ModuleId,
         MoveIrLoc, NamedConstantData, NamedConstantId, NodeId, QualifiedId, QualifiedInstId,
@@ -52,8 +55,6 @@ use crate::{
     symbol::{Symbol, SymbolPool},
     ty::{PrimitiveType, Type, BOOL_TYPE},
 };
-use codespan_reporting::diagnostic::Severity;
-use std::default::Default;
 
 #[derive(Debug)]
 pub(crate) struct ModuleBuilder<'env, 'translator> {
@@ -165,7 +166,7 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
 
 impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
     /// Shortcut for accessing the symbol pool.
-    fn symbol_pool(&self) -> &SymbolPool {
+    pub fn symbol_pool(&self) -> &SymbolPool {
         self.parent.env.symbol_pool()
     }
 
@@ -286,6 +287,23 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
                             };
                         AttributeValue::Value(value_node_id, val)
                     }
+                    EA::AttributeValue_::Module(mident) => {
+                        let addr_bytes = self.parent.resolve_address(
+                            &self.parent.to_loc(&mident.loc),
+                            &mident.value.address,
+                        );
+                        let module_name = ModuleName::from_address_bytes_and_name(
+                            addr_bytes,
+                            self.symbol_pool()
+                                .make(mident.value.module.0.value.as_str()),
+                        );
+                        // TODO support module attributes more than via empty string
+                        AttributeValue::Name(
+                            value_node_id,
+                            Some(module_name),
+                            self.symbol_pool().make(""),
+                        )
+                    }
                     EA::AttributeValue_::ModuleAccess(macc) => match macc.value {
                         EA::ModuleAccess_::Name(n) => AttributeValue::Name(
                             value_node_id,
@@ -358,8 +376,8 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
                 .unwrap();
         let mut et = ExpTranslator::new(self);
         let loc = et.to_loc(&def.loc);
-        let value = et.translate_from_move_value(&loc, &move_value);
         let ty = et.translate_type(&def.signature);
+        let value = et.translate_from_move_value(&loc, &ty, &move_value);
         et.parent
             .parent
             .define_const(qsym, ConstEntry { loc, ty, value });
@@ -737,27 +755,37 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
                             exp,
                             additional_exps,
                         } => {
+                            if fun_spec_info.contains_key(spec_id) {
+                                let context = SpecBlockContext::FunctionCode(
+                                    qsym.clone(),
+                                    &fun_spec_info[spec_id],
+                                );
+                                if let Some(kind) = self.convert_condition_kind(kind, &context) {
+                                    let properties =
+                                        self.translate_properties(properties, &|_, _, prop| {
+                                            if !is_property_valid_for_condition(&kind, prop) {
+                                                Some(loc.clone())
+                                            } else {
+                                                None
+                                            }
+                                        });
+                                    self.def_ana_condition(
+                                        loc,
+                                        &context,
+                                        kind,
+                                        properties,
+                                        exp,
+                                        additional_exps,
+                                    );
+                                }
+                            }
+                        }
+                        EA::SpecBlockMember_::Update { lhs, rhs } => {
                             let context = SpecBlockContext::FunctionCode(
                                 qsym.clone(),
                                 &fun_spec_info[spec_id],
                             );
-                            if let Some(kind) = self.convert_condition_kind(kind, &context) {
-                                let properties = self.translate_properties(properties, &|prop| {
-                                    if !is_property_valid_for_condition(&kind, prop) {
-                                        Some(loc.clone())
-                                    } else {
-                                        None
-                                    }
-                                });
-                                self.def_ana_condition(
-                                    loc,
-                                    &context,
-                                    kind,
-                                    properties,
-                                    exp,
-                                    additional_exps,
-                                );
-                            }
+                            self.def_ana_global_var_update(loc, &context, lhs, rhs)
                         }
                         _ => {
                             self.parent.error(loc, "item not allowed");
@@ -903,7 +931,7 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
     /// Move functions.
     fn propagate_function_impurity(
         &mut self,
-        mut visited: &mut BTreeMap<SpecFunId, bool>,
+        visited: &mut BTreeMap<SpecFunId, bool>,
         spec_fun_id: SpecFunId,
     ) -> bool {
         if let Some(is_pure) = visited.get(&spec_fun_id) {
@@ -940,7 +968,7 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
                     // This is calling a function from the module we are currently translating.
                     // Need to recursively ensure we have propagated impurity because of
                     // arbitrary call graphs, including cyclic.
-                    if !self.propagate_function_impurity(&mut visited, *fid) {
+                    if !self.propagate_function_impurity(visited, *fid) {
                         is_pure = false;
                     }
                 }
@@ -1029,7 +1057,7 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
                 additional_exps,
             } => {
                 if let Some(kind) = self.convert_condition_kind(kind, context) {
-                    let properties = self.translate_properties(properties, &|prop| {
+                    let properties = self.translate_properties(properties, &|_, _, prop| {
                         if !is_property_valid_for_condition(&kind, prop) {
                             Some(loc.clone())
                         } else {
@@ -1040,15 +1068,18 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
                 }
             }
             Function {
-                signature, body, ..
-            } => self.def_ana_spec_fun(signature, body),
+                uninterpreted,
+                signature,
+                body,
+                ..
+            } => self.def_ana_spec_fun(*uninterpreted, signature, body),
             Let {
                 name,
                 post_state,
                 def,
             } => self.def_ana_let(context, loc, *post_state, name, def),
             Include { properties, exp } => {
-                let properties = self.translate_properties(properties, &|_| None);
+                let properties = self.translate_properties(properties, &|_, _, _| None);
                 self.def_ana_schema_inclusion_outside_schema(loc, context, None, properties, exp)
             }
             Apply {
@@ -1129,13 +1160,17 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
         context: &SpecBlockContext,
         properties: &[EA::PragmaProperty],
     ) {
-        let properties = self.translate_properties(properties, &|prop| {
-            if !is_pragma_valid_for_block(context, prop) {
+        let mut properties = self.translate_properties(properties, &|symbols, bag, prop| {
+            if !is_pragma_valid_for_block(symbols, bag, context, prop) {
                 Some(loc.clone())
             } else {
                 None
             }
         });
+
+        // extra processing on concrete pragma declarations
+        process_intrinsic_declaration(self, loc, context, &mut properties);
+
         self.update_spec(context, move |spec| {
             spec.properties.extend(properties);
         });
@@ -1150,42 +1185,61 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
     ) -> PropertyBag
     where
         // Returns the location if not valid
-        F: Fn(&str) -> Option<Loc>,
+        F: Fn(&SymbolPool, &PropertyBag, &str) -> Option<Loc>,
     {
-        // For now we pass properties just on. We may want to check against a set of known
-        // property names and types in the future.
         let mut props = PropertyBag::default();
         for prop in properties {
-            let prop_str = prop.value.name.value.as_str();
-            if let Some(loc) = check_prop(prop_str) {
-                self.parent.error(
-                    &loc,
-                    &format!("property `{}` is not valid in this context", prop_str),
-                );
-            }
-            let prop_name = self.symbol_pool().make(&prop.value.name.value);
-            let value = if let Some(pv) = &prop.value.value {
-                match pv {
-                    EA::PragmaValue::Literal(ev) => {
-                        let mut et = ExpTranslator::new(self);
-                        if let Some((v, _)) = et.translate_value(ev) {
-                            PropertyValue::Value(v)
-                        } else {
-                            // Error reported
-                            continue;
-                        }
+            self.process_one_property(&mut props, prop, check_prop);
+        }
+        props
+    }
+
+    fn process_one_property<F>(
+        &mut self,
+        bag: &mut PropertyBag,
+        prop: &EA::PragmaProperty,
+        check_prop: &F,
+    ) where
+        // Returns the location if not valid
+        F: Fn(&SymbolPool, &PropertyBag, &str) -> Option<Loc>,
+    {
+        let prop_str = prop.value.name.value.as_str();
+        if let Some(loc) = check_prop(self.symbol_pool(), bag, prop_str) {
+            self.parent.error(
+                &loc,
+                &format!("property `{}` is not valid in this context", prop_str),
+            );
+            return;
+        }
+
+        let name = self.symbol_pool().make(&prop.value.name.value);
+        let value = match &prop.value.value {
+            None => PropertyValue::Value(Value::Bool(true)),
+            Some(EA::PragmaValue::Literal(ev)) => {
+                let mut et = ExpTranslator::new(self);
+                match et.translate_value(ev) {
+                    None => {
+                        // Error reported
+                        return;
                     }
-                    EA::PragmaValue::Ident(ema) => match self.module_access_to_parts(ema) {
-                        (None, sym) => PropertyValue::Symbol(sym),
-                        _ => PropertyValue::QualifiedSymbol(self.module_access_to_qualified(ema)),
-                    },
+                    Some((v, _)) => PropertyValue::Value(v),
                 }
-            } else {
-                PropertyValue::Value(Value::Bool(true))
-            };
-            props.insert(prop_name, value);
+            }
+            Some(EA::PragmaValue::Ident(ema)) => match self.module_access_to_parts(ema) {
+                (None, sym) => PropertyValue::Symbol(sym),
+                _ => PropertyValue::QualifiedSymbol(self.module_access_to_qualified(ema)),
+            },
+        };
+
+        if bag.insert(name, value).is_some() {
+            self.parent.error(
+                &self.parent.to_loc(&prop.loc),
+                &format!(
+                    "property `{}` specified more than once in the same pragma declaration",
+                    prop_str
+                ),
+            );
         }
-        props
     }
 
     fn add_bool_property(&self, mut properties: PropertyBag, name: &str, val: bool) -> PropertyBag {
@@ -1206,14 +1260,12 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
         use SpecBlockContext::*;
         match context {
             Function(name) => update(
-                &mut self
-                    .fun_specs
+                self.fun_specs
                     .entry(name.symbol)
                     .or_insert_with(Spec::default),
             ),
             FunctionCode(name, spec_info) => update(
-                &mut self
-                    .fun_specs
+                self.fun_specs
                     .entry(name.symbol)
                     .or_insert_with(Spec::default)
                     .on_impl
@@ -1229,8 +1281,7 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
                     .spec,
             ),
             Struct(name) => update(
-                &mut self
-                    .struct_specs
+                self.struct_specs
                     .entry(name.symbol)
                     .or_insert_with(Spec::default),
             ),
@@ -1714,12 +1765,18 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
                 }
                 (first.into_exp(), exps)
             }
+            ConditionKind::Axiom(ref type_params) => {
+                for (i, sym) in type_params.iter().enumerate() {
+                    et.define_type_param(loc, *sym, Type::TypeParameter(i as u16))
+                }
+                (et.translate_exp(exp, &expected_type).into_exp(), vec![])
+            }
             _ => {
                 if !additional_exps.is_empty() {
                     et.error(
-                        loc,
-                        "additional expressions only allowed with `aborts_if`, `aborts_with`, `modifies`, or `emits`",
-                    );
+                          loc,
+                          "additional expressions only allowed with `aborts_if`, `aborts_with`, `modifies`, or `emits`",
+                      );
                 }
                 (et.translate_exp(exp, &expected_type).into_exp(), vec![])
             }
@@ -1855,24 +1912,36 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
 
 impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
     /// Definition analysis for a specification helper function.
-    fn def_ana_spec_fun(&mut self, _signature: &EA::FunctionSignature, body: &EA::FunctionBody) {
-        if let EA::FunctionBody_::Defined(seq) = &body.value {
-            let entry = &self.spec_funs[self.spec_fun_index];
-            let type_params = entry.type_params.clone();
-            let params = entry.params.clone();
-            let result_type = entry.result_type.clone();
-            let mut et = ExpTranslator::new(self);
-            let loc = et.to_loc(&body.loc);
-            for (n, ty) in type_params {
-                et.define_type_param(&loc, n, ty);
+    fn def_ana_spec_fun(
+        &mut self,
+        uninterpreted: bool,
+        _signature: &EA::FunctionSignature,
+        body: &EA::FunctionBody,
+    ) {
+        match &body.value {
+            EA::FunctionBody_::Defined(seq) => {
+                let entry = &self.spec_funs[self.spec_fun_index];
+                let type_params = entry.type_params.clone();
+                let params = entry.params.clone();
+                let result_type = entry.result_type.clone();
+                let mut et = ExpTranslator::new(self);
+                let loc = et.to_loc(&body.loc);
+                for (n, ty) in type_params {
+                    et.define_type_param(&loc, n, ty);
+                }
+                et.enter_scope();
+                for (n, ty) in params {
+                    et.define_local(&loc, n, ty, None, None);
+                }
+                let translated = et.translate_seq(&loc, seq, &result_type);
+                et.finalize_types();
+                self.spec_funs[self.spec_fun_index].body = Some(translated.into_exp());
             }
-            et.enter_scope();
-            for (n, ty) in params {
-                et.define_local(&loc, n, ty, None, None);
+            EA::FunctionBody_::Native => {
+                if !uninterpreted {
+                    self.spec_funs[self.spec_fun_index].is_native = true
+                }
             }
-            let translated = et.translate_seq(&loc, seq, &result_type);
-            et.finalize_types();
-            self.spec_funs[self.spec_fun_index].body = Some(translated.into_exp());
         }
         self.spec_fun_index += 1;
     }
@@ -1965,14 +2034,13 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
         visiting.push(name.clone());
 
         // First recursively visit all schema includes and ensure they are analyzed.
-        for included_name in self
-            .iter_schema_includes(&block.value.members)
-            .map(|(_, _, exp)| {
-                let mut res = vec![];
-                extract_schema_access(exp, &mut res);
-                res
-            })
-            .flatten()
+        for included_name in
+            self.iter_schema_includes(&block.value.members)
+                .flat_map(|(_, _, exp)| {
+                    let mut res = vec![];
+                    extract_schema_access(exp, &mut res);
+                    res
+                })
         {
             let included_loc = self.parent.env.to_loc(&included_name.loc);
             let included_name = self.module_access_to_qualified(included_name);
@@ -2069,7 +2137,7 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
         // Process all schema includes. We need to do this before we type check expressions to have
         // all variables from includes in the environment.
         for (_, included_props, included_exp) in self.iter_schema_includes(&block.value.members) {
-            let included_props = self.translate_properties(included_props, &|_| None);
+            let included_props = self.translate_properties(included_props, &|_, _, _| None);
             self.def_ana_schema_exp(
                 &type_params,
                 &mut all_vars,
@@ -2107,7 +2175,7 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
                 } => {
                     let context = SpecBlockContext::Schema(name.clone());
                     if let Some(kind) = self.convert_condition_kind(kind, &context) {
-                        let properties = self.translate_properties(properties, &|prop| {
+                        let properties = self.translate_properties(properties, &|_, _, prop| {
                             if !is_property_valid_for_condition(&kind, prop) {
                                 Some(member_loc.clone())
                             } else {
@@ -2385,7 +2453,7 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
                     })
                     .collect()
             })
-            .unwrap_or_else(BTreeMap::new);
+            .unwrap_or_default();
 
         // Go over all variables in the schema which are not in the argument map and either match
         // them against existing one or declare new, if allowed.
diff --git a/language/move-model/src/builder/spec_builtins.rs b/language/move-model/src/builder/spec_builtins.rs
index 2025acc27d..2b6b411732 100644
--- a/language/move-model/src/builder/spec_builtins.rs
+++ b/language/move-model/src/builder/spec_builtins.rs
@@ -10,6 +10,7 @@ use crate::{
     ty::{PrimitiveType, Type},
 };
 use move_compiler::parser::ast::{self as PA};
+use move_core_types::u256::U256;
 use num::BigInt;
 
 /// Declares builtins in the build. This adds functions and operators
@@ -34,6 +35,14 @@ pub(crate) fn declare_spec_builtins(trans: &mut ModelBuilder<'_>) {
             trans.builtin_qualified_symbol("MAX_U8"),
             mk_num_const(BigInt::from(u8::MAX)),
         );
+        trans.define_const(
+            trans.builtin_qualified_symbol("MAX_U16"),
+            mk_num_const(BigInt::from(u16::MAX)),
+        );
+        trans.define_const(
+            trans.builtin_qualified_symbol("MAX_U32"),
+            mk_num_const(BigInt::from(u32::MAX)),
+        );
         trans.define_const(
             trans.builtin_qualified_symbol("MAX_U64"),
             mk_num_const(BigInt::from(u64::MAX)),
@@ -42,6 +51,10 @@ pub(crate) fn declare_spec_builtins(trans: &mut ModelBuilder<'_>) {
             trans.builtin_qualified_symbol("MAX_U128"),
             mk_num_const(BigInt::from(u128::MAX)),
         );
+        trans.define_const(
+            trans.builtin_qualified_symbol("MAX_U256"),
+            mk_num_const(BigInt::from(&U256::max_value())),
+        );
         trans.define_const(
             trans.builtin_qualified_symbol("EXECUTION_FAILURE"),
             mk_num_const(BigInt::from(-1)),
@@ -139,6 +152,30 @@ pub(crate) fn declare_spec_builtins(trans: &mut ModelBuilder<'_>) {
             },
         );
 
+        // Constants (max_u16(), etc.)
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("max_u16"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::MaxU16,
+                type_params: vec![],
+                arg_types: vec![],
+                result_type: num_t.clone(),
+            },
+        );
+
+        // Constants (max_u32(), etc.)
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("max_u32"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::MaxU32,
+                type_params: vec![],
+                arg_types: vec![],
+                result_type: num_t.clone(),
+            },
+        );
+
         trans.define_spec_fun(
             trans.builtin_qualified_symbol("max_u64"),
             SpecFunEntry {
@@ -161,6 +198,18 @@ pub(crate) fn declare_spec_builtins(trans: &mut ModelBuilder<'_>) {
             },
         );
 
+        // Constants (max_u256(), etc.)
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("max_u256"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::MaxU256,
+                type_params: vec![],
+                arg_types: vec![],
+                result_type: num_t.clone(),
+            },
+        );
+
         // Vectors
         trans.define_spec_fun(
             trans.builtin_qualified_symbol("len"),
@@ -335,12 +384,36 @@ pub(crate) fn declare_spec_builtins(trans: &mut ModelBuilder<'_>) {
         trans.define_spec_fun(
             trans.builtin_qualified_symbol("TRACE"),
             SpecFunEntry {
-                loc,
+                loc: loc.clone(),
                 oper: Operation::Trace(TraceKind::User),
                 type_params: vec![param_t.clone()],
                 arg_types: vec![param_t.clone()],
                 result_type: param_t.clone(),
             },
         );
+
+        // Explicit bv2int
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("bv2int"),
+            SpecFunEntry {
+                loc: loc.clone(),
+                oper: Operation::Bv2Int,
+                type_params: vec![param_t.clone()],
+                arg_types: vec![param_t.clone()],
+                result_type: param_t.clone(),
+            },
+        );
+
+        // Explicit int2bv
+        trans.define_spec_fun(
+            trans.builtin_qualified_symbol("int2bv"),
+            SpecFunEntry {
+                loc,
+                oper: Operation::Int2Bv,
+                type_params: vec![param_t.clone()],
+                arg_types: vec![param_t.clone()],
+                result_type: param_t.clone(),
+            },
+        );
     }
 }
diff --git a/language/move-model/src/exp_generator.rs b/language/move-model/src/exp_generator.rs
index 5dc50a91b8..1f448f9ec3 100644
--- a/language/move-model/src/exp_generator.rs
+++ b/language/move-model/src/exp_generator.rs
@@ -3,16 +3,17 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use itertools::Itertools;
+use num::BigUint;
 
 use crate::{
     ast::{Exp, ExpData, LocalVarDecl, Operation, QuantKind, TempIndex, Value},
     model::{
-        FieldEnv, FunctionEnv, GlobalEnv, Loc, NodeId, QualifiedId, QualifiedInstId, StructId,
+        FieldEnv, FunctionEnv, GlobalEnv, Loc, NodeId, QualifiedId, QualifiedInstId, SpecFunId,
+        StructId,
     },
     symbol::Symbol,
     ty::{PrimitiveType, Type, BOOL_TYPE, NUM_TYPE},
 };
-use num::BigUint;
 
 /// A trait that defines a generator for `Exp`.
 pub trait ExpGenerator<'env> {
@@ -144,7 +145,12 @@ pub trait ExpGenerator<'env> {
     fn mk_builtin_num_const(&self, oper: Operation) -> Exp {
         assert!(matches!(
             oper,
-            Operation::MaxU8 | Operation::MaxU64 | Operation::MaxU128
+            Operation::MaxU8
+                | Operation::MaxU16
+                | Operation::MaxU32
+                | Operation::MaxU64
+                | Operation::MaxU128
+                | Operation::MaxU256
         ));
         self.mk_call(&NUM_TYPE, oper, vec![])
     }
@@ -203,6 +209,50 @@ pub trait ExpGenerator<'env> {
         }
     }
 
+    /// Creates a quantifier over the content of a map. The passed function `f` receives
+    /// an expression representing an element of the map and returns the quantifiers predicate;
+    /// if it returns None, this function will also return None, otherwise the quantifier will be
+    /// returned.
+    ///
+    /// NOTE: the `spec_fun_get` argument is needed due to the fact that we do not have a native
+    /// operator of getting the value by key in from a map. In the `mk_vector_quant_opt` case,
+    /// we have the `Index` operator to map from an index to a value. But in the `map` case, we
+    /// need to use the spec function for the key-to-value conversion.
+    ///
+    /// Alternative design choices including:
+    /// - re-purpose the `Index` operator to take key and intrinsic maps
+    /// - add a new `Get` operator for this specific operation.
+    fn mk_map_quant_opt<F>(
+        &self,
+        kind: QuantKind,
+        map: Exp,
+        spec_fun_get: QualifiedId<SpecFunId>,
+        key_ty: &Type,
+        val_ty: &Type,
+        f: &mut F,
+    ) -> Option<Exp>
+    where
+        F: FnMut(Exp) -> Option<Exp>,
+    {
+        let key = self.mk_local("$key", key_ty.clone());
+        let val = self.mk_call_with_inst(
+            val_ty,
+            vec![key_ty.clone(), val_ty.clone()],
+            Operation::Function(spec_fun_get.module_id, spec_fun_get.id, None),
+            vec![map.clone(), key.clone()],
+        );
+        if let Some(body) = self.mk_join_opt_bool(Operation::And, f(key), f(val)) {
+            let range_decl = self.mk_decl(self.mk_symbol("$key"), key_ty.clone(), None);
+            let node_id = self.new_node(BOOL_TYPE.clone(), None);
+            Some(
+                ExpData::Quant(node_id, kind, vec![(range_decl, map)], vec![], None, body)
+                    .into_exp(),
+            )
+        } else {
+            None
+        }
+    }
+
     /// Creates a quantifier over the content of memory. The passed function `f` receives
     //  an expression representing a value in memory and returns the quantifiers predicate;
     //  if it returns None, this function will also return None.
diff --git a/language/move-model/src/intrinsics.rs b/language/move-model/src/intrinsics.rs
new file mode 100644
index 0000000000..b71246b9ae
--- /dev/null
+++ b/language/move-model/src/intrinsics.rs
@@ -0,0 +1,357 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{collections::BTreeMap, ops::Deref};
+
+use num::BigUint;
+
+use crate::{
+    ast::{Operation, PropertyBag, PropertyValue, QualifiedSymbol},
+    builder::module_builder::SpecBlockContext,
+    model::{IntrinsicId, QualifiedId, SpecFunId},
+    pragmas::{INTRINSIC_PRAGMA, INTRINSIC_TYPE_MAP, INTRINSIC_TYPE_MAP_ASSOC_FUNCTIONS},
+    symbol::{Symbol, SymbolPool},
+    FunId, GlobalEnv, Loc, ModuleBuilder, StructId,
+};
+
+/// An information pack that holds the intrinsic declaration
+#[derive(Clone, Debug)]
+pub struct IntrinsicDecl {
+    move_type: QualifiedId<StructId>,
+    intrinsic_type: Symbol,
+    intrinsic_to_move_fun: BTreeMap<Symbol, QualifiedId<FunId>>,
+    move_fun_to_intrinsic: BTreeMap<QualifiedId<FunId>, Symbol>,
+    intrinsic_to_spec_fun: BTreeMap<Symbol, QualifiedId<SpecFunId>>,
+    spec_fun_to_intrinsic: BTreeMap<QualifiedId<SpecFunId>, Symbol>,
+}
+
+impl IntrinsicDecl {
+    pub fn get_fun_triple(&self, env: &GlobalEnv, name: &str) -> Option<(BigUint, String, String)> {
+        let symbol_pool = env.symbol_pool();
+        let sym = symbol_pool.make(name);
+        self.intrinsic_to_move_fun
+            .get(&sym)
+            .map(|qid| {
+                let fun_env = env.get_function(*qid);
+                let mod_name = fun_env.module_env.get_name();
+                (
+                    mod_name.addr().clone(),
+                    symbol_pool.string(mod_name.name()).to_string(),
+                    symbol_pool.string(fun_env.get_name()).to_string(),
+                )
+            })
+            .or_else(|| {
+                self.intrinsic_to_spec_fun.get(&sym).map(|qid| {
+                    let mod_env = env.get_module(qid.module_id);
+                    let mod_name = mod_env.get_name();
+                    let fun_decl = mod_env.get_spec_fun(qid.id);
+                    (
+                        mod_name.addr().clone(),
+                        symbol_pool.string(mod_name.name()).to_string(),
+                        symbol_pool.string(fun_decl.name).to_string(),
+                    )
+                })
+            })
+    }
+
+    pub fn lookup_spec_fun(&self, env: &GlobalEnv, name: &str) -> Option<QualifiedId<SpecFunId>> {
+        let symbol_pool = env.symbol_pool();
+        let sym = symbol_pool.make(name);
+        self.intrinsic_to_spec_fun.get(&sym).cloned()
+    }
+}
+
+pub(crate) fn process_intrinsic_declaration(
+    builder: &mut ModuleBuilder,
+    loc: &Loc,
+    context: &SpecBlockContext,
+    props: &mut PropertyBag,
+) {
+    // intrinsic declarations only appears in struct spec block
+    let type_qsym = match context {
+        SpecBlockContext::Struct(qsym) => qsym.clone(),
+        _ => {
+            return;
+        }
+    };
+
+    // search for intrinsic declarations
+    let symbol_pool = builder.symbol_pool();
+    let pragma_symbol = symbol_pool.make(INTRINSIC_PRAGMA);
+    let target = match props.get_mut(&pragma_symbol) {
+        None => {
+            // this is not an intrinsic declaration
+            return;
+        }
+        Some(val) => {
+            match val {
+                PropertyValue::Symbol(sym) => symbol_pool.string(*sym),
+                PropertyValue::QualifiedSymbol(_) => {
+                    builder
+                        .parent
+                        .error(loc, "expect a boolean value or a valid intrinsic type");
+                    return;
+                }
+                _ => {
+                    // this is the true/false pragma
+                    return;
+                }
+            }
+        }
+    };
+
+    // obtain the associated functions map
+    let associated_funs = match target.as_str() {
+        INTRINSIC_TYPE_MAP => INTRINSIC_TYPE_MAP_ASSOC_FUNCTIONS.deref(),
+        _ => {
+            builder
+                .parent
+                .error(loc, &format!("unknown intrinsic type: {}", target.as_str()));
+            return;
+        }
+    };
+
+    // prepare the decl
+    let type_entry = builder.parent.struct_table.get(&type_qsym).expect("struct");
+    let move_type = type_entry.module_id.qualified(type_entry.struct_id);
+
+    let mut decl = IntrinsicDecl {
+        move_type,
+        intrinsic_type: symbol_pool.make(target.as_str()),
+        intrinsic_to_move_fun: BTreeMap::new(),
+        move_fun_to_intrinsic: BTreeMap::new(),
+        intrinsic_to_spec_fun: BTreeMap::new(),
+        spec_fun_to_intrinsic: BTreeMap::new(),
+    };
+
+    // construct the pack
+    populate_intrinsic_decl(builder, loc, associated_funs, props, &mut decl);
+
+    // add the decl back
+    builder.parent.intrinsics.push(decl);
+}
+
+fn populate_intrinsic_decl(
+    builder: &mut ModuleBuilder,
+    loc: &Loc,
+    associated_funs: &BTreeMap<&str, bool>,
+    props: &mut PropertyBag,
+    decl: &mut IntrinsicDecl,
+) {
+    let symbol_pool = builder.symbol_pool();
+    for (&name, &is_move_fun) in associated_funs {
+        let key_sym = symbol_pool.make(name);
+
+        // look-up the target of the declaration, if present
+        let target_sym = match props.remove(&key_sym) {
+            None => {
+                continue;
+            }
+            Some(PropertyValue::Value(_)) => {
+                builder.parent.error(
+                    loc,
+                    &format!("invalid intrinsic function mapping: {}", name),
+                );
+                continue;
+            }
+            Some(PropertyValue::Symbol(val_sym)) => val_sym,
+            Some(PropertyValue::QualifiedSymbol(qual_sym)) => {
+                if qual_sym.module_name != builder.module_name {
+                    builder.parent.error(
+                        loc,
+                        &format!(
+                            "an intrinsic function mapping can only refer to functions \
+                            declared in the same module while `{}` is not",
+                            qual_sym.display(symbol_pool)
+                        ),
+                    );
+                    continue;
+                }
+                qual_sym.symbol
+            }
+        };
+        let qualified_sym = QualifiedSymbol {
+            module_name: builder.module_name.clone(),
+            symbol: target_sym,
+        };
+
+        // check presence
+        if is_move_fun {
+            match builder.parent.fun_table.get(&qualified_sym) {
+                None => {
+                    builder.parent.error(
+                        loc,
+                        &format!(
+                            "unable to find move function for intrinsic mapping: {}",
+                            qualified_sym.display(symbol_pool)
+                        ),
+                    );
+                    continue;
+                }
+                Some(entry) => {
+                    // TODO: in theory, we should also do some type checking on the function
+                    // signature. This is implicitly done by Boogie right now, but we may want to
+                    // make it more explicit and do the checking ourselves.
+                    let qid = entry.module_id.qualified(entry.fun_id);
+                    decl.intrinsic_to_move_fun.insert(key_sym, qid);
+                    if decl.move_fun_to_intrinsic.insert(qid, key_sym).is_some() {
+                        builder.parent.error(
+                            loc,
+                            &format!(
+                                "duplicated intrinsic mapping for move function: {}",
+                                qualified_sym.display(symbol_pool)
+                            ),
+                        );
+                        continue;
+                    }
+                }
+            }
+        } else {
+            match builder.parent.spec_fun_table.get(&qualified_sym) {
+                None => {
+                    builder.parent.error(
+                        loc,
+                        &format!(
+                            "unable to find spec function for intrinsic mapping: {}",
+                            qualified_sym.display(symbol_pool)
+                        ),
+                    );
+                    continue;
+                }
+                Some(entries) => {
+                    if entries.len() != 1 {
+                        builder.parent.error(
+                            loc,
+                            &format!(
+                                "unable to find a unique spec function for intrinsic mapping: {}",
+                                qualified_sym.display(symbol_pool)
+                            ),
+                        );
+                        continue;
+                    }
+                    let entry = &entries[0];
+
+                    // TODO: in theory, we should also do some type checking on the function
+                    // signature. This is implicitly done by Boogie right now, but we may want to
+                    // make it more explicit and do the checking ourselves.
+                    if let Operation::Function(mid, fid, ..) = &entry.oper {
+                        let qid = mid.qualified(*fid);
+                        decl.intrinsic_to_spec_fun.insert(key_sym, qid);
+                        if decl.spec_fun_to_intrinsic.insert(qid, key_sym).is_some() {
+                            builder.parent.error(
+                                loc,
+                                &format!(
+                                    "duplicated intrinsic mapping for spec function: {}",
+                                    qualified_sym.display(symbol_pool)
+                                ),
+                            );
+                            continue;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+/// Hosts all intrinsic declarations
+#[derive(Clone, Debug, Default)]
+pub struct IntrinsicsAnnotation {
+    /// Intrinsic declarations
+    decls: BTreeMap<IntrinsicId, IntrinsicDecl>,
+    /// A map from intrinsic types to intrinsic decl
+    intrinsic_structs: BTreeMap<QualifiedId<StructId>, IntrinsicId>,
+    /// A map from intrinsic move functions to intrinsic decl
+    intrinsic_move_funs: BTreeMap<QualifiedId<FunId>, IntrinsicId>,
+    /// A map from intrinsic spec functions to intrinsic decl
+    intrinsic_spec_funs: BTreeMap<QualifiedId<SpecFunId>, IntrinsicId>,
+}
+
+impl IntrinsicsAnnotation {
+    /// Add a declaration pack into the annotation set
+    pub fn add_decl(&mut self, decl: &IntrinsicDecl) {
+        let id = IntrinsicId::new(self.decls.len());
+        self.intrinsic_structs.insert(decl.move_type, id);
+        for move_fid in decl.move_fun_to_intrinsic.keys() {
+            self.intrinsic_move_funs.insert(*move_fid, id);
+        }
+        for spec_fid in decl.spec_fun_to_intrinsic.keys() {
+            self.intrinsic_spec_funs.insert(*spec_fid, id);
+        }
+        self.decls.insert(id, decl.clone());
+    }
+
+    /// Get the intrinsic decl for struct
+    pub fn get_decl_for_struct(&self, qid: &QualifiedId<StructId>) -> Option<&IntrinsicDecl> {
+        self.intrinsic_structs
+            .get(qid)
+            .map(|id| self.decls.get(id).unwrap())
+    }
+
+    /// Get the intrinsic decl for a move function
+    pub fn get_decl_for_move_fun(&self, qid: &QualifiedId<FunId>) -> Option<&IntrinsicDecl> {
+        self.intrinsic_move_funs
+            .get(qid)
+            .map(|id| self.decls.get(id).unwrap())
+    }
+
+    /// Get the intrinsic decl for a spec function
+    pub fn get_decl_for_spec_fun(&self, qid: &QualifiedId<SpecFunId>) -> Option<&IntrinsicDecl> {
+        self.intrinsic_spec_funs
+            .get(qid)
+            .map(|id| self.decls.get(id).unwrap())
+    }
+
+    /// Test whether a struct is an intrinsic of a specific name
+    pub fn is_intrinsic_of_for_struct(
+        &self,
+        symbol_pool: &SymbolPool,
+        qid: &QualifiedId<StructId>,
+        intrinsic_name: &str,
+    ) -> bool {
+        self.intrinsic_structs.get(qid).map_or(false, |id| {
+            let decl = self.decls.get(id).expect("intrinsic decl");
+            let sym = symbol_pool.make(intrinsic_name);
+            decl.intrinsic_type == sym
+        })
+    }
+
+    /// Test whether a move function is an intrinsic of a specific name
+    pub fn is_intrinsic_of_for_move_fun(
+        &self,
+        symbol_pool: &SymbolPool,
+        qid: &QualifiedId<FunId>,
+        intrinsic_name: &str,
+    ) -> bool {
+        self.intrinsic_move_funs
+            .get(qid)
+            .and_then(|id| {
+                self.decls
+                    .get(id)
+                    .expect("intrinsic decl")
+                    .move_fun_to_intrinsic
+                    .get(qid)
+            })
+            .map_or(false, |sym| sym == &symbol_pool.make(intrinsic_name))
+    }
+
+    /// Test whether a spec function is an intrinsic of a specific name
+    pub fn is_intrinsic_of_for_spec_fun(
+        &self,
+        symbol_pool: &SymbolPool,
+        qid: &QualifiedId<SpecFunId>,
+        intrinsic_name: &str,
+    ) -> bool {
+        self.intrinsic_spec_funs
+            .get(qid)
+            .and_then(|id| {
+                self.decls
+                    .get(id)
+                    .expect("intrinsic decl")
+                    .spec_fun_to_intrinsic
+                    .get(qid)
+            })
+            .map_or(false, |sym| sym == &symbol_pool.make(intrinsic_name))
+    }
+}
diff --git a/language/move-model/src/lib.rs b/language/move-model/src/lib.rs
index ad4b736e00..f1fe7fda3b 100644
--- a/language/move-model/src/lib.rs
+++ b/language/move-model/src/lib.rs
@@ -4,16 +4,17 @@
 
 #![forbid(unsafe_code)]
 
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    rc::Rc,
+};
+
 use codespan::ByteIndex;
 use codespan_reporting::diagnostic::{Diagnostic, Label, LabelStyle};
 use itertools::Itertools;
 #[allow(unused_imports)]
 use log::warn;
-use move_symbol_pool::Symbol as MoveSymbol;
-use std::{
-    collections::{BTreeMap, BTreeSet, HashMap},
-    rc::Rc,
-};
+use num::{BigUint, Num};
 
 use builder::module_builder::ModuleBuilder;
 use move_binary_format::{
@@ -37,7 +38,7 @@ use move_compiler::{
 };
 use move_core_types::{account_address::AccountAddress, identifier::Identifier};
 use move_ir_types::location::sp;
-use num::{BigUint, Num};
+use move_symbol_pool::Symbol as MoveSymbol;
 
 use crate::{
     ast::{ModuleName, Spec},
@@ -45,7 +46,6 @@ use crate::{
     model::{FunId, FunctionData, GlobalEnv, Loc, ModuleData, ModuleId, StructId},
     options::ModelBuilderOptions,
     simplifier::{SpecRewriter, SpecRewriterPipeline},
-    symbol::{Symbol, SymbolPool},
 };
 
 pub mod ast;
@@ -53,6 +53,7 @@ mod builder;
 pub mod code_writer;
 pub mod exp_generator;
 pub mod exp_rewriter;
+pub mod intrinsics;
 pub mod model;
 pub mod options;
 pub mod pragmas;
@@ -92,7 +93,7 @@ pub fn run_model_builder_with_options<
         move_sources,
         deps,
         options,
-        Flags::empty(),
+        Flags::verification(),
     )
 }
 
@@ -110,10 +111,6 @@ pub fn run_model_builder_with_options_and_compilation_flags<
     let mut env = GlobalEnv::new();
     env.set_extension(options);
 
-    // Compute this now because the compiler consumes move sources and deps. We need it later
-    // to attach an alias definition to a module.
-    let address_aliases = create_file_to_address_aliases(env.symbol_pool(), &move_sources, &deps);
-
     // Step 1: parse the program to get comments and a separation of targets and dependencies.
     let (files, comments_and_compiler_res) = Compiler::from_package_paths(move_sources, deps)
         .set_flags(flags)
@@ -137,25 +134,44 @@ pub fn run_model_builder_with_options_and_compilation_flags<
         Ok(res) => res,
     };
     let (compiler, parsed_prog) = compiler.into_ast();
+
     // Add source files for targets and dependencies
     let dep_files: BTreeSet<_> = parsed_prog
         .lib_definitions
         .iter()
         .map(|p| p.def.file_hash())
         .collect();
+
+    for member in parsed_prog
+        .source_definitions
+        .iter()
+        .chain(parsed_prog.lib_definitions.iter())
+    {
+        let fhash = member.def.file_hash();
+        let (fname, fsrc) = files.get(&fhash).unwrap();
+        let is_dep = dep_files.contains(&fhash);
+        let aliases = parsed_prog
+            .named_address_maps
+            .get(member.named_address_map)
+            .iter()
+            .map(|(symbol, addr)| (env.symbol_pool().make(symbol.as_str()), *addr))
+            .collect();
+        env.add_source(fhash, Rc::new(aliases), fname.as_str(), fsrc, is_dep);
+    }
+
+    // If a move file does not contain any definition, it will not appear in `parsed_prog`. Add them explicitly.
     for fhash in files.keys().sorted() {
-        let (fname, fsrc) = files.get(fhash).unwrap();
-        let aliases = address_aliases
-            .get(fname)
-            .cloned()
-            .unwrap_or_else(|| Rc::new(BTreeMap::new()));
-        env.add_source(
-            *fhash,
-            aliases,
-            fname.as_str(),
-            fsrc,
-            dep_files.contains(fhash),
-        );
+        if env.get_file_id(*fhash).is_none() {
+            let (fname, fsrc) = files.get(fhash).unwrap();
+            let is_dep = dep_files.contains(fhash);
+            env.add_source(
+                *fhash,
+                Rc::new(BTreeMap::new()),
+                fname.as_str(),
+                fsrc,
+                is_dep,
+            );
+        }
     }
 
     // Add any documentation comments found by the Move compiler to the env.
@@ -191,6 +207,7 @@ pub fn run_model_builder_with_options_and_compilation_flags<
         }
         Ok(compiler) => compiler.into_ast(),
     };
+
     // Extract the module/script closure
     let mut visited_modules = BTreeSet::new();
     for (_, mident, mdef) in &expansion_ast.modules {
@@ -223,6 +240,7 @@ pub fn run_model_builder_with_options_and_compilation_flags<
         });
         E::Program { modules, scripts }
     };
+
     // Run the compiler fully to the compiled units
     let units = match compiler
         .at_expansion(expansion_ast.clone())
@@ -243,6 +261,7 @@ pub fn run_model_builder_with_options_and_compilation_flags<
             units
         }
     };
+
     // Check for bytecode verifier errors (there should not be any)
     let diags = compiled_unit::verify_units(&units);
     if !diags.is_empty() {
@@ -256,29 +275,6 @@ pub fn run_model_builder_with_options_and_compilation_flags<
     Ok(env)
 }
 
-fn create_file_to_address_aliases<
-    Paths: Into<MoveSymbol> + Clone,
-    NamedAddress: Into<MoveSymbol> + Clone,
->(
-    pool: &SymbolPool,
-    move_sources: &[PackagePaths<Paths, NamedAddress>],
-    deps: &[PackagePaths<Paths, NamedAddress>],
-) -> HashMap<MoveSymbol, Rc<BTreeMap<Symbol, NumericalAddress>>> {
-    let mut res = HashMap::<MoveSymbol, _>::new();
-    for pkg in move_sources.iter().chain(deps.iter()) {
-        let aliases = Rc::new(
-            pkg.named_address_map
-                .iter()
-                .map(|(k, v)| (pool.make(k.clone().into().as_ref()), *v))
-                .collect::<BTreeMap<_, _>>(),
-        );
-        for path in &pkg.paths {
-            res.insert(path.clone().into(), aliases.clone());
-        }
-    }
-    res
-}
-
 fn collect_related_modules_recursive<'a>(
     mident: &'a ModuleIdent_,
     modules: &'a UniqueMap<ModuleIdent, ModuleDefinition>,
@@ -593,6 +589,10 @@ fn run_spec_checker(env: &mut GlobalEnv, units: Vec<AnnotatedCompiledUnit>, mut
             function_infos,
         );
     }
+
+    // Populate GlobalEnv with model-level information
+    builder.populate_env();
+
     // After all specs have been processed, warn about any unused schemas.
     builder.warn_unused_schemas();
 
diff --git a/language/move-model/src/model.rs b/language/move-model/src/model.rs
index 4d9c2a4003..ebfb970677 100644
--- a/language/move-model/src/model.rs
+++ b/language/move-model/src/model.rs
@@ -32,15 +32,15 @@ use codespan_reporting::{
 use itertools::Itertools;
 #[allow(unused_imports)]
 use log::{info, warn};
-use move_command_line_common::files::FileHash;
 use num::{BigUint, One, ToPrimitive};
 use serde::{Deserialize, Serialize};
 
+pub use move_binary_format::file_format::{AbilitySet, Visibility as FunctionVisibility};
 use move_binary_format::{
     access::ModuleAccess,
     binary_views::BinaryIndexedView,
     file_format::{
-        AddressIdentifierIndex, Bytecode, Constant as VMConstant, ConstantPoolIndex,
+        AddressIdentifierIndex, Bytecode, CodeOffset, Constant as VMConstant, ConstantPoolIndex,
         FunctionDefinitionIndex, FunctionHandleIndex, SignatureIndex, SignatureToken,
         StructDefinitionIndex, StructFieldInformation, StructHandleIndex, Visibility,
     },
@@ -52,6 +52,7 @@ use move_binary_format::{
     CompiledModule,
 };
 use move_bytecode_source_map::{mapping::SourceMapping, source_map::SourceMap};
+use move_command_line_common::{address::NumericalAddress, files::FileHash};
 use move_core_types::{
     account_address::AccountAddress,
     identifier::{IdentStr, Identifier},
@@ -62,9 +63,10 @@ use move_disassembler::disassembler::{Disassembler, DisassemblerOptions};
 
 use crate::{
     ast::{
-        ConditionKind, Exp, ExpData, GlobalInvariant, ModuleName, PropertyBag, PropertyValue, Spec,
-        SpecBlockInfo, SpecFunDecl, SpecVarDecl, Value,
+        Attribute, ConditionKind, Exp, ExpData, GlobalInvariant, ModuleName, PropertyBag,
+        PropertyValue, Spec, SpecBlockInfo, SpecFunDecl, SpecVarDecl, Value,
     },
+    intrinsics::IntrinsicsAnnotation,
     pragmas::{
         DELEGATE_INVARIANTS_TO_CALLER_PRAGMA, DISABLE_INVARIANTS_IN_BODY_PRAGMA, FRIEND_PRAGMA,
         INTRINSIC_PRAGMA, OPAQUE_PRAGMA, VERIFY_PRAGMA,
@@ -73,12 +75,6 @@ use crate::{
     ty::{PrimitiveType, Type, TypeDisplayContext, TypeUnificationAdapter, Variance},
 };
 
-// import and re-expose symbols
-use crate::ast::Attribute;
-use move_binary_format::file_format::CodeOffset;
-pub use move_binary_format::file_format::{AbilitySet, Visibility as FunctionVisibility};
-use move_command_line_common::address::NumericalAddress;
-
 // =================================================================================================
 /// # Constants
 
@@ -225,6 +221,10 @@ pub struct NodeId(usize);
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
 pub struct GlobalId(usize);
 
+/// Identifier for an intrinsic declaration, relative globally in `GlobalEnv`.
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub struct IntrinsicId(usize);
+
 /// Some identifier qualified by a module.
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
 pub struct QualifiedId<Id> {
@@ -330,16 +330,6 @@ impl ModuleId {
     }
 }
 
-impl GlobalId {
-    pub fn new(idx: usize) -> Self {
-        Self(idx)
-    }
-
-    pub fn as_usize(self) -> usize {
-        self.0
-    }
-}
-
 impl ModuleId {
     pub fn qualified<Id>(self, id: Id) -> QualifiedId<Id> {
         QualifiedId {
@@ -357,6 +347,26 @@ impl ModuleId {
     }
 }
 
+impl GlobalId {
+    pub fn new(idx: usize) -> Self {
+        Self(idx)
+    }
+
+    pub fn as_usize(self) -> usize {
+        self.0
+    }
+}
+
+impl IntrinsicId {
+    pub fn new(idx: usize) -> Self {
+        Self(idx)
+    }
+
+    pub fn as_usize(self) -> usize {
+        self.0
+    }
+}
+
 impl<Id: Clone> QualifiedId<Id> {
     pub fn instantiate(self, inst: Vec<Type>) -> QualifiedInstId<Id> {
         let QualifiedId { module_id, id } = self;
@@ -407,7 +417,7 @@ impl QualifiedInstId<StructId> {
 /// # Verification Scope
 
 /// Defines what functions to verify.
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum VerificationScope {
     /// Verify only public functions.
     Public,
@@ -500,6 +510,8 @@ pub struct GlobalEnv {
     /// are represented without type instantiation because we assume the backend can handle
     /// generics in the expression language.
     pub used_spec_funs: BTreeSet<QualifiedId<SpecFunId>>,
+    /// An annotation of all intrinsic declarations
+    pub intrinsics: IntrinsicsAnnotation,
     /// A type-indexed container for storing extension data in the environment.
     extensions: RefCell<BTreeMap<TypeId, Box<dyn Any>>>,
     /// The address of the standard and extension libaries.
@@ -555,6 +567,7 @@ impl GlobalEnv {
             global_invariants: Default::default(),
             global_invariants_for_memory: Default::default(),
             used_spec_funs: BTreeSet::new(),
+            intrinsics: Default::default(),
             extensions: Default::default(),
             stdlib_address: None,
             extlib_address: None,
@@ -589,6 +602,20 @@ impl GlobalEnv {
             .and_then(|d| d.downcast_ref::<Rc<T>>().cloned())
     }
 
+    /// Retrieves a clone of the extension data from the environment. Use as in `env.get_cloned_extension::<T>()`.
+    pub fn get_cloned_extension<T: Any + Clone>(&self) -> T {
+        let id = TypeId::of::<T>();
+        let d = self
+            .extensions
+            .borrow_mut()
+            .remove(&id)
+            .expect("extension defined")
+            .downcast_ref::<Rc<T>>()
+            .cloned()
+            .unwrap();
+        Rc::try_unwrap(d).unwrap_or_else(|d| d.as_ref().clone())
+    }
+
     /// Updates extension data. If they are no outstanding references to this extension it
     /// is updated in place, otherwise it will be cloned before the update.
     pub fn update_extension<T: Any + Clone>(&self, f: impl FnOnce(&mut T)) {
@@ -1293,8 +1320,7 @@ impl GlobalEnv {
         name: &IdentStr,
     ) -> Option<FunctionEnv<'_>> {
         self.find_module_by_language_storage_id(id)
-            .map(|menv| menv.find_function(menv.symbol_pool().make(name.as_str())))
-            .flatten()
+            .and_then(|menv| menv.find_function(menv.symbol_pool().make(name.as_str())))
     }
 
     /// Gets a StructEnv in this module by its `StructTag`
@@ -1303,11 +1329,10 @@ impl GlobalEnv {
         tag: &language_storage::StructTag,
     ) -> Option<QualifiedId<StructId>> {
         self.find_module(&self.to_module_name(&tag.module_id()))
-            .map(|menv| {
+            .and_then(|menv| {
                 menv.find_struct_by_identifier(tag.name.clone())
                     .map(|sid| menv.get_id().qualified(sid))
             })
-            .flatten()
     }
 
     /// Return the module enclosing this location.
@@ -1348,12 +1373,9 @@ impl GlobalEnv {
     /// Returns the struct enclosing this location.
     pub fn get_enclosing_struct(&self, loc: &Loc) -> Option<StructEnv<'_>> {
         let module_env = self.get_enclosing_module(loc)?;
-        for struct_env in module_env.into_structs() {
-            if Self::enclosing_span(struct_env.get_loc().span(), loc.span()) {
-                return Some(struct_env);
-            }
-        }
-        None
+        module_env
+            .into_structs()
+            .find(|struct_env| Self::enclosing_span(struct_env.get_loc().span(), loc.span()))
     }
 
     fn enclosing_span(outer: Span, inner: Span) -> bool {
@@ -1567,8 +1589,7 @@ impl GlobalEnv {
 
     /// Gets the type parameter instantiation associated with the given node.
     pub fn get_node_instantiation(&self, node_id: NodeId) -> Vec<Type> {
-        self.get_node_instantiation_opt(node_id)
-            .unwrap_or_else(Vec::new)
+        self.get_node_instantiation_opt(node_id).unwrap_or_default()
     }
 
     /// Gets the type parameter instantiation associated with the given node, if it is available.
@@ -1579,6 +1600,11 @@ impl GlobalEnv {
             .and_then(|info| info.instantiation.clone())
     }
 
+    /// Gets the type parameter instantiation associated with the given node, if it is available.
+    pub fn get_nodes(&self) -> Vec<NodeId> {
+        (*self.exp_info.borrow()).clone().into_keys().collect_vec()
+    }
+
     /// Return the total number of declared functions in the modules of `self`
     pub fn get_declared_function_count(&self) -> usize {
         let mut total = 0;
@@ -1638,13 +1664,12 @@ impl GlobalEnv {
             .module_data
             .iter_mut()
             .filter(|m| m.id == fid.module_id)
-            .map(|m| {
+            .flat_map(|m| {
                 m.function_data
                     .iter_mut()
                     .filter(|(k, _)| **k == fid.id)
                     .map(|(_, v)| v)
             })
-            .flatten()
             .exactly_one()
             .unwrap_or_else(|_| {
                 panic!("Expect one and only one function for {:?}", fid);
@@ -1663,13 +1688,12 @@ impl GlobalEnv {
             .module_data
             .iter_mut()
             .filter(|m| m.id == fid.module_id)
-            .map(|m| {
+            .flat_map(|m| {
                 m.function_data
                     .iter_mut()
                     .filter(|(k, _)| **k == fid.id)
                     .map(|(_, v)| v)
             })
-            .flatten()
             .exactly_one()
             .unwrap_or_else(|_| {
                 panic!("Expect one and only one function for {:?}", fid);
@@ -2187,18 +2211,21 @@ impl<'env> ModuleEnv<'env> {
         match sig {
             SignatureToken::Bool => Type::Primitive(PrimitiveType::Bool),
             SignatureToken::U8 => Type::Primitive(PrimitiveType::U8),
+            SignatureToken::U16 => Type::Primitive(PrimitiveType::U16),
+            SignatureToken::U32 => Type::Primitive(PrimitiveType::U32),
             SignatureToken::U64 => Type::Primitive(PrimitiveType::U64),
             SignatureToken::U128 => Type::Primitive(PrimitiveType::U128),
+            SignatureToken::U256 => Type::Primitive(PrimitiveType::U256),
             SignatureToken::Address => Type::Primitive(PrimitiveType::Address),
             SignatureToken::Signer => Type::Primitive(PrimitiveType::Signer),
             SignatureToken::Reference(t) => {
-                Type::Reference(false, Box::new(self.globalize_signature(&*t)))
+                Type::Reference(false, Box::new(self.globalize_signature(t)))
             }
             SignatureToken::MutableReference(t) => {
-                Type::Reference(true, Box::new(self.globalize_signature(&*t)))
+                Type::Reference(true, Box::new(self.globalize_signature(t)))
             }
             SignatureToken::TypeParameter(index) => Type::TypeParameter(*index),
-            SignatureToken::Vector(bt) => Type::Vector(Box::new(self.globalize_signature(&*bt))),
+            SignatureToken::Vector(bt) => Type::Vector(Box::new(self.globalize_signature(bt))),
             SignatureToken::Struct(handle_idx) => {
                 let struct_view = StructHandleView::new(
                     &self.data.module,
@@ -2370,6 +2397,35 @@ impl<'env> ModuleEnv<'env> {
         }
         false
     }
+
+    fn match_module_name(&self, module_name: &str) -> bool {
+        self.get_name()
+            .name()
+            .display(self.env.symbol_pool())
+            .to_string()
+            == module_name
+    }
+
+    fn is_module_in_std(&self, module_name: &str) -> bool {
+        let addr = self.get_name().addr();
+        *addr == self.env.get_stdlib_address() && self.match_module_name(module_name)
+    }
+
+    fn is_module_in_ext(&self, module_name: &str) -> bool {
+        let addr = self.get_name().addr();
+        *addr == self.env.get_extlib_address() && self.match_module_name(module_name)
+    }
+
+    pub fn is_std_vector(&self) -> bool {
+        self.is_module_in_std("vector")
+    }
+
+    pub fn is_table(&self) -> bool {
+        self.is_module_in_std("table")
+            || self.is_module_in_std("table_with_length")
+            || self.is_module_in_ext("table")
+            || self.is_module_in_ext("table_with_length")
+    }
 }
 
 // =================================================================================================
@@ -2393,7 +2449,7 @@ pub struct StructData {
     /// Field definitions.
     field_data: BTreeMap<FieldId, FieldData>,
 
-    // Associated specification.
+    /// Associated specification.
     spec: Spec,
 }
 
@@ -2509,25 +2565,22 @@ impl<'env> StructEnv<'env> {
 
     /// Returns true if this struct has the pragma intrinsic set to true.
     pub fn is_intrinsic(&self) -> bool {
-        self.is_pragma_true(INTRINSIC_PRAGMA, || false)
-    }
-
-    /// Returns true if this is the well-known native or intrinsic struct of the given name.
-    pub fn is_well_known(&self, name: &str) -> bool {
-        let env = self.module_env.env;
-        if !self.is_native() && !self.is_intrinsic() {
-            return false;
-        }
-        let addr = self.module_env.get_name().addr();
-        (addr == &env.get_stdlib_address() || addr == &env.get_extlib_address())
-            && self.get_full_name_str() == name
+        self.is_pragma_true(INTRINSIC_PRAGMA, || {
+            self.module_env
+                .env
+                .intrinsics
+                .get_decl_for_struct(&self.get_qualified_id())
+                .is_some()
+        })
     }
 
-    /// Determines whether this struct is the well-known vector type.
-    pub fn is_vector(&self) -> bool {
-        let name = self.symbol_pool().string(self.module_env.get_name().name());
-        let addr = self.module_env.get_name().addr();
-        name.as_ref() == "vector" && addr == &BigUint::from(0_u64)
+    /// Returns true if this is an intrinsic struct of a given name
+    pub fn is_intrinsic_of(&self, name: &str) -> bool {
+        self.module_env.env.intrinsics.is_intrinsic_of_for_struct(
+            self.symbol_pool(),
+            &self.get_qualified_id(),
+            name,
+        )
     }
 
     /// Returns true if this struct is ghost memory for a specification variable.
@@ -2722,7 +2775,7 @@ impl<'env> StructEnv<'env> {
 
     /// Returns true if this struct is native or marked as intrinsic.
     pub fn is_native_or_intrinsic(&self) -> bool {
-        self.is_native() || self.is_pragma_true(INTRINSIC_PRAGMA, || false)
+        self.is_native() || self.is_intrinsic()
     }
 }
 
@@ -2991,10 +3044,14 @@ impl<'env> FunctionEnv<'env> {
         format!(
             "{}::{}",
             self.module_env.get_name().display(self.symbol_pool()),
-            self.get_name().display(self.symbol_pool())
+            self.get_name_str()
         )
     }
 
+    pub fn get_name_str(&self) -> String {
+        self.get_name().display(self.symbol_pool()).to_string()
+    }
+
     /// Returns the VM identifier for this function
     pub fn get_identifier(&'env self) -> Identifier {
         let m = &self.module_env.data.module;
@@ -3170,7 +3227,13 @@ impl<'env> FunctionEnv<'env> {
 
     /// Returns true if this function has the pragma intrinsic set to true.
     pub fn is_intrinsic(&self) -> bool {
-        self.is_pragma_true(INTRINSIC_PRAGMA, || false)
+        self.is_pragma_true(INTRINSIC_PRAGMA, || {
+            self.module_env
+                .env
+                .intrinsics
+                .get_decl_for_move_fun(&self.get_qualified_id())
+                .is_some()
+        })
     }
 
     /// Returns true if function is either native or intrinsic.
@@ -3178,6 +3241,15 @@ impl<'env> FunctionEnv<'env> {
         self.is_native() || self.is_intrinsic()
     }
 
+    /// Returns true if this is an intrinsic struct of a given name
+    pub fn is_intrinsic_of(&self, name: &str) -> bool {
+        self.module_env.env.intrinsics.is_intrinsic_of_for_move_fun(
+            self.symbol_pool(),
+            &self.get_qualified_id(),
+            name,
+        )
+    }
+
     /// Returns true if this is the well-known native or intrinsic function of the given name.
     /// The function must reside either in stdlib or extlib address domain.
     pub fn is_well_known(&self, name: &str) -> bool {
@@ -3669,7 +3741,7 @@ impl<'env> FunctionEnv<'env> {
 /// # Expression Environment
 
 /// Represents context for an expression.
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct ExpInfo {
     /// The associated location of this expression.
     loc: Loc,
diff --git a/language/move-model/src/pragmas.rs b/language/move-model/src/pragmas.rs
index fb3ae4bcac..bf68a32054 100644
--- a/language/move-model/src/pragmas.rs
+++ b/language/move-model/src/pragmas.rs
@@ -4,7 +4,15 @@
 
 //! Provides pragmas and properties of the specification language.
 
-use crate::{ast::ConditionKind, builder::module_builder::SpecBlockContext};
+use std::collections::BTreeMap;
+
+use once_cell::sync::Lazy;
+
+use crate::{
+    ast::{ConditionKind, PropertyBag, PropertyValue},
+    builder::module_builder::SpecBlockContext,
+    symbol::SymbolPool,
+};
 
 /// Pragma indicating whether verification should be performed for a function.
 pub const VERIFY_PRAGMA: &str = "verify";
@@ -70,8 +78,117 @@ pub const DISABLE_INVARIANTS_IN_BODY_PRAGMA: &str = "disable_invariants_in_body"
 /// to this function
 pub const DELEGATE_INVARIANTS_TO_CALLER_PRAGMA: &str = "delegate_invariants_to_caller";
 
+/// # Pragmas for intrinsic table declaration
+
+/// The intrinsic type for `Map<K, V>`
+pub const INTRINSIC_TYPE_MAP: &str = "map";
+
+/// Create a new table with an empty content
+/// `[move] fun map_new<K, V>(): Map<K, V>`
+pub const INTRINSIC_FUN_MAP_NEW: &str = "map_new";
+
+/// Create a new table with an empty content (the spec version)
+/// `[spec] fun map_new<K, V>(): Map<K, V>`
+pub const INTRINSIC_FUN_MAP_SPEC_NEW: &str = "map_spec_new";
+
+/// Get the value associated with key `k`.
+/// The behavior is undefined if `k` does not exist in the map
+/// `[spec] fun map_get<K, V>(m: Map<K, V>, k: K): V`
+pub const INTRINSIC_FUN_MAP_SPEC_GET: &str = "map_spec_get";
+
+/// Set the value to `v` with the key associated with `k`
+/// `[spec] fun map_set<K, V>(m: Map<K, V>, k: K, v: V): Map<K, V>`
+pub const INTRINSIC_FUN_MAP_SPEC_SET: &str = "map_spec_set";
+
+/// Remove the map entry associated with key `k`
+/// The behavior is undefined if `k` does not exist in the map
+/// `[spec] fun map_del<K, V>(m: Map<K, V>, k: K): Map<K, V>`
+pub const INTRINSIC_FUN_MAP_SPEC_DEL: &str = "map_spec_del";
+
+/// Get the number of entries in the map (the spec version)
+/// `[spec] fun map_len<K, V>(m: Map<K, V>): num`
+pub const INTRINSIC_FUN_MAP_SPEC_LEN: &str = "map_spec_len";
+
+/// Check whether the map is empty (the spec version)
+/// `[move] fun map_is_empty<K, V>(m: Map<K, V>): bool`
+pub const INTRINSIC_FUN_MAP_SPEC_IS_EMPTY: &str = "map_spec_is_empty";
+
+/// Get the number of entries in the map
+/// `[move] fun map_len<K, V>(m: &Map<K, V>): u64`
+pub const INTRINSIC_FUN_MAP_LEN: &str = "map_len";
+
+/// Check whether the map is empty
+/// `[move] fun map_is_empty<K, V>(m: &Map<K, V>): bool`
+pub const INTRINSIC_FUN_MAP_IS_EMPTY: &str = "map_is_empty";
+
+/// Check if the map has an entry associated with key `k` (the spec version)
+/// `[spec] fun map_has_key<K, V>(m: Map<K, V>, k: K): bool`
+pub const INTRINSIC_FUN_MAP_SPEC_HAS_KEY: &str = "map_spec_has_key";
+
+/// Check if the map has an entry associated with key `k`
+/// `[move] fun map_has_key<K, V>(m: &Map<K, V>, k: K): bool`
+pub const INTRINSIC_FUN_MAP_HAS_KEY: &str = "map_has_key";
+
+/// Destroys the map, aborts if the length is not zero.
+/// `[move] fun map_destroy_empty<K, V>(m: Map<K, V>)`
+pub const INTRINSIC_FUN_MAP_DESTROY_EMPTY: &str = "map_destroy_empty";
+
+/// Add a new entry to the map, aborts if the key already exists
+/// `[move] fun map_add_no_override<K, V>(m: &mut Map<K, V>, k: K, v: V)`
+pub const INTRINSIC_FUN_MAP_ADD_NO_OVERRIDE: &str = "map_add_no_override";
+
+/// Add a new entry to the map, override if the key already exists
+/// `[move] fun map_add_override_if_exists<K, V>(m: &mut Map<K, V>, k: K, v: V)`
+pub const INTRINSIC_FUN_MAP_ADD_OVERRIDE_IF_EXISTS: &str = "map_add_override_if_exists";
+
+/// Remove an entry from the map, aborts if the key does not exists
+/// `[move] fun map_del_must_exist<K, V>(m: &mut Map<K, V>, k: K): V`
+pub const INTRINSIC_FUN_MAP_DEL_MUST_EXIST: &str = "map_del_must_exist";
+
+/// Remove an entry from the map, aborts if the key does not exists
+/// `[move] fun map_del_return_key<K, V>(m: &mut Map<K, V>, k: K): (K, V)`
+pub const INTRINSIC_FUN_MAP_DEL_RETURN_KEY: &str = "map_del_return_key";
+
+/// Immutable borrow of a value from the map, aborts if the key does not exist
+/// `[move] fun map_borrow<K, V>(m: &Map<K, V>, k: K): &V`
+pub const INTRINSIC_FUN_MAP_BORROW: &str = "map_borrow";
+
+/// Mutable borrow of a value from the map, aborts if the key does not exist
+/// `[move] fun map_borrow_mut<K, V>(m: &mut Map<K, V>, k: K): &mut V`
+pub const INTRINSIC_FUN_MAP_BORROW_MUT: &str = "map_borrow_mut";
+
+/// All intrinsic functions associated with the map type
+pub static INTRINSIC_TYPE_MAP_ASSOC_FUNCTIONS: Lazy<BTreeMap<&'static str, bool>> =
+    Lazy::new(|| {
+        BTreeMap::from([
+            (INTRINSIC_FUN_MAP_NEW, true),
+            (INTRINSIC_FUN_MAP_SPEC_NEW, false),
+            (INTRINSIC_FUN_MAP_SPEC_GET, false),
+            (INTRINSIC_FUN_MAP_SPEC_SET, false),
+            (INTRINSIC_FUN_MAP_SPEC_DEL, false),
+            (INTRINSIC_FUN_MAP_SPEC_LEN, false),
+            (INTRINSIC_FUN_MAP_SPEC_IS_EMPTY, false),
+            (INTRINSIC_FUN_MAP_SPEC_HAS_KEY, false),
+            (INTRINSIC_FUN_MAP_LEN, true),
+            (INTRINSIC_FUN_MAP_IS_EMPTY, true),
+            (INTRINSIC_FUN_MAP_HAS_KEY, true),
+            (INTRINSIC_FUN_MAP_DESTROY_EMPTY, true),
+            (INTRINSIC_FUN_MAP_ADD_NO_OVERRIDE, true),
+            (INTRINSIC_FUN_MAP_ADD_OVERRIDE_IF_EXISTS, true),
+            (INTRINSIC_FUN_MAP_DEL_MUST_EXIST, true),
+            (INTRINSIC_FUN_MAP_DEL_RETURN_KEY, true),
+            (INTRINSIC_FUN_MAP_BORROW, true),
+            (INTRINSIC_FUN_MAP_BORROW_MUT, true),
+        ])
+    });
+
 /// Checks whether a pragma is valid in a specific spec block.
-pub fn is_pragma_valid_for_block(target: &SpecBlockContext<'_>, pragma: &str) -> bool {
+pub fn is_pragma_valid_for_block(
+    symbols: &SymbolPool,
+    bag: &PropertyBag,
+    target: &SpecBlockContext<'_>,
+    pragma: &str,
+) -> bool {
     use crate::builder::module_builder::SpecBlockContext::*;
     match target {
         Module => matches!(
@@ -103,8 +220,21 @@ pub fn is_pragma_valid_for_block(target: &SpecBlockContext<'_>, pragma: &str) ->
                 | FRIEND_PRAGMA
                 | DISABLE_INVARIANTS_IN_BODY_PRAGMA
                 | DELEGATE_INVARIANTS_TO_CALLER_PRAGMA
+                | BV_PARAM_PROP
+                | BV_RET_PROP
         ),
-        Struct(..) => matches!(pragma, INTRINSIC_PRAGMA),
+        Struct(..) => match pragma {
+            INTRINSIC_PRAGMA | BV_PARAM_PROP => true,
+            _ if INTRINSIC_TYPE_MAP_ASSOC_FUNCTIONS.contains_key(pragma) => bag
+                .get(&symbols.make(INTRINSIC_PRAGMA))
+                .map(|v| match v {
+                    PropertyValue::Symbol(s) => symbols.string(*s).as_str() == INTRINSIC_TYPE_MAP,
+                    _ => false,
+                })
+                .unwrap_or(false),
+            // all other cases
+            _ => false,
+        },
         _ => false,
     }
 }
@@ -159,6 +289,16 @@ pub const CONDITION_CHECK_ABORT_CODES_PROP: &str = "check";
 /// enabled disabled by the disable_invariant_in_body pragma
 pub const CONDITION_SUSPENDABLE_PROP: &str = "suspendable";
 
+/// A pragama defined in the spec block of a function or a struct
+/// to explicitly specify which argument or field will be translated into a bv type in the boogie file
+/// example: bv=b"0,1"
+pub const BV_PARAM_PROP: &str = "bv";
+
+/// A pragama defined in the spec block of a function
+/// to explicitly specify which return value will be translated into a bv type in the boogie file
+/// example: bv_ret=b"0,1"
+pub const BV_RET_PROP: &str = "bv_ret";
+
 /// A function which determines whether a property is valid for a given condition kind.
 pub fn is_property_valid_for_condition(kind: &ConditionKind, prop: &str) -> bool {
     if matches!(
diff --git a/language/move-model/src/simplifier/pass_inline.rs b/language/move-model/src/simplifier/pass_inline.rs
index f3a783b92a..7ee35501c4 100644
--- a/language/move-model/src/simplifier/pass_inline.rs
+++ b/language/move-model/src/simplifier/pass_inline.rs
@@ -163,8 +163,7 @@ impl ExpInliner<'_> {
                     if has_choice {
                         Err(e)
                     } else {
-                        let mut callee_local_vars =
-                            local_var_repl.cloned().unwrap_or_else(BTreeMap::new);
+                        let mut callee_local_vars = local_var_repl.cloned().unwrap_or_default();
                         for (arg_exp, (sym, _)) in args
                             .iter()
                             .map(|e| self.inline_exp(e, temp_var_repl, local_var_repl))
@@ -185,8 +184,7 @@ impl ExpInliner<'_> {
             ExpData::Invoke(_, lambda, args) => match lambda.as_ref() {
                 ExpData::Lambda(_, locals, body) => {
                     debug_assert_eq!(args.len(), locals.len());
-                    let mut lambda_local_vars =
-                        local_var_repl.cloned().unwrap_or_else(BTreeMap::new);
+                    let mut lambda_local_vars = local_var_repl.cloned().unwrap_or_default();
                     for (arg_exp, decl) in args
                         .iter()
                         .map(|e| self.inline_exp(e, temp_var_repl, local_var_repl))
@@ -199,7 +197,7 @@ impl ExpInliner<'_> {
                 _ => Err(e),
             },
             ExpData::Lambda(node_id, locals, body) => {
-                let mut lambda_local_vars = local_var_repl.cloned().unwrap_or_else(BTreeMap::new);
+                let mut lambda_local_vars = local_var_repl.cloned().unwrap_or_default();
                 for decl in locals {
                     lambda_local_vars
                         .insert(decl.name, ExpData::LocalVar(decl.id, decl.name).into_exp());
@@ -210,7 +208,7 @@ impl ExpInliner<'_> {
             }
             ExpData::Quant(node_id, kind, ranges, triggers, constraint, body) => {
                 let mut new_ranges = vec![];
-                let mut quant_local_vars = local_var_repl.cloned().unwrap_or_else(BTreeMap::new);
+                let mut quant_local_vars = local_var_repl.cloned().unwrap_or_default();
                 for (decl, range) in ranges {
                     debug_assert!(decl.binding.is_none());
                     new_ranges.push((
@@ -245,7 +243,7 @@ impl ExpInliner<'_> {
                 .into_exp())
             }
             ExpData::Block(_, var_decls, body) => {
-                let mut block_local_vars = local_var_repl.cloned().unwrap_or_else(BTreeMap::new);
+                let mut block_local_vars = local_var_repl.cloned().unwrap_or_default();
                 for var_decl in var_decls {
                     let var_exp = self.inline_exp(
                         var_decl.binding.as_ref().unwrap(),
diff --git a/language/move-model/src/spec_translator.rs b/language/move-model/src/spec_translator.rs
index 5d5672fc34..a0295d4ad8 100644
--- a/language/move-model/src/spec_translator.rs
+++ b/language/move-model/src/spec_translator.rs
@@ -117,8 +117,7 @@ impl TranslatedSpec {
                 .chain(
                     self.aborts_with
                         .iter()
-                        .map(|(_, codes)| codes.iter())
-                        .flatten()
+                        .flat_map(|(_, codes)| codes.iter())
                         .map(|c| eq_code(c)),
                 ),
         )
@@ -147,7 +146,7 @@ impl TranslatedSpec {
         let mut result = vec![];
         for i in 0..self.emits.len() {
             let loc = self.emits[i].0.clone();
-            let es = self.build_event_store(
+            let es = Self::build_event_store(
                 builder,
                 builder.mk_call(&es_ty, Operation::EmptyEventStore, vec![]),
                 &self.emits[0..i + 1],
@@ -162,7 +161,7 @@ impl TranslatedSpec {
 
     pub fn emits_completeness_condition<'a, T: ExpGenerator<'a>>(&self, builder: &T) -> Exp {
         let es_ty = Type::Primitive(PrimitiveType::EventStore);
-        let es = self.build_event_store(
+        let es = Self::build_event_store(
             builder,
             builder.mk_call(&es_ty, Operation::EmptyEventStore, vec![]),
             &self.emits,
@@ -171,7 +170,6 @@ impl TranslatedSpec {
     }
 
     fn build_event_store<'a, T: ExpGenerator<'a>>(
-        &self,
         builder: &T,
         es: Exp,
         emits: &[(Loc, Exp, Exp, Option<Exp>)],
@@ -186,7 +184,7 @@ impl TranslatedSpec {
             }
             let es_ty = Type::Primitive(PrimitiveType::EventStore);
             let extend_exp = builder.mk_call(&es_ty, Operation::ExtendEventStore, args);
-            self.build_event_store(builder, extend_exp, &emits[1..])
+            Self::build_event_store(builder, extend_exp, &emits[1..])
         }
     }
 }
@@ -283,6 +281,24 @@ impl<'a, 'b, T: ExpGenerator<'a>> SpecTranslator<'a, 'b, T> {
             let_locals: Default::default(),
             in_old: false,
         };
+
+        // Handle updating of global spec variables
+        for impl_spec in translator.fun_env.get_spec().on_impl.values() {
+            for cond in &impl_spec.conditions {
+                if cond.exp == prop.clone() && !cond.additional_exps.is_empty() {
+                    translator.in_post_state = false;
+                    let lhs = translator.translate_exp(
+                        &translator.auto_trace(&cond.loc, &cond.additional_exps[0]),
+                        false,
+                    );
+                    let rhs = translator
+                        .translate_exp(&translator.auto_trace(&cond.loc, &cond.exp), false);
+                    translator.result.updates.push((cond.loc.clone(), lhs, rhs));
+                    return (translator.result, cond.clone().exp);
+                }
+            }
+        }
+
         let exp = translator.translate_exp(&translator.auto_trace(loc, prop), false);
         (translator.result, exp)
     }
diff --git a/language/move-model/src/ty.rs b/language/move-model/src/ty.rs
index 5b40d558a0..c460ac906d 100644
--- a/language/move-model/src/ty.rs
+++ b/language/move-model/src/ty.rs
@@ -4,20 +4,19 @@
 
 //! Contains types and related functions.
 
-use crate::{
-    ast::QualifiedSymbol,
-    model::{GlobalEnv, ModuleId, StructEnv, StructId},
-    symbol::{Symbol, SymbolPool},
+use std::{
+    collections::{BTreeMap, BTreeSet, VecDeque},
+    fmt,
+    fmt::Formatter,
 };
 
 use move_binary_format::{file_format::TypeParameterIndex, normalized::Type as MType};
 use move_core_types::language_storage::{StructTag, TypeTag};
 
-use crate::model::QualifiedInstId;
-use std::{
-    collections::{BTreeMap, BTreeSet, VecDeque},
-    fmt,
-    fmt::Formatter,
+use crate::{
+    ast::QualifiedSymbol,
+    model::{GlobalEnv, ModuleId, QualifiedInstId, StructEnv, StructId},
+    symbol::{Symbol, SymbolPool},
 };
 
 /// Represents a type.
@@ -50,8 +49,11 @@ pub const NUM_TYPE: Type = Type::Primitive(PrimitiveType::Num);
 pub enum PrimitiveType {
     Bool,
     U8,
+    U16,
+    U32,
     U64,
     U128,
+    U256,
     Address,
     Signer,
     // Types only appearing in specifications
@@ -78,7 +80,7 @@ impl PrimitiveType {
     pub fn is_spec(&self) -> bool {
         use PrimitiveType::*;
         match self {
-            Bool | U8 | U64 | U128 | Address | Signer => false,
+            Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address | Signer => false,
             Num | Range | EventStore => true,
         }
     }
@@ -89,8 +91,11 @@ impl PrimitiveType {
         Some(match self {
             Bool => MType::Bool,
             U8 => MType::U8,
+            U16 => MType::U16,
+            U32 => MType::U32,
             U64 => MType::U64,
             U128 => MType::U128,
+            U256 => MType::U256,
             Address => MType::Address,
             Signer => MType::Signer,
             Num | Range | EventStore => return None,
@@ -170,8 +175,11 @@ impl Type {
     pub fn is_number(&self) -> bool {
         if let Type::Primitive(p) = self {
             if let PrimitiveType::U8
+            | PrimitiveType::U16
+            | PrimitiveType::U32
             | PrimitiveType::U64
             | PrimitiveType::U128
+            | PrimitiveType::U256
             | PrimitiveType::Num = p
             {
                 return true;
@@ -197,10 +205,29 @@ impl Type {
         matches!(self, Type::Primitive(PrimitiveType::Signer))
     }
 
+    /// Test whether this type can be used to substitute a type parameter
+    pub fn can_be_type_argument(&self) -> bool {
+        match self {
+            Type::Primitive(p) => !p.is_spec(),
+            Type::Tuple(..) => false,
+            Type::Vector(e) => e.can_be_type_argument(),
+            Type::Struct(_, _, insts) => insts.iter().all(|e| e.can_be_type_argument()),
+            Type::TypeParameter(..) => true,
+            // references cannot be a type argument
+            Type::Reference(..) => false,
+            // spec types cannot be a type argument
+            Type::Fun(..)
+            | Type::TypeDomain(..)
+            | Type::ResourceDomain(..)
+            | Type::Var(..)
+            | Type::Error => false,
+        }
+    }
+
     /// Skip reference type.
     pub fn skip_reference(&self) -> &Type {
         if let Type::Reference(_, bt) = self {
-            &*bt
+            bt
         } else {
             self
         }
@@ -404,10 +431,16 @@ impl Type {
                 env.get_struct_type(mid, sid, &ts),
             Vector(et) => Some(MType::Vector(
                 Box::new(et.into_normalized_type(env)
-                    .expect("Invariant violation: vector type argument contains incomplete, tuple, reference, or spec type"))
+                    .expect("Invariant violation: vector type argument contains incomplete, tuple, or spec type"))
             )),
+            Reference(r, t) =>
+                if r {
+                    Some(MType::MutableReference(Box::new(t.into_normalized_type(env).expect("Invariant violation: reference type contains incomplete, tuple, or spec type"))))
+                } else {
+                    Some(MType::Reference(Box::new(t.into_normalized_type(env).expect("Invariant violation: reference type contains incomplete, tuple, or spec type"))))
+                }
             TypeParameter(idx) => Some(MType::TypeParameter(idx as u16)),
-            Tuple(..) | Error | Fun(..) | TypeDomain(..) | ResourceDomain(..) | Var(..) | Reference(..) =>
+            Tuple(..) | Error | Fun(..) | TypeDomain(..) | ResourceDomain(..) | Var(..) =>
                 None
         }
     }
@@ -428,8 +461,11 @@ impl Type {
         match t {
             TypeTag::Bool => Primitive(PrimitiveType::Bool),
             TypeTag::U8 => Primitive(PrimitiveType::U8),
+            TypeTag::U16 => Primitive(PrimitiveType::U8),
+            TypeTag::U32 => Primitive(PrimitiveType::U8),
             TypeTag::U64 => Primitive(PrimitiveType::U64),
             TypeTag::U128 => Primitive(PrimitiveType::U128),
+            TypeTag::U256 => Primitive(PrimitiveType::U8),
             TypeTag::Address => Primitive(PrimitiveType::Address),
             TypeTag::Signer => Primitive(PrimitiveType::Signer),
             TypeTag::Struct(s) => {
@@ -636,7 +672,7 @@ impl Substitution {
             (Type::Fun(ts1, r1), Type::Fun(ts2, r2)) => {
                 return Ok(Type::Fun(
                     self.unify_vec(sub_variance, ts1, ts2, "functions")?,
-                    Box::new(self.unify(sub_variance, &*r1, &*r2)?),
+                    Box::new(self.unify(sub_variance, r1, r2)?),
                 ));
             }
             (Type::Struct(m1, s1, ts1), Type::Struct(m2, s2, ts2)) => {
@@ -649,17 +685,13 @@ impl Substitution {
                 }
             }
             (Type::Vector(e1), Type::Vector(e2)) => {
-                return Ok(Type::Vector(Box::new(self.unify(
-                    sub_variance,
-                    &*e1,
-                    &*e2,
-                )?)));
+                return Ok(Type::Vector(Box::new(self.unify(sub_variance, e1, e2)?)));
             }
             (Type::TypeDomain(e1), Type::TypeDomain(e2)) => {
                 return Ok(Type::TypeDomain(Box::new(self.unify(
                     sub_variance,
-                    &*e1,
-                    &*e2,
+                    e1,
+                    e2,
                 )?)));
             }
             _ => {}
@@ -863,8 +895,8 @@ impl TypeUnificationAdapter {
         Self::new(
             std::iter::once(lhs_type),
             std::iter::once(rhs_type),
-            treat_lhs_type_param_as_var.then(|| 0),
-            treat_rhs_type_param_as_var.then(|| 0),
+            treat_lhs_type_param_as_var.then_some(0),
+            treat_rhs_type_param_as_var.then_some(0),
         )
     }
 
@@ -881,8 +913,8 @@ impl TypeUnificationAdapter {
         Self::new(
             lhs_types.iter(),
             rhs_types.iter(),
-            treat_lhs_type_param_as_var.then(|| 0),
-            treat_rhs_type_param_as_var.then(|| 0),
+            treat_lhs_type_param_as_var.then_some(0),
+            treat_rhs_type_param_as_var.then_some(0),
         )
     }
 
@@ -986,9 +1018,9 @@ impl TypeInstantiationDerivation {
     ) -> BTreeSet<Type> {
         // progressively increase the boundary
         let treat_lhs_type_param_as_var_after_index =
-            treat_lhs_type_param_as_var.then(|| if target_lhs { target_param_index } else { 0 });
+            treat_lhs_type_param_as_var.then_some(if target_lhs { target_param_index } else { 0 });
         let treat_rhs_type_param_as_var_after_index =
-            treat_rhs_type_param_as_var.then(|| if target_lhs { 0 } else { target_param_index });
+            treat_rhs_type_param_as_var.then_some(if target_lhs { 0 } else { target_param_index });
 
         let mut target_param_insts = BTreeSet::new();
         for t_lhs in lhs_types {
@@ -1267,8 +1299,11 @@ impl fmt::Display for PrimitiveType {
         match self {
             Bool => f.write_str("bool"),
             U8 => f.write_str("u8"),
+            U16 => f.write_str("u16"),
+            U32 => f.write_str("u32"),
             U64 => f.write_str("u64"),
             U128 => f.write_str("u128"),
+            U256 => f.write_str("u256"),
             Address => f.write_str("address"),
             Signer => f.write_str("signer"),
             Range => f.write_str("range"),
diff --git a/language/move-model/src/well_known.rs b/language/move-model/src/well_known.rs
index 4f39190516..609c974249 100644
--- a/language/move-model/src/well_known.rs
+++ b/language/move-model/src/well_known.rs
@@ -8,6 +8,18 @@
 //! declarations. It can be extended on the go.
 
 pub const VECTOR_BORROW_MUT: &str = "vector::borrow_mut";
-pub const TABLE_BORROW_MUT: &str = "Table::borrow_mut";
 pub const EVENT_EMIT_EVENT: &str = "event::emit_event";
-pub const TABLE_TABLE: &str = "Table::Table";
+
+pub const TYPE_NAME_MOVE: &str = "type_info::type_name";
+pub const TYPE_NAME_SPEC: &str = "type_info::$type_name";
+pub const TYPE_INFO_MOVE: &str = "type_info::type_of";
+pub const TYPE_INFO_SPEC: &str = "type_info::$type_of";
+pub const TYPE_SPEC_IS_STRUCT: &str = "type_info::spec_is_struct";
+
+pub const TYPE_NAME_GET_MOVE: &str = "type_name::get";
+pub const TYPE_NAME_GET_SPEC: &str = "type_name::$get";
+
+// NOTE: `type_info::type_name` and `type_name::get` are very similar.
+// The main difference (from a prover's perspective) include:
+// - formatting of an address (part of the struct name), and
+// - whether it is in `stdlib` or `extlib`.
diff --git a/language/move-model/tests/sources/expressions_err.exp b/language/move-model/tests/sources/expressions_err.exp
index c9a0eb6699..4209d49f36 100644
--- a/language/move-model/tests/sources/expressions_err.exp
+++ b/language/move-model/tests/sources/expressions_err.exp
@@ -36,7 +36,7 @@ error: no matching declaration of `M::wrongly_typed_callee`
 37 │     fun wrongly_typed_caller(): num { wrongly_typed_callee(1, 1) }
    │                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^
    │
-   = outruled candidate `M::wrongly_typed_callee(num, bool): num` (expected `bool` but found `u128` for argument 2)
+   = outruled candidate `M::wrongly_typed_callee(num, bool): num` (expected `bool` but found `u256` for argument 2)
 
 error: expected `num` but found `bool` in expression
    ┌─ tests/sources/expressions_err.move:41:80
diff --git a/language/move-model/tests/sources/if_else_ok.exp b/language/move-model/tests/sources/if_else_ok.exp
new file mode 100644
index 0000000000..fd4dd9dc61
--- /dev/null
+++ b/language/move-model/tests/sources/if_else_ok.exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/language/move-model/tests/sources/if_else_ok.move b/language/move-model/tests/sources/if_else_ok.move
new file mode 100644
index 0000000000..2f1b521cb6
--- /dev/null
+++ b/language/move-model/tests/sources/if_else_ok.move
@@ -0,0 +1,23 @@
+module 0x42::Test {
+    fun foo(cond: bool) {
+        // NOTE: `foo` will not be treated as a pure function because in
+        // move-model, the only thing allowed in an exp block is let-bindings
+        // (except for the last expression). This will cause the type unifier
+        // to treat the `addr` to have a type which is the same as the `dummy()`
+        // function call return type. This is clearly an erroneous state, but is
+        // okay because we have previously marked the spec fucntion translation
+        // as failure and subsequent errors can be ignored.
+        let addr = if (cond) {
+            dummy(0);
+            @0x1
+        } else {
+            dummy(42);
+            @0x2
+        };
+        bar(addr);
+    }
+
+    fun bar(_addr: address) {}
+
+    fun dummy(val: u8): u8 { val }
+}
diff --git a/language/move-model/tests/sources/intrinsic_decl_err.exp b/language/move-model/tests/sources/intrinsic_decl_err.exp
new file mode 100644
index 0000000000..0f13ded20f
--- /dev/null
+++ b/language/move-model/tests/sources/intrinsic_decl_err.exp
@@ -0,0 +1,69 @@
+error: expect a boolean value or a valid intrinsic type
+   ┌─ tests/sources/intrinsic_decl_err.move:16:9
+   │
+16 │         pragma intrinsic = 0x42::M::MyTable;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: unknown intrinsic type: no_such_map
+   ┌─ tests/sources/intrinsic_decl_err.move:19:9
+   │
+19 │         pragma intrinsic = no_such_map;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: property `map_no_such_fun` is not valid in this context
+   ┌─ tests/sources/intrinsic_decl_err.move:22:9
+   │
+22 │ ╭         pragma intrinsic = map,
+23 │ │             map_no_such_fun = new;
+   │ ╰──────────────────────────────────^
+
+error: invalid intrinsic function mapping: map_len
+   ┌─ tests/sources/intrinsic_decl_err.move:26:9
+   │
+26 │ ╭         pragma intrinsic = map,
+27 │ │             map_len = true;
+   │ ╰───────────────────────────^
+
+error: an intrinsic function mapping can only refer to functions declared in the same module while `signer::address_of` is not
+   ┌─ tests/sources/intrinsic_decl_err.move:30:9
+   │
+30 │ ╭         pragma intrinsic = map,
+31 │ │             map_len = 0x1::signer::address_of;
+   │ ╰──────────────────────────────────────────────^
+
+error: unable to find move function for intrinsic mapping: M::no_such_move_fun
+   ┌─ tests/sources/intrinsic_decl_err.move:34:9
+   │
+34 │ ╭         pragma intrinsic = map,
+35 │ │             map_len = no_such_move_fun;
+   │ ╰───────────────────────────────────────^
+
+error: unable to find spec function for intrinsic mapping: M::no_such_spec_fun
+   ┌─ tests/sources/intrinsic_decl_err.move:38:9
+   │
+38 │ ╭         pragma intrinsic = map,
+39 │ │             map_spec_len = no_such_spec_fun;
+   │ ╰────────────────────────────────────────────^
+
+error: unable to find move function for intrinsic mapping: M::spec_len
+   ┌─ tests/sources/intrinsic_decl_err.move:42:9
+   │
+42 │ ╭         pragma intrinsic = map,
+43 │ │             map_len = spec_len;
+   │ ╰───────────────────────────────^
+
+error: duplicated intrinsic mapping for move function: M::length
+   ┌─ tests/sources/intrinsic_decl_err.move:46:9
+   │
+46 │ ╭         pragma intrinsic = map,
+47 │ │             map_len = length,
+48 │ │             map_borrow_mut = length;
+   │ ╰────────────────────────────────────^
+
+error: duplicated intrinsic mapping for spec function: M::spec_len
+   ┌─ tests/sources/intrinsic_decl_err.move:51:9
+   │
+51 │ ╭         pragma intrinsic = map,
+52 │ │             map_spec_len = spec_len,
+53 │ │             map_spec_set = spec_len;
+   │ ╰────────────────────────────────────^
diff --git a/language/move-model/tests/sources/intrinsic_decl_err.move b/language/move-model/tests/sources/intrinsic_decl_err.move
new file mode 100644
index 0000000000..f93cc00647
--- /dev/null
+++ b/language/move-model/tests/sources/intrinsic_decl_err.move
@@ -0,0 +1,55 @@
+module 0x42::M {
+    struct MyTable<phantom K, phantom V> {}
+    struct MyTable1<phantom K, phantom V> {}
+
+    native fun new<K, V>(): MyTable1<K, V>;
+    native fun destroy_empty<K, V>(t: MyTable1<K, V>);
+    native fun borrow_mut<K, V>(t: &mut MyTable1<K, V>, k: K): &mut V;
+    native fun length<K, V>(t: &MyTable1<K, V>): u64;
+
+    spec native fun spec_len<K, V>(t: MyTable1<K, V>): num;
+    spec native fun spec_set<K, V>(t: MyTable1<K, V>, k: K, v: V): MyTable1<K, V>;
+    spec native fun spec_get<K, V>(t: MyTable1<K, V>, k: K): V;
+
+    spec MyTable1 {
+        // expect failure
+        pragma intrinsic = 0x42::M::MyTable;
+
+        // expect failure
+        pragma intrinsic = no_such_map;
+
+        // expect failure
+        pragma intrinsic = map,
+            map_no_such_fun = new;
+
+        // expect failure
+        pragma intrinsic = map,
+            map_len = true;
+
+        // expect failure
+        pragma intrinsic = map,
+            map_len = 0x1::signer::address_of;
+
+        // expect failure
+        pragma intrinsic = map,
+            map_len = no_such_move_fun;
+
+        // expect failure
+        pragma intrinsic = map,
+            map_spec_len = no_such_spec_fun;
+
+        // expect failure
+        pragma intrinsic = map,
+            map_len = spec_len;
+
+        // expect failure
+        pragma intrinsic = map,
+            map_len = length,
+            map_borrow_mut = length;
+
+        // expect failure
+        pragma intrinsic = map,
+            map_spec_len = spec_len,
+            map_spec_set = spec_len;
+    }
+}
diff --git a/language/move-model/tests/sources/intrinsic_decl_ok.exp b/language/move-model/tests/sources/intrinsic_decl_ok.exp
new file mode 100644
index 0000000000..fd4dd9dc61
--- /dev/null
+++ b/language/move-model/tests/sources/intrinsic_decl_ok.exp
@@ -0,0 +1 @@
+All good, no errors!
diff --git a/language/move-model/tests/sources/intrinsic_decl_ok.move b/language/move-model/tests/sources/intrinsic_decl_ok.move
new file mode 100644
index 0000000000..98cd520dfb
--- /dev/null
+++ b/language/move-model/tests/sources/intrinsic_decl_ok.move
@@ -0,0 +1,45 @@
+module 0x42::M {
+    struct MyTable1<phantom K, phantom V> {}
+
+    native fun new<K, V>(): MyTable1<K, V>;
+    native fun destroy_empty<K, V>(t: MyTable1<K, V>);
+    native fun borrow_mut<K, V>(t: &mut MyTable1<K, V>, k: K): &mut V;
+    native fun length<K, V>(t: &MyTable1<K, V>): u64;
+
+    spec native fun spec_len<K, V>(t: MyTable1<K, V>): num;
+    spec native fun spec_set<K, V>(t: MyTable1<K, V>, k: K, v: V): MyTable1<K, V>;
+    spec native fun spec_get<K, V>(t: MyTable1<K, V>, k: K): V;
+
+    spec MyTable1 {
+        pragma intrinsic = map,
+            map_new = new,
+            map_destroy_empty = destroy_empty,
+            map_borrow_mut = borrow_mut,
+            map_len = length,
+            map_spec_len = spec_len,
+            map_spec_get = spec_get,
+            map_spec_set = spec_set;
+    }
+
+    struct MyTable2<phantom K, phantom V> {}
+
+    native fun new2<K, V>(): MyTable2<K, V>;
+    native fun contains<K, V>(t: &MyTable2<K, V>, k: K): bool;
+    native fun borrow<K, V>(t: &MyTable2<K, V>, k: K): &V;
+    native fun remove<K, V>(t: &mut MyTable2<K, V>, k: K): V;
+
+    spec native fun spec_len2<K, V>(t: MyTable2<K, V>): num;
+    spec native fun spec_del<K, V>(t: MyTable2<K, V>): num;
+    spec native fun spec_has_key<K, V>(t: MyTable2<K, V>, k: K): bool;
+
+    spec MyTable2 {
+        pragma intrinsic = map,
+            map_new = new2,
+            map_has_key = contains,
+            map_borrow = borrow,
+            map_del_must_exist = remove,
+            map_spec_len = spec_len2,
+            map_spec_del = spec_del,
+            map_spec_has_key = spec_has_key;
+    }
+}
diff --git a/language/move-model/tests/sources/pragmas_err.exp b/language/move-model/tests/sources/pragmas_err.exp
index 8fc16ed59a..735032376e 100644
--- a/language/move-model/tests/sources/pragmas_err.exp
+++ b/language/move-model/tests/sources/pragmas_err.exp
@@ -3,3 +3,9 @@ error: property `bar` is not valid in this context
   │
 7 │         pragma bar = true;
   │         ^^^^^^^^^^^^^^^^^^
+
+error: property `verify` specified more than once in the same pragma declaration
+   ┌─ tests/sources/pragmas_err.move:19:24
+   │
+19 │         pragma verify, verify;
+   │                        ^^^^^^
diff --git a/language/move-model/tests/sources/pragmas_err.move b/language/move-model/tests/sources/pragmas_err.move
index e5cca40bd9..c69dc00e1a 100644
--- a/language/move-model/tests/sources/pragmas_err.move
+++ b/language/move-model/tests/sources/pragmas_err.move
@@ -15,6 +15,9 @@ module 0x42::M {
         // Should be ok (we do not check types of values)
         pragma verify = Self::a_valid_id;
 
+        // Should produce an error that the same property is defined twice on the same line
+        pragma verify, verify;
+
         // The below produces an error from move_compiler because the relative module name cannot be resolved.
         // We leave it here for illustration.
         // pragma verify = M::a_valid_id;
diff --git a/language/move-model/tests/sources/schemas_err.exp b/language/move-model/tests/sources/schemas_err.exp
index 210b5380ca..a8fa744bd1 100644
--- a/language/move-model/tests/sources/schemas_err.exp
+++ b/language/move-model/tests/sources/schemas_err.exp
@@ -52,7 +52,7 @@ error: cyclic schema dependency: Cycle1 -> Cycle2 -> Cycle3 -> Cycle1
 80 │         include Cycle1;
    │                 ^^^^^^
 
-error: expected `bool` but found `u128` in expression
+error: expected `bool` but found `u256` in expression
    ┌─ tests/sources/schemas_err.move:84:17
    │
 84 │         include 22 ==> Condition;
diff --git a/language/move-prover/Cargo.toml b/language/move-prover/Cargo.toml
index d527848363..2ae6e48cc9 100644
--- a/language/move-prover/Cargo.toml
+++ b/language/move-prover/Cargo.toml
@@ -3,7 +3,7 @@ name = "move-prover"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
@@ -38,7 +38,7 @@ serde = { version = "1.0.124", features = ["derive"] }
 serde_json = "1.0.64"
 simplelog = "0.9.0"
 once_cell = "1.7.2"
-tokio = { version = "1.8.1", features = ["full"] }
+tokio = { version = "1.18.2", features = ["full"] }
 toml = "0.5.8"
 
 [dev-dependencies]
diff --git a/language/move-prover/boogie-backend/Cargo.toml b/language/move-prover/boogie-backend/Cargo.toml
index 96b571961e..03eb00e766 100644
--- a/language/move-prover/boogie-backend/Cargo.toml
+++ b/language/move-prover/boogie-backend/Cargo.toml
@@ -5,12 +5,13 @@ authors = ["Diem Association <opensource@diem.com>"]
 description = "Move prover Boogie backend"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 async-trait = "0.1.42"
 move-stackless-bytecode = { path = "../bytecode" }
 move-command-line-common = { path = "../../move-command-line-common" }
+move-compiler = { path = "../../move-compiler" }
 move-model = { path = "../../move-model" }
 move-binary-format = { path = "../../move-binary-format" }
 num = "0.4.0"
@@ -22,10 +23,10 @@ serde_json = "1.0.64"
 anyhow = "1.0.52"
 once_cell = "1.7.2"
 pretty = "0.10.0"
-regex = "1.4.3"
+regex = "1.5.5"
 rand = "0.8.3"
 futures = "0.3.12"
-tera = "1.7.1"
-tokio = { version = "1.8.1", features = ["full"] }
+tera = "1.16.0"
+tokio = { version = "1.18.2", features = ["full"] }
 codespan = "0.11.1"
 codespan-reporting = "0.11.1"
diff --git a/language/move-prover/boogie-backend/src/boogie_helpers.rs b/language/move-prover/boogie-backend/src/boogie_helpers.rs
index 9d89add337..b1d1e255e2 100644
--- a/language/move-prover/boogie-backend/src/boogie_helpers.rs
+++ b/language/move-prover/boogie-backend/src/boogie_helpers.rs
@@ -4,19 +4,25 @@
 
 //! Helpers for emitting Boogie code.
 
-use crate::options::BoogieOptions;
+// TODO(tengzhang): helpers specifically for bv types need to be refactored
+
 use itertools::Itertools;
+use num::BigUint;
+
+use move_binary_format::file_format::TypeParameterIndex;
 use move_model::{
-    ast::{MemoryLabel, TempIndex},
+    ast::{MemoryLabel, TempIndex, Value},
     model::{
         FieldEnv, FunctionEnv, GlobalEnv, ModuleEnv, QualifiedInstId, SpecFunId, StructEnv,
         StructId, SCRIPT_MODULE_NAME,
     },
+    pragmas::INTRINSIC_TYPE_MAP,
     symbol::Symbol,
     ty::{PrimitiveType, Type},
-    well_known::TABLE_TABLE,
 };
-use move_stackless_bytecode::function_target::FunctionTarget;
+use move_stackless_bytecode::{function_target::FunctionTarget, stackless_bytecode::Constant};
+
+use crate::options::BoogieOptions;
 
 pub const MAX_MAKE_VEC_ARGS: usize = 4;
 
@@ -35,12 +41,17 @@ pub fn boogie_module_name(env: &ModuleEnv<'_>) -> String {
 
 /// Return boogie name of given structure.
 pub fn boogie_struct_name(struct_env: &StructEnv<'_>, inst: &[Type]) -> String {
-    if struct_env.is_well_known(TABLE_TABLE) {
+    boogie_struct_name_bv(struct_env, inst, false)
+}
+
+pub fn boogie_struct_name_bv(struct_env: &StructEnv<'_>, inst: &[Type], bv_flag: bool) -> String {
+    if struct_env.is_intrinsic_of(INTRINSIC_TYPE_MAP) {
         // Map to the theory type representation, which is `Table int V`. The key
         // is encoded as an integer to avoid extensionality problems, and to support
         // $Mutation paths, which are sequences of ints.
         let env = struct_env.module_env.env;
-        format!("Table int ({})", boogie_type(env, &inst[1]))
+        let type_fun = if bv_flag { boogie_bv_type } else { boogie_type };
+        format!("Table int ({})", type_fun(env, &inst[1]))
     } else {
         format!(
             "${}_{}{}",
@@ -64,7 +75,7 @@ pub fn boogie_field_sel(field_env: &FieldEnv<'_>, inst: &[Type]) -> String {
 /// Return field selector for given field.
 pub fn boogie_field_update(field_env: &FieldEnv<'_>, inst: &[Type]) -> String {
     let struct_env = &field_env.struct_env;
-    let suffix = boogie_type_suffix_for_struct(struct_env, inst);
+    let suffix = boogie_type_suffix_for_struct(struct_env, inst, false);
     format!(
         "$Update'{}'_{}",
         suffix,
@@ -82,6 +93,21 @@ pub fn boogie_function_name(fun_env: &FunctionEnv<'_>, inst: &[Type]) -> String
     )
 }
 
+/// Return boogie name of given function
+/// Currently bv_flag is used when generating vector functions
+pub fn boogie_function_bv_name(
+    fun_env: &FunctionEnv<'_>,
+    inst: &[Type],
+    bv_flag: &[bool],
+) -> String {
+    format!(
+        "${}_{}{}",
+        boogie_module_name(&fun_env.module_env),
+        fun_env.get_name().display(fun_env.symbol_pool()),
+        boogie_inst_suffix_bv(fun_env.module_env.env, inst, bv_flag)
+    )
+}
+
 /// Return boogie name of given spec var.
 pub fn boogie_spec_var_name(
     module_env: &ModuleEnv<'_>,
@@ -99,7 +125,12 @@ pub fn boogie_spec_var_name(
 }
 
 /// Return boogie name of given spec function.
-pub fn boogie_spec_fun_name(env: &ModuleEnv<'_>, id: SpecFunId, inst: &[Type]) -> String {
+pub fn boogie_spec_fun_name(
+    env: &ModuleEnv<'_>,
+    id: SpecFunId,
+    inst: &[Type],
+    bv_flag: bool,
+) -> String {
     let decl = env.get_spec_fun(id);
     let pos = env
         .get_spec_funs_of_name(decl.name)
@@ -110,12 +141,17 @@ pub fn boogie_spec_fun_name(env: &ModuleEnv<'_>, id: SpecFunId, inst: &[Type]) -
     } else {
         "".to_string()
     };
+    let mut suffix = boogie_inst_suffix_bv(env.env, inst, &[bv_flag]);
+    if env.is_table() {
+        assert_eq!(inst.len(), 2);
+        suffix = boogie_inst_suffix_bv_pair(env.env, inst, &[false, bv_flag]);
+    };
     format!(
         "${}_{}{}{}",
         boogie_module_name(env),
         decl.name.display(env.symbol_pool()),
         overload_qualifier,
-        boogie_inst_suffix(env.env, inst)
+        suffix
     )
 }
 
@@ -184,10 +220,10 @@ pub fn boogie_type(env: &GlobalEnv, ty: &Type) -> String {
     use Type::*;
     match ty {
         Primitive(p) => match p {
-            U8 | U64 | U128 | Num | Address => "int".to_string(),
+            U8 | U16 | U32 | U64 | U128 | U256 | Num | Address => "int".to_string(),
             Signer => "$signer".to_string(),
             Bool => "bool".to_string(),
-            _ => panic!("unexpected type"),
+            Range | EventStore => panic!("unexpected type"),
         },
         Vector(et) => format!("Vec ({})", boogie_type(env, et)),
         Struct(mid, sid, inst) => boogie_struct_name(&env.get_module(*mid).into_struct(*sid), inst),
@@ -199,37 +235,118 @@ pub fn boogie_type(env: &GlobalEnv, ty: &Type) -> String {
     }
 }
 
+/// Return boogie type for a local with given signature token.
+/// TODO(tengzhang): combine with boogie_type later
+pub fn boogie_bv_type(env: &GlobalEnv, ty: &Type) -> String {
+    use PrimitiveType::*;
+    use Type::*;
+    match ty {
+        Primitive(p) => match p {
+            U8 => "bv8".to_string(),
+            U16 => "bv16".to_string(),
+            U32 => "bv32".to_string(),
+            U64 => "bv64".to_string(),
+            U128 => "bv128".to_string(),
+            U256 => "bv256".to_string(),
+            Address => "int".to_string(),
+            Signer => "$signer".to_string(),
+            Bool => "bool".to_string(),
+            Range | EventStore => panic!("unexpected type"),
+            Num => "<<num is not unsupported here>>".to_string(),
+        },
+        Vector(et) => format!("Vec ({})", boogie_bv_type(env, et)),
+        Struct(mid, sid, inst) => {
+            boogie_struct_name_bv(&env.get_module(*mid).into_struct(*sid), inst, true)
+        }
+        Reference(_, bt) => format!("$Mutation ({})", boogie_bv_type(env, bt)),
+        TypeParameter(idx) => boogie_type_param(env, *idx),
+        Fun(..) | Tuple(..) | TypeDomain(..) | ResourceDomain(..) | Error | Var(..) => {
+            format!("<<unsupported: {:?}>>", ty)
+        }
+    }
+}
+
 pub fn boogie_type_param(_env: &GlobalEnv, idx: u16) -> String {
     format!("#{}", idx)
 }
 
-pub fn boogie_temp(env: &GlobalEnv, ty: &Type, instance: usize) -> String {
-    boogie_temp_from_suffix(env, &boogie_type_suffix(env, ty), instance)
+pub fn boogie_temp(env: &GlobalEnv, ty: &Type, instance: usize, bv_flag: bool) -> String {
+    boogie_temp_from_suffix(env, &boogie_type_suffix_bv(env, ty, bv_flag), instance)
 }
 
 pub fn boogie_temp_from_suffix(_env: &GlobalEnv, suffix: &str, instance: usize) -> String {
     format!("$temp_{}'{}'", instance, suffix)
 }
 
+/// Generate number literals that may comes with a bv suffix in the boogie code
+pub fn boogie_num_literal(num: &String, base: usize, bv_flag: bool) -> String {
+    if bv_flag {
+        format!("{}bv{}", num, base)
+    } else {
+        num.clone()
+    }
+}
+
+pub fn boogie_num_type_string(num: &str, bv_flag: bool) -> String {
+    let pre = if bv_flag { "bv" } else { "u" };
+    [pre, num].join("")
+}
+
+pub fn boogie_num_type_string_capital(num: &str, bv_flag: bool) -> String {
+    let pre = if bv_flag { "Bv" } else { "U" };
+    [pre, num].join("")
+}
+
+pub fn boogie_num_type_base(ty: &Type) -> String {
+    use PrimitiveType::*;
+    use Type::*;
+    match ty {
+        Primitive(p) => match p {
+            U8 => "8".to_string(),
+            U16 => "16".to_string(),
+            U32 => "32".to_string(),
+            U64 => "64".to_string(),
+            U128 => "128".to_string(),
+            U256 => "256".to_string(),
+            Num => "<<num is not unsupported here>>".to_string(),
+            _ => format!("<<unsupported {:?}>>", ty),
+        },
+        _ => format!("<<unsupported {:?}>>", ty),
+    }
+}
+
 /// Returns the suffix to specialize a name for the given type instance.
-pub fn boogie_type_suffix(env: &GlobalEnv, ty: &Type) -> String {
+pub fn boogie_type_suffix_bv(env: &GlobalEnv, ty: &Type, bv_flag: bool) -> String {
     use PrimitiveType::*;
     use Type::*;
+
     match ty {
         Primitive(p) => match p {
-            U8 => "u8".to_string(),
-            U64 => "u64".to_string(),
-            U128 => "u128".to_string(),
-            Num => "num".to_string(),
+            U8 => boogie_num_type_string("8", bv_flag),
+            U16 => boogie_num_type_string("16", bv_flag),
+            U32 => boogie_num_type_string("32", bv_flag),
+            U64 => boogie_num_type_string("64", bv_flag),
+            U128 => boogie_num_type_string("128", bv_flag),
+            U256 => boogie_num_type_string("256", bv_flag),
+            Num => {
+                if bv_flag {
+                    "<<num is not unsupported here>>".to_string()
+                } else {
+                    "num".to_string()
+                }
+            }
             Address => "address".to_string(),
             Signer => "signer".to_string(),
             Bool => "bool".to_string(),
             Range => "range".to_string(),
-            _ => format!("<<unsupported {:?}>>", ty),
+            EventStore => format!("<<unsupported {:?}>>", ty),
         },
-        Vector(et) => format!("vec{}", boogie_inst_suffix(env, &[et.as_ref().to_owned()])),
+        Vector(et) => format!(
+            "vec{}",
+            boogie_inst_suffix_bv(env, &[et.as_ref().to_owned()], &[bv_flag])
+        ),
         Struct(mid, sid, inst) => {
-            boogie_type_suffix_for_struct(&env.get_module(*mid).into_struct(*sid), inst)
+            boogie_type_suffix_for_struct(&env.get_module(*mid).into_struct(*sid), inst, bv_flag)
         }
         TypeParameter(idx) => boogie_type_param(env, *idx),
         Fun(..) | Tuple(..) | TypeDomain(..) | ResourceDomain(..) | Error | Var(..)
@@ -237,15 +354,63 @@ pub fn boogie_type_suffix(env: &GlobalEnv, ty: &Type) -> String {
     }
 }
 
-pub fn boogie_type_suffix_for_struct(struct_env: &StructEnv<'_>, inst: &[Type]) -> String {
-    let env = struct_env.module_env.env;
-    if struct_env.is_well_known(TABLE_TABLE) {
-        format!("table{}", boogie_inst_suffix(env, inst))
+/// Return the suffix to specialize a name for the given type instance.
+pub fn boogie_type_suffix(env: &GlobalEnv, ty: &Type) -> String {
+    boogie_type_suffix_bv(env, ty, false)
+}
+
+pub fn boogie_type_suffix_for_struct(
+    struct_env: &StructEnv<'_>,
+    inst: &[Type],
+    bv_flag: bool,
+) -> String {
+    if struct_env.is_intrinsic_of(INTRINSIC_TYPE_MAP) {
+        format!(
+            "${}_{}{}",
+            boogie_module_name(&struct_env.module_env),
+            struct_env.get_name().display(struct_env.symbol_pool()),
+            boogie_inst_suffix_bv_pair(struct_env.module_env.env, inst, &[false, bv_flag])
+        )
     } else {
         boogie_struct_name(struct_env, inst)
     }
 }
 
+/// Generate suffix after instantiation of type parameters
+pub fn boogie_inst_suffix_bv(env: &GlobalEnv, inst: &[Type], bv_flag: &[bool]) -> String {
+    if inst.is_empty() {
+        "".to_owned()
+    } else {
+        let suffix = if bv_flag.len() == 1 {
+            inst.iter()
+                .map(|ty| boogie_type_suffix_bv(env, ty, bv_flag[0]))
+                .join("_")
+        } else {
+            assert_eq!(inst.len(), bv_flag.len());
+            inst.iter()
+                .zip(bv_flag.iter())
+                .map(|(ty, flag)| boogie_type_suffix_bv(env, ty, *flag))
+                .join("_")
+        };
+        format!("'{}'", suffix)
+    }
+}
+
+pub fn boogie_inst_suffix_bv_pair(env: &GlobalEnv, inst: &[Type], bv_flag: &[bool]) -> String {
+    if inst.is_empty() {
+        "".to_owned()
+    } else {
+        assert_eq!(inst.len(), bv_flag.len());
+        format!(
+            "'{}'",
+            inst.iter()
+                .zip(bv_flag.iter())
+                .map(|(ty, flag)| boogie_type_suffix_bv(env, ty, *flag))
+                .join("_")
+        )
+    }
+}
+
 pub fn boogie_inst_suffix(env: &GlobalEnv, inst: &[Type]) -> String {
     if inst.is_empty() {
         "".to_owned()
@@ -257,14 +422,26 @@ pub fn boogie_inst_suffix(env: &GlobalEnv, inst: &[Type]) -> String {
     }
 }
 
-pub fn boogie_equality_for_type(env: &GlobalEnv, eq: bool, ty: &Type) -> String {
+pub fn boogie_equality_for_type(env: &GlobalEnv, eq: bool, ty: &Type, bv_flag: bool) -> String {
     format!(
         "{}'{}'",
         if eq { "$IsEqual" } else { "!$IsEqual" },
-        boogie_type_suffix(env, ty)
+        boogie_type_suffix_bv(env, ty, bv_flag)
     )
 }
 
+/// Create boogie well-formed boolean expression
+/// TODO(tengzhang): combine with boogie_well_formed_expr
+pub fn boogie_well_formed_expr_bv(env: &GlobalEnv, name: &str, ty: &Type, bv_flag: bool) -> String {
+    let target = if ty.is_reference() {
+        format!("$Dereference({})", name)
+    } else {
+        name.to_owned()
+    };
+    let suffix = boogie_type_suffix_bv(env, ty.skip_reference(), bv_flag);
+    format!("$IsValid'{}'({})", suffix, target)
+}
+
 /// Create boogie well-formed boolean expression.
 pub fn boogie_well_formed_expr(env: &GlobalEnv, name: &str, ty: &Type) -> String {
     let target = if ty.is_reference() {
@@ -278,8 +455,8 @@ pub fn boogie_well_formed_expr(env: &GlobalEnv, name: &str, ty: &Type) -> String
 
 /// Create boogie well-formed check. The result will be either an empty string or a
 /// newline-terminated assume statement.
-pub fn boogie_well_formed_check(env: &GlobalEnv, name: &str, ty: &Type) -> String {
-    let expr = boogie_well_formed_expr(env, name, ty);
+pub fn boogie_well_formed_check(env: &GlobalEnv, name: &str, ty: &Type, bv_flag: bool) -> String {
+    let expr = boogie_well_formed_expr_bv(env, name, ty, bv_flag);
     if !expr.is_empty() {
         format!("assume {};", expr)
     } else {
@@ -300,23 +477,96 @@ pub fn boogie_declare_global(env: &GlobalEnv, name: &str, ty: &Type) -> String {
     )
 }
 
-pub fn boogie_byte_blob(_options: &BoogieOptions, val: &[u8]) -> String {
+pub fn boogie_byte_blob(_options: &BoogieOptions, val: &[u8], bv_flag: bool) -> String {
+    let val_suffix = if bv_flag { "bv8" } else { "" };
+    let suffix = if bv_flag { "bv8" } else { "u8" };
+    let args = val
+        .iter()
+        .map(|v| format!("{}{}", *v, val_suffix))
+        .collect_vec();
+    if args.is_empty() {
+        format!("$EmptyVec'{}'()", suffix)
+    } else {
+        boogie_make_vec_from_strings(&args)
+    }
+}
+
+pub fn boogie_address_blob(_options: &BoogieOptions, val: &[BigUint]) -> String {
     let args = val.iter().map(|v| format!("{}", *v)).collect_vec();
     if args.is_empty() {
-        "$EmptyVec'u8'()".to_string()
+        "$EmptyVec'address'()".to_string()
+    } else {
+        boogie_make_vec_from_strings(&args)
+    }
+}
+
+/// Generate vectors for constant values
+/// TODO(tengzhang): add support for bv types
+pub fn boogie_constant_blob(_options: &BoogieOptions, val: &[Constant]) -> String {
+    let args = val
+        .iter()
+        .map(|v| boogie_constant(_options, v))
+        .collect_vec();
+    if args.is_empty() {
+        "EmptyVec()".to_string()
+    } else {
+        boogie_make_vec_from_strings(&args)
+    }
+}
+
+pub fn boogie_constant(_options: &BoogieOptions, val: &Constant) -> String {
+    match val {
+        Constant::Bool(true) => "true".to_string(),
+        Constant::Bool(false) => "false".to_string(),
+        Constant::U8(num) => num.to_string(),
+        Constant::U64(num) => num.to_string(),
+        Constant::U128(num) => num.to_string(),
+        Constant::U256(num) => num.to_string(),
+        Constant::Address(v) => v.to_string(),
+        Constant::ByteArray(v) => boogie_byte_blob(_options, v, false),
+        Constant::AddressArray(v) => boogie_address_blob(_options, v),
+        Constant::Vector(vec) => boogie_make_vec_from_strings(
+            &vec.iter()
+                .map(|v| boogie_constant(_options, v))
+                .collect_vec(),
+        ),
+        Constant::U16(num) => num.to_string(),
+        Constant::U32(num) => num.to_string(),
+    }
+}
+
+pub fn boogie_value_blob(_options: &BoogieOptions, val: &[Value]) -> String {
+    let args = val.iter().map(|v| boogie_value(_options, v)).collect_vec();
+    if args.is_empty() {
+        "EmptyVec()".to_string()
     } else {
         boogie_make_vec_from_strings(&args)
     }
 }
 
+pub fn boogie_value(_options: &BoogieOptions, val: &Value) -> String {
+    match val {
+        Value::Bool(true) => "true".to_string(),
+        Value::Bool(false) => "false".to_string(),
+        Value::Number(num) => num.to_string(),
+        Value::Address(v) => v.to_string(),
+        Value::ByteArray(v) => boogie_byte_blob(_options, v, false),
+        Value::AddressArray(v) => boogie_address_blob(_options, v),
+        Value::Vector(vec) => boogie_make_vec_from_strings(
+            &vec.iter().map(|v| boogie_value(_options, v)).collect_vec(),
+        ),
+    }
+}
+
 /// Construct a statement to debug track a local based on the Boogie attribute approach.
 pub fn boogie_debug_track_local(
     fun_target: &FunctionTarget<'_>,
     origin_idx: TempIndex,
     idx: TempIndex,
     ty: &Type,
+    bv_flag: bool,
 ) -> String {
-    boogie_debug_track(fun_target, "$track_local", origin_idx, idx, ty)
+    boogie_debug_track(fun_target, "$track_local", origin_idx, idx, ty, bv_flag)
 }
 
 fn boogie_debug_track(
@@ -325,11 +575,12 @@ fn boogie_debug_track(
     tracked_idx: usize,
     idx: TempIndex,
     ty: &Type,
+    bv_flag: bool,
 ) -> String {
     let fun_def_idx = fun_target.func_env.get_def_idx();
     let value = format!("$t{}", idx);
     if ty.is_reference() {
-        let temp_name = boogie_temp(fun_target.global_env(), ty.skip_reference(), 0);
+        let temp_name = boogie_temp(fun_target.global_env(), ty.skip_reference(), 0, bv_flag);
         format!(
             "{} := $Dereference({});\n\
              assume {{:print \"{}({},{},{}):\", {}}} {} == {};",
@@ -376,6 +627,340 @@ pub fn boogie_debug_track_return(
     ret_idx: usize,
     idx: TempIndex,
     ty: &Type,
+    bv_flag: bool,
 ) -> String {
-    boogie_debug_track(fun_target, "$track_return", ret_idx, idx, ty)
+    boogie_debug_track(fun_target, "$track_return", ret_idx, idx, ty, bv_flag)
+}
+
+pub enum TypeIdentToken {
+    Char(u8),
+    Variable(String),
+}
+
+impl TypeIdentToken {
+    pub fn make(name: &str) -> Vec<TypeIdentToken> {
+        name.as_bytes()
+            .iter()
+            .map(|c| TypeIdentToken::Char(*c))
+            .collect()
+    }
+
+    pub fn join(sep: &str, mut pieces: Vec<Vec<TypeIdentToken>>) -> Vec<TypeIdentToken> {
+        if pieces.is_empty() {
+            return vec![];
+        }
+
+        pieces.reverse();
+        let mut tokens = pieces.pop().unwrap();
+        while !pieces.is_empty() {
+            tokens.extend(Self::make(sep));
+            tokens.extend(pieces.pop().unwrap());
+        }
+        tokens
+    }
+
+    pub fn convert_to_bytes(tokens: Vec<TypeIdentToken>) -> String {
+        fn get_char_array(tokens: &[TypeIdentToken], start: usize, end: usize) -> String {
+            let elements = (start..end)
+                .map(|k| {
+                    format!(
+                        "[{} := {}]",
+                        k - start,
+                        match &tokens[k] {
+                            TypeIdentToken::Char(c) => *c,
+                            TypeIdentToken::Variable(_) => unreachable!(),
+                        }
+                    )
+                })
+                .join("");
+            format!("Vec(DefaultVecMap(){}, {})", elements, end - start)
+        }
+
+        // construct all the segments
+        let mut segments = vec![];
+
+        let mut char_seq_start = None;
+        for (i, token) in tokens.iter().enumerate() {
+            match token {
+                TypeIdentToken::Char(_) => {
+                    if char_seq_start.is_none() {
+                        char_seq_start = Some(i);
+                    }
+                }
+                TypeIdentToken::Variable(name) => {
+                    if let Some(start) = &char_seq_start {
+                        segments.push(get_char_array(&tokens, *start, i));
+                    };
+                    char_seq_start = None;
+                    segments.push(name.clone());
+                }
+            }
+        }
+        if let Some(start) = char_seq_start {
+            segments.push(get_char_array(&tokens, start, tokens.len()));
+        }
+
+        // concat the segments
+        if segments.is_empty() {
+            return String::new();
+        }
+
+        segments.reverse();
+        let mut cursor = segments.pop().unwrap();
+        while !segments.is_empty() {
+            let next = segments.pop().unwrap();
+            cursor = format!("ConcatVec({}, {})", cursor, next);
+        }
+        cursor
+    }
+}
+
+/// A formatter for address
+pub struct AddressFormatter {
+    /// whether the `0x` prefix is needed
+    pub prefix: bool,
+    /// whether to include leading zeros
+    pub full_length: bool,
+    /// whether to capitalize the hex repr
+    pub capitalized: bool,
+}
+
+impl AddressFormatter {
+    pub fn format(&self, addr: &BigUint) -> String {
+        let result = addr.to_str_radix(16);
+        // into correct length
+        let result = if self.full_length {
+            format!("{:0>32}", result)
+        } else {
+            result
+        };
+        // into correct case
+        let result = if self.capitalized {
+            result.to_uppercase()
+        } else {
+            result
+        };
+        // with or without prefix
+        if self.prefix {
+            format!("0x{}", result)
+        } else {
+            result
+        }
+    }
+}
+
+fn type_name_to_ident_tokens(
+    env: &GlobalEnv,
+    ty: &Type,
+    formatter: &AddressFormatter,
+) -> Vec<TypeIdentToken> {
+    match ty {
+        Type::Primitive(PrimitiveType::Bool) => TypeIdentToken::make("bool"),
+        Type::Primitive(PrimitiveType::U8) => TypeIdentToken::make("u8"),
+        Type::Primitive(PrimitiveType::U16) => TypeIdentToken::make("u16"),
+        Type::Primitive(PrimitiveType::U32) => TypeIdentToken::make("u32"),
+        Type::Primitive(PrimitiveType::U64) => TypeIdentToken::make("u64"),
+        Type::Primitive(PrimitiveType::U128) => TypeIdentToken::make("u128"),
+        Type::Primitive(PrimitiveType::U256) => TypeIdentToken::make("u256"),
+        Type::Primitive(PrimitiveType::Address) => TypeIdentToken::make("address"),
+        Type::Primitive(PrimitiveType::Signer) => TypeIdentToken::make("signer"),
+        Type::Vector(element) => {
+            let mut tokens = TypeIdentToken::make("vector<");
+            tokens.extend(type_name_to_ident_tokens(env, element, formatter));
+            tokens.extend(TypeIdentToken::make(">"));
+            tokens
+        }
+        Type::Struct(mid, sid, ty_args) => {
+            let module_env = env.get_module(*mid);
+            let struct_env = module_env.get_struct(*sid);
+            let type_name = format!(
+                "{}::{}::{}",
+                formatter.format(module_env.get_name().addr()),
+                module_env
+                    .get_name()
+                    .name()
+                    .display(module_env.symbol_pool()),
+                struct_env.get_name().display(module_env.symbol_pool())
+            );
+            let mut tokens = TypeIdentToken::make(&type_name);
+            if !ty_args.is_empty() {
+                tokens.extend(TypeIdentToken::make("<"));
+                let ty_args_tokens = ty_args
+                    .iter()
+                    .map(|t| type_name_to_ident_tokens(env, t, formatter))
+                    .collect();
+                tokens.extend(TypeIdentToken::join(", ", ty_args_tokens));
+                tokens.extend(TypeIdentToken::make(">"));
+            }
+            tokens
+        }
+        Type::TypeParameter(idx) => {
+            vec![TypeIdentToken::Variable(format!(
+                "$TypeName(#{}_info)",
+                *idx
+            ))]
+        }
+        // move types that are not allowed
+        Type::Reference(..) | Type::Tuple(..) => {
+            unreachable!("Prohibited move type in type_name call");
+        }
+        // spec only types
+        Type::Primitive(PrimitiveType::Num)
+        | Type::Primitive(PrimitiveType::Range)
+        | Type::Primitive(PrimitiveType::EventStore)
+        | Type::Fun(..)
+        | Type::TypeDomain(..)
+        | Type::ResourceDomain(..) => {
+            unreachable!("Unexpected spec-only type in type_name call");
+        }
+        // temporary types
+        Type::Error | Type::Var(..) => {
+            unreachable!("Unexpected temporary type in type_name call");
+        }
+    }
+}
+
+/// Convert a type name into a format that can be recognized by Boogie
+///
+/// The `stdlib` bool flag represents whether this type name is intended for
+/// - true  --> `std::type_name` and
+/// - false --> `ext::type_info`.
+/// TODO(mengxu): the above is a very hacky, we need a better way to differentiate
+pub fn boogie_reflection_type_name(env: &GlobalEnv, ty: &Type, stdlib: bool) -> String {
+    let formatter = if stdlib {
+        AddressFormatter {
+            prefix: false,
+            full_length: true,
+            capitalized: false,
+        }
+    } else {
+        AddressFormatter {
+            prefix: true,
+            full_length: false,
+            capitalized: false,
+        }
+    };
+    let bytes = TypeIdentToken::convert_to_bytes(type_name_to_ident_tokens(env, ty, &formatter));
+    if stdlib {
+        format!(
+            "${}_type_name_TypeName(${}_ascii_String({}))",
+            env.get_stdlib_address(),
+            env.get_stdlib_address(),
+            bytes
+        )
+    } else {
+        format!("${}_string_String({})", env.get_stdlib_address(), bytes)
+    }
+}
+
+enum TypeInfoPack {
+    Struct(BigUint, String, String),
+    Symbolic(TypeParameterIndex),
+}
+
+fn type_name_to_info_pack(env: &GlobalEnv, ty: &Type) -> Option<TypeInfoPack> {
+    match ty {
+        Type::Struct(mid, sid, _) => {
+            let module_env = env.get_module(*mid);
+            let struct_env = module_env.get_struct(*sid);
+            let module_name = module_env.get_name();
+            Some(TypeInfoPack::Struct(
+                module_name.addr().clone(),
+                module_name
+                    .name()
+                    .display(module_env.symbol_pool())
+                    .to_string(),
+                struct_env
+                    .get_name()
+                    .display(module_env.symbol_pool())
+                    .to_string(),
+            ))
+        }
+        Type::TypeParameter(idx) => Some(TypeInfoPack::Symbolic(*idx)),
+        // move types that will cause an error
+        Type::Primitive(PrimitiveType::Bool)
+        | Type::Primitive(PrimitiveType::U8)
+        | Type::Primitive(PrimitiveType::U16)
+        | Type::Primitive(PrimitiveType::U32)
+        | Type::Primitive(PrimitiveType::U64)
+        | Type::Primitive(PrimitiveType::U128)
+        | Type::Primitive(PrimitiveType::U256)
+        | Type::Primitive(PrimitiveType::Address)
+        | Type::Primitive(PrimitiveType::Signer)
+        | Type::Vector(_) => None,
+        // move types that are not allowed
+        Type::Reference(..) | Type::Tuple(..) => {
+            unreachable!("Prohibited move type in type_name call");
+        }
+        // spec only types
+        Type::Primitive(PrimitiveType::Num)
+        | Type::Primitive(PrimitiveType::Range)
+        | Type::Primitive(PrimitiveType::EventStore)
+        | Type::Fun(..)
+        | Type::TypeDomain(..)
+        | Type::ResourceDomain(..) => {
+            unreachable!("Unexpected spec-only type in type_name call");
+        }
+        // temporary types
+        Type::Error | Type::Var(..) => {
+            unreachable!("Unexpected temporary type in type_name call");
+        }
+    }
+}
+
+/// Convert a type info into a format that can be recognized by Boogie
+pub fn boogie_reflection_type_info(env: &GlobalEnv, ty: &Type) -> (String, String) {
+    fn get_symbol_is_struct(idx: TypeParameterIndex) -> String {
+        format!("is#$TypeParamStruct(#{}_info)", idx)
+    }
+    fn get_symbol_account_address(idx: TypeParameterIndex) -> String {
+        format!("a#$TypeParamStruct(#{}_info)", idx)
+    }
+    fn get_symbol_module_name(idx: TypeParameterIndex) -> String {
+        format!("m#$TypeParamStruct(#{}_info)", idx)
+    }
+    fn get_symbol_struct_name(idx: TypeParameterIndex) -> String {
+        format!("s#$TypeParamStruct(#{}_info)", idx)
+    }
+
+    let extlib_address = env.get_extlib_address();
+    match type_name_to_info_pack(env, ty) {
+        None => (
+            "false".to_string(),
+            format!(
+                "${}_type_info_TypeInfo(0, EmptyVec(), EmptyVec())",
+                extlib_address
+            ),
+        ),
+        Some(TypeInfoPack::Struct(addr, module_name, struct_name)) => {
+            let module_repr = TypeIdentToken::convert_to_bytes(TypeIdentToken::make(&module_name));
+            let struct_repr = TypeIdentToken::convert_to_bytes(TypeIdentToken::make(&struct_name));
+            (
+                "true".to_string(),
+                format!(
+                    "${}_type_info_TypeInfo({}, {}, {})",
+                    extlib_address, addr, module_repr, struct_repr
+                ),
+            )
+        }
+        Some(TypeInfoPack::Symbolic(idx)) => (
+            get_symbol_is_struct(idx),
+            format!(
+                "${}_type_info_TypeInfo({}, {}, {})",
+                extlib_address,
+                get_symbol_account_address(idx),
+                get_symbol_module_name(idx),
+                get_symbol_struct_name(idx)
+            ),
+        ),
+    }
+}
+
+/// Encode the test on whether a type is a struct in a format that can be recognized by Boogie
+pub fn boogie_reflection_type_is_struct(env: &GlobalEnv, ty: &Type) -> String {
+    match type_name_to_info_pack(env, ty) {
+        None => "false".to_string(),
+        Some(TypeInfoPack::Struct(..)) => "true".to_string(),
+        Some(TypeInfoPack::Symbolic(idx)) => format!("is#$TypeParamStruct(#{}_info)", idx),
+    }
 }
diff --git a/language/move-prover/boogie-backend/src/boogie_wrapper.rs b/language/move-prover/boogie-backend/src/boogie_wrapper.rs
index fc870b934e..8f91ef6a77 100644
--- a/language/move-prover/boogie-backend/src/boogie_wrapper.rs
+++ b/language/move-prover/boogie-backend/src/boogie_wrapper.rs
@@ -26,8 +26,8 @@ use move_model::{
     ast::TempIndex,
     code_writer::CodeWriter,
     model::{FunId, GlobalEnv, Loc, ModuleId, NodeId, QualifiedId, StructEnv},
+    pragmas::INTRINSIC_TYPE_MAP,
     ty::{PrimitiveType, Type},
-    well_known::TABLE_TABLE,
 };
 use move_stackless_bytecode::function_target_pipeline::{FunctionTargetsHolder, FunctionVariant};
 
@@ -97,6 +97,7 @@ pub enum TraceEntry {
     Exp(NodeId, ModelValue),
     SubExp(NodeId, ModelValue),
     GlobalMem(NodeId, ModelValue),
+    InfoLine(String),
 }
 
 // Error message matching
@@ -385,6 +386,10 @@ impl<'env> BoogieWrapper<'env> {
                             }
                         }
                     }
+                    InfoLine(info_line) => {
+                        // information that should be displayed to the user
+                        display.push(format!("    {}", info_line));
+                    }
                     _ => {}
                 }
             }
@@ -524,9 +529,18 @@ impl<'env> BoogieWrapper<'env> {
 
             let args = cap.name("args").unwrap().as_str();
             let loc = self.report_error(self.extract_loc(args), self.env.unknown_loc());
-            let execution_trace = self.extract_augmented_trace(out, &mut at);
+            let plain_trace = self.extract_execution_trace(out, &mut at);
+            let mut execution_trace = self.extract_augmented_trace(out, &mut at);
             let mut model = Model::new(self);
-            self.extract_model(&mut model, out, &mut at);
+            if execution_trace.is_empty() {
+                execution_trace.push(TraceEntry::InfoLine(format!(
+                    "Boogie does not return any augmented executed trace. \
+                    See the plain trace below:\n{}",
+                    plain_trace.join("\n")
+                )))
+            } else {
+                self.extract_model(&mut model, out, &mut at);
+            }
 
             if msg != "expected to fail" {
                 // Only add this if it is not a negative test. We still needed to parse it.
@@ -560,7 +574,12 @@ impl<'env> BoogieWrapper<'env> {
 
         if let Some(cap) = MODEL_REGION.captures(&out[*at..]) {
             *at = usize::saturating_add(*at, cap.get(0).unwrap().end());
-            match model.parse(self, cap.name("mod").unwrap().as_str()) {
+
+            // Cuts out the state info block which is not used currently.
+            let re = Regex::new(r"(?m)\*\*\* STATE(?s:.)*?\*\*\* END_STATE\n").unwrap();
+            let remnant = re.replace(cap.name("mod").unwrap().as_str(), "");
+
+            match model.parse(self, remnant.as_ref()) {
                 Ok(_) => {}
                 Err(parse_error) => {
                     let context_module = self
@@ -576,6 +595,27 @@ impl<'env> BoogieWrapper<'env> {
         }
     }
 
+    /// Extracts the plain execution trace.
+    fn extract_execution_trace(&self, out: &str, at: &mut usize) -> Vec<String> {
+        static TRACE_START: Lazy<Regex> =
+            Lazy::new(|| Regex::new(r"(?m)^Execution trace:\s*$").unwrap());
+        static TRACE_ENTRY: Lazy<Regex> = Lazy::new(|| {
+            Regex::new(r"^\s+(?P<name>[^(]+)\((?P<args>[^)]*)\): (?P<value>.*)\n").unwrap()
+        });
+        let mut result = vec![];
+        if let Some(m) = TRACE_START.find(&out[*at..]) {
+            *at = usize::saturating_add(*at, m.end());
+            while let Some(cap) = TRACE_ENTRY.captures(&out[*at..]) {
+                *at = usize::saturating_add(*at, cap.get(0).unwrap().end());
+                let name = cap.name("name").unwrap().as_str();
+                let args = cap.name("args").unwrap().as_str();
+                let value = cap.name("value").unwrap().as_str();
+                result.push(format!("{}({}): {}", name, args, value))
+            }
+        }
+        result
+    }
+
     /// Extracts augmented execution trace.
     fn extract_augmented_trace(&self, out: &str, at: &mut usize) -> Vec<TraceEntry> {
         static TRACE_START: Lazy<Regex> =
@@ -649,6 +689,10 @@ impl<'env> BoogieWrapper<'env> {
                 let value = self.extract_value(value)?;
                 Ok(TraceEntry::GlobalMem(node_id, value))
             }
+            "info" => match value {
+                Some(info_line) => Ok(TraceEntry::InfoLine(info_line.trim().to_string())),
+                None => Ok(TraceEntry::InfoLine("".to_string())),
+            },
             _ => Err(ModelParseError::new(&format!(
                 "unrecognized augmented trace entry `{}`",
                 name
@@ -1036,7 +1080,7 @@ impl ModelValue {
             if args.len() != 2 {
                 return None;
             }
-            let size = (&args[1]).extract_number()?;
+            let size = args[1].extract_number()?;
             let map_key = &args[0];
             let value_array_map = model
                 .vars
@@ -1132,7 +1176,7 @@ impl ModelValue {
             .and_then(|update_map| update_map.extract_map());
 
         let mut domain_exists_map_opt = domain_idx_map.get(domain);
-        if domain_exists_map_opt == None {
+        if domain_exists_map_opt.is_none() {
             if let Some(default_domain_model) = default_domain_model_opt {
                 domain_exists_map_opt = domain_idx_map.get(default_domain_model);
             }
@@ -1174,7 +1218,7 @@ impl ModelValue {
             }
         }
 
-        // Travese the update map to obtain the updated value
+        // Traverse the update map to obtain the updated value
         if let Some(value_update_map) = value_update_map_opt {
             for up_k in value_update_map.keys() {
                 if let ModelValue::List(elems) = up_k {
@@ -1373,14 +1417,14 @@ impl ModelValue {
             Type::Vector(param) => self.pretty_vector(wrapper, model, param),
             Type::Struct(module_id, struct_id, params) => {
                 let struct_env = wrapper.env.get_struct_qid(module_id.qualified(*struct_id));
-                if struct_env.is_well_known(TABLE_TABLE) {
+                if struct_env.is_intrinsic_of(INTRINSIC_TYPE_MAP) {
                     self.pretty_table(wrapper, model, &params[0], &params[1])
                 } else {
                     self.pretty_struct(wrapper, model, &struct_env, params)
                 }
             }
             Type::Reference(_, bt) => {
-                Some(PrettyDoc::text("&").append(self.pretty(wrapper, model, &*bt)?))
+                Some(PrettyDoc::text("&").append(self.pretty(wrapper, model, bt)?))
             }
             Type::TypeParameter(_) => {
                 // The value of a generic cannot be easily displayed because we do not know the
@@ -1389,7 +1433,13 @@ impl ModelValue {
                 // effect the verification outcome, we may not have much need for seeing it.
                 Some(PrettyDoc::text("<generic>"))
             }
-            _ => None,
+            Type::Tuple(_)
+            | Type::Primitive(_)
+            | Type::Fun(_, _)
+            | Type::TypeDomain(_)
+            | Type::ResourceDomain(_, _, _)
+            | Type::Error
+            | Type::Var(_) => None,
         }
     }
 
@@ -1465,7 +1515,7 @@ impl ModelValue {
             }
             vec![PrettyDoc::text(rep)]
         } else {
-            let struct_name = &boogie_struct_name(&struct_env, inst);
+            let struct_name = &boogie_struct_name(struct_env, inst);
             let values = self
                 .extract_list(struct_name)
                 // It appears sometimes keys are represented witout, sometimes with enclosing
@@ -1673,7 +1723,7 @@ impl<'s> ModelParser<'s> {
 
     fn parse_key(&mut self) -> Result<ModelValue, ModelParseError> {
         let mut comps = vec![];
-        while !self.looking_at("->") {
+        while !self.looking_at("->") && self.at < self.input.len() {
             let value = self.parse_value()?;
             comps.push(value);
         }
diff --git a/language/move-prover/boogie-backend/src/bytecode_translator.rs b/language/move-prover/boogie-backend/src/bytecode_translator.rs
index 7672dcbe65..73143da6e5 100644
--- a/language/move-prover/boogie-backend/src/bytecode_translator.rs
+++ b/language/move-prover/boogie-backend/src/bytecode_translator.rs
@@ -6,46 +6,51 @@
 
 use std::collections::{BTreeMap, BTreeSet};
 
+use codespan::LineIndex;
 use itertools::Itertools;
 #[allow(unused_imports)]
 use log::{debug, info, log, warn, Level};
 
+use move_compiler::interface_generator::NATIVE_INTERFACE;
 use move_model::{
+    ast::{Attribute, TempIndex, TraceKind},
     code_writer::CodeWriter,
     emit, emitln,
-    model::{GlobalEnv, QualifiedInstId, StructEnv, StructId},
+    model::{FieldId, GlobalEnv, Loc, NodeId, QualifiedInstId, StructEnv, StructId},
     pragmas::{ADDITION_OVERFLOW_UNCHECKED_PRAGMA, SEED_PRAGMA, TIMEOUT_PRAGMA},
-    ty::{PrimitiveType, Type},
+    ty::{PrimitiveType, Type, TypeDisplayContext, BOOL_TYPE},
+    well_known::{TYPE_INFO_MOVE, TYPE_NAME_GET_MOVE, TYPE_NAME_MOVE},
 };
 use move_stackless_bytecode::{
     function_target::FunctionTarget,
-    function_target_pipeline::{FunctionTargetsHolder, VerificationFlavor},
+    function_target_pipeline::{FunctionTargetsHolder, FunctionVariant, VerificationFlavor},
     mono_analysis,
-    stackless_bytecode::{BorrowEdge, BorrowNode, Bytecode, Constant, HavocKind, Operation},
+    number_operation::{
+        FuncOperationMap, GlobalNumberOperationState, NumOperation,
+        NumOperation::{Bitwise, Bottom},
+    },
+    options::ProverOptions,
+    stackless_bytecode::{
+        AbortAction, BorrowEdge, BorrowNode, Bytecode, Constant, HavocKind, IndexEdgeKind,
+        Operation, PropKind,
+    },
 };
 
 use crate::{
     boogie_helpers::{
-        boogie_byte_blob, boogie_debug_track_abort, boogie_debug_track_local,
-        boogie_debug_track_return, boogie_equality_for_type, boogie_field_sel, boogie_field_update,
+        boogie_address_blob, boogie_bv_type, boogie_byte_blob, boogie_constant_blob,
+        boogie_debug_track_abort, boogie_debug_track_local, boogie_debug_track_return,
+        boogie_equality_for_type, boogie_field_sel, boogie_field_update, boogie_function_bv_name,
         boogie_function_name, boogie_make_vec_from_strings, boogie_modifies_memory_name,
-        boogie_resource_memory_name, boogie_struct_name, boogie_temp, boogie_type,
-        boogie_type_param, boogie_type_suffix, boogie_type_suffix_for_struct,
-        boogie_well_formed_check, boogie_well_formed_expr,
+        boogie_num_literal, boogie_num_type_base, boogie_num_type_string_capital,
+        boogie_reflection_type_info, boogie_reflection_type_name, boogie_resource_memory_name,
+        boogie_struct_name, boogie_temp, boogie_temp_from_suffix, boogie_type, boogie_type_param,
+        boogie_type_suffix, boogie_type_suffix_bv, boogie_type_suffix_for_struct,
+        boogie_well_formed_check, boogie_well_formed_expr_bv, TypeIdentToken,
     },
     options::BoogieOptions,
     spec_translator::SpecTranslator,
 };
-use codespan::LineIndex;
-use move_model::{
-    ast::{TempIndex, TraceKind},
-    model::{Loc, NodeId},
-    ty::{TypeDisplayContext, BOOL_TYPE},
-};
-use move_stackless_bytecode::{
-    function_target_pipeline::FunctionVariant,
-    stackless_bytecode::{AbortAction, PropKind},
-};
 
 pub struct BoogieTranslator<'env> {
     env: &'env GlobalEnv,
@@ -95,6 +100,83 @@ impl<'env> BoogieTranslator<'env> {
             writer,
             "\n\n//==================================\n// Begin Translation\n"
         );
+
+        // Add type reflection axioms
+        if !mono_info.type_params.is_empty() {
+            emitln!(writer, "function $TypeName(t: $TypeParamInfo): Vec int;");
+
+            // type name <-> type info: primitives
+            for name in [
+                "Bool", "U8", "U16", "U32", "U64", "U128", "U256", "Address", "Signer",
+            ]
+            .into_iter()
+            {
+                emitln!(
+                    writer,
+                    "axiom (forall t: $TypeParamInfo :: {{$TypeName(t)}} \
+                            is#$TypeParam{}(t) ==> $IsEqual'vec'u8''($TypeName(t), {}));",
+                    name,
+                    TypeIdentToken::convert_to_bytes(TypeIdentToken::make(&name.to_lowercase()))
+                );
+                emitln!(
+                    writer,
+                    "axiom (forall t: $TypeParamInfo :: {{$TypeName(t)}} \
+                            $IsEqual'vec'u8''($TypeName(t), {}) ==> is#$TypeParam{}(t));",
+                    TypeIdentToken::convert_to_bytes(TypeIdentToken::make(&name.to_lowercase())),
+                    name,
+                );
+            }
+
+            // type name <-> type info: vector
+            let mut tokens = TypeIdentToken::make("vector<");
+            tokens.push(TypeIdentToken::Variable(
+                "$TypeName(e#$TypeParamVector(t))".to_string(),
+            ));
+            tokens.extend(TypeIdentToken::make(">"));
+            emitln!(
+                writer,
+                "axiom (forall t: $TypeParamInfo :: {{$TypeName(t)}} \
+                            is#$TypeParamVector(t) ==> $IsEqual'vec'u8''($TypeName(t), {}));",
+                TypeIdentToken::convert_to_bytes(tokens)
+            );
+            // TODO(mengxu): this will parse it to an uninterpreted vector element type
+            emitln!(
+                writer,
+                "axiom (forall t: $TypeParamInfo :: {{$TypeName(t)}} \
+                            ($IsPrefix'vec'u8''($TypeName(t), {}) && $IsSuffix'vec'u8''($TypeName(t), {})) ==> is#$TypeParamVector(t));",
+                TypeIdentToken::convert_to_bytes(TypeIdentToken::make("vector<")),
+                TypeIdentToken::convert_to_bytes(TypeIdentToken::make(">")),
+            );
+
+            // type name <-> type info: struct
+            let mut tokens = TypeIdentToken::make("0x");
+            // TODO(mengxu): this is not a correct radix16 encoding of an integer
+            tokens.push(TypeIdentToken::Variable(
+                "MakeVec1(a#$TypeParamStruct(t))".to_string(),
+            ));
+            tokens.extend(TypeIdentToken::make("::"));
+            tokens.push(TypeIdentToken::Variable(
+                "m#$TypeParamStruct(t)".to_string(),
+            ));
+            tokens.extend(TypeIdentToken::make("::"));
+            tokens.push(TypeIdentToken::Variable(
+                "s#$TypeParamStruct(t)".to_string(),
+            ));
+            emitln!(
+                writer,
+                "axiom (forall t: $TypeParamInfo :: {{$TypeName(t)}} \
+                            is#$TypeParamStruct(t) ==> $IsEqual'vec'u8''($TypeName(t), {}));",
+                TypeIdentToken::convert_to_bytes(tokens)
+            );
+            // TODO(mengxu): this will parse it to an uninterpreted struct
+            emitln!(
+                writer,
+                "axiom (forall t: $TypeParamInfo :: {{$TypeName(t)}} \
+                            $IsPrefix'vec'u8''($TypeName(t), {}) ==> is#$TypeParamVector(t));",
+                TypeIdentToken::convert_to_bytes(TypeIdentToken::make("0x")),
+            );
+        }
+
         // Add given type declarations for type parameters.
         emitln!(writer, "\n\n// Given Types for Type Parameters\n");
         for idx in &mono_info.type_params {
@@ -114,6 +196,12 @@ impl<'env> BoogieTranslator<'env> {
                 suffix,
                 param_type,
             );
+
+            // declare free variables to represent the type info for this type
+            emitln!(writer, "var {}_info: $TypeParamInfo;", param_type);
+
+            // declare the memory variable for this type
+            emitln!(writer, "var {}_$memory: $Memory {};", suffix, param_type);
         }
         emitln!(writer);
 
@@ -232,6 +320,35 @@ impl<'env> StructTranslator<'env> {
         ty.instantiate(self.type_inst)
     }
 
+    /// Return whether a field involves bitwise operations
+    pub fn field_bv_flag(&self, field_id: &FieldId) -> bool {
+        let global_state = &self
+            .parent
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let operation_map = &global_state.struct_operation_map;
+        let mid = self.struct_env.module_env.get_id();
+        let sid = self.struct_env.get_id();
+        let field_oper = operation_map.get(&(mid, sid)).unwrap().get(field_id);
+        matches!(field_oper, Some(&Bitwise))
+    }
+
+    /// Return boogie type for a struct
+    pub fn boogie_type_for_struct_field(
+        &self,
+        field_id: &FieldId,
+        env: &GlobalEnv,
+        ty: &Type,
+    ) -> String {
+        let bv_flag = self.field_bv_flag(field_id);
+        if bv_flag {
+            boogie_bv_type(env, ty)
+        } else {
+            boogie_type(env, ty)
+        }
+    }
+
     /// Translates the given struct.
     fn translate(&self) {
         let writer = self.parent.writer;
@@ -262,7 +379,11 @@ impl<'env> StructTranslator<'env> {
                 format!(
                     "${}: {}",
                     field.get_name().display(env.symbol_pool()),
-                    boogie_type(env, &self.inst(&field.get_type()))
+                    self.boogie_type_for_struct_field(
+                        &field.get_id(),
+                        env,
+                        &self.inst(&field.get_type())
+                    )
                 )
             })
             .join(", ");
@@ -274,7 +395,7 @@ impl<'env> StructTranslator<'env> {
             struct_name
         );
 
-        let suffix = boogie_type_suffix_for_struct(struct_env, self.type_inst);
+        let suffix = boogie_type_suffix_for_struct(struct_env, self.type_inst, false);
 
         // Emit $UpdateField functions.
         let fields = struct_env.get_fields().collect_vec();
@@ -286,7 +407,11 @@ impl<'env> StructTranslator<'env> {
                     suffix,
                     field_name,
                     struct_name,
-                    boogie_type(env, &self.inst(&field_env.get_type())),
+                    self.boogie_type_for_struct_field(
+                        &field_env.get_id(),
+                        env,
+                        &self.inst(&field_env.get_type())
+                    ),
                     struct_name
                 ),
                 || {
@@ -318,7 +443,13 @@ impl<'env> StructTranslator<'env> {
                     for field in struct_env.get_fields() {
                         let sel = format!("{}({})", boogie_field_sel(&field, self.type_inst), "s");
                         let ty = &field.get_type().instantiate(self.type_inst);
-                        emitln!(writer, "{}{}", sep, boogie_well_formed_expr(env, &sel, ty));
+                        let bv_flag = self.field_bv_flag(&field.get_id());
+                        emitln!(
+                            writer,
+                            "{}{}",
+                            sep,
+                            boogie_well_formed_expr_bv(env, &sel, ty, bv_flag)
+                        );
                         sep = "  && ";
                     }
                 }
@@ -338,7 +469,9 @@ impl<'env> StructTranslator<'env> {
                     let mut sep = "";
                     for field in &fields {
                         let sel_fun = boogie_field_sel(field, self.type_inst);
-                        let field_suffix = boogie_type_suffix(env, &self.inst(&field.get_type()));
+                        let bv_flag = self.field_bv_flag(&field.get_id());
+                        let field_suffix =
+                            boogie_type_suffix_bv(env, &self.inst(&field.get_type()), bv_flag);
                         emit!(
                             writer,
                             "{}$IsEqual'{}'({}(s1), {}(s2))",
@@ -386,6 +519,45 @@ impl<'env> StructTranslator<'env> {
 // Function Translation
 
 impl<'env> FunctionTranslator<'env> {
+    /// Return whether a specific TempIndex involves in bitwise operations
+    pub fn bv_flag_from_map(&self, i: &usize, operation_map: &FuncOperationMap) -> bool {
+        let mid = self.fun_target.module_env().get_id();
+        let sid = self.fun_target.func_env.get_id();
+        let param_oper = operation_map.get(&(mid, sid)).unwrap().get(i);
+        matches!(param_oper, Some(&Bitwise))
+    }
+
+    /// Return whether a specific TempIndex involves in bitwise operations
+    pub fn bv_flag(&self, num_oper: &NumOperation) -> bool {
+        *num_oper == Bitwise
+    }
+
+    /// Return whether a return value at position i involves in bitwise operation
+    pub fn ret_bv_flag(&self, i: &usize) -> bool {
+        let global_state = &self
+            .fun_target
+            .global_env()
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let operation_map = &global_state.get_ret_map();
+        self.bv_flag_from_map(i, operation_map)
+    }
+
+    /// Return boogie type for a local with given signature token.
+    pub fn boogie_type_for_fun(
+        &self,
+        env: &GlobalEnv,
+        ty: &Type,
+        num_oper: &NumOperation,
+    ) -> String {
+        let bv_flag = self.bv_flag(num_oper);
+        if bv_flag {
+            boogie_bv_type(env, ty)
+        } else {
+            boogie_type(env, ty)
+        }
+    }
+
     fn inst(&self, ty: &Type) -> Type {
         ty.instantiate(self.type_inst)
     }
@@ -477,6 +649,14 @@ impl<'env> FunctionTranslator<'env> {
     fn generate_function_args_and_returns(&self) -> (String, String) {
         let fun_target = self.fun_target;
         let env = fun_target.global_env();
+        let baseline_flag = self.fun_target.data.variant == FunctionVariant::Baseline;
+        let global_state = &self
+            .fun_target
+            .global_env()
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let mid = fun_target.func_env.module_env.get_id();
+        let fid = fun_target.func_env.get_id();
         let args = (0..fun_target.get_parameter_count())
             .map(|i| {
                 let ty = self.get_local_type(i);
@@ -486,14 +666,23 @@ impl<'env> FunctionTranslator<'env> {
                 } else {
                     "$"
                 };
-                format!("{}t{}: {}", prefix, i, boogie_type(env, &ty))
+                let num_oper = global_state
+                    .get_temp_index_oper(mid, fid, i, baseline_flag)
+                    .unwrap_or(&Bottom);
+                format!(
+                    "{}t{}: {}",
+                    prefix,
+                    i,
+                    self.boogie_type_for_fun(env, &ty, num_oper)
+                )
             })
             .join(", ");
         let mut_ref_inputs = (0..fun_target.get_parameter_count())
-            .filter_map(|idx| {
+            .enumerate()
+            .filter_map(|(i, idx)| {
                 let ty = self.get_local_type(idx);
                 if ty.is_mutable_reference() {
-                    Some(ty)
+                    Some((i, ty))
                 } else {
                     None
                 }
@@ -505,14 +694,19 @@ impl<'env> FunctionTranslator<'env> {
             .enumerate()
             .map(|(i, s)| {
                 let s = self.inst(s);
-                format!("$ret{}: {}", i, boogie_type(env, &s))
+                let operation_map = global_state.get_ret_map();
+                let num_oper = operation_map.get(&(mid, fid)).unwrap().get(&i).unwrap();
+                format!("$ret{}: {}", i, self.boogie_type_for_fun(env, &s, num_oper))
             })
             // Add implicit return parameters for &mut
-            .chain(mut_ref_inputs.into_iter().enumerate().map(|(i, ty)| {
+            .chain(mut_ref_inputs.into_iter().enumerate().map(|(i, (_, ty))| {
+                let num_oper = &global_state
+                    .get_temp_index_oper(mid, fid, i, baseline_flag)
+                    .unwrap();
                 format!(
                     "$ret{}: {}",
                     usize::saturating_add(fun_target.get_return_count(), i),
-                    boogie_type(env, &ty)
+                    self.boogie_type_for_fun(env, &ty, num_oper)
                 )
             }))
             .join(", ");
@@ -526,6 +720,12 @@ impl<'env> FunctionTranslator<'env> {
         let variant = &fun_target.data.variant;
         let instantiation = &fun_target.data.type_args;
         let env = fun_target.global_env();
+        let baseline_flag = self.fun_target.data.variant == FunctionVariant::Baseline;
+        let global_state = &self
+            .fun_target
+            .global_env()
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
 
         // Be sure to set back location to the whole function definition as a default.
         writer.set_location(&fun_target.get_loc().at_start());
@@ -553,18 +753,31 @@ impl<'env> FunctionTranslator<'env> {
         // Generate local variable declarations. They need to appear first in boogie.
         emitln!(writer, "// declare local variables");
         let num_args = fun_target.get_parameter_count();
+        let mid = fun_target.func_env.module_env.get_id();
+        let fid = fun_target.func_env.get_id();
         for i in num_args..fun_target.get_local_count() {
+            let num_oper = global_state
+                .get_temp_index_oper(mid, fid, i, baseline_flag)
+                .unwrap();
             let local_type = &self.get_local_type(i);
-            emitln!(writer, "var $t{}: {};", i, boogie_type(env, local_type));
+            emitln!(
+                writer,
+                "var $t{}: {};",
+                i,
+                self.boogie_type_for_fun(env, local_type, num_oper)
+            );
         }
         // Generate declarations for renamed parameters.
         let proxied_parameters = self.get_mutable_parameters();
         for (idx, ty) in &proxied_parameters {
+            let num_oper = &global_state
+                .get_temp_index_oper(mid, fid, *idx, baseline_flag)
+                .unwrap();
             emitln!(
                 writer,
                 "var $t{}: {};",
                 idx,
-                boogie_type(env, &ty.instantiate(self.type_inst))
+                self.boogie_type_for_fun(env, &ty.instantiate(self.type_inst), num_oper)
             );
         }
         // Generate declarations for modifies condition.
@@ -581,16 +794,21 @@ impl<'env> FunctionTranslator<'env> {
                 mem_inst_seen.insert(memory);
             }
         }
-
+        let mut dup: Vec<String> = vec![];
         // Declare temporaries for debug tracing and other purposes.
-        for (_, (ref ty, cnt)) in self.compute_needed_temps() {
+        for (_, (ty, ref bv_flag, cnt)) in self.compute_needed_temps() {
             for i in 0..cnt {
-                emitln!(
-                    writer,
-                    "var {}: {};",
-                    boogie_temp(env, ty, i),
-                    boogie_type(env, ty)
-                );
+                let bv_type = if *bv_flag {
+                    boogie_bv_type
+                } else {
+                    boogie_type
+                };
+                let temp_name =
+                    boogie_temp_from_suffix(env, &boogie_type_suffix_bv(env, &ty, *bv_flag), i);
+                if !dup.contains(&temp_name) {
+                    emitln!(writer, "var {}: {};", temp_name.clone(), bv_type(env, &ty));
+                    dup.push(temp_name);
+                }
             }
         }
 
@@ -623,13 +841,6 @@ impl<'env> FunctionTranslator<'env> {
             emitln!(writer, "$t{} := _$t{};", idx, idx);
         }
 
-        // Initialize mutations to have empty paths so $IsParentMutation works correctly.
-        for i in num_args..fun_target.get_local_count() {
-            if self.get_local_type(i).is_mutable_reference() {
-                emitln!(writer, "assume IsEmptyVec(p#$Mutation($t{}));", i);
-            }
-        }
-
         // Initial assumptions
         if variant.is_verified() {
             self.translate_verify_entry_assumptions(fun_target);
@@ -728,7 +939,17 @@ impl<'env> FunctionTranslator<'env> {
 
         // Print debug comments.
         if let Some(comment) = fun_target.get_debug_comment(attr_id) {
-            emitln!(writer, "// {}", comment);
+            if comment.starts_with("info: ") {
+                // if the comment is annotated with "info: ", it should be displayed to the user
+                emitln!(
+                    writer,
+                    "assume {{:print \"${}(){}\"}} true;",
+                    &comment[..4],
+                    &comment[4..]
+                );
+            } else {
+                emitln!(writer, "// {}", comment);
+            }
         }
 
         // Track location for execution traces.
@@ -738,9 +959,22 @@ impl<'env> FunctionTranslator<'env> {
             *last_tracked_loc = None;
         }
         self.track_loc(last_tracked_loc, &loc);
+        if matches!(bytecode, Label(_, _)) {
+            // For labels, retrack the location after the label itself, so
+            // the information will not be missing if we jump to this label
+            *last_tracked_loc = None;
+        }
 
         // Helper function to get a a string for a local
         let str_local = |idx: usize| format!("$t{}", idx);
+        let baseline_flag = self.fun_target.data.variant == FunctionVariant::Baseline;
+        let global_state = &self
+            .fun_target
+            .global_env()
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let mid = self.fun_target.func_env.module_env.get_id();
+        let fid = self.fun_target.func_env.get_id();
 
         // Translate the bytecode instruction.
         match bytecode {
@@ -776,17 +1010,18 @@ impl<'env> FunctionTranslator<'env> {
                 }
                 PropKind::Modifies => {
                     let ty = &self.inst(&env.get_node_type(exp.node_id()));
+                    let bv_flag = global_state.get_node_num_oper(exp.node_id()) == Bitwise;
                     let (mid, sid, inst) = ty.require_struct();
                     let memory = boogie_resource_memory_name(
                         env,
                         &mid.qualified_inst(sid, inst.to_owned()),
                         &None,
                     );
-                    let exists_str = boogie_temp(env, &BOOL_TYPE, 0);
+                    let exists_str = boogie_temp(env, &BOOL_TYPE, 0, false);
                     emitln!(writer, "havoc {};", exists_str);
                     emitln!(writer, "if ({}) {{", exists_str);
                     writer.with_indent(|| {
-                        let val_str = boogie_temp(env, ty, 0);
+                        let val_str = boogie_temp(env, ty, 0, bv_flag);
                         emitln!(writer, "havoc {};", val_str);
                         emit!(writer, "{} := $ResourceUpdate({}, ", memory, memory);
                         spec_translator.translate(&exp.call_args()[0], self.type_inst);
@@ -832,21 +1067,29 @@ impl<'env> FunctionTranslator<'env> {
                 emitln!(writer, "return;");
             }
             Load(_, dest, c) => {
+                let num_oper = global_state
+                    .get_temp_index_oper(mid, fid, *dest, baseline_flag)
+                    .unwrap();
+                let bv_flag = self.bv_flag(num_oper);
                 let value = match c {
                     Constant::Bool(true) => "true".to_string(),
                     Constant::Bool(false) => "false".to_string(),
-                    Constant::U8(num) => num.to_string(),
-                    Constant::U64(num) => num.to_string(),
-                    Constant::U128(num) => num.to_string(),
-                    Constant::U256(num) => num.to_string(),
+                    Constant::U8(num) => boogie_num_literal(&num.to_string(), 8, bv_flag),
+                    Constant::U64(num) => boogie_num_literal(&num.to_string(), 64, bv_flag),
+                    Constant::U128(num) => boogie_num_literal(&num.to_string(), 128, bv_flag),
+                    Constant::U256(num) => boogie_num_literal(&num.to_string(), 256, bv_flag),
                     Constant::Address(val) => val.to_string(),
-                    Constant::ByteArray(val) => boogie_byte_blob(options, val),
+                    Constant::ByteArray(val) => boogie_byte_blob(options, val, bv_flag),
+                    Constant::AddressArray(val) => boogie_address_blob(options, val),
+                    Constant::Vector(val) => boogie_constant_blob(options, val),
+                    Constant::U16(num) => boogie_num_literal(&num.to_string(), 16, bv_flag),
+                    Constant::U32(num) => boogie_num_literal(&num.to_string(), 32, bv_flag),
                 };
                 let dest_str = str_local(*dest);
                 emitln!(writer, "{} := {};", dest_str, value);
                 // Insert a WellFormed assumption so the new value gets tagged as u8, ...
                 let ty = &self.get_local_type(*dest);
-                let check = boogie_well_formed_check(env, &dest_str, ty);
+                let check = boogie_well_formed_check(env, &dest_str, ty, bv_flag);
                 if !check.is_empty() {
                     emitln!(writer, &check);
                 }
@@ -872,12 +1115,20 @@ impl<'env> FunctionTranslator<'env> {
                                 .into_iter()
                                 .filter_map(|e| match e {
                                     BorrowEdge::Field(_, offset) => Some(format!("{}", offset)),
-                                    BorrowEdge::Index => Some("-1".to_owned()),
+                                    BorrowEdge::Index(_) => Some("-1".to_owned()),
                                     BorrowEdge::Direct => None,
                                     _ => unreachable!(),
                                 })
                                 .collect_vec();
-                            if edge_pattern.len() == 1 {
+                            if edge_pattern.is_empty() {
+                                emitln!(
+                                    writer,
+                                    "{} := $IsSameMutation({}, {});",
+                                    str_local(dests[0]),
+                                    str_local(*parent),
+                                    src_str
+                                );
+                            } else if edge_pattern.len() == 1 {
                                 emitln!(
                                     writer,
                                     "{} := $IsParentMutation({}, {}, {});",
@@ -934,9 +1185,10 @@ impl<'env> FunctionTranslator<'env> {
                     }
                     Function(mid, fid, inst) => {
                         let inst = &self.inst_slice(inst);
-                        let callee_env = env.get_module(*mid).into_function(*fid);
+                        let module_env = env.get_module(*mid);
+                        let callee_env = module_env.get_function(*fid);
 
-                        let args_str = srcs.iter().cloned().map(str_local).join(", ");
+                        let mut args_str = srcs.iter().cloned().map(str_local).join(", ");
                         let dest_str = dests
                             .iter()
                             .cloned()
@@ -951,22 +1203,229 @@ impl<'env> FunctionTranslator<'env> {
                             )
                             .join(",");
 
-                        if dest_str.is_empty() {
-                            emitln!(
-                                writer,
-                                "call {}({});",
-                                boogie_function_name(&callee_env, inst),
-                                args_str
+                        // special casing for type reflection
+                        let mut processed = false;
+
+                        // TODO(mengxu): change it to a better address name instead of extlib
+                        if env.get_extlib_address() == *module_env.get_name().addr() {
+                            let qualified_name = format!(
+                                "{}::{}",
+                                module_env.get_name().name().display(env.symbol_pool()),
+                                callee_env.get_name().display(env.symbol_pool()),
                             );
-                        } else {
-                            emitln!(
-                                writer,
-                                "call {} := {}({});",
-                                dest_str,
-                                boogie_function_name(&callee_env, inst),
-                                args_str
+                            if qualified_name == TYPE_NAME_MOVE {
+                                assert_eq!(inst.len(), 1);
+                                if dest_str.is_empty() {
+                                    emitln!(
+                                        writer,
+                                        "{}",
+                                        boogie_reflection_type_name(env, &inst[0], false)
+                                    );
+                                } else {
+                                    emitln!(
+                                        writer,
+                                        "{} := {};",
+                                        dest_str,
+                                        boogie_reflection_type_name(env, &inst[0], false)
+                                    );
+                                }
+                                processed = true;
+                            } else if qualified_name == TYPE_INFO_MOVE {
+                                assert_eq!(inst.len(), 1);
+                                let (flag, info) = boogie_reflection_type_info(env, &inst[0]);
+                                emitln!(writer, "if (!{}) {{", flag);
+                                writer.with_indent(|| emitln!(writer, "call $ExecFailureAbort();"));
+                                emitln!(writer, "}");
+                                if !dest_str.is_empty() {
+                                    emitln!(writer, "else {");
+                                    writer.with_indent(|| {
+                                        emitln!(writer, "{} := {};", dest_str, info)
+                                    });
+                                    emitln!(writer, "}");
+                                }
+                                processed = true;
+                            }
+                        }
+
+                        if env.get_stdlib_address() == *module_env.get_name().addr() {
+                            let qualified_name = format!(
+                                "{}::{}",
+                                module_env.get_name().name().display(env.symbol_pool()),
+                                callee_env.get_name().display(env.symbol_pool()),
                             );
+                            if qualified_name == TYPE_NAME_GET_MOVE {
+                                assert_eq!(inst.len(), 1);
+                                if dest_str.is_empty() {
+                                    emitln!(
+                                        writer,
+                                        "{}",
+                                        boogie_reflection_type_name(env, &inst[0], true)
+                                    );
+                                } else {
+                                    emitln!(
+                                        writer,
+                                        "{} := {};",
+                                        dest_str,
+                                        boogie_reflection_type_name(env, &inst[0], true)
+                                    );
+                                }
+                                processed = true;
+                            }
+                        }
+
+                        // regular path
+                        if !processed {
+                            let targeted = self.fun_target.module_env().is_target();
+                            // If the callee has been generated from a native interface, return an error
+                            if callee_env.is_native() && targeted {
+                                for attr in callee_env.get_attributes() {
+                                    if let Attribute::Apply(_, name, _) = attr {
+                                        if self
+                                            .fun_target
+                                            .module_env()
+                                            .symbol_pool()
+                                            .string(*name)
+                                            .as_str()
+                                            == NATIVE_INTERFACE
+                                        {
+                                            let loc = self.fun_target.get_bytecode_loc(attr_id);
+                                            self.parent
+                                                .env
+                                                .error(&loc, "Unknown native function is called");
+                                        }
+                                    }
+                                }
+                            }
+                            let caller_mid = self.fun_target.module_env().get_id();
+                            let caller_fid = self.fun_target.get_id();
+                            let fun_verified =
+                                !self.fun_target.func_env.is_explicitly_not_verified(
+                                    &ProverOptions::get(self.fun_target.global_env()).verify_scope,
+                                );
+                            let mut fun_name = boogie_function_name(&callee_env, inst);
+                            // Helper function to check whether the idx corresponds to a bitwise operation
+                            let compute_flag = |idx: TempIndex| {
+                                targeted
+                                    && fun_verified
+                                    && *global_state
+                                        .get_temp_index_oper(
+                                            caller_mid,
+                                            caller_fid,
+                                            idx,
+                                            baseline_flag,
+                                        )
+                                        .unwrap()
+                                        == Bitwise
+                            };
+                            let instrument_bv2int =
+                                |idx: TempIndex, args_str_vec: &mut Vec<String>| {
+                                    let local_ty_srcs_1 = self.get_local_type(idx);
+                                    let srcs_1_bv_flag = compute_flag(idx);
+                                    let mut args_src_1_str = str_local(idx);
+                                    if srcs_1_bv_flag {
+                                        args_src_1_str = format!(
+                                            "$bv2int.{}({})",
+                                            boogie_num_type_base(&local_ty_srcs_1),
+                                            args_src_1_str
+                                        );
+                                    }
+                                    args_str_vec.push(args_src_1_str);
+                                };
+                            let callee_name = callee_env.get_name_str();
+                            if dest_str.is_empty() {
+                                let bv_flag = !srcs.is_empty() && compute_flag(srcs[0]);
+                                if module_env.is_std_vector() {
+                                    // Check the target vector contains bv values
+                                    if callee_name.contains("insert") {
+                                        let mut args_str_vec =
+                                            vec![str_local(srcs[0]), str_local(srcs[1])];
+                                        assert!(srcs.len() > 2);
+                                        instrument_bv2int(srcs[2], &mut args_str_vec);
+                                        args_str = args_str_vec.iter().cloned().join(", ");
+                                    }
+                                    fun_name =
+                                        boogie_function_bv_name(&callee_env, inst, &[bv_flag]);
+                                } else if module_env.is_table() {
+                                    fun_name = boogie_function_bv_name(
+                                        &callee_env,
+                                        inst,
+                                        &[false, bv_flag],
+                                    );
+                                }
+                                emitln!(writer, "call {}({});", fun_name, args_str);
+                            } else {
+                                let dest_bv_flag = !dests.is_empty() && compute_flag(dests[0]);
+                                let bv_flag = !srcs.is_empty() && compute_flag(srcs[0]);
+                                // Handle the case where the return value of length is assigned to a bv int because
+                                // length always returns a non-bv result
+                                if module_env.is_std_vector() {
+                                    fun_name = boogie_function_bv_name(
+                                        &callee_env,
+                                        inst,
+                                        &[bv_flag || dest_bv_flag],
+                                    );
+                                    // Handle the case where the return value of length is assigned to a bv int because
+                                    // length always returns a non-bv result
+                                    if callee_name.contains("length") && dest_bv_flag {
+                                        let local_ty = self.get_local_type(dests[0]);
+                                        // Insert '$' for calling function instead of procedure
+                                        // TODO(tengzhang): a hacky way to convert int to bv for return value
+                                        fun_name.insert(10, '$');
+                                        // first call len fun then convert its return value to a bv type
+                                        emitln!(
+                                            writer,
+                                            "call {} := $int2bv{}({}({}));",
+                                            dest_str,
+                                            boogie_num_type_base(&local_ty),
+                                            fun_name,
+                                            args_str
+                                        );
+                                    } else if callee_name.contains("borrow")
+                                        || callee_name.contains("remove")
+                                        || callee_name.contains("swap")
+                                    {
+                                        let mut args_str_vec = vec![str_local(srcs[0])];
+                                        instrument_bv2int(srcs[1], &mut args_str_vec);
+                                        // Handle swap with three parameters
+                                        if srcs.len() > 2 {
+                                            instrument_bv2int(srcs[2], &mut args_str_vec);
+                                        }
+                                        args_str = args_str_vec.iter().cloned().join(", ");
+                                    }
+                                } else if module_env.is_table() {
+                                    fun_name = boogie_function_bv_name(
+                                        &callee_env,
+                                        inst,
+                                        &[false, bv_flag || dest_bv_flag],
+                                    );
+                                    if dest_bv_flag && callee_name.contains("length") {
+                                        // Handle the case where the return value of length is assigned to a bv int because
+                                        // length always returns a non-bv result
+                                        let local_ty = self.get_local_type(dests[0]);
+                                        // Replace with "spec_len"
+                                        let length_idx_start = callee_name.find("length").unwrap();
+                                        let length_idx_end = length_idx_start + "length".len();
+                                        fun_name = [
+                                            callee_name[0..length_idx_start].to_string(),
+                                            "spec_len".to_string(),
+                                            callee_name[length_idx_end..].to_string(),
+                                        ]
+                                        .join("");
+                                        // first call len fun then convert its return value to a bv type
+                                        emitln!(
+                                            writer,
+                                            "call {} := $int2bv{}({}({}));",
+                                            dest_str,
+                                            boogie_num_type_base(&local_ty),
+                                            fun_name,
+                                            args_str
+                                        );
+                                    }
+                                }
+                                emitln!(writer, "call {} := {}({});", dest_str, fun_name, args_str);
+                            }
                         }
+
                         // Clear the last track location after function call, as the call inserted
                         // location tracks before it returns.
                         *last_tracked_loc = None;
@@ -1150,67 +1609,70 @@ impl<'env> FunctionTranslator<'env> {
                         emitln!(writer, "}");
                     }
                     Havoc(HavocKind::Value) | Havoc(HavocKind::MutationAll) => {
-                        let src_str = str_local(srcs[0]);
-                        emitln!(writer, "havoc {};", src_str);
-                        // Insert a WellFormed check
-                        let ty = &self.get_local_type(srcs[0]);
-                        let check = boogie_well_formed_check(env, &src_str, ty);
-                        if !check.is_empty() {
-                            emitln!(writer, &check);
-                        }
+                        let var_str = str_local(dests[0]);
+                        emitln!(writer, "havoc {};", var_str);
                     }
                     Havoc(HavocKind::MutationValue) => {
-                        let ty = &self.get_local_type(srcs[0]);
-                        let src_str = str_local(srcs[0]);
-                        let temp_str = boogie_temp(env, ty.skip_reference(), 0);
+                        let ty = &self.get_local_type(dests[0]);
+                        let num_oper = global_state
+                            .get_temp_index_oper(mid, fid, dests[0], baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+                        let var_str = str_local(dests[0]);
+                        let temp_str = boogie_temp(env, ty.skip_reference(), 0, bv_flag);
                         emitln!(writer, "havoc {};", temp_str);
                         emitln!(
                             writer,
                             "{} := $UpdateMutation({}, {});",
-                            src_str,
-                            src_str,
+                            var_str,
+                            var_str,
                             temp_str
                         );
-                        // Insert a WellFormed check
-                        let check = boogie_well_formed_check(env, &src_str, ty);
-                        if !check.is_empty() {
-                            emitln!(writer, &check);
-                        }
                     }
                     Stop => {
                         // the two statements combined terminate any execution trace that reaches it
                         emitln!(writer, "assume false;");
                         emitln!(writer, "return;");
                     }
-                    CastU8 => {
+                    CastU8 | CastU16 | CastU32 | CastU64 | CastU128 | CastU256 => {
                         let src = srcs[0];
                         let dest = dests[0];
-                        emitln!(
-                            writer,
-                            "call {} := $CastU8({});",
-                            str_local(dest),
-                            str_local(src)
-                        );
-                    }
-                    CastU64 => {
-                        let src = srcs[0];
-                        let dest = dests[0];
-                        emitln!(
-                            writer,
-                            "call {} := $CastU64({});",
-                            str_local(dest),
-                            str_local(src)
-                        );
-                    }
-                    CastU128 => {
-                        let src = srcs[0];
-                        let dest = dests[0];
-                        emitln!(
-                            writer,
-                            "call {} := $CastU128({});",
-                            str_local(dest),
-                            str_local(src)
-                        );
+                        let make_cast = |target_base: &str, src: TempIndex, dest: TempIndex| {
+                            let num_oper = global_state
+                                .get_temp_index_oper(mid, fid, src, baseline_flag)
+                                .unwrap();
+                            let bv_flag = self.bv_flag(num_oper);
+                            if bv_flag {
+                                let src_type = self.get_local_type(src);
+                                let base = boogie_num_type_base(&src_type);
+                                emitln!(
+                                    writer,
+                                    "call {} := $CastBv{}to{}({});",
+                                    str_local(dest),
+                                    base,
+                                    target_base,
+                                    str_local(src)
+                                );
+                            } else {
+                                emitln!(
+                                    writer,
+                                    "call {} := $CastU{}({});",
+                                    str_local(dest),
+                                    target_base,
+                                    str_local(src)
+                                );
+                            }
+                        };
+                        let target_base = match oper {
+                            CastU8 => "8",
+                            CastU16 => "16",
+                            CastU32 => "32",
+                            CastU64 => "64",
+                            CastU128 => "128",
+                            CastU256 => "256",
+                            _ => unreachable!(),
+                        };
+                        make_cast(target_base, src, dest);
                     }
                     Not => {
                         let src = srcs[0];
@@ -1233,11 +1695,51 @@ impl<'env> FunctionTranslator<'env> {
                         } else {
                             ""
                         };
+                        let num_oper = global_state
+                            .get_temp_index_oper(mid, fid, dest, baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+
                         let add_type = match &self.get_local_type(dest) {
-                            Type::Primitive(PrimitiveType::U8) => "U8".to_string(),
-                            Type::Primitive(PrimitiveType::U64) => format!("U64{}", unchecked),
-                            Type::Primitive(PrimitiveType::U128) => format!("U128{}", unchecked),
-                            _ => unreachable!(),
+                            Type::Primitive(PrimitiveType::U8) => {
+                                boogie_num_type_string_capital("8", bv_flag)
+                            }
+                            Type::Primitive(PrimitiveType::U16) => format!(
+                                "{}{}",
+                                boogie_num_type_string_capital("16", bv_flag),
+                                unchecked
+                            ),
+                            Type::Primitive(PrimitiveType::U32) => format!(
+                                "{}{}",
+                                boogie_num_type_string_capital("32", bv_flag),
+                                unchecked
+                            ),
+                            Type::Primitive(PrimitiveType::U64) => format!(
+                                "{}{}",
+                                boogie_num_type_string_capital("64", bv_flag),
+                                unchecked
+                            ),
+                            Type::Primitive(PrimitiveType::U128) => format!(
+                                "{}{}",
+                                boogie_num_type_string_capital("128", bv_flag),
+                                unchecked
+                            ),
+                            Type::Primitive(PrimitiveType::U256) => format!(
+                                "{}{}",
+                                boogie_num_type_string_capital("256", bv_flag),
+                                unchecked
+                            ),
+                            Type::Primitive(_)
+                            | Type::Tuple(_)
+                            | Type::Vector(_)
+                            | Type::Struct(_, _, _)
+                            | Type::TypeParameter(_)
+                            | Type::Reference(_, _)
+                            | Type::Fun(_, _)
+                            | Type::TypeDomain(_)
+                            | Type::ResourceDomain(_, _, _)
+                            | Type::Error
+                            | Type::Var(_) => unreachable!(),
                         };
                         emitln!(
                             writer,
@@ -1252,23 +1754,86 @@ impl<'env> FunctionTranslator<'env> {
                         let dest = dests[0];
                         let op1 = srcs[0];
                         let op2 = srcs[1];
-                        emitln!(
-                            writer,
-                            "call {} := $Sub({}, {});",
-                            str_local(dest),
-                            str_local(op1),
-                            str_local(op2)
-                        );
+                        let num_oper = global_state
+                            .get_temp_index_oper(mid, fid, dest, baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+                        if bv_flag {
+                            let sub_type = match &self.get_local_type(dest) {
+                                Type::Primitive(PrimitiveType::U8) => "Bv8".to_string(),
+                                Type::Primitive(PrimitiveType::U16) => "Bv16".to_string(),
+                                Type::Primitive(PrimitiveType::U32) => "Bv32".to_string(),
+                                Type::Primitive(PrimitiveType::U64) => "Bv64".to_string(),
+                                Type::Primitive(PrimitiveType::U128) => "Bv128".to_string(),
+                                Type::Primitive(PrimitiveType::U256) => "Bv256".to_string(),
+                                Type::Primitive(_)
+                                | Type::Tuple(_)
+                                | Type::Vector(_)
+                                | Type::Struct(_, _, _)
+                                | Type::TypeParameter(_)
+                                | Type::Reference(_, _)
+                                | Type::Fun(_, _)
+                                | Type::TypeDomain(_)
+                                | Type::ResourceDomain(_, _, _)
+                                | Type::Error
+                                | Type::Var(_) => unreachable!(),
+                            };
+                            emitln!(
+                                writer,
+                                "call {} := $Sub{}({}, {});",
+                                str_local(dest),
+                                sub_type,
+                                str_local(op1),
+                                str_local(op2)
+                            );
+                        } else {
+                            emitln!(
+                                writer,
+                                "call {} := $Sub({}, {});",
+                                str_local(dest),
+                                str_local(op1),
+                                str_local(op2)
+                            );
+                        }
                     }
                     Mul => {
                         let dest = dests[0];
                         let op1 = srcs[0];
                         let op2 = srcs[1];
+                        let num_oper = global_state
+                            .get_temp_index_oper(mid, fid, dest, baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
                         let mul_type = match &self.get_local_type(dest) {
-                            Type::Primitive(PrimitiveType::U8) => "U8",
-                            Type::Primitive(PrimitiveType::U64) => "U64",
-                            Type::Primitive(PrimitiveType::U128) => "U128",
-                            _ => unreachable!(),
+                            Type::Primitive(PrimitiveType::U8) => {
+                                boogie_num_type_string_capital("8", bv_flag)
+                            }
+                            Type::Primitive(PrimitiveType::U16) => {
+                                boogie_num_type_string_capital("16", bv_flag)
+                            }
+                            Type::Primitive(PrimitiveType::U32) => {
+                                boogie_num_type_string_capital("32", bv_flag)
+                            }
+                            Type::Primitive(PrimitiveType::U64) => {
+                                boogie_num_type_string_capital("64", bv_flag)
+                            }
+                            Type::Primitive(PrimitiveType::U128) => {
+                                boogie_num_type_string_capital("128", bv_flag)
+                            }
+                            Type::Primitive(PrimitiveType::U256) => {
+                                boogie_num_type_string_capital("256", bv_flag)
+                            }
+                            Type::Primitive(_)
+                            | Type::Tuple(_)
+                            | Type::Vector(_)
+                            | Type::Struct(_, _, _)
+                            | Type::TypeParameter(_)
+                            | Type::Reference(_, _)
+                            | Type::Fun(_, _)
+                            | Type::TypeDomain(_)
+                            | Type::ResourceDomain(_, _, _)
+                            | Type::Error
+                            | Type::Var(_) => unreachable!(),
                         };
                         emitln!(
                             writer,
@@ -1283,10 +1848,38 @@ impl<'env> FunctionTranslator<'env> {
                         let dest = dests[0];
                         let op1 = srcs[0];
                         let op2 = srcs[1];
+                        let num_oper = global_state
+                            .get_temp_index_oper(mid, fid, dest, baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+                        let div_type = if bv_flag {
+                            match &self.get_local_type(dest) {
+                                Type::Primitive(PrimitiveType::U8) => "Bv8".to_string(),
+                                Type::Primitive(PrimitiveType::U16) => "Bv16".to_string(),
+                                Type::Primitive(PrimitiveType::U32) => "Bv32".to_string(),
+                                Type::Primitive(PrimitiveType::U64) => "Bv64".to_string(),
+                                Type::Primitive(PrimitiveType::U128) => "Bv128".to_string(),
+                                Type::Primitive(PrimitiveType::U256) => "Bv256".to_string(),
+                                Type::Primitive(_)
+                                | Type::Tuple(_)
+                                | Type::Vector(_)
+                                | Type::Struct(_, _, _)
+                                | Type::TypeParameter(_)
+                                | Type::Reference(_, _)
+                                | Type::Fun(_, _)
+                                | Type::TypeDomain(_)
+                                | Type::ResourceDomain(_, _, _)
+                                | Type::Error
+                                | Type::Var(_) => unreachable!(),
+                            }
+                        } else {
+                            "".to_string()
+                        };
                         emitln!(
                             writer,
-                            "call {} := $Div({}, {});",
+                            "call {} := $Div{}({}, {});",
                             str_local(dest),
+                            div_type,
                             str_local(op1),
                             str_local(op2)
                         );
@@ -1295,92 +1888,163 @@ impl<'env> FunctionTranslator<'env> {
                         let dest = dests[0];
                         let op1 = srcs[0];
                         let op2 = srcs[1];
-                        emitln!(
-                            writer,
-                            "call {} := $Mod({}, {});",
-                            str_local(dest),
-                            str_local(op1),
-                            str_local(op2)
-                        );
-                    }
-                    Shl => {
-                        let dest = dests[0];
-                        let op1 = srcs[0];
-                        let op2 = srcs[1];
-                        let sh_type = match &self.get_local_type(dest) {
-                            Type::Primitive(PrimitiveType::U8) => "U8",
-                            Type::Primitive(PrimitiveType::U64) => "U64",
-                            Type::Primitive(PrimitiveType::U128) => "U128",
-                            _ => unreachable!(),
+                        let num_oper = global_state
+                            .get_temp_index_oper(mid, fid, dest, baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+                        let mod_type = if bv_flag {
+                            match &self.get_local_type(dest) {
+                                Type::Primitive(PrimitiveType::U8) => "Bv8".to_string(),
+                                Type::Primitive(PrimitiveType::U16) => "Bv16".to_string(),
+                                Type::Primitive(PrimitiveType::U32) => "Bv32".to_string(),
+                                Type::Primitive(PrimitiveType::U64) => "Bv64".to_string(),
+                                Type::Primitive(PrimitiveType::U128) => "Bv128".to_string(),
+                                Type::Primitive(PrimitiveType::U256) => "Bv256".to_string(),
+                                Type::Primitive(_)
+                                | Type::Tuple(_)
+                                | Type::Vector(_)
+                                | Type::Struct(_, _, _)
+                                | Type::TypeParameter(_)
+                                | Type::Reference(_, _)
+                                | Type::Fun(_, _)
+                                | Type::TypeDomain(_)
+                                | Type::ResourceDomain(_, _, _)
+                                | Type::Error
+                                | Type::Var(_) => unreachable!(),
+                            }
+                        } else {
+                            "".to_string()
                         };
                         emitln!(
                             writer,
-                            "call {} := $Shl{}({}, {});",
-                            str_local(dest),
-                            sh_type,
-                            str_local(op1),
-                            str_local(op2)
-                        );
-                    }
-                    Shr => {
-                        let dest = dests[0];
-                        let op1 = srcs[0];
-                        let op2 = srcs[1];
-                        emitln!(
-                            writer,
-                            "call {} := $Shr({}, {});",
-                            str_local(dest),
-                            str_local(op1),
-                            str_local(op2)
-                        );
-                    }
-                    Lt => {
-                        let dest = dests[0];
-                        let op1 = srcs[0];
-                        let op2 = srcs[1];
-                        emitln!(
-                            writer,
-                            "call {} := $Lt({}, {});",
-                            str_local(dest),
-                            str_local(op1),
-                            str_local(op2)
-                        );
-                    }
-                    Gt => {
-                        let dest = dests[0];
-                        let op1 = srcs[0];
-                        let op2 = srcs[1];
-                        emitln!(
-                            writer,
-                            "call {} := $Gt({}, {});",
+                            "call {} := $Mod{}({}, {});",
                             str_local(dest),
+                            mod_type,
                             str_local(op1),
                             str_local(op2)
                         );
                     }
-                    Le => {
+                    Shl | Shr => {
                         let dest = dests[0];
                         let op1 = srcs[0];
                         let op2 = srcs[1];
-                        emitln!(
-                            writer,
-                            "call {} := $Le({}, {});",
-                            str_local(dest),
-                            str_local(op1),
-                            str_local(op2)
-                        );
+                        let sh_oper_str = if oper == &Shl { "Shl" } else { "Shr" };
+                        let num_oper = global_state
+                            .get_temp_index_oper(mid, fid, dest, baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+                        if bv_flag {
+                            let target_type = match &self.get_local_type(dest) {
+                                Type::Primitive(PrimitiveType::U8) => "Bv8",
+                                Type::Primitive(PrimitiveType::U16) => "Bv16",
+                                Type::Primitive(PrimitiveType::U32) => "Bv32",
+                                Type::Primitive(PrimitiveType::U64) => "Bv64",
+                                Type::Primitive(PrimitiveType::U128) => "Bv128",
+                                Type::Primitive(PrimitiveType::U256) => "Bv256",
+                                Type::Primitive(_)
+                                | Type::Tuple(_)
+                                | Type::Vector(_)
+                                | Type::Struct(_, _, _)
+                                | Type::TypeParameter(_)
+                                | Type::Reference(_, _)
+                                | Type::Fun(_, _)
+                                | Type::TypeDomain(_)
+                                | Type::ResourceDomain(_, _, _)
+                                | Type::Error
+                                | Type::Var(_) => unreachable!(),
+                            };
+                            let src_type = boogie_num_type_base(&self.get_local_type(op2));
+                            emitln!(
+                                writer,
+                                "call {} := ${}Bv{}From{}({}, {});",
+                                str_local(dest),
+                                sh_oper_str,
+                                target_type,
+                                src_type,
+                                str_local(op1),
+                                str_local(op2)
+                            );
+                        } else {
+                            let sh_type = match &self.get_local_type(dest) {
+                                Type::Primitive(PrimitiveType::U8) => "U8",
+                                Type::Primitive(PrimitiveType::U16) => "U16",
+                                Type::Primitive(PrimitiveType::U32) => "U32",
+                                Type::Primitive(PrimitiveType::U64) => "U64",
+                                Type::Primitive(PrimitiveType::U128) => "U128",
+                                Type::Primitive(PrimitiveType::U256) => "U256",
+                                Type::Primitive(_)
+                                | Type::Tuple(_)
+                                | Type::Vector(_)
+                                | Type::Struct(_, _, _)
+                                | Type::TypeParameter(_)
+                                | Type::Reference(_, _)
+                                | Type::Fun(_, _)
+                                | Type::TypeDomain(_)
+                                | Type::ResourceDomain(_, _, _)
+                                | Type::Error
+                                | Type::Var(_) => unreachable!(),
+                            };
+                            emitln!(
+                                writer,
+                                "call {} := ${}{}({}, {});",
+                                str_local(dest),
+                                sh_oper_str,
+                                sh_type,
+                                str_local(op1),
+                                str_local(op2)
+                            );
+                        }
                     }
-                    Ge => {
+                    Lt | Le | Gt | Ge => {
                         let dest = dests[0];
                         let op1 = srcs[0];
                         let op2 = srcs[1];
-                        emitln!(
-                            writer,
-                            "call {} := $Ge({}, {});",
-                            str_local(dest),
-                            str_local(op1),
-                            str_local(op2)
-                        );
+                        let make_comparison = |comp_oper: &str, op1, op2, dest| {
+                            let num_oper = global_state
+                                .get_temp_index_oper(mid, fid, op1, baseline_flag)
+                                .unwrap();
+                            let bv_flag = self.bv_flag(num_oper);
+                            let lt_type = if bv_flag {
+                                match &self.get_local_type(op1) {
+                                    Type::Primitive(PrimitiveType::U8) => "Bv8".to_string(),
+                                    Type::Primitive(PrimitiveType::U16) => "Bv16".to_string(),
+                                    Type::Primitive(PrimitiveType::U32) => "Bv32".to_string(),
+                                    Type::Primitive(PrimitiveType::U64) => "Bv64".to_string(),
+                                    Type::Primitive(PrimitiveType::U128) => "Bv128".to_string(),
+                                    Type::Primitive(PrimitiveType::U256) => "Bv256".to_string(),
+                                    Type::Primitive(_)
+                                    | Type::Tuple(_)
+                                    | Type::Vector(_)
+                                    | Type::Struct(_, _, _)
+                                    | Type::TypeParameter(_)
+                                    | Type::Reference(_, _)
+                                    | Type::Fun(_, _)
+                                    | Type::TypeDomain(_)
+                                    | Type::ResourceDomain(_, _, _)
+                                    | Type::Error
+                                    | Type::Var(_) => unreachable!(),
+                                }
+                            } else {
+                                "".to_string()
+                            };
+                            emitln!(
+                                writer,
+                                "call {} := {}{}({}, {});",
+                                str_local(dest),
+                                comp_oper,
+                                lt_type,
+                                str_local(op1),
+                                str_local(op2)
+                            );
+                        };
+                        let comp_oper = match oper {
+                            Lt => "$Lt",
+                            Le => "$Le",
+                            Gt => "$Gt",
+                            Ge => "$Ge",
+                            _ => unreachable!(),
+                        };
+                        make_comparison(comp_oper, op1, op2, dest);
                     }
                     Or => {
                         let dest = dests[0];
@@ -1410,8 +2074,16 @@ impl<'env> FunctionTranslator<'env> {
                         let dest = dests[0];
                         let op1 = srcs[0];
                         let op2 = srcs[1];
-                        let oper =
-                            boogie_equality_for_type(env, oper == &Eq, &self.get_local_type(op1));
+                        let num_oper = global_state
+                            .get_temp_index_oper(mid, fid, op1, baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+                        let oper = boogie_equality_for_type(
+                            env,
+                            oper == &Eq,
+                            &self.get_local_type(op1),
+                            bv_flag,
+                        );
                         emitln!(
                             writer,
                             "{} := {}({}, {});",
@@ -1421,34 +2093,108 @@ impl<'env> FunctionTranslator<'env> {
                             str_local(op2)
                         );
                     }
-                    BitOr | BitAnd | Xor => {
-                        env.error(&loc, "Unsupported operator");
+                    Xor | BitOr | BitAnd => {
+                        let dest = dests[0];
+                        let op1 = srcs[0];
+                        let op2 = srcs[1];
+                        let make_bitwise =
+                            |bv_oper: &str, op1: TempIndex, op2: TempIndex, dest: TempIndex| {
+                                let base = match &self.get_local_type(dest) {
+                                    Type::Primitive(PrimitiveType::U8) => "Bv8".to_string(),
+                                    Type::Primitive(PrimitiveType::U16) => "Bv16".to_string(),
+                                    Type::Primitive(PrimitiveType::U32) => "Bv32".to_string(),
+                                    Type::Primitive(PrimitiveType::U64) => "Bv64".to_string(),
+                                    Type::Primitive(PrimitiveType::U128) => "Bv128".to_string(),
+                                    Type::Primitive(PrimitiveType::U256) => "Bv256".to_string(),
+                                    Type::Primitive(_)
+                                    | Type::Tuple(_)
+                                    | Type::Vector(_)
+                                    | Type::Struct(_, _, _)
+                                    | Type::TypeParameter(_)
+                                    | Type::Reference(_, _)
+                                    | Type::Fun(_, _)
+                                    | Type::TypeDomain(_)
+                                    | Type::ResourceDomain(_, _, _)
+                                    | Type::Error
+                                    | Type::Var(_) => unreachable!(),
+                                };
+                                let op1_ty = &self.get_local_type(op1);
+                                let op2_ty = &self.get_local_type(op2);
+                                let num_oper_1 = global_state
+                                    .get_temp_index_oper(mid, fid, op1, baseline_flag)
+                                    .unwrap();
+                                let op1_bv_flag = self.bv_flag(num_oper_1);
+                                let num_oper_2 = global_state
+                                    .get_temp_index_oper(mid, fid, op2, baseline_flag)
+                                    .unwrap();
+                                let op2_bv_flag = self.bv_flag(num_oper_2);
+                                let op1_str = if !op1_bv_flag {
+                                    format!(
+                                        "$int2bv.{}({})",
+                                        boogie_num_type_base(op1_ty),
+                                        str_local(op1)
+                                    )
+                                } else {
+                                    str_local(op1)
+                                };
+                                let op2_str = if !op2_bv_flag {
+                                    format!(
+                                        "$int2bv.{}({})",
+                                        boogie_num_type_base(op2_ty),
+                                        str_local(op2)
+                                    )
+                                } else {
+                                    str_local(op2)
+                                };
+                                emitln!(
+                                    writer,
+                                    "call {} := {}{}({}, {});",
+                                    str_local(dest),
+                                    bv_oper,
+                                    base,
+                                    op1_str,
+                                    op2_str
+                                );
+                            };
+                        let bv_oper_str = match oper {
+                            Xor => "$Xor",
+                            BitOr => "$Or",
+                            BitAnd => "$And",
+                            _ => unreachable!(),
+                        };
+                        make_bitwise(bv_oper_str, op1, op2, dest);
+                    }
+                    Uninit => {
                         emitln!(
                             writer,
-                            "// bit operation not supported: {:?}\nassert false;",
-                            bytecode
+                            "assume l#$Mutation($t{}) == $Uninitialized();",
+                            srcs[0]
                         );
                     }
                     Destroy => {}
                     TraceLocal(idx) => {
-                        self.track_local(*idx, srcs[0]);
+                        let num_oper = global_state
+                            .get_temp_index_oper(mid, fid, srcs[0], baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+                        self.track_local(*idx, srcs[0], bv_flag);
                     }
                     TraceReturn(i) => {
-                        self.track_return(*i, srcs[0]);
+                        let oper_map = global_state.get_ret_map();
+                        let bv_flag = self.bv_flag_from_map(&srcs[0], oper_map);
+                        self.track_return(*i, srcs[0], bv_flag);
                     }
                     TraceAbort => self.track_abort(&str_local(srcs[0])),
-                    TraceExp(kind, node_id) => self.track_exp(*kind, *node_id, srcs[0]),
+                    TraceExp(kind, node_id) => {
+                        let bv_flag = *global_state
+                            .get_temp_index_oper(mid, fid, srcs[0], baseline_flag)
+                            .unwrap()
+                            == Bitwise;
+                        self.track_exp(*kind, *node_id, srcs[0], bv_flag)
+                    }
                     EmitEvent => {
                         let msg = srcs[0];
                         let handle = srcs[1];
-                        let translate_local = |idx: usize| {
-                            let ty = &self.get_local_type(idx);
-                            if ty.is_mutable_reference() {
-                                format!("$Dereference({})", str_local(idx))
-                            } else {
-                                str_local(idx)
-                            }
-                        };
                         let suffix = boogie_type_suffix(env, &self.get_local_type(msg));
                         emit!(
                             writer,
@@ -1456,7 +2202,7 @@ impl<'env> FunctionTranslator<'env> {
                             if srcs.len() > 2 { "Cond" } else { "" },
                             suffix
                         );
-                        emit!(writer, "{}, {}", translate_local(handle), str_local(msg));
+                        emit!(writer, "{}, {}", str_local(handle), str_local(msg));
                         if srcs.len() > 2 {
                             emit!(writer, ", {}", str_local(srcs[2]));
                         }
@@ -1470,7 +2216,6 @@ impl<'env> FunctionTranslator<'env> {
                         let node_id = env.new_node(env.unknown_loc(), mem.to_type());
                         self.track_global_mem(mem, node_id);
                     }
-                    CastU256 => unimplemented!(),
                 }
                 if let Some(AbortAction(target, code)) = aa {
                     emitln!(writer, "if ($abort_flag) {");
@@ -1523,7 +2268,6 @@ impl<'env> FunctionTranslator<'env> {
                 emitln!(writer, "$t{} := $Dereference({});", idx, src_str);
             }
             Reference(idx) => {
-                let dst_ty = &self.get_local_type(*idx).skip_reference().clone();
                 let dst_value = format!("$Dereference($t{})", idx);
                 let src_value = format!("$Dereference({})", src_str);
                 let get_path_index = |offset: usize| {
@@ -1541,7 +2285,6 @@ impl<'env> FunctionTranslator<'env> {
                 };
                 let update = if let BorrowEdge::Hyper(edges) = edge {
                     self.translate_write_back_update(
-                        dst_ty,
                         &mut || dst_value.clone(),
                         &get_path_index,
                         src_value,
@@ -1550,7 +2293,6 @@ impl<'env> FunctionTranslator<'env> {
                     )
                 } else {
                     self.translate_write_back_update(
-                        dst_ty,
                         &mut || dst_value.clone(),
                         &get_path_index,
                         src_value,
@@ -1569,9 +2311,19 @@ impl<'env> FunctionTranslator<'env> {
         }
     }
 
+    /// Returns read aggregate and write aggregate if fun_env matches one of the native functions
+    /// implementing custom mutable borrow.
+    fn get_borrow_native_aggregate_names(&self, fn_name: &String) -> Option<(String, String)> {
+        for f in &self.parent.options.borrow_aggregates {
+            if &f.name == fn_name {
+                return Some((f.read_aggregate.clone(), f.write_aggregate.clone()));
+            }
+        }
+        None
+    }
+
     fn translate_write_back_update(
         &self,
-        dst_ty: &Type,
         mk_dest: &mut dyn FnMut() -> String,
         get_path_index: &dyn Fn(usize) -> String,
         src: String,
@@ -1582,24 +2334,17 @@ impl<'env> FunctionTranslator<'env> {
             src
         } else {
             match &edges[at] {
-                BorrowEdge::Direct => self.translate_write_back_update(
-                    dst_ty,
-                    mk_dest,
-                    get_path_index,
-                    src,
-                    edges,
-                    at + 1,
-                ),
+                BorrowEdge::Direct => {
+                    self.translate_write_back_update(mk_dest, get_path_index, src, edges, at + 1)
+                }
                 BorrowEdge::Field(memory, offset) => {
                     let memory = memory.to_owned().instantiate(self.type_inst);
                     let struct_env = &self.parent.env.get_struct_qid(memory.to_qualified_id());
                     let field_env = &struct_env.get_field_by_offset(*offset);
                     let sel_fun = boogie_field_sel(field_env, &memory.inst);
                     let new_dest = format!("{}({})", sel_fun, (*mk_dest)());
-                    let new_dest_ty = &self.inst(&field_env.get_type());
                     let mut new_dest_needed = false;
                     let new_src = self.translate_write_back_update(
-                        new_dest_ty,
                         &mut || {
                             new_dest_needed = true;
                             format!("$$sel{}", at)
@@ -1623,15 +2368,19 @@ impl<'env> FunctionTranslator<'env> {
                         format!("{}({}, {})", update_fun, (*mk_dest)(), new_src)
                     }
                 }
-                BorrowEdge::Index => {
-                    // Index edge is used for both vectors and tables. Determine which operations
-                    // to use to read and update.
-                    let (read_aggregate, update_aggregate, elem_ty) = match dst_ty {
-                        Type::Vector(et) => ("ReadVec", "UpdateVec", et.as_ref().clone()),
-                        // If its not a vector, we assume it is the Table type.
-                        Type::Struct(_, _, inst) => ("GetTable", "UpdateTable", inst[1].clone()),
-                        _ => unreachable!(),
+                BorrowEdge::Index(index_edge_kind) => {
+                    // Index edge is used for both vectors, tables, and custom native methods
+                    // implementing similar functionality (mutable borrow). Determine which
+                    // operations to use to read and update.
+                    let (read_aggregate, update_aggregate) = match index_edge_kind {
+                        IndexEdgeKind::Vector => ("ReadVec".to_string(), "UpdateVec".to_string()),
+                        IndexEdgeKind::Table => ("GetTable".to_string(), "UpdateTable".to_string()),
+                        IndexEdgeKind::Custom(name) => {
+                            // panic here means that custom borrow natives options were not specified properly
+                            self.get_borrow_native_aggregate_names(name).unwrap()
+                        }
                     };
+
                     // Compute the offset into the path where to retrieve the index.
                     let offset = edges[0..at]
                         .iter()
@@ -1642,7 +2391,6 @@ impl<'env> FunctionTranslator<'env> {
                     let mut new_dest_needed = false;
                     // Recursively perform write backs for next edges
                     let new_src = self.translate_write_back_update(
-                        &elem_ty,
                         &mut || {
                             new_dest_needed = true;
                             format!("$$sel{}", at)
@@ -1707,18 +2455,30 @@ impl<'env> FunctionTranslator<'env> {
     }
 
     /// Generates an update of the debug information about temporary.
-    fn track_local(&self, origin_idx: TempIndex, idx: TempIndex) {
+    fn track_local(&self, origin_idx: TempIndex, idx: TempIndex, bv_flag: bool) {
         emitln!(
             self.parent.writer,
-            &boogie_debug_track_local(self.fun_target, origin_idx, idx, &self.get_local_type(idx),)
+            &boogie_debug_track_local(
+                self.fun_target,
+                origin_idx,
+                idx,
+                &self.get_local_type(idx),
+                bv_flag
+            )
         );
     }
 
     /// Generates an update of the debug information about the return value at given location.
-    fn track_return(&self, return_idx: usize, idx: TempIndex) {
+    fn track_return(&self, return_idx: usize, idx: TempIndex, bv_flag: bool) {
         emitln!(
             self.parent.writer,
-            &boogie_debug_track_return(self.fun_target, return_idx, idx, &self.get_local_type(idx))
+            &boogie_debug_track_return(
+                self.fun_target,
+                return_idx,
+                idx,
+                &self.get_local_type(idx),
+                bv_flag
+            )
         );
     }
 
@@ -1734,12 +2494,12 @@ impl<'env> FunctionTranslator<'env> {
         );
     }
 
-    fn track_exp(&self, kind: TraceKind, node_id: NodeId, temp: TempIndex) {
+    fn track_exp(&self, kind: TraceKind, node_id: NodeId, temp: TempIndex, bv_flag: bool) {
         let env = self.parent.env;
         let writer = self.parent.writer;
         let ty = self.get_local_type(temp);
         let temp_str = if ty.is_reference() {
-            let new_temp = boogie_temp(env, ty.skip_reference(), 0);
+            let new_temp = boogie_temp(env, ty.skip_reference(), 0, bv_flag);
             emitln!(writer, "{} := $Dereference($t{});", new_temp, temp);
             new_temp
         } else {
@@ -1764,35 +2524,70 @@ impl<'env> FunctionTranslator<'env> {
         format!("({},{},{})", file_idx, loc.span().start(), loc.span().end())
     }
 
-    /// Compute temporaries needed for the compilation of given function. Because boogie does
-    /// not allow to declare locals in arbitrary blocks, we need to compute them upfront.
-    fn compute_needed_temps(&self) -> BTreeMap<String, (Type, usize)> {
+    fn compute_needed_temps(&self) -> BTreeMap<(String, bool), (Type, bool, usize)> {
         use Bytecode::*;
         use Operation::*;
 
         let fun_target = self.fun_target;
         let env = fun_target.global_env();
 
-        let mut res: BTreeMap<String, (Type, usize)> = BTreeMap::new();
-        let mut need = |ty: &Type, n: usize| {
+        let mut res: BTreeMap<(String, bool), (Type, bool, usize)> = BTreeMap::new();
+        let mut need = |ty: &Type, bv_flag: bool, n: usize| {
             // Index by type suffix, which is more coarse grained then type.
             let ty = ty.skip_reference();
             let suffix = boogie_type_suffix(env, ty);
-            let cnt = res.entry(suffix).or_insert_with(|| (ty.to_owned(), 0));
-            (*cnt).1 = (*cnt).1.max(n);
+            let cnt = res
+                .entry((suffix, bv_flag))
+                .or_insert_with(|| (ty.to_owned(), bv_flag, 0));
+            cnt.2 = cnt.2.max(n);
         };
+        let baseline_flag = self.fun_target.data.variant == FunctionVariant::Baseline;
+        let global_state = &self
+            .fun_target
+            .global_env()
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let ret_oper_map = &global_state.get_ret_map();
+        let mid = fun_target.func_env.module_env.get_id();
+        let fid = fun_target.func_env.get_id();
+
         for bc in &fun_target.data.code {
             match bc {
-                Call(_, _, oper, srcs, ..) => match oper {
-                    TraceExp(_, id) => need(&self.inst(&env.get_node_type(*id)), 1),
-                    TraceReturn(idx) => need(&self.inst(fun_target.get_return_type(*idx)), 1),
-                    TraceLocal(_) => need(&self.get_local_type(srcs[0]), 1),
-                    Havoc(HavocKind::MutationValue) => need(&self.get_local_type(srcs[0]), 1),
+                Call(_, dests, oper, srcs, ..) => match oper {
+                    TraceExp(_, id) => {
+                        let ty = &self.inst(&env.get_node_type(*id));
+                        let bv_flag = global_state.get_node_num_oper(*id) == Bitwise;
+                        need(ty, bv_flag, 1)
+                    }
+                    TraceReturn(idx) => {
+                        let ty = &self.inst(fun_target.get_return_type(*idx));
+                        let bv_flag = self.bv_flag_from_map(idx, ret_oper_map);
+                        need(ty, bv_flag, 1)
+                    }
+                    TraceLocal(_) => {
+                        let ty = &self.get_local_type(srcs[0]);
+                        let num_oper = &global_state
+                            .get_temp_index_oper(mid, fid, srcs[0], baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+                        need(ty, bv_flag, 1)
+                    }
+                    Havoc(HavocKind::MutationValue) => {
+                        let ty = &self.get_local_type(dests[0]);
+                        let num_oper = &global_state
+                            .get_temp_index_oper(mid, fid, dests[0], baseline_flag)
+                            .unwrap();
+                        let bv_flag = self.bv_flag(num_oper);
+                        need(ty, bv_flag, 1)
+                    }
                     _ => {}
                 },
                 Prop(_, PropKind::Modifies, exp) => {
-                    need(&BOOL_TYPE, 1);
-                    need(&self.inst(&env.get_node_type(exp.node_id())), 1)
+                    // global_state.exp_operation_map.get(exp.node_id()) == Bitwise;
+                    //let bv_flag = env.get_node_num_oper(exp.node_id()) == Bitwise;
+                    let bv_flag = global_state.get_node_num_oper(exp.node_id()) == Bitwise;
+                    need(&BOOL_TYPE, false, 1);
+                    need(&self.inst(&env.get_node_type(exp.node_id())), bv_flag, 1)
                 }
                 _ => {}
             }
@@ -1832,6 +2627,14 @@ pub fn has_native_equality(env: &GlobalEnv, options: &BoogieOptions, ty: &Type)
         Type::Struct(mid, sid, sinst) => {
             struct_has_native_equality(&env.get_struct_qid(mid.qualified(*sid)), sinst, options)
         }
-        _ => true,
+        Type::Primitive(_)
+        | Type::Tuple(_)
+        | Type::TypeParameter(_)
+        | Type::Reference(_, _)
+        | Type::Fun(_, _)
+        | Type::TypeDomain(_)
+        | Type::ResourceDomain(_, _, _)
+        | Type::Error
+        | Type::Var(_) => true,
     }
 }
diff --git a/language/move-prover/boogie-backend/src/lib.rs b/language/move-prover/boogie-backend/src/lib.rs
index a04cf73e87..a255739ce4 100644
--- a/language/move-prover/boogie-backend/src/lib.rs
+++ b/language/move-prover/boogie-backend/src/lib.rs
@@ -9,19 +9,29 @@ use std::collections::BTreeSet;
 use itertools::Itertools;
 #[allow(unused_imports)]
 use log::{debug, info, warn};
+use num::BigUint;
 use serde::{Deserialize, Serialize};
 use tera::{Context, Tera};
 
 use move_model::{
     code_writer::CodeWriter,
     emit, emitln,
-    model::GlobalEnv,
+    model::{GlobalEnv, QualifiedId, StructId},
+    pragmas::{
+        INTRINSIC_FUN_MAP_ADD_NO_OVERRIDE, INTRINSIC_FUN_MAP_ADD_OVERRIDE_IF_EXISTS,
+        INTRINSIC_FUN_MAP_BORROW, INTRINSIC_FUN_MAP_BORROW_MUT, INTRINSIC_FUN_MAP_DEL_MUST_EXIST,
+        INTRINSIC_FUN_MAP_DEL_RETURN_KEY, INTRINSIC_FUN_MAP_DESTROY_EMPTY,
+        INTRINSIC_FUN_MAP_HAS_KEY, INTRINSIC_FUN_MAP_IS_EMPTY, INTRINSIC_FUN_MAP_LEN,
+        INTRINSIC_FUN_MAP_NEW, INTRINSIC_FUN_MAP_SPEC_DEL, INTRINSIC_FUN_MAP_SPEC_GET,
+        INTRINSIC_FUN_MAP_SPEC_HAS_KEY, INTRINSIC_FUN_MAP_SPEC_IS_EMPTY,
+        INTRINSIC_FUN_MAP_SPEC_LEN, INTRINSIC_FUN_MAP_SPEC_NEW, INTRINSIC_FUN_MAP_SPEC_SET,
+    },
     ty::{PrimitiveType, Type},
 };
 use move_stackless_bytecode::mono_analysis;
 
 use crate::{
-    boogie_helpers::{boogie_type, boogie_type_suffix},
+    boogie_helpers::{boogie_bv_type, boogie_module_name, boogie_type, boogie_type_suffix_bv},
     bytecode_translator::has_native_equality,
     options::{BoogieOptions, VectorTheory},
 };
@@ -55,6 +65,75 @@ struct TypeInfo {
     has_native_equality: bool,
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, Default)]
+struct BvInfo {
+    base: usize,
+    max: String,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, Default)]
+struct MapImpl {
+    struct_name: String,
+    insts: Vec<(TypeInfo, TypeInfo)>,
+    // move functions
+    fun_new: String,
+    fun_destroy_empty: String,
+    fun_len: String,
+    fun_is_empty: String,
+    fun_has_key: String,
+    fun_add_no_override: String,
+    fun_add_override_if_exists: String,
+    fun_del_must_exist: String,
+    fun_del_return_key: String,
+    fun_borrow: String,
+    fun_borrow_mut: String,
+    // spec functions
+    fun_spec_new: String,
+    fun_spec_get: String,
+    fun_spec_set: String,
+    fun_spec_del: String,
+    fun_spec_len: String,
+    fun_spec_is_empty: String,
+    fun_spec_has_key: String,
+}
+
+/// Help generating vector functions for bv types
+fn bv_helper() -> Vec<BvInfo> {
+    let mut bv_info = vec![];
+    let bv_8 = BvInfo {
+        base: 8,
+        max: "255".to_string(),
+    };
+    bv_info.push(bv_8);
+    let bv_16 = BvInfo {
+        base: 16,
+        max: "65535".to_string(),
+    };
+    bv_info.push(bv_16);
+    let bv_32 = BvInfo {
+        base: 32,
+        max: "2147483647".to_string(),
+    };
+    bv_info.push(bv_32);
+    let bv_64 = BvInfo {
+        base: 64,
+        max: "18446744073709551615".to_string(),
+    };
+    bv_info.push(bv_64);
+    let bv_128 = BvInfo {
+        base: 128,
+        max: "340282366920938463463374607431768211455".to_string(),
+    };
+    bv_info.push(bv_128);
+    let bv_256 = BvInfo {
+        base: 256,
+        max: "115792089237316195423570985008687907853269984665640564039457584007913129639935"
+            .to_string(),
+    };
+    bv_info.push(bv_256);
+    bv_info
+}
+
 /// Adds the prelude to the generated output.
 pub fn add_prelude(
     env: &GlobalEnv,
@@ -84,9 +163,6 @@ pub fn add_prelude(
     templates.push(templ("multiset-theory", MULTISET_ARRAY_THEORY));
     templates.push(templ("table-theory", TABLE_ARRAY_THEORY));
 
-    let mut tera = Tera::default();
-    tera.add_raw_templates(templates)?;
-
     let mut context = Context::new();
     context.insert("options", options);
 
@@ -96,53 +172,106 @@ pub fn add_prelude(
         env,
         options,
         &Type::Primitive(PrimitiveType::U8),
+        false,
     )];
-    let vec_instances = mono_info
+    // Used for generating functions for bv types in prelude
+    let mut sh_instances = vec![8, 16, 32, 64, 128, 256];
+    let mut bv_instances = bv_helper();
+    // Skip bv for cvc5
+    if options.use_cvc5 {
+        sh_instances = vec![];
+        bv_instances = vec![];
+    }
+    context.insert("sh_instances", &sh_instances);
+    context.insert("bv_instances", &bv_instances);
+    let mut vec_instances = mono_info
         .vec_inst
         .iter()
-        .map(|ty| TypeInfo::new(env, options, ty))
+        .map(|ty| TypeInfo::new(env, options, ty, false))
         .chain(implicit_vec_inst.into_iter())
         .collect::<BTreeSet<_>>()
         .into_iter()
         .collect_vec();
-    context.insert("vec_instances", &vec_instances);
-    let table_instances = mono_info
+    let mut table_instances = mono_info
         .table_inst
         .iter()
-        .map(|(kty, vty)| {
-            (
-                TypeInfo::new(env, options, kty),
-                TypeInfo::new(env, options, vty),
-            )
-        })
+        .map(|(qid, ty_args)| MapImpl::new(env, options, *qid, ty_args, false))
         .collect_vec();
+    // If not using cvc5, generate vector functions for bv types
+    if !options.use_cvc5 {
+        let mut bv_vec_instances = mono_info
+            .vec_inst
+            .iter()
+            .map(|ty| TypeInfo::new(env, options, ty, true))
+            .filter(|ty_info| !vec_instances.contains(ty_info))
+            .collect::<BTreeSet<_>>()
+            .into_iter()
+            .collect_vec();
+        let mut bv_table_instances = mono_info
+            .table_inst
+            .iter()
+            .map(|(qid, ty_args)| {
+                let v_ty = ty_args.iter().map(|(_, vty)| vty).collect_vec();
+                let bv_flag = v_ty.iter().all(|ty| ty.skip_reference().is_number());
+                MapImpl::new(env, options, *qid, ty_args, bv_flag)
+            })
+            .filter(|map_impl| !table_instances.contains(map_impl))
+            .collect_vec();
+        vec_instances.append(&mut bv_vec_instances);
+        table_instances.append(&mut bv_table_instances);
+    }
+    context.insert("vec_instances", &vec_instances);
+    context.insert("table_instances", &table_instances);
     let table_key_instances = mono_info
         .table_inst
         .iter()
-        .map(|(kty, _)| kty)
+        .flat_map(|(_, ty_args)| ty_args.iter().map(|(kty, _)| kty))
         .unique()
-        .map(|ty| TypeInfo::new(env, options, ty))
+        .map(|ty| TypeInfo::new(env, options, ty, false))
         .collect_vec();
-    context.insert("table_instances", &table_instances);
     context.insert("table_key_instances", &table_key_instances);
     let filter_native = |module: &str| {
         mono_info
             .native_inst
             .iter()
             .filter(|(id, _)| env.get_module(**id).get_full_name_str() == module)
-            .map(|(_, insts)| {
-                insts
-                    .iter()
-                    .map(|inst| TypeInfo::new(env, options, &inst[0]))
+            .flat_map(|(_, insts)| {
+                insts.iter().map(|inst| {
+                    inst.iter()
+                        .map(|i| TypeInfo::new(env, options, i, false))
+                        .collect::<Vec<_>>()
+                })
             })
-            .flatten()
-            .collect::<BTreeSet<_>>()
+            .sorted()
+            .collect_vec()
+    };
+    // make sure that all natives have only one type instantiations
+    // because of this assertion, this function returns a `Vec<TypeInfo>`
+    let filter_native_ensure_one_inst = |module: &str| {
+        filter_native(module)
             .into_iter()
+            .map(|mut insts| {
+                assert_eq!(insts.len(), 1);
+                insts.pop().unwrap()
+            })
+            .sorted()
             .collect_vec()
     };
-    let bcs_instances = filter_native(BCS_MODULE);
+    // make sure that all natives have exactly the same number of type instantiations,
+    // this function returns a `Vec<Vec<TypeInfo>>`
+    let filter_native_check_consistency = |module: &str| {
+        let filtered = filter_native(module);
+        let size = match filtered.first() {
+            None => 0,
+            Some(insts) => insts.len(),
+        };
+        assert!(filtered.iter().all(|insts| insts.len() == size));
+        filtered
+    };
+
+    let bcs_instances = filter_native_ensure_one_inst(BCS_MODULE);
     context.insert("bcs_instances", &bcs_instances);
-    let event_instances = filter_native(EVENT_MODULE);
+    let event_instances = filter_native_ensure_one_inst(EVENT_MODULE);
     context.insert("event_instances", &event_instances);
 
     // TODO: we have defined {{std}} for adaptable resolution of stdlib addresses but
@@ -152,17 +281,137 @@ pub fn add_prelude(
     context.insert("std", &std_addr);
     context.insert("Ext", &ext_addr);
 
+    // If a custom Boogie template is provided, add it as part of the templates and
+    // add all type instances that use generic functions in the provided modules to the context.
+    if let Some(custom_native_options) = options.custom_natives.clone() {
+        templates.push(templ(
+            "custom-natives",
+            &custom_native_options.template_bytes,
+        ));
+        for (module_name, instance_name, expect_single_type_inst) in
+            custom_native_options.module_instance_names
+        {
+            if expect_single_type_inst {
+                context.insert(instance_name, &filter_native_ensure_one_inst(&module_name));
+            } else {
+                context.insert(
+                    instance_name,
+                    &filter_native_check_consistency(&module_name),
+                );
+            }
+        }
+    }
+
+    let mut tera = Tera::default();
+    tera.add_raw_templates(templates)?;
+
     let expanded_content = tera.render("prelude", &context)?;
     emitln!(writer, &expanded_content);
     Ok(())
 }
 
 impl TypeInfo {
-    fn new(env: &GlobalEnv, options: &BoogieOptions, ty: &Type) -> Self {
+    fn new(env: &GlobalEnv, options: &BoogieOptions, ty: &Type, bv_flag: bool) -> Self {
+        let name_fun = if bv_flag { boogie_bv_type } else { boogie_type };
         Self {
-            name: boogie_type(env, ty),
-            suffix: boogie_type_suffix(env, ty),
+            name: name_fun(env, ty),
+            suffix: boogie_type_suffix_bv(env, ty, bv_flag),
             has_native_equality: has_native_equality(env, options, ty),
         }
     }
 }
+
+impl MapImpl {
+    fn new(
+        env: &GlobalEnv,
+        options: &BoogieOptions,
+        struct_qid: QualifiedId<StructId>,
+        ty_args: &BTreeSet<(Type, Type)>,
+        bv_flag: bool,
+    ) -> Self {
+        let insts = ty_args
+            .iter()
+            .map(|(kty, vty)| {
+                (
+                    TypeInfo::new(env, options, kty, false),
+                    TypeInfo::new(env, options, vty, bv_flag),
+                )
+            })
+            .collect();
+        let struct_env = env.get_struct(struct_qid);
+        let struct_name = format!(
+            "${}_{}",
+            boogie_module_name(&struct_env.module_env),
+            struct_env.get_name().display(struct_env.symbol_pool()),
+        );
+
+        let decl = env
+            .intrinsics
+            .get_decl_for_struct(&struct_qid)
+            .expect("intrinsic decl");
+
+        MapImpl {
+            struct_name,
+            insts,
+            fun_new: Self::triple_opt_to_name(decl.get_fun_triple(env, INTRINSIC_FUN_MAP_NEW)),
+            fun_destroy_empty: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_DESTROY_EMPTY),
+            ),
+            fun_len: Self::triple_opt_to_name(decl.get_fun_triple(env, INTRINSIC_FUN_MAP_LEN)),
+            fun_is_empty: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_IS_EMPTY),
+            ),
+            fun_has_key: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_HAS_KEY),
+            ),
+            fun_add_no_override: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_ADD_NO_OVERRIDE),
+            ),
+            fun_add_override_if_exists: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_ADD_OVERRIDE_IF_EXISTS),
+            ),
+            fun_del_must_exist: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_DEL_MUST_EXIST),
+            ),
+            fun_del_return_key: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_DEL_RETURN_KEY),
+            ),
+            fun_borrow: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_BORROW),
+            ),
+            fun_borrow_mut: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_BORROW_MUT),
+            ),
+            fun_spec_new: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_SPEC_NEW),
+            ),
+            fun_spec_get: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_SPEC_GET),
+            ),
+            fun_spec_set: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_SPEC_SET),
+            ),
+            fun_spec_del: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_SPEC_DEL),
+            ),
+            fun_spec_len: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_SPEC_LEN),
+            ),
+            fun_spec_is_empty: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_SPEC_IS_EMPTY),
+            ),
+            fun_spec_has_key: Self::triple_opt_to_name(
+                decl.get_fun_triple(env, INTRINSIC_FUN_MAP_SPEC_HAS_KEY),
+            ),
+        }
+    }
+
+    fn triple_opt_to_name(triple_opt: Option<(BigUint, String, String)>) -> String {
+        match triple_opt {
+            None => String::new(),
+            Some((addr, mod_name, fun_name)) => {
+                format!("${}_{}_{}", addr.to_str_radix(16), mod_name, fun_name)
+            }
+        }
+    }
+}
diff --git a/language/move-prover/boogie-backend/src/options.rs b/language/move-prover/boogie-backend/src/options.rs
index 10e0eb2c6b..f53aab12ae 100644
--- a/language/move-prover/boogie-backend/src/options.rs
+++ b/language/move-prover/boogie-backend/src/options.rs
@@ -19,8 +19,8 @@ const DEFAULT_BOOGIE_FLAGS: &[&str] = &[
     "-proverOpt:O:model_validate=true",
 ];
 
-const MIN_BOOGIE_VERSION: &str = "2.9.0";
-const MIN_Z3_VERSION: &str = "4.8.9";
+const MIN_BOOGIE_VERSION: &str = "2.15.8";
+const MIN_Z3_VERSION: &str = "4.11.0";
 const MIN_CVC5_VERSION: &str = "0.0.3";
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
@@ -41,6 +41,39 @@ impl VectorTheory {
     }
 }
 
+/// Options to define custom native functions to include in generated Boogie file.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CustomNativeOptions {
+    /// Bytes of the custom template.
+    pub template_bytes: Vec<u8>,
+    /// List of (module name, module instance key, single_type_expected) tuples,
+    /// used to generate instantiated versions of generic native functions.
+    pub module_instance_names: Vec<(String, String, bool)>,
+}
+
+/// Contains information about a native method implementing mutable borrow semantics for a given
+/// type in an alternative storage model (returning &mut without taking appropriate &mut as a
+/// parameter, much like vector::borrow_mut)
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct BorrowAggregate {
+    /// Method's name (qualified with module name, e.g., m::foo)
+    pub name: String,
+    /// Name of the read aggregate
+    pub read_aggregate: String,
+    /// Name of the write aggregate
+    pub write_aggregate: String,
+}
+
+impl BorrowAggregate {
+    pub fn new(name: String, read_aggregate: String, write_aggregate: String) -> Self {
+        BorrowAggregate {
+            name,
+            read_aggregate,
+            write_aggregate,
+        }
+    }
+}
+
 /// Boogie options.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(default, deny_unknown_fields)]
@@ -106,6 +139,12 @@ pub struct BoogieOptions {
     pub vector_theory: VectorTheory,
     /// Whether to generate a z3 trace file and where to put it.
     pub z3_trace_file: Option<String>,
+    /// Options to define user-custom native funs.
+    pub custom_natives: Option<CustomNativeOptions>,
+    /// Number of iterations to unroll loops.
+    pub loop_unroll: Option<u64>,
+    /// Optional aggregate function names for native methods implementing mutable borrow semantics
+    pub borrow_aggregates: Vec<BorrowAggregate>,
 }
 
 impl Default for BoogieOptions {
@@ -140,6 +179,9 @@ impl Default for BoogieOptions {
             hard_timeout_secs: 0,
             vector_theory: VectorTheory::BoogieArray,
             z3_trace_file: None,
+            custom_natives: None,
+            loop_unroll: None,
+            borrow_aggregates: vec![],
         }
     }
 }
@@ -193,6 +235,9 @@ impl BoogieOptions {
                 self.lazy_threshold
             )]);
         }
+        if let Some(iters) = self.loop_unroll {
+            add(&[&format!("-loopUnroll:{}", iters)]);
+        }
         add(&[&format!(
             "-vcsCores:{}",
             if self.stable_test_output {
@@ -245,10 +290,17 @@ impl BoogieOptions {
     /// Checks whether the expected tool versions are installed in the environment.
     pub fn check_tool_versions(&self) -> anyhow::Result<()> {
         if !self.boogie_exe.is_empty() {
+            // On Mac, version arg is `/version`, not `-version`
+            let version_arg = if cfg!(target_os = "macos") {
+                &["/version"]
+            } else {
+                &["-version"]
+            };
+
             let version = Self::get_version(
                 "boogie",
                 &self.boogie_exe,
-                &["-version"],
+                version_arg,
                 r"version ([0-9.]*)",
             )?;
             Self::check_version_is_greater("boogie", &version, MIN_BOOGIE_VERSION)?;
@@ -307,6 +359,9 @@ impl BoogieOptions {
                     tool
                 ));
             }
+            if gn > en {
+                break;
+            }
         }
         Ok(())
     }
diff --git a/language/move-prover/boogie-backend/src/prelude/native.bpl b/language/move-prover/boogie-backend/src/prelude/native.bpl
index 80a5f294a1..85969bde4e 100644
--- a/language/move-prover/boogie-backend/src/prelude/native.bpl
+++ b/language/move-prover/boogie-backend/src/prelude/native.bpl
@@ -22,6 +22,18 @@ function $IsEqual'vec{{S}}'(v1: Vec ({{T}}), v2: Vec ({{T}})): bool {
 }
 {%- endif %}
 
+// Not inlined.
+function $IsPrefix'vec{{S}}'(v: Vec ({{T}}), prefix: Vec ({{T}})): bool {
+    LenVec(v) >= LenVec(prefix) &&
+    (forall i: int:: InRangeVec(prefix, i) ==> $IsEqual{{S}}(ReadVec(v, i), ReadVec(prefix, i)))
+}
+
+// Not inlined.
+function $IsSuffix'vec{{S}}'(v: Vec ({{T}}), suffix: Vec ({{T}})): bool {
+    LenVec(v) >= LenVec(suffix) &&
+    (forall i: int:: InRangeVec(suffix, i) ==> $IsEqual{{S}}(ReadVec(v, LenVec(v) - LenVec(suffix) + i), ReadVec(suffix, i)))
+}
+
 // Not inlined.
 function $IsValid'vec{{S}}'(v: Vec ({{T}})): bool {
     $IsValid'u64'(LenVec(v)) &&
@@ -175,6 +187,25 @@ procedure {:inline 1} $1_vector_remove{{S}}(m: $Mutation (Vec ({{T}})), i: int)
     m' := $UpdateMutation(m, RemoveAtVec(v, i));
 }
 
+procedure {:inline 1} $1_vector_insert{{S}}(m: $Mutation (Vec ({{T}})), val: {{T}}, i: int) returns (m': $Mutation (Vec ({{T}}))) {
+
+    var len: int;
+    var v: Vec ({{T}});
+
+    v := $Dereference(m);
+
+    len := LenVec(v);
+    if (i < 0 || i > len) {
+        call $ExecFailureAbort();
+        return;
+    }
+    if (i == len) {
+        m' := $UpdateMutation(m, ExtendVec(v, val));
+    } else {
+        m' := $UpdateMutation(m, InsertAtVec(v, i, val));
+    }
+}
+
 procedure {:inline 1} $1_vector_swap_remove{{S}}(m: $Mutation (Vec ({{T}})), i: int) returns (e: {{T}}, m': $Mutation (Vec ({{T}})))
 {
     var len: int;
@@ -222,52 +253,68 @@ axiom (
 {% endmacro table_key_encoding %}
 
 
-{% macro table_module(instance) %}
+{% macro table_module(impl, instance) %}
 {%- set K = instance.0.name -%}
 {%- set V = instance.1.name -%}
+{%- set Type = impl.struct_name -%}
 {%- set Self = "Table int (" ~ V ~ ")" -%}
 {%- set S = "'" ~ instance.0.suffix ~ "_" ~ instance.1.suffix ~ "'" -%}
 {%- set SV = "'" ~ instance.1.suffix ~ "'" -%}
 {%- set ENC = "$EncodeKey'" ~ instance.0.suffix ~ "'" -%}
 
-
-function $IsEqual'table{{S}}'(t1: {{Self}}, t2: {{Self}}): bool {
-    // TODO: do we need to encode table identity?
+{%- if options.native_equality -%}
+function $IsEqual'{{Type}}{{S}}'(t1: {{Self}}, t2: {{Self}}): bool {
     t1 == t2
 }
+{%- else -%}
+function $IsEqual'{{Type}}{{S}}'(t1: {{Self}}, t2: {{Self}}): bool {
+    LenTable(t1) == LenTable(t2) &&
+    (forall k: int :: ContainsTable(t1, k) <==> ContainsTable(t2, k)) &&
+    (forall k: int :: ContainsTable(t1, k) ==> GetTable(t1, k) == GetTable(t2, k)) &&
+    (forall k: int :: ContainsTable(t2, k) ==> GetTable(t1, k) == GetTable(t2, k))
+}
+{%- endif %}
 
 // Not inlined.
-function $IsValid'table{{S}}'(t: {{Self}}): bool {
+function $IsValid'{{Type}}{{S}}'(t: {{Self}}): bool {
     $IsValid'u64'(LenTable(t)) &&
     (forall i: int:: ContainsTable(t, i) ==> $IsValid{{SV}}(GetTable(t, i)))
 }
 
-procedure {:inline 2} {{Ext}}_Table_new{{S}}() returns (v: {{Self}}) {
+{%- if impl.fun_new != "" %}
+procedure {:inline 2} {{impl.fun_new}}{{S}}() returns (v: {{Self}}) {
     v := EmptyTable();
 }
+{%- endif %}
 
-procedure {:inline 2} {{Ext}}_Table_destroy_empty{{S}}(t: {{Self}}) {
+{%- if impl.fun_destroy_empty != "" %}
+procedure {:inline 2} {{impl.fun_destroy_empty}}{{S}}(t: {{Self}}) {
     if (LenTable(t) != 0) {
         call $Abort($StdError(1/*INVALID_STATE*/, 102/*ENOT_EMPTY*/));
     }
 }
+{%- endif %}
 
-procedure {:inline 2} {{Ext}}_Table_drop_unchecked{{S}}(t: {{Self}}) {
-}
-
-procedure {:inline 2} {{Ext}}_Table_length{{S}}(t: ({{Self}})) returns (l: int) {
+{%- if impl.fun_len != "" %}
+procedure {:inline 2} {{impl.fun_len}}{{S}}(t: ({{Self}})) returns (l: int) {
     l := LenTable(t);
 }
+{%- endif %}
 
-procedure {:inline 2} {{Ext}}_Table_empty{{S}}(t: ({{Self}})) returns (r: bool) {
+{%- if impl.fun_is_empty != "" %}
+procedure {:inline 2} {{impl.fun_is_empty}}{{S}}(t: ({{Self}})) returns (r: bool) {
     r := LenTable(t) == 0;
 }
+{%- endif %}
 
-procedure {:inline 2} {{Ext}}_Table_contains{{S}}(t: ({{Self}}), k: {{K}}) returns (r: bool) {
+{%- if impl.fun_has_key != "" %}
+procedure {:inline 2} {{impl.fun_has_key}}{{S}}(t: ({{Self}}), k: {{K}}) returns (r: bool) {
     r := ContainsTable(t, {{ENC}}(k));
 }
+{%- endif %}
 
-procedure {:inline 2} {{Ext}}_Table_add{{S}}(m: $Mutation ({{Self}}), k: {{K}}, v: {{V}}) returns (m': $Mutation({{Self}})) {
+{%- if impl.fun_add_no_override != "" %}
+procedure {:inline 2} {{impl.fun_add_no_override}}{{S}}(m: $Mutation ({{Self}}), k: {{K}}, v: {{V}}) returns (m': $Mutation({{Self}})) {
     var enc_k: int;
     var t: {{Self}};
     enc_k := {{ENC}}(k);
@@ -278,8 +325,24 @@ procedure {:inline 2} {{Ext}}_Table_add{{S}}(m: $Mutation ({{Self}}), k: {{K}},
         m' := $UpdateMutation(m, AddTable(t, enc_k, v));
     }
 }
+{%- endif %}
+
+{%- if impl.fun_add_override_if_exists != "" %}
+procedure {:inline 2} {{impl.fun_add_override_if_exists}}{{S}}(m: $Mutation ({{Self}}), k: {{K}}, v: {{V}}) returns (m': $Mutation({{Self}})) {
+    var enc_k: int;
+    var t: {{Self}};
+    enc_k := {{ENC}}(k);
+    t := $Dereference(m);
+    if (ContainsTable(t, enc_k)) {
+        m' := $UpdateMutation(m, UpdateTable(t, enc_k, v));
+    } else {
+        m' := $UpdateMutation(m, AddTable(t, enc_k, v));
+    }
+}
+{%- endif %}
 
-procedure {:inline 2} {{Ext}}_Table_remove{{S}}(m: $Mutation ({{Self}}), k: {{K}})
+{%- if impl.fun_del_must_exist != "" %}
+procedure {:inline 2} {{impl.fun_del_must_exist}}{{S}}(m: $Mutation ({{Self}}), k: {{K}})
 returns (v: {{V}}, m': $Mutation({{Self}})) {
     var enc_k: int;
     var t: {{Self}};
@@ -292,8 +355,27 @@ returns (v: {{V}}, m': $Mutation({{Self}})) {
         m' := $UpdateMutation(m, RemoveTable(t, enc_k));
     }
 }
+{%- endif %}
+
+{%- if impl.fun_del_return_key != "" %}
+procedure {:inline 2} {{impl.fun_del_return_key}}{{S}}(m: $Mutation ({{Self}}), k: {{K}})
+returns (k': {{K}}, v: {{V}}, m': $Mutation({{Self}})) {
+    var enc_k: int;
+    var t: {{Self}};
+    enc_k := {{ENC}}(k);
+    t := $Dereference(m);
+    if (!ContainsTable(t, enc_k)) {
+        call $Abort($StdError(7/*INVALID_ARGUMENTS*/, 101/*ENOT_FOUND*/));
+    } else {
+        k' := k;
+        v := GetTable(t, enc_k);
+        m' := $UpdateMutation(m, RemoveTable(t, enc_k));
+    }
+}
+{%- endif %}
 
-procedure {:inline 2} {{Ext}}_Table_borrow{{S}}(t: {{Self}}, k: {{K}}) returns (v: {{V}}) {
+{%- if impl.fun_borrow != "" %}
+procedure {:inline 2} {{impl.fun_borrow}}{{S}}(t: {{Self}}, k: {{K}}) returns (v: {{V}}) {
     var enc_k: int;
     enc_k := {{ENC}}(k);
     if (!ContainsTable(t, enc_k)) {
@@ -302,8 +384,10 @@ procedure {:inline 2} {{Ext}}_Table_borrow{{S}}(t: {{Self}}, k: {{K}}) returns (
         v := GetTable(t, {{ENC}}(k));
     }
 }
+{%- endif %}
 
-procedure {:inline 2} {{Ext}}_Table_borrow_mut{{S}}(m: $Mutation ({{Self}}), k: {{K}})
+{%- if impl.fun_borrow_mut != "" %}
+procedure {:inline 2} {{impl.fun_borrow_mut}}{{S}}(m: $Mutation ({{Self}}), k: {{K}})
 returns (dst: $Mutation ({{V}}), m': $Mutation ({{Self}})) {
     var enc_k: int;
     var t: {{Self}};
@@ -316,32 +400,53 @@ returns (dst: $Mutation ({{V}}), m': $Mutation ({{Self}})) {
         m' := m;
     }
 }
+{%- endif %}
 
-function {:inline} {{Ext}}_Table_spec_table{{S}}(): {{Self}} {
-    EmptyTable()
+{%- if impl.fun_spec_len != "" %}
+function {:inline} {{impl.fun_spec_len}}{{S}}(t: ({{Self}})): int {
+    LenTable(t)
 }
+{%- endif %}
 
-function {:inline} {{Ext}}_Table_spec_len{{S}}(t: {{Self}}): int {
-    LenTable(t)
+{%- if impl.fun_spec_is_empty != "" %}
+function {:inline} {{impl.fun_spec_is_empty}}{{S}}(t: ({{Self}})): bool {
+    LenTable(t) == 0
 }
+{%- endif %}
 
-function {:inline} {{Ext}}_Table_spec_contains{{S}}(t: {{Self}}, k: {{K}}): bool {
+{%- if impl.fun_spec_has_key != "" %}
+function {:inline} {{impl.fun_spec_has_key}}{{S}}(t: ({{Self}}), k: {{K}}): bool {
     ContainsTable(t, {{ENC}}(k))
 }
+{%- endif %}
 
-
-function {:inline} {{Ext}}_Table_spec_add{{S}}(t: {{Self}}, k: {{K}}, v: {{V}}): {{Self}} {
-    AddTable(t, {{ENC}}(k), v)
+{%- if impl.fun_spec_set != "" %}
+function {:inline} {{impl.fun_spec_set}}{{S}}(t: {{Self}}, k: {{K}}, v: {{V}}): {{Self}} {
+    (var enc_k := {{ENC}}(k);
+    if (ContainsTable(t, enc_k)) then
+        UpdateTable(t, enc_k, v)
+    else
+        AddTable(t, enc_k, v))
 }
+{%- endif %}
 
-function {:inline} {{Ext}}_Table_spec_remove{{S}}(t: {{Self}}, k: {{K}}): {{Self}} {
+{%- if impl.fun_spec_del != "" %}
+function {:inline} {{impl.fun_spec_del}}{{S}}(t: {{Self}}, k: {{K}}): {{Self}} {
     RemoveTable(t, {{ENC}}(k))
 }
+{%- endif %}
 
-function {:inline} {{Ext}}_Table_spec_get{{S}}(t: {{Self}}, k: {{K}}): {{V}} {
+{%- if impl.fun_spec_get != "" %}
+function {:inline} {{impl.fun_spec_get}}{{S}}(t: {{Self}}, k: {{K}}): {{V}} {
     GetTable(t, {{ENC}}(k))
 }
+{%- endif %}
 
+{%- if impl.fun_spec_new != "" %}
+function {:inline} {{impl.fun_spec_new}}{{S}}(): {{Self}} {
+    EmptyTable()
+}
+{%- endif %}
 
 {% endmacro table_module %}
 
@@ -430,6 +535,18 @@ returns (res: $Mutation $1_event_EventHandle{{S}}) {
     res := handle_mut;
 }
 
+procedure {:inline 1} $1_event_guid{{S}}(handle_ref: $1_event_EventHandle{{S}})
+returns (res: int) {
+    // TODO: temporarily mocked. The return type needs to be fixed.
+    res := 0;
+}
+
+procedure {:inline 1} $1_event_counter{{S}}(handle_ref: $1_event_EventHandle{{S}})
+returns (res: int) {
+    // TODO: temporarily mocked.
+    res := 0;
+}
+
 procedure {:inline 1} $1_event_destroy_handle{{S}}(handle: $1_event_EventHandle{{S}}) {
 }
 
diff --git a/language/move-prover/boogie-backend/src/prelude/prelude.bpl b/language/move-prover/boogie-backend/src/prelude/prelude.bpl
index 101339882b..b0e66b8f83 100644
--- a/language/move-prover/boogie-backend/src/prelude/prelude.bpl
+++ b/language/move-prover/boogie-backend/src/prelude/prelude.bpl
@@ -20,17 +20,156 @@ options provided to the prover.
 {% include "vector-theory" %}
 {% include "multiset-theory" %}
 {% include "table-theory" %}
-
+{%- if options.custom_natives -%}
+{% include "custom-natives" %}
+{%- endif %}
 
 // ============================================================================================
 // Primitive Types
 
 const $MAX_U8: int;
 axiom $MAX_U8 == 255;
+const $MAX_U16: int;
+axiom $MAX_U16 == 65535;
+const $MAX_U32: int;
+axiom $MAX_U32 == 4294967295;
 const $MAX_U64: int;
 axiom $MAX_U64 == 18446744073709551615;
 const $MAX_U128: int;
 axiom $MAX_U128 == 340282366920938463463374607431768211455;
+const $MAX_U256: int;
+axiom $MAX_U256 == 115792089237316195423570985008687907853269984665640564039457584007913129639935;
+
+// Templates for bitvector operations
+
+{%- for impl in bv_instances %}
+
+function {:bvbuiltin "bvand"} $And'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvor"} $Or'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvxor"} $Xor'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvadd"} $Add'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvsub"} $Sub'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvmul"} $Mul'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvudiv"} $Div'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvurem"} $Mod'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvshl"} $Shl'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvlshr"} $Shr'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bv{{impl.base}});
+function {:bvbuiltin "bvult"} $Lt'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bool);
+function {:bvbuiltin "bvule"} $Le'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bool);
+function {:bvbuiltin "bvugt"} $Gt'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bool);
+function {:bvbuiltin "bvuge"} $Ge'Bv{{impl.base}}'(bv{{impl.base}},bv{{impl.base}}) returns(bool);
+
+procedure {:inline 1} $AddBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bv{{impl.base}})
+{
+    if ($Lt'Bv{{impl.base}}'($Add'Bv{{impl.base}}'(src1, src2), src1)) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $Add'Bv{{impl.base}}'(src1, src2);
+}
+
+procedure {:inline 1} $AddBv{{impl.base}}_unchecked(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bv{{impl.base}})
+{
+    dst := $Add'Bv{{impl.base}}'(src1, src2);
+}
+
+procedure {:inline 1} $SubBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bv{{impl.base}})
+{
+    if ($Lt'Bv{{impl.base}}'(src1, src2)) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $Sub'Bv{{impl.base}}'(src1, src2);
+}
+
+procedure {:inline 1} $MulBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bv{{impl.base}})
+{
+    if ($Lt'Bv{{impl.base}}'($Mul'Bv{{impl.base}}'(src1, src2), src1)) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $Mul'Bv{{impl.base}}'(src1, src2);
+}
+
+procedure {:inline 1} $DivBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bv{{impl.base}})
+{
+    if (src2 == 0bv{{impl.base}}) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $Div'Bv{{impl.base}}'(src1, src2);
+}
+
+procedure {:inline 1} $ModBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bv{{impl.base}})
+{
+    if (src2 == 0bv{{impl.base}}) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $Mod'Bv{{impl.base}}'(src1, src2);
+}
+
+procedure {:inline 1} $AndBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bv{{impl.base}})
+{
+    dst := $And'Bv{{impl.base}}'(src1,src2);
+}
+
+procedure {:inline 1} $OrBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bv{{impl.base}})
+{
+    dst := $Or'Bv{{impl.base}}'(src1,src2);
+}
+
+procedure {:inline 1} $XorBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bv{{impl.base}})
+{
+    dst := $Xor'Bv{{impl.base}}'(src1,src2);
+}
+
+procedure {:inline 1} $LtBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bool)
+{
+    dst := $Lt'Bv{{impl.base}}'(src1,src2);
+}
+
+procedure {:inline 1} $LeBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bool)
+{
+    dst := $Le'Bv{{impl.base}}'(src1,src2);
+}
+
+procedure {:inline 1} $GtBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bool)
+{
+    dst := $Gt'Bv{{impl.base}}'(src1,src2);
+}
+
+procedure {:inline 1} $GeBv{{impl.base}}(src1: bv{{impl.base}}, src2: bv{{impl.base}}) returns (dst: bool)
+{
+    dst := $Ge'Bv{{impl.base}}'(src1,src2);
+}
+
+function $IsValid'bv{{impl.base}}'(v: bv{{impl.base}}): bool {
+  $Ge'Bv{{impl.base}}'(v,0bv{{impl.base}}) && $Le'Bv{{impl.base}}'(v,{{impl.max}}bv{{impl.base}})
+}
+
+function {:inline} $IsEqual'bv{{impl.base}}'(x: bv{{impl.base}}, y: bv{{impl.base}}): bool {
+    x == y
+}
+
+procedure {:inline 1} $int2bv{{impl.base}}(src: int) returns (dst: bv{{impl.base}})
+{
+    if (src > {{impl.max}}) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $int2bv.{{impl.base}}(src);
+}
+
+procedure {:inline 1} $bv2int{{impl.base}}(src: bv{{impl.base}}) returns (dst: int)
+{
+    dst := $bv2int.{{impl.base}}(src);
+}
+
+function {:builtin "(_ int2bv {{impl.base}})"} $int2bv.{{impl.base}}(i: int) returns (bv{{impl.base}});
+function {:builtin "bv2nat"} $bv2int.{{impl.base}}(i: bv{{impl.base}}) returns (int);
+
+{%- endfor %}
 
 type {:datatype} $Range;
 function {:constructor} $Range(lb: int, ub: int): $Range;
@@ -43,6 +182,14 @@ function $IsValid'u8'(v: int): bool {
   v >= 0 && v <= $MAX_U8
 }
 
+function $IsValid'u16'(v: int): bool {
+  v >= 0 && v <= $MAX_U16
+}
+
+function $IsValid'u32'(v: int): bool {
+  v >= 0 && v <= $MAX_U32
+}
+
 function $IsValid'u64'(v: int): bool {
   v >= 0 && v <= $MAX_U64
 }
@@ -51,6 +198,10 @@ function $IsValid'u128'(v: int): bool {
   v >= 0 && v <= $MAX_U128
 }
 
+function $IsValid'u256'(v: int): bool {
+  v >= 0 && v <= $MAX_U256
+}
+
 function $IsValid'num'(v: int): bool {
   true
 }
@@ -74,6 +225,14 @@ function {:inline} $IsEqual'u8'(x: int, y: int): bool {
     x == y
 }
 
+function {:inline} $IsEqual'u16'(x: int, y: int): bool {
+    x == y
+}
+
+function {:inline} $IsEqual'u32'(x: int, y: int): bool {
+    x == y
+}
+
 function {:inline} $IsEqual'u64'(x: int, y: int): bool {
     x == y
 }
@@ -82,6 +241,10 @@ function {:inline} $IsEqual'u128'(x: int, y: int): bool {
     x == y
 }
 
+function {:inline} $IsEqual'u256'(x: int, y: int): bool {
+    x == y
+}
+
 function {:inline} $IsEqual'num'(x: int, y: int): bool {
     x == y
 }
@@ -111,6 +274,9 @@ function {:constructor} $Local(i: int): $Location;
 // when mutation ends.
 function {:constructor} $Param(i: int): $Location;
 
+// The location of an uninitialized mutation. Using this to make sure that the location
+// will not be equal to any valid mutation locations, i.e., $Local, $Global, or $Param.
+function {:constructor} $Uninitialized(): $Location;
 
 // A mutable reference which also carries its current value. Since mutable references
 // are single threaded in Move, we can keep them together and treat them as a value
@@ -142,7 +308,12 @@ function {:inline} $ChildMutation<T1, T2>(m: $Mutation T1, offset: int, v: T2):
     $Mutation(l#$Mutation(m), ExtendVec(p#$Mutation(m), offset), v)
 }
 
-// Return true of the mutation is a parent of a child which was derived with the given edge offset. This
+// Return true if two mutations share the location and path
+function {:inline} $IsSameMutation<T1, T2>(parent: $Mutation T1, child: $Mutation T2 ): bool {
+    l#$Mutation(parent) == l#$Mutation(child) && p#$Mutation(parent) == p#$Mutation(child)
+}
+
+// Return true if the mutation is a parent of a child which was derived with the given edge offset. This
 // is used to implement write-back choices.
 function {:inline} $IsParentMutation<T1, T2>(parent: $Mutation T1, edge: int, child: $Mutation T2 ): bool {
     l#$Mutation(parent) == l#$Mutation(child) &&
@@ -156,7 +327,7 @@ function {:inline} $IsParentMutation<T1, T2>(parent: $Mutation T1, edge: int, ch
     ))))
 }
 
-// Return true of the mutation is a parent of a child, for hyper edge.
+// Return true if the mutation is a parent of a child, for hyper edge.
 function {:inline} $IsParentMutationHyper<T1, T2>(parent: $Mutation T1, hyper_edge: Vec int, child: $Mutation T2 ): bool {
     l#$Mutation(parent) == l#$Mutation(child) &&
     (var pp := p#$Mutation(parent);
@@ -274,6 +445,24 @@ procedure {:inline 1} $CastU8(src: int) returns (dst: int)
     dst := src;
 }
 
+procedure {:inline 1} $CastU16(src: int) returns (dst: int)
+{
+    if (src > $MAX_U16) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src;
+}
+
+procedure {:inline 1} $CastU32(src: int) returns (dst: int)
+{
+    if (src > $MAX_U32) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src;
+}
+
 procedure {:inline 1} $CastU64(src: int) returns (dst: int)
 {
     if (src > $MAX_U64) {
@@ -292,6 +481,15 @@ procedure {:inline 1} $CastU128(src: int) returns (dst: int)
     dst := src;
 }
 
+procedure {:inline 1} $CastU256(src: int) returns (dst: int)
+{
+    if (src > $MAX_U256) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src;
+}
+
 procedure {:inline 1} $AddU8(src1: int, src2: int) returns (dst: int)
 {
     if (src1 + src2 > $MAX_U8) {
@@ -301,6 +499,34 @@ procedure {:inline 1} $AddU8(src1: int, src2: int) returns (dst: int)
     dst := src1 + src2;
 }
 
+procedure {:inline 1} $AddU16(src1: int, src2: int) returns (dst: int)
+{
+    if (src1 + src2 > $MAX_U16) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 + src2;
+}
+
+procedure {:inline 1} $AddU16_unchecked(src1: int, src2: int) returns (dst: int)
+{
+    dst := src1 + src2;
+}
+
+procedure {:inline 1} $AddU32(src1: int, src2: int) returns (dst: int)
+{
+    if (src1 + src2 > $MAX_U32) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 + src2;
+}
+
+procedure {:inline 1} $AddU32_unchecked(src1: int, src2: int) returns (dst: int)
+{
+    dst := src1 + src2;
+}
+
 procedure {:inline 1} $AddU64(src1: int, src2: int) returns (dst: int)
 {
     if (src1 + src2 > $MAX_U64) {
@@ -329,6 +555,20 @@ procedure {:inline 1} $AddU128_unchecked(src1: int, src2: int) returns (dst: int
     dst := src1 + src2;
 }
 
+procedure {:inline 1} $AddU256(src1: int, src2: int) returns (dst: int)
+{
+    if (src1 + src2 > $MAX_U256) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 + src2;
+}
+
+procedure {:inline 1} $AddU256_unchecked(src1: int, src2: int) returns (dst: int)
+{
+    dst := src1 + src2;
+}
+
 procedure {:inline 1} $Sub(src1: int, src2: int) returns (dst: int)
 {
     if (src1 < src2) {
@@ -353,18 +593,149 @@ function $shl(src1: int, p: int): int {
     src1 * $pow(2, p)
 }
 
+function $shlU8(src1: int, p: int): int {
+    (src1 * $pow(2, p)) mod 256
+}
+
+function $shlU16(src1: int, p: int): int {
+    (src1 * $pow(2, p)) mod 65536
+}
+
+function $shlU32(src1: int, p: int): int {
+    (src1 * $pow(2, p)) mod 4294967296
+}
+
+function $shlU64(src1: int, p: int): int {
+    (src1 * $pow(2, p)) mod 18446744073709551616
+}
+
+function $shlU128(src1: int, p: int): int {
+    (src1 * $pow(2, p)) mod 340282366920938463463374607431768211456
+}
+
+function $shlU256(src1: int, p: int): int {
+    (src1 * $pow(2, p)) mod 115792089237316195423570985008687907853269984665640564039457584007913129639936
+}
+
 function $shr(src1: int, p: int): int {
     src1 div $pow(2, p)
 }
 
 // We need to know the size of the destination in order to drop bits
-// that have been shifted left more than that, so we have $ShlU8/64/128
+// that have been shifted left more than that, so we have $ShlU8/16/32/64/128/256
 procedure {:inline 1} $ShlU8(src1: int, src2: int) returns (dst: int)
 {
     var res: int;
     // src2 is a u8
     assume src2 >= 0 && src2 < 256;
-    dst := $shl(src1, src2) mod 256;
+    if (src2 >= 8) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $shlU8(src1, src2);
+}
+
+// Template for cast and shift operations of bitvector types
+
+{%- for impl in bv_instances %}
+{%- for instance in sh_instances %}
+{%- set base_diff = impl.base - instance %}
+
+procedure {:inline 1} $CastBv{{instance}}to{{impl.base}}(src: bv{{instance}}) returns (dst: bv{{impl.base}})
+{
+    {%- if base_diff < 0 %}
+    if ($Gt'Bv{{instance}}'(src, {{impl.max}}bv{{instance}})) {
+            call $ExecFailureAbort();
+            return;
+    }
+    {%- endif %}
+    {%- if base_diff < 0 %}
+    dst := src[{{impl.base}}:0];
+    {%- elif base_diff == 0 %}
+    dst := src;
+    {%- else %}
+    dst := 0bv{{base_diff}} ++ src;
+    {%- endif %}
+}
+
+
+function $shlBv{{impl.base}}From{{instance}}(src1: bv{{impl.base}}, src2: bv{{instance}}) returns (bv{{impl.base}})
+{
+    {%- if base_diff > 0 %}
+    $Shl'Bv{{impl.base}}'(src1, 0bv{{base_diff}} ++ src2)
+    {%- elif base_diff == 0 %}
+    $Shl'Bv{{impl.base}}'(src1, src2)
+    {%- else %}
+    $Shl'Bv{{impl.base}}'(src1, src2[{{impl.base}}:0])
+    {%- endif %}
+}
+
+procedure {:inline 1} $ShlBv{{impl.base}}From{{instance}}(src1: bv{{impl.base}}, src2: bv{{instance}}) returns (dst: bv{{impl.base}})
+{
+    if ($Ge'Bv{{instance}}'(src2, {{impl.base}}bv{{instance}})) {
+        call $ExecFailureAbort();
+        return;
+    }
+    {%- if base_diff > 0 %}
+    dst := $Shl'Bv{{impl.base}}'(src1, 0bv{{base_diff}} ++ src2);
+    {%- elif base_diff == 0 %}
+    dst := $Shl'Bv{{impl.base}}'(src1, src2);
+    {%- else %}
+    dst := $Shl'Bv{{impl.base}}'(src1, src2[{{impl.base}}:0]);
+    {%- endif %}
+}
+
+function $shrBv{{impl.base}}From{{instance}}(src1: bv{{impl.base}}, src2: bv{{instance}}) returns (bv{{impl.base}})
+{
+    {%- if base_diff > 0 %}
+    $Shr'Bv{{impl.base}}'(src1, 0bv{{base_diff}} ++ src2)
+    {%- elif base_diff == 0 %}
+    $Shr'Bv{{impl.base}}'(src1, src2)
+    {%- else %}
+    $Shr'Bv{{impl.base}}'(src1, src2[{{impl.base}}:0])
+    {%- endif %}
+}
+
+procedure {:inline 1} $ShrBv{{impl.base}}From{{instance}}(src1: bv{{impl.base}}, src2: bv{{instance}}) returns (dst: bv{{impl.base}})
+{
+    if ($Ge'Bv{{instance}}'(src2, {{impl.base}}bv{{instance}})) {
+        call $ExecFailureAbort();
+        return;
+    }
+    {%- if base_diff > 0 %}
+    dst := $Shr'Bv{{impl.base}}'(src1, 0bv{{base_diff}} ++ src2);
+    {%- elif base_diff == 0 %}
+    dst := $Shr'Bv{{impl.base}}'(src1, src2);
+    {%- else %}
+    dst := $Shr'Bv{{impl.base}}'(src1, src2[{{impl.base}}:0]);
+    {%- endif %}
+}
+
+{%- endfor %}
+{%- endfor %}
+
+procedure {:inline 1} $ShlU16(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    if (src2 >= 16) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $shlU16(src1, src2);
+}
+
+procedure {:inline 1} $ShlU32(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    if (src2 >= 32) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $shlU32(src1, src2);
 }
 
 procedure {:inline 1} $ShlU64(src1: int, src2: int) returns (dst: int)
@@ -372,7 +743,11 @@ procedure {:inline 1} $ShlU64(src1: int, src2: int) returns (dst: int)
     var res: int;
     // src2 is a u8
     assume src2 >= 0 && src2 < 256;
-    dst := $shl(src1, src2) mod 18446744073709551616;
+    if (src2 >= 64) {
+       call $ExecFailureAbort();
+       return;
+    }
+    dst := $shlU64(src1, src2);
 }
 
 procedure {:inline 1} $ShlU128(src1: int, src2: int) returns (dst: int)
@@ -380,10 +755,21 @@ procedure {:inline 1} $ShlU128(src1: int, src2: int) returns (dst: int)
     var res: int;
     // src2 is a u8
     assume src2 >= 0 && src2 < 256;
-    dst := $shl(src1, src2) mod 340282366920938463463374607431768211456;
+    if (src2 >= 128) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $shlU128(src1, src2);
+}
+
+procedure {:inline 1} $ShlU256(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    dst := $shlU256(src1, src2);
 }
 
-// We don't need to know the size of destination, so no $ShrU8, etc.
 procedure {:inline 1} $Shr(src1: int, src2: int) returns (dst: int)
 {
     var res: int;
@@ -392,6 +778,74 @@ procedure {:inline 1} $Shr(src1: int, src2: int) returns (dst: int)
     dst := $shr(src1, src2);
 }
 
+procedure {:inline 1} $ShrU8(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    if (src2 >= 8) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $shr(src1, src2);
+}
+
+procedure {:inline 1} $ShrU16(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    if (src2 >= 16) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $shr(src1, src2);
+}
+
+procedure {:inline 1} $ShrU32(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    if (src2 >= 32) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $shr(src1, src2);
+}
+
+procedure {:inline 1} $ShrU64(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    if (src2 >= 64) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $shr(src1, src2);
+}
+
+procedure {:inline 1} $ShrU128(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    if (src2 >= 128) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := $shr(src1, src2);
+}
+
+procedure {:inline 1} $ShrU256(src1: int, src2: int) returns (dst: int)
+{
+    var res: int;
+    // src2 is a u8
+    assume src2 >= 0 && src2 < 256;
+    dst := $shr(src1, src2);
+}
+
 procedure {:inline 1} $MulU8(src1: int, src2: int) returns (dst: int)
 {
     if (src1 * src2 > $MAX_U8) {
@@ -401,6 +855,24 @@ procedure {:inline 1} $MulU8(src1: int, src2: int) returns (dst: int)
     dst := src1 * src2;
 }
 
+procedure {:inline 1} $MulU16(src1: int, src2: int) returns (dst: int)
+{
+    if (src1 * src2 > $MAX_U16) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 * src2;
+}
+
+procedure {:inline 1} $MulU32(src1: int, src2: int) returns (dst: int)
+{
+    if (src1 * src2 > $MAX_U32) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 * src2;
+}
+
 procedure {:inline 1} $MulU64(src1: int, src2: int) returns (dst: int)
 {
     if (src1 * src2 > $MAX_U64) {
@@ -419,6 +891,15 @@ procedure {:inline 1} $MulU128(src1: int, src2: int) returns (dst: int)
     dst := src1 * src2;
 }
 
+procedure {:inline 1} $MulU256(src1: int, src2: int) returns (dst: int)
+{
+    if (src1 * src2 > $MAX_U256) {
+        call $ExecFailureAbort();
+        return;
+    }
+    dst := src1 * src2;
+}
+
 procedure {:inline 1} $Div(src1: int, src2: int) returns (dst: int)
 {
     if (src2 == 0) {
@@ -498,18 +979,19 @@ function {:inline} $SliceVecByRange<T>(v: Vec T, r: $Range): Vec T {
 {%- for instance in table_key_instances %}
 
 // ----------------------------------------------------------------------------------
-// Native Table key encoding for type `({{instance.suffix}}`
+// Native Table key encoding for type `{{instance.suffix}}`
 
 {{ native::table_key_encoding(instance=instance) -}}
 {%- endfor %}
 
-{%- for instance in table_instances %}
+{%- for impl in table_instances %}
+{%- for instance in impl.insts %}
 
 // ----------------------------------------------------------------------------------
 // Native Table implementation for type `({{instance.0.suffix}},{{instance.1.suffix}})`
 
-
-{{ native::table_module(instance=instance) -}}
+{{ native::table_module(impl=impl, instance=instance) -}}
+{%- endfor %}
 {%- endfor %}
 
 // ==================================================================================
@@ -558,6 +1040,26 @@ function {:inline} $1_hash_$sha3_256(val: Vec int): Vec int {
     $1_hash_sha3(val)
 }
 
+// ==================================================================================
+// Native string
+
+// TODO: correct implementation of strings
+
+procedure {:inline 1} $1_string_internal_check_utf8(x: Vec int) returns (r: bool) {
+}
+
+procedure {:inline 1} $1_string_internal_sub_string(x: Vec int, i: int, j: int) returns (r: Vec int) {
+}
+
+procedure {:inline 1} $1_string_internal_index_of(x: Vec int, y: Vec int) returns (r: int) {
+}
+
+procedure {:inline 1} $1_string_internal_is_char_boundary(x: Vec int, i: int) returns (r: bool) {
+}
+
+
+
+
 // ==================================================================================
 // Native diem_account
 
@@ -732,3 +1234,20 @@ axiom $EventStore__is_empty($EmptyEventStore);
 procedure {:inline 1} $InitEventStore() {
 }
 {%- endif %}
+
+// ============================================================================================
+// Type Reflection on Type Parameters
+
+type {:datatype} $TypeParamInfo;
+
+function {:constructor} $TypeParamBool(): $TypeParamInfo;
+function {:constructor} $TypeParamU8(): $TypeParamInfo;
+function {:constructor} $TypeParamU16(): $TypeParamInfo;
+function {:constructor} $TypeParamU32(): $TypeParamInfo;
+function {:constructor} $TypeParamU64(): $TypeParamInfo;
+function {:constructor} $TypeParamU128(): $TypeParamInfo;
+function {:constructor} $TypeParamU256(): $TypeParamInfo;
+function {:constructor} $TypeParamAddress(): $TypeParamInfo;
+function {:constructor} $TypeParamSigner(): $TypeParamInfo;
+function {:constructor} $TypeParamVector(e: $TypeParamInfo): $TypeParamInfo;
+function {:constructor} $TypeParamStruct(a: int, m: Vec int, s: Vec int): $TypeParamInfo;
diff --git a/language/move-prover/boogie-backend/src/prelude/table-array-theory.bpl b/language/move-prover/boogie-backend/src/prelude/table-array-theory.bpl
index 9253eb16d0..73b3ec1e4d 100644
--- a/language/move-prover/boogie-backend/src/prelude/table-array-theory.bpl
+++ b/language/move-prover/boogie-backend/src/prelude/table-array-theory.bpl
@@ -39,7 +39,7 @@ function {:inline} ContainsTable<K,V>(t: Table K V, k: K): bool {
 }
 
 function {:inline} UpdateTable<K,V>(t: Table K V, k: K, v: V): Table K V {
-    Table(v#Table(t)[k := v], e#Table(t)[k := true], l#Table(t))
+    Table(v#Table(t)[k := v], e#Table(t), l#Table(t))
 }
 
 function {:inline} AddTable<K,V>(t: Table K V, k: K, v: V): Table K V {
@@ -53,3 +53,10 @@ function {:inline} RemoveTable<K,V>(t: Table K V, k: K): Table K V {
     // Similar as above, we only need to consider the case where the key is in the table.
     Table(v#Table(t), e#Table(t)[k := false], l#Table(t) - 1)
 }
+
+axiom {:ctor "Table"} (forall<K,V> t: Table K V :: {LenTable(t)}
+    (exists k: K :: {ContainsTable(t, k)} ContainsTable(t, k)) ==> LenTable(t) >= 1
+);
+// TODO: we might want to encoder a stronger property that the length of table
+// must be more than N given a set of N items. Currently we don't see a need here
+// and the above axiom seems to be sufficient.
diff --git a/language/move-prover/boogie-backend/src/prelude/vector-array-intern-theory.bpl b/language/move-prover/boogie-backend/src/prelude/vector-array-intern-theory.bpl
index 6a527412e2..45ef7145ca 100644
--- a/language/move-prover/boogie-backend/src/prelude/vector-array-intern-theory.bpl
+++ b/language/move-prover/boogie-backend/src/prelude/vector-array-intern-theory.bpl
@@ -87,6 +87,17 @@ function {:inline} RemoveAtVec<T>(v: Vec T, i: int): Vec T {
         l)))
 }
 
+function {:inline} InsertAtVec<T>(v: Vec T, i: int, elem: T): Vec T {
+    (var l := l#Vec(v) + 1;
+    VecIntern(Vec(
+        (lambda j: int ::
+         if j >= 0 && j < l then
+           if j < i then v#Vec(v)[j]
+           else if j > i then v#Vec(v)[j-1] else elem
+         else DefaultVecElem()),
+        l)))
+}
+
 function {:inline} ConcatVec<T>(v1: Vec T, v2: Vec T): Vec T {
     (var l1, m1, l2, m2 := l#Vec(v1), v#Vec(v1), l#Vec(v2), v#Vec(v2);
     VecIntern(Vec(
diff --git a/language/move-prover/boogie-backend/src/prelude/vector-array-theory.bpl b/language/move-prover/boogie-backend/src/prelude/vector-array-theory.bpl
index 7d92e6bfd0..7df3995a92 100644
--- a/language/move-prover/boogie-backend/src/prelude/vector-array-theory.bpl
+++ b/language/move-prover/boogie-backend/src/prelude/vector-array-theory.bpl
@@ -64,6 +64,17 @@ function {:inline} RemoveAtVec<T>(v: Vec T, i: int): Vec T {
         l))
 }
 
+function {:inline} InsertAtVec<T>(v: Vec T, i: int, elem: T): Vec T {
+    (var l := l#Vec(v) + 1;
+    Vec(
+        (lambda j: int ::
+         if j >= 0 && j < l then
+           if j < i then v#Vec(v)[j]
+           else if j > i then v#Vec(v)[j-1] else elem
+         else DefaultVecElem()),
+        l))
+}
+
 function {:inline} ConcatVec<T>(v1: Vec T, v2: Vec T): Vec T {
     (var l1, m1, l2, m2 := l#Vec(v1), v#Vec(v1), l#Vec(v2), v#Vec(v2);
     Vec(
diff --git a/language/move-prover/boogie-backend/src/spec_translator.rs b/language/move-prover/boogie-backend/src/spec_translator.rs
index 0d74424501..527cfcfd9d 100644
--- a/language/move-prover/boogie-backend/src/spec_translator.rs
+++ b/language/move-prover/boogie-backend/src/spec_translator.rs
@@ -5,6 +5,7 @@
 //! This module translates specification conditions to Boogie code.
 
 use std::{
+    cell::RefCell,
     collections::{BTreeSet, HashMap},
     rc::Rc,
 };
@@ -14,29 +15,38 @@ use itertools::Itertools;
 use log::{debug, info, warn};
 
 use move_model::{
-    ast::{ExpData, LocalVarDecl, Operation, Value},
+    ast::{
+        Exp, ExpData, LocalVarDecl, MemoryLabel, Operation, QuantKind, SpecFunDecl, SpecVarDecl,
+        TempIndex, Value,
+    },
     code_writer::CodeWriter,
     emit, emitln,
-    model::{FieldId, GlobalEnv, Loc, ModuleEnv, ModuleId, NodeId, SpecFunId, StructId},
+    model::{
+        FieldId, GlobalEnv, Loc, ModuleEnv, ModuleId, NodeId, QualifiedInstId, SpecFunId,
+        SpecVarId, StructId,
+    },
+    pragmas::INTRINSIC_TYPE_MAP,
     symbol::Symbol,
     ty::{PrimitiveType, Type},
+    well_known::{TYPE_INFO_SPEC, TYPE_NAME_GET_SPEC, TYPE_NAME_SPEC, TYPE_SPEC_IS_STRUCT},
+};
+use move_stackless_bytecode::{
+    mono_analysis::MonoInfo,
+    number_operation::{GlobalNumberOperationState, NumOperation::Bitwise},
 };
 
 use crate::{
     boogie_helpers::{
-        boogie_byte_blob, boogie_choice_fun_name, boogie_declare_global, boogie_field_sel,
-        boogie_inst_suffix, boogie_modifies_memory_name, boogie_resource_memory_name,
-        boogie_spec_fun_name, boogie_spec_var_name, boogie_struct_name, boogie_type,
-        boogie_type_suffix, boogie_well_formed_expr,
+        boogie_address_blob, boogie_bv_type, boogie_byte_blob, boogie_choice_fun_name,
+        boogie_declare_global, boogie_field_sel, boogie_inst_suffix, boogie_modifies_memory_name,
+        boogie_num_type_base, boogie_reflection_type_info, boogie_reflection_type_is_struct,
+        boogie_reflection_type_name, boogie_resource_memory_name, boogie_spec_fun_name,
+        boogie_spec_var_name, boogie_struct_name, boogie_type, boogie_type_suffix,
+        boogie_type_suffix_bv, boogie_value_blob, boogie_well_formed_expr,
+        boogie_well_formed_expr_bv,
     },
     options::BoogieOptions,
 };
-use move_model::{
-    ast::{Exp, MemoryLabel, QuantKind, SpecFunDecl, SpecVarDecl, TempIndex},
-    model::{QualifiedInstId, SpecVarId},
-};
-use move_stackless_bytecode::mono_analysis::MonoInfo;
-use std::cell::RefCell;
 
 #[derive(Clone)]
 pub struct SpecTranslator<'env> {
@@ -134,12 +144,27 @@ impl<'env> SpecTranslator<'env> {
 
 impl<'env> SpecTranslator<'env> {
     pub fn translate_axioms(&self, env: &GlobalEnv, mono_info: &MonoInfo) {
-        for axiom in &mono_info.axioms {
-            self.writer.set_location(&axiom.loc);
-            emitln!(self.writer, "// axiom {}", axiom.loc.display(env));
-            emit!(self.writer, "axiom ");
-            self.translate_exp(&axiom.exp);
-            emitln!(self.writer, ";\n");
+        let type_display_ctx = env.get_type_display_ctx();
+        for (axiom, type_insts) in &mono_info.axioms {
+            for type_inst in type_insts {
+                self.writer.set_location(&axiom.loc);
+                emit!(self.writer, "// axiom {}", axiom.loc.display(env));
+                if !type_inst.is_empty() {
+                    emitln!(
+                        self.writer,
+                        ", instance <{}>",
+                        type_inst
+                            .iter()
+                            .map(|t| t.display(&type_display_ctx).to_string())
+                            .join(", ")
+                    );
+                } else {
+                    emitln!(self.writer);
+                }
+                emit!(self.writer, "axiom ");
+                self.translate(&axiom.exp, type_inst);
+                emitln!(self.writer, ";\n");
+            }
         }
     }
 }
@@ -211,7 +236,7 @@ impl<'env> SpecTranslator<'env> {
                 .iter()
                 .cloned()
             {
-                let name = boogie_spec_fun_name(module_env, *id, &type_inst);
+                let name = boogie_spec_fun_name(module_env, *id, &type_inst, false);
                 if !translated.insert(name) {
                     continue;
                 }
@@ -256,7 +281,31 @@ impl<'env> SpecTranslator<'env> {
             if recursive { "recursive " } else { "" },
             fun.loc.display(self.env)
         );
-        let result_type = boogie_type(self.env, &self.inst(&fun.result_type));
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let bv_flag_result = if global_state
+            .spec_fun_operation_map
+            .contains_key(&(module_env.get_id(), id))
+        {
+            let ret_oper_map = &global_state
+                .spec_fun_operation_map
+                .get(&(module_env.get_id(), id))
+                .unwrap()
+                .1;
+            ret_oper_map[0] == Bitwise
+        } else {
+            false
+        };
+        let ty_str_fn = |bv_flag: bool| {
+            if bv_flag {
+                boogie_bv_type
+            } else {
+                boogie_type
+            }
+        };
+        let result_type = ty_str_fn(bv_flag_result)(self.env, &self.inst(&fun.result_type));
         // it is possible that the spec fun may refer to the same memory after monomorphization,
         // (e.g., one via concrete type and the other via type parameter being instantiated).
         // In this case, we mark the other parameter as unused
@@ -275,15 +324,28 @@ impl<'env> SpecTranslator<'env> {
                 format!("__unused_{}", param_repr)
             }
         });
-        let params = fun.params.iter().map(|(name, ty)| {
+        let params = fun.params.iter().enumerate().map(|(i, (name, ty))| {
+            let bv_flag = if global_state
+                .spec_fun_operation_map
+                .contains_key(&(module_env.get_id(), id))
+            {
+                global_state
+                    .spec_fun_operation_map
+                    .get(&(module_env.get_id(), id))
+                    .unwrap()
+                    .0[i]
+                    == Bitwise
+            } else {
+                false
+            };
             format!(
                 "{}: {}",
                 name.display(module_env.symbol_pool()),
-                boogie_type(self.env, &self.inst(ty))
+                ty_str_fn(bv_flag)(self.env, &self.inst(ty))
             )
         });
         self.writer.set_location(&fun.loc);
-        let boogie_name = boogie_spec_fun_name(module_env, id, &self.type_inst);
+        let boogie_name = boogie_spec_fun_name(module_env, id, &self.type_inst, bv_flag_result);
         let param_list = mem_params.chain(params).join(", ");
         let attrs = if fun.uninterpreted || recursive {
             ""
@@ -438,7 +500,16 @@ impl<'env> SpecTranslator<'env> {
                     new_spec_trans.translate_exp(&info.range);
                     emit!(new_spec_trans.writer, ", {})", &var_decl.0);
                 }
-                _ => {}
+                Type::Primitive(_)
+                | Type::Tuple(_)
+                | Type::Struct(_, _, _)
+                | Type::TypeParameter(_)
+                | Type::Reference(_, _)
+                | Type::Fun(_, _)
+                | Type::TypeDomain(_)
+                | Type::ResourceDomain(_, _, _)
+                | Type::Error
+                | Type::Var(_) => {}
             }
             emitln!(new_spec_trans.writer, " &&");
             new_spec_trans.translate_exp(&info.condition);
@@ -631,12 +702,26 @@ impl<'env> SpecTranslator<'env> {
         emit!(self.writer, ")");
     }
 
-    fn translate_value(&self, _node_id: NodeId, val: &Value) {
+    fn translate_value(&self, node_id: NodeId, val: &Value) {
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let num_oper = global_state.get_node_num_oper(node_id);
+        let mut suffix = "".to_string();
+        let bv_flag = num_oper == Bitwise;
+        if bv_flag {
+            suffix = boogie_bv_type(self.env, self.env.get_node_type(node_id).skip_reference());
+        }
         match val {
             Value::Address(addr) => emit!(self.writer, "{}", addr),
-            Value::Number(val) => emit!(self.writer, "{}", val),
+            Value::Number(val) => emit!(self.writer, "{}{}", val, suffix),
             Value::Bool(val) => emit!(self.writer, "{}", val),
-            Value::ByteArray(val) => emit!(self.writer, &boogie_byte_blob(self.options, val)),
+            Value::ByteArray(val) => {
+                emit!(self.writer, &boogie_byte_blob(self.options, val, bv_flag))
+            }
+            Value::AddressArray(val) => emit!(self.writer, &boogie_address_blob(self.options, val)),
+            Value::Vector(val) => emit!(self.writer, &boogie_value_blob(self.options, val)),
         }
     }
 
@@ -676,6 +761,10 @@ impl<'env> SpecTranslator<'env> {
 
     fn translate_call(&self, node_id: NodeId, oper: &Operation, args: &[Exp]) {
         let loc = self.env.get_node_loc(node_id);
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
         match oper {
             // Operators we introduced in the top level public entry `SpecTranslator::translate`,
             // mapping between Boogies single value domain and our typed world.
@@ -707,31 +796,55 @@ impl<'env> SpecTranslator<'env> {
             Operation::Range => self.translate_primitive_call("$Range", args),
 
             // Binary operators
-            Operation::Add => self.translate_arith_op("+", args),
-            Operation::Sub => self.translate_arith_op("-", args),
-            Operation::Mul => self.translate_arith_op("*", args),
-            Operation::Mod => self.translate_arith_op("mod", args),
-            Operation::Div => self.translate_arith_op("div", args),
-            Operation::BitOr => self.translate_arith_op("|", args),
-            Operation::BitAnd => self.translate_arith_op("&", args),
-            Operation::Xor => self.translate_arith_op("^", args),
-            Operation::Shl => self.translate_primitive_call("$shl", args),
-            Operation::Shr => self.translate_primitive_call("$shr", args),
+            Operation::Add => self.translate_op("+", "Add", args),
+            Operation::Sub => self.translate_op("-", "Sub", args),
+            Operation::Mul => self.translate_op("*", "Mul", args),
+            Operation::Mod => self.translate_op("mod", "Mod", args),
+            Operation::Div => self.translate_op("div", "Div", args),
+            Operation::BitOr => self.translate_bit_op("$Or", args),
+            Operation::BitAnd => self.translate_bit_op("$And", args),
+            Operation::Xor => self.translate_bit_op("$Xor", args),
+            Operation::Shl => self.translate_primitive_call_shl("$shl", args),
+            Operation::Shr => self.translate_primitive_call_shr("$shr", args),
             Operation::Implies => self.translate_logical_op("==>", args),
             Operation::Iff => self.translate_logical_op("<==>", args),
             Operation::And => self.translate_logical_op("&&", args),
             Operation::Or => self.translate_logical_op("||", args),
-            Operation::Lt => self.translate_rel_op("<", args),
-            Operation::Le => self.translate_rel_op("<=", args),
-            Operation::Gt => self.translate_rel_op(">", args),
-            Operation::Ge => self.translate_rel_op(">=", args),
+            Operation::Lt => self.translate_op("<", "Lt", args),
+            Operation::Le => self.translate_op("<=", "Le", args),
+            Operation::Gt => self.translate_op(">", "Gt", args),
+            Operation::Ge => self.translate_op(">=", "Ge", args),
             Operation::Identical => self.translate_identical(args),
             Operation::Eq => self.translate_eq_neq("$IsEqual", args),
             Operation::Neq => self.translate_eq_neq("!$IsEqual", args),
 
             // Unary operators
             Operation::Not => self.translate_logical_unary_op("!", args),
-
+            Operation::Cast => self.translate_cast(node_id, args),
+            Operation::Int2Bv => {
+                let exp_arith_flag = global_state.get_node_num_oper(args[0].node_id()) != Bitwise;
+                if exp_arith_flag {
+                    let arg_node_type = self.env.get_node_type(args[0].node_id());
+                    let literal = boogie_num_type_base(&arg_node_type);
+                    emit!(self.writer, "$int2bv.{}(", literal);
+                }
+                self.translate_exp(&args[0]);
+                if exp_arith_flag {
+                    emit!(self.writer, ")");
+                }
+            }
+            Operation::Bv2Int => {
+                let exp_bv_flag = global_state.get_node_num_oper(args[0].node_id()) == Bitwise;
+                if exp_bv_flag {
+                    let arg_node_type = self.env.get_node_type(args[0].node_id());
+                    let literal = boogie_num_type_base(&arg_node_type);
+                    emit!(self.writer, "$bv2int.{}(", literal);
+                }
+                self.translate_exp(&args[0]);
+                if exp_bv_flag {
+                    emit!(self.writer, ")");
+                }
+            }
             // Builtin functions
             Operation::Global(memory_label) => {
                 self.translate_resource_access(node_id, args, memory_label)
@@ -760,8 +873,11 @@ impl<'env> SpecTranslator<'env> {
             Operation::InRangeVec => self.translate_primitive_call("InRangeVec", args),
             Operation::InRangeRange => self.translate_primitive_call("$InRange", args),
             Operation::MaxU8 => emit!(self.writer, "$MAX_U8"),
+            Operation::MaxU16 => emit!(self.writer, "$MAX_U16"),
+            Operation::MaxU32 => emit!(self.writer, "$MAX_U32"),
             Operation::MaxU64 => emit!(self.writer, "$MAX_U64"),
             Operation::MaxU128 => emit!(self.writer, "$MAX_U128"),
+            Operation::MaxU256 => emit!(self.writer, "$MAX_U256"),
             Operation::WellFormed => self.translate_well_formed(&args[0]),
             Operation::AbortCode => emit!(self.writer, "$abort_code"),
             Operation::AbortFlag => emit!(self.writer, "$abort_flag"),
@@ -845,30 +961,98 @@ impl<'env> SpecTranslator<'env> {
         let inst = &self.get_node_instantiation(node_id);
         let module_env = &self.env.get_module(module_id);
         let fun_decl = module_env.get_spec_fun(fun_id);
-        let name = boogie_spec_fun_name(module_env, fun_id, inst);
-        emit!(self.writer, "{}(", name);
-        let mut first = true;
-        let mut maybe_comma = || {
-            if first {
-                first = false;
-            } else {
-                emit!(self.writer, ", ");
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+
+        // special casing for type reflection
+        let mut processed = false;
+
+        // TODO(mengxu): change it to a better address name instead of extlib
+        if self.env.get_extlib_address() == *module_env.get_name().addr() {
+            let qualified_name = format!(
+                "{}::{}",
+                module_env.get_name().name().display(self.env.symbol_pool()),
+                fun_decl.name.display(self.env.symbol_pool()),
+            );
+            if qualified_name == TYPE_NAME_SPEC {
+                assert_eq!(inst.len(), 1);
+                emit!(
+                    self.writer,
+                    "{}",
+                    boogie_reflection_type_name(self.env, &inst[0], false)
+                );
+                processed = true;
+            } else if qualified_name == TYPE_INFO_SPEC {
+                assert_eq!(inst.len(), 1);
+                // TODO(mengxu): by ignoring the first return value of this function, we are
+                // essentially ignoring the condition where this `type_info` call may abort, e.g.,
+                // invoking `type_info` on a primitive type like: `type_info<bool>`.
+                let (_, info) = boogie_reflection_type_info(self.env, &inst[0]);
+                emit!(self.writer, "{}", info);
+                processed = true;
+            } else if qualified_name == TYPE_SPEC_IS_STRUCT {
+                assert_eq!(inst.len(), 1);
+                emit!(
+                    self.writer,
+                    "{}",
+                    boogie_reflection_type_is_struct(self.env, &inst[0])
+                );
+                processed = true;
             }
-        };
-        let label_at = |i| memory_labels.as_ref().map(|labels| labels[i]);
-        let mut i = 0;
-        for memory in &fun_decl.used_memory {
-            let memory = &memory.to_owned().instantiate(inst);
-            maybe_comma();
-            let memory = boogie_resource_memory_name(self.env, memory, &label_at(i));
-            emit!(self.writer, &memory);
-            i = usize::saturating_add(i, 1);
         }
-        for exp in args {
-            maybe_comma();
-            self.translate_exp(exp);
+
+        if self.env.get_stdlib_address() == *module_env.get_name().addr() {
+            let qualified_name = format!(
+                "{}::{}",
+                module_env.get_name().name().display(self.env.symbol_pool()),
+                fun_decl.name.display(self.env.symbol_pool()),
+            );
+            if qualified_name == TYPE_NAME_GET_SPEC {
+                assert_eq!(inst.len(), 1);
+                emit!(
+                    self.writer,
+                    "{}",
+                    boogie_reflection_type_name(self.env, &inst[0], true)
+                );
+                processed = true;
+            }
+        }
+
+        let is_vector_table_module = module_env.is_std_vector() || module_env.is_table();
+        // regular path
+        if !processed {
+            let bv_flag = if is_vector_table_module && !args.is_empty() {
+                global_state.get_node_num_oper(args[0].node_id()) == Bitwise
+            } else {
+                global_state.get_node_num_oper(node_id) == Bitwise
+            };
+            let name = boogie_spec_fun_name(module_env, fun_id, inst, bv_flag);
+            emit!(self.writer, "{}(", name);
+            let mut first = true;
+            let mut maybe_comma = || {
+                if first {
+                    first = false;
+                } else {
+                    emit!(self.writer, ", ");
+                }
+            };
+            let label_at = |i| memory_labels.as_ref().map(|labels| labels[i]);
+            let mut i = 0;
+            for memory in &fun_decl.used_memory {
+                let memory = &memory.to_owned().instantiate(inst);
+                maybe_comma();
+                let memory = boogie_resource_memory_name(self.env, memory, &label_at(i));
+                emit!(self.writer, &memory);
+                i = usize::saturating_add(i, 1);
+            }
+            for exp in args {
+                maybe_comma();
+                self.translate_exp(exp);
+            }
+            emit!(self.writer, ")");
         }
-        emit!(self.writer, ")");
     }
 
     fn translate_select(
@@ -1008,8 +1192,7 @@ impl<'env> SpecTranslator<'env> {
                     emit!(self.writer, "(var {} := {};\n", var_name, quant_var);
                 }
                 Type::ResourceDomain(mid, sid, inst_opt) => {
-                    let memory =
-                        &mid.qualified_inst(*sid, inst_opt.to_owned().unwrap_or_else(Vec::new));
+                    let memory = &mid.qualified_inst(*sid, inst_opt.to_owned().unwrap_or_default());
                     let addr_var = resource_vars.get(&var.name).unwrap();
                     let resource_name = boogie_resource_memory_name(self.env, memory, &None);
                     emit!(
@@ -1039,20 +1222,37 @@ impl<'env> SpecTranslator<'env> {
         condition: &Option<Exp>,
         body: &Exp,
     ) {
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
         assert!(!kind.is_choice());
         // Translate range expressions. While doing, check for currently unsupported
         // type quantification
         let mut range_tmps = HashMap::new();
         for (var, range) in ranges {
-            match self.get_node_type(range.node_id()).skip_reference() {
-                Type::Vector(..) | Type::Primitive(PrimitiveType::Range) => {
-                    let range_tmp = self.fresh_var_name("range");
-                    emit!(self.writer, "(var {} := ", range_tmp);
-                    self.translate_exp(range);
-                    emit!(self.writer, "; ");
-                    range_tmps.insert(var.name, range_tmp);
+            let should_bind_range = match self.get_node_type(range.node_id()).skip_reference() {
+                Type::Vector(..) | Type::Primitive(PrimitiveType::Range) => true,
+                Type::Struct(mid, sid, ..) => {
+                    let struct_env = self.env.get_struct(mid.qualified(*sid));
+                    struct_env.is_intrinsic_of(INTRINSIC_TYPE_MAP)
                 }
-                _ => {}
+                Type::Primitive(_)
+                | Type::Tuple(_)
+                | Type::TypeParameter(_)
+                | Type::Reference(_, _)
+                | Type::Fun(_, _)
+                | Type::TypeDomain(_)
+                | Type::ResourceDomain(_, _, _)
+                | Type::Error
+                | Type::Var(_) => false,
+            };
+            if should_bind_range {
+                let range_tmp = self.fresh_var_name("range");
+                emit!(self.writer, "(var {} := ", range_tmp);
+                self.translate_exp(range);
+                emit!(self.writer, "; ");
+                range_tmps.insert(var.name, range_tmp);
             }
         }
         // Translate quantified variables.
@@ -1063,16 +1263,25 @@ impl<'env> SpecTranslator<'env> {
         for (var, range) in ranges {
             let var_name = self.env.symbol_pool().string(var.name);
             let quant_ty = self.get_node_type(range.node_id());
+            let num_oper = global_state.get_node_num_oper(range.node_id());
+            let ty_str = |ty: _| {
+                if num_oper == Bitwise {
+                    boogie_bv_type(self.env, ty)
+                } else {
+                    boogie_type(self.env, ty)
+                }
+            };
             match quant_ty.skip_reference() {
                 Type::TypeDomain(ty) => {
-                    let ty = &self.inst(ty);
-                    emit!(
-                        self.writer,
-                        "{}{}: {}",
-                        comma,
-                        var_name,
-                        boogie_type(self.env, ty)
-                    );
+                    emit!(self.writer, "{}{}: {}", comma, var_name, ty_str(ty));
+                }
+                Type::Struct(mid, sid, targs) => {
+                    let struct_env = self.env.get_struct(mid.qualified(*sid));
+                    if struct_env.is_intrinsic_of(INTRINSIC_TYPE_MAP) {
+                        emit!(self.writer, "{}{}: {}", comma, var_name, ty_str(&targs[0]));
+                    } else {
+                        panic!("unexpected type");
+                    }
                 }
                 Type::ResourceDomain(..) => {
                     let addr_quant_var = self.fresh_var_name("a");
@@ -1114,8 +1323,7 @@ impl<'env> SpecTranslator<'env> {
                 let quant_ty = self.get_node_type(range.node_id());
                 if let Type::ResourceDomain(mid, sid, inst_opt) = quant_ty.skip_reference() {
                     let addr_var = resource_vars.get(&var.name).unwrap();
-                    let memory =
-                        &mid.qualified_inst(*sid, inst_opt.to_owned().unwrap_or_else(Vec::new));
+                    let memory = &mid.qualified_inst(*sid, inst_opt.to_owned().unwrap_or_default());
                     let resource_name = boogie_resource_memory_name(self.env, memory, &None);
                     let resource_value = format!("$ResourceValue({}, {})", resource_name, addr_var);
                     emit!(self.writer, "{{{}}}", resource_value);
@@ -1132,6 +1340,7 @@ impl<'env> SpecTranslator<'env> {
         for (var, range) in ranges {
             let var_name = self.env.symbol_pool().string(var.name);
             let quant_ty = self.get_node_type(range.node_id());
+            let num_oper = global_state.get_node_num_oper(range.node_id());
             match quant_ty.skip_reference() {
                 Type::TypeDomain(domain_ty) => {
                     let mut type_check = boogie_well_formed_expr(self.env, &var_name, domain_ty);
@@ -1155,6 +1364,21 @@ impl<'env> SpecTranslator<'env> {
                         quant_var,
                     );
                 }
+                Type::Struct(mid, sid, targs) => {
+                    let struct_env = self.env.get_struct(mid.qualified(*sid));
+                    if struct_env.is_intrinsic_of(INTRINSIC_TYPE_MAP) {
+                        emit!(
+                            self.writer,
+                            "{}ContainsTable({}, $EncodeKey'{}'({}))",
+                            separator,
+                            range_tmps.get(&var.name).unwrap(),
+                            boogie_type_suffix_bv(self.env, &targs[0], num_oper == Bitwise),
+                            var_name,
+                        );
+                    } else {
+                        panic!("unexpected type");
+                    }
+                }
                 Type::Primitive(PrimitiveType::Range) => {
                     let range_tmp = range_tmps.get(&var.name).unwrap();
                     let quant_var = quant_vars.get(&var.name).unwrap();
@@ -1166,7 +1390,13 @@ impl<'env> SpecTranslator<'env> {
                         quant_var,
                     );
                 }
-                _ => panic!("unexpected type"),
+                Type::Primitive(_)
+                | Type::Tuple(_)
+                | Type::TypeParameter(_)
+                | Type::Reference(_, _)
+                | Type::Fun(_, _)
+                | Type::Error
+                | Type::Var(_) => panic!("unexpected type"),
             }
             separator = connective;
         }
@@ -1190,7 +1420,7 @@ impl<'env> SpecTranslator<'env> {
         );
         emit!(
             self.writer,
-            &")".repeat(range_tmps.len().checked_add(1).unwrap())
+            &")".repeat(quant_vars.len().checked_add(1).unwrap())
         );
     }
 
@@ -1273,9 +1503,15 @@ impl<'env> SpecTranslator<'env> {
     }
 
     fn translate_eq_neq(&self, boogie_val_fun: &str, args: &[Exp]) {
-        let suffix = boogie_type_suffix(
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let num_oper = global_state.get_node_num_oper(args[0].node_id());
+        let suffix = boogie_type_suffix_bv(
             self.env,
             self.get_node_type(args[0].node_id()).skip_reference(),
+            num_oper == Bitwise,
         );
         emit!(self.writer, "{}'{}'(", boogie_val_fun, suffix);
         self.translate_exp(&args[0]);
@@ -1300,11 +1536,62 @@ impl<'env> SpecTranslator<'env> {
         }
     }
 
-    fn translate_arith_op(&self, boogie_op: &str, args: &[Exp]) {
-        emit!(self.writer, "(");
-        self.translate_exp(&args[0]);
-        emit!(self.writer, " {} ", boogie_op);
-        self.translate_exp(&args[1]);
+    fn translate_op(&self, boogie_op: &str, bv_op: &str, args: &[Exp]) {
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let num_oper = global_state.get_node_num_oper(args[0].node_id());
+        if num_oper == Bitwise {
+            let oper_base = match self.env.get_node_type(args[0].node_id()).skip_reference() {
+                Type::Primitive(PrimitiveType::U8) => "Bv8",
+                Type::Primitive(PrimitiveType::U16) => "Bv16",
+                Type::Primitive(PrimitiveType::U32) => "Bv32",
+                Type::Primitive(PrimitiveType::U64) => "Bv64",
+                Type::Primitive(PrimitiveType::U128) => "Bv128",
+                Type::Primitive(PrimitiveType::U256) => "Bv256",
+                Type::Primitive(PrimitiveType::Num) => "<<num is not unsupported here>>",
+                _ => unreachable!(),
+            };
+            emit!(self.writer, "${}'{}'(", bv_op, oper_base);
+            self.translate_seq(args.iter(), ", ", |e| self.translate_exp(e));
+            emit!(self.writer, ")");
+        } else {
+            emit!(self.writer, "(");
+            self.translate_exp(&args[0]);
+            emit!(self.writer, " {} ", boogie_op);
+            self.translate_exp(&args[1]);
+            emit!(self.writer, ")");
+        }
+    }
+
+    fn translate_bit_op(&self, boogie_op: &str, args: &[Exp]) {
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let oper_base = match self.env.get_node_type(args[0].node_id()).skip_reference() {
+            Type::Primitive(PrimitiveType::U8) => "Bv8",
+            Type::Primitive(PrimitiveType::U16) => "Bv16",
+            Type::Primitive(PrimitiveType::U32) => "Bv32",
+            Type::Primitive(PrimitiveType::U64) => "Bv64",
+            Type::Primitive(PrimitiveType::U128) => "Bv128",
+            Type::Primitive(PrimitiveType::U256) => "Bv256",
+            Type::Primitive(PrimitiveType::Num) => "<<num is not unsupported here>>",
+            _ => unreachable!(),
+        };
+        emit!(self.writer, "{}'{}'(", boogie_op, oper_base);
+        self.translate_seq(args.iter(), ", ", |e| {
+            let num_oper_e = global_state.get_node_num_oper(e.node_id());
+            let ty_e = self.env.get_node_type(e.node_id());
+            if num_oper_e != Bitwise {
+                emit!(self.writer, "$int2bv.{}(", boogie_num_type_base(&ty_e));
+            }
+            self.translate_exp(e);
+            if num_oper_e != Bitwise {
+                emit!(self.writer, ")")
+            }
+        });
         emit!(self.writer, ")");
     }
 
@@ -1329,12 +1616,100 @@ impl<'env> SpecTranslator<'env> {
         self.translate_exp(&args[0]);
     }
 
+    fn translate_cast(&self, node_id: NodeId, args: &[Exp]) {
+        let mut global_state = self
+            .env
+            .get_cloned_extension::<GlobalNumberOperationState>();
+        let arg = args[0].clone();
+        self.env
+            .update_node_type(arg.node_id(), self.env.get_node_type(node_id));
+        let cast_oper = global_state.get_node_num_oper(node_id);
+        global_state.update_node_oper(args[0].node_id(), cast_oper, true);
+        self.env.set_extension(global_state);
+        self.translate_exp(&arg);
+    }
+
     fn translate_primitive_call(&self, fun: &str, args: &[Exp]) {
         emit!(self.writer, "{}(", fun);
         self.translate_seq(args.iter(), ", ", |e| self.translate_exp(e));
         emit!(self.writer, ")");
     }
 
+    fn translate_primitive_call_shr(&self, fun: &str, args: &[Exp]) {
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let num_oper = global_state.get_node_num_oper(args[0].node_id());
+        if num_oper == Bitwise {
+            let oper_left_base = match self.env.get_node_type(args[0].node_id()).skip_reference() {
+                Type::Primitive(PrimitiveType::U8) => "Bv8",
+                Type::Primitive(PrimitiveType::U16) => "Bv16",
+                Type::Primitive(PrimitiveType::U32) => "Bv32",
+                Type::Primitive(PrimitiveType::U64) => "Bv64",
+                Type::Primitive(PrimitiveType::U128) => "Bv128",
+                Type::Primitive(PrimitiveType::U256) => "Bv256",
+                Type::Primitive(PrimitiveType::Num) => "<<num is not unsupported here>>",
+                _ => unreachable!(),
+            };
+            let oper_right_base = boogie_num_type_base(&self.env.get_node_type(args[1].node_id()));
+            emit!(
+                self.writer,
+                "{}{}From{}(",
+                fun,
+                oper_left_base,
+                oper_right_base
+            );
+        } else {
+            emit!(self.writer, "{}(", fun);
+        }
+        self.translate_seq(args.iter(), ", ", |e| self.translate_exp(e));
+        emit!(self.writer, ")");
+    }
+
+    fn translate_primitive_call_shl(&self, fun: &str, args: &[Exp]) {
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number operation state");
+        let num_oper = global_state.get_node_num_oper(args[0].node_id());
+        if num_oper == Bitwise {
+            let oper_left_base = match self.env.get_node_type(args[0].node_id()).skip_reference() {
+                Type::Primitive(PrimitiveType::U8) => "Bv8",
+                Type::Primitive(PrimitiveType::U16) => "Bv16",
+                Type::Primitive(PrimitiveType::U32) => "Bv32",
+                Type::Primitive(PrimitiveType::U64) => "Bv64",
+                Type::Primitive(PrimitiveType::U128) => "Bv128",
+                Type::Primitive(PrimitiveType::U256) => "Bv256",
+                Type::Primitive(PrimitiveType::Num) => "<<num is not unsupported here>>",
+                _ => unreachable!(),
+            };
+            let oper_right_base = boogie_num_type_base(&self.env.get_node_type(args[1].node_id()));
+            emit!(
+                self.writer,
+                "{}{}From{}(",
+                fun,
+                oper_left_base,
+                oper_right_base
+            );
+        } else {
+            let ty = self.get_node_type(args[0].node_id());
+            let fun_num = match ty {
+                Type::Primitive(PrimitiveType::U8) => "U8",
+                Type::Primitive(PrimitiveType::U16) => "U16",
+                Type::Primitive(PrimitiveType::U32) => "U32",
+                Type::Primitive(PrimitiveType::U64) => "U64",
+                Type::Primitive(PrimitiveType::U128) => "U128",
+                Type::Primitive(PrimitiveType::U256) => "U256",
+                Type::Primitive(PrimitiveType::Num) => "",
+                _ => unreachable!(),
+            };
+            emit!(self.writer, "{}(", format!("{}{}", fun, fun_num).as_str());
+        }
+        self.translate_seq(args.iter(), ", ", |e| self.translate_exp(e));
+        emit!(self.writer, ")");
+    }
+
     fn translate_primitive_inst_call(&self, node_id: NodeId, fun: &str, args: &[Exp]) {
         let suffix = boogie_inst_suffix(self.env, &self.get_node_instantiation(node_id));
         emit!(self.writer, "{}{}(", fun, suffix);
@@ -1343,14 +1718,20 @@ impl<'env> SpecTranslator<'env> {
     }
 
     fn translate_well_formed(&self, exp: &Exp) {
+        let global_state = &self
+            .env
+            .get_extension::<GlobalNumberOperationState>()
+            .expect("global number state");
         let ty = self.get_node_type(exp.node_id());
+        let bv_flag = global_state.get_node_num_oper(exp.node_id()) == Bitwise;
         match exp.as_ref() {
             ExpData::Temporary(_, idx) => {
                 // For the special case of a temporary which can represent a
                 // &mut, skip the normal translation of `exp` which would do automatic
                 // dereferencing. Instead let boogie_well_formed_expr handle the
                 // the dereferencing as part of its logic.
-                let check = boogie_well_formed_expr(self.env, &format!("$t{}", idx), &ty);
+                let check =
+                    boogie_well_formed_expr_bv(self.env, &format!("$t{}", idx), &ty, bv_flag);
                 if !check.is_empty() {
                     emit!(self.writer, &check);
                 } else {
@@ -1379,15 +1760,17 @@ impl<'env> SpecTranslator<'env> {
             }
             ExpData::LocalVar(_, sym) => {
                 // For specification locals (which never can be references) directly emit them.
-                let check = boogie_well_formed_expr(
+                let check = boogie_well_formed_expr_bv(
                     self.env,
                     self.env.symbol_pool().string(*sym).as_str(),
                     &ty,
+                    bv_flag,
                 );
                 emit!(self.writer, &check);
             }
             _ => {
-                let check = boogie_well_formed_expr(self.env, "$val", ty.skip_reference());
+                let check =
+                    boogie_well_formed_expr_bv(self.env, "$val", ty.skip_reference(), bv_flag);
                 emit!(self.writer, "(var $val := ");
                 self.translate_exp(exp);
                 emit!(self.writer, "; {})", check);
diff --git a/language/move-prover/bytecode/Cargo.toml b/language/move-prover/bytecode/Cargo.toml
index 1ee878e6ac..e802d8b236 100644
--- a/language/move-prover/bytecode/Cargo.toml
+++ b/language/move-prover/bytecode/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 move-model = { path = "../../move-model" }
diff --git a/language/move-prover/bytecode/src/access_path.rs b/language/move-prover/bytecode/src/access_path.rs
index 66e7d5f3af..c7c2450281 100644
--- a/language/move-prover/bytecode/src/access_path.rs
+++ b/language/move-prover/bytecode/src/access_path.rs
@@ -208,7 +208,7 @@ impl AbsAddr {
         true
     }
 
-    /// Substitute all occurences of Footprint(ap) in `self` by resolving the accesss path
+    /// Substitute all occurrences of Footprint(ap) in `self` by resolving the access path
     /// `ap` in `sub_map`
     pub fn substitute_footprint(
         &mut self,
@@ -351,7 +351,7 @@ impl GlobalKey {
         self.addr.is_statically_known() && self.ty.is_closed()
     }
 
-    /// Substitute all occurences of Footprint(ap) in `self.addr` by resolving the accesss path
+    /// Substitute all occurrences of Footprint(ap) in `self.addr` by resolving the access path
     /// `ap` in `sub_map`.
     pub fn substitute_footprint(
         &mut self,
@@ -472,7 +472,7 @@ impl Offset {
                     .get_type();
                 field_type.instantiate(types)
             }
-            (Type::Vector(t), Offset::VectorIndex) => (*t.clone()),
+            (Type::Vector(t), Offset::VectorIndex) => *t.clone(),
             (Type::Primitive(PrimitiveType::Address), Offset::Global(s)) => s.get_type(),
             (Type::Primitive(PrimitiveType::Signer), Offset::Global(s)) => {
                 // we conflate address and signer, so this can happen
@@ -482,7 +482,34 @@ impl Offset {
                 // couldn't infer the type of `base`. propagate the error
                 Type::Error
             }
-            _ => {
+            (Type::Primitive(_), Offset::Global(_))
+            | (Type::Primitive(_), Offset::Field(_))
+            | (Type::Primitive(_), Offset::VectorIndex)
+            | (Type::Tuple(_), Offset::Field(_))
+            | (Type::Tuple(_), Offset::VectorIndex)
+            | (Type::Tuple(_), Offset::Global(_))
+            | (Type::Vector(_), Offset::Field(_))
+            | (Type::Vector(_), Offset::Global(_))
+            | (Type::Struct(_, _, _), Offset::VectorIndex)
+            | (Type::Struct(_, _, _), Offset::Global(_))
+            | (Type::TypeParameter(_), Offset::Field(_))
+            | (Type::TypeParameter(_), Offset::VectorIndex)
+            | (Type::TypeParameter(_), Offset::Global(_))
+            | (Type::Reference(_, _), Offset::Field(_))
+            | (Type::Reference(_, _), Offset::VectorIndex)
+            | (Type::Reference(_, _), Offset::Global(_))
+            | (Type::Fun(_, _), Offset::Field(_))
+            | (Type::Fun(_, _), Offset::VectorIndex)
+            | (Type::Fun(_, _), Offset::Global(_))
+            | (Type::TypeDomain(_), Offset::Field(_))
+            | (Type::TypeDomain(_), Offset::VectorIndex)
+            | (Type::TypeDomain(_), Offset::Global(_))
+            | (Type::ResourceDomain(_, _, _), Offset::Field(_))
+            | (Type::ResourceDomain(_, _, _), Offset::VectorIndex)
+            | (Type::ResourceDomain(_, _, _), Offset::Global(_))
+            | (Type::Var(_), Offset::Field(_))
+            | (Type::Var(_), Offset::VectorIndex)
+            | (Type::Var(_), Offset::Global(_)) => {
                 panic!(
                     "get_type warning: Invalid base type {} for offset {:?} in get_type",
                     base.display(&move_model::ty::TypeDisplayContext::WithEnv {
diff --git a/language/move-prover/bytecode/src/access_path_trie.rs b/language/move-prover/bytecode/src/access_path_trie.rs
index bc3e284944..685f5180e6 100644
--- a/language/move-prover/bytecode/src/access_path_trie.rs
+++ b/language/move-prover/bytecode/src/access_path_trie.rs
@@ -394,8 +394,7 @@ impl<T: FootprintDomain> AccessPathTrie<T> {
     /// Retrieve the data associated with `local_index` in the trie. Returns `None` if there is no associated data
     pub fn get_local(&self, local_index: TempIndex, fun_env: &FunctionEnv) -> Option<&T> {
         self.get_local_node(local_index, fun_env)
-            .map(|n| n.data.as_ref())
-            .flatten()
+            .and_then(|n| n.data.as_ref())
     }
 
     /// Retrieve the node associated with `local_index` in the trie. Returns `None` if there is no associated node
diff --git a/language/move-prover/bytecode/src/annotations.rs b/language/move-prover/bytecode/src/annotations.rs
index 54ad9e5a3a..89dd8c5391 100644
--- a/language/move-prover/bytecode/src/annotations.rs
+++ b/language/move-prover/bytecode/src/annotations.rs
@@ -2,7 +2,6 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use itertools::Itertools;
 use std::{
     any::{Any, TypeId},
     collections::BTreeMap,
@@ -10,10 +9,13 @@ use std::{
     rc::Rc,
 };
 
-/// A container for an extensible, dynamically typed set of annotations.
+use itertools::Itertools;
+
+/// A container for an extensible, dynamically typed set of annotations, that may or may not have
+/// reached a fixedpoint state
 #[derive(Default, Clone)]
 pub struct Annotations {
-    map: BTreeMap<TypeId, Data>,
+    map: BTreeMap<TypeId, (Data, bool)>,
 }
 
 /// An internal struct to represent annotation data. This carries in addition to the
@@ -66,24 +68,25 @@ impl Annotations {
     /// Gets annotation of type T.
     pub fn get<T: Any>(&self) -> Option<&T> {
         let id = TypeId::of::<T>();
-        self.map.get(&id).and_then(|d| d.value.downcast_ref::<T>())
+        self.map
+            .get(&id)
+            .and_then(|(d, _)| d.value.downcast_ref::<T>())
     }
 
     /// Gets annotation of type T or creates one from default.
-    pub fn get_or_default_mut<T: Any + Default + Clone>(&mut self) -> &mut T {
+    pub fn get_or_default_mut<T: Any + Default + Clone>(&mut self, fixedpoint: bool) -> &mut T {
         let id = TypeId::of::<T>();
-        self.map
+        let (data, _) = self
+            .map
             .entry(id)
-            .or_insert_with(|| Data::new(T::default()))
-            .value
-            .downcast_mut::<T>()
-            .expect("cast successful")
+            .or_insert_with(|| (Data::new(T::default()), fixedpoint));
+        data.value.downcast_mut::<T>().expect("cast successful")
     }
 
     /// Sets annotation of type T.
-    pub fn set<T: Any + Clone>(&mut self, x: T) {
+    pub fn set<T: Any + Clone>(&mut self, x: T, fixedpoint: bool) {
         let id = TypeId::of::<T>();
-        self.map.insert(id, Data::new(x));
+        self.map.insert(id, (Data::new(x), fixedpoint));
     }
 
     /// Removes annotation of type T.
@@ -91,6 +94,11 @@ impl Annotations {
         let id = TypeId::of::<T>();
         self.map
             .remove(&id)
-            .and_then(|d| d.value.downcast::<T>().ok())
+            .and_then(|(d, _)| d.value.downcast::<T>().ok())
+    }
+
+    /// Mark whether the annotations all reach a fixedpoint status
+    pub fn reached_fixedpoint(&self) -> bool {
+        self.map.values().all(|(_, fixedpoint)| *fixedpoint)
     }
 }
diff --git a/language/move-prover/bytecode/src/borrow_analysis.rs b/language/move-prover/bytecode/src/borrow_analysis.rs
index 88d36a2f30..9f9e7adc71 100644
--- a/language/move-prover/bytecode/src/borrow_analysis.rs
+++ b/language/move-prover/bytecode/src/borrow_analysis.rs
@@ -4,38 +4,35 @@
 
 //! Data flow analysis computing borrow information for preparation of memory_instrumentation.
 
-use crate::{
-    dataflow_analysis::{DataflowAnalysis, TransferFunctions},
-    dataflow_domains::{AbstractDomain, JoinResult, MapDomain, SetDomain},
-    function_target::{FunctionData, FunctionTarget},
-    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant},
-    livevar_analysis::LiveVarAnnotation,
-    stackless_bytecode::{AssignKind, BorrowEdge, BorrowNode, Bytecode, Operation},
-    stackless_control_flow_graph::StacklessControlFlowGraph,
-};
+use std::{borrow::BorrowMut, collections::BTreeMap, fmt};
+
 use itertools::Itertools;
+
 use move_binary_format::file_format::CodeOffset;
 use move_model::{
     ast::TempIndex,
     model::{FunctionEnv, GlobalEnv, QualifiedInstId},
+    pragmas::INTRINSIC_FUN_MAP_BORROW_MUT,
     ty::Type,
-    well_known::{TABLE_BORROW_MUT, VECTOR_BORROW_MUT},
+    well_known::VECTOR_BORROW_MUT,
 };
-use std::{
-    borrow::BorrowMut,
-    collections::{BTreeMap, BTreeSet},
-    fmt,
+
+use crate::{
+    dataflow_analysis::{DataflowAnalysis, TransferFunctions},
+    dataflow_domains::{AbstractDomain, JoinResult, MapDomain, SetDomain},
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant},
+    livevar_analysis::LiveVarAnnotation,
+    stackless_bytecode::{AssignKind, BorrowEdge, BorrowNode, Bytecode, IndexEdgeKind, Operation},
+    stackless_control_flow_graph::StacklessControlFlowGraph,
 };
 
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Default)]
+#[derive(Debug, Clone, Eq, Ord, PartialEq, PartialOrd, Default)]
 pub struct BorrowInfo {
     /// Contains the nodes which are alive. This excludes nodes which are alive because
     /// other nodes which are alive borrow from them.
     live_nodes: SetDomain<BorrowNode>,
 
-    /// Contains the nodes which have been moved via a move instruction.
-    moved_nodes: SetDomain<BorrowNode>,
-
     /// Forward borrow information.
     borrowed_by: MapDomain<BorrowNode, SetDomain<(BorrowNode, BorrowEdge)>>,
 
@@ -44,44 +41,30 @@ pub struct BorrowInfo {
     borrows_from: MapDomain<BorrowNode, SetDomain<(BorrowNode, BorrowEdge)>>,
 }
 
+/// Represents a write-back from a source node to a destination node with the associated edge
+#[derive(Debug, Clone, Eq, Ord, PartialEq, PartialOrd)]
+pub struct WriteBackAction {
+    /// the `src` of a write-back action must be a reference
+    pub src: TempIndex,
+    pub dst: BorrowNode,
+    pub edge: BorrowEdge,
+}
+
 impl BorrowInfo {
     /// Gets the children of this node.
-    pub fn get_children(&self, node: &BorrowNode) -> Vec<&BorrowNode> {
+    fn get_children(&self, node: &BorrowNode) -> Vec<&BorrowNode> {
         self.borrowed_by
             .get(node)
             .map(|s| s.iter().map(|(n, _)| n).collect_vec())
-            .unwrap_or_else(Vec::new)
+            .unwrap_or_default()
     }
 
-    /// Gets the parents of this node.
-    pub fn get_parents(&self, node: &BorrowNode) -> Vec<&BorrowNode> {
+    /// Gets the parents (together with the edges) of this node.
+    fn get_incoming(&self, node: &BorrowNode) -> Vec<(&BorrowNode, &BorrowEdge)> {
         self.borrows_from
             .get(node)
-            .map(|s| s.iter().map(|(n, _)| n).collect_vec())
-            .unwrap_or_else(Vec::new)
-    }
-
-    /// Gets incoming edges (together with sources) of this node.
-    pub fn get_incoming(&self, node: &BorrowNode) -> SetDomain<(BorrowNode, BorrowEdge)> {
-        self.borrows_from.get(node).cloned().unwrap_or_default()
-    }
-
-    /// Returns true if this node is conditional, that is, it borrows from multiple parents,
-    /// or has a transient child which is conditional.
-    pub fn is_conditional(&self, node: &BorrowNode) -> bool {
-        if let Some(parents) = self.borrows_from.get(node) {
-            // If there are more than one parent for this node, it is
-            // conditional.
-            if parents.len() > 1 {
-                return true;
-            }
-        }
-        if let Some(childs) = self.borrowed_by.get(node) {
-            // Otherwise we look for a child that is conditional.
-            childs.iter().any(|(c, _)| self.is_conditional(c))
-        } else {
-            false
-        }
+            .map(|s| s.iter().map(|(n, e)| (n, e)).collect_vec())
+            .unwrap_or_default()
     }
 
     /// Checks whether a node is in use. A node is used if it is in the live_nodes set
@@ -96,53 +79,80 @@ impl BorrowInfo {
         }
     }
 
-    /// Checks whether this is a moved node.
-    pub fn is_moved(&self, node: &BorrowNode) -> bool {
-        self.moved_nodes.contains(node)
-    }
-
     /// Returns nodes which are dying from this to the next state. This includes those which
     /// are directly dying plus those from which they borrow. Returns nodes in child-first order.
-    pub fn dying_nodes(&self, next: &BorrowInfo) -> Vec<BorrowNode> {
-        let mut visited = BTreeSet::new();
+    pub fn dying_nodes(&self, next: &BorrowInfo) -> Vec<(BorrowNode, Vec<Vec<WriteBackAction>>)> {
         let mut result = vec![];
         for dying in self.live_nodes.difference(&next.live_nodes) {
-            // Collect ancestors, but exclude those which are still in use. Some nodes may be
-            // dying regards direct usage in instructions, but they may still be ancestors of
-            // living nodes (this is what `is_in_use` checks for).
-            if !next.is_in_use(dying) {
-                self.collect_ancestors(&mut visited, &mut result, dying, &|n| !next.is_in_use(n));
+            if next.is_in_use(dying) {
+                continue;
             }
+
+            // Collect ancestors trees until reaching an ancestor that is still in use.
+            let dying_trees = self.collect_dying_ancestor_trees(dying, next);
+            result.push((dying.clone(), dying_trees));
         }
         result
     }
 
-    /// Collects this node and ancestors, inserting them in child-first order into the
-    /// given vector. Ancestors are only added if they fulfill the predicate.
-    fn collect_ancestors<P>(
+    /// Start from this node and follow-up the borrow chain until reaching a live/in-use ancestor.
+    /// Collect possible paths (from this node to a live ancestor) and return them in the DFS order.
+    fn collect_dying_ancestor_trees(
         &self,
-        visited: &mut BTreeSet<BorrowNode>,
-        order: &mut Vec<BorrowNode>,
         node: &BorrowNode,
-        cond: &P,
-    ) where
-        P: Fn(&BorrowNode) -> bool,
-    {
-        if visited.insert(node.clone()) {
-            order.push(node.clone());
-            for parent in self.get_parents(node) {
-                if cond(parent) {
-                    self.collect_ancestors(visited, order, parent, cond);
+        next: &BorrowInfo,
+    ) -> Vec<Vec<WriteBackAction>> {
+        let mut trees = vec![];
+        self.collect_dying_ancestor_trees_recursive(node, next, vec![], &mut trees);
+        trees
+    }
+
+    fn collect_dying_ancestor_trees_recursive(
+        &self,
+        node: &BorrowNode,
+        next: &BorrowInfo,
+        order: Vec<WriteBackAction>,
+        trees: &mut Vec<Vec<WriteBackAction>>,
+    ) {
+        match node {
+            BorrowNode::LocalRoot(..) | BorrowNode::GlobalRoot(..) => {
+                trees.push(order);
+            }
+            BorrowNode::Reference(index) => {
+                if next.is_in_use(node) {
+                    // stop at a live reference
+                    trees.push(order);
+                } else {
+                    let incoming = self.get_incoming(node);
+                    if incoming.is_empty() {
+                        // when the borrow reference node has no incoming edges, it means that this
+                        // reference is a function argument.
+                        trees.push(order);
+                    } else {
+                        // when there are incoming edges, this borrow occurs within the body
+                        // of this function and this node need to be further traced upwards.
+                        for (parent, edge) in incoming {
+                            let mut appended = order.clone();
+                            appended.push(WriteBackAction {
+                                src: *index,
+                                dst: parent.clone(),
+                                edge: edge.clone(),
+                            });
+                            self.collect_dying_ancestor_trees_recursive(
+                                parent, next, appended, trees,
+                            );
+                        }
+                    }
                 }
             }
+            BorrowNode::ReturnPlaceholder(..) => {
+                unreachable!("placeholder node type is not expected here");
+            }
         }
     }
 
     pub fn is_empty(&self) -> bool {
-        self.live_nodes.is_empty()
-            && self.moved_nodes.is_empty()
-            && self.borrowed_by.is_empty()
-            && self.borrows_from.is_empty()
+        self.live_nodes.is_empty() && self.borrowed_by.is_empty() && self.borrows_from.is_empty()
     }
 
     pub fn borrow_info_str(&self, func_target: &FunctionTarget<'_>) -> String {
@@ -159,13 +169,6 @@ impl BorrowInfo {
                 .map(|node| format!("{}", node.display(func_target)))
                 .join(", "),
         );
-        add(
-            "moved_nodes",
-            self.moved_nodes
-                .iter()
-                .map(|node| format!("{}", node.display(func_target)))
-                .join(", "),
-        );
         let borrows_str =
             |(node1, borrows): (&BorrowNode, &SetDomain<(BorrowNode, BorrowEdge)>)| {
                 format!(
@@ -196,7 +199,7 @@ impl BorrowInfo {
         self.live_nodes.insert(node);
     }
 
-    fn remove_node(&mut self, node: &BorrowNode) {
+    fn del_node(&mut self, node: &BorrowNode) {
         self.live_nodes.remove(node);
     }
 
@@ -260,7 +263,7 @@ impl BorrowInfo {
     ) {
         for (dest, edge) in outgoing.iter() {
             let mut path = prefix.to_owned();
-            path.extend(edge.flatten().into_iter().cloned());
+            path.push(edge.clone());
             if let Some(succs) = ret_info.borrows_from.get(dest) {
                 self.construct_hyper_edges(leaf, ret_info, path, succs);
             } else {
@@ -269,7 +272,12 @@ impl BorrowInfo {
                     path.pop().unwrap()
                 } else {
                     path.reverse();
-                    BorrowEdge::Hyper(path)
+                    let flattened = path
+                        .iter()
+                        .flat_map(|e| e.flatten().into_iter())
+                        .cloned()
+                        .collect();
+                    BorrowEdge::Hyper(flattened)
                 };
                 self.borrowed_by
                     .entry(dest.clone())
@@ -282,7 +290,7 @@ impl BorrowInfo {
     /// Instantiates the summarized borrow graph of a function call in this graph.
     fn instantiate(
         &mut self,
-        callee_target: &FunctionTarget<'_>,
+        callee_env: &FunctionEnv,
         callee_targs: &[Type],
         callee_summary: &BorrowInfo,
         ins: &[TempIndex],
@@ -306,25 +314,28 @@ impl BorrowInfo {
                     if let BorrowNode::Reference(in_idx) = in_node {
                         let actual_in_node = BorrowNode::Reference(get_in(*in_idx));
                         self.add_edge(
-                            actual_in_node.clone(),
+                            actual_in_node,
                             out_node.clone(),
                             edge.instantiate(callee_targs),
                         );
-                        self.moved_nodes.insert(actual_in_node);
                     }
                 }
             } else {
                 assert!(
-                    !callee_target
-                        .get_return_type(ret_idx)
-                        .is_mutable_reference(),
-                    "inconsistent borrow information: undefined output: {}\n{}",
-                    callee_target.func_env.get_full_name_str(),
-                    callee_summary.borrow_info_str(callee_target)
+                    !callee_env.get_return_type(ret_idx).is_mutable_reference(),
+                    "inconsistent borrow information: undefined output: {}",
+                    callee_env.get_full_name_str()
                 )
             }
         }
     }
+
+    fn join(&mut self, other: &Self) -> JoinResult {
+        self.live_nodes
+            .join(&other.live_nodes)
+            .combine(self.borrowed_by.join(&other.borrowed_by))
+            .combine(self.borrows_from.join(&other.borrows_from))
+    }
 }
 
 #[derive(Clone, Default)]
@@ -347,14 +358,33 @@ impl BorrowAnnotation {
     pub fn get_borrow_info_at(&self, code_offset: CodeOffset) -> Option<&BorrowInfoAtCodeOffset> {
         self.code_map.get(&code_offset)
     }
+
+    fn join(&mut self, other: &Self) -> JoinResult {
+        let mut result = self.summary.join(&other.summary);
+        for (offset, info) in self.code_map.iter_mut() {
+            let other_info = other.code_map.get(offset).unwrap();
+            result = result.combine(
+                info.before
+                    .join(&other_info.before)
+                    .combine(info.after.join(&other_info.after)),
+            );
+        }
+        result
+    }
 }
 
 /// Borrow analysis processor.
-pub struct BorrowAnalysisProcessor {}
+pub struct BorrowAnalysisProcessor {
+    borrow_natives: Vec<String>,
+}
 
 impl BorrowAnalysisProcessor {
     pub fn new() -> Box<Self> {
-        Box::new(BorrowAnalysisProcessor {})
+        Self::new_borrow_natives(vec![])
+    }
+
+    pub fn new_borrow_natives(borrow_natives: Vec<String>) -> Box<Self> {
+        Box::new(BorrowAnalysisProcessor { borrow_natives })
     }
 }
 
@@ -362,24 +392,42 @@ impl FunctionTargetProcessor for BorrowAnalysisProcessor {
     fn process(
         &self,
         targets: &mut FunctionTargetsHolder,
-        func_env: &FunctionEnv<'_>,
+        func_env: &FunctionEnv,
         mut data: FunctionData,
+        scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
-        let borrow_annotation = if func_env.is_native_or_intrinsic() {
-            native_annotation(func_env)
-        } else {
-            let func_target = FunctionTarget::new(func_env, &data);
-            let analyzer = BorrowAnalysis::new(&func_target, targets);
-            analyzer.analyze(&data.code)
+        let mut borrow_annotation = get_custom_annotation_or_none(func_env, &self.borrow_natives)
+            .unwrap_or_else(|| {
+                let func_target = FunctionTarget::new(func_env, &data);
+                let analyzer = BorrowAnalysis::new(&func_target, targets, &self.borrow_natives);
+                analyzer.analyze(&data.code)
+            });
+
+        // Annotate function target with computed borrow data
+        let fixedpoint = match scc_opt {
+            None => true,
+            Some(_) => match data.annotations.get::<BorrowAnnotation>() {
+                None => false,
+                Some(old_annotation) => match borrow_annotation.join(old_annotation) {
+                    JoinResult::Unchanged => true,
+                    JoinResult::Changed => false,
+                },
+            },
         };
-        // Annotate function target with computed borrow data.
         data.annotations
             .borrow_mut()
-            .set::<BorrowAnnotation>(borrow_annotation);
-        data.annotations.borrow_mut().remove::<LiveVarAnnotation>();
+            .set::<BorrowAnnotation>(borrow_annotation, fixedpoint);
         data
     }
 
+    fn finalize(&self, _env: &GlobalEnv, targets: &mut FunctionTargetsHolder) {
+        for (fun_id, variant) in targets.get_funs_and_variants().collect_vec() {
+            if let Some(data) = targets.get_data_mut(&fun_id, &variant) {
+                data.annotations.remove::<LiveVarAnnotation>();
+            }
+        }
+    }
+
     fn name(&self) -> String {
         "borrow_analysis".to_string()
     }
@@ -412,22 +460,67 @@ impl FunctionTargetProcessor for BorrowAnalysisProcessor {
     }
 }
 
-fn native_annotation(fun_env: &FunctionEnv) -> BorrowAnnotation {
-    if fun_env.is_well_known(VECTOR_BORROW_MUT) || fun_env.is_well_known(TABLE_BORROW_MUT) {
-        // Create an edge from the first parameter to the return value.
-        let mut an = BorrowAnnotation::default();
-        let param_node = BorrowNode::Reference(0);
-        let return_node = BorrowNode::ReturnPlaceholder(0);
-        let edge = BorrowEdge::Index;
-        an.summary
-            .borrowed_by
-            .entry(param_node)
-            .or_default()
-            .insert((return_node, edge));
-        an.summary.consolidate();
-        an
-    } else {
-        BorrowAnnotation::default()
+/// If fun_env matches one of the functions implementing custom mutable borrow semantics,
+/// return the name of this function
+fn get_custom_borrow_info_or_none(
+    fun_env: &FunctionEnv,
+    borrow_natives: &Vec<String>,
+) -> Option<String> {
+    for name in borrow_natives {
+        if &fun_env.get_full_name_str() == name {
+            return Some(name.to_string());
+        }
+    }
+    None
+}
+
+/// Create a borrow annotation that captures the borrow relation between function params and returns
+fn summarize_custom_borrow(
+    edge_kind: IndexEdgeKind,
+    params: &[usize],
+    returns: &[usize],
+) -> BorrowAnnotation {
+    let mut an = BorrowAnnotation::default();
+    for param_index in params {
+        for return_index in returns {
+            let param_node = BorrowNode::Reference(*param_index);
+            let return_node = BorrowNode::ReturnPlaceholder(*return_index);
+            let edge = BorrowEdge::Index(edge_kind.clone());
+            an.summary
+                .borrowed_by
+                .entry(param_node)
+                .or_default()
+                .insert((return_node, edge));
+        }
+    }
+    an.summary.consolidate();
+    an
+}
+
+fn get_custom_annotation_or_none(
+    fun_env: &FunctionEnv,
+    borrow_natives: &Vec<String>,
+) -> Option<BorrowAnnotation> {
+    match get_custom_borrow_info_or_none(fun_env, borrow_natives) {
+        None => {
+            // check whether this borrow has known special semantics
+            if fun_env.is_well_known(VECTOR_BORROW_MUT) {
+                Some(summarize_custom_borrow(IndexEdgeKind::Vector, &[0], &[0]))
+            } else if fun_env.is_intrinsic_of(INTRINSIC_FUN_MAP_BORROW_MUT) {
+                Some(summarize_custom_borrow(IndexEdgeKind::Table, &[0], &[0]))
+            } else if fun_env.is_native_or_intrinsic() {
+                // non-borrow related native/intrinsic has no borrow semantics
+                Some(BorrowAnnotation::default())
+            } else {
+                // this is a normal function and we can summarize its borrow semantics
+                None
+            }
+        }
+        Some(name) => Some(summarize_custom_borrow(
+            IndexEdgeKind::Custom(name),
+            &[0],
+            &[0],
+        )),
     }
 }
 
@@ -435,10 +528,15 @@ struct BorrowAnalysis<'a> {
     func_target: &'a FunctionTarget<'a>,
     livevar_annotation: &'a LiveVarAnnotation,
     targets: &'a FunctionTargetsHolder,
+    borrow_natives: &'a Vec<String>,
 }
 
 impl<'a> BorrowAnalysis<'a> {
-    fn new(func_target: &'a FunctionTarget<'a>, targets: &'a FunctionTargetsHolder) -> Self {
+    fn new(
+        func_target: &'a FunctionTarget<'a>,
+        targets: &'a FunctionTargetsHolder,
+        borrow_natives: &'a Vec<String>,
+    ) -> Self {
         let livevar_annotation = func_target
             .get_annotations()
             .get::<LiveVarAnnotation>()
@@ -448,6 +546,7 @@ impl<'a> BorrowAnalysis<'a> {
             func_target,
             livevar_annotation,
             targets,
+            borrow_natives,
         }
     }
 
@@ -492,26 +591,6 @@ impl<'a> BorrowAnalysis<'a> {
             BorrowNode::LocalRoot(idx)
         }
     }
-
-    fn remap_borrow_node(&self, state: &mut BorrowInfo, from: &BorrowNode, to: &BorrowNode) {
-        let remap = |node: BorrowNode| if &node == from { to.clone() } else { node };
-        state.live_nodes = std::mem::take(&mut state.live_nodes)
-            .into_iter()
-            .map(remap)
-            .collect();
-        state.borrowed_by = std::mem::take(&mut state.borrowed_by)
-            .into_iter()
-            .map(|(src, dests)| {
-                (
-                    remap(src),
-                    dests
-                        .into_iter()
-                        .map(|(node, edges)| (remap(node), edges))
-                        .collect(),
-                )
-            })
-            .collect()
-    }
 }
 
 impl<'a> TransferFunctions for BorrowAnalysis<'a> {
@@ -524,22 +603,35 @@ impl<'a> TransferFunctions for BorrowAnalysis<'a> {
             .livevar_annotation
             .get_live_var_info_at(code_offset)
             .expect("livevar annotation");
+
         match instr {
             Assign(_, dest, src, kind) => {
                 let dest_node = self.borrow_node(*dest);
+                state.add_node(dest_node.clone());
+
                 let src_node = self.borrow_node(*src);
                 match kind {
-                    AssignKind::Move | AssignKind::Store => {
-                        self.remap_borrow_node(state, &src_node, &dest_node);
-                        state.moved_nodes.insert(src_node);
+                    AssignKind::Move => {
+                        assert!(!self.func_target.get_local_type(*src).is_reference());
+                        assert!(!self.func_target.get_local_type(*dest).is_reference());
+                        state.del_node(&src_node);
                     }
                     AssignKind::Copy => {
-                        state.add_node(dest_node.clone());
-                        state.add_edge(src_node, dest_node, BorrowEdge::Direct);
+                        assert!(!self.func_target.get_local_type(*src).is_reference());
+                        assert!(!self.func_target.get_local_type(*dest).is_reference());
+                    }
+                    AssignKind::Store => {
+                        if self.func_target.get_local_type(*src).is_mutable_reference() {
+                            assert!(self
+                                .func_target
+                                .get_local_type(*dest)
+                                .is_mutable_reference());
+                            state.add_edge(src_node, dest_node, BorrowEdge::Direct);
+                        }
                     }
                 }
             }
-            Call(id, dests, oper, srcs, _) => {
+            Call(_, dests, oper, srcs, _) => {
                 use Operation::*;
                 match oper {
                     // In the borrows below, we only create an edge if the
@@ -581,36 +673,40 @@ impl<'a> TransferFunctions for BorrowAnalysis<'a> {
                             .func_target
                             .global_env()
                             .get_function_qid(mid.qualified(*fid));
-                        let callee_target = &self
-                            .targets
-                            .get_target(callee_env, &FunctionVariant::Baseline);
-                        let native_an;
-                        let callee_an_opt = if callee_env.is_native_or_intrinsic() {
-                            native_an = native_annotation(callee_env);
-                            Some(&native_an)
-                        } else {
-                            callee_target.get_annotations().get::<BorrowAnnotation>()
-                        };
-                        if let Some(callee_an) = callee_an_opt {
-                            state.instantiate(
-                                callee_target,
-                                targs,
-                                &callee_an.summary,
-                                srcs,
-                                dests,
-                            );
-                        } else {
-                            // This can happen for recursive functions. Check whether the function
-                            // has &mut returns, and report an error that we can't deal with it if
-                            // so.
-                            let has_muts = (0..callee_target.get_return_count()).any(|idx| {
-                                callee_target.get_return_type(idx).is_mutable_reference()
-                            });
-                            if has_muts {
-                                callee_target.global_env().error(&self.func_target.get_bytecode_loc(*id),
-                                    "restriction: recursive functions which return `&mut` values not supported");
-                            }
-                        }
+
+                        let callee_annotation =
+                            get_custom_annotation_or_none(callee_env, self.borrow_natives)
+                                .unwrap_or_else(|| {
+                                    let callee_info = if mid.qualified(*fid)
+                                        == self.func_target.func_env.get_qualified_id()
+                                    {
+                                        // self recursion (this is because we removed the current target from `self.targets`)
+                                        self.func_target.get_annotations().get::<BorrowAnnotation>()
+                                    } else {
+                                        let callee_target = self
+                                            .targets
+                                            .get_target(callee_env, &FunctionVariant::Baseline);
+                                        callee_target.get_annotations().get::<BorrowAnnotation>()
+                                    };
+                                    match callee_info {
+                                        None => {
+                                            // 1st iteration of the recursive case
+                                            BorrowAnnotation::default()
+                                        }
+                                        Some(annotation) => {
+                                            // non-recursive case or Nth iteration of fixedpoint (N >= 1)
+                                            annotation.clone()
+                                        }
+                                    }
+                                });
+
+                        state.instantiate(
+                            callee_env,
+                            targs,
+                            &callee_annotation.summary,
+                            srcs,
+                            dests,
+                        );
                     }
                     OpaqueCallBegin(_, _, _) | OpaqueCallEnd(_, _, _) => {
                         // just skip
@@ -626,14 +722,13 @@ impl<'a> TransferFunctions for BorrowAnalysis<'a> {
         }
 
         // Update live_vars.
-
         for idx in livevar_annotation_at
             .before
             .difference(&livevar_annotation_at.after)
         {
             if self.func_target.get_local_type(*idx).is_reference() {
                 let node = self.borrow_node(*idx);
-                state.remove_node(&node);
+                state.del_node(&node);
             }
         }
     }
@@ -644,11 +739,8 @@ impl<'a> DataflowAnalysis for BorrowAnalysis<'a> {}
 impl AbstractDomain for BorrowInfo {
     fn join(&mut self, other: &Self) -> JoinResult {
         let live_changed = self.live_nodes.join(&other.live_nodes);
-        let moved_changed = self.moved_nodes.join(&other.moved_nodes);
         let borrowed_changed = self.borrowed_by.join(&other.borrowed_by);
-        borrowed_changed
-            .combine(moved_changed)
-            .combine(live_changed)
+        borrowed_changed.combine(live_changed)
     }
 }
 
diff --git a/language/move-prover/bytecode/src/clean_and_optimize.rs b/language/move-prover/bytecode/src/clean_and_optimize.rs
index 87f31287b0..b1c6d8bd54 100644
--- a/language/move-prover/bytecode/src/clean_and_optimize.rs
+++ b/language/move-prover/bytecode/src/clean_and_optimize.rs
@@ -4,23 +4,24 @@
 
 // Final phase of cleanup and optimization.
 
+use std::collections::BTreeSet;
+
+use move_binary_format::file_format::CodeOffset;
+use move_model::{
+    model::FunctionEnv,
+    pragmas::INTRINSIC_FUN_MAP_BORROW_MUT,
+    well_known::{EVENT_EMIT_EVENT, VECTOR_BORROW_MUT},
+};
+
 use crate::{
     dataflow_analysis::{DataflowAnalysis, TransferFunctions},
+    dataflow_domains::{AbstractDomain, JoinResult},
     function_target::{FunctionData, FunctionTarget},
     function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
     options::ProverOptions,
     stackless_bytecode::{BorrowNode, Bytecode, Operation},
     stackless_control_flow_graph::StacklessControlFlowGraph,
 };
-use move_binary_format::file_format::CodeOffset;
-use move_model::{
-    model::FunctionEnv,
-    well_known::{EVENT_EMIT_EVENT, VECTOR_BORROW_MUT},
-};
-
-use crate::dataflow_domains::{AbstractDomain, JoinResult};
-use move_model::well_known::TABLE_BORROW_MUT;
-use std::collections::BTreeSet;
 
 pub struct CleanAndOptimizeProcessor();
 
@@ -34,8 +35,9 @@ impl FunctionTargetProcessor for CleanAndOptimizeProcessor {
     fn process(
         &self,
         _targets: &mut FunctionTargetsHolder,
-        func_env: &FunctionEnv<'_>,
+        func_env: &FunctionEnv,
         mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         if func_env.is_native() {
             // Nothing to do
@@ -46,7 +48,7 @@ impl FunctionTargetProcessor for CleanAndOptimizeProcessor {
         let options = ProverOptions::get(func_env.module_env.env);
         let instrs = std::mem::take(&mut data.code);
         let new_instrs = Optimizer {
-            options: &*options,
+            options: &options,
             target: &FunctionTarget::new(func_env, &data),
         }
         .run(instrs);
@@ -115,7 +117,8 @@ impl<'a> TransferFunctions for Optimizer<'a> {
                         // Exploit knowledge about builtin functions
                         !(callee_env.is_well_known(VECTOR_BORROW_MUT)
                             || callee_env.is_well_known(EVENT_EMIT_EVENT)
-                            || callee_env.is_well_known(TABLE_BORROW_MUT))
+                            || callee_env.is_intrinsic_of(INTRINSIC_FUN_MAP_BORROW_MUT)
+                            || is_custom_borrow(callee_env, &self.options.borrow_natives))
                     } else {
                         true
                     };
@@ -135,6 +138,16 @@ impl<'a> TransferFunctions for Optimizer<'a> {
     }
 }
 
+/// Check if fun_env matches one of the functions implementing custom mutable borrow semantics.
+fn is_custom_borrow(fun_env: &FunctionEnv, borrow_natives: &Vec<String>) -> bool {
+    for name in borrow_natives {
+        if &fun_env.get_full_name_str() == name {
+            return true;
+        }
+    }
+    false
+}
+
 impl<'a> DataflowAnalysis for Optimizer<'a> {}
 
 // Transformation
@@ -149,7 +162,8 @@ impl<'a> Optimizer<'a> {
 
         // Transform code.
         let mut new_instrs = vec![];
-        for (code_offset, instr) in instrs.into_iter().enumerate() {
+        let mut should_skip = BTreeSet::new();
+        for (code_offset, instr) in instrs.iter().enumerate() {
             use BorrowNode::*;
             use Bytecode::*;
             use Operation::*;
@@ -162,38 +176,73 @@ impl<'a> Optimizer<'a> {
                     true
                 }
             };
-            if !new_instrs.is_empty() {
-                // Perform peephole optimization
-                match (&new_instrs[new_instrs.len() - 1], &instr) {
-                    (Call(_, _, UnpackRef, srcs1, _), Call(_, _, PackRef, srcs2, _))
-                        if srcs1[0] == srcs2[0] =>
-                    {
-                        // skip this redundant unpack/pack pair.
-                        new_instrs.pop();
-                        continue;
+
+            // Perform peephole optimization
+            match (new_instrs.last(), instr) {
+                (None, _) => {}
+                (Some(Call(_, _, UnpackRef, srcs1, _)), Call(_, _, PackRef, srcs2, _))
+                    if srcs1[0] == srcs2[0] =>
+                {
+                    // skip this redundant unpack/pack pair.
+                    new_instrs.pop();
+                    continue;
+                }
+                (Some(Call(_, dests, IsParent(..), srcs, _)), Branch(_, _, _, tmp))
+                    if dests[0] == *tmp
+                        && !is_unwritten(code_offset as CodeOffset, &Reference(srcs[0])) =>
+                {
+                    assert!(matches!(instrs[code_offset + 1], Label(..)));
+                    // skip this obsolete IsParent check when all WriteBacks in this block are redundant
+                    let mut block_cursor = code_offset + 2;
+                    let mut skip_branch = true;
+                    loop {
+                        match &instrs[block_cursor] {
+                            Call(_, _, WriteBack(_, _), srcs, _) => {
+                                if is_unwritten(block_cursor as CodeOffset, &Reference(srcs[0])) {
+                                    skip_branch = false;
+                                    break;
+                                }
+                                // skip redundant write-backs
+                                should_skip.insert(block_cursor);
+                            }
+                            Call(_, _, TraceLocal(_), _, _) => {
+                                // since the previous write-back is skipped, this trace local is redundant as well
+                                should_skip.insert(block_cursor);
+                            }
+                            _ => {
+                                break;
+                            }
+                        }
+                        block_cursor += 1;
                     }
-                    (Call(_, dests, IsParent(..), srcs, _), Branch(_, _, _, tmp))
-                        if dests[0] == *tmp
-                            && !is_unwritten(code_offset as CodeOffset, &Reference(srcs[0])) =>
-                    {
-                        // skip this obsolete IsParent check
+                    if skip_branch {
+                        // get rid of the label as well
+                        should_skip.insert(code_offset + 1);
                         new_instrs.pop();
                         continue;
                     }
-                    _ => {}
                 }
+                (Some(_), _) => {}
             }
-            // Remove unnecessary WriteBack
-            match &instr {
+
+            // Do not include this instruction if it is marked as skipped
+            if should_skip.contains(&code_offset) {
+                continue;
+            }
+
+            // Other cases for skipping the instruction
+            match instr {
+                // Remove unnecessary WriteBack
                 Call(_, _, WriteBack(..), srcs, _)
                     if !is_unwritten(code_offset as CodeOffset, &Reference(srcs[0])) =>
                 {
-                    // skip this obsolete WriteBack
                     continue;
                 }
                 _ => {}
             }
-            new_instrs.push(instr);
+
+            // This instruction should be included
+            new_instrs.push(instr.clone());
         }
         new_instrs
     }
diff --git a/language/move-prover/bytecode/src/compositional_analysis.rs b/language/move-prover/bytecode/src/compositional_analysis.rs
index f6b669e3ca..20bbc52860 100644
--- a/language/move-prover/bytecode/src/compositional_analysis.rs
+++ b/language/move-prover/bytecode/src/compositional_analysis.rs
@@ -2,6 +2,8 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use move_model::model::{FunId, GlobalEnv, QualifiedId};
+
 use crate::{
     dataflow_analysis::DataflowAnalysis,
     dataflow_domains::AbstractDomain,
@@ -9,7 +11,6 @@ use crate::{
     function_target_pipeline::{FunctionTargetsHolder, FunctionVariant},
     stackless_control_flow_graph::StacklessControlFlowGraph,
 };
-use move_model::model::{FunId, GlobalEnv, QualifiedId};
 
 /// Provides access to procedure summaries that have already been computed
 pub struct SummaryCache<'a> {
@@ -25,7 +26,8 @@ impl<'a> SummaryCache<'a> {
         }
     }
 
-    /// Return a summary for a variant of `fun_id`. Returns None if `fun_id` is a native function
+    /// Return a summary for a variant of `fun_id`. Returns None if `fun_id` is a native function or
+    /// we are at the first iteration of a recursive functions group.
     pub fn get<Summary: 'static>(
         &self,
         fun_id: QualifiedId<FunId>,
@@ -34,18 +36,13 @@ impl<'a> SummaryCache<'a> {
         let fun_env = self.global_env.get_function(fun_id);
         self.targets
             .get_data(&fun_id, variant)
-            .map(|fun_data| {
+            .and_then(|fun_data| {
                 if fun_env.is_native_or_intrinsic() {
                     None
                 } else {
-                    Some(
-                        fun_data.annotations.get::<Summary>().expect(
-                            "Failed to resolve summary; recursion or scheduler bug suspected",
-                        ),
-                    )
+                    fun_data.annotations.get::<Summary>()
                 }
             })
-            .flatten()
     }
 
     pub fn global_env(&self) -> &GlobalEnv {
diff --git a/language/move-prover/bytecode/src/data_invariant_instrumentation.rs b/language/move-prover/bytecode/src/data_invariant_instrumentation.rs
index 721c693979..d3b5b9d9dc 100644
--- a/language/move-prover/bytecode/src/data_invariant_instrumentation.rs
+++ b/language/move-prover/bytecode/src/data_invariant_instrumentation.rs
@@ -11,22 +11,23 @@
 //! (which depends on the compilation scheme). It also handles PackRef/PackRefDeep
 //! instructions introduced by memory instrumentation, as well as the Pack instructions.
 
-use crate::{
-    function_data_builder::FunctionDataBuilder,
-    function_target::FunctionData,
-    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
-    options::ProverOptions,
-    stackless_bytecode::{Bytecode, Operation, PropKind},
-};
-
 use move_model::{
     ast,
     ast::{ConditionKind, Exp, ExpData, QuantKind, TempIndex},
     exp_generator::ExpGenerator,
     model::{FunctionEnv, Loc, NodeId, StructEnv},
+    pragmas::{INTRINSIC_FUN_MAP_SPEC_GET, INTRINSIC_TYPE_MAP},
     ty::Type,
 };
 
+use crate::{
+    function_data_builder::FunctionDataBuilder,
+    function_target::FunctionData,
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
+    options::ProverOptions,
+    stackless_bytecode::{Bytecode, Operation, PropKind},
+};
+
 const INVARIANT_FAILS_MESSAGE: &str = "data invariant does not hold";
 
 pub struct DataInvariantInstrumentationProcessor {}
@@ -41,15 +42,16 @@ impl FunctionTargetProcessor for DataInvariantInstrumentationProcessor {
     fn process(
         &self,
         targets: &mut FunctionTargetsHolder,
-        fun_env: &FunctionEnv<'_>,
+        fun_env: &FunctionEnv,
         data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         if fun_env.is_native() || fun_env.is_intrinsic() {
             // Nothing to do.
             return data;
         }
         let options = ProverOptions::get(fun_env.module_env.env);
-        Instrumenter::run(&*options, targets, fun_env, data)
+        Instrumenter::run(&options, targets, fun_env, data)
     }
 
     fn name(&self) -> String {
@@ -164,30 +166,63 @@ impl<'a> Instrumenter<'a> {
     }
 
     fn translate_invariant(&self, deep: bool, value: Exp) -> Vec<(Loc, Exp)> {
-        let ty = self.builder.global_env().get_node_type(value.node_id());
+        let env = self.builder.global_env();
+        let ty = env.get_node_type(value.node_id());
         match ty.skip_reference() {
             Type::Struct(mid, sid, targs) => {
-                let struct_env = self.builder.global_env().get_module(*mid).into_struct(*sid);
-                self.translate_invariant_for_struct(deep, value, struct_env, targs)
+                let struct_env = env.get_module(*mid).into_struct(*sid);
+                if struct_env.is_intrinsic_of(INTRINSIC_TYPE_MAP) {
+                    let decl = env
+                        .intrinsics
+                        .get_decl_for_struct(&mid.qualified(*sid))
+                        .expect("intrinsic declaration");
+                    let spec_fun_get = decl
+                        .lookup_spec_fun(env, INTRINSIC_FUN_MAP_SPEC_GET)
+                        .expect("intrinsic map_get function");
+
+                    // When dealing with a map, we cannot maintain individual locations for
+                    // invariants. Instead we choose just one as a representative.
+                    // TODO(refactoring): we should use the spec block position instead.
+                    let mut loc = env.unknown_loc();
+                    let quant = self.builder.mk_map_quant_opt(
+                        QuantKind::Forall,
+                        value,
+                        spec_fun_get,
+                        &targs[0],
+                        &targs[1],
+                        &mut |e| {
+                            let invs = self.translate_invariant(deep, e);
+                            if !invs.is_empty() {
+                                loc = invs[0].0.clone();
+                            }
+                            self.builder
+                                .mk_join_bool(ast::Operation::And, invs.into_iter().map(|(_, e)| e))
+                        },
+                    );
+                    if let Some(e) = quant {
+                        vec![(loc, e)]
+                    } else {
+                        vec![]
+                    }
+                } else {
+                    self.translate_invariant_for_struct(deep, value, struct_env, targs)
+                }
             }
             Type::Vector(ety) => {
                 // When dealing with a vector, we cannot maintain individual locations for
                 // invariants. Instead we choose just one as a representative.
                 // TODO(refactoring): we should use the spec block position instead.
-                let mut loc = self.builder.global_env().unknown_loc();
-                let quant = self.builder.mk_vector_quant_opt(
-                    QuantKind::Forall,
-                    value,
-                    &*ety,
-                    &mut |elem| {
-                        let invs = self.translate_invariant(deep, elem);
-                        if !invs.is_empty() {
-                            loc = invs[0].0.clone();
-                        }
-                        self.builder
-                            .mk_join_bool(ast::Operation::And, invs.into_iter().map(|(_, e)| e))
-                    },
-                );
+                let mut loc = env.unknown_loc();
+                let quant =
+                    self.builder
+                        .mk_vector_quant_opt(QuantKind::Forall, value, ety, &mut |elem| {
+                            let invs = self.translate_invariant(deep, elem);
+                            if !invs.is_empty() {
+                                loc = invs[0].0.clone();
+                            }
+                            self.builder
+                                .mk_join_bool(ast::Operation::And, invs.into_iter().map(|(_, e)| e))
+                        });
                 if let Some(e) = quant {
                     vec![(loc, e)]
                 } else {
diff --git a/language/move-prover/bytecode/src/debug_instrumentation.rs b/language/move-prover/bytecode/src/debug_instrumentation.rs
index 754d3d6e07..54afa69fc3 100644
--- a/language/move-prover/bytecode/src/debug_instrumentation.rs
+++ b/language/move-prover/bytecode/src/debug_instrumentation.rs
@@ -10,6 +10,10 @@
 //! compiler. Later transformations may replace `idx` but `original_idx` will be preserved so
 //! the user sees the value of their named variable.
 
+use std::collections::BTreeSet;
+
+use move_model::{exp_generator::ExpGenerator, model::FunctionEnv};
+
 use crate::{
     function_data_builder::FunctionDataBuilder,
     function_target::FunctionData,
@@ -17,9 +21,6 @@ use crate::{
     stackless_bytecode::{Bytecode, Operation},
 };
 
-use move_model::{exp_generator::ExpGenerator, model::FunctionEnv};
-use std::collections::BTreeSet;
-
 pub struct DebugInstrumenter {}
 
 impl DebugInstrumenter {
@@ -32,8 +33,9 @@ impl FunctionTargetProcessor for DebugInstrumenter {
     fn process(
         &self,
         _targets: &mut FunctionTargetsHolder,
-        fun_env: &FunctionEnv<'_>,
+        fun_env: &FunctionEnv,
         data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         use Bytecode::*;
 
@@ -93,7 +95,7 @@ impl FunctionTargetProcessor for DebugInstrumenter {
                     for idx in affected_variables {
                         // Only emit this for user declared locals, not for ones introduced
                         // by stack elimination.
-                        if idx < fun_env.get_local_count() {
+                        if !fun_env.is_temporary(idx) {
                             builder.emit_with(|id| {
                                 Call(id, vec![], Operation::TraceLocal(idx), vec![idx], None)
                             });
diff --git a/language/move-prover/bytecode/src/eliminate_imm_refs.rs b/language/move-prover/bytecode/src/eliminate_imm_refs.rs
index 93a2e97e13..aa670c0aa5 100644
--- a/language/move-prover/bytecode/src/eliminate_imm_refs.rs
+++ b/language/move-prover/bytecode/src/eliminate_imm_refs.rs
@@ -2,13 +2,14 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use move_model::{ast::TempIndex, model::FunctionEnv, ty::Type};
+
 use crate::{
     function_data_builder::FunctionDataBuilder,
     function_target::FunctionData,
     function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
     stackless_bytecode::{AssignKind, Bytecode, Operation},
 };
-use move_model::{ast::TempIndex, model::FunctionEnv, ty::Type};
 
 pub struct EliminateImmRefsProcessor {}
 
@@ -22,8 +23,9 @@ impl FunctionTargetProcessor for EliminateImmRefsProcessor {
     fn process(
         &self,
         _targets: &mut FunctionTargetsHolder,
-        func_env: &FunctionEnv<'_>,
+        func_env: &FunctionEnv,
         data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         let mut elim = EliminateImmRefs::new(FunctionDataBuilder::new(func_env, data));
         elim.run();
@@ -105,6 +107,9 @@ impl<'a> EliminateImmRefs<'a> {
                         aa,
                     ));
                 }
+                Destroy if self.is_imm_ref(srcs[0]) => {
+                    // skip the destroy on an immutable ref
+                }
                 _ => self.builder.emit(Call(attr_id, dests, op, srcs, aa)),
             },
             _ => self.builder.emit(bytecode),
diff --git a/language/move-prover/bytecode/src/escape_analysis.rs b/language/move-prover/bytecode/src/escape_analysis.rs
index e84f98cdba..4f86a59382 100644
--- a/language/move-prover/bytecode/src/escape_analysis.rs
+++ b/language/move-prover/bytecode/src/escape_analysis.rs
@@ -5,25 +5,28 @@
 //! This escape analysis flags procedures that return a reference pointing inside of a struct type
 //! declared in the current module.
 
-use crate::{
-    dataflow_analysis::{DataflowAnalysis, TransferFunctions},
-    dataflow_domains::{AbstractDomain, JoinResult, MapDomain},
-    function_target::FunctionData,
-    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
-    stackless_bytecode::{Bytecode, Operation},
-    stackless_control_flow_graph::StacklessControlFlowGraph,
+use std::{
+    cell::RefCell,
+    cmp::Ordering,
+    collections::{BTreeMap, BTreeSet, HashSet},
 };
+
 use codespan::FileId;
 use codespan_reporting::diagnostic::{Diagnostic, Label, Severity};
+
 use move_binary_format::file_format::CodeOffset;
 use move_model::{
     ast::{Operation as ASTOperation, TempIndex},
     model::{FieldId, FunctionEnv, ModuleId, QualifiedId, StructId},
 };
-use std::{
-    cell::RefCell,
-    cmp::Ordering,
-    collections::{BTreeMap, BTreeSet, HashSet},
+
+use crate::{
+    dataflow_analysis::{DataflowAnalysis, TransferFunctions},
+    dataflow_domains::{AbstractDomain, JoinResult, MapDomain},
+    function_target::FunctionData,
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
+    stackless_bytecode::{Bytecode, Operation},
+    stackless_control_flow_graph::StacklessControlFlowGraph,
 };
 
 // =================================================================================================
@@ -295,6 +298,9 @@ impl<'a> TransferFunctions for EscapeAnalysis<'a> {
                 WriteRef | MoveTo(..) => {
                     // these operations do not assign any locals
                 }
+                Uninit => {
+                    // this operation is just a marker and does not assign any locals
+                }
                 Destroy => {
                     state.remove(&args[0]);
                 }
@@ -336,8 +342,9 @@ impl FunctionTargetProcessor for EscapeAnalysisProcessor {
     fn process(
         &self,
         _targets: &mut FunctionTargetsHolder,
-        func_env: &FunctionEnv<'_>,
+        func_env: &FunctionEnv,
         data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         if func_env.is_native() {
             return data;
diff --git a/language/move-prover/bytecode/src/function_data_builder.rs b/language/move-prover/bytecode/src/function_data_builder.rs
index f223e91264..69f1c4a13a 100644
--- a/language/move-prover/bytecode/src/function_data_builder.rs
+++ b/language/move-prover/bytecode/src/function_data_builder.rs
@@ -210,6 +210,21 @@ impl<'env> FunctionDataBuilder<'env> {
         (temp, temp_exp)
     }
 
+    /// Similar to `emit_let`, but with the temporary created as identical to the dereference of
+    /// the mutation (if the `def` argument is a mutable reference).
+    pub fn emit_let_skip_reference(&mut self, def: Exp) -> (TempIndex, Exp) {
+        let ty = self
+            .global_env()
+            .get_node_type(def.node_id())
+            .skip_reference()
+            .clone();
+        let temp = self.new_temp(ty);
+        let temp_exp = self.mk_temporary(temp);
+        let definition = self.mk_identical(temp_exp.clone(), def);
+        self.emit_with(|id| Bytecode::Prop(id, PropKind::Assume, definition));
+        (temp, temp_exp)
+    }
+
     /// Emits a new temporary with a havoced value of given type.
     pub fn emit_let_havoc(&mut self, ty: Type) -> (TempIndex, Exp) {
         let havoc_kind = if ty.is_mutable_reference() {
@@ -220,7 +235,7 @@ impl<'env> FunctionDataBuilder<'env> {
         let temp = self.new_temp(ty);
         let temp_exp = self.mk_temporary(temp);
         self.emit_with(|id| {
-            Bytecode::Call(id, vec![], Operation::Havoc(havoc_kind), vec![temp], None)
+            Bytecode::Call(id, vec![temp], Operation::Havoc(havoc_kind), vec![], None)
         });
         (temp, temp_exp)
     }
diff --git a/language/move-prover/bytecode/src/function_target.rs b/language/move-prover/bytecode/src/function_target.rs
index b0a20415ad..79f0aeab14 100644
--- a/language/move-prover/bytecode/src/function_target.rs
+++ b/language/move-prover/bytecode/src/function_target.rs
@@ -152,16 +152,6 @@ impl<'env> FunctionTarget<'env> {
         self.data.vc_infos.get(&attr_id)
     }
 
-    /// Returns true if this function is native.
-    pub fn is_native(&self) -> bool {
-        self.func_env.is_native()
-    }
-
-    /// Returns true if this function is marked as intrinsic
-    pub fn is_intrinsic(&self) -> bool {
-        self.func_env.is_intrinsic()
-    }
-
     /// Returns true if this function is opaque.
     pub fn is_opaque(&self) -> bool {
         self.func_env.is_opaque()
@@ -326,7 +316,7 @@ impl<'env> FunctionTarget<'env> {
         self.data
             .modify_targets
             .iter()
-            .map(|(qid, exps)| {
+            .flat_map(|(qid, exps)| {
                 exps.iter().map(move |e| {
                     let env = self.global_env();
                     let rty = &env.get_node_instantiation(e.node_id())[0];
@@ -334,7 +324,6 @@ impl<'env> FunctionTarget<'env> {
                     qid.instantiate(inst.to_owned())
                 })
             })
-            .flatten()
             .collect()
     }
 
@@ -377,7 +366,7 @@ impl<'env> FunctionTarget<'env> {
             .borrow()
             .iter()
             .filter_map(|fmt_fun| fmt_fun(self, offset as CodeOffset))
-            .map(|s| format!("     # {}", s.replace("\n", "\n     # ").trim()))
+            .map(|s| format!("     # {}", s.replace('\n', "\n     # ").trim()))
             .join("\n");
         if !annotations.is_empty() {
             texts.push(annotations);
diff --git a/language/move-prover/bytecode/src/function_target_pipeline.rs b/language/move-prover/bytecode/src/function_target_pipeline.rs
index cb524c0279..a2b2113dc1 100644
--- a/language/move-prover/bytecode/src/function_target_pipeline.rs
+++ b/language/move-prover/bytecode/src/function_target_pipeline.rs
@@ -2,17 +2,29 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use core::fmt;
+use std::{
+    cmp::Ordering,
+    collections::{btree_map::Entry as MapEntry, BTreeMap, BTreeSet},
+    fmt::Formatter,
+    fs,
+};
+
+use itertools::{Either, Itertools};
+use log::{debug, info};
+use petgraph::{
+    algo::has_path_connecting,
+    graph::{DiGraph, NodeIndex},
+};
+
+use move_model::model::{FunId, FunctionEnv, GlobalEnv, QualifiedId};
+
 use crate::{
     function_target::{FunctionData, FunctionTarget},
     print_targets_for_test,
     stackless_bytecode_generator::StacklessBytecodeGenerator,
     stackless_control_flow_graph::generate_cfg_in_dot_format,
 };
-use core::fmt;
-use itertools::Itertools;
-use log::{debug, info};
-use move_model::model::{FunId, FunctionEnv, GlobalEnv, QualifiedId};
-use std::{collections::BTreeMap, fmt::Formatter, fs};
 
 /// A data structure which holds data for multiple function targets, and allows to
 /// manipulate them as part of a transformation pipeline.
@@ -79,8 +91,9 @@ pub trait FunctionTargetProcessor {
     fn process(
         &self,
         _targets: &mut FunctionTargetsHolder,
-        _fun_env: &FunctionEnv<'_>,
+        _fun_env: &FunctionEnv,
         _data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         unimplemented!()
     }
@@ -91,10 +104,11 @@ pub trait FunctionTargetProcessor {
     fn process_and_maybe_remove(
         &self,
         targets: &mut FunctionTargetsHolder,
-        func_env: &FunctionEnv<'_>,
+        func_env: &FunctionEnv,
         data: FunctionData,
+        scc_opt: Option<&[FunctionEnv]>,
     ) -> Option<FunctionData> {
-        Some(self.process(targets, func_env, data))
+        Some(self.process(targets, func_env, data, scc_opt))
     }
 
     /// Returns a name for this processor. This should be suitable as a file suffix.
@@ -159,8 +173,7 @@ impl FunctionTargetsHolder {
     ) -> impl Iterator<Item = (QualifiedId<FunId>, FunctionVariant)> + '_ {
         self.targets
             .iter()
-            .map(|(id, vs)| vs.keys().map(move |v| (*id, v.clone())))
-            .flatten()
+            .flat_map(|(id, vs)| vs.keys().map(move |v| (*id, v.clone())))
     }
 
     /// Adds a new function target. The target will be initialized from the Move byte code.
@@ -261,12 +274,19 @@ impl FunctionTargetsHolder {
     }
 
     /// Processes the function target data for given function.
-    fn process(&mut self, func_env: &FunctionEnv<'_>, processor: &dyn FunctionTargetProcessor) {
+    fn process(
+        &mut self,
+        func_env: &FunctionEnv,
+        processor: &dyn FunctionTargetProcessor,
+        scc_opt: Option<&[FunctionEnv]>,
+    ) {
         let id = func_env.get_qualified_id();
         for variant in self.get_target_variants(func_env) {
             // Remove data so we can own it.
             let data = self.remove_target_data(&id, &variant);
-            if let Some(processed_data) = processor.process_and_maybe_remove(self, func_env, data) {
+            if let Some(processed_data) =
+                processor.process_and_maybe_remove(self, func_env, data, scc_opt)
+            {
                 // Put back processed data.
                 self.insert_target_data(&id, variant, processed_data);
             }
@@ -290,14 +310,87 @@ impl FunctionTargetPipeline {
             .as_ref()
     }
 
-    /// Sort functions in topological order. This is important for the function target processors.
-    /// In programs without recursion or mutual recursion, processing functions in topological order
-    /// means that when a processor sees a caller function, it is guaranteed that all the callees
-    /// have already been analyzed.
-    pub fn sort_targets_in_topological_order<'env>(
-        env: &'env GlobalEnv,
+    /// Build the call graph
+    fn build_call_graph(
+        env: &GlobalEnv,
+        targets: &FunctionTargetsHolder,
+    ) -> (
+        DiGraph<QualifiedId<FunId>, ()>,
+        BTreeMap<QualifiedId<FunId>, NodeIndex>,
+    ) {
+        let mut graph = DiGraph::new();
+        let mut nodes = BTreeMap::new();
+        for fun_id in targets.get_funs() {
+            let node_idx = graph.add_node(fun_id);
+            nodes.insert(fun_id, node_idx);
+        }
+        for fun_id in targets.get_funs() {
+            let src_idx = nodes.get(&fun_id).unwrap();
+            let fun_env = env.get_function(fun_id);
+            for callee in fun_env.get_called_functions() {
+                let dst_idx = nodes
+                    .get(&callee)
+                    .expect("callee is not in function targets");
+                graph.add_edge(*src_idx, *dst_idx, ());
+            }
+        }
+        (graph, nodes)
+    }
+
+    /// Collect strongly connected components (SCCs) from the call graph.
+    fn derive_call_graph_sccs(
+        env: &GlobalEnv,
+        graph: &DiGraph<QualifiedId<FunId>, ()>,
+    ) -> BTreeMap<QualifiedId<FunId>, Option<BTreeSet<QualifiedId<FunId>>>> {
+        let mut sccs = BTreeMap::new();
+        for scc in petgraph::algo::tarjan_scc(graph) {
+            let mut part = BTreeSet::new();
+            let mut is_cyclic = scc.len() > 1;
+            for node_idx in scc {
+                let fun_id = *graph.node_weight(node_idx).unwrap();
+                let fun_env = env.get_function(fun_id);
+                if !is_cyclic && fun_env.get_called_functions().contains(&fun_id) {
+                    is_cyclic = true;
+                }
+                let inserted = part.insert(fun_id);
+                assert!(inserted);
+            }
+
+            if is_cyclic {
+                for fun_id in &part {
+                    let existing = sccs.insert(*fun_id, Some(part.clone()));
+                    assert!(existing.is_none());
+                }
+            } else {
+                let fun_id = part.into_iter().next().unwrap();
+                let existing = sccs.insert(fun_id, None);
+                assert!(existing.is_none());
+            }
+        }
+        sccs
+    }
+
+    /// Sort the call graph in topological order with strongly connected components (SCCs)
+    /// to represent recursive calls.
+    pub fn sort_targets_in_topological_order(
+        env: &GlobalEnv,
         targets: &FunctionTargetsHolder,
-    ) -> Vec<FunctionEnv<'env>> {
+    ) -> Vec<Either<QualifiedId<FunId>, Vec<QualifiedId<FunId>>>> {
+        // collect sccs
+        let (graph, nodes) = Self::build_call_graph(env, targets);
+        let sccs = Self::derive_call_graph_sccs(env, &graph);
+
+        let mut scc_staging = BTreeMap::new();
+        for scc_opt in sccs.values() {
+            match scc_opt.as_ref() {
+                None => (),
+                Some(scc) => {
+                    scc_staging.insert(scc, vec![]);
+                }
+            }
+        }
+
+        // construct the work list (with a deterministic ordering)
         let mut worklist = vec![];
         for fun in targets.get_funs() {
             let fun_env = env.get_function(fun);
@@ -306,49 +399,72 @@ impl FunctionTargetPipeline {
                 fun_env.get_called_functions().into_iter().collect_vec(),
             ));
         }
-        let mut to_remove = vec![];
-        let mut topological_order = vec![];
+
         // analyze bottom-up from the leaves of the call graph
-        loop {
-            let last = worklist.last();
-            if last.is_none() {
-                break;
-            }
-            // front of the worklist has a nonempty list of callees to analyze. walk through the
-            // worklist and remove the analyzed callees from `to_remove` from each entry in the
-            // worklist.
-            if !last.unwrap().1.is_empty() {
-                for (_f, f_callees) in &mut worklist {
-                    for f in &to_remove {
-                        f_callees.retain(|e| e != f);
+        // NOTE: this algorithm produces a deterministic ordering of functions to be analyzed
+        let mut dep_ordered = vec![];
+        while !worklist.is_empty() {
+            worklist.sort_by(|(caller1, callees1), (caller2, callees2)| {
+                // rules of ordering:
+                // - if function A depends on B (i.e., calls B), put B towards the end of the worklist
+                // - if there are no dependencies among A and B, rank them by callee size
+
+                let node1 = *nodes.get(caller1).unwrap();
+                let node2 = *nodes.get(caller2).unwrap();
+                match (
+                    has_path_connecting(&graph, node1, node2, None),
+                    has_path_connecting(&graph, node2, node1, None),
+                ) {
+                    (true, true) => Ordering::Equal,
+                    (true, false) => Ordering::Less,
+                    (false, true) => Ordering::Greater,
+                    (false, false) => {
+                        // Put functions with 0 calls first in line, at the end of the vector
+                        callees2.len().cmp(&callees1.len())
                     }
                 }
-                // Put functions with 0 calls first in line, at the end of the vector
-                worklist
-                    .sort_by(|(_, callees1), (_, callees2)| callees2.len().cmp(&callees1.len()));
-            }
+            });
+
             let (call_id, callees) = worklist.pop().unwrap();
+
             // At this point, one of two things is true:
             // 1. callees is empty (common case)
-            // 2. callees is nonempty and mid is part of a recursive or mutually recursive
-            //    intra-module call cycle (possible in theory, but doesn't happen in the current
-            //    implementation of the Diem framework).
-            to_remove.push(call_id);
-            let func_env = env.get_function(call_id);
-            if !callees.is_empty() {
-                // The right long-term thing to do here is to allow analysis in case (2) and ask the
-                // analysis processors to deal gracefully with the absence of summaries. But for
-                // now, we intentionally fail because recursion is not expected in Diem Framework
-                // code
-                unimplemented!(
-                    "Recursion or mutual recursion detected in {:?}. \
-                     Make sure that all analyses in processors are prepared to handle recursion",
-                    func_env.get_identifier()
-                );
+            // 2. callees is nonempty and call_id is part of a recursive or mutually recursive function group
+
+            match sccs.get(&call_id).unwrap().as_ref() {
+                None => {
+                    // case 1: non-recursive call
+                    assert!(callees.is_empty());
+                    dep_ordered.push(Either::Left(call_id));
+                }
+                Some(scc) => {
+                    // case 2: recursive call group
+                    match scc_staging.entry(scc) {
+                        MapEntry::Vacant(_) => {
+                            panic!("all scc groups should be in staging")
+                        }
+                        MapEntry::Occupied(mut entry) => {
+                            let scc_vec = entry.get_mut();
+                            scc_vec.push(call_id);
+                            if scc_vec.len() == scc.len() {
+                                dep_ordered.push(Either::Right(entry.remove()));
+                            }
+                        }
+                    }
+                }
+            }
+
+            // update the worklist
+            for (_, callees) in worklist.iter_mut() {
+                callees.retain(|e| e != &call_id);
             }
-            topological_order.push(func_env);
         }
-        topological_order
+
+        // ensure that everything is cleared
+        assert!(scc_staging.is_empty());
+
+        // return the ordered dep list
+        dep_ordered
     }
 
     /// Runs the pipeline on all functions in the targets holder. Processors are run on each
@@ -372,8 +488,33 @@ impl FunctionTargetPipeline {
                 processor.run(env, targets);
             } else {
                 processor.initialize(env, targets);
-                for func_env in &topological_order {
-                    targets.process(func_env, processor.as_ref());
+                for item in &topological_order {
+                    match item {
+                        Either::Left(fid) => {
+                            let func_env = env.get_function(*fid);
+                            targets.process(&func_env, processor.as_ref(), None);
+                        }
+                        Either::Right(scc) => 'fixedpoint: loop {
+                            let scc_env: Vec<_> =
+                                scc.iter().map(|fid| env.get_function(*fid)).collect();
+                            for fid in scc {
+                                let func_env = env.get_function(*fid);
+                                targets.process(&func_env, processor.as_ref(), Some(&scc_env));
+                            }
+
+                            // check for fixedpoint in summaries
+                            for fid in scc {
+                                let func_env = env.get_function(*fid);
+                                for (_, target) in targets.get_targets(&func_env) {
+                                    if !target.data.annotations.reached_fixedpoint() {
+                                        continue 'fixedpoint;
+                                    }
+                                }
+                            }
+                            // fixedpoint reached when execution hits this line
+                            break 'fixedpoint;
+                        },
+                    }
                 }
                 processor.finalize(env, targets);
             }
@@ -440,7 +581,7 @@ impl FunctionTargetPipeline {
             ProcessorResultDisplay {
                 env,
                 targets,
-                processor
+                processor,
             }
         );
         if !processor.is_single_run() {
diff --git a/language/move-prover/bytecode/src/global_invariant_analysis.rs b/language/move-prover/bytecode/src/global_invariant_analysis.rs
index 2edd8f46b2..415da089c6 100644
--- a/language/move-prover/bytecode/src/global_invariant_analysis.rs
+++ b/language/move-prover/bytecode/src/global_invariant_analysis.rs
@@ -4,14 +4,9 @@
 
 // Analysis pass which analyzes how to injects global invariants into the bytecode.
 
-use crate::{
-    function_target::{FunctionData, FunctionTarget},
-    function_target_pipeline::{
-        FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant, VerificationFlavor,
-    },
-    stackless_bytecode::{BorrowNode, Bytecode, Operation, PropKind},
-    usage_analysis,
-    verification_analysis::{is_invariant_suspendable, InvariantAnalysisData},
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    fmt,
 };
 
 use move_binary_format::file_format::CodeOffset;
@@ -21,9 +16,14 @@ use move_model::{
     ty::{Type, TypeDisplayContext, TypeInstantiationDerivation, TypeUnificationAdapter, Variance},
 };
 
-use std::{
-    collections::{BTreeMap, BTreeSet},
-    fmt,
+use crate::{
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{
+        FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant, VerificationFlavor,
+    },
+    stackless_bytecode::{BorrowNode, Bytecode, Operation, PropKind},
+    usage_analysis,
+    verification_analysis::{is_invariant_suspendable, InvariantAnalysisData},
 };
 
 /// A named struct for holding the information on how an invariant is relevant to a bytecode.
@@ -86,8 +86,9 @@ impl FunctionTargetProcessor for GlobalInvariantAnalysisProcessor {
     fn process(
         &self,
         targets: &mut FunctionTargetsHolder,
-        fun_env: &FunctionEnv<'_>,
+        fun_env: &FunctionEnv,
         mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         if fun_env.is_native() || fun_env.is_intrinsic() {
             // Nothing to do
@@ -101,7 +102,9 @@ impl FunctionTargetProcessor for GlobalInvariantAnalysisProcessor {
         // Analyze invariants
         let target = FunctionTarget::new(fun_env, &data);
         let analysis_result = PerFunctionRelevance::analyze(&target, targets);
-        data.annotations.set(analysis_result);
+        // TODO(mengxu): re-verify that recursive functions do not impact how  global invariant
+        // analysis are performed.
+        data.annotations.set(analysis_result, true);
 
         // This is an analysis pass, nothing gets changed
         data
diff --git a/language/move-prover/bytecode/src/global_invariant_instrumentation.rs b/language/move-prover/bytecode/src/global_invariant_instrumentation.rs
index 6b19539af0..ecf0fc25ad 100644
--- a/language/move-prover/bytecode/src/global_invariant_instrumentation.rs
+++ b/language/move-prover/bytecode/src/global_invariant_instrumentation.rs
@@ -4,16 +4,7 @@
 
 // Instrumentation pass which injects global invariants into the bytecode.
 
-use crate::{
-    function_data_builder::FunctionDataBuilder,
-    function_target::{FunctionData, FunctionTarget},
-    function_target_pipeline::{
-        FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant, VerificationFlavor,
-    },
-    global_invariant_analysis::{self, PerFunctionRelevance},
-    options::ProverOptions,
-    stackless_bytecode::{Bytecode, Operation, PropKind},
-};
+use std::collections::{BTreeMap, BTreeSet};
 
 use move_binary_format::file_format::CodeOffset;
 use move_model::{
@@ -24,7 +15,16 @@ use move_model::{
     ty::Type,
 };
 
-use std::collections::{BTreeMap, BTreeSet};
+use crate::{
+    function_data_builder::FunctionDataBuilder,
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{
+        FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant, VerificationFlavor,
+    },
+    global_invariant_analysis::{self, PerFunctionRelevance},
+    options::ProverOptions,
+    stackless_bytecode::{Bytecode, Operation, PropKind},
+};
 
 const GLOBAL_INVARIANT_FAILS_MESSAGE: &str = "global memory invariant does not hold";
 
@@ -111,8 +111,9 @@ impl FunctionTargetProcessor for GlobalInvariantInstrumentationProcessor {
     fn process(
         &self,
         _targets: &mut FunctionTargetsHolder,
-        fun_env: &FunctionEnv<'_>,
+        fun_env: &FunctionEnv,
         data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         if fun_env.is_native() || fun_env.is_intrinsic() {
             // nothing to do
@@ -253,10 +254,10 @@ impl<'env> Instrumenter<'env> {
         let env = self.builder.global_env();
         let options = ProverOptions::get(env);
 
-        let inst_invs = invs_with_insts
-            .iter()
-            .map(|(inv_id, inv_insts)| inv_insts.iter().map(move |inst| (*inv_id, inst.clone())))
-            .flatten();
+        let inst_invs = invs_with_insts.iter().flat_map(|(inv_id, inv_insts)| {
+            inv_insts.iter().map(move |inst| (*inv_id, inst.clone()))
+        });
+
         SpecTranslator::translate_invariants_by_id(
             options.auto_trace_level.invariants(),
             &mut self.builder,
diff --git a/language/move-prover/bytecode/src/global_invariant_instrumentation_v2.rs b/language/move-prover/bytecode/src/global_invariant_instrumentation_v2.rs
index f80730b5e5..aa1feba287 100644
--- a/language/move-prover/bytecode/src/global_invariant_instrumentation_v2.rs
+++ b/language/move-prover/bytecode/src/global_invariant_instrumentation_v2.rs
@@ -4,9 +4,23 @@
 
 // Transformation which injects global invariants into the bytecode.
 
+use std::collections::{BTreeMap, BTreeSet};
+
+use itertools::Itertools;
 #[allow(unused_imports)]
 use log::{debug, info, log, warn};
 
+#[cfg(invariant_trace)]
+use move_model::ty::TypeDisplayContext;
+use move_model::{
+    ast::{ConditionKind, Exp, GlobalInvariant},
+    exp_generator::ExpGenerator,
+    model::{FunId, FunctionEnv, GlobalEnv, GlobalId, Loc, QualifiedId, QualifiedInstId, StructId},
+    pragmas::CONDITION_ISOLATED_PROP,
+    spec_translator::{SpecTranslator, TranslatedSpec},
+    ty::{Type, TypeUnificationAdapter, Variance},
+};
+
 use crate::{
     function_data_builder::FunctionDataBuilder,
     function_target::{FunctionData, FunctionTarget},
@@ -19,19 +33,6 @@ use crate::{
     verification_analysis_v2::InvariantAnalysisData,
 };
 
-use itertools::Itertools;
-#[cfg(invariant_trace)]
-use move_model::ty::TypeDisplayContext;
-use move_model::{
-    ast::{ConditionKind, Exp, GlobalInvariant},
-    exp_generator::ExpGenerator,
-    model::{FunId, FunctionEnv, GlobalEnv, GlobalId, Loc, QualifiedId, QualifiedInstId, StructId},
-    pragmas::CONDITION_ISOLATED_PROP,
-    spec_translator::{SpecTranslator, TranslatedSpec},
-    ty::{Type, TypeUnificationAdapter, Variance},
-};
-use std::collections::{BTreeMap, BTreeSet};
-
 const GLOBAL_INVARIANT_FAILS_MESSAGE: &str = "global memory invariant does not hold";
 
 pub struct GlobalInvariantInstrumentationProcessorV2 {}
@@ -46,8 +47,9 @@ impl FunctionTargetProcessor for GlobalInvariantInstrumentationProcessorV2 {
     fn process(
         &self,
         targets: &mut FunctionTargetsHolder,
-        fun_env: &FunctionEnv<'_>,
+        fun_env: &FunctionEnv,
         data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         if fun_env.is_native() || fun_env.is_intrinsic() {
             // Nothing to do.
@@ -704,11 +706,10 @@ impl<'a> Instrumenter<'a> {
         invs: &BTreeSet<GlobalId>,
     ) -> Vec<(GlobalId, Vec<Type>)> {
         invs.iter()
-            .map(|id| {
+            .flat_map(|id| {
                 let inv = self.builder.global_env().get_global_invariant(*id).unwrap();
                 self.compute_invariant_instances(inv).into_iter()
             })
-            .flatten()
             .collect()
     }
 
diff --git a/language/move-prover/bytecode/src/inconsistency_check.rs b/language/move-prover/bytecode/src/inconsistency_check.rs
index 9852e7a9c6..bd144e9a1f 100644
--- a/language/move-prover/bytecode/src/inconsistency_check.rs
+++ b/language/move-prover/bytecode/src/inconsistency_check.rs
@@ -20,6 +20,8 @@
 //! any post-condition can be proved. Checking of this behavior is turned-off by default, and can
 //! be enabled with the `unconditional-abort-as-inconsistency` flag.
 
+use move_model::{exp_generator::ExpGenerator, model::FunctionEnv};
+
 use crate::{
     function_data_builder::FunctionDataBuilder,
     function_target::FunctionData,
@@ -30,8 +32,6 @@ use crate::{
     stackless_bytecode::{Bytecode, PropKind},
 };
 
-use move_model::{exp_generator::ExpGenerator, model::FunctionEnv};
-
 // This message is for the boogie wrapper, and not shown to the users.
 const EXPECTED_TO_FAIL: &str = "expected to fail";
 
@@ -47,8 +47,9 @@ impl FunctionTargetProcessor for InconsistencyCheckInstrumenter {
     fn process(
         &self,
         targets: &mut FunctionTargetsHolder,
-        fun_env: &FunctionEnv<'_>,
+        fun_env: &FunctionEnv,
         data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         if fun_env.is_native() || fun_env.is_intrinsic() {
             // Nothing to do.
diff --git a/language/move-prover/bytecode/src/lib.rs b/language/move-prover/bytecode/src/lib.rs
index 3599d63c7d..07ce643b7e 100644
--- a/language/move-prover/bytecode/src/lib.rs
+++ b/language/move-prover/bytecode/src/lib.rs
@@ -6,6 +6,7 @@
 
 use crate::function_target_pipeline::FunctionTargetsHolder;
 use move_model::model::GlobalEnv;
+use std::fmt::Write;
 
 pub mod access_path;
 pub mod access_path_trie;
@@ -33,6 +34,8 @@ pub mod memory_instrumentation;
 pub mod mono_analysis;
 pub mod mut_ref_instrumentation;
 pub mod mutation_tester;
+pub mod number_operation;
+pub mod number_operation_analysis;
 pub mod options;
 pub mod packed_types_analysis;
 pub mod pipeline_factory;
@@ -54,13 +57,13 @@ pub fn print_targets_for_test(
     targets: &FunctionTargetsHolder,
 ) -> String {
     let mut text = String::new();
-    text.push_str(&format!("============ {} ================\n", header));
+    writeln!(&mut text, "============ {} ================", header).unwrap();
     for module_env in env.get_modules() {
         for func_env in module_env.get_functions() {
             for (variant, target) in targets.get_targets(&func_env) {
                 if !target.data.code.is_empty() || target.func_env.is_native_or_intrinsic() {
                     target.register_annotation_formatters_for_test();
-                    text += &format!("\n[variant {}]\n{}\n", variant, target);
+                    writeln!(&mut text, "\n[variant {}]\n{}", variant, target).unwrap();
                 }
             }
         }
diff --git a/language/move-prover/bytecode/src/livevar_analysis.rs b/language/move-prover/bytecode/src/livevar_analysis.rs
index 6e399337e2..9fb9a33b21 100644
--- a/language/move-prover/bytecode/src/livevar_analysis.rs
+++ b/language/move-prover/bytecode/src/livevar_analysis.rs
@@ -5,6 +5,13 @@
 // Live variable analysis with subsequent dead assignment elimination and
 // computation of new Destroy instructions.
 
+use std::collections::{BTreeMap, BTreeSet};
+
+use itertools::Itertools;
+
+use move_binary_format::file_format::CodeOffset;
+use move_model::{ast::TempIndex, model::FunctionEnv, ty::Type};
+
 use crate::{
     dataflow_analysis::{DataflowAnalysis, TransferFunctions},
     dataflow_domains::{AbstractDomain, JoinResult},
@@ -13,10 +20,6 @@ use crate::{
     stackless_bytecode::{AbortAction, AttrId, Bytecode, Label, Operation},
     stackless_control_flow_graph::StacklessControlFlowGraph,
 };
-use itertools::Itertools;
-use move_binary_format::file_format::CodeOffset;
-use move_model::{ast::TempIndex, model::FunctionEnv, ty::Type};
-use std::collections::{BTreeMap, BTreeSet};
 
 /// The annotation for live variable analysis. For each code position, we have a set of local
 /// variable indices that are live just before the code offset, i.e. these variables are used
@@ -58,8 +61,9 @@ impl FunctionTargetProcessor for LiveVarAnalysisProcessor {
     fn process(
         &self,
         _targets: &mut FunctionTargetsHolder,
-        func_env: &FunctionEnv<'_>,
+        func_env: &FunctionEnv,
         mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         if func_env.is_native() {
             // Native functions have no byte code.
@@ -92,8 +96,9 @@ impl FunctionTargetProcessor for LiveVarAnalysisProcessor {
             let func_target = FunctionTarget::new(func_env, &data);
             let offset_to_live_refs = LiveVarAnnotation(Self::analyze(&func_target, &data.code));
             // Annotate function target with computed life variable data.
+            // TODO(mengxu): verify that recursion does not affect how live-var analysis is done
             data.annotations
-                .set::<LiveVarAnnotation>(offset_to_live_refs);
+                .set::<LiveVarAnnotation>(offset_to_live_refs, true);
         }
         data
     }
@@ -216,6 +221,30 @@ impl<'a> LiveVarAnalysis<'a> {
         let label_to_code_offset = Bytecode::label_offsets(&code);
         let mut transformed_code = vec![];
         let mut new_bytecodes = vec![];
+
+        // insert marks for uninitialized mutable references
+        let num_args = self.func_target.get_parameter_count();
+        if let Some(info) = annotations.get(&0) {
+            for index in &info.before {
+                // only mark the mutable references conditionally defined in function body as uninit
+                if *index >= num_args
+                    && self
+                        .func_target
+                        .get_local_type(*index)
+                        .is_mutable_reference()
+                {
+                    transformed_code.push(Bytecode::Call(
+                        self.new_attr_id(),
+                        vec![],
+                        Operation::Uninit,
+                        vec![*index],
+                        None,
+                    ));
+                }
+            }
+        }
+
+        // optimize the function body
         let mut skip_next = false;
         for code_offset in 0..code.len() {
             if skip_next {
@@ -252,7 +281,9 @@ impl<'a> LiveVarAnalysis<'a> {
                     // Drop this load/assign as it is not used.
                 }
                 Bytecode::Call(attr_id, dests, oper, srcs, aa)
-                    if code_offset + 1 < code.len() && dests.len() == 1 =>
+                    if code_offset + 1 < code.len()
+                        && dests.len() == 1
+                        && !matches!(oper, Operation::BorrowLoc | Operation::BorrowGlobal(..)) =>
                 {
                     // Catch the common case where we have:
                     //
@@ -263,6 +294,11 @@ impl<'a> LiveVarAnalysis<'a> {
                     // This is an artifact from transformation from stack to stackless bytecode.
                     // Copy propagation cannot catch this case because it does not have the
                     // livevar information about $t.
+                    //
+                    // With one exception: if the called operation is a BorrowLocal or BorrowGlobal (i.e., an operation
+                    // that creates a root mutable reference), do not optimize it away as we need this local/global root
+                    // reference for our IsParent test. An alternative (i.e., one way to get rid of this exception) is
+                    // to support IsParent test against local and global directly, but that is more complicated.
                     let next_code_offset = code_offset + 1;
                     if let Bytecode::Assign(_, dest, src, _) = &code[next_code_offset] {
                         let annotation_at = &annotations[&(next_code_offset as CodeOffset)];
diff --git a/language/move-prover/bytecode/src/loop_analysis.rs b/language/move-prover/bytecode/src/loop_analysis.rs
index 04e5213df4..3ceb734fac 100644
--- a/language/move-prover/bytecode/src/loop_analysis.rs
+++ b/language/move-prover/bytecode/src/loop_analysis.rs
@@ -2,6 +2,16 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use std::collections::{BTreeMap, BTreeSet};
+
+use move_binary_format::file_format::CodeOffset;
+use move_model::{
+    ast::{self, TempIndex},
+    exp_generator::ExpGenerator,
+    model::FunctionEnv,
+    ty::{PrimitiveType, Type},
+};
+
 use crate::{
     function_data_builder::{FunctionDataBuilder, FunctionDataBuilderOptions},
     function_target::{FunctionData, FunctionTarget},
@@ -11,13 +21,6 @@ use crate::{
     stackless_bytecode::{AttrId, Bytecode, HavocKind, Label, Operation, PropKind},
     stackless_control_flow_graph::{BlockContent, BlockId, StacklessControlFlowGraph},
 };
-use move_binary_format::file_format::CodeOffset;
-use move_model::{
-    ast::{self, TempIndex},
-    exp_generator::ExpGenerator,
-    model::FunctionEnv,
-};
-use std::collections::{BTreeMap, BTreeSet};
 
 const LOOP_INVARIANT_BASE_FAILED: &str = "base case of the loop invariant does not hold";
 const LOOP_INVARIANT_INDUCTION_FAILED: &str = "induction case of the loop invariant does not hold";
@@ -48,8 +51,7 @@ impl LoopAnnotation {
     fn back_edges_locations(&self) -> BTreeSet<CodeOffset> {
         self.fat_loops
             .values()
-            .map(|l| l.back_edges.iter())
-            .flatten()
+            .flat_map(|l| l.back_edges.iter())
             .copied()
             .collect()
     }
@@ -57,8 +59,7 @@ impl LoopAnnotation {
     fn invariants_locations(&self) -> BTreeSet<CodeOffset> {
         self.fat_loops
             .values()
-            .map(|l| l.invariants.keys())
-            .flatten()
+            .flat_map(|l| l.invariants.keys())
             .copied()
             .collect()
     }
@@ -76,8 +77,9 @@ impl FunctionTargetProcessor for LoopAnalysisProcessor {
     fn process(
         &self,
         _targets: &mut FunctionTargetsHolder,
-        func_env: &FunctionEnv<'_>,
+        func_env: &FunctionEnv,
         data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         if func_env.is_native() {
             return data;
@@ -148,12 +150,19 @@ impl LoopAnalysisProcessor {
                             builder.emit_with(|attr_id| {
                                 Bytecode::Call(
                                     attr_id,
-                                    vec![],
-                                    Operation::Havoc(HavocKind::Value),
                                     vec![*idx],
+                                    Operation::Havoc(HavocKind::Value),
+                                    vec![],
                                     None,
                                 )
                             });
+                            // add a well-formed assumption explicitly and immediately
+                            let exp = builder.mk_call(
+                                &Type::Primitive(PrimitiveType::Bool),
+                                ast::Operation::WellFormed,
+                                vec![builder.mk_temporary(*idx)],
+                            );
+                            builder.emit_with(move |id| Bytecode::Prop(id, PropKind::Assume, exp));
                         }
                         for (idx, havoc_all) in &loop_info.mut_targets {
                             let havoc_kind = if *havoc_all {
@@ -164,14 +173,87 @@ impl LoopAnalysisProcessor {
                             builder.emit_with(|attr_id| {
                                 Bytecode::Call(
                                     attr_id,
-                                    vec![],
+                                    vec![*idx],
                                     Operation::Havoc(havoc_kind),
+                                    vec![],
+                                    None,
+                                )
+                            });
+                            // add a well-formed assumption explicitly and immediately
+                            let exp = builder.mk_call(
+                                &Type::Primitive(PrimitiveType::Bool),
+                                ast::Operation::WellFormed,
+                                vec![builder.mk_temporary(*idx)],
+                            );
+                            builder.emit_with(move |id| Bytecode::Prop(id, PropKind::Assume, exp));
+                        }
+
+                        // trace implicitly reassigned variables after havocking
+                        let affected_variables: BTreeSet<_> = loop_info
+                            .val_targets
+                            .iter()
+                            .chain(loop_info.mut_targets.iter().map(|(idx, _)| idx))
+                            .collect();
+
+                        // Only emit this for user declared locals, not for ones introduced
+                        // by stack elimination.
+                        let affected_non_temporary_variables: BTreeSet<_> = affected_variables
+                            .into_iter()
+                            .filter(|&idx| !func_env.is_temporary(*idx))
+                            .collect();
+
+                        if affected_non_temporary_variables.is_empty() {
+                            // no user declared local is havocked
+                            builder.set_next_debug_comment(format!(
+                                "info: enter loop {}",
+                                match loop_info.invariants.is_empty() {
+                                    true => "",
+                                    false => ", loop invariant holds at current state",
+                                }
+                            ));
+                        } else {
+                            // show the havocked locals to user
+                            let affected_non_temporary_variable_names: Vec<_> =
+                                affected_non_temporary_variables
+                                    .iter()
+                                    .map(|&idx| {
+                                        func_env
+                                            .symbol_pool()
+                                            .string(func_env.get_local_name(*idx))
+                                            .to_string()
+                                    })
+                                    .collect();
+                            let joined_variables_names_str =
+                                affected_non_temporary_variable_names.join(", ");
+                            builder.set_next_debug_comment(format!(
+                                "info: enter loop, variable(s) {} havocked and reassigned",
+                                joined_variables_names_str
+                            ));
+                        }
+
+                        // track the new values of havocked user declared locals
+                        for idx_ in &affected_non_temporary_variables {
+                            let idx = *idx_;
+                            builder.emit_with(|id| {
+                                Bytecode::Call(
+                                    id,
+                                    vec![],
+                                    Operation::TraceLocal(*idx),
                                     vec![*idx],
                                     None,
                                 )
                             });
                         }
 
+                        // after showing the havocked locals and their new values, show the following message
+                        if !affected_non_temporary_variables.is_empty()
+                            && !loop_info.invariants.is_empty()
+                        {
+                            builder.set_next_debug_comment(
+                                "info: loop invariant holds at current state".to_string(),
+                            );
+                        }
+
                         // add an additional assumption that the loop did not abort
                         let exp =
                             builder.mk_not(builder.mk_bool_call(ast::Operation::AbortFlag, vec![]));
@@ -319,8 +401,7 @@ impl LoopAnalysisProcessor {
         let mut mut_targets = BTreeMap::new();
         let fat_loop_body: BTreeSet<_> = sub_loops
             .iter()
-            .map(|l| l.loop_body.iter())
-            .flatten()
+            .flat_map(|l| l.loop_body.iter())
             .copied()
             .collect();
         for block_id in fat_loop_body {
@@ -385,13 +466,12 @@ impl LoopAnalysisProcessor {
         let nodes = cfg.blocks();
         let edges: Vec<(BlockId, BlockId)> = nodes
             .iter()
-            .map(|x| {
+            .flat_map(|x| {
                 cfg.successors(*x)
                     .iter()
                     .map(|y| (*x, *y))
                     .collect::<Vec<(BlockId, BlockId)>>()
             })
-            .flatten()
             .collect();
         let graph = Graph::new(entry, nodes, edges);
         let natural_loops = graph.compute_reducible().expect(
@@ -439,8 +519,7 @@ impl LoopAnalysisProcessor {
         // check for redundant loop invariant declarations in the spec
         let all_invariants: BTreeSet<_> = fat_loops
             .values()
-            .map(|l| l.invariants.values().map(|(attr_id, _)| *attr_id))
-            .flatten()
+            .flat_map(|l| l.invariants.values().map(|(attr_id, _)| *attr_id))
             .collect();
 
         let env = func_target.global_env();
diff --git a/language/move-prover/bytecode/src/memory_instrumentation.rs b/language/move-prover/bytecode/src/memory_instrumentation.rs
index b58ff00949..40190d51e3 100644
--- a/language/move-prover/bytecode/src/memory_instrumentation.rs
+++ b/language/move-prover/bytecode/src/memory_instrumentation.rs
@@ -2,8 +2,18 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use std::collections::BTreeSet;
+
+use move_binary_format::file_format::CodeOffset;
+use move_model::{
+    ast::ConditionKind,
+    exp_generator::ExpGenerator,
+    model::{FunctionEnv, StructEnv},
+    ty::{Type, BOOL_TYPE},
+};
+
 use crate::{
-    borrow_analysis::BorrowAnnotation,
+    borrow_analysis::{BorrowAnnotation, WriteBackAction},
     function_data_builder::FunctionDataBuilder,
     function_target::FunctionData,
     function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
@@ -13,13 +23,6 @@ use crate::{
         Operation,
     },
 };
-use move_binary_format::file_format::CodeOffset;
-use move_model::{
-    ast::ConditionKind,
-    exp_generator::ExpGenerator,
-    model::{FunctionEnv, StructEnv},
-    ty::{Type, BOOL_TYPE},
-};
 
 pub struct MemoryInstrumentationProcessor {}
 
@@ -33,8 +36,9 @@ impl FunctionTargetProcessor for MemoryInstrumentationProcessor {
     fn process(
         &self,
         _targets: &mut FunctionTargetsHolder,
-        func_env: &FunctionEnv<'_>,
+        func_env: &FunctionEnv,
         mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         if func_env.is_native_or_intrinsic() {
             return data;
@@ -93,7 +97,15 @@ impl<'a> Instrumenter<'a> {
                     || inst.iter().any(|t| self.is_pack_ref_ty(t))
             }
             Vector(et) => self.is_pack_ref_ty(et.as_ref()),
-            _ => false,
+            Primitive(_)
+            | Tuple(_)
+            | TypeParameter(_)
+            | Reference(_, _)
+            | Fun(_, _)
+            | TypeDomain(_)
+            | ResourceDomain(_, _, _)
+            | Error
+            | Var(_) => false,
         }
     }
 
@@ -106,7 +118,42 @@ impl<'a> Instrumenter<'a> {
             .any(|fe| self.is_pack_ref_ty(&fe.get_type()))
     }
 
+    /// Calculate the differentiating factor for a particular write-back chain (among the tree)
+    fn get_differentiation_factors(tree: &[Vec<WriteBackAction>], index: usize) -> BTreeSet<usize> {
+        // utility function to first the first different action among two chains
+        fn index_of_first_different_action(
+            base: &[WriteBackAction],
+            another: &[WriteBackAction],
+        ) -> usize {
+            for ((i, a1), a2) in base.iter().enumerate().zip(another.iter()) {
+                if a1 != a2 {
+                    return i;
+                }
+            }
+            unreachable!("Two write-back action chains cannot be exactly the same");
+        }
+
+        // derive all the borrow edges that uniquely differentiate this chain
+        let base = &tree[index];
+        let diffs = tree
+            .iter()
+            .enumerate()
+            .filter_map(|(i, chain)| {
+                if i == index {
+                    None
+                } else {
+                    Some(index_of_first_different_action(base, chain))
+                }
+            })
+            .collect();
+
+        // return the indices of the actions that differentiate this borrow chain
+        diffs
+    }
+
     fn memory_instrumentation(&mut self, code_offset: CodeOffset, bytecode: &Bytecode) {
+        let param_count = self.builder.get_target().get_parameter_count();
+
         let borrow_annotation_at = self
             .borrow_annotation
             .get_borrow_info_at(code_offset)
@@ -138,59 +185,142 @@ impl<'a> Instrumenter<'a> {
 
         // Generate PackRef for nodes which go out of scope, as well as WriteBack.
         let attr_id = bytecode.get_attr_id();
-        for node in before.dying_nodes(after) {
-            if let BorrowNode::Reference(idx) = &node {
-                // Generate write_back for this reference.
-                let is_conditional = before.is_conditional(&node);
-                for (parent, edge) in before.get_incoming(&node) {
-                    self.builder.set_loc_from_attr(attr_id);
-                    let skip_label_opt = match parent {
-                        BorrowNode::Reference(..) if is_conditional => {
-                            let temp = self.builder.new_temp(BOOL_TYPE.clone());
-                            self.builder.emit_with(|id| {
-                                Bytecode::Call(
-                                    id,
-                                    vec![temp],
-                                    Operation::IsParent(parent.clone(), edge.clone()),
-                                    vec![*idx],
-                                    None,
-                                )
-                            });
-                            let update_label = self.builder.new_label();
-                            let skip_label = self.builder.new_label();
-                            self.builder.emit_with(|id| {
-                                Bytecode::Branch(id, update_label, skip_label, temp)
-                            });
-                            self.builder
-                                .emit_with(|id| Bytecode::Label(id, update_label));
-                            Some(skip_label)
-                        }
-                        _ => None,
-                    };
-                    if matches!(
-                        parent,
-                        BorrowNode::LocalRoot(..) | BorrowNode::GlobalRoot(..)
-                    ) {
-                        // On write-back to a root, "pack" the reference i.e. validate all its
-                        // invariants.
-                        let ty = &self.builder.get_target().get_local_type(*idx).to_owned();
+        self.builder.set_loc_from_attr(attr_id);
+
+        for (node, ancestors) in before.dying_nodes(after) {
+            // we only care about references that occurs in the function body
+            let node_idx = match node {
+                BorrowNode::LocalRoot(..) | BorrowNode::GlobalRoot(..) => {
+                    continue;
+                }
+                BorrowNode::Reference(idx) => {
+                    if idx < param_count {
+                        // NOTE: we have an entry-point assumption where a &mut parameter must
+                        // have its data invariants hold. As a result, when we write-back the
+                        // references, we should assert that the data invariant still hold.
+                        //
+                        // This, however, does not apply to &mut references we obtained in the
+                        // function body, i.e., by borrow local or borrow global. These cases
+                        // are handled by the `pre_writeback_check_opt` (see below).
+                        let target = self.builder.get_target();
+                        let ty = target.get_local_type(idx);
                         if self.is_pack_ref_ty(ty) {
                             self.builder.emit_with(|id| {
-                                Bytecode::Call(id, vec![], Operation::PackRefDeep, vec![*idx], None)
+                                Bytecode::Call(id, vec![], Operation::PackRefDeep, vec![idx], None)
                             });
                         }
+                        continue;
                     }
+                    idx
+                }
+                BorrowNode::ReturnPlaceholder(..) => {
+                    unreachable!("Unexpected placeholder borrow node");
+                }
+            };
+
+            // Generate write_back for this reference.
+            let is_conditional = ancestors.len() > 1;
+            for (chain_index, chain) in ancestors.iter().enumerate() {
+                // sanity check: the src node of the first action must be the node itself
+                assert_eq!(
+                    chain
+                        .first()
+                        .expect("The write-back chain should contain at action")
+                        .src,
+                    node_idx
+                );
+
+                // decide on whether we need IsParent checks and how to instrument the checks
+                let skip_label_opt = if is_conditional {
+                    let factors = Self::get_differentiation_factors(&ancestors, chain_index);
+                    let mut last_is_parent_temp = None;
+
+                    for idx in factors {
+                        let action = &chain[idx];
+                        let temp = self.builder.new_temp(BOOL_TYPE.clone());
+                        self.builder.emit_with(|id| {
+                            Bytecode::Call(
+                                id,
+                                vec![temp],
+                                Operation::IsParent(action.dst.clone(), action.edge.clone()),
+                                vec![action.src],
+                                None,
+                            )
+                        });
+
+                        let combined_temp = match last_is_parent_temp {
+                            None => temp,
+                            Some(last_temp) => {
+                                let temp_conjunction = self.builder.new_temp(BOOL_TYPE.clone());
+                                self.builder.emit_with(|id| {
+                                    Bytecode::Call(
+                                        id,
+                                        vec![temp_conjunction],
+                                        Operation::And,
+                                        vec![last_temp, temp],
+                                        None,
+                                    )
+                                });
+                                temp_conjunction
+                            }
+                        };
+                        last_is_parent_temp = Some(combined_temp);
+                    }
+
+                    let update_label = self.builder.new_label();
+                    let skip_label = self.builder.new_label();
+                    self.builder.emit_with(|id| {
+                        Bytecode::Branch(
+                            id,
+                            update_label,
+                            skip_label,
+                            last_is_parent_temp
+                                .expect("There should be at least one IsParent call for a conditional write-back"),
+                        )
+                    });
+                    self.builder
+                        .emit_with(|id| Bytecode::Label(id, update_label));
+                    Some(skip_label)
+                } else {
+                    None
+                };
+
+                // issue a chain of write-back actions
+                for action in chain {
+                    // decide if we need a pre-writeback pack-ref (i.e., data structure invariant checking)
+                    let pre_writeback_check_opt = match &action.dst {
+                        BorrowNode::LocalRoot(..) | BorrowNode::GlobalRoot(..) => {
+                            // On write-back to a root, "pack" the reference, i.e. validate all its invariants.
+                            let target = self.builder.get_target();
+                            let ty = target.get_local_type(action.src);
+                            if self.is_pack_ref_ty(ty) {
+                                Some(action.src)
+                            } else {
+                                None
+                            }
+                        }
+                        BorrowNode::Reference(..) => None,
+                        BorrowNode::ReturnPlaceholder(..) => unreachable!("invalid placeholder"),
+                    };
+                    if let Some(idx) = pre_writeback_check_opt {
+                        self.builder.emit_with(|id| {
+                            Bytecode::Call(id, vec![], Operation::PackRefDeep, vec![idx], None)
+                        });
+                    }
+
+                    // emit the write-back
                     self.builder.emit_with(|id| {
                         Bytecode::Call(
                             id,
                             vec![],
-                            Operation::WriteBack(parent.clone(), edge),
-                            vec![*idx],
+                            Operation::WriteBack(action.dst.clone(), action.edge.clone()),
+                            vec![action.src],
                             None,
                         )
                     });
-                    // Add a trace for written back value if it's a user variable.
-                    match parent {
+
+                    // add a trace for written back value if it's a user variable.
+                    match action.dst {
                         BorrowNode::LocalRoot(temp) | BorrowNode::Reference(temp) => {
                             if temp < self.builder.fun_env.get_local_count() {
                                 self.builder.emit_with(|id| {
@@ -206,9 +336,11 @@ impl<'a> Instrumenter<'a> {
                         }
                         _ => {}
                     }
-                    if let Some(label) = skip_label_opt {
-                        self.builder.emit_with(|id| Bytecode::Label(id, label));
-                    }
+                }
+
+                // continued from IsParent check
+                if let Some(label) = skip_label_opt {
+                    self.builder.emit_with(|id| Bytecode::Label(id, label));
                 }
             }
         }
diff --git a/language/move-prover/bytecode/src/mono_analysis.rs b/language/move-prover/bytecode/src/mono_analysis.rs
index f91e2059a4..6c314db3d7 100644
--- a/language/move-prover/bytecode/src/mono_analysis.rs
+++ b/language/move-prover/bytecode/src/mono_analysis.rs
@@ -17,17 +17,21 @@ use move_model::{
     ast,
     ast::{Condition, ConditionKind, ExpData},
     model::{
-        FunId, FunctionEnv, GlobalEnv, ModuleId, QualifiedId, QualifiedInstId, SpecFunId,
-        SpecVarId, StructEnv, StructId,
+        FunId, GlobalEnv, ModuleId, QualifiedId, QualifiedInstId, SpecFunId, SpecVarId, StructEnv,
+        StructId,
     },
+    pragmas::INTRINSIC_TYPE_MAP,
     ty::{Type, TypeDisplayContext, TypeInstantiationDerivation, TypeUnificationAdapter, Variance},
-    well_known::TABLE_TABLE,
+    well_known::{
+        TYPE_INFO_MOVE, TYPE_INFO_SPEC, TYPE_NAME_GET_MOVE, TYPE_NAME_GET_SPEC, TYPE_NAME_MOVE,
+        TYPE_NAME_SPEC, TYPE_SPEC_IS_STRUCT,
+    },
 };
 
 use crate::{
-    function_target::{FunctionData, FunctionTarget},
+    function_target::FunctionTarget,
     function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant},
-    stackless_bytecode::{Bytecode, Operation},
+    stackless_bytecode::{BorrowEdge, Bytecode, Operation},
     usage_analysis::UsageProcessor,
 };
 
@@ -40,9 +44,10 @@ pub struct MonoInfo {
     pub spec_vars: BTreeMap<QualifiedId<SpecVarId>, BTreeSet<Vec<Type>>>,
     pub type_params: BTreeSet<u16>,
     pub vec_inst: BTreeSet<Type>,
-    pub table_inst: BTreeSet<(Type, Type)>,
+    pub table_inst: BTreeMap<QualifiedId<StructId>, BTreeSet<(Type, Type)>>,
     pub native_inst: BTreeMap<ModuleId, BTreeSet<Vec<Type>>>,
-    pub axioms: Vec<Condition>,
+    pub all_types: BTreeSet<Type>,
+    pub axioms: Vec<(Condition, Vec<Vec<Type>>)>,
 }
 
 /// Get the information computed by this analysis.
@@ -61,44 +66,16 @@ impl MonoAnalysisProcessor {
 
 /// This processor computes monomorphization information for backends.
 impl FunctionTargetProcessor for MonoAnalysisProcessor {
-    fn process(
-        &self,
-        _targets: &mut FunctionTargetsHolder,
-        _fun_env: &FunctionEnv<'_>,
-        data: FunctionData,
-    ) -> FunctionData {
-        // Nothing to do
-        data
-    }
-
     fn name(&self) -> String {
         "mono_analysis".to_owned()
     }
 
-    fn initialize(&self, env: &GlobalEnv, targets: &mut FunctionTargetsHolder) {
-        self.analyze(env, None, targets);
+    fn is_single_run(&self) -> bool {
+        true
     }
 
-    fn finalize(&self, env: &GlobalEnv, _targets: &mut FunctionTargetsHolder) {
-        // TODO: specialize axioms based on functions they are using. For now,
-        //   we can't deal with generic axioms.
-        let mut axioms = vec![];
-        for module_env in env.get_modules() {
-            for cond in &module_env.get_spec().conditions {
-                if let ConditionKind::Axiom(params) = &cond.kind {
-                    if params.is_empty() {
-                        axioms.push(cond.clone());
-                    } else {
-                        env.error(&cond.loc, "generic axioms not yet supported")
-                    }
-                }
-            }
-        }
-        if !axioms.is_empty() {
-            env.update_extension(move |info: &mut MonoInfo| {
-                info.axioms = axioms;
-            });
-        }
+    fn run(&self, env: &GlobalEnv, targets: &mut FunctionTargetsHolder) {
+        self.analyze(env, targets);
     }
 
     fn dump_result(
@@ -147,6 +124,24 @@ impl FunctionTargetProcessor for MonoAnalysisProcessor {
             }
             writeln!(f, "}}")?;
         }
+        for (module, insts) in &info.native_inst {
+            writeln!(
+                f,
+                "module {} = {{",
+                env.get_module(*module).get_full_name_str()
+            )?;
+            for inst in insts {
+                writeln!(f, "  <{}>", display_inst(inst))?;
+            }
+            writeln!(f, "}}")?;
+        }
+        for (cond, insts) in &info.axioms {
+            writeln!(f, "axiom {} = {{", cond.loc.display(env))?;
+            for inst in insts {
+                writeln!(f, "  <{}>", display_inst(inst))?;
+            }
+            writeln!(f, "}}")?;
+        }
 
         Ok(())
     }
@@ -156,12 +151,7 @@ impl FunctionTargetProcessor for MonoAnalysisProcessor {
 // ======================
 
 impl MonoAnalysisProcessor {
-    fn analyze<'a>(
-        &self,
-        env: &'a GlobalEnv,
-        rewritten_axioms: Option<&[Condition]>,
-        targets: &'a FunctionTargetsHolder,
-    ) {
+    fn analyze<'a>(&self, env: &'a GlobalEnv, targets: &'a FunctionTargetsHolder) {
         let mut analyzer = Analyzer {
             env,
             targets,
@@ -173,21 +163,20 @@ impl MonoAnalysisProcessor {
             done_types: BTreeSet::new(),
             inst_opt: None,
         };
-        if let Some(axioms) = rewritten_axioms {
-            // Analyze newly rewritten axioms.
-            for axiom in axioms {
+        // Analyze axioms found in modules.
+        for module_env in env.get_modules() {
+            for axiom in module_env.get_spec().filter_kind_axiom() {
                 analyzer.analyze_exp(&axiom.exp)
             }
-        } else {
-            // Analyze axioms found in modules.
-            for module_env in env.get_modules() {
-                for axiom in module_env.get_spec().filter_kind_axiom() {
-                    analyzer.analyze_exp(&axiom.exp)
-                }
-            }
         }
+        // Analyze functions
         analyzer.analyze_funs();
-        let Analyzer { info, .. } = analyzer;
+        let Analyzer {
+            mut info,
+            done_types,
+            ..
+        } = analyzer;
+        info.all_types = done_types;
         env.set_extension(info);
     }
 }
@@ -226,9 +215,9 @@ impl<'a> Analyzer<'a> {
                 }
             }
         }
-        // Now incrementally work todo lists until they are done, while self.inst_opt
-        // contains the specific instantiation. We can first do regular functions,
-        // then the spec functions; the later can never add new regular functions.
+
+        // Next do todo-list for regular functions, while self.inst_opt contains the
+        // specific instantiation.
         while !self.todo_funs.is_empty() {
             let (fun, variant, inst) = self.todo_funs.pop().unwrap();
             self.inst_opt = Some(inst);
@@ -245,6 +234,18 @@ impl<'a> Analyzer<'a> {
                 .insert(inst.clone());
             self.done_funs.insert((fun, variant, inst));
         }
+
+        // Next do axioms, based on the types discovered for regular functions.
+        let axioms = self.compute_axiom_instances();
+        for (cond, insts) in axioms {
+            for inst in &insts {
+                self.inst_opt = Some(inst.clone());
+                self.analyze_exp(&cond.exp);
+            }
+            self.info.axioms.push((cond, insts))
+        }
+
+        // Finally do spec functions, after all regular functions and axioms are done.
         while !self.todo_spec_funs.is_empty() {
             let (fun, inst) = self.todo_spec_funs.pop().unwrap();
             self.inst_opt = Some(inst);
@@ -260,6 +261,47 @@ impl<'a> Analyzer<'a> {
         }
     }
 
+    /// Analyze axioms, computing all the instantiations needed. We over-approximate the
+    /// instantiations by using the cartesian product of all known types. As the number of
+    /// type parameters for axioms is restricted to 2, the number of instantiations
+    /// should stay in range. Since each axiom instance is eventually instantiated for
+    /// distinct types, unnecessary axioms should be ignorable by the SMT solver, avoiding
+    /// over-triggering.
+    fn compute_axiom_instances(&self) -> Vec<(Condition, Vec<Vec<Type>>)> {
+        let mut axioms = vec![];
+        let all_types = self
+            .done_types
+            .iter()
+            .filter(|t| t.can_be_type_argument())
+            .cloned()
+            .collect::<Vec<_>>();
+        for module_env in self.env.get_modules() {
+            for cond in &module_env.get_spec().conditions {
+                if let ConditionKind::Axiom(params) = &cond.kind {
+                    let type_insts = match params.len() {
+                        0 => vec![vec![]],
+                        1 => all_types.iter().cloned().map(|t| vec![t]).collect(),
+                        2 => itertools::iproduct!(
+                            all_types.iter().cloned(),
+                            all_types.iter().cloned()
+                        )
+                        .map(|(x, y)| vec![x, y])
+                        .collect(),
+                        _ => {
+                            self.env.error(
+                                &cond.loc,
+                                "axioms cannot have more than two type parameters",
+                            );
+                            vec![]
+                        }
+                    };
+                    axioms.push((cond.clone(), type_insts));
+                }
+            }
+        }
+        axioms
+    }
+
     fn analyze_fun(&mut self, target: FunctionTarget<'_>) {
         // Analyze function locals and return value types.
         for idx in 0..target.get_local_count() {
@@ -328,18 +370,42 @@ impl<'a> Analyzer<'a> {
         // elsewhere.
         match bc {
             Call(_, _, Function(mid, fid, targs), ..) => {
-                let callee = &self.env.get_module(*mid).into_function(*fid);
+                let module_env = &self.env.get_module(*mid);
+                let callee_env = module_env.get_function(*fid);
                 let actuals = self.instantiate_vec(targs);
-                if callee.is_native_or_intrinsic() && !actuals.is_empty() {
+
+                // the type reflection functions are specially handled here
+                if self.env.get_extlib_address() == *module_env.get_name().addr() {
+                    let qualified_name = format!(
+                        "{}::{}",
+                        module_env.get_name().name().display(self.env.symbol_pool()),
+                        callee_env.get_name().display(self.env.symbol_pool()),
+                    );
+                    if qualified_name == TYPE_NAME_MOVE || qualified_name == TYPE_INFO_MOVE {
+                        self.add_type(&actuals[0]);
+                    }
+                }
+                if self.env.get_stdlib_address() == *module_env.get_name().addr() {
+                    let qualified_name = format!(
+                        "{}::{}",
+                        module_env.get_name().name().display(self.env.symbol_pool()),
+                        callee_env.get_name().display(self.env.symbol_pool()),
+                    );
+                    if qualified_name == TYPE_NAME_GET_MOVE {
+                        self.add_type(&actuals[0]);
+                    }
+                }
+
+                if callee_env.is_native_or_intrinsic() && !actuals.is_empty() {
                     // Mark the associated module to be instantiated with the given actuals.
                     // This will instantiate all functions in the module with matching number
                     // of type parameters.
                     self.info
                         .native_inst
-                        .entry(callee.module_env.get_id())
+                        .entry(callee_env.module_env.get_id())
                         .or_default()
                         .insert(actuals);
-                } else if !callee.is_opaque() {
+                } else if !callee_env.is_opaque() {
                     // This call needs to be inlined, with targs instantiated by self.inst_opt.
                     // Schedule for later processing if this instance has not been processed yet.
                     let entry = (mid.qualified(*fid), FunctionVariant::Baseline, actuals);
@@ -348,6 +414,15 @@ impl<'a> Analyzer<'a> {
                     }
                 }
             }
+            Call(_, _, WriteBack(_, edge), ..) => {
+                // In very rare occasions, not all types used in the function can appear in
+                // function parameters, locals, and return values. Types hidden in the write-back
+                // chain of a hyper edge is one such case. Therefore, we need an extra processing
+                // to collect types used in borrow edges.
+                //
+                // TODO(mengxu): need to revisit this once the modeling for dynamic borrow is done
+                self.add_types_in_borrow_edge(edge)
+            }
             Prop(_, _, exp) => self.analyze_exp(exp),
             SaveMem(_, _, mem) => {
                 let mem = self.instantiate_mem(mem.to_owned());
@@ -398,9 +473,34 @@ impl<'a> Analyzer<'a> {
             }
             if let ExpData::Call(node_id, ast::Operation::Function(mid, fid, _), _) = e {
                 let actuals = self.instantiate_vec(&self.env.get_node_instantiation(*node_id));
-                // Only if this call has not been processed yet, queue it for future processing.
                 let module = self.env.get_module(*mid);
                 let spec_fun = module.get_spec_fun(*fid);
+
+                // the type reflection functions are specially handled here
+                if self.env.get_extlib_address() == *module.get_name().addr() {
+                    let qualified_name = format!(
+                        "{}::{}",
+                        module.get_name().name().display(self.env.symbol_pool()),
+                        spec_fun.name.display(self.env.symbol_pool()),
+                    );
+                    if qualified_name == TYPE_NAME_SPEC
+                        || qualified_name == TYPE_INFO_SPEC
+                        || qualified_name == TYPE_SPEC_IS_STRUCT
+                    {
+                        self.add_type(&actuals[0]);
+                    }
+                }
+                if self.env.get_stdlib_address() == *module.get_name().addr() {
+                    let qualified_name = format!(
+                        "{}::{}",
+                        module.get_name().name().display(self.env.symbol_pool()),
+                        spec_fun.name.display(self.env.symbol_pool()),
+                    );
+                    if qualified_name == TYPE_NAME_GET_SPEC {
+                        self.add_type(&actuals[0]);
+                    }
+                }
+
                 if spec_fun.is_native && !actuals.is_empty() {
                     // Add module to native modules
                     self.info
@@ -410,6 +510,7 @@ impl<'a> Analyzer<'a> {
                         .insert(actuals);
                 } else {
                     let entry = (mid.qualified(*fid), actuals);
+                    // Only if this call has not been processed yet, queue it for future processing.
                     if !self.done_spec_funs.contains(&entry) {
                         self.todo_spec_funs.push(entry);
                     }
@@ -449,9 +550,11 @@ impl<'a> Analyzer<'a> {
     }
 
     fn add_struct(&mut self, struct_: StructEnv<'_>, targs: &[Type]) {
-        if struct_.is_well_known(TABLE_TABLE) {
+        if struct_.is_intrinsic_of(INTRINSIC_TYPE_MAP) {
             self.info
                 .table_inst
+                .entry(struct_.get_qualified_id())
+                .or_default()
                 .insert((targs[0].clone(), targs[1].clone()));
         } else if struct_.is_native_or_intrinsic() && !targs.is_empty() {
             self.info
@@ -470,4 +573,21 @@ impl<'a> Analyzer<'a> {
             }
         }
     }
+
+    // Utility functions
+    // -----------------
+
+    fn add_types_in_borrow_edge(&mut self, edge: &BorrowEdge) {
+        match edge {
+            BorrowEdge::Direct | BorrowEdge::Index(_) => (),
+            BorrowEdge::Field(qid, _) => {
+                self.add_type_root(&qid.to_type());
+            }
+            BorrowEdge::Hyper(edges) => {
+                for item in edges {
+                    self.add_types_in_borrow_edge(item);
+                }
+            }
+        }
+    }
 }
diff --git a/language/move-prover/bytecode/src/mut_ref_instrumentation.rs b/language/move-prover/bytecode/src/mut_ref_instrumentation.rs
index 154b36416a..0cae439624 100644
--- a/language/move-prover/bytecode/src/mut_ref_instrumentation.rs
+++ b/language/move-prover/bytecode/src/mut_ref_instrumentation.rs
@@ -2,19 +2,15 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use itertools::Itertools;
+
+use move_model::{ast::TempIndex, model::FunctionEnv};
+
 use crate::{
     function_data_builder::FunctionDataBuilder,
     function_target::FunctionData,
     function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder},
-    stackless_bytecode::{Bytecode, Operation},
-};
-
-use crate::stackless_bytecode::AssignKind;
-use itertools::Itertools;
-use move_model::ast::TempIndex;
-pub use move_model::{
-    model::{FunctionEnv, Loc},
-    ty::Type,
+    stackless_bytecode::{AssignKind, Bytecode, Operation},
 };
 
 pub struct MutRefInstrumenter {}
@@ -29,8 +25,9 @@ impl FunctionTargetProcessor for MutRefInstrumenter {
     fn process(
         &self,
         _targets: &mut FunctionTargetsHolder,
-        fun_env: &FunctionEnv<'_>,
+        fun_env: &FunctionEnv,
         data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         if fun_env.is_native() {
             return data;
diff --git a/language/move-prover/bytecode/src/mutation_tester.rs b/language/move-prover/bytecode/src/mutation_tester.rs
index bc01df048e..3a117afd32 100644
--- a/language/move-prover/bytecode/src/mutation_tester.rs
+++ b/language/move-prover/bytecode/src/mutation_tester.rs
@@ -9,6 +9,11 @@
 //! It emits instructions in bytecode format, but with changes made
 //! Note that this mutation does nothing if mutation flags are not enabled
 
+use move_model::{
+    exp_generator::ExpGenerator,
+    model::{FunctionEnv, GlobalEnv},
+};
+
 use crate::{
     function_data_builder::FunctionDataBuilder,
     function_target::FunctionData,
@@ -17,11 +22,6 @@ use crate::{
     stackless_bytecode::{Bytecode, Operation},
 };
 
-use move_model::{
-    exp_generator::ExpGenerator,
-    model::{FunctionEnv, GlobalEnv},
-};
-
 pub struct MutationTester {}
 
 pub struct MutationManager {
@@ -87,8 +87,9 @@ impl FunctionTargetProcessor for MutationTester {
     fn process(
         &self,
         _targets: &mut FunctionTargetsHolder,
-        fun_env: &FunctionEnv<'_>,
+        fun_env: &FunctionEnv,
         data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         use Bytecode::*;
 
@@ -120,12 +121,8 @@ impl FunctionTargetProcessor for MutationTester {
                         (*dests).clone(),
                     );
                     let mv = m.add_sub;
-                    let result: usize;
-                    if mv > 0 {
-                        result = mv - 1;
-                    } else {
-                        result = mv;
-                    }
+
+                    let result = if mv > 0 { mv - 1 } else { mv };
                     let mm = MutationManager {
                         add_sub: result,
                         ..*m
@@ -141,12 +138,8 @@ impl FunctionTargetProcessor for MutationTester {
                         (*dests).clone(),
                     );
                     let mv = m.sub_add;
-                    let result: usize;
-                    if mv > 0 {
-                        result = mv - 1;
-                    } else {
-                        result = mv;
-                    }
+
+                    let result = if mv > 0 { mv - 1 } else { mv };
                     let mm = MutationManager {
                         sub_add: result,
                         ..*m
@@ -162,12 +155,8 @@ impl FunctionTargetProcessor for MutationTester {
                         (*dests).clone(),
                     );
                     let mv = m.mul_div;
-                    let result: usize;
-                    if mv > 0 {
-                        result = mv - 1;
-                    } else {
-                        result = mv;
-                    }
+
+                    let result = if mv > 0 { mv - 1 } else { mv };
                     let mm = MutationManager {
                         mul_div: result,
                         ..*m
@@ -182,13 +171,8 @@ impl FunctionTargetProcessor for MutationTester {
                         (*srcs).clone(),
                         (*dests).clone(),
                     );
-                    let mv = m.div_mul;
-                    let result: usize;
-                    if mv > 0 {
-                        result = mv - 1;
-                    } else {
-                        result = mv;
-                    }
+                    let mv = m.mul_div;
+                    let result = if mv > 0 { mv - 1 } else { mv };
                     let mm = MutationManager {
                         div_mul: result,
                         ..*m
diff --git a/language/move-prover/bytecode/src/number_operation.rs b/language/move-prover/bytecode/src/number_operation.rs
new file mode 100644
index 0000000000..2610968281
--- /dev/null
+++ b/language/move-prover/bytecode/src/number_operation.rs
@@ -0,0 +1,334 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This file defines types, data structures and corresponding functions to
+//! mark the operation (arithmetic or bitwise) that a variable or a field involves,
+//! which will be used later when the correct number type (int or bv<N>) in the boogie program
+
+use itertools::Itertools;
+use move_model::{
+    ast::{PropertyValue, TempIndex, Value},
+    model::{FieldId, FunId, FunctionEnv, ModuleId, NodeId, SpecFunId, StructEnv, StructId},
+    pragmas::{BV_PARAM_PROP, BV_RET_PROP},
+    ty::Type,
+};
+use std::{collections::BTreeMap, str};
+
+static PARSING_ERROR: &str = "error happened when parsing the bv pragma";
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Default, Hash)]
+pub enum NumOperation {
+    /// Default value, not involved in arithmetic or bitwise operations
+    #[default]
+    Bottom,
+    /// Involved in arithmetic operations
+    Arithmetic,
+    /// Involved in bitwise operations
+    Bitwise,
+}
+
+impl NumOperation {
+    /// Check whether two operations are conflicting
+    pub fn conflict(&self, other: &NumOperation) -> bool {
+        use NumOperation::*;
+        (*self == Arithmetic && *other == Bitwise) || (*self == Bitwise && *other == Arithmetic)
+    }
+
+    /// Return the operation according to the partial order in NumOperation
+    pub fn merge(&self, other: &NumOperation) -> NumOperation {
+        if self.ge(other) {
+            *self
+        } else {
+            *other
+        }
+    }
+}
+
+// NumOperation of a variable
+pub type OperationMap = BTreeMap<usize, NumOperation>;
+pub type ExpMap = BTreeMap<NodeId, NumOperation>;
+pub type OperationVec = Vec<NumOperation>;
+// NumOperation of a field
+pub type StructFieldOperationMap = BTreeMap<FieldId, NumOperation>;
+pub type FuncOperationMap = BTreeMap<(ModuleId, FunId), OperationMap>;
+pub type SpecFuncOperationMap = BTreeMap<(ModuleId, SpecFunId), (OperationVec, OperationVec)>;
+pub type StructOperationMap = BTreeMap<(ModuleId, StructId), StructFieldOperationMap>;
+
+#[derive(Default, Debug, Clone, Eq, PartialEq, PartialOrd)]
+pub struct GlobalNumberOperationState {
+    // TODO(tengzhang): spec funs and spec vars need to be handled here
+    // Each TempIndex for parameters appearing the function has a corresponding NumOperation
+    temp_index_operation_map: FuncOperationMap,
+    // Each return value in the function has a corresponding NumOperation
+    ret_operation_map: FuncOperationMap,
+    // Each TempIndex for locals appearing the function has a corresponding NumOperation
+    local_oper: FuncOperationMap,
+    // local_oper, but for baseline
+    local_oper_baseline: FuncOperationMap,
+    // Each node id appearing the function has a corresponding NumOperation
+    pub exp_operation_map: ExpMap,
+    // NumberOperation state for spec functions
+    pub spec_fun_operation_map: SpecFuncOperationMap,
+    // Each field in the struct has a corresponding NumOperation
+    pub struct_operation_map: StructOperationMap,
+}
+
+impl GlobalNumberOperationState {
+    /// Parse pragma bv=b"..." and pragma bv_ret=b"...", the result is a list of position (starting from 0)
+    /// in the argument list of the function
+    /// or a struct definition
+    fn extract_bv_vars(bv_temp_opt: Option<&PropertyValue>) -> Vec<usize> {
+        let mut bv_temp_vec = vec![];
+        if let Some(PropertyValue::Value(Value::ByteArray(arr))) = bv_temp_opt {
+            let param_str = str::from_utf8(arr).expect(PARSING_ERROR);
+            let idx_vec = param_str
+                .split(',')
+                .map(|s| s.trim().parse::<usize>().expect(PARSING_ERROR))
+                .collect_vec();
+            bv_temp_vec = idx_vec;
+        }
+        bv_temp_vec
+    }
+
+    pub fn get_ret_map(&self) -> &FuncOperationMap {
+        &self.ret_operation_map
+    }
+
+    pub fn get_mut_ret_map(&mut self) -> &mut FuncOperationMap {
+        &mut self.ret_operation_map
+    }
+
+    pub fn get_non_param_local_map(
+        &self,
+        mid: ModuleId,
+        fid: FunId,
+        baseline_flag: bool,
+    ) -> &OperationMap {
+        if baseline_flag {
+            self.local_oper_baseline.get(&(mid, fid)).unwrap()
+        } else {
+            self.local_oper.get(&(mid, fid)).unwrap()
+        }
+    }
+
+    pub fn get_mut_non_param_local_map(
+        &mut self,
+        mid: ModuleId,
+        fid: FunId,
+        baseline_flag: bool,
+    ) -> &mut OperationMap {
+        if baseline_flag {
+            self.local_oper_baseline.get_mut(&(mid, fid)).unwrap()
+        } else {
+            self.local_oper.get_mut(&(mid, fid)).unwrap()
+        }
+    }
+
+    pub fn get_temp_index_oper(
+        &self,
+        mid: ModuleId,
+        fid: FunId,
+        idx: TempIndex,
+        baseline_flag: bool,
+    ) -> Option<&NumOperation> {
+        if baseline_flag {
+            if self
+                .local_oper_baseline
+                .get(&(mid, fid))
+                .unwrap()
+                .contains_key(&idx)
+            {
+                self.local_oper_baseline.get(&(mid, fid)).unwrap().get(&idx)
+            } else {
+                self.temp_index_operation_map
+                    .get(&(mid, fid))
+                    .unwrap()
+                    .get(&idx)
+            }
+        } else if self.local_oper.get(&(mid, fid)).unwrap().contains_key(&idx) {
+            self.local_oper.get(&(mid, fid)).unwrap().get(&idx)
+        } else {
+            self.temp_index_operation_map
+                .get(&(mid, fid))
+                .unwrap()
+                .get(&idx)
+        }
+    }
+
+    pub fn get_mut_temp_index_oper(
+        &mut self,
+        mid: ModuleId,
+        fid: FunId,
+        idx: TempIndex,
+        baseline_flag: bool,
+    ) -> Option<&mut NumOperation> {
+        if baseline_flag {
+            if self
+                .local_oper_baseline
+                .get(&(mid, fid))
+                .unwrap()
+                .contains_key(&idx)
+            {
+                self.local_oper_baseline
+                    .get_mut(&(mid, fid))
+                    .unwrap()
+                    .get_mut(&idx)
+            } else {
+                self.temp_index_operation_map
+                    .get_mut(&(mid, fid))
+                    .unwrap()
+                    .get_mut(&idx)
+            }
+        } else if self.local_oper.get(&(mid, fid)).unwrap().contains_key(&idx) {
+            self.local_oper.get_mut(&(mid, fid)).unwrap().get_mut(&idx)
+        } else {
+            self.temp_index_operation_map
+                .get_mut(&(mid, fid))
+                .unwrap()
+                .get_mut(&idx)
+        }
+    }
+
+    /// Create the initial NumberOperationState
+    pub fn create_initial_func_oper_state(&mut self, func_env: &FunctionEnv) {
+        use NumOperation::*;
+
+        // Obtain positions that are marked as Bitwise by analyzing the pragma
+        let para_sym = &func_env.module_env.env.symbol_pool().make(BV_PARAM_PROP);
+        let ret_sym = &func_env.module_env.env.symbol_pool().make(BV_RET_PROP);
+        let number_param_property = func_env.get_spec().properties.get(para_sym);
+        let number_ret_property = func_env.get_spec().properties.get(ret_sym);
+        let para_idx_vec = Self::extract_bv_vars(number_param_property);
+        let ret_idx_vec = Self::extract_bv_vars(number_ret_property);
+
+        let mid = func_env.module_env.get_id();
+        let fid = func_env.get_id();
+        let mut default_map = BTreeMap::new();
+        let mut default_ret_operation_map = BTreeMap::new();
+
+        // Set initial state for tempIndex
+        for i in 0..func_env.get_parameter_count() {
+            if para_idx_vec.contains(&i) {
+                default_map.insert(i, Bitwise);
+            } else {
+                // If not appearing in the pragma, mark it as Arithmetic or Bottom
+                // Similar logic when populating ret_operation_map below
+                let local_ty = func_env.get_local_type(i);
+                let arith_flag = if let Type::Reference(_, tr) = local_ty {
+                    tr.is_number()
+                } else if let Type::Vector(tr) = local_ty {
+                    tr.is_number()
+                } else {
+                    local_ty.is_number()
+                };
+                if arith_flag {
+                    default_map.insert(i, Arithmetic);
+                } else {
+                    default_map.insert(i, Bottom);
+                }
+            }
+        }
+
+        // Set initial state for ret_operation_map
+        for i in 0..func_env.get_return_count() {
+            if ret_idx_vec.contains(&i) {
+                default_ret_operation_map.insert(i, Bitwise);
+            } else {
+                let ret_ty = func_env.get_return_type(i);
+                let arith_flag = if let Type::Reference(_, tr) = ret_ty {
+                    tr.is_number()
+                } else if let Type::Vector(tr) = ret_ty {
+                    tr.is_number()
+                } else {
+                    ret_ty.is_number()
+                };
+                if arith_flag {
+                    default_ret_operation_map.insert(i, Arithmetic);
+                } else {
+                    default_ret_operation_map.insert(i, Bottom);
+                }
+            }
+        }
+
+        self.temp_index_operation_map
+            .insert((mid, fid), default_map);
+        self.local_oper_baseline.insert((mid, fid), BTreeMap::new());
+        self.local_oper.insert((mid, fid), BTreeMap::new());
+        self.ret_operation_map
+            .insert((mid, fid), default_ret_operation_map);
+    }
+
+    /// Populate default state for struct operation map
+    pub fn create_initial_struct_oper_state(&mut self, struct_env: &StructEnv) {
+        use NumOperation::*;
+
+        // Obtain positions that are marked as Bitwise by analyzing the pragma
+        let para_sym = &struct_env.module_env.env.symbol_pool().make(BV_PARAM_PROP);
+        let bv_struct_opt = struct_env.get_spec().properties.get(para_sym);
+        let field_idx_vec = Self::extract_bv_vars(bv_struct_opt);
+
+        let mid = struct_env.module_env.get_id();
+        let sid = struct_env.get_id();
+        let struct_env = struct_env.module_env.env.get_module(mid).into_struct(sid);
+        let mut field_oper_map = BTreeMap::new();
+
+        for (i, field) in struct_env.get_fields().enumerate() {
+            if field_idx_vec.contains(&i) {
+                field_oper_map.insert(field.get_id(), Bitwise);
+            } else {
+                let field_ty = field.get_type();
+                let arith_flag = if let Type::Reference(_, tr) = field_ty {
+                    tr.is_number()
+                } else if let Type::Vector(tr) = field_ty {
+                    tr.is_number()
+                } else {
+                    field_ty.is_number()
+                };
+                if arith_flag {
+                    field_oper_map.insert(field.get_id(), Arithmetic);
+                } else {
+                    field_oper_map.insert(field.get_id(), Bottom);
+                }
+            }
+        }
+        self.struct_operation_map.insert((mid, sid), field_oper_map);
+    }
+
+    /// Updates the number operation for the given node id.
+    pub fn update_node_oper(
+        &mut self,
+        node_id: NodeId,
+        num_oper: NumOperation,
+        allow: bool,
+    ) -> bool {
+        let mods = &mut self.exp_operation_map;
+        let oper = mods.get_mut(&node_id).expect("node exist");
+        if !allow && oper.conflict(&num_oper) {
+            false
+        } else {
+            *oper = num_oper;
+            true
+        }
+    }
+
+    /// Gets the number operation of the given node.
+    pub fn get_node_num_oper(&self, node_id: NodeId) -> NumOperation {
+        self.get_node_num_oper_opt(node_id)
+            .expect("node number oper defined")
+    }
+
+    /// Gets the number operation of the given node, if available.
+    pub fn get_node_num_oper_opt(&self, node_id: NodeId) -> Option<NumOperation> {
+        self.exp_operation_map.get(&node_id).copied()
+    }
+
+    pub fn update_spec_ret(&mut self, mid: &ModuleId, fid: &SpecFunId, oper: NumOperation) {
+        let ret_num_oper_vec = &mut self
+            .spec_fun_operation_map
+            .get_mut(&(*mid, *fid))
+            .unwrap()
+            .1;
+        ret_num_oper_vec[0] = oper;
+    }
+}
diff --git a/language/move-prover/bytecode/src/number_operation_analysis.rs b/language/move-prover/bytecode/src/number_operation_analysis.rs
new file mode 100644
index 0000000000..c772880eaa
--- /dev/null
+++ b/language/move-prover/bytecode/src/number_operation_analysis.rs
@@ -0,0 +1,1116 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Analysis on partitioning temp variables, struct fields and function parameters according to involved operations (arithmetic or bitwise)
+//
+// The result of this analysis will be used when generating the boogie code
+
+use crate::{
+    dataflow_analysis::{DataflowAnalysis, TransferFunctions},
+    dataflow_domains::{AbstractDomain, JoinResult},
+    function_target::FunctionTarget,
+    function_target_pipeline::{
+        FunctionTargetPipeline, FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant,
+    },
+    number_operation::{
+        GlobalNumberOperationState,
+        NumOperation::{self, Arithmetic, Bitwise, Bottom},
+    },
+    options::ProverOptions,
+    stackless_bytecode::{AttrId, Bytecode, Operation},
+    stackless_control_flow_graph::StacklessControlFlowGraph,
+};
+use itertools::Either;
+use move_binary_format::file_format::CodeOffset;
+use move_model::{
+    ast::{Exp, ExpData, TempIndex},
+    model::{FunId, GlobalEnv, ModuleId},
+    ty::{PrimitiveType, Type},
+};
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    str,
+};
+
+static CONFLICT_ERROR_MSG: &str = "cannot appear in both arithmetic and bitwise operation";
+
+pub struct NumberOperationProcessor {}
+
+impl NumberOperationProcessor {
+    pub fn new() -> Box<Self> {
+        Box::new(NumberOperationProcessor {})
+    }
+
+    /// Create initial number operation state for expressions
+    pub fn create_initial_exp_oper_state(&self, env: &GlobalEnv) {
+        let mut default_exp = BTreeMap::new();
+        let exp_info_map = env.get_nodes();
+        for id in exp_info_map {
+            default_exp.insert(id, Bottom);
+        }
+        let mut global_state = env.get_cloned_extension::<GlobalNumberOperationState>();
+        global_state.exp_operation_map = default_exp;
+        env.set_extension(global_state);
+    }
+
+    /// Entry point of the analysis
+    fn analyze<'a>(&self, env: &'a GlobalEnv, targets: &'a FunctionTargetsHolder) {
+        self.create_initial_exp_oper_state(env);
+        let fun_env_vec = FunctionTargetPipeline::sort_targets_in_topological_order(env, targets);
+        for item in &fun_env_vec {
+            match item {
+                Either::Left(fid) => {
+                    let func_env = env.get_function(*fid);
+                    for (_, target) in targets.get_targets(&func_env) {
+                        if target.data.code.is_empty() {
+                            continue;
+                        }
+                        self.analyze_fun(env, target.clone());
+                    }
+                }
+                Either::Right(scc) => {
+                    for fid in scc {
+                        let func_env = env.get_function(*fid);
+                        for (_, target) in targets.get_targets(&func_env) {
+                            if target.data.code.is_empty() {
+                                continue;
+                            }
+                            self.analyze_fun(env, target.clone());
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    fn analyze_fun<'a>(&self, env: &'a GlobalEnv, target: FunctionTarget) {
+        if !target.func_env.is_native_or_intrinsic() {
+            let cfg = StacklessControlFlowGraph::one_block(target.get_bytecode());
+            let analyzer = NumberOperationAnalysis {
+                func_target: target,
+                ban_int_2_bv_conversion: ProverOptions::get(env).ban_int_2_bv,
+            };
+            analyzer.analyze_function(
+                NumberOperationState::create_initial_state(),
+                analyzer.func_target.get_bytecode(),
+                &cfg,
+            );
+        }
+    }
+}
+
+impl FunctionTargetProcessor for NumberOperationProcessor {
+    fn is_single_run(&self) -> bool {
+        true
+    }
+
+    fn run(&self, env: &GlobalEnv, targets: &mut FunctionTargetsHolder) {
+        self.analyze(env, targets);
+    }
+
+    fn name(&self) -> String {
+        "number_operation_analysis".to_string()
+    }
+}
+
+struct NumberOperationAnalysis<'a> {
+    func_target: FunctionTarget<'a>,
+    ban_int_2_bv_conversion: bool,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, PartialOrd)]
+struct NumberOperationState {
+    // Flag to mark whether the global state has been changed in one pass
+    pub changed: bool,
+}
+
+impl NumberOperationState {
+    /// Create a default NumberOperationState
+    fn create_initial_state() -> Self {
+        NumberOperationState { changed: false }
+    }
+}
+
+fn vector_table_funs_name_propogate_to_dest(callee_name: &str) -> bool {
+    callee_name.contains("borrow")
+        || callee_name.contains("borrow_mut")
+        || callee_name.contains("pop_back")
+        || callee_name.contains("singleton")
+        || callee_name.contains("remove")
+        || callee_name.contains("swap_remove")
+        || callee_name.contains("spec_get")
+}
+
+fn vector_funs_name_propogate_to_srcs(callee_name: &str) -> bool {
+    callee_name == "contains"
+        || callee_name == "index_of"
+        || callee_name == "append"
+        || callee_name == "push_back"
+        || callee_name == "insert"
+}
+
+fn table_funs_name_propogate_to_srcs(callee_name: &str) -> bool {
+    callee_name == "add" || callee_name == "borrow_mut_with_default" || callee_name == "upsert"
+}
+
+impl<'a> NumberOperationAnalysis<'a> {
+    /// Analyze the expression in the spec
+    fn handle_exp(
+        &self,
+        attr_id: AttrId,
+        e: &Exp,
+        global_state: &mut GlobalNumberOperationState,
+        state: &mut NumberOperationState,
+    ) {
+        // TODO(tengzhang): add logic to support converting int to bv in the spec
+        let allow_merge = false;
+        let opers_for_propagation = |oper: &move_model::ast::Operation| {
+            use move_model::ast::Operation::*;
+            matches!(
+                *oper,
+                Add | Sub
+                    | Mul
+                    | Div
+                    | Mod
+                    | BitOr
+                    | BitAnd
+                    | Xor
+                    | Shr
+                    | Shl
+                    | Lt
+                    | Le
+                    | Gt
+                    | Ge
+                    | Neq
+                    | Eq
+            )
+        };
+        let bitwise_oper = |oper: &move_model::ast::Operation| {
+            use move_model::ast::Operation::*;
+            matches!(*oper, |BitOr| BitAnd | Xor)
+        };
+        let baseline_flag = self.func_target.data.variant == FunctionVariant::Baseline;
+        let cur_mid = self.func_target.func_env.module_env.get_id();
+        let cur_fid = self.func_target.func_env.get_id();
+        let update_temporary = |arg: &Exp,
+                                oper: &NumOperation,
+                                global_state: &mut GlobalNumberOperationState,
+                                state: &mut NumberOperationState| {
+            if let ExpData::Temporary(_, idx) = arg.as_ref() {
+                let cur_oper = global_state
+                    .get_temp_index_oper(cur_mid, cur_fid, *idx, baseline_flag)
+                    .unwrap_or(&Bottom);
+                if *cur_oper != *oper {
+                    state.changed = true;
+                    *global_state
+                        .get_mut_temp_index_oper(cur_mid, cur_fid, *idx, baseline_flag)
+                        .unwrap() = *oper;
+                }
+            }
+        };
+        let visitor = &mut |exp: &ExpData| {
+            match exp {
+                ExpData::Temporary(id, idx) => {
+                    let baseline_flag = self.func_target.data.variant == FunctionVariant::Baseline;
+                    let oper = global_state
+                        .get_temp_index_oper(cur_mid, cur_fid, *idx, baseline_flag)
+                        .unwrap_or(&Bottom);
+                    // Update num_oper for the node for the temporary variable
+                    global_state.update_node_oper(*id, *oper, true);
+                }
+                ExpData::Block(id, _, exp) => {
+                    let exp_oper = global_state.get_node_num_oper(exp.node_id());
+                    global_state.update_node_oper(*id, exp_oper, true);
+                }
+                ExpData::IfElse(id, _, true_exp, false_exp) => {
+                    let true_oper = global_state.get_node_num_oper(true_exp.node_id());
+                    let false_oper = global_state.get_node_num_oper(false_exp.node_id());
+                    if !allow_merge && true_oper.conflict(&false_oper) {
+                        self.func_target.global_env().error(
+                            &self.func_target.get_bytecode_loc(attr_id),
+                            CONFLICT_ERROR_MSG,
+                        );
+                    }
+                    global_state.update_node_oper(*id, true_oper.merge(&false_oper), true);
+                }
+                ExpData::Call(id, oper, args) => {
+                    let mut arg_oper = vec![];
+                    for arg in args {
+                        arg_oper.push(global_state.get_node_num_oper(arg.node_id()));
+                    }
+                    match oper {
+                        move_model::ast::Operation::Identical => {
+                            let num_oper_0 = global_state.get_node_num_oper(args[0].node_id());
+                            let num_oper_1 = global_state.get_node_num_oper(args[1].node_id());
+                            if !num_oper_0.conflict(&num_oper_1) {
+                                let merged = num_oper_0.merge(&num_oper_1);
+                                global_state.update_node_oper(*id, merged, true);
+                                for arg in args {
+                                    global_state.update_node_oper(arg.node_id(), merged, true);
+                                    update_temporary(arg, &merged, global_state, state);
+                                }
+                            }
+                        }
+                        // Update node for index
+                        move_model::ast::Operation::Index => {
+                            global_state.update_node_oper(*id, arg_oper[0], true);
+                        }
+                        // Update node for return value
+                        move_model::ast::Operation::Result(i) => {
+                            let oper = global_state
+                                .get_ret_map()
+                                .get(&(cur_mid, cur_fid))
+                                .unwrap()
+                                .get(i)
+                                .unwrap_or(&Bottom);
+                            global_state.update_node_oper(*id, *oper, true);
+                        }
+                        // Update node for field operation
+                        move_model::ast::Operation::Select(mid, sid, field_id)
+                        | move_model::ast::Operation::UpdateField(mid, sid, field_id) => {
+                            let field_oper = global_state
+                                .struct_operation_map
+                                .get(&(*mid, *sid))
+                                .unwrap()
+                                .get(field_id)
+                                .unwrap();
+                            global_state.update_node_oper(*id, *field_oper, true);
+                        }
+                        move_model::ast::Operation::Cast => {
+                            // Obtained the updated num_oper of the expression
+                            let num_oper = global_state.get_node_num_oper(args[0].node_id());
+                            // Update the node of cast
+                            global_state.update_node_oper(*id, num_oper, true);
+                        }
+                        move_model::ast::Operation::Int2Bv => {
+                            global_state.update_node_oper(*id, Bitwise, true);
+                        }
+                        move_model::ast::Operation::Bv2Int => {
+                            global_state.update_node_oper(*id, Arithmetic, true);
+                        }
+                        move_model::ast::Operation::Function(mid, sid, _) => {
+                            let module_env = &self.func_target.global_env().get_module(*mid);
+                            let callee_name = module_env
+                                .get_spec_fun(*sid)
+                                .name
+                                .display(self.func_target.global_env().symbol_pool())
+                                .to_string();
+                            if module_env.is_std_vector() || module_env.is_table() {
+                                if !args.is_empty() {
+                                    let oper_first =
+                                        global_state.get_node_num_oper(args[0].node_id());
+                                    // First argument is the target vector and the return type has the same NumberOperation type
+                                    if vector_table_funs_name_propogate_to_dest(&callee_name) {
+                                        global_state.update_node_oper(*id, oper_first, true);
+                                    } else {
+                                        global_state.update_node_oper(*id, Bottom, allow_merge);
+                                    }
+                                    // Handle the case of borrow_mut_with_default
+                                    if callee_name.contains("borrow_mut_with_default") {
+                                        assert!(args.len() >= 3);
+                                        update_temporary(
+                                            &args[2],
+                                            &oper_first,
+                                            global_state,
+                                            state,
+                                        );
+                                    }
+                                }
+                            } else {
+                                // Analysis for general spec functions.
+                                let module = &self.func_target.global_env().get_module(*mid);
+                                let callee_spec_fun = module.get_spec_fun(*sid);
+                                // Try to get num_oper for signatures
+                                // If not exists, compute num_oper for this spec fun and update the exp_operation_map and spec_fun_map
+                                if let std::collections::btree_map::Entry::Vacant(_) =
+                                    global_state.spec_fun_operation_map.entry((*mid, *sid))
+                                {
+                                    let mut para_vec = vec![];
+                                    let mut ret_vec = vec![];
+                                    // Default num oper is determined by the actual arguments
+                                    para_vec.append(&mut arg_oper);
+                                    ret_vec.push(Bottom);
+                                    if callee_spec_fun.body.is_some() {
+                                        let body_exp = callee_spec_fun.body.as_ref().unwrap();
+                                        let local_map = body_exp.free_local_vars_with_node_id();
+                                        for (i, (sym, _)) in
+                                            callee_spec_fun.params.iter().enumerate()
+                                        {
+                                            if local_map.contains_key(sym) {
+                                                let sym_node_id = local_map.get(sym).unwrap();
+                                                let oper_opt =
+                                                    global_state.exp_operation_map.get(sym_node_id);
+                                                if let Some(oper) = oper_opt {
+                                                    // Still need to check compatibility
+                                                    if !allow_merge && oper.conflict(&para_vec[i]) {
+                                                        self.func_target.global_env().error(
+                                                            &self
+                                                                .func_target
+                                                                .get_bytecode_loc(attr_id),
+                                                            CONFLICT_ERROR_MSG,
+                                                        );
+                                                    } else {
+                                                        let merged = oper.merge(&para_vec[i]);
+                                                        para_vec[i] = merged;
+                                                    }
+                                                }
+                                                global_state.update_node_oper(
+                                                    *sym_node_id,
+                                                    para_vec[i],
+                                                    true,
+                                                );
+                                            }
+                                        }
+                                        global_state
+                                            .spec_fun_operation_map
+                                            .insert((*mid, *sid), (para_vec, ret_vec));
+
+                                        // Check compatibility between formal and actual arguments
+                                        self.handle_exp(attr_id, body_exp, global_state, state);
+                                        global_state.update_node_oper(
+                                            *id,
+                                            global_state.get_node_num_oper(body_exp.node_id()),
+                                            allow_merge,
+                                        );
+                                        global_state.update_spec_ret(
+                                            mid,
+                                            sid,
+                                            global_state.get_node_num_oper(body_exp.node_id()),
+                                        );
+                                    } else {
+                                        global_state
+                                            .spec_fun_operation_map
+                                            .insert((*mid, *sid), (para_vec, ret_vec));
+                                    }
+                                } else {
+                                    // Check compatibility between formal and actual arguments
+                                    let para_oper_vec = &global_state
+                                        .spec_fun_operation_map
+                                        .get(&(*mid, *sid))
+                                        .unwrap()
+                                        .0;
+                                    assert_eq!(para_oper_vec.len(), arg_oper.len());
+                                    for (formal_oper, actual_oper) in
+                                        para_oper_vec.iter().zip(arg_oper.iter())
+                                    {
+                                        // For simplicity, only check compatibility
+                                        if !allow_merge && formal_oper.conflict(actual_oper) {
+                                            self.func_target.global_env().error(
+                                                &self.func_target.get_bytecode_loc(attr_id),
+                                                CONFLICT_ERROR_MSG,
+                                            );
+                                        }
+                                    }
+                                }
+                                // Update number oper for this node based on the return value of the spec fun
+                                let ret_num_oper_vec = &global_state
+                                    .spec_fun_operation_map
+                                    .get(&(*mid, *sid))
+                                    .unwrap()
+                                    .1;
+                                if !ret_num_oper_vec.is_empty() {
+                                    global_state.update_node_oper(
+                                        *id,
+                                        ret_num_oper_vec[0],
+                                        allow_merge,
+                                    );
+                                }
+                            }
+                        }
+                        move_model::ast::Operation::WellFormed => {
+                            global_state.update_node_oper(*id, arg_oper[0], true);
+                        }
+                        _ => {
+                            // All args must have compatible number operations
+                            // TODO(tengzhang): support converting int to bv
+                            if opers_for_propagation(oper) {
+                                let mut merged = if bitwise_oper(oper) { Bitwise } else { Bottom };
+                                if bitwise_oper(oper) {
+                                    let ty =
+                                        self.func_target.global_env().get_node_type(exp.node_id());
+                                    if matches!(ty, Type::Primitive(PrimitiveType::Num)) {
+                                        self.func_target.global_env().update_node_type(
+                                            exp.node_id(),
+                                            self.func_target
+                                                .global_env()
+                                                .get_node_type(args[0].node_id())
+                                                .skip_reference()
+                                                .clone(),
+                                        );
+                                    }
+                                }
+                                for num_oper in &arg_oper {
+                                    if !allow_merge && num_oper.conflict(&merged) {
+                                        self.func_target.global_env().error(
+                                            &self.func_target.get_bytecode_loc(attr_id),
+                                            CONFLICT_ERROR_MSG,
+                                        );
+                                    }
+                                    merged = num_oper.merge(&merged);
+                                }
+
+                                for (arg, arg_oper) in args.iter().zip(arg_oper.iter()) {
+                                    if merged != *arg_oper {
+                                        // propagate to arg if necessary
+                                        global_state.update_node_oper(
+                                            arg.node_id(),
+                                            merged,
+                                            allow_merge,
+                                        );
+                                        update_temporary(arg, &merged, global_state, state);
+                                    }
+                                }
+
+                                global_state.update_node_oper(*id, merged, allow_merge);
+                            }
+                        }
+                    }
+                }
+                _ => {}
+            }
+        };
+        e.visit(visitor);
+    }
+
+    /// Check whether operations in s conflicting
+    fn check_conflict_set(&self, s: &BTreeSet<&NumOperation>) -> bool {
+        if self.ban_int_2_bv_conversion {
+            let mut arith_flag = false;
+            let mut bitwise_flag = false;
+            for &oper in s {
+                if *oper == Arithmetic {
+                    arith_flag = true;
+                }
+                if *oper == Bitwise {
+                    bitwise_flag = true;
+                }
+            }
+            arith_flag && bitwise_flag
+        } else {
+            false
+        }
+    }
+
+    /// Check whether oper_1 and oper_2 conflict
+    fn check_conflict(&self, oper_1: &NumOperation, oper_2: &NumOperation) -> bool {
+        if self.ban_int_2_bv_conversion {
+            oper_1.conflict(oper_2)
+        } else {
+            false
+        }
+    }
+
+    /// Check whether operation of dest and src conflict, if not propagate the merged operation
+    fn check_and_propagate(
+        &self,
+        id: &AttrId,
+        state: &mut NumberOperationState,
+        dest: &TempIndex,
+        src: &TempIndex,
+        mid: ModuleId,
+        fid: FunId,
+        global_state: &mut GlobalNumberOperationState,
+        baseline_flag: bool,
+    ) {
+        // Each TempIndex has a default operation in the map, can unwrap
+        let dest_oper = global_state
+            .get_temp_index_oper(mid, fid, *dest, baseline_flag)
+            .unwrap();
+        let src_oper = global_state
+            .get_temp_index_oper(mid, fid, *src, baseline_flag)
+            .unwrap();
+        if self.check_conflict(dest_oper, src_oper) {
+            self.func_target
+                .func_env
+                .module_env
+                .env
+                .error(&self.func_target.get_bytecode_loc(*id), CONFLICT_ERROR_MSG);
+        } else {
+            let merged_oper = dest_oper.merge(src_oper);
+            if merged_oper != *dest_oper || merged_oper != *src_oper {
+                state.changed = true;
+            }
+            *global_state
+                .get_mut_temp_index_oper(mid, fid, *dest, baseline_flag)
+                .unwrap() = merged_oper;
+            *global_state
+                .get_mut_temp_index_oper(mid, fid, *src, baseline_flag)
+                .unwrap() = merged_oper;
+        }
+    }
+
+    /// Update operation in dests and srcs using oper
+    fn check_and_update_oper(
+        &self,
+        id: &AttrId,
+        state: &mut NumberOperationState,
+        dests: &[TempIndex],
+        srcs: &[TempIndex],
+        oper: NumOperation,
+        mid: ModuleId,
+        fid: FunId,
+        global_state: &mut GlobalNumberOperationState,
+        baseline_flag: bool,
+    ) {
+        let op_srcs_0 = global_state
+            .get_temp_index_oper(mid, fid, srcs[0], baseline_flag)
+            .unwrap();
+        let op_srcs_1 = global_state
+            .get_temp_index_oper(mid, fid, srcs[1], baseline_flag)
+            .unwrap();
+        let op_dests_0 = global_state
+            .get_temp_index_oper(mid, fid, dests[0], baseline_flag)
+            .unwrap();
+        // Check conflicts among dests and srcs
+        let mut state_set = BTreeSet::new();
+        state_set.insert(op_srcs_0);
+        state_set.insert(op_srcs_1);
+        state_set.insert(op_dests_0);
+        if self.check_conflict_set(&state_set) {
+            self.func_target
+                .func_env
+                .module_env
+                .env
+                .error(&self.func_target.get_bytecode_loc(*id), CONFLICT_ERROR_MSG);
+            return;
+        }
+        if oper != *op_srcs_0 || oper != *op_srcs_1 || oper != *op_dests_0 {
+            state.changed = true;
+        }
+        *global_state
+            .get_mut_temp_index_oper(mid, fid, srcs[0], baseline_flag)
+            .unwrap() = oper;
+        *global_state
+            .get_mut_temp_index_oper(mid, fid, srcs[1], baseline_flag)
+            .unwrap() = oper;
+        *global_state
+            .get_mut_temp_index_oper(mid, fid, dests[0], baseline_flag)
+            .unwrap() = oper;
+    }
+
+    fn check_and_update_oper_dest(
+        &self,
+        state: &mut NumberOperationState,
+        dests: &[TempIndex],
+        oper: NumOperation,
+        mid: ModuleId,
+        fid: FunId,
+        global_state: &mut GlobalNumberOperationState,
+        baseline_flag: bool,
+    ) {
+        let op_dests_0 = global_state
+            .get_temp_index_oper(mid, fid, dests[0], baseline_flag)
+            .unwrap();
+        if oper != *op_dests_0 {
+            state.changed = true;
+        }
+        *global_state
+            .get_mut_temp_index_oper(mid, fid, dests[0], baseline_flag)
+            .unwrap() = oper;
+    }
+
+    /// Generate default num_oper for all non-parameter locals
+    fn populate_non_param_oper(&self, global_state: &mut GlobalNumberOperationState) {
+        let mid = self.func_target.func_env.module_env.get_id();
+        let fid = self.func_target.func_env.get_id();
+        let non_param_range = self.func_target.get_non_parameter_locals();
+        let baseline_flag = self.func_target.data.variant == FunctionVariant::Baseline;
+        for i in non_param_range {
+            if !global_state
+                .get_non_param_local_map(mid, fid, baseline_flag)
+                .contains_key(&i)
+            {
+                global_state
+                    .get_mut_non_param_local_map(mid, fid, baseline_flag)
+                    .insert(i, Bottom);
+            }
+        }
+    }
+}
+
+impl<'a> TransferFunctions for NumberOperationAnalysis<'a> {
+    type State = NumberOperationState;
+    const BACKWARD: bool = false;
+
+    /// Update global state of num_operation by analyzing each instruction
+    fn execute(&self, state: &mut NumberOperationState, instr: &Bytecode, _offset: CodeOffset) {
+        use Bytecode::*;
+        use Operation::*;
+        let mut global_state = self
+            .func_target
+            .global_env()
+            .get_cloned_extension::<GlobalNumberOperationState>();
+        self.populate_non_param_oper(&mut global_state);
+        let baseline_flag = self.func_target.data.variant == FunctionVariant::Baseline;
+        let cur_mid = self.func_target.func_env.module_env.get_id();
+        let cur_fid = self.func_target.func_env.get_id();
+        match instr {
+            Assign(id, dest, src, _) => {
+                self.check_and_propagate(
+                    id,
+                    state,
+                    dest,
+                    src,
+                    cur_mid,
+                    cur_fid,
+                    &mut global_state,
+                    baseline_flag,
+                );
+            }
+            // Check and update operations of rets in temp_index_operation_map and operations in ret_operation_map
+            Ret(id, rets) => {
+                let ret_types = self.func_target.get_return_types();
+                for ((i, _), ret) in ret_types.iter().enumerate().zip(rets) {
+                    let ret_oper = global_state
+                        .get_ret_map()
+                        .get(&(cur_mid, cur_fid))
+                        .unwrap()
+                        .get(&i)
+                        .unwrap();
+                    let idx_oper = global_state
+                        .get_temp_index_oper(cur_mid, cur_fid, *ret, baseline_flag)
+                        .unwrap();
+
+                    if self.check_conflict(idx_oper, ret_oper) {
+                        self.func_target
+                            .func_env
+                            .module_env
+                            .env
+                            .error(&self.func_target.get_bytecode_loc(*id), CONFLICT_ERROR_MSG);
+                    } else {
+                        let merged = idx_oper.merge(ret_oper);
+                        if merged != *idx_oper || merged != *ret_oper {
+                            state.changed = true;
+                        }
+                        *global_state
+                            .get_mut_temp_index_oper(cur_mid, cur_fid, *ret, baseline_flag)
+                            .unwrap() = merged;
+                        global_state
+                            .get_mut_ret_map()
+                            .get_mut(&(cur_mid, cur_fid))
+                            .unwrap()
+                            .insert(i, merged);
+                    }
+                }
+            }
+            Call(id, dests, oper, srcs, _) => {
+                match oper {
+                    BorrowLoc | ReadRef | CastU8 | CastU16 | CastU32 | CastU64 | CastU128
+                    | CastU256 => {
+                        self.check_and_propagate(
+                            id,
+                            state,
+                            &dests[0],
+                            &srcs[0],
+                            cur_mid,
+                            cur_fid,
+                            &mut global_state,
+                            baseline_flag,
+                        );
+                    }
+                    WriteRef | Lt | Le | Gt | Ge | Eq | Neq => {
+                        self.check_and_propagate(
+                            id,
+                            state,
+                            &srcs[0],
+                            &srcs[1],
+                            cur_mid,
+                            cur_fid,
+                            &mut global_state,
+                            baseline_flag,
+                        );
+                    }
+                    Add | Sub | Mul | Div | Mod => {
+                        let mut num_oper = Arithmetic;
+                        if !self.ban_int_2_bv_conversion {
+                            let op_srcs_0 = global_state
+                                .get_temp_index_oper(cur_mid, cur_fid, srcs[0], baseline_flag)
+                                .unwrap();
+                            let op_srcs_1 = global_state
+                                .get_temp_index_oper(cur_mid, cur_fid, srcs[1], baseline_flag)
+                                .unwrap();
+                            let op_dests_0 = global_state
+                                .get_temp_index_oper(cur_mid, cur_fid, dests[0], baseline_flag)
+                                .unwrap();
+                            // If there is conflict among operations, merged will not be used for updating
+                            num_oper = op_srcs_0.merge(op_srcs_1).merge(op_dests_0);
+                        }
+                        self.check_and_update_oper(
+                            id,
+                            state,
+                            dests,
+                            srcs,
+                            num_oper,
+                            cur_mid,
+                            cur_fid,
+                            &mut global_state,
+                            baseline_flag,
+                        );
+                    }
+                    BitOr | BitAnd | Xor => {
+                        if self.ban_int_2_bv_conversion {
+                            self.check_and_update_oper(
+                                id,
+                                state,
+                                dests,
+                                srcs,
+                                Bitwise,
+                                cur_mid,
+                                cur_fid,
+                                &mut global_state,
+                                baseline_flag,
+                            );
+                        } else {
+                            self.check_and_update_oper_dest(
+                                state,
+                                dests,
+                                Bitwise,
+                                cur_mid,
+                                cur_fid,
+                                &mut global_state,
+                                baseline_flag,
+                            )
+                        }
+                    }
+                    Shl | Shr => {
+                        let op_srcs_0 = global_state
+                            .get_temp_index_oper(cur_mid, cur_fid, srcs[0], baseline_flag)
+                            .unwrap();
+                        let op_srcs_1 = global_state
+                            .get_temp_index_oper(cur_mid, cur_fid, srcs[1], baseline_flag)
+                            .unwrap();
+                        let op_dests_0 = global_state
+                            .get_temp_index_oper(cur_mid, cur_fid, dests[0], baseline_flag)
+                            .unwrap();
+                        // If there is conflict among operations, merged will not be used for updating
+                        let merged = op_srcs_0.merge(op_srcs_1).merge(op_dests_0);
+                        self.check_and_update_oper(
+                            id,
+                            state,
+                            dests,
+                            srcs,
+                            merged,
+                            cur_mid,
+                            cur_fid,
+                            &mut global_state,
+                            baseline_flag,
+                        );
+                    }
+                    // Checking and operations in the struct_operation_map when packing
+                    Pack(msid, sid, _) => {
+                        let struct_env = self
+                            .func_target
+                            .global_env()
+                            .get_module(*msid)
+                            .into_struct(*sid);
+                        for (i, field) in struct_env.get_fields().enumerate() {
+                            let current_field_oper = global_state
+                                .struct_operation_map
+                                .get(&(*msid, *sid))
+                                .unwrap()
+                                .get(&field.get_id())
+                                .unwrap();
+                            let pack_oper = global_state
+                                .get_temp_index_oper(cur_mid, cur_fid, srcs[i], baseline_flag)
+                                .unwrap();
+                            if self.check_conflict(current_field_oper, pack_oper) {
+                                self.func_target.func_env.module_env.env.error(
+                                    &self.func_target.get_bytecode_loc(*id),
+                                    CONFLICT_ERROR_MSG,
+                                );
+                            } else {
+                                let merged = current_field_oper.merge(pack_oper);
+                                if merged != *current_field_oper || merged != *pack_oper {
+                                    state.changed = true;
+                                }
+                                *global_state
+                                    .get_mut_temp_index_oper(
+                                        cur_mid,
+                                        cur_fid,
+                                        srcs[i],
+                                        baseline_flag,
+                                    )
+                                    .unwrap() = merged;
+                                global_state
+                                    .struct_operation_map
+                                    .get_mut(&(*msid, *sid))
+                                    .unwrap()
+                                    .insert(field.get_id(), merged);
+                            }
+                        }
+                    }
+                    // Checking and operations in the struct_operation_map when unpacking
+                    Unpack(msid, sid, _) => {
+                        let struct_env = self
+                            .func_target
+                            .global_env()
+                            .get_module(*msid)
+                            .into_struct(*sid);
+                        for (i, field) in struct_env.get_fields().enumerate() {
+                            let current_field_oper = global_state
+                                .struct_operation_map
+                                .get(&(*msid, *sid))
+                                .unwrap()
+                                .get(&field.get_id())
+                                .unwrap();
+                            let pack_oper = global_state
+                                .get_temp_index_oper(cur_mid, cur_fid, dests[i], baseline_flag)
+                                .unwrap();
+                            if self.check_conflict(current_field_oper, pack_oper) {
+                                self.func_target.func_env.module_env.env.error(
+                                    &self.func_target.get_bytecode_loc(*id),
+                                    CONFLICT_ERROR_MSG,
+                                );
+                            } else {
+                                let merged = current_field_oper.merge(pack_oper);
+                                if merged != *current_field_oper || merged != *pack_oper {
+                                    state.changed = true;
+                                }
+                                *global_state
+                                    .get_mut_temp_index_oper(
+                                        cur_mid,
+                                        cur_fid,
+                                        dests[i],
+                                        baseline_flag,
+                                    )
+                                    .unwrap() = merged;
+                                global_state
+                                    .struct_operation_map
+                                    .get_mut(&(*msid, *sid))
+                                    .unwrap()
+                                    .insert(field.get_id(), merged);
+                            }
+                        }
+                    }
+                    GetField(msid, sid, _, offset) | BorrowField(msid, sid, _, offset) => {
+                        let dests_oper = global_state
+                            .get_temp_index_oper(cur_mid, cur_fid, dests[0], baseline_flag)
+                            .unwrap();
+                        let field_oper = global_state
+                            .struct_operation_map
+                            .get(&(*msid, *sid))
+                            .unwrap()
+                            .get(
+                                &self
+                                    .func_target
+                                    .func_env
+                                    .module_env
+                                    .get_struct(*sid)
+                                    .get_field_by_offset(*offset)
+                                    .get_id(),
+                            )
+                            .unwrap();
+
+                        if self.check_conflict(dests_oper, field_oper) {
+                            self.func_target
+                                .func_env
+                                .module_env
+                                .env
+                                .error(&self.func_target.get_bytecode_loc(*id), CONFLICT_ERROR_MSG);
+                        } else {
+                            let merged_oper = dests_oper.merge(field_oper);
+                            if merged_oper != *field_oper || merged_oper != *dests_oper {
+                                state.changed = true;
+                            }
+                            *global_state
+                                .get_mut_temp_index_oper(cur_mid, cur_fid, dests[0], baseline_flag)
+                                .unwrap() = merged_oper;
+                            global_state
+                                .struct_operation_map
+                                .get_mut(&(*msid, *sid))
+                                .unwrap()
+                                .insert(
+                                    self.func_target
+                                        .func_env
+                                        .module_env
+                                        .get_struct(*sid)
+                                        .get_field_by_offset(*offset)
+                                        .get_id(),
+                                    merged_oper,
+                                );
+                        }
+                    }
+                    Function(msid, fsid, _) => {
+                        let module_env = &self.func_target.global_env().get_module(*msid);
+                        // Vector functions are handled separately
+                        if !module_env.is_std_vector() && !module_env.is_table() {
+                            for (i, src) in srcs.iter().enumerate() {
+                                let cur_oper = global_state
+                                    .get_temp_index_oper(cur_mid, cur_fid, *src, baseline_flag)
+                                    .unwrap();
+                                let callee_oper = global_state
+                                    .get_temp_index_oper(*msid, *fsid, i, true)
+                                    .unwrap();
+
+                                if self.check_conflict(cur_oper, callee_oper) {
+                                    self.func_target.func_env.module_env.env.error(
+                                        &self.func_target.get_bytecode_loc(*id),
+                                        CONFLICT_ERROR_MSG,
+                                    );
+                                } else {
+                                    let merged = cur_oper.merge(callee_oper);
+                                    if merged != *cur_oper || merged != *callee_oper {
+                                        state.changed = true;
+                                    }
+                                    *global_state
+                                        .get_mut_temp_index_oper(
+                                            cur_mid,
+                                            cur_fid,
+                                            *src,
+                                            baseline_flag,
+                                        )
+                                        .unwrap() = merged;
+                                    *global_state
+                                        .get_mut_temp_index_oper(*msid, *fsid, i, true)
+                                        .unwrap() = merged;
+                                }
+                            }
+                            for (i, dest) in dests.iter().enumerate() {
+                                let cur_oper = global_state
+                                    .get_temp_index_oper(cur_mid, cur_fid, *dest, baseline_flag)
+                                    .unwrap();
+                                let callee_oper = global_state
+                                    .get_ret_map()
+                                    .get(&(*msid, *fsid))
+                                    .unwrap()
+                                    .get(&i)
+                                    .unwrap();
+                                if self.check_conflict(cur_oper, callee_oper) {
+                                    self.func_target.func_env.module_env.env.error(
+                                        &self.func_target.get_bytecode_loc(*id),
+                                        CONFLICT_ERROR_MSG,
+                                    );
+                                } else {
+                                    let merged = cur_oper.merge(callee_oper);
+                                    if merged != *cur_oper || merged != *callee_oper {
+                                        state.changed = true;
+                                    }
+                                    *global_state
+                                        .get_mut_temp_index_oper(
+                                            cur_mid,
+                                            cur_fid,
+                                            *dest,
+                                            baseline_flag,
+                                        )
+                                        .unwrap() = merged;
+                                    global_state
+                                        .get_mut_ret_map()
+                                        .get_mut(&(*msid, *fsid))
+                                        .unwrap()
+                                        .insert(i, merged);
+                                }
+                            }
+                        } else {
+                            let callee = module_env.get_function(*fsid);
+                            let callee_name = callee.get_name_str();
+                            let check_and_update_bitwise =
+                                |idx: &TempIndex,
+                                 global_state: &mut GlobalNumberOperationState,
+                                 state: &mut NumberOperationState| {
+                                    let cur_oper = global_state
+                                        .get_temp_index_oper(cur_mid, cur_fid, *idx, baseline_flag)
+                                        .unwrap();
+
+                                    if self.check_conflict(cur_oper, &Bitwise) {
+                                        self.func_target.func_env.module_env.env.error(
+                                            &self.func_target.get_bytecode_loc(*id),
+                                            CONFLICT_ERROR_MSG,
+                                        );
+                                    } else if *cur_oper != Bitwise {
+                                        state.changed = true;
+                                        *global_state
+                                            .get_mut_temp_index_oper(
+                                                cur_mid,
+                                                cur_fid,
+                                                *idx,
+                                                baseline_flag,
+                                            )
+                                            .unwrap() = Bitwise;
+                                    }
+                                };
+                            if !srcs.is_empty() {
+                                // First element
+                                let first_oper = global_state
+                                    .get_temp_index_oper(cur_mid, cur_fid, srcs[0], baseline_flag)
+                                    .unwrap();
+                                // Bitwise is specified explicitly in the fun or struct spec
+                                if vector_table_funs_name_propogate_to_dest(&callee_name) {
+                                    if *first_oper == Bitwise {
+                                        // Do not consider the method remove_return_key where the first return value is k
+                                        for dest in dests.iter() {
+                                            check_and_update_bitwise(
+                                                dest,
+                                                &mut global_state,
+                                                state,
+                                            );
+                                        }
+                                    }
+                                } else {
+                                    let mut second_oper = first_oper;
+                                    let mut src_idx = 0;
+                                    if module_env.is_std_vector()
+                                        && vector_funs_name_propogate_to_srcs(&callee_name)
+                                    {
+                                        assert!(srcs.len() > 1);
+                                        second_oper = global_state
+                                            .get_temp_index_oper(
+                                                cur_mid,
+                                                cur_fid,
+                                                srcs[1],
+                                                baseline_flag,
+                                            )
+                                            .unwrap();
+                                        src_idx = 1;
+                                    } else if table_funs_name_propogate_to_srcs(&callee_name) {
+                                        assert!(srcs.len() > 2);
+                                        second_oper = global_state
+                                            .get_temp_index_oper(
+                                                cur_mid,
+                                                cur_fid,
+                                                srcs[2],
+                                                baseline_flag,
+                                            )
+                                            .unwrap();
+                                        src_idx = 2;
+                                    }
+                                    if *first_oper == Bitwise || *second_oper == Bitwise {
+                                        check_and_update_bitwise(
+                                            &srcs[0],
+                                            &mut global_state,
+                                            state,
+                                        );
+                                        check_and_update_bitwise(
+                                            &srcs[src_idx],
+                                            &mut global_state,
+                                            state,
+                                        );
+                                    }
+                                }
+                            } // empty, do nothing
+                        }
+                    }
+                    _ => {}
+                }
+            }
+            Prop(id, _, exp) => {
+                self.handle_exp(*id, exp, &mut global_state, state);
+            }
+            _ => {}
+        }
+        self.func_target.global_env().set_extension(global_state);
+    }
+}
+
+impl<'a> DataflowAnalysis for NumberOperationAnalysis<'a> {}
+
+impl AbstractDomain for NumberOperationState {
+    fn join(&mut self, other: &Self) -> JoinResult {
+        let mut result = JoinResult::Unchanged;
+        self.changed = false;
+        if other.changed {
+            result = JoinResult::Changed;
+        }
+        result
+    }
+}
diff --git a/language/move-prover/bytecode/src/options.rs b/language/move-prover/bytecode/src/options.rs
index 2eb63c8bcc..822f127ee2 100644
--- a/language/move-prover/bytecode/src/options.rs
+++ b/language/move-prover/bytecode/src/options.rs
@@ -82,6 +82,13 @@ pub struct ProverOptions {
     pub unconditional_abort_as_inconsistency: bool,
     /// Whether to run the transformation passes for concrete interpretation (instead of proving)
     pub for_interpretation: bool,
+    /// Whether to skip loop analysis.
+    pub skip_loop_analysis: bool,
+    /// Optional names of native methods (qualified with module name, e.g., m::foo) implementing
+    /// mutable borrow semantics
+    pub borrow_natives: Vec<String>,
+    /// Whether to ban convertion from int to bv at the boogie backend
+    pub ban_int_2_bv: bool,
 }
 
 // add custom struct for mutation options
@@ -113,6 +120,9 @@ impl Default for ProverOptions {
             check_inconsistency: false,
             unconditional_abort_as_inconsistency: false,
             for_interpretation: false,
+            skip_loop_analysis: false,
+            borrow_natives: vec![],
+            ban_int_2_bv: false,
         }
     }
 }
diff --git a/language/move-prover/bytecode/src/packed_types_analysis.rs b/language/move-prover/bytecode/src/packed_types_analysis.rs
index 4bbea4b1cf..11e401f8f3 100644
--- a/language/move-prover/bytecode/src/packed_types_analysis.rs
+++ b/language/move-prover/bytecode/src/packed_types_analysis.rs
@@ -2,6 +2,15 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use std::collections::BTreeSet;
+
+use move_binary_format::file_format::CodeOffset;
+use move_core_types::language_storage::{StructTag, TypeTag};
+use move_model::{
+    model::{FunctionEnv, GlobalEnv},
+    ty::Type,
+};
+
 use crate::{
     compositional_analysis::{CompositionalAnalysis, SummaryCache},
     dataflow_analysis::{DataflowAnalysis, TransferFunctions},
@@ -10,13 +19,6 @@ use crate::{
     function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant},
     stackless_bytecode::{Bytecode, Operation},
 };
-use move_binary_format::file_format::CodeOffset;
-use move_core_types::language_storage::{StructTag, TypeTag};
-use move_model::{
-    model::{FunctionEnv, GlobalEnv},
-    ty::Type,
-};
-use std::collections::BTreeSet;
 
 /// Get all closed types that may be packed by (1) genesis and (2) all transaction scripts.
 /// This makes some simplifying assumptions that are not correct in general, but hold for the
@@ -56,7 +58,7 @@ pub fn get_packed_types(
                             for coin_ty in &coin_types {
                                 match open_ty.instantiate(vec![coin_ty.clone()].as_slice()).into_type_tag(env) {
                                     Some(TypeTag::Struct(s)) =>     {
-                                        packed_types.insert(s);
+                                        packed_types.insert(*s);
                                     }
                                     _ => panic!("Invariant violation: failed to specialize tx script open type {:?} into struct", open_ty),
                                 }
@@ -137,12 +139,13 @@ impl<'a> TransferFunctions for PackedTypesAnalysis<'a> {
                             } else if let Some(TypeTag::Struct(s)) =
                                 specialized_ty.into_type_tag(self.cache.global_env())
                             {
-                                state.closed_types.insert(s);
+                                state.closed_types.insert(*s);
                             } else {
                                 panic!("Invariant violation: struct type {:?} became non-struct type after substitution", open_ty)
                             }
                         }
                     }
+                    // TODO(mengxu, sam): fix the recursive function case
                 }
                 OpaqueCallBegin(_, _, _) | OpaqueCallEnd(_, _, _) => {
                     // skip
@@ -175,15 +178,18 @@ impl FunctionTargetProcessor for PackedTypesProcessor {
     fn process(
         &self,
         targets: &mut FunctionTargetsHolder,
-        func_env: &FunctionEnv<'_>,
+        func_env: &FunctionEnv,
         mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         let initial_state = PackedTypesState::default();
         let fun_target = FunctionTarget::new(func_env, &data);
         let cache = SummaryCache::new(targets, func_env.module_env.env);
         let analysis = PackedTypesAnalysis { cache };
         let summary = analysis.summarize(&fun_target, initial_state);
-        data.annotations.set(summary);
+        // TODO(mengxu, sam): recursion seems to have an impact on how this analysis are conducted,
+        // resolve the TODO item above in the code and update the fixedpoint calculation logic here.
+        data.annotations.set(summary, true);
         data
     }
 
diff --git a/language/move-prover/bytecode/src/pipeline_factory.rs b/language/move-prover/bytecode/src/pipeline_factory.rs
index de97f2d4c6..95083f159c 100644
--- a/language/move-prover/bytecode/src/pipeline_factory.rs
+++ b/language/move-prover/bytecode/src/pipeline_factory.rs
@@ -18,6 +18,7 @@ use crate::{
     mono_analysis::MonoAnalysisProcessor,
     mut_ref_instrumentation::MutRefInstrumenter,
     mutation_tester::MutationTester,
+    number_operation_analysis::NumberOperationProcessor,
     options::ProverOptions,
     reaching_def_analysis::ReachingDefProcessor,
     spec_instrumentation::SpecInstrumentationProcessor,
@@ -35,12 +36,18 @@ pub fn default_pipeline_with_options(options: &ProverOptions) -> FunctionTargetP
         MutRefInstrumenter::new(),
         ReachingDefProcessor::new(),
         LiveVarAnalysisProcessor::new(),
-        BorrowAnalysisProcessor::new(),
+        BorrowAnalysisProcessor::new_borrow_natives(options.borrow_natives.clone()),
         MemoryInstrumentationProcessor::new(),
         CleanAndOptimizeProcessor::new(),
         UsageProcessor::new(),
         VerificationAnalysisProcessor::new(),
-        LoopAnalysisProcessor::new(),
+    ];
+
+    if !options.skip_loop_analysis {
+        processors.push(LoopAnalysisProcessor::new());
+    }
+
+    processors.append(&mut vec![
         // spec instrumentation
         SpecInstrumentationProcessor::new(),
         GlobalInvariantAnalysisProcessor::new(),
@@ -49,7 +56,7 @@ pub fn default_pipeline_with_options(options: &ProverOptions) -> FunctionTargetP
         DataInvariantInstrumentationProcessor::new(),
         // monomorphization
         MonoAnalysisProcessor::new(),
-    ];
+    ]);
 
     if options.mutation {
         // pass which may do nothing
@@ -61,6 +68,10 @@ pub fn default_pipeline_with_options(options: &ProverOptions) -> FunctionTargetP
         processors.push(InconsistencyCheckInstrumenter::new());
     }
 
+    if !options.for_interpretation {
+        processors.push(NumberOperationProcessor::new());
+    }
+
     let mut res = FunctionTargetPipeline::default();
     for p in processors {
         res.add_processor(p);
diff --git a/language/move-prover/bytecode/src/reaching_def_analysis.rs b/language/move-prover/bytecode/src/reaching_def_analysis.rs
index 0c3db2823a..334c83f7e7 100644
--- a/language/move-prover/bytecode/src/reaching_def_analysis.rs
+++ b/language/move-prover/bytecode/src/reaching_def_analysis.rs
@@ -7,6 +7,13 @@
 // This analysis and transformation only propagates definitions, leaving dead assignments
 // in the code. The subsequent livevar_analysis takes care of removing those.
 
+use std::collections::{BTreeMap, BTreeSet};
+
+use itertools::Itertools;
+
+use move_binary_format::file_format::CodeOffset;
+use move_model::{ast::TempIndex, model::FunctionEnv};
+
 use crate::{
     dataflow_analysis::{DataflowAnalysis, TransferFunctions},
     dataflow_domains::{AbstractDomain, JoinResult},
@@ -15,10 +22,6 @@ use crate::{
     stackless_bytecode::{AbortAction, BorrowNode, Bytecode, Operation},
     stackless_control_flow_graph::StacklessControlFlowGraph,
 };
-use itertools::Itertools;
-use move_binary_format::file_format::CodeOffset;
-use move_model::{ast::TempIndex, model::FunctionEnv};
-use std::collections::{BTreeMap, BTreeSet};
 
 /// The reaching definitions we are capturing. Currently we only capture
 /// aliases (assignment).
@@ -27,49 +30,65 @@ pub enum Def {
     Alias(TempIndex),
 }
 
+type DefMap = BTreeMap<TempIndex, BTreeSet<Def>>;
+type HavocSet = BTreeSet<TempIndex>;
+
+#[derive(Debug, Clone, Eq, PartialEq, PartialOrd, Default)]
+pub struct ReachingDefState {
+    pub map: DefMap,
+    pub havoced: HavocSet,
+}
+
 /// The annotation for reaching definitions. For each code position, we have a map of local
 /// indices to the set of definitions reaching the code position.
 #[derive(Default)]
-pub struct ReachingDefAnnotation(BTreeMap<CodeOffset, BTreeMap<TempIndex, BTreeSet<Def>>>);
+pub struct ReachingDefAnnotation(BTreeMap<CodeOffset, ReachingDefState>);
 
 pub struct ReachingDefProcessor {}
 
-type DefMap = BTreeMap<TempIndex, BTreeSet<Def>>;
-
 impl ReachingDefProcessor {
     pub fn new() -> Box<Self> {
         Box::new(ReachingDefProcessor {})
     }
 
     /// Returns Some(temp, def) if temp has a unique reaching definition and None otherwise.
-    fn get_unique_def(temp: TempIndex, defs: &BTreeSet<Def>) -> Option<(TempIndex, TempIndex)> {
+    fn get_unique_def(
+        temp: TempIndex,
+        defs: &BTreeSet<Def>,
+        havoc_vars: &HavocSet,
+    ) -> Option<(TempIndex, TempIndex)> {
         if defs.len() != 1 {
             return None;
         }
         let Def::Alias(def) = defs.iter().next().unwrap();
+        if havoc_vars.contains(def) {
+            return None;
+        }
         Some((temp, *def))
     }
 
     /// Gets the propagated local resolving aliases using the reaching definitions.
-    fn get_propagated_local(temp: TempIndex, reaching_defs: &DefMap) -> TempIndex {
+    fn get_propagated_local(temp: TempIndex, state: &ReachingDefState) -> TempIndex {
         // For being robust, we protect this function against cycles in alias definitions. If
         // a cycle is detected, alias resolution stops.
         fn get(
             temp: TempIndex,
-            reaching_defs: &DefMap,
+            state: &ReachingDefState,
             visited: &mut BTreeSet<TempIndex>,
         ) -> TempIndex {
-            if let Some(defs) = reaching_defs.get(&temp) {
-                if let Some((_, def_temp)) = ReachingDefProcessor::get_unique_def(temp, defs) {
+            if let Some(defs) = state.map.get(&temp) {
+                if let Some((_, def_temp)) =
+                    ReachingDefProcessor::get_unique_def(temp, defs, &state.havoced)
+                {
                     if visited.insert(def_temp) {
-                        return get(def_temp, reaching_defs, visited);
+                        return get(def_temp, state, visited);
                     }
                 }
             }
             temp
         }
         let mut visited = BTreeSet::new();
-        get(temp, reaching_defs, &mut visited)
+        get(temp, state, &mut visited)
     }
 
     /// Perform copy propagation based on reaching definitions analysis results.
@@ -78,11 +97,12 @@ impl ReachingDefProcessor {
         code: Vec<Bytecode>,
         defs: &ReachingDefAnnotation,
     ) -> Vec<Bytecode> {
+        let default_state = ReachingDefState::default();
+
         let mut res = vec![];
         for (pc, bytecode) in code.into_iter().enumerate() {
-            let no_defs = BTreeMap::new();
-            let reaching_defs = defs.0.get(&(pc as CodeOffset)).unwrap_or(&no_defs);
-            let mut propagate = |local| Self::get_propagated_local(local, reaching_defs);
+            let state = defs.0.get(&(pc as CodeOffset)).unwrap_or(&default_state);
+            let mut propagate = |local| Self::get_propagated_local(local, state);
             res.push(bytecode.remap_src_vars(target, &mut propagate));
         }
         res
@@ -109,8 +129,9 @@ impl FunctionTargetProcessor for ReachingDefProcessor {
     fn process(
         &self,
         _targets: &mut FunctionTargetsHolder,
-        func_env: &FunctionEnv<'_>,
+        func_env: &FunctionEnv,
         mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         if !func_env.is_native() {
             let cfg = StacklessControlFlowGraph::new_forward(&data.code);
@@ -121,17 +142,18 @@ impl FunctionTargetProcessor for ReachingDefProcessor {
             let block_state_map = analyzer.analyze_function(
                 ReachingDefState {
                     map: BTreeMap::new(),
+                    havoced: BTreeSet::new(),
                 },
                 &data.code,
                 &cfg,
             );
-            let defs =
+            let per_bytecode_state =
                 analyzer.state_per_instruction(block_state_map, &data.code, &cfg, |before, _| {
-                    before.map.clone()
+                    before.clone()
                 });
 
             // Run copy propagation transformation.
-            let annotations = ReachingDefAnnotation(defs);
+            let annotations = ReachingDefAnnotation(per_bytecode_state);
             let code = std::mem::take(&mut data.code);
             let target = FunctionTarget::new(func_env, &data);
             let new_code = Self::copy_propagation(&target, code, &annotations);
@@ -155,11 +177,6 @@ struct ReachingDefAnalysis<'a> {
     borrowed_locals: BTreeSet<TempIndex>,
 }
 
-#[derive(Debug, Clone, Eq, PartialEq, PartialOrd)]
-struct ReachingDefState {
-    map: BTreeMap<TempIndex, BTreeSet<Def>>,
-}
-
 impl<'a> ReachingDefAnalysis<'a> {}
 
 impl<'a> TransferFunctions for ReachingDefAnalysis<'a> {
@@ -181,15 +198,23 @@ impl<'a> TransferFunctions for ReachingDefAnalysis<'a> {
                 state.kill(*dest);
             }
             Call(_, dests, oper, _, on_abort) => {
-                if let WriteBack(LocalRoot(dest), ..) = oper {
-                    state.kill(*dest);
-                }
+                // generic kills
                 for dest in dests {
                     state.kill(*dest);
                 }
                 if let Some(AbortAction(_, dest)) = on_abort {
                     state.kill(*dest);
                 }
+                // op-specific actions
+                match oper {
+                    WriteBack(LocalRoot(local_root), ..) => {
+                        state.kill(*local_root);
+                    }
+                    Havoc(_) => {
+                        state.havoc(dests[0]);
+                    }
+                    _ => (),
+                }
             }
             _ => {}
         }
@@ -222,14 +247,27 @@ impl AbstractDomain for ReachingDefState {
 
 impl ReachingDefState {
     fn def_alias(&mut self, dest: TempIndex, src: TempIndex) {
-        let set = self.map.entry(dest).or_insert_with(BTreeSet::new);
-        // Kill previous definitions.
-        set.clear();
-        set.insert(Def::Alias(src));
+        // ensure that the previous def is killed
+        assert!(!self.map.contains_key(&dest));
+
+        // cascade the definition
+        for defs in self.map.values_mut() {
+            if defs.contains(&Def::Alias(dest)) {
+                defs.insert(Def::Alias(src));
+            }
+        }
+
+        // update the new alias
+        self.map.entry(dest).or_default().insert(Def::Alias(src));
     }
 
     fn kill(&mut self, dest: TempIndex) {
         self.map.remove(&dest);
+        self.havoced.remove(&dest);
+    }
+
+    fn havoc(&mut self, dest: TempIndex) {
+        self.havoced.insert(dest);
     }
 }
 
@@ -246,6 +284,7 @@ pub fn format_reaching_def_annotation(
     {
         if let Some(map_at) = map.get(&code_offset) {
             let mut res = map_at
+                .map
                 .iter()
                 .map(|(idx, defs)| {
                     let name = target.get_local_name(*idx);
@@ -255,10 +294,17 @@ pub fn format_reaching_def_annotation(
                         defs.iter()
                             .map(|def| {
                                 match def {
-                                    Def::Alias(a) => format!(
-                                        "{}",
-                                        target.get_local_name(*a).display(target.symbol_pool())
-                                    ),
+                                    Def::Alias(a) => {
+                                        let local_name = format!(
+                                            "{}",
+                                            target.get_local_name(*a).display(target.symbol_pool())
+                                        );
+                                        if map_at.havoced.contains(a) {
+                                            format!("{}, {}*", local_name, local_name)
+                                        } else {
+                                            local_name
+                                        }
+                                    }
                                 }
                             })
                             .join(", ")
diff --git a/language/move-prover/bytecode/src/read_write_set_analysis.rs b/language/move-prover/bytecode/src/read_write_set_analysis.rs
index a400abd3c4..8e859f3958 100644
--- a/language/move-prover/bytecode/src/read_write_set_analysis.rs
+++ b/language/move-prover/bytecode/src/read_write_set_analysis.rs
@@ -10,16 +10,8 @@
 //! current state. This logic (implemented in `apply_summary`) is by far the most complex part of themove
 //! analysis.
 
-use crate::{
-    access_path::{AbsAddr, AccessPath, AccessPathMap, Addr, FootprintDomain, Offset, Root},
-    access_path_trie::AccessPathTrie,
-    compositional_analysis::{CompositionalAnalysis, SummaryCache},
-    dataflow_analysis::{DataflowAnalysis, TransferFunctions},
-    dataflow_domains::{AbstractDomain, JoinResult},
-    function_target::{FunctionData, FunctionTarget},
-    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant},
-    stackless_bytecode::{Bytecode, Constant, Operation},
-};
+use std::{fmt, fmt::Formatter};
+
 use move_binary_format::file_format::CodeOffset;
 use move_core_types::language_storage::TypeTag;
 use move_model::{
@@ -31,14 +23,24 @@ use move_read_write_set_types::{
     Access, AccessPath as RWAccessPath, Offset as RWOffset, ReadWriteSet, Root as RWRoot,
     RootAddress as RWRootAddress,
 };
-use std::{fmt, fmt::Formatter};
+
+use crate::{
+    access_path::{AbsAddr, AccessPath, AccessPathMap, Addr, FootprintDomain, Offset, Root},
+    access_path_trie::AccessPathTrie,
+    compositional_analysis::{CompositionalAnalysis, SummaryCache},
+    dataflow_analysis::{DataflowAnalysis, TransferFunctions},
+    dataflow_domains::{AbstractDomain, JoinResult},
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant},
+    stackless_bytecode::{Bytecode, Constant, Operation},
+};
 
 // =================================================================================================
 // Data Model
 
 /// A record of the glocals and locals accessed by the current procedure + the address values stored
 /// by locals or globals
-#[derive(Debug, Clone, Eq, PartialOrd, PartialEq)]
+#[derive(Debug, Clone, Eq, PartialOrd, PartialEq, Default)]
 pub struct ReadWriteSetState {
     /// memory accessed so far
     accesses: AccessPathTrie<Access>,
@@ -521,6 +523,9 @@ impl<'a> TransferFunctions for ReadWriteSetAnalysis<'a> {
                 OpaqueCallBegin(_, _, _) | OpaqueCallEnd(_, _, _) => {
                     // skip
                 }
+                Uninit => {
+                    // do nothing, this marks a reference (args[0]) but the ref is only defined later
+                }
                 Destroy => state.locals.remove_local(args[0], func_env),
                 Eq | Neq => {
                     // These operations read reference types passed to them. Add Access::Read's for both operands
@@ -681,6 +686,10 @@ fn call_native_function(
             }
         }
         ("vector", "empty") | ("vector", "destroy_empty") | ("vector", "reverse") => (),
+        ("string", "internal_check_utf8")
+        | ("string", "internal_is_char_boundary")
+        | ("string", "internal_sub_string")
+        | ("string", "internal_index_of") => (),
         ("event", "write_to_event_store") => (),
         ("hash", "sha3_256") | ("hash", "sha2_256") => (),
         ("Signature", "ed25519_validate_pubkey") | ("Signature", "ed25519_verify") => (),
@@ -732,8 +741,9 @@ impl FunctionTargetProcessor for ReadWriteSetProcessor {
     fn process(
         &self,
         targets: &mut FunctionTargetsHolder,
-        func_env: &FunctionEnv<'_>,
+        func_env: &FunctionEnv,
         mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         let fun_target = FunctionTarget::new(func_env, &data);
         let mut initial_state = ReadWriteSetState::default();
@@ -748,7 +758,9 @@ impl FunctionTargetProcessor for ReadWriteSetProcessor {
         let cache = SummaryCache::new(targets, func_env.module_env.env);
         let analysis = ReadWriteSetAnalysis { cache, func_env };
         let summary = analysis.summarize(&fun_target, initial_state);
-        data.annotations.set(summary);
+        // TODO(mengxu, sam): recursion seems to have an impact on how this analysis are conducted,
+        // revisit the code logic and update the fixedpoint calculation logic here.
+        data.annotations.set(summary, true);
         data
     }
 
@@ -815,15 +827,6 @@ impl<'a> fmt::Display for ReadWriteSetStateDisplay<'a> {
     }
 }
 
-impl Default for ReadWriteSetState {
-    fn default() -> Self {
-        Self {
-            accesses: AccessPathTrie::default(),
-            locals: AccessPathTrie::default(),
-        }
-    }
-}
-
 // =================================================================================================
 // Converting Infer Result into standalone types
 
diff --git a/language/move-prover/bytecode/src/spec_instrumentation.rs b/language/move-prover/bytecode/src/spec_instrumentation.rs
index 96cb50efdb..7152ca6cdf 100644
--- a/language/move-prover/bytecode/src/spec_instrumentation.rs
+++ b/language/move-prover/bytecode/src/spec_instrumentation.rs
@@ -4,13 +4,20 @@
 
 // Transformation which injects specifications (Move function spec blocks) into the bytecode.
 
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    fmt,
+};
+
 use itertools::Itertools;
 
 use move_model::{
     ast,
-    ast::{ExpData, TempIndex, Value},
+    ast::{Exp, ExpData, TempIndex, Value},
+    exp_generator::ExpGenerator,
     model::{FunId, FunctionEnv, GlobalEnv, Loc, ModuleId, QualifiedId, QualifiedInstId, StructId},
     pragmas::{ABORTS_IF_IS_PARTIAL_PRAGMA, EMITS_IS_PARTIAL_PRAGMA, EMITS_IS_STRICT_PRAGMA},
+    spec_translator::{SpecTranslator, TranslatedSpec},
     ty::{Type, TypeDisplayContext, BOOL_TYPE, NUM_TYPE},
 };
 
@@ -29,15 +36,6 @@ use crate::{
     },
     usage_analysis, verification_analysis,
 };
-use move_model::{
-    ast::Exp,
-    exp_generator::ExpGenerator,
-    spec_translator::{SpecTranslator, TranslatedSpec},
-};
-use std::{
-    collections::{BTreeMap, BTreeSet},
-    fmt,
-};
 
 const REQUIRES_FAILS_MESSAGE: &str = "precondition does not hold at this call";
 const ENSURES_FAILS_MESSAGE: &str = "post-condition does not hold";
@@ -100,8 +98,9 @@ impl FunctionTargetProcessor for SpecInstrumentationProcessor {
     fn process(
         &self,
         targets: &mut FunctionTargetsHolder,
-        fun_env: &FunctionEnv<'_>,
+        fun_env: &FunctionEnv,
         mut data: FunctionData,
+        scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         assert_eq!(data.variant, FunctionVariant::Baseline);
         if fun_env.is_native() || fun_env.is_intrinsic() {
@@ -119,7 +118,8 @@ impl FunctionTargetProcessor for SpecInstrumentationProcessor {
             // out of this data and into the clone.
             let mut verification_data =
                 data.fork(FunctionVariant::Verification(VerificationFlavor::Regular));
-            verification_data = Instrumenter::run(&*options, targets, fun_env, verification_data);
+            verification_data =
+                Instrumenter::run(&options, targets, fun_env, verification_data, scc_opt);
             targets.insert_target_data(
                 &fun_env.get_qualified_id(),
                 verification_data.variant.clone(),
@@ -129,7 +129,7 @@ impl FunctionTargetProcessor for SpecInstrumentationProcessor {
 
         // Instrument baseline variant only if it is inlined.
         if is_inlined {
-            Instrumenter::run(&*options, targets, fun_env, data)
+            Instrumenter::run(&options, targets, fun_env, data, scc_opt)
         } else {
             // Clear code but keep function data stub.
             // TODO(refactoring): the stub is currently still needed because boogie_wrapper
@@ -197,6 +197,7 @@ impl<'a> Instrumenter<'a> {
         targets: &mut FunctionTargetsHolder,
         fun_env: &FunctionEnv<'a>,
         data: FunctionData,
+        scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         // Pre-collect properties in the original function data
         let props: Vec<_> = data
@@ -292,8 +293,8 @@ impl<'a> Instrumenter<'a> {
         let mut data = instrumenter.builder.data;
         let reach_def = ReachingDefProcessor::new();
         let live_vars = LiveVarAnalysisProcessor::new_no_annotate();
-        data = reach_def.process(targets, fun_env, data);
-        live_vars.process(targets, fun_env, data)
+        data = reach_def.process(targets, fun_env, data, scc_opt);
+        live_vars.process(targets, fun_env, data, scc_opt)
     }
 
     fn is_verified(&self) -> bool {
@@ -355,6 +356,20 @@ impl<'a> Instrumenter<'a> {
                 let saved_params = translated_spec.saved_params.clone();
                 self.emit_save_for_old(&saved_params);
             }
+        } else {
+            // The inlined variant may have an inlined spec that used "old" values - these need to
+            // be saved in both cases
+            assert!(
+                verification_analysis::get_info(&FunctionTarget::new(
+                    self.builder.fun_env,
+                    &self.builder.data
+                ))
+                .inlined
+            );
+            for translated_spec in inlined_props.values().map(|(s, _)| s) {
+                let saved_params = translated_spec.saved_params.clone();
+                self.emit_save_for_old(&saved_params);
+            }
         }
 
         // Instrument and generate new code
@@ -450,8 +465,13 @@ impl<'a> Instrumenter<'a> {
                         self.builder.emit(Prop(id, kind, prop));
                     }
                     Some((translated_spec, exp)) => {
-                        self.emit_traces(translated_spec, exp);
-                        self.builder.emit(Prop(id, kind, exp.clone()));
+                        // Logic specifically for generating code of updating global spec variables in the function body
+                        if *exp == prop && !translated_spec.updates.is_empty() {
+                            self.emit_updates(translated_spec);
+                        } else {
+                            self.emit_traces(translated_spec, exp);
+                            self.builder.emit(Prop(id, kind, exp.clone()));
+                        }
                     }
                 }
             }
@@ -622,9 +642,9 @@ impl<'a> Instrumenter<'a> {
                 self.builder.emit_with(|id| {
                     Call(
                         id,
-                        vec![],
-                        Operation::Havoc(HavocKind::MutationValue),
                         vec![*src],
+                        Operation::Havoc(HavocKind::MutationValue),
+                        vec![],
                         None,
                     )
                 });
@@ -660,8 +680,13 @@ impl<'a> Instrumenter<'a> {
                 if let Some(c) = &cond {
                     self.emit_traces(&callee_spec, c);
                 }
+
                 let temp_msg = self.builder.emit_let(msg).0;
-                let temp_handle = self.builder.emit_let(handle).0;
+                // the event handle needs to be let-bound without the reference as we do not want
+                // to create mutable references via Assume(Identical) as it complicates both
+                // the live var analysis and the borrow analysis.
+                let temp_handle = self.builder.emit_let_skip_reference(handle).0;
+
                 let mut temp_list = vec![temp_msg, temp_handle];
                 if let Some(cond) = cond {
                     temp_list.push(self.builder.emit_let(cond).0);
@@ -801,7 +826,11 @@ impl<'a> Instrumenter<'a> {
             .iter()
             .filter(|(_, _, exp)| node_ids.contains(&exp.node_id()));
         for (node_id, kind, exp) in traces {
-            let loc = self.builder.global_env().get_node_loc(*node_id);
+            let env = self.builder.global_env();
+            let loc = env.get_node_loc(*node_id);
+            if !exp.free_vars(env).is_empty() {
+                continue;
+            }
             self.builder.set_loc(loc);
             let temp = if let ExpData::Temporary(_, temp) = exp.as_ref() {
                 *temp
diff --git a/language/move-prover/bytecode/src/stackless_bytecode.rs b/language/move-prover/bytecode/src/stackless_bytecode.rs
index 421958623a..d81d9573b3 100644
--- a/language/move-prover/bytecode/src/stackless_bytecode.rs
+++ b/language/move-prover/bytecode/src/stackless_bytecode.rs
@@ -6,6 +6,7 @@ use crate::function_target::FunctionTarget;
 use ethnum::U256;
 use itertools::Itertools;
 use move_binary_format::file_format::CodeOffset;
+use move_core_types::u256;
 use move_model::{
     ast::{Exp, ExpData, MemoryLabel, TempIndex, TraceKind},
     exp_rewriter::{ExpRewriter, ExpRewriterFunctions, RewriteTarget},
@@ -90,9 +91,19 @@ pub enum Constant {
     U8(u8),
     U64(u64),
     U128(u128),
-    U256(U256),
     Address(BigUint),
     ByteArray(Vec<u8>),
+    AddressArray(Vec<BigUint>), // TODO: merge AddressArray to Vector type in the futureq
+    Vector(Vec<Constant>),
+    U16(u16),
+    U32(u32),
+    U256(U256),
+}
+
+impl From<&u256::U256> for Constant {
+    fn from(n: &u256::U256) -> Constant {
+        Constant::U256(U256::from(n))
+    }
 }
 
 /// An operation -- target of a call. This contains user functions, builtin functions, and
@@ -128,6 +139,7 @@ pub enum Operation {
     GetGlobal(ModuleId, StructId, Vec<Type>),
 
     // Builtins
+    Uninit,
     Destroy,
     ReadRef,
     WriteRef,
@@ -145,6 +157,8 @@ pub enum Operation {
 
     // Unary
     CastU8,
+    CastU16,
+    CastU32,
     CastU64,
     CastU128,
     Not,
@@ -199,6 +213,7 @@ impl Operation {
             Operation::BorrowGlobal(_, _, _) => true,
             Operation::GetField(_, _, _, _) => false,
             Operation::GetGlobal(_, _, _) => true,
+            Operation::Uninit => false,
             Operation::Destroy => false,
             Operation::ReadRef => false,
             Operation::WriteRef => false,
@@ -212,6 +227,8 @@ impl Operation {
             Operation::UnpackRefDeep => false,
             Operation::PackRefDeep => false,
             Operation::CastU8 => true,
+            Operation::CastU16 => true,
+            Operation::CastU32 => true,
             Operation::CastU64 => true,
             Operation::CastU128 => true,
             Operation::CastU256 => true,
@@ -224,8 +241,8 @@ impl Operation {
             Operation::BitOr => false,
             Operation::BitAnd => false,
             Operation::Xor => false,
-            Operation::Shl => false,
-            Operation::Shr => false,
+            Operation::Shl => true,
+            Operation::Shr => true,
             Operation::Lt => false,
             Operation::Gt => false,
             Operation::Le => false,
@@ -273,6 +290,17 @@ impl BorrowNode {
     }
 }
 
+#[derive(Debug, Clone, Eq, Ord, PartialEq, PartialOrd)]
+/// A type of index borrow edge
+pub enum IndexEdgeKind {
+    /// vector operations support
+    Vector,
+    /// table operations support
+    Table,
+    /// support for a custom native function with a given name
+    Custom(String),
+}
+
 /// A borrow edge.
 #[derive(Debug, Clone, Eq, Ord, PartialEq, PartialOrd)]
 pub enum BorrowEdge {
@@ -281,7 +309,7 @@ pub enum BorrowEdge {
     /// Field borrow with static offset.
     Field(QualifiedInstId<StructId>, usize),
     /// Vector borrow with dynamic index.
-    Index,
+    Index(IndexEdgeKind),
     /// Composed sequence of edges.
     Hyper(Vec<BorrowEdge>),
 }
@@ -969,6 +997,9 @@ impl<'env> fmt::Display for OperationDisplay<'env> {
             }
 
             // Builtins
+            Uninit => {
+                write!(f, "uninit")?;
+            }
             Destroy => {
                 write!(f, "destroy")?;
             }
@@ -1024,6 +1055,8 @@ impl<'env> fmt::Display for OperationDisplay<'env> {
             }
             // Unary
             CastU8 => write!(f, "(u8)")?,
+            CastU16 => write!(f, "(u16)")?,
+            CastU32 => write!(f, "(u32)")?,
             CastU64 => write!(f, "(u64)")?,
             CastU128 => write!(f, "(u128)")?,
             CastU256 => write!(f, "(u256)")?,
@@ -1117,6 +1150,16 @@ impl fmt::Display for Constant {
             U256(x) => write!(f, "{}", x)?,
             Address(x) => write!(f, "0x{}", x.to_str_radix(16))?,
             ByteArray(x) => write!(f, "{:?}", x)?,
+            AddressArray(x) => write!(
+                f,
+                "{:?}",
+                x.iter()
+                    .map(|v| format!("0x{}", v.to_str_radix(16)))
+                    .collect_vec()
+            )?,
+            Vector(x) => write!(f, "{:?}", x.iter().map(|v| format!("{}", v)).collect_vec())?,
+            U16(x) => write!(f, "{}", x)?,
+            U32(x) => write!(f, "{}", x)?,
         }
         Ok(())
     }
@@ -1196,7 +1239,7 @@ impl<'a> std::fmt::Display for BorrowEdgeDisplay<'a> {
                     field_type.display(&tctx),
                 )
             }
-            Index => write!(f, "[]"),
+            Index(_) => write!(f, "[]"),
             Direct => write!(f, "@"),
             Hyper(es) => {
                 write!(
diff --git a/language/move-prover/bytecode/src/stackless_bytecode_generator.rs b/language/move-prover/bytecode/src/stackless_bytecode_generator.rs
index 4efc1dcab4..03cad999ef 100644
--- a/language/move-prover/bytecode/src/stackless_bytecode_generator.rs
+++ b/language/move-prover/bytecode/src/stackless_bytecode_generator.rs
@@ -27,6 +27,7 @@ use move_model::{
     model::{FunId, FunctionEnv, Loc, ModuleId, StructId},
     ty::{PrimitiveType, Type},
 };
+use num::BigUint;
 use std::{
     collections::{BTreeMap, BTreeSet},
     convert::TryInto,
@@ -181,7 +182,11 @@ impl<'a> StacklessBytecodeGenerator<'a> {
                         self.loop_invariants.insert(attr_id);
                         PropKind::Assert
                     }
-                    _ => panic!("unsupported spec condition in code"),
+                    // Updating global spec variables are translated to Assume, which will be replaced when instrumenting the spec
+                    ConditionKind::Update => PropKind::Assume,
+                    _ => {
+                        panic!("unsupported spec condition in code")
+                    }
                 };
                 self.code
                     .push(Bytecode::Prop(attr_id, kind, cond.exp.clone()));
@@ -381,6 +386,24 @@ impl<'a> StacklessBytecodeGenerator<'a> {
                 self.temp_count += 1;
             }
 
+            MoveBytecode::LdU16(number) => {
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::U16));
+                self.code
+                    .push(Bytecode::Load(attr_id, temp_index, Constant::U16(*number)));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::LdU32(number) => {
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::U32));
+                self.code
+                    .push(Bytecode::Load(attr_id, temp_index, Constant::U32(*number)));
+                self.temp_count += 1;
+            }
+
             MoveBytecode::LdU64(number) => {
                 let temp_index = self.temp_count;
                 self.temp_stack.push(temp_index);
@@ -390,6 +413,15 @@ impl<'a> StacklessBytecodeGenerator<'a> {
                 self.temp_count += 1;
             }
 
+            MoveBytecode::LdU256(number) => {
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::U256));
+                self.code
+                    .push(Bytecode::Load(attr_id, temp_index, Constant::from(number)));
+                self.temp_count += 1;
+            }
+
             MoveBytecode::LdU128(number) => {
                 let temp_index = self.temp_count;
                 self.temp_stack.push(temp_index);
@@ -409,6 +441,26 @@ impl<'a> StacklessBytecodeGenerator<'a> {
                 self.temp_count += 1;
             }
 
+            MoveBytecode::CastU16 => {
+                let operand_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::U16));
+                self.code
+                    .push(mk_unary(Operation::CastU16, temp_index, operand_index));
+                self.temp_count += 1;
+            }
+
+            MoveBytecode::CastU32 => {
+                let operand_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::U32));
+                self.code
+                    .push(mk_unary(Operation::CastU32, temp_index, operand_index));
+                self.temp_count += 1;
+            }
+
             MoveBytecode::CastU64 => {
                 let operand_index = self.temp_stack.pop().unwrap();
                 let temp_index = self.temp_count;
@@ -429,6 +481,16 @@ impl<'a> StacklessBytecodeGenerator<'a> {
                 self.temp_count += 1;
             }
 
+            MoveBytecode::CastU256 => {
+                let operand_index = self.temp_stack.pop().unwrap();
+                let temp_index = self.temp_count;
+                self.temp_stack.push(temp_index);
+                self.local_types.push(Type::Primitive(PrimitiveType::U256));
+                self.code
+                    .push(mk_unary(Operation::CastU256, temp_index, operand_index));
+                self.temp_count += 1;
+            }
+
             MoveBytecode::LdConst(idx) => {
                 let temp_index = self.temp_count;
                 self.temp_stack.push(temp_index);
@@ -1200,14 +1262,26 @@ impl<'a> StacklessBytecodeGenerator<'a> {
                     vec![],
                     None,
                 ));
-                for operand in operands {
-                    self.code.push(Bytecode::Call(
-                        attr_id,
-                        vec![],
-                        mk_vec_function_operation("push_back", vec![ty.clone()]),
-                        vec![temp_index, operand],
-                        None,
+                if !operands.is_empty() {
+                    let mut_ref_index = self.temp_count;
+                    self.local_types.push(Type::Reference(
+                        true,
+                        Box::new(Type::Vector(Box::new(ty.clone()))),
                     ));
+                    self.temp_count += 1;
+
+                    self.code
+                        .push(mk_unary(Operation::BorrowLoc, mut_ref_index, temp_index));
+
+                    for operand in operands {
+                        self.code.push(Bytecode::Call(
+                            attr_id,
+                            vec![],
+                            mk_vec_function_operation("push_back", vec![ty.clone()]),
+                            vec![mut_ref_index, operand],
+                            None,
+                        ));
+                    }
                 }
             }
             MoveBytecode::VecUnpack(sig, n) => {
@@ -1218,15 +1292,29 @@ impl<'a> StacklessBytecodeGenerator<'a> {
                 self.local_types.extend(vec![ty.clone(); n]);
                 self.temp_count += n;
                 self.temp_stack.extend(&temps);
-                for temp in temps {
-                    self.code.push(Bytecode::Call(
-                        attr_id,
-                        vec![temp],
-                        mk_vec_function_operation("pop_back", vec![ty.clone()]),
-                        vec![operand_index],
-                        None,
+
+                if !temps.is_empty() {
+                    let mut_ref_index = self.temp_count;
+                    self.local_types.push(Type::Reference(
+                        true,
+                        Box::new(Type::Vector(Box::new(ty.clone()))),
                     ));
+                    self.temp_count += 1;
+
+                    self.code
+                        .push(mk_unary(Operation::BorrowLoc, mut_ref_index, operand_index));
+
+                    for temp in temps {
+                        self.code.push(Bytecode::Call(
+                            attr_id,
+                            vec![temp],
+                            mk_vec_function_operation("pop_back", vec![ty.clone()]),
+                            vec![mut_ref_index],
+                            None,
+                        ));
+                    }
                 }
+
                 self.code.push(Bytecode::Call(
                     attr_id,
                     vec![],
@@ -1240,20 +1328,42 @@ impl<'a> StacklessBytecodeGenerator<'a> {
 
     fn translate_value(ty: &Type, value: &MoveValue) -> Constant {
         match (ty, &value) {
-            (Type::Vector(inner), MoveValue::Vector(vs)) => {
-                let b = vs
-                    .iter()
-                    .map(|v| match Self::translate_value(inner, v) {
-                        Constant::U8(u) => u,
-                        _ => unimplemented!("Not yet supported constant vector type: {:?}", ty),
-                    })
-                    .collect::<Vec<u8>>();
-                Constant::ByteArray(b)
-            }
+            (Type::Vector(inner), MoveValue::Vector(vs)) => match **inner {
+                Type::Primitive(PrimitiveType::U8) => {
+                    let b = vs
+                        .iter()
+                        .map(|v| match Self::translate_value(inner, v) {
+                            Constant::U8(u) => u,
+                            _ => panic!("Expected u8, but found: {:?}", inner),
+                        })
+                        .collect::<Vec<u8>>();
+                    Constant::ByteArray(b)
+                }
+                Type::Primitive(PrimitiveType::Address) => {
+                    let b = vs
+                        .iter()
+                        .map(|v| match Self::translate_value(inner, v) {
+                            Constant::Address(a) => a,
+                            _ => panic!("Expected address, but found: {:?}", inner),
+                        })
+                        .collect::<Vec<BigUint>>();
+                    Constant::AddressArray(b)
+                }
+                _ => {
+                    let b = vs
+                        .iter()
+                        .map(|v| Self::translate_value(inner, v))
+                        .collect::<Vec<Constant>>();
+                    Constant::Vector(b)
+                }
+            },
             (Type::Primitive(PrimitiveType::Bool), MoveValue::Bool(b)) => Constant::Bool(*b),
             (Type::Primitive(PrimitiveType::U8), MoveValue::U8(b)) => Constant::U8(*b),
+            (Type::Primitive(PrimitiveType::U16), MoveValue::U16(b)) => Constant::U16(*b),
+            (Type::Primitive(PrimitiveType::U32), MoveValue::U32(b)) => Constant::U32(*b),
             (Type::Primitive(PrimitiveType::U64), MoveValue::U64(b)) => Constant::U64(*b),
             (Type::Primitive(PrimitiveType::U128), MoveValue::U128(b)) => Constant::U128(*b),
+            (Type::Primitive(PrimitiveType::U256), MoveValue::U256(b)) => Constant::U256(b.into()),
             (Type::Primitive(PrimitiveType::Address), MoveValue::Address(a)) => {
                 Constant::Address(move_model::addr_to_big_uint(a))
             }
diff --git a/language/move-prover/bytecode/src/stackless_control_flow_graph.rs b/language/move-prover/bytecode/src/stackless_control_flow_graph.rs
index 688c56d4a2..27b2395e8f 100644
--- a/language/move-prover/bytecode/src/stackless_control_flow_graph.rs
+++ b/language/move-prover/bytecode/src/stackless_control_flow_graph.rs
@@ -91,6 +91,45 @@ impl StacklessControlFlowGraph {
         }
     }
 
+    /// Generate a block that contains all the code
+    pub fn one_block(code: &[Bytecode]) -> Self {
+        let mut blocks = Map::new();
+        let mut successors = vec![];
+        let entry_bb = 2 as BlockId;
+        successors.insert(0, entry_bb);
+        successors.insert(1, DUMMY_EXIT);
+        let bb = BlockContent::Basic {
+            lower: 0,
+            upper: code.len() as u16 - 1,
+        };
+        blocks.insert(
+            entry_bb,
+            Block {
+                successors,
+                content: bb,
+            },
+        );
+        blocks.insert(
+            DUMMY_ENTRANCE,
+            Block {
+                successors: vec![entry_bb],
+                content: BlockContent::Dummy,
+            },
+        );
+        blocks.insert(
+            DUMMY_EXIT,
+            Block {
+                successors: Vec::new(),
+                content: BlockContent::Dummy,
+            },
+        );
+        Self {
+            entry_block_id: DUMMY_ENTRANCE,
+            blocks,
+            backward: false,
+        }
+    }
+
     fn collect_blocks(code: &[Bytecode]) -> Map<BlockId, Block> {
         // First go through and collect basic block offsets.
         // Need to do this first in order to handle backwards edges.
diff --git a/language/move-prover/bytecode/src/usage_analysis.rs b/language/move-prover/bytecode/src/usage_analysis.rs
index 888f032643..0cd0659f45 100644
--- a/language/move-prover/bytecode/src/usage_analysis.rs
+++ b/language/move-prover/bytecode/src/usage_analysis.rs
@@ -2,6 +2,18 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use std::{collections::BTreeSet, fmt, fmt::Formatter};
+
+use itertools::Itertools;
+use paste::paste;
+
+use move_binary_format::file_format::CodeOffset;
+use move_model::{
+    ast::{ConditionKind, Spec},
+    model::{FunctionEnv, GlobalEnv, QualifiedId, QualifiedInstId, StructId},
+    ty::Type,
+};
+
 use crate::{
     compositional_analysis::{CompositionalAnalysis, SummaryCache},
     dataflow_analysis::{DataflowAnalysis, TransferFunctions},
@@ -11,17 +23,6 @@ use crate::{
     stackless_bytecode::{BorrowNode, Bytecode, Operation, PropKind},
 };
 
-use move_binary_format::file_format::CodeOffset;
-use move_model::{
-    model::{FunctionEnv, GlobalEnv, QualifiedId, QualifiedInstId, StructId},
-    ty::Type,
-};
-
-use itertools::Itertools;
-use move_model::ast::{ConditionKind, Spec};
-use paste::paste;
-use std::{collections::BTreeSet, fmt, fmt::Formatter};
-
 pub fn get_memory_usage<'env>(target: &FunctionTarget<'env>) -> &'env UsageState {
     target
         .get_annotations()
@@ -299,6 +300,19 @@ impl<'a> MemoryUsageAnalysis<'a> {
                 }
             }
         }
+
+        // Handle memory update of the specs in the function body
+        for impl_spec in spec.on_impl.values() {
+            for cond in &impl_spec.conditions {
+                if matches!(cond.kind, Update) && !cond.additional_exps.is_empty() {
+                    if let Some((mem, _, _)) =
+                        cond.additional_exps[0].extract_ghost_mem_access(self.cache.global_env())
+                    {
+                        state.add_direct_modified(mem);
+                    }
+                }
+            }
+        }
     }
 }
 
@@ -327,11 +341,13 @@ impl FunctionTargetProcessor for UsageProcessor {
     fn process(
         &self,
         targets: &mut FunctionTargetsHolder,
-        func_env: &FunctionEnv<'_>,
+        func_env: &FunctionEnv,
         mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         let summary = Self::analyze(targets, func_env, &data);
-        data.annotations.set(summary);
+        // TODO(mengxu): re-check the code on whether recursion have an impact on the analysis here.
+        data.annotations.set(summary, true);
         data
     }
 
diff --git a/language/move-prover/bytecode/src/verification_analysis.rs b/language/move-prover/bytecode/src/verification_analysis.rs
index 8fa6a7b8ec..c67a486c91 100644
--- a/language/move-prover/bytecode/src/verification_analysis.rs
+++ b/language/move-prover/bytecode/src/verification_analysis.rs
@@ -7,13 +7,14 @@
 //! each function as well as collect information on how these invariants should be handled (i.e.,
 //! checked after bytecode, checked at function exit, or deferred to caller).
 
-use crate::{
-    function_target::{FunctionData, FunctionTarget},
-    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant},
-    options::ProverOptions,
-    usage_analysis,
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    fmt::{self, Formatter},
 };
 
+use codespan_reporting::diagnostic::Severity;
+use itertools::Itertools;
+
 use move_model::{
     ast::GlobalInvariant,
     model::{FunId, FunctionEnv, GlobalEnv, GlobalId, QualifiedId, VerificationScope},
@@ -24,11 +25,11 @@ use move_model::{
     ty::{TypeUnificationAdapter, Variance},
 };
 
-use codespan_reporting::diagnostic::Severity;
-use itertools::Itertools;
-use std::{
-    collections::{BTreeMap, BTreeSet},
-    fmt::{self, Formatter},
+use crate::{
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant},
+    options::ProverOptions,
+    usage_analysis,
 };
 
 /// The annotation for information about verification.
@@ -85,8 +86,9 @@ impl FunctionTargetProcessor for VerificationAnalysisProcessor {
     fn process(
         &self,
         targets: &mut FunctionTargetsHolder,
-        fun_env: &FunctionEnv<'_>,
+        fun_env: &FunctionEnv,
         mut data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         // This function implements the logic to decide whether to verify this function
 
@@ -116,8 +118,7 @@ impl FunctionTargetProcessor for VerificationAnalysisProcessor {
         let inv_analysis = env.get_extension::<InvariantAnalysisData>().unwrap();
         let target_invs: BTreeSet<_> = target_modules
             .iter()
-            .map(|menv| env.get_global_invariants_by_module(menv.get_id()))
-            .flatten()
+            .flat_map(|menv| env.get_global_invariants_by_module(menv.get_id()))
             .collect();
         let inv_relevance = inv_analysis
             .fun_to_inv_map
@@ -166,8 +167,7 @@ impl FunctionTargetProcessor for VerificationAnalysisProcessor {
         let target_invs: BTreeSet<_> = env
             .get_target_modules()
             .iter()
-            .map(|menv| env.get_global_invariants_by_module(menv.get_id()))
-            .flatten()
+            .flat_map(|menv| env.get_global_invariants_by_module(menv.get_id()))
             .collect();
 
         let fmt_inv_ids = |ids: &BTreeSet<GlobalId>| -> String {
@@ -319,8 +319,7 @@ impl FunctionTargetProcessor for VerificationAnalysisProcessor {
         // check for unused invariants defined in the target module
         let all_checked_invariants: BTreeSet<_> = fun_to_inv_map
             .values()
-            .map(|rel| rel.direct_modified.iter())
-            .flatten()
+            .flat_map(|rel| rel.direct_modified.iter())
             .cloned()
             .collect();
         for module_env in env.get_modules() {
@@ -371,7 +370,10 @@ impl VerificationAnalysisProcessor {
         data: &mut FunctionData,
         targets: &mut FunctionTargetsHolder,
     ) {
-        let mut info = data.annotations.get_or_default_mut::<VerificationInfo>();
+        // TODO(mengxu): re-check the treatment of fixedpoint here
+        let mut info = data
+            .annotations
+            .get_or_default_mut::<VerificationInfo>(true);
         if !info.verified {
             info.verified = true;
             Self::mark_callees_inlined(fun_env, targets);
@@ -389,13 +391,25 @@ impl VerificationAnalysisProcessor {
 
         // at this time, we only have the `baseline` variant in the targets
         let variant = FunctionVariant::Baseline;
-        let data = targets
-            .get_data_mut(&fun_env.get_qualified_id(), &variant)
-            .expect("function data defined");
-        let info = data.annotations.get_or_default_mut::<VerificationInfo>();
-        if !info.inlined {
-            info.inlined = true;
-            Self::mark_callees_inlined(fun_env, targets);
+        if let Some(data) = targets.get_data_mut(&fun_env.get_qualified_id(), &variant) {
+            // TODO(mengxu): re-check the treatment of fixedpoint here
+            let info = data
+                .annotations
+                .get_or_default_mut::<VerificationInfo>(true);
+            if !info.inlined {
+                info.inlined = true;
+                Self::mark_callees_inlined(fun_env, targets);
+            }
+        } else {
+            fun_env.module_env.env.error(
+                &fun_env.get_loc(),
+                &format!(
+                    "function `{}` is a recursive function \
+                       (or part of a mutually recursive function group) \
+                       and should be marked as opaque",
+                    fun_env.get_full_name_str()
+                ),
+            );
         }
     }
 
diff --git a/language/move-prover/bytecode/src/verification_analysis_v2.rs b/language/move-prover/bytecode/src/verification_analysis_v2.rs
index 0dfc776a45..33fa359afc 100644
--- a/language/move-prover/bytecode/src/verification_analysis_v2.rs
+++ b/language/move-prover/bytecode/src/verification_analysis_v2.rs
@@ -4,15 +4,11 @@
 
 //! Analysis which computes an annotation for each function whether
 
-use crate::{
-    dataflow_domains::SetDomain,
-    function_target::{FunctionData, FunctionTarget},
-    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant},
-    options::ProverOptions,
-    usage_analysis,
-};
+use std::collections::{BTreeMap, BTreeSet, VecDeque};
+
 use itertools::Itertools;
 use log::debug;
+
 use move_model::{
     model::{FunId, FunctionEnv, GlobalEnv, GlobalId, ModuleEnv, QualifiedId, VerificationScope},
     pragmas::{
@@ -20,7 +16,14 @@ use move_model::{
         DISABLE_INVARIANTS_IN_BODY_PRAGMA, VERIFY_PRAGMA,
     },
 };
-use std::collections::{BTreeMap, BTreeSet, VecDeque};
+
+use crate::{
+    dataflow_domains::SetDomain,
+    function_target::{FunctionData, FunctionTarget},
+    function_target_pipeline::{FunctionTargetProcessor, FunctionTargetsHolder, FunctionVariant},
+    options::ProverOptions,
+    usage_analysis,
+};
 
 /// The annotation for information about verification.
 #[derive(Clone, Default)]
@@ -568,8 +571,9 @@ impl FunctionTargetProcessor for VerificationAnalysisProcessorV2 {
     fn process(
         &self,
         targets: &mut FunctionTargetsHolder,
-        fun_env: &FunctionEnv<'_>,
+        fun_env: &FunctionEnv,
         data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         let global_env = fun_env.module_env.env;
         let fun_id = fun_env.get_qualified_id();
@@ -738,7 +742,7 @@ fn mark_verified(
             .get_data_mut(&actual_env.get_qualified_id(), &variant)
             .expect("function data available")
             .annotations
-            .get_or_default_mut::<VerificationInfoV2>();
+            .get_or_default_mut::<VerificationInfoV2>(true);
         if !info.verified {
             info.verified = true;
             mark_callees_inlined(&actual_env, variant, targets);
@@ -767,7 +771,9 @@ fn mark_inlined(
     let data = targets
         .get_data_mut(&fun_env.get_qualified_id(), &variant)
         .expect("function data defined");
-    let info = data.annotations.get_or_default_mut::<VerificationInfoV2>();
+    let info = data
+        .annotations
+        .get_or_default_mut::<VerificationInfoV2>(true);
     if !info.inlined {
         info.inlined = true;
         mark_callees_inlined(fun_env, variant, targets);
diff --git a/language/move-prover/bytecode/src/well_formed_instrumentation.rs b/language/move-prover/bytecode/src/well_formed_instrumentation.rs
index d8ca7fab98..4f095bc4c1 100644
--- a/language/move-prover/bytecode/src/well_formed_instrumentation.rs
+++ b/language/move-prover/bytecode/src/well_formed_instrumentation.rs
@@ -14,6 +14,15 @@
 //! Because data invariants cannot refer to global memory, they are not relevant for memory
 //! usage, and their injection therefore can happen after this phase.
 
+use num::{BigUint, Zero};
+
+use move_model::{
+    ast::{Operation, QuantKind},
+    exp_generator::ExpGenerator,
+    model::FunctionEnv,
+    ty::BOOL_TYPE,
+};
+
 use crate::{
     function_data_builder::FunctionDataBuilder,
     function_target::FunctionData,
@@ -21,13 +30,6 @@ use crate::{
     stackless_bytecode::PropKind,
     usage_analysis::UsageProcessor,
 };
-use move_model::{
-    ast::{Operation, QuantKind},
-    exp_generator::ExpGenerator,
-    model::FunctionEnv,
-    ty::BOOL_TYPE,
-};
-use num::{BigUint, Zero};
 
 pub struct WellFormedInstrumentationProcessor {}
 
@@ -41,8 +43,9 @@ impl FunctionTargetProcessor for WellFormedInstrumentationProcessor {
     fn process(
         &self,
         targets: &mut FunctionTargetsHolder,
-        fun_env: &FunctionEnv<'_>,
+        fun_env: &FunctionEnv,
         data: FunctionData,
+        _scc_opt: Option<&[FunctionEnv]>,
     ) -> FunctionData {
         if !data.variant.is_verified() {
             // only need to do this for verified functions
@@ -105,8 +108,7 @@ impl FunctionTargetProcessor for WellFormedInstrumentationProcessor {
                         Operation::Global(None),
                         vec![zero_addr],
                     );
-                    let eq_with_init =
-                        builder.mk_bool_call(Operation::Identical, vec![mem_access, mem_val]);
+                    let eq_with_init = builder.mk_identical(mem_access, mem_val);
                     builder.emit_prop(PropKind::Assume, eq_with_init);
                 }
             }
diff --git a/language/move-prover/bytecode/tests/borrow/basic_test.exp b/language/move-prover/bytecode/tests/borrow/basic_test.exp
index 2372575562..b4d7cf99bd 100644
--- a/language/move-prover/bytecode/tests/borrow/basic_test.exp
+++ b/language/move-prover/bytecode/tests/borrow/basic_test.exp
@@ -3,29 +3,25 @@
 [variant baseline]
 fun TestBorrow::test1(): TestBorrow::R {
      var $t0|r: TestBorrow::R
-     var $t1|r_ref: &mut TestBorrow::R
-     var $t2|x_ref: &mut u64
-     var $t3: u64
-     var $t4: TestBorrow::R
-     var $t5: &mut TestBorrow::R
-     var $t6: &mut TestBorrow::R
+     var $t1|x_ref: &mut u64
+     var $t2: u64
+     var $t3: TestBorrow::R
+     var $t4: &mut TestBorrow::R
+     var $t5: &mut u64
+     var $t6: u64
      var $t7: &mut u64
-     var $t8: u64
-     var $t9: &mut u64
-     var $t10: TestBorrow::R
-  0: $t3 := 3
-  1: $t4 := pack TestBorrow::R($t3)
-  2: $t0 := $t4
-  3: $t5 := borrow_local($t0)
-  4: $t1 := $t5
-  5: $t6 := move($t1)
-  6: $t7 := borrow_field<TestBorrow::R>.x($t6)
-  7: $t2 := $t7
-  8: $t8 := 0
-  9: $t9 := move($t2)
- 10: write_ref($t9, $t8)
- 11: $t10 := move($t0)
- 12: return $t10
+     var $t8: TestBorrow::R
+  0: $t2 := 3
+  1: $t3 := pack TestBorrow::R($t2)
+  2: $t0 := $t3
+  3: $t4 := borrow_local($t0)
+  4: $t5 := borrow_field<TestBorrow::R>.x($t4)
+  5: $t1 := $t5
+  6: $t6 := 0
+  7: $t7 := move($t1)
+  8: write_ref($t7, $t6)
+  9: $t8 := move($t0)
+ 10: return $t8
 }
 
 
@@ -42,41 +38,33 @@ fun TestBorrow::test2($t0|x_ref: &mut u64, $t1|v: u64) {
 
 [variant baseline]
 public fun TestBorrow::test3($t0|r_ref: &mut TestBorrow::R, $t1|v: u64) {
-     var $t2|x_ref: &mut u64
-     var $t3: &mut TestBorrow::R
-     var $t4: &mut u64
-     var $t5: &mut u64
-     var $t6: u64
-  0: $t3 := move($t0)
-  1: $t4 := borrow_field<TestBorrow::R>.x($t3)
-  2: $t2 := $t4
-  3: $t5 := move($t2)
-  4: $t6 := move($t1)
-  5: TestBorrow::test2($t5, $t6)
-  6: return ()
+     var $t2: &mut TestBorrow::R
+     var $t3: &mut u64
+     var $t4: u64
+  0: $t2 := move($t0)
+  1: $t3 := borrow_field<TestBorrow::R>.x($t2)
+  2: $t4 := move($t1)
+  3: TestBorrow::test2($t3, $t4)
+  4: return ()
 }
 
 
 [variant baseline]
 fun TestBorrow::test4(): TestBorrow::R {
      var $t0|r: TestBorrow::R
-     var $t1|r_ref: &mut TestBorrow::R
-     var $t2: u64
-     var $t3: TestBorrow::R
-     var $t4: &mut TestBorrow::R
-     var $t5: &mut TestBorrow::R
-     var $t6: u64
-     var $t7: TestBorrow::R
-  0: $t2 := 3
-  1: $t3 := pack TestBorrow::R($t2)
-  2: $t0 := $t3
-  3: $t4 := borrow_local($t0)
-  4: $t1 := $t4
-  5: $t5 := move($t1)
-  6: $t6 := 0
-  7: TestBorrow::test3($t5, $t6)
-  8: $t7 := move($t0)
-  9: return $t7
+     var $t1: u64
+     var $t2: TestBorrow::R
+     var $t3: &mut TestBorrow::R
+     var $t4: u64
+     var $t5: TestBorrow::R
+  0: $t1 := 3
+  1: $t2 := pack TestBorrow::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := 0
+  5: TestBorrow::test3($t3, $t4)
+  6: $t5 := move($t0)
+  7: return $t5
 }
 
 
@@ -93,29 +81,21 @@ public fun TestBorrow::test5($t0|r_ref: &mut TestBorrow::R): &mut u64 {
 [variant baseline]
 fun TestBorrow::test6(): TestBorrow::R {
      var $t0|r: TestBorrow::R
-     var $t1|r_ref: &mut TestBorrow::R
-     var $t2|x_ref: &mut u64
-     var $t3: u64
-     var $t4: TestBorrow::R
-     var $t5: &mut TestBorrow::R
-     var $t6: &mut TestBorrow::R
-     var $t7: &mut u64
-     var $t8: &mut u64
-     var $t9: u64
-     var $t10: TestBorrow::R
-  0: $t3 := 3
-  1: $t4 := pack TestBorrow::R($t3)
-  2: $t0 := $t4
-  3: $t5 := borrow_local($t0)
-  4: $t1 := $t5
-  5: $t6 := move($t1)
-  6: $t7 := TestBorrow::test5($t6)
-  7: $t2 := $t7
-  8: $t8 := move($t2)
-  9: $t9 := 0
- 10: TestBorrow::test2($t8, $t9)
- 11: $t10 := move($t0)
- 12: return $t10
+     var $t1: u64
+     var $t2: TestBorrow::R
+     var $t3: &mut TestBorrow::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestBorrow::R
+  0: $t1 := 3
+  1: $t2 := pack TestBorrow::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := TestBorrow::test5($t3)
+  5: $t5 := 0
+  6: TestBorrow::test2($t4, $t5)
+  7: $t6 := move($t0)
+  8: return $t6
 }
 
 
@@ -144,13 +124,13 @@ fun TestBorrow::test7($t0|b: bool) {
   7: $t3 := $t8
   8: $t9 := move($t0)
   9: if ($t9) goto 10 else goto 16
- 10: label L0
+ 10: label L1
  11: $t10 := move($t3)
  12: destroy($t10)
  13: $t11 := borrow_local($t2)
  14: $t3 := $t11
  15: goto 16
- 16: label L2
+ 16: label L0
  17: $t12 := move($t3)
  18: $t13 := 0
  19: TestBorrow::test3($t12, $t13)
@@ -198,53 +178,55 @@ fun TestBorrow::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestBorrow::R) {
   6: $t10 := borrow_local($t4)
   7: $t5 := $t10
   8: goto 9
-  9: label L7
+  9: label L6
  10: $t11 := 0
  11: $t12 := copy($t1)
  12: $t13 := <($t11, $t12)
- 13: if ($t13) goto 14 else goto 37
- 14: label L0
- 15: $t14 := move($t5)
- 16: destroy($t14)
- 17: $t15 := copy($t1)
- 18: $t16 := 2
- 19: $t17 := /($t15, $t16)
- 20: $t18 := 0
- 21: $t19 := ==($t17, $t18)
- 22: if ($t19) goto 23 else goto 27
- 23: label L3
- 24: $t20 := borrow_local($t3)
- 25: $t5 := $t20
- 26: goto 31
- 27: label L5
- 28: $t21 := borrow_local($t4)
- 29: $t5 := $t21
- 30: goto 31
- 31: label L6
- 32: $t22 := move($t1)
- 33: $t23 := 1
- 34: $t24 := -($t22, $t23)
- 35: $t1 := $t24
- 36: goto 9
- 37: label L2
- 38: $t25 := move($t0)
- 39: if ($t25) goto 40 else goto 47
- 40: label L8
- 41: $t26 := move($t5)
- 42: destroy($t26)
- 43: $t27 := move($t2)
- 44: $t28 := 0
- 45: TestBorrow::test3($t27, $t28)
- 46: goto 54
- 47: label L10
- 48: $t29 := move($t2)
- 49: destroy($t29)
- 50: $t30 := move($t5)
- 51: $t31 := 0
- 52: TestBorrow::test3($t30, $t31)
- 53: goto 54
- 54: label L11
- 55: return ()
+ 13: if ($t13) goto 14 else goto 39
+ 14: label L1
+ 15: goto 16
+ 16: label L2
+ 17: $t14 := move($t5)
+ 18: destroy($t14)
+ 19: $t15 := copy($t1)
+ 20: $t16 := 2
+ 21: $t17 := /($t15, $t16)
+ 22: $t18 := 0
+ 23: $t19 := ==($t17, $t18)
+ 24: if ($t19) goto 25 else goto 29
+ 25: label L4
+ 26: $t20 := borrow_local($t3)
+ 27: $t5 := $t20
+ 28: goto 33
+ 29: label L3
+ 30: $t21 := borrow_local($t4)
+ 31: $t5 := $t21
+ 32: goto 33
+ 33: label L5
+ 34: $t22 := move($t1)
+ 35: $t23 := 1
+ 36: $t24 := -($t22, $t23)
+ 37: $t1 := $t24
+ 38: goto 9
+ 39: label L0
+ 40: $t25 := move($t0)
+ 41: if ($t25) goto 42 else goto 49
+ 42: label L8
+ 43: $t26 := move($t5)
+ 44: destroy($t26)
+ 45: $t27 := move($t2)
+ 46: $t28 := 0
+ 47: TestBorrow::test3($t27, $t28)
+ 48: goto 56
+ 49: label L7
+ 50: $t29 := move($t2)
+ 51: destroy($t29)
+ 52: $t30 := move($t5)
+ 53: $t31 := 0
+ 54: TestBorrow::test3($t30, $t31)
+ 55: goto 56
+ 56: label L9
+ 57: return ()
 }
 
 ============ after pipeline `borrow` ================
@@ -252,35 +234,34 @@ fun TestBorrow::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestBorrow::R) {
 [variant baseline]
 fun TestBorrow::test1(): TestBorrow::R {
      var $t0|r: TestBorrow::R
-     var $t1|r_ref: &mut TestBorrow::R
-     var $t2|x_ref: &mut u64
-     var $t3: u64
-     var $t4: &mut TestBorrow::R
-     var $t5: &mut u64
-     var $t6: u64
-     var $t7: TestBorrow::R
-  0: $t3 := 3
-  1: $t0 := pack TestBorrow::R($t3)
-  2: $t4 := borrow_local($t0)
+     var $t1|x_ref: &mut u64
+     var $t2: u64
+     var $t3: &mut TestBorrow::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestBorrow::R
+  0: $t2 := 3
+  1: $t0 := pack TestBorrow::R($t2)
+  2: $t3 := borrow_local($t0)
+     # live_nodes: Reference($t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
+  3: $t4 := borrow_field<TestBorrow::R>.x($t3)
      # live_nodes: Reference($t4)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}
-     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}
-  3: $t5 := borrow_field<TestBorrow::R>.x($t4)
-     # live_nodes: Reference($t5)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
-     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}, Reference($t5) -> {(.x (u64), Reference($t4))}
-  4: $t6 := 0
-     # live_nodes: Reference($t5)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
-     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}, Reference($t5) -> {(.x (u64), Reference($t4))}
-  5: write_ref($t5, $t6)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
-     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}, Reference($t5) -> {(.x (u64), Reference($t4))}
-  6: $t7 := move($t0)
-     # moved_nodes: LocalRoot($t0)
-     # borrowed_by: LocalRoot($t7) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
-     # borrows_from: Reference($t4) -> {(@, LocalRoot($t7))}, Reference($t5) -> {(.x (u64), Reference($t4))}
-  7: return $t7
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  4: $t5 := 0
+     # live_nodes: Reference($t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  5: write_ref($t4, $t5)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  6: $t6 := move($t0)
+     # live_nodes: LocalRoot($t6)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  7: return $t6
 }
 
 
@@ -297,21 +278,20 @@ fun TestBorrow::test2($t0|x_ref: &mut u64, $t1|v: u64) {
 
 [variant baseline]
 public fun TestBorrow::test3($t0|r_ref: &mut TestBorrow::R, $t1|v: u64) {
-     var $t2|x_ref: &mut u64
-     var $t3: &mut u64
+     var $t2: &mut u64
      # live_nodes: LocalRoot($t1), Reference($t0)
-  0: $t3 := borrow_field<TestBorrow::R>.x($t0)
-     # live_nodes: LocalRoot($t1), Reference($t0), Reference($t3)
-     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t3))}
-     # borrows_from: Reference($t3) -> {(.x (u64), Reference($t0))}
-  1: TestBorrow::test2($t3, $t1)
+  0: $t2 := borrow_field<TestBorrow::R>.x($t0)
+     # live_nodes: LocalRoot($t1), Reference($t0), Reference($t2)
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t0))}
+  1: TestBorrow::test2($t2, $t1)
      # live_nodes: LocalRoot($t1), Reference($t0)
-     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t3))}
-     # borrows_from: Reference($t3) -> {(.x (u64), Reference($t0))}
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t0))}
   2: trace_local[r_ref]($t0)
      # live_nodes: LocalRoot($t1)
-     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t3))}
-     # borrows_from: Reference($t3) -> {(.x (u64), Reference($t0))}
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t0))}
   3: return ()
 }
 
@@ -319,29 +299,28 @@ public fun TestBorrow::test3($t0|r_ref: &mut TestBorrow::R, $t1|v: u64) {
 [variant baseline]
 fun TestBorrow::test4(): TestBorrow::R {
      var $t0|r: TestBorrow::R
-     var $t1|r_ref: &mut TestBorrow::R
-     var $t2: u64
-     var $t3: &mut TestBorrow::R
-     var $t4: u64
-     var $t5: TestBorrow::R
-  0: $t2 := 3
-  1: $t0 := pack TestBorrow::R($t2)
-  2: $t3 := borrow_local($t0)
-     # live_nodes: Reference($t3)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
-  3: $t4 := 0
-     # live_nodes: Reference($t3)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
-  4: TestBorrow::test3($t3, $t4)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
-  5: $t5 := move($t0)
-     # moved_nodes: LocalRoot($t0)
-     # borrowed_by: LocalRoot($t5) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t5))}
-  6: return $t5
+     var $t1: u64
+     var $t2: &mut TestBorrow::R
+     var $t3: u64
+     var $t4: TestBorrow::R
+  0: $t1 := 3
+  1: $t0 := pack TestBorrow::R($t1)
+  2: $t2 := borrow_local($t0)
+     # live_nodes: Reference($t2)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}
+  3: $t3 := 0
+     # live_nodes: Reference($t2)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}
+  4: TestBorrow::test3($t2, $t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}
+  5: $t4 := move($t0)
+     # live_nodes: LocalRoot($t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}
+  6: return $t4
 }
 
 
@@ -364,38 +343,33 @@ public fun TestBorrow::test5($t0|r_ref: &mut TestBorrow::R): &mut u64 {
 [variant baseline]
 fun TestBorrow::test6(): TestBorrow::R {
      var $t0|r: TestBorrow::R
-     var $t1|r_ref: &mut TestBorrow::R
-     var $t2|x_ref: &mut u64
-     var $t3: u64
-     var $t4: &mut TestBorrow::R
-     var $t5: &mut u64
-     var $t6: u64
-     var $t7: TestBorrow::R
-  0: $t3 := 3
-  1: $t0 := pack TestBorrow::R($t3)
-  2: $t4 := borrow_local($t0)
-     # live_nodes: Reference($t4)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}
-     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}
-  3: $t5 := TestBorrow::test5($t4)
-     # live_nodes: Reference($t5)
-     # moved_nodes: Reference($t4)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
-     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}, Reference($t5) -> {(.x (u64), Reference($t4))}
-  4: $t6 := 0
-     # live_nodes: Reference($t5)
-     # moved_nodes: Reference($t4)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
-     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}, Reference($t5) -> {(.x (u64), Reference($t4))}
-  5: TestBorrow::test2($t5, $t6)
-     # moved_nodes: Reference($t4)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
-     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}, Reference($t5) -> {(.x (u64), Reference($t4))}
-  6: $t7 := move($t0)
-     # moved_nodes: LocalRoot($t0), Reference($t4)
-     # borrowed_by: LocalRoot($t7) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
-     # borrows_from: Reference($t4) -> {(@, LocalRoot($t7))}, Reference($t5) -> {(.x (u64), Reference($t4))}
-  7: return $t7
+     var $t1: u64
+     var $t2: &mut TestBorrow::R
+     var $t3: &mut u64
+     var $t4: u64
+     var $t5: TestBorrow::R
+  0: $t1 := 3
+  1: $t0 := pack TestBorrow::R($t1)
+  2: $t2 := borrow_local($t0)
+     # live_nodes: Reference($t2)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}
+  3: $t3 := TestBorrow::test5($t2)
+     # live_nodes: Reference($t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}, Reference($t2) -> {(.x (u64), Reference($t3))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}, Reference($t3) -> {(.x (u64), Reference($t2))}
+  4: $t4 := 0
+     # live_nodes: Reference($t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}, Reference($t2) -> {(.x (u64), Reference($t3))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}, Reference($t3) -> {(.x (u64), Reference($t2))}
+  5: TestBorrow::test2($t3, $t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}, Reference($t2) -> {(.x (u64), Reference($t3))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}, Reference($t3) -> {(.x (u64), Reference($t2))}
+  6: $t5 := move($t0)
+     # live_nodes: LocalRoot($t5)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t2))}, Reference($t2) -> {(.x (u64), Reference($t3))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t0))}, Reference($t3) -> {(.x (u64), Reference($t2))}
+  7: return $t5
 }
 
 
@@ -407,7 +381,8 @@ fun TestBorrow::test7($t0|b: bool) {
      var $t4: u64
      var $t5: u64
      var $t6: &mut TestBorrow::R
-     var $t7: u64
+     var $t7: &mut TestBorrow::R
+     var $t8: u64
      # live_nodes: LocalRoot($t0)
   0: $t4 := 3
      # live_nodes: LocalRoot($t0)
@@ -422,76 +397,66 @@ fun TestBorrow::test7($t0|b: bool) {
      # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}
      # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}
   5: $t3 := $t6
-     # live_nodes: LocalRoot($t0), Reference($t3)
-     # moved_nodes: Reference($t6)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
-  6: if ($t0) goto 14 else goto 17
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: Reference($t6)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
-  7: label L0
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: Reference($t6)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+  6: if ($t0) goto 15 else goto 18
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+  7: label L1
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
   8: destroy($t6)
      # live_nodes: LocalRoot($t0)
-     # moved_nodes: Reference($t6)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
-  9: $t3 := borrow_local($t2)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+  9: $t7 := borrow_local($t2)
+     # live_nodes: LocalRoot($t0), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, LocalRoot($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t2))}
+ 10: $t3 := $t7
      # live_nodes: LocalRoot($t0), Reference($t3)
-     # moved_nodes: Reference($t6)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, LocalRoot($t2) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1)), (@, LocalRoot($t2))}
- 10: label L2
-     # live_nodes: LocalRoot($t0), Reference($t3)
-     # moved_nodes: Reference($t6)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, LocalRoot($t2) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1)), (@, LocalRoot($t2))}
- 11: $t7 := 0
-     # live_nodes: LocalRoot($t0), Reference($t3)
-     # moved_nodes: Reference($t6)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, LocalRoot($t2) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1)), (@, LocalRoot($t2))}
- 12: TestBorrow::test3($t3, $t7)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: Reference($t6)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, LocalRoot($t2) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1)), (@, LocalRoot($t2))}
- 13: return ()
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, LocalRoot($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, Reference($t3))}, Reference($t7) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t2))}
+ 11: label L0
      # live_nodes: LocalRoot($t0), Reference($t3)
-     # moved_nodes: Reference($t6)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
- 14: label L3
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, LocalRoot($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, Reference($t3))}, Reference($t7) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t2))}
+ 12: $t8 := 0
      # live_nodes: LocalRoot($t0), Reference($t3)
-     # moved_nodes: Reference($t6)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
- 15: destroy($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, LocalRoot($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, Reference($t3))}, Reference($t7) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t2))}
+ 13: TestBorrow::test3($t3, $t8)
      # live_nodes: LocalRoot($t0)
-     # moved_nodes: Reference($t6)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
- 16: goto 7
-     # live_nodes: LocalRoot($t0), Reference($t3)
-     # moved_nodes: Reference($t6)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
- 17: label L4
-     # live_nodes: LocalRoot($t0), Reference($t3)
-     # moved_nodes: Reference($t6)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
- 18: destroy($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, LocalRoot($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, Reference($t3))}, Reference($t7) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t2))}
+ 14: return ()
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+ 15: label L2
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+ 16: destroy($t3)
+     # live_nodes: LocalRoot($t0), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+ 17: goto 7
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+ 18: label L3
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t6)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+ 19: destroy($t6)
      # live_nodes: LocalRoot($t0), Reference($t3)
-     # moved_nodes: Reference($t6)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
- 19: goto 10
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+ 20: goto 11
 }
 
 
@@ -502,15 +467,18 @@ fun TestBorrow::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestBorrow::R) {
      var $t5|t_ref: &mut TestBorrow::R
      var $t6: u64
      var $t7: u64
-     var $t8: u64
-     var $t9: bool
-     var $t10: u64
+     var $t8: &mut TestBorrow::R
+     var $t9: u64
+     var $t10: bool
      var $t11: u64
      var $t12: u64
-     var $t13: bool
-     var $t14: u64
-     var $t15: u64
-     var $t16: u64
+     var $t13: u64
+     var $t14: bool
+     var $t15: &mut TestBorrow::R
+     var $t16: &mut TestBorrow::R
+     var $t17: u64
+     var $t18: u64
+     var $t19: u64
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
   0: $t6 := 3
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
@@ -520,143 +488,159 @@ fun TestBorrow::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestBorrow::R) {
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
   3: $t4 := pack TestBorrow::R($t7)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-  4: $t5 := borrow_local($t4)
+  4: $t8 := borrow_local($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t8)
+     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t8))}
+     # borrows_from: Reference($t8) -> {(@, LocalRoot($t4))}
+  5: $t5 := $t8
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+  6: label L6
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
-  5: label L7
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+  7: $t9 := 0
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
-  6: $t8 := 0
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+  8: $t10 := <($t9, $t1)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
-  7: $t9 := <($t8, $t1)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+  9: if ($t10) goto 10 else goto 29
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
-  8: if ($t9) goto 9 else goto 25
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 10: label L1
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
-  9: label L0
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 11: label L2
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 10: destroy($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 12: destroy($t5)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 11: $t10 := 2
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 13: $t11 := 2
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 12: $t11 := /($t1, $t10)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 14: $t12 := /($t1, $t11)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 13: $t12 := 0
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 15: $t13 := 0
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 14: $t13 := ==($t11, $t12)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 16: $t14 := ==($t12, $t13)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 15: if ($t13) goto 16 else goto 19
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 17: if ($t14) goto 18 else goto 22
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 16: label L3
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 18: label L4
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 17: $t5 := borrow_local($t3)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 19: $t15 := borrow_local($t3)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t15)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 20: $t5 := $t15
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 18: goto 21
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 21: goto 25
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 19: label L5
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 22: label L3
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 20: $t5 := borrow_local($t4)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 23: $t16 := borrow_local($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t16)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 24: $t5 := $t16
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 21: label L6
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 25: label L5
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 22: $t14 := 1
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 26: $t17 := 1
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 23: $t1 := -($t1, $t14)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 27: $t1 := -($t1, $t17)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 24: goto 5
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 28: goto 6
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 25: label L2
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 29: label L0
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 26: if ($t0) goto 27 else goto 32
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 30: if ($t0) goto 31 else goto 36
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 27: label L8
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 31: label L8
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 28: destroy($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 32: destroy($t5)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 29: $t15 := 0
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 33: $t18 := 0
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 30: TestBorrow::test3($t2, $t15)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 34: TestBorrow::test3($t2, $t18)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 31: goto 36
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 35: goto 40
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 32: label L10
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 36: label L7
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 33: destroy($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 37: destroy($t2)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 34: $t16 := 0
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 38: $t19 := 0
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 35: TestBorrow::test3($t5, $t16)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 39: TestBorrow::test3($t5, $t19)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 36: label L11
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 40: label L9
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 37: trace_local[r_ref]($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 41: trace_local[r_ref]($t2)
      # live_nodes: LocalRoot($t0), LocalRoot($t1)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 38: return ()
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t15))}, LocalRoot($t4) -> {(@, Reference($t8)), (@, Reference($t16))}, Reference($t8) -> {(@, Reference($t5))}, Reference($t15) -> {(@, Reference($t5))}, Reference($t16) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t8)), (@, Reference($t15)), (@, Reference($t16))}, Reference($t8) -> {(@, LocalRoot($t4))}, Reference($t15) -> {(@, LocalRoot($t3))}, Reference($t16) -> {(@, LocalRoot($t4))}
+ 42: return ()
 }
 
 
diff --git a/language/move-prover/bytecode/tests/borrow/function_call.exp b/language/move-prover/bytecode/tests/borrow/function_call.exp
new file mode 100644
index 0000000000..1e0c0bfc9c
--- /dev/null
+++ b/language/move-prover/bytecode/tests/borrow/function_call.exp
@@ -0,0 +1,296 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: &vector<#0>, $t1|e: &#0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: &vector<#0>, $t1|e: &#0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: &vector<#0>, $t1|i: u64): &#0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: &vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v: vector<#0>
+     var $t2: vector<#0>
+     var $t3: &mut vector<#0>
+     var $t4: #0
+     var $t5: vector<#0>
+  0: $t2 := vector::empty<#0>()
+  1: $t1 := $t2
+  2: $t3 := borrow_local($t1)
+  3: $t4 := move($t0)
+  4: vector::push_back<#0>($t3, $t4)
+  5: $t5 := move($t1)
+  6: return $t5
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+fun MultiLayerCalling::inner($t0|has_vector: &mut MultiLayerCalling::HasVector): &mut MultiLayerCalling::HasAnotherVector {
+     var $t1: &mut MultiLayerCalling::HasVector
+     var $t2: &mut vector<MultiLayerCalling::HasAnotherVector>
+     var $t3: u64
+     var $t4: &mut MultiLayerCalling::HasAnotherVector
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<MultiLayerCalling::HasVector>.v($t1)
+  2: $t3 := 7
+  3: $t4 := vector::borrow_mut<MultiLayerCalling::HasAnotherVector>($t2, $t3)
+  4: return $t4
+}
+
+
+[variant baseline]
+fun MultiLayerCalling::mid($t0|has_vector: &mut MultiLayerCalling::HasVector): &mut MultiLayerCalling::HasAnotherVector {
+     var $t1: &mut MultiLayerCalling::HasVector
+     var $t2: &mut MultiLayerCalling::HasAnotherVector
+  0: $t1 := move($t0)
+  1: $t2 := MultiLayerCalling::inner($t1)
+  2: return $t2
+}
+
+
+[variant baseline]
+fun MultiLayerCalling::outer($t0|has_vector: &mut MultiLayerCalling::HasVector) {
+     var $t1: &mut MultiLayerCalling::HasVector
+     var $t2: &mut MultiLayerCalling::HasAnotherVector
+     var $t3: &mut vector<u8>
+     var $t4: u8
+  0: $t1 := move($t0)
+  1: $t2 := MultiLayerCalling::mid($t1)
+  2: $t3 := borrow_field<MultiLayerCalling::HasAnotherVector>.v($t2)
+  3: $t4 := 42
+  4: vector::push_back<u8>($t3, $t4)
+  5: return ()
+}
+
+============ after pipeline `borrow` ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: vector<#0>, $t1|e: #0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: vector<#0>, $t1|e: #0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v: vector<#0>
+     var $t2: &mut vector<#0>
+     var $t3: vector<#0>
+     # live_nodes: LocalRoot($t0)
+  0: $t1 := vector::empty<#0>()
+     # live_nodes: LocalRoot($t0)
+  1: $t2 := borrow_local($t1)
+     # live_nodes: LocalRoot($t0), Reference($t2)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  2: vector::push_back<#0>($t2, $t0)
+     # live_nodes: LocalRoot($t0)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  3: $t3 := move($t1)
+     # live_nodes: LocalRoot($t0), LocalRoot($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
+  4: return $t3
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+fun MultiLayerCalling::inner($t0|has_vector: &mut MultiLayerCalling::HasVector): &mut MultiLayerCalling::HasAnotherVector {
+     var $t1: &mut vector<MultiLayerCalling::HasAnotherVector>
+     var $t2: u64
+     var $t3: &mut MultiLayerCalling::HasAnotherVector
+     # live_nodes: Reference($t0)
+  0: $t1 := borrow_field<MultiLayerCalling::HasVector>.v($t0)
+     # live_nodes: Reference($t0), Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t0))}
+  1: $t2 := 7
+     # live_nodes: Reference($t0), Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t0))}
+  2: $t3 := vector::borrow_mut<MultiLayerCalling::HasAnotherVector>($t1, $t2)
+     # live_nodes: Reference($t0), Reference($t3)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t1))}, Reference($t1) -> {([], Reference($t3))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t0))}, Reference($t3) -> {([], Reference($t1))}
+  3: trace_local[has_vector]($t0)
+     # live_nodes: Reference($t3)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t1))}, Reference($t1) -> {([], Reference($t3))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>), Reference($t0))}, Reference($t3) -> {([], Reference($t1))}
+  4: return $t3
+}
+
+
+[variant baseline]
+fun MultiLayerCalling::mid($t0|has_vector: &mut MultiLayerCalling::HasVector): &mut MultiLayerCalling::HasAnotherVector {
+     var $t1: &mut MultiLayerCalling::HasAnotherVector
+     # live_nodes: Reference($t0)
+  0: $t1 := MultiLayerCalling::inner($t0)
+     # live_nodes: Reference($t0), Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}
+  1: trace_local[has_vector]($t0)
+     # live_nodes: Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}
+  2: return $t1
+}
+
+
+[variant baseline]
+fun MultiLayerCalling::outer($t0|has_vector: &mut MultiLayerCalling::HasVector) {
+     var $t1: &mut MultiLayerCalling::HasAnotherVector
+     var $t2: &mut vector<u8>
+     var $t3: u8
+     # live_nodes: Reference($t0)
+  0: $t1 := MultiLayerCalling::mid($t0)
+     # live_nodes: Reference($t0), Reference($t1)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t1))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}
+  1: $t2 := borrow_field<MultiLayerCalling::HasAnotherVector>.v($t1)
+     # live_nodes: Reference($t0), Reference($t2)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t1))}, Reference($t1) -> {(.v (vector<u8>), Reference($t2))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}, Reference($t2) -> {(.v (vector<u8>), Reference($t1))}
+  2: $t3 := 42
+     # live_nodes: Reference($t0), Reference($t2)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t1))}, Reference($t1) -> {(.v (vector<u8>), Reference($t2))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}, Reference($t2) -> {(.v (vector<u8>), Reference($t1))}
+  3: vector::push_back<u8>($t2, $t3)
+     # live_nodes: Reference($t0)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t1))}, Reference($t1) -> {(.v (vector<u8>), Reference($t2))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}, Reference($t2) -> {(.v (vector<u8>), Reference($t1))}
+  4: trace_local[has_vector]($t0)
+     # borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t1))}, Reference($t1) -> {(.v (vector<u8>), Reference($t2))}
+     # borrows_from: Reference($t1) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}, Reference($t2) -> {(.v (vector<u8>), Reference($t1))}
+  5: return ()
+}
+
+
+
+==== borrow analysis summaries ====
+
+fun vector::borrow_mut[baseline]
+borrowed_by: Reference($t0) -> {([], Return(0))}
+borrows_from: Return(0) -> {([], Reference($t0))}
+
+fun MultiLayerCalling::inner[baseline]
+borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Return(0))}
+borrows_from: Return(0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}
+
+fun MultiLayerCalling::mid[baseline]
+borrowed_by: Reference($t0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Return(0))}
+borrows_from: Return(0) -> {(.v (vector<MultiLayerCalling::HasAnotherVector>)/[], Reference($t0))}
diff --git a/language/move-prover/bytecode/tests/borrow/function_call.move b/language/move-prover/bytecode/tests/borrow/function_call.move
new file mode 100644
index 0000000000..2d5a300f54
--- /dev/null
+++ b/language/move-prover/bytecode/tests/borrow/function_call.move
@@ -0,0 +1,26 @@
+// dep: ../../move-stdlib/sources/vector.move
+
+module 0x2::MultiLayerCalling {
+    use std::vector;
+
+    struct HasVector {
+        v: vector<HasAnotherVector>,
+    }
+
+    struct HasAnotherVector {
+        v: vector<u8>,
+    }
+
+    fun outer(has_vector: &mut HasVector) {
+        let has_another_vector = mid(has_vector);
+        vector::push_back(&mut has_another_vector.v, 42)
+    }
+
+    fun mid(has_vector: &mut HasVector): &mut HasAnotherVector {
+        inner(has_vector)
+    }
+
+    fun inner(has_vector: &mut HasVector): &mut HasAnotherVector {
+        vector::borrow_mut(&mut has_vector.v, 7)
+    }
+}
diff --git a/language/move-prover/bytecode/tests/borrow/hyper_edge.exp b/language/move-prover/bytecode/tests/borrow/hyper_edge.exp
index 22a967414d..28abc98b37 100644
--- a/language/move-prover/bytecode/tests/borrow/hyper_edge.exp
+++ b/language/move-prover/bytecode/tests/borrow/hyper_edge.exp
@@ -28,6 +28,10 @@ public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
 public native fun vector::empty<#0>(): vector<#0>;
 
 
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
 [variant baseline]
 public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
 
@@ -157,6 +161,10 @@ public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
 public native fun vector::empty<#0>(): vector<#0>;
 
 
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
 [variant baseline]
 public intrinsic fun vector::is_empty<#0>($t0|v: vector<#0>): bool;
 
@@ -198,10 +206,9 @@ public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
      # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
      # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
   3: $t3 := move($t1)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t1)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t2))}
-     # borrows_from: Reference($t2) -> {(@, LocalRoot($t3))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
   4: return $t3
 }
 
@@ -225,12 +232,10 @@ public fun Collection::borrow_mut<#0>($t0|c: &mut Collection::Collection<#0>, $t
      # borrows_from: Reference($t2) -> {(.items (vector<#0>), Reference($t0))}
   1: $t3 := vector::borrow_mut<#0>($t2, $t1)
      # live_nodes: LocalRoot($t1), Reference($t0), Reference($t3)
-     # moved_nodes: Reference($t2)
      # borrowed_by: Reference($t0) -> {(.items (vector<#0>), Reference($t2))}, Reference($t2) -> {([], Reference($t3))}
      # borrows_from: Reference($t2) -> {(.items (vector<#0>), Reference($t0))}, Reference($t3) -> {([], Reference($t2))}
   2: trace_local[c]($t0)
      # live_nodes: LocalRoot($t1), Reference($t3)
-     # moved_nodes: Reference($t2)
      # borrowed_by: Reference($t0) -> {(.items (vector<#0>), Reference($t2))}, Reference($t2) -> {([], Reference($t3))}
      # borrows_from: Reference($t2) -> {(.items (vector<#0>), Reference($t0))}, Reference($t3) -> {([], Reference($t2))}
   3: return $t3
@@ -266,22 +271,18 @@ public fun Test::foo<#0>($t0|i: u64) {
      # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
   2: $t4 := Collection::borrow_mut<Test::Token<#0>>($t3, $t0)
      # live_nodes: LocalRoot($t0), Reference($t4)
-     # moved_nodes: Reference($t3)
      # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, Reference($t3) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t4))}
      # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}, Reference($t4) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t3))}
   3: $t5 := 0
      # live_nodes: LocalRoot($t0), Reference($t4)
-     # moved_nodes: Reference($t3)
      # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, Reference($t3) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t4))}
      # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}, Reference($t4) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t3))}
   4: $t6 := borrow_field<Test::Token<#0>>.value($t4)
      # live_nodes: LocalRoot($t0), Reference($t6)
-     # moved_nodes: Reference($t3)
      # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, Reference($t3) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t4))}, Reference($t4) -> {(.value (u64), Reference($t6))}
      # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}, Reference($t4) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t3))}, Reference($t6) -> {(.value (u64), Reference($t4))}
   5: write_ref($t6, $t5)
      # live_nodes: LocalRoot($t0)
-     # moved_nodes: Reference($t3)
      # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, Reference($t3) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t4))}, Reference($t4) -> {(.value (u64), Reference($t6))}
      # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}, Reference($t4) -> {(.items (vector<Test::Token<#0>>)/[], Reference($t3))}, Reference($t6) -> {(.value (u64), Reference($t4))}
   6: return ()
diff --git a/language/move-prover/bytecode/tests/borrow_strong/basic_test.exp b/language/move-prover/bytecode/tests/borrow_strong/basic_test.exp
index 6af0e726d6..1728873fb2 100644
--- a/language/move-prover/bytecode/tests/borrow_strong/basic_test.exp
+++ b/language/move-prover/bytecode/tests/borrow_strong/basic_test.exp
@@ -3,31 +3,27 @@
 [variant baseline]
 fun TestBorrow::test1(): TestBorrow::R {
      var $t0|r: TestBorrow::R
-     var $t1|r_ref: &mut TestBorrow::R
-     var $t2|x_ref: &mut u64
+     var $t1|x_ref: &mut u64
+     var $t2: u64
      var $t3: u64
-     var $t4: u64
-     var $t5: TestBorrow::R
-     var $t6: &mut TestBorrow::R
-     var $t7: &mut TestBorrow::R
+     var $t4: TestBorrow::R
+     var $t5: &mut TestBorrow::R
+     var $t6: &mut u64
+     var $t7: u64
      var $t8: &mut u64
-     var $t9: u64
-     var $t10: &mut u64
-     var $t11: TestBorrow::R
-  0: $t3 := 3
-  1: $t4 := 4
-  2: $t5 := pack TestBorrow::R($t3, $t4)
-  3: $t0 := $t5
-  4: $t6 := borrow_local($t0)
-  5: $t1 := $t6
-  6: $t7 := move($t1)
-  7: $t8 := borrow_field<TestBorrow::R>.x($t7)
-  8: $t2 := $t8
-  9: $t9 := 0
- 10: $t10 := move($t2)
- 11: write_ref($t10, $t9)
- 12: $t11 := move($t0)
- 13: return $t11
+     var $t9: TestBorrow::R
+  0: $t2 := 3
+  1: $t3 := 4
+  2: $t4 := pack TestBorrow::R($t2, $t3)
+  3: $t0 := $t4
+  4: $t5 := borrow_local($t0)
+  5: $t6 := borrow_field<TestBorrow::R>.x($t5)
+  6: $t1 := $t6
+  7: $t7 := 0
+  8: $t8 := move($t1)
+  9: write_ref($t8, $t7)
+ 10: $t9 := move($t0)
+ 11: return $t9
 }
 
 
@@ -62,7 +58,7 @@ fun TestBorrow::test10($t0|b: bool): TestBorrow::R {
   8: $t2 := $t9
   9: $t10 := copy($t0)
  10: if ($t10) goto 11 else goto 19
- 11: label L0
+ 11: label L1
  12: $t11 := move($t2)
  13: destroy($t11)
  14: $t12 := move($t0)
@@ -70,11 +66,11 @@ fun TestBorrow::test10($t0|b: bool): TestBorrow::R {
  16: $t14 := TestBorrow::test9($t12, $t13)
  17: $t2 := $t14
  18: goto 23
- 19: label L2
+ 19: label L0
  20: $t15 := move($t3)
  21: destroy($t15)
  22: goto 23
- 23: label L3
+ 23: label L2
  24: $t16 := 0
  25: $t17 := move($t2)
  26: write_ref($t17, $t16)
@@ -96,43 +92,35 @@ fun TestBorrow::test2($t0|x_ref: &mut u64, $t1|v: u64) {
 
 [variant baseline]
 public fun TestBorrow::test3($t0|r_ref: &mut TestBorrow::R, $t1|v: u64) {
-     var $t2|x_ref: &mut u64
-     var $t3: &mut TestBorrow::R
-     var $t4: &mut u64
-     var $t5: &mut u64
-     var $t6: u64
-  0: $t3 := move($t0)
-  1: $t4 := borrow_field<TestBorrow::R>.x($t3)
-  2: $t2 := $t4
-  3: $t5 := move($t2)
-  4: $t6 := move($t1)
-  5: TestBorrow::test2($t5, $t6)
-  6: return ()
+     var $t2: &mut TestBorrow::R
+     var $t3: &mut u64
+     var $t4: u64
+  0: $t2 := move($t0)
+  1: $t3 := borrow_field<TestBorrow::R>.x($t2)
+  2: $t4 := move($t1)
+  3: TestBorrow::test2($t3, $t4)
+  4: return ()
 }
 
 
 [variant baseline]
 fun TestBorrow::test4(): TestBorrow::R {
      var $t0|r: TestBorrow::R
-     var $t1|r_ref: &mut TestBorrow::R
+     var $t1: u64
      var $t2: u64
-     var $t3: u64
-     var $t4: TestBorrow::R
-     var $t5: &mut TestBorrow::R
-     var $t6: &mut TestBorrow::R
-     var $t7: u64
-     var $t8: TestBorrow::R
-  0: $t2 := 3
-  1: $t3 := 4
-  2: $t4 := pack TestBorrow::R($t2, $t3)
-  3: $t0 := $t4
-  4: $t5 := borrow_local($t0)
-  5: $t1 := $t5
-  6: $t6 := move($t1)
-  7: $t7 := 0
-  8: TestBorrow::test3($t6, $t7)
-  9: $t8 := move($t0)
- 10: return $t8
+     var $t3: TestBorrow::R
+     var $t4: &mut TestBorrow::R
+     var $t5: u64
+     var $t6: TestBorrow::R
+  0: $t1 := 3
+  1: $t2 := 4
+  2: $t3 := pack TestBorrow::R($t1, $t2)
+  3: $t0 := $t3
+  4: $t4 := borrow_local($t0)
+  5: $t5 := 0
+  6: TestBorrow::test3($t4, $t5)
+  7: $t6 := move($t0)
+  8: return $t6
 }
 
 
@@ -149,31 +137,23 @@ public fun TestBorrow::test5($t0|r_ref: &mut TestBorrow::R): &mut u64 {
 [variant baseline]
 fun TestBorrow::test6(): TestBorrow::R {
      var $t0|r: TestBorrow::R
-     var $t1|r_ref: &mut TestBorrow::R
-     var $t2|x_ref: &mut u64
-     var $t3: u64
-     var $t4: u64
-     var $t5: TestBorrow::R
-     var $t6: &mut TestBorrow::R
-     var $t7: &mut TestBorrow::R
-     var $t8: &mut u64
-     var $t9: &mut u64
-     var $t10: u64
-     var $t11: TestBorrow::R
-  0: $t3 := 3
-  1: $t4 := 4
-  2: $t5 := pack TestBorrow::R($t3, $t4)
-  3: $t0 := $t5
-  4: $t6 := borrow_local($t0)
-  5: $t1 := $t6
-  6: $t7 := move($t1)
-  7: $t8 := TestBorrow::test5($t7)
-  8: $t2 := $t8
-  9: $t9 := move($t2)
- 10: $t10 := 0
- 11: TestBorrow::test2($t9, $t10)
- 12: $t11 := move($t0)
- 13: return $t11
+     var $t1: u64
+     var $t2: u64
+     var $t3: TestBorrow::R
+     var $t4: &mut TestBorrow::R
+     var $t5: &mut u64
+     var $t6: u64
+     var $t7: TestBorrow::R
+  0: $t1 := 3
+  1: $t2 := 4
+  2: $t3 := pack TestBorrow::R($t1, $t2)
+  3: $t0 := $t3
+  4: $t4 := borrow_local($t0)
+  5: $t5 := TestBorrow::test5($t4)
+  6: $t6 := 0
+  7: TestBorrow::test2($t5, $t6)
+  8: $t7 := move($t0)
+  9: return $t7
 }
 
 
@@ -206,13 +186,13 @@ fun TestBorrow::test7($t0|b: bool) {
   9: $t3 := $t10
  10: $t11 := move($t0)
  11: if ($t11) goto 12 else goto 18
- 12: label L0
+ 12: label L1
  13: $t12 := move($t3)
  14: destroy($t12)
  15: $t13 := borrow_local($t2)
  16: $t3 := $t13
  17: goto 18
- 18: label L2
+ 18: label L0
  19: $t14 := move($t3)
  20: $t15 := 0
  21: TestBorrow::test3($t14, $t15)
@@ -264,53 +244,55 @@ fun TestBorrow::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestBorrow::R) {
   8: $t12 := borrow_local($t4)
   9: $t5 := $t12
  10: goto 11
- 11: label L7
+ 11: label L6
  12: $t13 := 0
  13: $t14 := copy($t1)
  14: $t15 := <($t13, $t14)
- 15: if ($t15) goto 16 else goto 39
- 16: label L0
- 17: $t16 := move($t5)
- 18: destroy($t16)
- 19: $t17 := copy($t1)
- 20: $t18 := 2
- 21: $t19 := /($t17, $t18)
- 22: $t20 := 0
- 23: $t21 := ==($t19, $t20)
- 24: if ($t21) goto 25 else goto 29
- 25: label L3
- 26: $t22 := borrow_local($t3)
- 27: $t5 := $t22
- 28: goto 33
- 29: label L5
- 30: $t23 := borrow_local($t4)
- 31: $t5 := $t23
- 32: goto 33
- 33: label L6
- 34: $t24 := move($t1)
- 35: $t25 := 1
- 36: $t26 := -($t24, $t25)
- 37: $t1 := $t26
- 38: goto 11
- 39: label L2
- 40: $t27 := move($t0)
- 41: if ($t27) goto 42 else goto 49
- 42: label L8
- 43: $t28 := move($t5)
- 44: destroy($t28)
- 45: $t29 := move($t2)
- 46: $t30 := 0
- 47: TestBorrow::test3($t29, $t30)
- 48: goto 56
- 49: label L10
- 50: $t31 := move($t2)
- 51: destroy($t31)
- 52: $t32 := move($t5)
- 53: $t33 := 0
- 54: TestBorrow::test3($t32, $t33)
- 55: goto 56
- 56: label L11
- 57: return ()
+ 15: if ($t15) goto 16 else goto 41
+ 16: label L1
+ 17: goto 18
+ 18: label L2
+ 19: $t16 := move($t5)
+ 20: destroy($t16)
+ 21: $t17 := copy($t1)
+ 22: $t18 := 2
+ 23: $t19 := /($t17, $t18)
+ 24: $t20 := 0
+ 25: $t21 := ==($t19, $t20)
+ 26: if ($t21) goto 27 else goto 31
+ 27: label L4
+ 28: $t22 := borrow_local($t3)
+ 29: $t5 := $t22
+ 30: goto 35
+ 31: label L3
+ 32: $t23 := borrow_local($t4)
+ 33: $t5 := $t23
+ 34: goto 35
+ 35: label L5
+ 36: $t24 := move($t1)
+ 37: $t25 := 1
+ 38: $t26 := -($t24, $t25)
+ 39: $t1 := $t26
+ 40: goto 11
+ 41: label L0
+ 42: $t27 := move($t0)
+ 43: if ($t27) goto 44 else goto 51
+ 44: label L8
+ 45: $t28 := move($t5)
+ 46: destroy($t28)
+ 47: $t29 := move($t2)
+ 48: $t30 := 0
+ 49: TestBorrow::test3($t29, $t30)
+ 50: goto 58
+ 51: label L7
+ 52: $t31 := move($t2)
+ 53: destroy($t31)
+ 54: $t32 := move($t5)
+ 55: $t33 := 0
+ 56: TestBorrow::test3($t32, $t33)
+ 57: goto 58
+ 58: label L9
+ 59: return ()
 }
 
 
@@ -332,18 +314,18 @@ fun TestBorrow::test9($t0|b: bool, $t1|r_ref: &mut TestBorrow::R): &mut u64 {
   2: $t2 := $t4
   3: $t5 := move($t0)
   4: if ($t5) goto 5 else goto 12
-  5: label L0
+  5: label L1
   6: $t6 := move($t2)
   7: destroy($t6)
   8: $t7 := move($t1)
   9: $t8 := borrow_field<TestBorrow::R>.y($t7)
  10: $t2 := $t8
  11: goto 16
- 12: label L2
+ 12: label L0
  13: $t9 := move($t1)
  14: destroy($t9)
  15: goto 16
- 16: label L3
+ 16: label L2
  17: $t10 := 0
  18: $t11 := copy($t2)
  19: write_ref($t11, $t10)
@@ -356,37 +338,36 @@ fun TestBorrow::test9($t0|b: bool, $t1|r_ref: &mut TestBorrow::R): &mut u64 {
 [variant baseline]
 fun TestBorrow::test1(): TestBorrow::R {
      var $t0|r: TestBorrow::R
-     var $t1|r_ref: &mut TestBorrow::R
-     var $t2|x_ref: &mut u64
+     var $t1|x_ref: &mut u64
+     var $t2: u64
      var $t3: u64
-     var $t4: u64
-     var $t5: &mut TestBorrow::R
-     var $t6: &mut u64
-     var $t7: u64
-     var $t8: TestBorrow::R
-  0: $t3 := 3
-  1: $t4 := 4
-  2: $t0 := pack TestBorrow::R($t3, $t4)
-  3: $t5 := borrow_local($t0)
+     var $t4: &mut TestBorrow::R
+     var $t5: &mut u64
+     var $t6: u64
+     var $t7: TestBorrow::R
+  0: $t2 := 3
+  1: $t3 := 4
+  2: $t0 := pack TestBorrow::R($t2, $t3)
+  3: $t4 := borrow_local($t0)
+     # live_nodes: Reference($t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}
+     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}
+  4: $t5 := borrow_field<TestBorrow::R>.x($t4)
+     # live_nodes: Reference($t5)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
+     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}, Reference($t5) -> {(.x (u64), Reference($t4))}
+  5: $t6 := 0
      # live_nodes: Reference($t5)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t0))}
-  4: $t6 := borrow_field<TestBorrow::R>.x($t5)
-     # live_nodes: Reference($t6)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t5))}, Reference($t5) -> {(.x (u64), Reference($t6))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t0))}, Reference($t6) -> {(.x (u64), Reference($t5))}
-  5: $t7 := 0
-     # live_nodes: Reference($t6)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t5))}, Reference($t5) -> {(.x (u64), Reference($t6))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t0))}, Reference($t6) -> {(.x (u64), Reference($t5))}
-  6: write_ref($t6, $t7)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t5))}, Reference($t5) -> {(.x (u64), Reference($t6))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t0))}, Reference($t6) -> {(.x (u64), Reference($t5))}
-  7: $t8 := move($t0)
-     # moved_nodes: LocalRoot($t0)
-     # borrowed_by: LocalRoot($t8) -> {(@, Reference($t5))}, Reference($t5) -> {(.x (u64), Reference($t6))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t8))}, Reference($t6) -> {(.x (u64), Reference($t5))}
-  8: return $t8
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
+     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}, Reference($t5) -> {(.x (u64), Reference($t4))}
+  6: write_ref($t5, $t6)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
+     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}, Reference($t5) -> {(.x (u64), Reference($t4))}
+  7: $t7 := move($t0)
+     # live_nodes: LocalRoot($t7)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}, Reference($t4) -> {(.x (u64), Reference($t5))}
+     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}, Reference($t5) -> {(.x (u64), Reference($t4))}
+  8: return $t7
 }
 
 
@@ -417,95 +398,77 @@ fun TestBorrow::test10($t0|b: bool): TestBorrow::R {
      # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}
      # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
   5: $t2 := $t7
-     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6)
-     # moved_nodes: Reference($t7)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
   6: if ($t0) goto 18 else goto 21
-     # live_nodes: LocalRoot($t0), Reference($t6)
-     # moved_nodes: Reference($t7)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
-  7: label L0
-     # live_nodes: LocalRoot($t0), Reference($t6)
-     # moved_nodes: Reference($t7)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+     # live_nodes: LocalRoot($t0), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+  7: label L1
+     # live_nodes: LocalRoot($t0), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
   8: destroy($t7)
      # live_nodes: LocalRoot($t0), Reference($t6)
-     # moved_nodes: Reference($t7)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
   9: $t2 := TestBorrow::test9($t0, $t6)
      # live_nodes: LocalRoot($t0), Reference($t2)
-     # moved_nodes: Reference($t6), Reference($t7)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t2)), (.y (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t6)), (.y (u64), Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.y (u64), Reference($t2)), (.x (u64)/@, Reference($t2)), (.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t6)), (.x (u64)/@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
  10: goto 13
      # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6)
-     # moved_nodes: Reference($t7)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
- 11: label L2
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 11: label L0
      # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6)
-     # moved_nodes: Reference($t7)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
  12: destroy($t6)
      # live_nodes: LocalRoot($t0), Reference($t2)
-     # moved_nodes: Reference($t6), Reference($t7)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t2)), (.y (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t6)), (.y (u64), Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
- 13: label L3
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.y (u64), Reference($t2)), (.x (u64)/@, Reference($t2)), (.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t6)), (.x (u64)/@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 13: label L2
      # live_nodes: LocalRoot($t0), Reference($t2)
-     # moved_nodes: Reference($t6), Reference($t7)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t2)), (.y (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t6)), (.y (u64), Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.y (u64), Reference($t2)), (.x (u64)/@, Reference($t2)), (.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t6)), (.x (u64)/@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
  14: $t8 := 0
      # live_nodes: LocalRoot($t0), Reference($t2)
-     # moved_nodes: Reference($t6), Reference($t7)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t2)), (.y (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t6)), (.y (u64), Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.y (u64), Reference($t2)), (.x (u64)/@, Reference($t2)), (.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t6)), (.x (u64)/@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
  15: write_ref($t2, $t8)
      # live_nodes: LocalRoot($t0)
-     # moved_nodes: Reference($t6), Reference($t7)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t2)), (.y (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t6)), (.y (u64), Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.y (u64), Reference($t2)), (.x (u64)/@, Reference($t2)), (.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t6)), (.x (u64)/@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
  16: $t9 := move($t1)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t1), Reference($t6), Reference($t7)
-     # borrowed_by: LocalRoot($t9) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t2)), (.y (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t6)), (.y (u64), Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t9))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t9)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.y (u64), Reference($t2)), (.x (u64)/@, Reference($t2)), (.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t6)), (.x (u64)/@, Reference($t6)), (@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
  17: return $t9
-     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6)
-     # moved_nodes: Reference($t7)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
- 18: label L4
-     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6)
-     # moved_nodes: Reference($t7)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 18: label L3
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
  19: destroy($t2)
-     # live_nodes: LocalRoot($t0), Reference($t6)
-     # moved_nodes: Reference($t7)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+     # live_nodes: LocalRoot($t0), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
  20: goto 7
-     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6)
-     # moved_nodes: Reference($t7)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
- 21: label L5
-     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6)
-     # moved_nodes: Reference($t7)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
+ 21: label L4
+     # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6), Reference($t7)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
  22: destroy($t7)
      # live_nodes: LocalRoot($t0), Reference($t2), Reference($t6)
-     # moved_nodes: Reference($t7)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t6))}, Reference($t6) -> {(@, LocalRoot($t1))}
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6))}, Reference($t6) -> {(.x (u64), Reference($t7))}, Reference($t7) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t7))}, Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(.x (u64), Reference($t6))}
  23: goto 11
 }
 
@@ -523,21 +486,20 @@ fun TestBorrow::test2($t0|x_ref: &mut u64, $t1|v: u64) {
 
 [variant baseline]
 public fun TestBorrow::test3($t0|r_ref: &mut TestBorrow::R, $t1|v: u64) {
-     var $t2|x_ref: &mut u64
-     var $t3: &mut u64
+     var $t2: &mut u64
      # live_nodes: LocalRoot($t1), Reference($t0)
-  0: $t3 := borrow_field<TestBorrow::R>.x($t0)
-     # live_nodes: LocalRoot($t1), Reference($t0), Reference($t3)
-     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t3))}
-     # borrows_from: Reference($t3) -> {(.x (u64), Reference($t0))}
-  1: TestBorrow::test2($t3, $t1)
+  0: $t2 := borrow_field<TestBorrow::R>.x($t0)
+     # live_nodes: LocalRoot($t1), Reference($t0), Reference($t2)
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t0))}
+  1: TestBorrow::test2($t2, $t1)
      # live_nodes: LocalRoot($t1), Reference($t0)
-     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t3))}
-     # borrows_from: Reference($t3) -> {(.x (u64), Reference($t0))}
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t0))}
   2: trace_local[r_ref]($t0)
      # live_nodes: LocalRoot($t1)
-     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t3))}
-     # borrows_from: Reference($t3) -> {(.x (u64), Reference($t0))}
+     # borrowed_by: Reference($t0) -> {(.x (u64), Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t0))}
   3: return ()
 }
 
@@ -545,31 +507,30 @@ public fun TestBorrow::test3($t0|r_ref: &mut TestBorrow::R, $t1|v: u64) {
 [variant baseline]
 fun TestBorrow::test4(): TestBorrow::R {
      var $t0|r: TestBorrow::R
-     var $t1|r_ref: &mut TestBorrow::R
+     var $t1: u64
      var $t2: u64
-     var $t3: u64
-     var $t4: &mut TestBorrow::R
-     var $t5: u64
-     var $t6: TestBorrow::R
-  0: $t2 := 3
-  1: $t3 := 4
-  2: $t0 := pack TestBorrow::R($t2, $t3)
-  3: $t4 := borrow_local($t0)
-     # live_nodes: Reference($t4)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}
-     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}
-  4: $t5 := 0
-     # live_nodes: Reference($t4)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}
-     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}
-  5: TestBorrow::test3($t4, $t5)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t4))}
-     # borrows_from: Reference($t4) -> {(@, LocalRoot($t0))}
-  6: $t6 := move($t0)
-     # moved_nodes: LocalRoot($t0)
-     # borrowed_by: LocalRoot($t6) -> {(@, Reference($t4))}
-     # borrows_from: Reference($t4) -> {(@, LocalRoot($t6))}
-  7: return $t6
+     var $t3: &mut TestBorrow::R
+     var $t4: u64
+     var $t5: TestBorrow::R
+  0: $t1 := 3
+  1: $t2 := 4
+  2: $t0 := pack TestBorrow::R($t1, $t2)
+  3: $t3 := borrow_local($t0)
+     # live_nodes: Reference($t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
+  4: $t4 := 0
+     # live_nodes: Reference($t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
+  5: TestBorrow::test3($t3, $t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
+  6: $t5 := move($t0)
+     # live_nodes: LocalRoot($t5)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
+  7: return $t5
 }
 
 
@@ -592,40 +553,35 @@ public fun TestBorrow::test5($t0|r_ref: &mut TestBorrow::R): &mut u64 {
 [variant baseline]
 fun TestBorrow::test6(): TestBorrow::R {
      var $t0|r: TestBorrow::R
-     var $t1|r_ref: &mut TestBorrow::R
-     var $t2|x_ref: &mut u64
-     var $t3: u64
-     var $t4: u64
-     var $t5: &mut TestBorrow::R
-     var $t6: &mut u64
-     var $t7: u64
-     var $t8: TestBorrow::R
-  0: $t3 := 3
-  1: $t4 := 4
-  2: $t0 := pack TestBorrow::R($t3, $t4)
-  3: $t5 := borrow_local($t0)
-     # live_nodes: Reference($t5)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t0))}
-  4: $t6 := TestBorrow::test5($t5)
-     # live_nodes: Reference($t6)
-     # moved_nodes: Reference($t5)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t5))}, Reference($t5) -> {(.x (u64), Reference($t6))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t0))}, Reference($t6) -> {(.x (u64), Reference($t5))}
-  5: $t7 := 0
-     # live_nodes: Reference($t6)
-     # moved_nodes: Reference($t5)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t5))}, Reference($t5) -> {(.x (u64), Reference($t6))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t0))}, Reference($t6) -> {(.x (u64), Reference($t5))}
-  6: TestBorrow::test2($t6, $t7)
-     # moved_nodes: Reference($t5)
-     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t5))}, Reference($t5) -> {(.x (u64), Reference($t6))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t0))}, Reference($t6) -> {(.x (u64), Reference($t5))}
-  7: $t8 := move($t0)
-     # moved_nodes: LocalRoot($t0), Reference($t5)
-     # borrowed_by: LocalRoot($t8) -> {(@, Reference($t5))}, Reference($t5) -> {(.x (u64), Reference($t6))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t8))}, Reference($t6) -> {(.x (u64), Reference($t5))}
-  8: return $t8
+     var $t1: u64
+     var $t2: u64
+     var $t3: &mut TestBorrow::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestBorrow::R
+  0: $t1 := 3
+  1: $t2 := 4
+  2: $t0 := pack TestBorrow::R($t1, $t2)
+  3: $t3 := borrow_local($t0)
+     # live_nodes: Reference($t3)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}
+  4: $t4 := TestBorrow::test5($t3)
+     # live_nodes: Reference($t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  5: $t5 := 0
+     # live_nodes: Reference($t4)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  6: TestBorrow::test2($t4, $t5)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  7: $t6 := move($t0)
+     # live_nodes: LocalRoot($t6)
+     # borrowed_by: LocalRoot($t0) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t4))}
+     # borrows_from: Reference($t3) -> {(@, LocalRoot($t0))}, Reference($t4) -> {(.x (u64), Reference($t3))}
+  8: return $t6
 }
 
 
@@ -639,7 +595,8 @@ fun TestBorrow::test7($t0|b: bool) {
      var $t6: u64
      var $t7: u64
      var $t8: &mut TestBorrow::R
-     var $t9: u64
+     var $t9: &mut TestBorrow::R
+     var $t10: u64
      # live_nodes: LocalRoot($t0)
   0: $t4 := 3
      # live_nodes: LocalRoot($t0)
@@ -658,76 +615,66 @@ fun TestBorrow::test7($t0|b: bool) {
      # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}
      # borrows_from: Reference($t8) -> {(@, LocalRoot($t1))}
   7: $t3 := $t8
-     # live_nodes: LocalRoot($t0), Reference($t3)
-     # moved_nodes: Reference($t8)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
-  8: if ($t0) goto 16 else goto 19
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: Reference($t8)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
-  9: label L0
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: Reference($t8)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+  8: if ($t0) goto 17 else goto 20
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+  9: label L1
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
  10: destroy($t8)
      # live_nodes: LocalRoot($t0)
-     # moved_nodes: Reference($t8)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
- 11: $t3 := borrow_local($t2)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 11: $t9 := borrow_local($t2)
+     # live_nodes: LocalRoot($t0), Reference($t9)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, LocalRoot($t2) -> {(@, Reference($t9))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t2))}
+ 12: $t3 := $t9
      # live_nodes: LocalRoot($t0), Reference($t3)
-     # moved_nodes: Reference($t8)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, LocalRoot($t2) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1)), (@, LocalRoot($t2))}
- 12: label L2
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, LocalRoot($t2) -> {(@, Reference($t9))}, Reference($t8) -> {(@, Reference($t3))}, Reference($t9) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8)), (@, Reference($t9))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t2))}
+ 13: label L0
      # live_nodes: LocalRoot($t0), Reference($t3)
-     # moved_nodes: Reference($t8)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, LocalRoot($t2) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1)), (@, LocalRoot($t2))}
- 13: $t9 := 0
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, LocalRoot($t2) -> {(@, Reference($t9))}, Reference($t8) -> {(@, Reference($t3))}, Reference($t9) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8)), (@, Reference($t9))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t2))}
+ 14: $t10 := 0
      # live_nodes: LocalRoot($t0), Reference($t3)
-     # moved_nodes: Reference($t8)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, LocalRoot($t2) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1)), (@, LocalRoot($t2))}
- 14: TestBorrow::test3($t3, $t9)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, LocalRoot($t2) -> {(@, Reference($t9))}, Reference($t8) -> {(@, Reference($t3))}, Reference($t9) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8)), (@, Reference($t9))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t2))}
+ 15: TestBorrow::test3($t3, $t10)
      # live_nodes: LocalRoot($t0)
-     # moved_nodes: Reference($t8)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}, LocalRoot($t2) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1)), (@, LocalRoot($t2))}
- 15: return ()
-     # live_nodes: LocalRoot($t0), Reference($t3)
-     # moved_nodes: Reference($t8)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
- 16: label L3
-     # live_nodes: LocalRoot($t0), Reference($t3)
-     # moved_nodes: Reference($t8)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
- 17: destroy($t3)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: Reference($t8)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
- 18: goto 9
-     # live_nodes: LocalRoot($t0), Reference($t3)
-     # moved_nodes: Reference($t8)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
- 19: label L4
-     # live_nodes: LocalRoot($t0), Reference($t3)
-     # moved_nodes: Reference($t8)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
- 20: destroy($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, LocalRoot($t2) -> {(@, Reference($t9))}, Reference($t8) -> {(@, Reference($t3))}, Reference($t9) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8)), (@, Reference($t9))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t2))}
+ 16: return ()
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 17: label L2
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 18: destroy($t3)
+     # live_nodes: LocalRoot($t0), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 19: goto 9
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 20: label L3
+     # live_nodes: LocalRoot($t0), Reference($t3), Reference($t8)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 21: destroy($t8)
      # live_nodes: LocalRoot($t0), Reference($t3)
-     # moved_nodes: Reference($t8)
-     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t3))}
-     # borrows_from: Reference($t3) -> {(@, LocalRoot($t1))}
- 21: goto 12
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t8))}, Reference($t8) -> {(@, Reference($t3))}
+     # borrows_from: Reference($t3) -> {(@, Reference($t8))}, Reference($t8) -> {(@, LocalRoot($t1))}
+ 22: goto 13
 }
 
 
@@ -740,15 +687,18 @@ fun TestBorrow::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestBorrow::R) {
      var $t7: u64
      var $t8: u64
      var $t9: u64
-     var $t10: u64
-     var $t11: bool
-     var $t12: u64
+     var $t10: &mut TestBorrow::R
+     var $t11: u64
+     var $t12: bool
      var $t13: u64
      var $t14: u64
-     var $t15: bool
-     var $t16: u64
-     var $t17: u64
-     var $t18: u64
+     var $t15: u64
+     var $t16: bool
+     var $t17: &mut TestBorrow::R
+     var $t18: &mut TestBorrow::R
+     var $t19: u64
+     var $t20: u64
+     var $t21: u64
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
   0: $t6 := 3
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
@@ -762,143 +712,159 @@ fun TestBorrow::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestBorrow::R) {
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
   5: $t4 := pack TestBorrow::R($t8, $t9)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-  6: $t5 := borrow_local($t4)
+  6: $t10 := borrow_local($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t10)
+     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t10))}
+     # borrows_from: Reference($t10) -> {(@, LocalRoot($t4))}
+  7: $t5 := $t10
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
-  7: label L7
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+  8: label L6
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
-  8: $t10 := 0
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+  9: $t11 := 0
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
-  9: $t11 := <($t10, $t1)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 10: $t12 := <($t11, $t1)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 10: if ($t11) goto 11 else goto 27
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 11: if ($t12) goto 12 else goto 31
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 11: label L0
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 12: label L1
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 13: label L2
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 12: destroy($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 14: destroy($t5)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 13: $t12 := 2
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 15: $t13 := 2
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 14: $t13 := /($t1, $t12)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 16: $t14 := /($t1, $t13)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 15: $t14 := 0
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 17: $t15 := 0
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 16: $t15 := ==($t13, $t14)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 18: $t16 := ==($t14, $t15)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 17: if ($t15) goto 18 else goto 21
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 19: if ($t16) goto 20 else goto 24
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 18: label L3
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 20: label L4
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 19: $t5 := borrow_local($t3)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 21: $t17 := borrow_local($t3)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t17)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 22: $t5 := $t17
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 20: goto 23
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 23: goto 27
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 21: label L5
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 24: label L3
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 22: $t5 := borrow_local($t4)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 25: $t18 := borrow_local($t4)
+     # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t18)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 26: $t5 := $t18
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 23: label L6
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 27: label L5
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 24: $t16 := 1
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 28: $t19 := 1
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 25: $t1 := -($t1, $t16)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 29: $t1 := -($t1, $t19)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 26: goto 7
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 30: goto 8
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 27: label L2
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 31: label L0
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 28: if ($t0) goto 29 else goto 34
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 32: if ($t0) goto 33 else goto 38
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 29: label L8
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 33: label L8
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 30: destroy($t5)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 34: destroy($t5)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 31: $t17 := 0
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 35: $t20 := 0
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 32: TestBorrow::test3($t2, $t17)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 36: TestBorrow::test3($t2, $t20)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 33: goto 38
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 37: goto 42
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 34: label L10
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 38: label L7
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 35: destroy($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 39: destroy($t2)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 36: $t18 := 0
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 40: $t21 := 0
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2), Reference($t5)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 37: TestBorrow::test3($t5, $t18)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 41: TestBorrow::test3($t5, $t21)
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 38: label L11
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 42: label L9
      # live_nodes: LocalRoot($t0), LocalRoot($t1), Reference($t2)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 39: trace_local[r_ref]($t2)
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 43: trace_local[r_ref]($t2)
      # live_nodes: LocalRoot($t0), LocalRoot($t1)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t5))}, LocalRoot($t4) -> {(@, Reference($t5))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t3)), (@, LocalRoot($t4))}
- 40: return ()
+     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t17))}, LocalRoot($t4) -> {(@, Reference($t10)), (@, Reference($t18))}, Reference($t10) -> {(@, Reference($t5))}, Reference($t17) -> {(@, Reference($t5))}, Reference($t18) -> {(@, Reference($t5))}
+     # borrows_from: Reference($t5) -> {(@, Reference($t10)), (@, Reference($t17)), (@, Reference($t18))}, Reference($t10) -> {(@, LocalRoot($t4))}, Reference($t17) -> {(@, LocalRoot($t3))}, Reference($t18) -> {(@, LocalRoot($t4))}
+ 44: return ()
 }
 
 
@@ -913,95 +879,77 @@ fun TestBorrow::test9($t0|b: bool, $t1|r_ref: &mut TestBorrow::R): &mut u64 {
      # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}
      # borrows_from: Reference($t3) -> {(.x (u64), Reference($t1))}
   1: $t2 := $t3
-     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-     # moved_nodes: Reference($t3)
-     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t1))}
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
   2: if ($t0) goto 14 else goto 17
-     # live_nodes: LocalRoot($t0), Reference($t1)
-     # moved_nodes: Reference($t3)
-     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t1))}
-  3: label L0
-     # live_nodes: LocalRoot($t0), Reference($t1)
-     # moved_nodes: Reference($t3)
-     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t1))}
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+  3: label L1
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
   4: destroy($t3)
      # live_nodes: LocalRoot($t0), Reference($t1)
-     # moved_nodes: Reference($t3)
-     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t1))}
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
   5: $t2 := borrow_field<TestBorrow::R>.y($t1)
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-     # moved_nodes: Reference($t3)
-     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t2)), (.y (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t1)), (.y (u64), Reference($t1))}
+     # borrowed_by: Reference($t1) -> {(.y (u64), Reference($t2)), (.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t1)), (@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
   6: goto 9
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-     # moved_nodes: Reference($t3)
-     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t1))}
-  7: label L2
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+  7: label L0
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-     # moved_nodes: Reference($t3)
-     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t1))}
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
   8: destroy($t1)
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-     # moved_nodes: Reference($t3)
-     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t2)), (.y (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t1)), (.y (u64), Reference($t1))}
-  9: label L3
+     # borrowed_by: Reference($t1) -> {(.y (u64), Reference($t2)), (.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t1)), (@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+  9: label L2
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-     # moved_nodes: Reference($t3)
-     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t2)), (.y (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t1)), (.y (u64), Reference($t1))}
+     # borrowed_by: Reference($t1) -> {(.y (u64), Reference($t2)), (.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t1)), (@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
  10: $t4 := 0
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-     # moved_nodes: Reference($t3)
-     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t2)), (.y (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t1)), (.y (u64), Reference($t1))}
+     # borrowed_by: Reference($t1) -> {(.y (u64), Reference($t2)), (.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t1)), (@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
  11: write_ref($t2, $t4)
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-     # moved_nodes: Reference($t3)
-     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t2)), (.y (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t1)), (.y (u64), Reference($t1))}
+     # borrowed_by: Reference($t1) -> {(.y (u64), Reference($t2)), (.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t1)), (@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
  12: trace_local[r_ref]($t1)
      # live_nodes: LocalRoot($t0), Reference($t2)
-     # moved_nodes: Reference($t3)
-     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t2)), (.y (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t1)), (.y (u64), Reference($t1))}
+     # borrowed_by: Reference($t1) -> {(.y (u64), Reference($t2)), (.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(.y (u64), Reference($t1)), (@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
  13: return $t2
-     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-     # moved_nodes: Reference($t3)
-     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t1))}
- 14: label L4
-     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-     # moved_nodes: Reference($t3)
-     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t1))}
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 14: label L3
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
  15: destroy($t2)
-     # live_nodes: LocalRoot($t0), Reference($t1)
-     # moved_nodes: Reference($t3)
-     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t1))}
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
  16: goto 3
-     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-     # moved_nodes: Reference($t3)
-     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t1))}
- 17: label L5
-     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-     # moved_nodes: Reference($t3)
-     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t1))}
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
+ 17: label L4
+     # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
  18: destroy($t3)
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-     # moved_nodes: Reference($t3)
-     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t2))}
-     # borrows_from: Reference($t2) -> {(.x (u64), Reference($t1))}
+     # borrowed_by: Reference($t1) -> {(.x (u64), Reference($t3))}, Reference($t3) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, Reference($t3))}, Reference($t3) -> {(.x (u64), Reference($t1))}
  19: goto 7
 }
 
@@ -1014,5 +962,5 @@ borrowed_by: Reference($t0) -> {(.x (u64), Return(0))}
 borrows_from: Return(0) -> {(.x (u64), Reference($t0))}
 
 fun TestBorrow::test9[baseline]
-borrowed_by: Reference($t1) -> {(.x (u64), Return(0)), (.y (u64), Return(0))}
-borrows_from: Return(0) -> {(.x (u64), Reference($t1)), (.y (u64), Reference($t1))}
+borrowed_by: Reference($t1) -> {(.y (u64), Return(0)), (.x (u64)/@, Return(0))}
+borrows_from: Return(0) -> {(.y (u64), Reference($t1)), (.x (u64)/@, Reference($t1))}
diff --git a/language/move-prover/bytecode/tests/borrow_strong/mut_ref.exp b/language/move-prover/bytecode/tests/borrow_strong/mut_ref.exp
index 8c61c9bd28..5c979306bd 100644
--- a/language/move-prover/bytecode/tests/borrow_strong/mut_ref.exp
+++ b/language/move-prover/bytecode/tests/borrow_strong/mut_ref.exp
@@ -28,6 +28,10 @@ public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
 public native fun vector::empty<#0>(): vector<#0>;
 
 
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
 [variant baseline]
 public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
 
@@ -326,18 +330,18 @@ fun TestMutRef::return_ref_different_path($t0|b: bool, $t1|x: &mut TestMutRef::N
      var $t9: &mut u64
   0: $t3 := move($t0)
   1: if ($t3) goto 2 else goto 7
-  2: label L0
+  2: label L1
   3: $t4 := move($t1)
   4: $t5 := borrow_field<TestMutRef::N>.value($t4)
   5: $t2 := $t5
   6: goto 13
-  7: label L2
+  7: label L0
   8: $t6 := move($t1)
   9: $t7 := borrow_field<TestMutRef::N>.t($t6)
  10: $t8 := borrow_field<TestMutRef::T>.value($t7)
  11: $t2 := $t8
  12: goto 13
- 13: label L3
+ 13: label L2
  14: $t9 := move($t2)
  15: return $t9
 }
@@ -358,21 +362,21 @@ fun TestMutRef::return_ref_different_path_vec($t0|b: bool, $t1|x: &mut TestMutRe
      var $t12: &mut u64
   0: $t3 := move($t0)
   1: if ($t3) goto 2 else goto 9
-  2: label L0
+  2: label L1
   3: $t4 := move($t1)
   4: $t5 := borrow_field<TestMutRef::V>.is($t4)
   5: $t6 := 1
   6: $t7 := vector::borrow_mut<u64>($t5, $t6)
   7: $t2 := $t7
   8: goto 16
-  9: label L2
+  9: label L0
  10: $t8 := move($t1)
  11: $t9 := borrow_field<TestMutRef::V>.is($t8)
  12: $t10 := 0
  13: $t11 := vector::borrow_mut<u64>($t9, $t10)
  14: $t2 := $t11
  15: goto 16
- 16: label L3
+ 16: label L2
  17: $t12 := move($t2)
  18: return $t12
 }
@@ -394,14 +398,14 @@ fun TestMutRef::return_ref_different_path_vec2($t0|b: bool, $t1|x: &mut TestMutR
      var $t13: &mut u64
   0: $t3 := move($t0)
   1: if ($t3) goto 2 else goto 9
-  2: label L0
+  2: label L1
   3: $t4 := move($t1)
   4: $t5 := borrow_field<TestMutRef::V>.is($t4)
   5: $t6 := 1
   6: $t7 := vector::borrow_mut<u64>($t5, $t6)
   7: $t2 := $t7
   8: goto 17
-  9: label L2
+  9: label L0
  10: $t8 := move($t1)
  11: $t9 := borrow_field<TestMutRef::V>.ts($t8)
  12: $t10 := 0
@@ -409,7 +413,7 @@ fun TestMutRef::return_ref_different_path_vec2($t0|b: bool, $t1|x: &mut TestMutR
  14: $t12 := borrow_field<TestMutRef::T>.value($t11)
  15: $t2 := $t12
  16: goto 17
- 17: label L3
+ 17: label L2
  18: $t13 := move($t2)
  19: return $t13
 }
@@ -428,21 +432,21 @@ fun TestMutRef::return_ref_different_root($t0|b: bool, $t1|x: &mut TestMutRef::T
      var $t11: &mut u64
   0: $t4 := move($t0)
   1: if ($t4) goto 2 else goto 9
-  2: label L0
+  2: label L1
   3: $t5 := move($t2)
   4: destroy($t5)
   5: $t6 := move($t1)
   6: $t7 := borrow_field<TestMutRef::T>.value($t6)
   7: $t3 := $t7
   8: goto 16
-  9: label L2
+  9: label L0
  10: $t8 := move($t1)
  11: destroy($t8)
  12: $t9 := move($t2)
  13: $t10 := borrow_field<TestMutRef::R>.value($t9)
  14: $t3 := $t10
  15: goto 16
- 16: label L3
+ 16: label L2
  17: $t11 := move($t3)
  18: return $t11
 }
@@ -477,6 +481,10 @@ public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
 public native fun vector::empty<#0>(): vector<#0>;
 
 
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
 [variant baseline]
 public intrinsic fun vector::is_empty<#0>($t0|v: vector<#0>): bool;
 
@@ -518,10 +526,9 @@ public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
      # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
      # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
   3: $t3 := move($t1)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t1)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t2))}
-     # borrows_from: Reference($t2) -> {(@, LocalRoot($t3))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t3)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t2))}
+     # borrows_from: Reference($t2) -> {(@, LocalRoot($t1))}
   4: return $t3
 }
 
@@ -560,24 +567,20 @@ fun TestMutRef::call_return_ref_different_path($t0|b: bool): TestMutRef::N {
      # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}
   5: $t7 := TestMutRef::return_ref_different_path($t0, $t6)
      # live_nodes: LocalRoot($t0), Reference($t7)
-     # moved_nodes: Reference($t6)
      # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, Reference($t6) -> {(.value (u64), Reference($t7)), (.t (TestMutRef::T)/.value (u64), Reference($t7))}
      # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(.value (u64), Reference($t6)), (.t (TestMutRef::T)/.value (u64), Reference($t6))}
   6: $t8 := 5
      # live_nodes: LocalRoot($t0), Reference($t7)
-     # moved_nodes: Reference($t6)
      # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, Reference($t6) -> {(.value (u64), Reference($t7)), (.t (TestMutRef::T)/.value (u64), Reference($t7))}
      # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(.value (u64), Reference($t6)), (.t (TestMutRef::T)/.value (u64), Reference($t6))}
   7: write_ref($t7, $t8)
      # live_nodes: LocalRoot($t0)
-     # moved_nodes: Reference($t6)
      # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, Reference($t6) -> {(.value (u64), Reference($t7)), (.t (TestMutRef::T)/.value (u64), Reference($t7))}
      # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(.value (u64), Reference($t6)), (.t (TestMutRef::T)/.value (u64), Reference($t6))}
   8: $t9 := move($t2)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t2), Reference($t6)
-     # borrowed_by: LocalRoot($t9) -> {(@, Reference($t6))}, Reference($t6) -> {(.value (u64), Reference($t7)), (.t (TestMutRef::T)/.value (u64), Reference($t7))}
-     # borrows_from: Reference($t6) -> {(@, LocalRoot($t9))}, Reference($t7) -> {(.value (u64), Reference($t6)), (.t (TestMutRef::T)/.value (u64), Reference($t6))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t9)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, Reference($t6) -> {(.value (u64), Reference($t7)), (.t (TestMutRef::T)/.value (u64), Reference($t7))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(.value (u64), Reference($t6)), (.t (TestMutRef::T)/.value (u64), Reference($t6))}
   9: return $t9
 }
 
@@ -628,40 +631,33 @@ fun TestMutRef::call_return_ref_different_path_vec($t0|b: bool): TestMutRef::V {
      # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}
      # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}
   8: $t10 := move($t1)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t1)
-     # borrowed_by: LocalRoot($t10) -> {(@, Reference($t6)), (@, Reference($t8))}
-     # borrows_from: Reference($t6) -> {(@, LocalRoot($t10))}, Reference($t8) -> {(@, LocalRoot($t10))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t10)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}
   9: $t4 := pack TestMutRef::V($t10, $t5)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t1)
-     # borrowed_by: LocalRoot($t10) -> {(@, Reference($t6)), (@, Reference($t8))}
-     # borrows_from: Reference($t6) -> {(@, LocalRoot($t10))}, Reference($t8) -> {(@, LocalRoot($t10))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t10)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}
  10: $t11 := borrow_local($t4)
-     # live_nodes: LocalRoot($t0), Reference($t11)
-     # moved_nodes: LocalRoot($t1)
-     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t11))}, LocalRoot($t10) -> {(@, Reference($t6)), (@, Reference($t8))}
-     # borrows_from: Reference($t6) -> {(@, LocalRoot($t10))}, Reference($t8) -> {(@, LocalRoot($t10))}, Reference($t11) -> {(@, LocalRoot($t4))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t10), Reference($t11)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}, LocalRoot($t4) -> {(@, Reference($t11))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t11) -> {(@, LocalRoot($t4))}
  11: $t12 := TestMutRef::return_ref_different_path_vec($t0, $t11)
-     # live_nodes: LocalRoot($t0), Reference($t12)
-     # moved_nodes: LocalRoot($t1), Reference($t11)
-     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t11))}, LocalRoot($t10) -> {(@, Reference($t6)), (@, Reference($t8))}, Reference($t11) -> {(.is (vector<u64>)/[], Reference($t12))}
-     # borrows_from: Reference($t6) -> {(@, LocalRoot($t10))}, Reference($t8) -> {(@, LocalRoot($t10))}, Reference($t11) -> {(@, LocalRoot($t4))}, Reference($t12) -> {(.is (vector<u64>)/[], Reference($t11))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t10), Reference($t12)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}, LocalRoot($t4) -> {(@, Reference($t11))}, Reference($t11) -> {(.is (vector<u64>)/[], Reference($t12))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t11) -> {(@, LocalRoot($t4))}, Reference($t12) -> {(.is (vector<u64>)/[], Reference($t11))}
  12: $t13 := 5
-     # live_nodes: LocalRoot($t0), Reference($t12)
-     # moved_nodes: LocalRoot($t1), Reference($t11)
-     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t11))}, LocalRoot($t10) -> {(@, Reference($t6)), (@, Reference($t8))}, Reference($t11) -> {(.is (vector<u64>)/[], Reference($t12))}
-     # borrows_from: Reference($t6) -> {(@, LocalRoot($t10))}, Reference($t8) -> {(@, LocalRoot($t10))}, Reference($t11) -> {(@, LocalRoot($t4))}, Reference($t12) -> {(.is (vector<u64>)/[], Reference($t11))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t10), Reference($t12)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}, LocalRoot($t4) -> {(@, Reference($t11))}, Reference($t11) -> {(.is (vector<u64>)/[], Reference($t12))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t11) -> {(@, LocalRoot($t4))}, Reference($t12) -> {(.is (vector<u64>)/[], Reference($t11))}
  13: write_ref($t12, $t13)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t1), Reference($t11)
-     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t11))}, LocalRoot($t10) -> {(@, Reference($t6)), (@, Reference($t8))}, Reference($t11) -> {(.is (vector<u64>)/[], Reference($t12))}
-     # borrows_from: Reference($t6) -> {(@, LocalRoot($t10))}, Reference($t8) -> {(@, LocalRoot($t10))}, Reference($t11) -> {(@, LocalRoot($t4))}, Reference($t12) -> {(.is (vector<u64>)/[], Reference($t11))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t10)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}, LocalRoot($t4) -> {(@, Reference($t11))}, Reference($t11) -> {(.is (vector<u64>)/[], Reference($t12))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t11) -> {(@, LocalRoot($t4))}, Reference($t12) -> {(.is (vector<u64>)/[], Reference($t11))}
  14: $t14 := move($t4)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t1), LocalRoot($t4), Reference($t11)
-     # borrowed_by: LocalRoot($t10) -> {(@, Reference($t6)), (@, Reference($t8))}, LocalRoot($t14) -> {(@, Reference($t11))}, Reference($t11) -> {(.is (vector<u64>)/[], Reference($t12))}
-     # borrows_from: Reference($t6) -> {(@, LocalRoot($t10))}, Reference($t8) -> {(@, LocalRoot($t10))}, Reference($t11) -> {(@, LocalRoot($t14))}, Reference($t12) -> {(.is (vector<u64>)/[], Reference($t11))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t10), LocalRoot($t14)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t6)), (@, Reference($t8))}, LocalRoot($t4) -> {(@, Reference($t11))}, Reference($t11) -> {(.is (vector<u64>)/[], Reference($t12))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t1))}, Reference($t8) -> {(@, LocalRoot($t1))}, Reference($t11) -> {(@, LocalRoot($t4))}, Reference($t12) -> {(.is (vector<u64>)/[], Reference($t11))}
  15: return $t14
 }
 
@@ -750,45 +746,37 @@ fun TestMutRef::call_return_ref_different_path_vec2($t0|b: bool): TestMutRef::V
      # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
      # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
  16: $t15 := move($t1)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t1)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t15) -> {(@, Reference($t5)), (@, Reference($t7))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t15))}, Reference($t7) -> {(@, LocalRoot($t15))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t15)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
  17: $t16 := move($t3)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t1), LocalRoot($t3)
-     # borrowed_by: LocalRoot($t15) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t16) -> {(@, Reference($t9)), (@, Reference($t12))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t15))}, Reference($t7) -> {(@, LocalRoot($t15))}, Reference($t9) -> {(@, LocalRoot($t16))}, Reference($t12) -> {(@, LocalRoot($t16))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
  18: $t4 := pack TestMutRef::V($t15, $t16)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t1), LocalRoot($t3)
-     # borrowed_by: LocalRoot($t15) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t16) -> {(@, Reference($t9)), (@, Reference($t12))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t15))}, Reference($t7) -> {(@, LocalRoot($t15))}, Reference($t9) -> {(@, LocalRoot($t16))}, Reference($t12) -> {(@, LocalRoot($t16))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
  19: $t17 := borrow_local($t4)
-     # live_nodes: LocalRoot($t0), Reference($t17)
-     # moved_nodes: LocalRoot($t1), LocalRoot($t3)
-     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t17))}, LocalRoot($t15) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t16) -> {(@, Reference($t9)), (@, Reference($t12))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t15))}, Reference($t7) -> {(@, LocalRoot($t15))}, Reference($t9) -> {(@, LocalRoot($t16))}, Reference($t12) -> {(@, LocalRoot($t16))}, Reference($t17) -> {(@, LocalRoot($t4))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), Reference($t17)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}
  20: $t18 := TestMutRef::return_ref_different_path_vec2($t0, $t17)
-     # live_nodes: LocalRoot($t0), Reference($t18)
-     # moved_nodes: LocalRoot($t1), LocalRoot($t3), Reference($t17)
-     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t17))}, LocalRoot($t15) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t16) -> {(@, Reference($t9)), (@, Reference($t12))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t15))}, Reference($t7) -> {(@, LocalRoot($t15))}, Reference($t9) -> {(@, LocalRoot($t16))}, Reference($t12) -> {(@, LocalRoot($t16))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), Reference($t18)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
  21: $t19 := 5
-     # live_nodes: LocalRoot($t0), Reference($t18)
-     # moved_nodes: LocalRoot($t1), LocalRoot($t3), Reference($t17)
-     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t17))}, LocalRoot($t15) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t16) -> {(@, Reference($t9)), (@, Reference($t12))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t15))}, Reference($t7) -> {(@, LocalRoot($t15))}, Reference($t9) -> {(@, LocalRoot($t16))}, Reference($t12) -> {(@, LocalRoot($t16))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), Reference($t18)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
  22: write_ref($t18, $t19)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t1), LocalRoot($t3), Reference($t17)
-     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t17))}, LocalRoot($t15) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t16) -> {(@, Reference($t9)), (@, Reference($t12))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t15))}, Reference($t7) -> {(@, LocalRoot($t15))}, Reference($t9) -> {(@, LocalRoot($t16))}, Reference($t12) -> {(@, LocalRoot($t16))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
  23: $t20 := move($t4)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t1), LocalRoot($t3), LocalRoot($t4), Reference($t17)
-     # borrowed_by: LocalRoot($t15) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t16) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t20) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t15))}, Reference($t7) -> {(@, LocalRoot($t15))}, Reference($t9) -> {(@, LocalRoot($t16))}, Reference($t12) -> {(@, LocalRoot($t16))}, Reference($t17) -> {(@, LocalRoot($t20))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), LocalRoot($t20)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
  24: return $t20
 }
 
@@ -877,45 +865,37 @@ fun TestMutRef::call_return_ref_different_path_vec2_incorrect($t0|b: bool): Test
      # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
      # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
  16: $t15 := move($t1)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t1)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t15) -> {(@, Reference($t5)), (@, Reference($t7))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t15))}, Reference($t7) -> {(@, LocalRoot($t15))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t15)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
  17: $t16 := move($t3)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t1), LocalRoot($t3)
-     # borrowed_by: LocalRoot($t15) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t16) -> {(@, Reference($t9)), (@, Reference($t12))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t15))}, Reference($t7) -> {(@, LocalRoot($t15))}, Reference($t9) -> {(@, LocalRoot($t16))}, Reference($t12) -> {(@, LocalRoot($t16))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
  18: $t4 := pack TestMutRef::V($t15, $t16)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t1), LocalRoot($t3)
-     # borrowed_by: LocalRoot($t15) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t16) -> {(@, Reference($t9)), (@, Reference($t12))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t15))}, Reference($t7) -> {(@, LocalRoot($t15))}, Reference($t9) -> {(@, LocalRoot($t16))}, Reference($t12) -> {(@, LocalRoot($t16))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}
  19: $t17 := borrow_local($t4)
-     # live_nodes: LocalRoot($t0), Reference($t17)
-     # moved_nodes: LocalRoot($t1), LocalRoot($t3)
-     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t17))}, LocalRoot($t15) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t16) -> {(@, Reference($t9)), (@, Reference($t12))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t15))}, Reference($t7) -> {(@, LocalRoot($t15))}, Reference($t9) -> {(@, LocalRoot($t16))}, Reference($t12) -> {(@, LocalRoot($t16))}, Reference($t17) -> {(@, LocalRoot($t4))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), Reference($t17)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}
  20: $t18 := TestMutRef::return_ref_different_path_vec2($t0, $t17)
-     # live_nodes: LocalRoot($t0), Reference($t18)
-     # moved_nodes: LocalRoot($t1), LocalRoot($t3), Reference($t17)
-     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t17))}, LocalRoot($t15) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t16) -> {(@, Reference($t9)), (@, Reference($t12))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t15))}, Reference($t7) -> {(@, LocalRoot($t15))}, Reference($t9) -> {(@, LocalRoot($t16))}, Reference($t12) -> {(@, LocalRoot($t16))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), Reference($t18)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
  21: $t19 := 0
-     # live_nodes: LocalRoot($t0), Reference($t18)
-     # moved_nodes: LocalRoot($t1), LocalRoot($t3), Reference($t17)
-     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t17))}, LocalRoot($t15) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t16) -> {(@, Reference($t9)), (@, Reference($t12))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t15))}, Reference($t7) -> {(@, LocalRoot($t15))}, Reference($t9) -> {(@, LocalRoot($t16))}, Reference($t12) -> {(@, LocalRoot($t16))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), Reference($t18)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
  22: write_ref($t18, $t19)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t1), LocalRoot($t3), Reference($t17)
-     # borrowed_by: LocalRoot($t4) -> {(@, Reference($t17))}, LocalRoot($t15) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t16) -> {(@, Reference($t9)), (@, Reference($t12))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t15))}, Reference($t7) -> {(@, LocalRoot($t15))}, Reference($t9) -> {(@, LocalRoot($t16))}, Reference($t12) -> {(@, LocalRoot($t16))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
  23: $t20 := move($t4)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t1), LocalRoot($t3), LocalRoot($t4), Reference($t17)
-     # borrowed_by: LocalRoot($t15) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t16) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t20) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
-     # borrows_from: Reference($t5) -> {(@, LocalRoot($t15))}, Reference($t7) -> {(@, LocalRoot($t15))}, Reference($t9) -> {(@, LocalRoot($t16))}, Reference($t12) -> {(@, LocalRoot($t16))}, Reference($t17) -> {(@, LocalRoot($t20))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t15), LocalRoot($t16), LocalRoot($t20)
+     # borrowed_by: LocalRoot($t1) -> {(@, Reference($t5)), (@, Reference($t7))}, LocalRoot($t3) -> {(@, Reference($t9)), (@, Reference($t12))}, LocalRoot($t4) -> {(@, Reference($t17))}, Reference($t17) -> {(.is (vector<u64>)/[], Reference($t18)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t18))}
+     # borrows_from: Reference($t5) -> {(@, LocalRoot($t1))}, Reference($t7) -> {(@, LocalRoot($t1))}, Reference($t9) -> {(@, LocalRoot($t3))}, Reference($t12) -> {(@, LocalRoot($t3))}, Reference($t17) -> {(@, LocalRoot($t4))}, Reference($t18) -> {(.is (vector<u64>)/[], Reference($t17)), (.ts (vector<TestMutRef::T>)/[]/.value (u64), Reference($t17))}
  24: return $t20
 }
 
@@ -952,29 +932,24 @@ fun TestMutRef::call_return_ref_different_root($t0|b: bool): (TestMutRef::T, Tes
      # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(@, LocalRoot($t3))}
   6: $t8 := TestMutRef::return_ref_different_root($t0, $t6, $t7)
      # live_nodes: LocalRoot($t0), Reference($t8)
-     # moved_nodes: Reference($t6), Reference($t7)
      # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, LocalRoot($t3) -> {(@, Reference($t7))}, Reference($t6) -> {(.value (u64), Reference($t8))}, Reference($t7) -> {(.value (u64), Reference($t8))}
      # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(@, LocalRoot($t3))}, Reference($t8) -> {(.value (u64), Reference($t6)), (.value (u64), Reference($t7))}
   7: $t9 := 5
      # live_nodes: LocalRoot($t0), Reference($t8)
-     # moved_nodes: Reference($t6), Reference($t7)
      # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, LocalRoot($t3) -> {(@, Reference($t7))}, Reference($t6) -> {(.value (u64), Reference($t8))}, Reference($t7) -> {(.value (u64), Reference($t8))}
      # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(@, LocalRoot($t3))}, Reference($t8) -> {(.value (u64), Reference($t6)), (.value (u64), Reference($t7))}
   8: write_ref($t8, $t9)
      # live_nodes: LocalRoot($t0)
-     # moved_nodes: Reference($t6), Reference($t7)
      # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, LocalRoot($t3) -> {(@, Reference($t7))}, Reference($t6) -> {(.value (u64), Reference($t8))}, Reference($t7) -> {(.value (u64), Reference($t8))}
      # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(@, LocalRoot($t3))}, Reference($t8) -> {(.value (u64), Reference($t6)), (.value (u64), Reference($t7))}
   9: $t10 := move($t2)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t2), Reference($t6), Reference($t7)
-     # borrowed_by: LocalRoot($t3) -> {(@, Reference($t7))}, LocalRoot($t10) -> {(@, Reference($t6))}, Reference($t6) -> {(.value (u64), Reference($t8))}, Reference($t7) -> {(.value (u64), Reference($t8))}
-     # borrows_from: Reference($t6) -> {(@, LocalRoot($t10))}, Reference($t7) -> {(@, LocalRoot($t3))}, Reference($t8) -> {(.value (u64), Reference($t6)), (.value (u64), Reference($t7))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t10)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, LocalRoot($t3) -> {(@, Reference($t7))}, Reference($t6) -> {(.value (u64), Reference($t8))}, Reference($t7) -> {(.value (u64), Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(@, LocalRoot($t3))}, Reference($t8) -> {(.value (u64), Reference($t6)), (.value (u64), Reference($t7))}
  10: $t11 := move($t3)
-     # live_nodes: LocalRoot($t0)
-     # moved_nodes: LocalRoot($t2), LocalRoot($t3), Reference($t6), Reference($t7)
-     # borrowed_by: LocalRoot($t10) -> {(@, Reference($t6))}, LocalRoot($t11) -> {(@, Reference($t7))}, Reference($t6) -> {(.value (u64), Reference($t8))}, Reference($t7) -> {(.value (u64), Reference($t8))}
-     # borrows_from: Reference($t6) -> {(@, LocalRoot($t10))}, Reference($t7) -> {(@, LocalRoot($t11))}, Reference($t8) -> {(.value (u64), Reference($t6)), (.value (u64), Reference($t7))}
+     # live_nodes: LocalRoot($t0), LocalRoot($t10), LocalRoot($t11)
+     # borrowed_by: LocalRoot($t2) -> {(@, Reference($t6))}, LocalRoot($t3) -> {(@, Reference($t7))}, Reference($t6) -> {(.value (u64), Reference($t8))}, Reference($t7) -> {(.value (u64), Reference($t8))}
+     # borrows_from: Reference($t6) -> {(@, LocalRoot($t2))}, Reference($t7) -> {(@, LocalRoot($t3))}, Reference($t8) -> {(.value (u64), Reference($t6)), (.value (u64), Reference($t7))}
  11: return ($t10, $t11)
 }
 
@@ -986,7 +961,7 @@ fun TestMutRef::return_ref_different_path($t0|b: bool, $t1|x: &mut TestMutRef::N
      # live_nodes: LocalRoot($t0), Reference($t1)
   0: if ($t0) goto 1 else goto 4
      # live_nodes: LocalRoot($t0), Reference($t1)
-  1: label L0
+  1: label L1
      # live_nodes: LocalRoot($t0), Reference($t1)
   2: $t2 := borrow_field<TestMutRef::N>.value($t1)
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
@@ -994,7 +969,7 @@ fun TestMutRef::return_ref_different_path($t0|b: bool, $t1|x: &mut TestMutRef::N
      # borrows_from: Reference($t2) -> {(.value (u64), Reference($t1))}
   3: goto 7
      # live_nodes: LocalRoot($t0), Reference($t1)
-  4: label L2
+  4: label L0
      # live_nodes: LocalRoot($t0), Reference($t1)
   5: $t3 := borrow_field<TestMutRef::N>.t($t1)
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t3)
@@ -1004,7 +979,7 @@ fun TestMutRef::return_ref_different_path($t0|b: bool, $t1|x: &mut TestMutRef::N
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
      # borrowed_by: Reference($t1) -> {(.value (u64), Reference($t2)), (.t (TestMutRef::T), Reference($t3))}, Reference($t3) -> {(.value (u64), Reference($t2))}
      # borrows_from: Reference($t2) -> {(.value (u64), Reference($t1)), (.value (u64), Reference($t3))}, Reference($t3) -> {(.t (TestMutRef::T), Reference($t1))}
-  7: label L3
+  7: label L2
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
      # borrowed_by: Reference($t1) -> {(.value (u64), Reference($t2)), (.t (TestMutRef::T), Reference($t3))}, Reference($t3) -> {(.value (u64), Reference($t2))}
      # borrows_from: Reference($t2) -> {(.value (u64), Reference($t1)), (.value (u64), Reference($t3))}, Reference($t3) -> {(.t (TestMutRef::T), Reference($t1))}
@@ -1026,7 +1001,7 @@ fun TestMutRef::return_ref_different_path_vec($t0|b: bool, $t1|x: &mut TestMutRe
      # live_nodes: LocalRoot($t0), Reference($t1)
   0: if ($t0) goto 1 else goto 6
      # live_nodes: LocalRoot($t0), Reference($t1)
-  1: label L0
+  1: label L1
      # live_nodes: LocalRoot($t0), Reference($t1)
   2: $t3 := borrow_field<TestMutRef::V>.is($t1)
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t3)
@@ -1038,12 +1013,11 @@ fun TestMutRef::return_ref_different_path_vec($t0|b: bool, $t1|x: &mut TestMutRe
      # borrows_from: Reference($t3) -> {(.is (vector<u64>), Reference($t1))}
   4: $t2 := vector::borrow_mut<u64>($t3, $t4)
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-     # moved_nodes: Reference($t3)
      # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3))}, Reference($t3) -> {([], Reference($t2))}
      # borrows_from: Reference($t2) -> {([], Reference($t3))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}
   5: goto 10
      # live_nodes: LocalRoot($t0), Reference($t1)
-  6: label L2
+  6: label L0
      # live_nodes: LocalRoot($t0), Reference($t1)
   7: $t5 := borrow_field<TestMutRef::V>.is($t1)
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t5)
@@ -1055,17 +1029,14 @@ fun TestMutRef::return_ref_different_path_vec($t0|b: bool, $t1|x: &mut TestMutRe
      # borrows_from: Reference($t5) -> {(.is (vector<u64>), Reference($t1))}
   9: $t2 := vector::borrow_mut<u64>($t5, $t6)
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-     # moved_nodes: Reference($t3), Reference($t5)
      # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3)), (.is (vector<u64>), Reference($t5))}, Reference($t3) -> {([], Reference($t2))}, Reference($t5) -> {([], Reference($t2))}
      # borrows_from: Reference($t2) -> {([], Reference($t3)), ([], Reference($t5))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}, Reference($t5) -> {(.is (vector<u64>), Reference($t1))}
- 10: label L3
+ 10: label L2
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-     # moved_nodes: Reference($t3), Reference($t5)
      # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3)), (.is (vector<u64>), Reference($t5))}, Reference($t3) -> {([], Reference($t2))}, Reference($t5) -> {([], Reference($t2))}
      # borrows_from: Reference($t2) -> {([], Reference($t3)), ([], Reference($t5))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}, Reference($t5) -> {(.is (vector<u64>), Reference($t1))}
  11: trace_local[x]($t1)
      # live_nodes: LocalRoot($t0), Reference($t2)
-     # moved_nodes: Reference($t3), Reference($t5)
      # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3)), (.is (vector<u64>), Reference($t5))}, Reference($t3) -> {([], Reference($t2))}, Reference($t5) -> {([], Reference($t2))}
      # borrows_from: Reference($t2) -> {([], Reference($t3)), ([], Reference($t5))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}, Reference($t5) -> {(.is (vector<u64>), Reference($t1))}
  12: return $t2
@@ -1083,7 +1054,7 @@ fun TestMutRef::return_ref_different_path_vec2($t0|b: bool, $t1|x: &mut TestMutR
      # live_nodes: LocalRoot($t0), Reference($t1)
   0: if ($t0) goto 1 else goto 6
      # live_nodes: LocalRoot($t0), Reference($t1)
-  1: label L0
+  1: label L1
      # live_nodes: LocalRoot($t0), Reference($t1)
   2: $t3 := borrow_field<TestMutRef::V>.is($t1)
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t3)
@@ -1095,12 +1066,11 @@ fun TestMutRef::return_ref_different_path_vec2($t0|b: bool, $t1|x: &mut TestMutR
      # borrows_from: Reference($t3) -> {(.is (vector<u64>), Reference($t1))}
   4: $t2 := vector::borrow_mut<u64>($t3, $t4)
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-     # moved_nodes: Reference($t3)
      # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3))}, Reference($t3) -> {([], Reference($t2))}
      # borrows_from: Reference($t2) -> {([], Reference($t3))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}
   5: goto 11
      # live_nodes: LocalRoot($t0), Reference($t1)
-  6: label L2
+  6: label L0
      # live_nodes: LocalRoot($t0), Reference($t1)
   7: $t5 := borrow_field<TestMutRef::V>.ts($t1)
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t5)
@@ -1112,22 +1082,18 @@ fun TestMutRef::return_ref_different_path_vec2($t0|b: bool, $t1|x: &mut TestMutR
      # borrows_from: Reference($t5) -> {(.ts (vector<TestMutRef::T>), Reference($t1))}
   9: $t7 := vector::borrow_mut<TestMutRef::T>($t5, $t6)
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t7)
-     # moved_nodes: Reference($t5)
      # borrowed_by: Reference($t1) -> {(.ts (vector<TestMutRef::T>), Reference($t5))}, Reference($t5) -> {([], Reference($t7))}
      # borrows_from: Reference($t5) -> {(.ts (vector<TestMutRef::T>), Reference($t1))}, Reference($t7) -> {([], Reference($t5))}
  10: $t2 := borrow_field<TestMutRef::T>.value($t7)
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-     # moved_nodes: Reference($t3), Reference($t5)
      # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3)), (.ts (vector<TestMutRef::T>), Reference($t5))}, Reference($t3) -> {([], Reference($t2))}, Reference($t5) -> {([], Reference($t7))}, Reference($t7) -> {(.value (u64), Reference($t2))}
      # borrows_from: Reference($t2) -> {([], Reference($t3)), (.value (u64), Reference($t7))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}, Reference($t5) -> {(.ts (vector<TestMutRef::T>), Reference($t1))}, Reference($t7) -> {([], Reference($t5))}
- 11: label L3
+ 11: label L2
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-     # moved_nodes: Reference($t3), Reference($t5)
      # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3)), (.ts (vector<TestMutRef::T>), Reference($t5))}, Reference($t3) -> {([], Reference($t2))}, Reference($t5) -> {([], Reference($t7))}, Reference($t7) -> {(.value (u64), Reference($t2))}
      # borrows_from: Reference($t2) -> {([], Reference($t3)), (.value (u64), Reference($t7))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}, Reference($t5) -> {(.ts (vector<TestMutRef::T>), Reference($t1))}, Reference($t7) -> {([], Reference($t5))}
  12: trace_local[x]($t1)
      # live_nodes: LocalRoot($t0), Reference($t2)
-     # moved_nodes: Reference($t3), Reference($t5)
      # borrowed_by: Reference($t1) -> {(.is (vector<u64>), Reference($t3)), (.ts (vector<TestMutRef::T>), Reference($t5))}, Reference($t3) -> {([], Reference($t2))}, Reference($t5) -> {([], Reference($t7))}, Reference($t7) -> {(.value (u64), Reference($t2))}
      # borrows_from: Reference($t2) -> {([], Reference($t3)), (.value (u64), Reference($t7))}, Reference($t3) -> {(.is (vector<u64>), Reference($t1))}, Reference($t5) -> {(.ts (vector<TestMutRef::T>), Reference($t1))}, Reference($t7) -> {([], Reference($t5))}
  13: return $t2
@@ -1140,7 +1106,7 @@ fun TestMutRef::return_ref_different_root($t0|b: bool, $t1|x: &mut TestMutRef::T
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
   0: if ($t0) goto 1 else goto 5
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-  1: label L0
+  1: label L1
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
   2: destroy($t2)
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
@@ -1150,7 +1116,7 @@ fun TestMutRef::return_ref_different_root($t0|b: bool, $t1|x: &mut TestMutRef::T
      # borrows_from: Reference($t3) -> {(.value (u64), Reference($t1))}
   4: goto 8
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
-  5: label L2
+  5: label L0
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
   6: destroy($t1)
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2)
@@ -1158,7 +1124,7 @@ fun TestMutRef::return_ref_different_root($t0|b: bool, $t1|x: &mut TestMutRef::T
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
      # borrowed_by: Reference($t1) -> {(.value (u64), Reference($t3))}, Reference($t2) -> {(.value (u64), Reference($t3))}
      # borrows_from: Reference($t3) -> {(.value (u64), Reference($t1)), (.value (u64), Reference($t2))}
-  8: label L3
+  8: label L2
      # live_nodes: LocalRoot($t0), Reference($t1), Reference($t2), Reference($t3)
      # borrowed_by: Reference($t1) -> {(.value (u64), Reference($t3))}, Reference($t2) -> {(.value (u64), Reference($t3))}
      # borrows_from: Reference($t3) -> {(.value (u64), Reference($t1)), (.value (u64), Reference($t2))}
diff --git a/language/move-prover/bytecode/tests/data_invariant_instrumentation/borrow.exp b/language/move-prover/bytecode/tests/data_invariant_instrumentation/borrow.exp
index ea4a2c952f..ab580064b0 100644
--- a/language/move-prover/bytecode/tests/data_invariant_instrumentation/borrow.exp
+++ b/language/move-prover/bytecode/tests/data_invariant_instrumentation/borrow.exp
@@ -2,19 +2,15 @@
 
 [variant baseline]
 public fun Test::test_borrow_imm<#0>(): u64 {
-     var $t0|r: &Test::R<#0>
-     var $t1: address
-     var $t2: &Test::R<#0>
-     var $t3: &Test::R<#0>
-     var $t4: &u64
-     var $t5: u64
-  0: $t1 := 0x1
-  1: $t2 := borrow_global<Test::R<#0>>($t1)
-  2: $t0 := $t2
-  3: $t3 := move($t0)
-  4: $t4 := borrow_field<Test::R<#0>>.x($t3)
-  5: $t5 := read_ref($t4)
-  6: return $t5
+     var $t0: address
+     var $t1: &Test::R<#0>
+     var $t2: &u64
+     var $t3: u64
+  0: $t0 := 0x1
+  1: $t1 := borrow_global<Test::R<#0>>($t0)
+  2: $t2 := borrow_field<Test::R<#0>>.x($t1)
+  3: $t3 := read_ref($t2)
+  4: return $t3
 }
 
 
@@ -95,19 +91,18 @@ public fun Test::test_borrow_mut_local(): Test::R<u64> {
 
 [variant verification]
 public fun Test::test_borrow_imm<#0>(): u64 {
-     var $t0|r: Test::R<#0>
-     var $t1: address
-     var $t2: Test::R<#0>
-     var $t3: num
-     var $t4: u64
+     var $t0: address
+     var $t1: Test::R<#0>
+     var $t2: num
+     var $t3: u64
   0: assume forall $rsc: ResourceDomain<Test::R<#0>>(): And(WellFormed($rsc), And(Gt(select Test::R.x($rsc), select Test::S.y(select Test::R.s($rsc))), Gt(select Test::S.y(select Test::R.s($rsc)), 0)))
-  1: $t1 := 0x1
-  2: $t2 := get_global<Test::R<#0>>($t1) on_abort goto 6 with $t3
-  3: $t4 := get_field<Test::R<#0>>.x($t2)
+  1: $t0 := 0x1
+  2: $t1 := get_global<Test::R<#0>>($t0) on_abort goto 6 with $t2
+  3: $t3 := get_field<Test::R<#0>>.x($t1)
   4: label L1
-  5: return $t4
+  5: return $t3
   6: label L2
-  7: abort($t3)
+  7: abort($t2)
 }
 
 
diff --git a/language/move-prover/bytecode/tests/data_invariant_instrumentation/pack.exp b/language/move-prover/bytecode/tests/data_invariant_instrumentation/pack.exp
index e15aca885c..afa97b8261 100644
--- a/language/move-prover/bytecode/tests/data_invariant_instrumentation/pack.exp
+++ b/language/move-prover/bytecode/tests/data_invariant_instrumentation/pack.exp
@@ -2,39 +2,35 @@
 
 [variant baseline]
 public fun Test::test_pack(): Test::R {
-     var $t0|r: Test::R
-     var $t1|s: Test::S
-     var $t2: u64
-     var $t3: u64
-     var $t4: Test::S
-     var $t5: Test::R
-  0: $t2 := 3
-  1: $t3 := 1
-  2: $t4 := pack Test::S($t3)
-  3: $t5 := pack Test::R($t2, $t4)
-  4: return $t5
+     var $t0: u64
+     var $t1: u64
+     var $t2: Test::S
+     var $t3: Test::R
+  0: $t0 := 3
+  1: $t1 := 1
+  2: $t2 := pack Test::S($t1)
+  3: $t3 := pack Test::R($t0, $t2)
+  4: return $t3
 }
 
 ============ after pipeline `data_invariant_instrumentation` ================
 
 [variant verification]
 public fun Test::test_pack(): Test::R {
-     var $t0|r: Test::R
-     var $t1|s: Test::S
-     var $t2: u64
-     var $t3: u64
-     var $t4: Test::S
-     var $t5: Test::R
-  0: $t2 := 3
-  1: $t3 := 1
-  2: $t4 := pack Test::S($t3)
+     var $t0: u64
+     var $t1: u64
+     var $t2: Test::S
+     var $t3: Test::R
+  0: $t0 := 3
+  1: $t1 := 1
+  2: $t2 := pack Test::S($t1)
      # data invariant at tests/data_invariant_instrumentation/pack.move:16:9+16
      # VC: data invariant does not hold at tests/data_invariant_instrumentation/pack.move:16:9+16
-  3: assert Gt(select Test::S.y($t4), 0)
-  4: $t5 := pack Test::R($t2, $t4)
+  3: assert Gt(select Test::S.y($t2), 0)
+  4: $t3 := pack Test::R($t0, $t2)
      # data invariant at tests/data_invariant_instrumentation/pack.move:12:9+18
      # VC: data invariant does not hold at tests/data_invariant_instrumentation/pack.move:12:9+18
-  5: assert Gt(select Test::R.x($t5), select Test::S.y(select Test::R.s($t5)))
+  5: assert Gt(select Test::R.x($t3), select Test::S.y(select Test::R.s($t3)))
   6: label L1
-  7: return $t5
+  7: return $t3
 }
diff --git a/language/move-prover/bytecode/tests/data_invariant_instrumentation/params.exp b/language/move-prover/bytecode/tests/data_invariant_instrumentation/params.exp
index 549766c594..4ec2addfcb 100644
--- a/language/move-prover/bytecode/tests/data_invariant_instrumentation/params.exp
+++ b/language/move-prover/bytecode/tests/data_invariant_instrumentation/params.exp
@@ -14,6 +14,12 @@ public fun Test::test_param($t0|_simple_R: Test::R, $t1|_ref_R: Test::R, $t2|_si
   2: assume And(WellFormed($t2), Gt(select Test::S.y($t2), 0))
   3: assume And(WellFormed($t3), And(Gt(select Test::R.x($t3), select Test::S.y(select Test::R.s($t3))), Gt(select Test::S.y(select Test::R.s($t3)), 0)))
   4: trace_local[_mut_R]($t3)
-  5: label L1
-  6: return ()
+     # data invariant at tests/data_invariant_instrumentation/params.move:12:9+18
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/params.move:12:9+18
+  5: assert Gt(select Test::R.x($t3), select Test::S.y(select Test::R.s($t3)))
+     # data invariant at tests/data_invariant_instrumentation/params.move:16:9+16
+     # VC: data invariant does not hold at tests/data_invariant_instrumentation/params.move:16:9+16
+  6: assert Gt(select Test::S.y(select Test::R.s($t3)), 0)
+  7: label L1
+  8: return ()
 }
diff --git a/language/move-prover/bytecode/tests/eliminate_imm_refs/basic_test.exp b/language/move-prover/bytecode/tests/eliminate_imm_refs/basic_test.exp
index f208761943..c1760b21b2 100644
--- a/language/move-prover/bytecode/tests/eliminate_imm_refs/basic_test.exp
+++ b/language/move-prover/bytecode/tests/eliminate_imm_refs/basic_test.exp
@@ -3,181 +3,174 @@
 [variant baseline]
 fun TestEliminateImmRefs::test1(): TestEliminateImmRefs::R {
      var $t0|r: TestEliminateImmRefs::R
-     var $t1|r_ref: &mut TestEliminateImmRefs::R
-     var $t2|x_ref: &mut u64
-     var $t3: u64
-     var $t4: TestEliminateImmRefs::R
-     var $t5: &mut TestEliminateImmRefs::R
-     var $t6: &mut TestEliminateImmRefs::R
+     var $t1|x_ref: &mut u64
+     var $t2: u64
+     var $t3: TestEliminateImmRefs::R
+     var $t4: &mut TestEliminateImmRefs::R
+     var $t5: &mut u64
+     var $t6: u64
      var $t7: &mut u64
-     var $t8: u64
-     var $t9: &mut u64
-     var $t10: TestEliminateImmRefs::R
-  0: $t3 := 3
-  1: $t4 := pack TestEliminateImmRefs::R($t3)
-  2: $t0 := $t4
-  3: $t5 := borrow_local($t0)
-  4: $t1 := $t5
-  5: $t6 := move($t1)
-  6: $t7 := borrow_field<TestEliminateImmRefs::R>.x($t6)
-  7: $t2 := $t7
-  8: $t8 := 0
-  9: $t9 := move($t2)
- 10: write_ref($t9, $t8)
- 11: $t10 := move($t0)
- 12: return $t10
+     var $t8: TestEliminateImmRefs::R
+  0: $t2 := 3
+  1: $t3 := pack TestEliminateImmRefs::R($t2)
+  2: $t0 := $t3
+  3: $t4 := borrow_local($t0)
+  4: $t5 := borrow_field<TestEliminateImmRefs::R>.x($t4)
+  5: $t1 := $t5
+  6: $t6 := 0
+  7: $t7 := move($t1)
+  8: write_ref($t7, $t6)
+  9: $t8 := move($t0)
+ 10: return $t8
 }
 
 
 [variant baseline]
 fun TestEliminateImmRefs::test2(): u64 {
      var $t0|r: TestEliminateImmRefs::R
-     var $t1|r_ref: &TestEliminateImmRefs::R
-     var $t2|x_ref: &u64
-     var $t3: u64
-     var $t4: TestEliminateImmRefs::R
-     var $t5: &TestEliminateImmRefs::R
-     var $t6: &TestEliminateImmRefs::R
-     var $t7: &u64
-     var $t8: &u64
-     var $t9: u64
-  0: $t3 := 3
-  1: $t4 := pack TestEliminateImmRefs::R($t3)
-  2: $t0 := $t4
-  3: $t5 := borrow_local($t0)
-  4: $t1 := $t5
-  5: $t6 := move($t1)
-  6: $t7 := borrow_field<TestEliminateImmRefs::R>.x($t6)
-  7: $t2 := $t7
-  8: $t8 := move($t2)
-  9: $t9 := read_ref($t8)
- 10: return $t9
+     var $t1: u64
+     var $t2: TestEliminateImmRefs::R
+     var $t3: &TestEliminateImmRefs::R
+     var $t4: &u64
+     var $t5: u64
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateImmRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := borrow_field<TestEliminateImmRefs::R>.x($t3)
+  5: $t5 := read_ref($t4)
+  6: return $t5
 }
 
 
 [variant baseline]
 fun TestEliminateImmRefs::test3($t0|r_ref: &TestEliminateImmRefs::R): u64 {
-     var $t1|x_ref: &u64
-     var $t2: &TestEliminateImmRefs::R
-     var $t3: &u64
-     var $t4: &u64
-     var $t5: u64
-  0: $t2 := move($t0)
-  1: $t3 := borrow_field<TestEliminateImmRefs::R>.x($t2)
-  2: $t1 := $t3
-  3: $t4 := move($t1)
-  4: $t5 := read_ref($t4)
-  5: return $t5
+     var $t1: &TestEliminateImmRefs::R
+     var $t2: &u64
+     var $t3: u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<TestEliminateImmRefs::R>.x($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
 }
 
 
 [variant baseline]
 fun TestEliminateImmRefs::test4(): u64 {
      var $t0|r: TestEliminateImmRefs::R
-     var $t1|r_ref: &TestEliminateImmRefs::R
+     var $t1: u64
+     var $t2: TestEliminateImmRefs::R
+     var $t3: &TestEliminateImmRefs::R
+     var $t4: u64
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateImmRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := TestEliminateImmRefs::test3($t3)
+  5: return $t4
+}
+
+
+[variant baseline]
+fun TestEliminateImmRefs::test5(): TestEliminateImmRefs::R {
+     var $t0|r: TestEliminateImmRefs::R
+     var $t1: u64
+     var $t2: TestEliminateImmRefs::R
+     var $t3: &TestEliminateImmRefs::R
+     var $t4: TestEliminateImmRefs::R
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateImmRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: destroy($t3)
+  5: $t4 := move($t0)
+  6: return $t4
+}
+
+============ after pipeline `eliminate_imm_refs` ================
+
+[variant baseline]
+fun TestEliminateImmRefs::test1(): TestEliminateImmRefs::R {
+     var $t0|r: TestEliminateImmRefs::R
+     var $t1|x_ref: &mut u64
      var $t2: u64
      var $t3: TestEliminateImmRefs::R
-     var $t4: &TestEliminateImmRefs::R
-     var $t5: &TestEliminateImmRefs::R
+     var $t4: &mut TestEliminateImmRefs::R
+     var $t5: &mut u64
      var $t6: u64
+     var $t7: &mut u64
+     var $t8: TestEliminateImmRefs::R
   0: $t2 := 3
   1: $t3 := pack TestEliminateImmRefs::R($t2)
   2: $t0 := $t3
   3: $t4 := borrow_local($t0)
-  4: $t1 := $t4
-  5: $t5 := move($t1)
-  6: $t6 := TestEliminateImmRefs::test3($t5)
-  7: return $t6
+  4: $t5 := borrow_field<TestEliminateImmRefs::R>.x($t4)
+  5: $t1 := $t5
+  6: $t6 := 0
+  7: $t7 := move($t1)
+  8: write_ref($t7, $t6)
+  9: $t8 := move($t0)
+ 10: return $t8
 }
 
-============ after pipeline `eliminate_imm_refs` ================
 
 [variant baseline]
-fun TestEliminateImmRefs::test1(): TestEliminateImmRefs::R {
+fun TestEliminateImmRefs::test2(): u64 {
      var $t0|r: TestEliminateImmRefs::R
-     var $t1|r_ref: &mut TestEliminateImmRefs::R
-     var $t2|x_ref: &mut u64
-     var $t3: u64
-     var $t4: TestEliminateImmRefs::R
-     var $t5: &mut TestEliminateImmRefs::R
-     var $t6: &mut TestEliminateImmRefs::R
-     var $t7: &mut u64
-     var $t8: u64
-     var $t9: &mut u64
-     var $t10: TestEliminateImmRefs::R
-  0: $t3 := 3
-  1: $t4 := pack TestEliminateImmRefs::R($t3)
-  2: $t0 := $t4
-  3: $t5 := borrow_local($t0)
-  4: $t1 := $t5
-  5: $t6 := move($t1)
-  6: $t7 := borrow_field<TestEliminateImmRefs::R>.x($t6)
-  7: $t2 := $t7
-  8: $t8 := 0
-  9: $t9 := move($t2)
- 10: write_ref($t9, $t8)
- 11: $t10 := move($t0)
- 12: return $t10
+     var $t1: u64
+     var $t2: TestEliminateImmRefs::R
+     var $t3: TestEliminateImmRefs::R
+     var $t4: u64
+     var $t5: u64
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateImmRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := copy($t0)
+  4: $t4 := get_field<TestEliminateImmRefs::R>.x($t3)
+  5: $t5 := move($t4)
+  6: return $t5
 }
 
 
 [variant baseline]
-fun TestEliminateImmRefs::test2(): u64 {
-     var $t0|r: TestEliminateImmRefs::R
-     var $t1|r_ref: TestEliminateImmRefs::R
-     var $t2|x_ref: u64
+fun TestEliminateImmRefs::test3($t0|r_ref: TestEliminateImmRefs::R): u64 {
+     var $t1: TestEliminateImmRefs::R
+     var $t2: u64
      var $t3: u64
-     var $t4: TestEliminateImmRefs::R
-     var $t5: TestEliminateImmRefs::R
-     var $t6: TestEliminateImmRefs::R
-     var $t7: u64
-     var $t8: u64
-     var $t9: u64
-  0: $t3 := 3
-  1: $t4 := pack TestEliminateImmRefs::R($t3)
-  2: $t0 := $t4
-  3: $t5 := copy($t0)
-  4: $t1 := $t5
-  5: $t6 := move($t1)
-  6: $t7 := get_field<TestEliminateImmRefs::R>.x($t6)
-  7: $t2 := $t7
-  8: $t8 := move($t2)
-  9: $t9 := move($t8)
- 10: return $t9
+  0: $t1 := move($t0)
+  1: $t2 := get_field<TestEliminateImmRefs::R>.x($t1)
+  2: $t3 := move($t2)
+  3: return $t3
 }
 
 
 [variant baseline]
-fun TestEliminateImmRefs::test3($t0|r_ref: TestEliminateImmRefs::R): u64 {
-     var $t1|x_ref: u64
+fun TestEliminateImmRefs::test4(): u64 {
+     var $t0|r: TestEliminateImmRefs::R
+     var $t1: u64
      var $t2: TestEliminateImmRefs::R
-     var $t3: u64
+     var $t3: TestEliminateImmRefs::R
      var $t4: u64
-     var $t5: u64
-  0: $t2 := move($t0)
-  1: $t3 := get_field<TestEliminateImmRefs::R>.x($t2)
-  2: $t1 := $t3
-  3: $t4 := move($t1)
-  4: $t5 := move($t4)
-  5: return $t5
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateImmRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := copy($t0)
+  4: $t4 := TestEliminateImmRefs::test3($t3)
+  5: return $t4
 }
 
 
 [variant baseline]
-fun TestEliminateImmRefs::test4(): u64 {
+fun TestEliminateImmRefs::test5(): TestEliminateImmRefs::R {
      var $t0|r: TestEliminateImmRefs::R
-     var $t1|r_ref: TestEliminateImmRefs::R
-     var $t2: u64
+     var $t1: u64
+     var $t2: TestEliminateImmRefs::R
      var $t3: TestEliminateImmRefs::R
      var $t4: TestEliminateImmRefs::R
-     var $t5: TestEliminateImmRefs::R
-     var $t6: u64
-  0: $t2 := 3
-  1: $t3 := pack TestEliminateImmRefs::R($t2)
-  2: $t0 := $t3
-  3: $t4 := copy($t0)
-  4: $t1 := $t4
-  5: $t5 := move($t1)
-  6: $t6 := TestEliminateImmRefs::test3($t5)
-  7: return $t6
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateImmRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := copy($t0)
+  4: $t4 := move($t0)
+  5: return $t4
 }
diff --git a/language/move-prover/bytecode/tests/eliminate_imm_refs/basic_test.move b/language/move-prover/bytecode/tests/eliminate_imm_refs/basic_test.move
index 95358d749e..8dada99bc3 100644
--- a/language/move-prover/bytecode/tests/eliminate_imm_refs/basic_test.move
+++ b/language/move-prover/bytecode/tests/eliminate_imm_refs/basic_test.move
@@ -29,4 +29,11 @@ module 0x42::TestEliminateImmRefs {
         let r_ref = & r;
         test3(r_ref)
     }
+
+    fun test5() : R {
+        let r = R {x: 3};
+        let p = &r;
+        let _ = p;
+        r
+    }
 }
diff --git a/language/move-prover/bytecode/tests/escape_analysis/global_spec_relevance.exp b/language/move-prover/bytecode/tests/escape_analysis/global_spec_relevance.exp
index 6c69c91a6d..6ca06c565b 100644
--- a/language/move-prover/bytecode/tests/escape_analysis/global_spec_relevance.exp
+++ b/language/move-prover/bytecode/tests/escape_analysis/global_spec_relevance.exp
@@ -48,17 +48,19 @@ public fun GlobalSpecRelevance::publish($t0|account: &signer, $t1|n: GlobalSpecR
   2: $t4 := read_ref($t3)
   3: $t5 := 0
   4: $t6 := >($t4, $t5)
-  5: if ($t6) goto 11 else goto 6
+  5: if ($t6) goto 6 else goto 8
   6: label L1
-  7: $t7 := move($t0)
-  8: destroy($t7)
-  9: $t8 := 0
- 10: abort($t8)
- 11: label L0
- 12: $t9 := move($t0)
- 13: $t10 := move($t1)
- 14: move_to<GlobalSpecRelevance::Nonzero>($t10, $t9)
- 15: return ()
+  7: goto 13
+  8: label L0
+  9: $t7 := move($t0)
+ 10: destroy($t7)
+ 11: $t8 := 0
+ 12: abort($t8)
+ 13: label L2
+ 14: $t9 := move($t0)
+ 15: $t10 := move($t1)
+ 16: move_to<GlobalSpecRelevance::Nonzero>($t10, $t9)
+ 17: return ()
 }
 
 ============ after pipeline `escape_analysis` ================
@@ -111,17 +113,19 @@ public fun GlobalSpecRelevance::publish($t0|account: &signer, $t1|n: GlobalSpecR
   2: $t4 := read_ref($t3)
   3: $t5 := 0
   4: $t6 := >($t4, $t5)
-  5: if ($t6) goto 11 else goto 6
+  5: if ($t6) goto 6 else goto 8
   6: label L1
-  7: $t7 := move($t0)
-  8: destroy($t7)
-  9: $t8 := 0
- 10: abort($t8)
- 11: label L0
- 12: $t9 := move($t0)
- 13: $t10 := move($t1)
- 14: move_to<GlobalSpecRelevance::Nonzero>($t10, $t9)
- 15: return ()
+  7: goto 13
+  8: label L0
+  9: $t7 := move($t0)
+ 10: destroy($t7)
+ 11: $t8 := 0
+ 12: abort($t8)
+ 13: label L2
+ 14: $t9 := move($t0)
+ 15: $t10 := move($t1)
+ 16: move_to<GlobalSpecRelevance::Nonzero>($t10, $t9)
+ 17: return ()
 }
 
 ============ Diagnostics ================
diff --git a/language/move-prover/bytecode/tests/escape_analysis/return_internal_refs.exp b/language/move-prover/bytecode/tests/escape_analysis/return_internal_refs.exp
index f0bace1aef..dc88e942fc 100644
--- a/language/move-prover/bytecode/tests/escape_analysis/return_internal_refs.exp
+++ b/language/move-prover/bytecode/tests/escape_analysis/return_internal_refs.exp
@@ -22,20 +22,20 @@ fun LeakInternalRefs::leak_in_branch($t0|b: bool, $t1|x: &mut u64, $t2|s: &mut L
      var $t10: &mut u64
   0: $t4 := move($t0)
   1: if ($t4) goto 2 else goto 8
-  2: label L0
+  2: label L1
   3: $t5 := move($t2)
   4: destroy($t5)
   5: $t6 := move($t1)
   6: $t3 := $t6
   7: goto 15
-  8: label L2
+  8: label L0
   9: $t7 := move($t1)
  10: destroy($t7)
  11: $t8 := move($t2)
  12: $t9 := borrow_field<LeakInternalRefs::S>.f($t8)
  13: $t3 := $t9
  14: goto 15
- 15: label L3
+ 15: label L2
  16: $t10 := move($t3)
  17: return $t10
 }
@@ -62,33 +62,35 @@ fun LeakInternalRefs::leak_in_loop($t0|x: &mut u64, $t1|s: &mut LeakInternalRefs
   0: $t3 := 0
   1: $t2 := $t3
   2: goto 3
-  3: label L6
+  3: label L5
   4: $t4 := copy($t2)
   5: $t5 := 10
   6: $t6 := <($t4, $t5)
-  7: if ($t6) goto 8 else goto 25
-  8: label L0
-  9: $t7 := copy($t2)
- 10: $t8 := 7
- 11: $t9 := ==($t7, $t8)
- 12: if ($t9) goto 13 else goto 19
- 13: label L3
- 14: $t10 := move($t0)
- 15: destroy($t10)
- 16: $t11 := move($t1)
- 17: $t12 := borrow_field<LeakInternalRefs::S>.f($t11)
- 18: return $t12
- 19: label L5
- 20: $t13 := move($t2)
- 21: $t14 := 1
- 22: $t15 := +($t13, $t14)
- 23: $t2 := $t15
- 24: goto 3
- 25: label L2
- 26: $t16 := move($t1)
- 27: destroy($t16)
- 28: $t17 := move($t0)
- 29: return $t17
+  7: if ($t6) goto 8 else goto 27
+  8: label L1
+  9: goto 10
+ 10: label L2
+ 11: $t7 := copy($t2)
+ 12: $t8 := 7
+ 13: $t9 := ==($t7, $t8)
+ 14: if ($t9) goto 15 else goto 21
+ 15: label L4
+ 16: $t10 := move($t0)
+ 17: destroy($t10)
+ 18: $t11 := move($t1)
+ 19: $t12 := borrow_field<LeakInternalRefs::S>.f($t11)
+ 20: return $t12
+ 21: label L3
+ 22: $t13 := move($t2)
+ 23: $t14 := 1
+ 24: $t15 := +($t13, $t14)
+ 25: $t2 := $t15
+ 26: goto 3
+ 27: label L0
+ 28: $t16 := move($t1)
+ 29: destroy($t16)
+ 30: $t17 := move($t0)
+ 31: return $t17
 }
 
 
@@ -152,20 +154,20 @@ fun LeakInternalRefs::leak_in_branch($t0|b: bool, $t1|x: &mut u64, $t2|s: &mut L
      var $t10: &mut u64
   0: $t4 := move($t0)
   1: if ($t4) goto 2 else goto 8
-  2: label L0
+  2: label L1
   3: $t5 := move($t2)
   4: destroy($t5)
   5: $t6 := move($t1)
   6: $t3 := $t6
   7: goto 15
-  8: label L2
+  8: label L0
   9: $t7 := move($t1)
  10: destroy($t7)
  11: $t8 := move($t2)
  12: $t9 := borrow_field<LeakInternalRefs::S>.f($t8)
  13: $t3 := $t9
  14: goto 15
- 15: label L3
+ 15: label L2
  16: $t10 := move($t3)
  17: return $t10
 }
@@ -192,33 +194,35 @@ fun LeakInternalRefs::leak_in_loop($t0|x: &mut u64, $t1|s: &mut LeakInternalRefs
   0: $t3 := 0
   1: $t2 := $t3
   2: goto 3
-  3: label L6
+  3: label L5
   4: $t4 := copy($t2)
   5: $t5 := 10
   6: $t6 := <($t4, $t5)
-  7: if ($t6) goto 8 else goto 25
-  8: label L0
-  9: $t7 := copy($t2)
- 10: $t8 := 7
- 11: $t9 := ==($t7, $t8)
- 12: if ($t9) goto 13 else goto 19
- 13: label L3
- 14: $t10 := move($t0)
- 15: destroy($t10)
- 16: $t11 := move($t1)
- 17: $t12 := borrow_field<LeakInternalRefs::S>.f($t11)
- 18: return $t12
- 19: label L5
- 20: $t13 := move($t2)
- 21: $t14 := 1
- 22: $t15 := +($t13, $t14)
- 23: $t2 := $t15
- 24: goto 3
- 25: label L2
- 26: $t16 := move($t1)
- 27: destroy($t16)
- 28: $t17 := move($t0)
- 29: return $t17
+  7: if ($t6) goto 8 else goto 27
+  8: label L1
+  9: goto 10
+ 10: label L2
+ 11: $t7 := copy($t2)
+ 12: $t8 := 7
+ 13: $t9 := ==($t7, $t8)
+ 14: if ($t9) goto 15 else goto 21
+ 15: label L4
+ 16: $t10 := move($t0)
+ 17: destroy($t10)
+ 18: $t11 := move($t1)
+ 19: $t12 := borrow_field<LeakInternalRefs::S>.f($t11)
+ 20: return $t12
+ 21: label L3
+ 22: $t13 := move($t2)
+ 23: $t14 := 1
+ 24: $t15 := +($t13, $t14)
+ 25: $t2 := $t15
+ 26: goto 3
+ 27: label L0
+ 28: $t16 := move($t1)
+ 29: destroy($t16)
+ 30: $t17 := move($t0)
+ 31: return $t17
 }
 
 
diff --git a/language/move-prover/bytecode/tests/escape_analysis/return_refs_into_vec.exp b/language/move-prover/bytecode/tests/escape_analysis/return_refs_into_vec.exp
index 107bfc1daa..4644b8bd04 100644
--- a/language/move-prover/bytecode/tests/escape_analysis/return_refs_into_vec.exp
+++ b/language/move-prover/bytecode/tests/escape_analysis/return_refs_into_vec.exp
@@ -28,6 +28,10 @@ public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
 public native fun vector::empty<#0>(): vector<#0>;
 
 
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
 [variant baseline]
 public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
 
@@ -130,6 +134,10 @@ public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
 public native fun vector::empty<#0>(): vector<#0>;
 
 
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
 [variant baseline]
 public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
 
diff --git a/language/move-prover/bytecode/tests/escape_analysis/struct_spec_relevance.exp b/language/move-prover/bytecode/tests/escape_analysis/struct_spec_relevance.exp
index 62c0e933e7..27801d2d05 100644
--- a/language/move-prover/bytecode/tests/escape_analysis/struct_spec_relevance.exp
+++ b/language/move-prover/bytecode/tests/escape_analysis/struct_spec_relevance.exp
@@ -12,15 +12,17 @@ public fun StructSpecRelevance::create($t0|i: u64, $t1|j: u64): StructSpecReleva
   0: $t2 := copy($t0)
   1: $t3 := 0
   2: $t4 := >($t2, $t3)
-  3: if ($t4) goto 7 else goto 4
+  3: if ($t4) goto 4 else goto 6
   4: label L1
-  5: $t5 := 0
-  6: abort($t5)
-  7: label L0
-  8: $t6 := move($t0)
-  9: $t7 := move($t1)
- 10: $t8 := pack StructSpecRelevance::Nonzero($t6, $t7)
- 11: return $t8
+  5: goto 9
+  6: label L0
+  7: $t5 := 0
+  8: abort($t5)
+  9: label L2
+ 10: $t6 := move($t0)
+ 11: $t7 := move($t1)
+ 12: $t8 := pack StructSpecRelevance::Nonzero($t6, $t7)
+ 13: return $t8
 }
 
 
@@ -57,15 +59,17 @@ public fun StructSpecRelevance::create($t0|i: u64, $t1|j: u64): StructSpecReleva
   0: $t2 := copy($t0)
   1: $t3 := 0
   2: $t4 := >($t2, $t3)
-  3: if ($t4) goto 7 else goto 4
+  3: if ($t4) goto 4 else goto 6
   4: label L1
-  5: $t5 := 0
-  6: abort($t5)
-  7: label L0
-  8: $t6 := move($t0)
-  9: $t7 := move($t1)
- 10: $t8 := pack StructSpecRelevance::Nonzero($t6, $t7)
- 11: return $t8
+  5: goto 9
+  6: label L0
+  7: $t5 := 0
+  8: abort($t5)
+  9: label L2
+ 10: $t6 := move($t0)
+ 11: $t7 := move($t1)
+ 12: $t8 := pack StructSpecRelevance::Nonzero($t6, $t7)
+ 13: return $t8
 }
 
 
diff --git a/language/move-prover/bytecode/tests/escape_analysis/vec_eq.exp b/language/move-prover/bytecode/tests/escape_analysis/vec_eq.exp
index 86bfa71e02..e43882546e 100644
--- a/language/move-prover/bytecode/tests/escape_analysis/vec_eq.exp
+++ b/language/move-prover/bytecode/tests/escape_analysis/vec_eq.exp
@@ -28,6 +28,10 @@ public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
 public native fun vector::empty<#0>(): vector<#0>;
 
 
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
 [variant baseline]
 public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
 
@@ -142,6 +146,10 @@ public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
 public native fun vector::empty<#0>(): vector<#0>;
 
 
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
 [variant baseline]
 public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
 
diff --git a/language/move-prover/bytecode/tests/from_move/regression_generic_and_native_type.exp b/language/move-prover/bytecode/tests/from_move/regression_generic_and_native_type.exp
index 3adb0bf627..acb0ba8b19 100644
--- a/language/move-prover/bytecode/tests/from_move/regression_generic_and_native_type.exp
+++ b/language/move-prover/bytecode/tests/from_move/regression_generic_and_native_type.exp
@@ -28,6 +28,10 @@ public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
 public native fun vector::empty<#0>(): vector<#0>;
 
 
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
 [variant baseline]
 public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
 
diff --git a/language/move-prover/bytecode/tests/from_move/smoke_test.exp b/language/move-prover/bytecode/tests/from_move/smoke_test.exp
index 89d473b4de..decb2607c2 100644
--- a/language/move-prover/bytecode/tests/from_move/smoke_test.exp
+++ b/language/move-prover/bytecode/tests/from_move/smoke_test.exp
@@ -32,10 +32,10 @@ fun SmokeTest::arithmetic_ops($t0|a: u64): (u64, u64) {
   3: $t4 := 2
   4: $t5 := !=($t3, $t4)
   5: if ($t5) goto 6 else goto 9
-  6: label L0
+  6: label L1
   7: $t6 := 42
   8: abort($t6)
-  9: label L2
+  9: label L0
  10: $t7 := move($t1)
  11: $t8 := move($t0)
  12: return ($t7, $t8)
@@ -75,17 +75,17 @@ fun SmokeTest::bool_ops($t0|a: u64, $t1|b: u64): (bool, bool) {
   1: $t7 := copy($t1)
   2: $t8 := >($t6, $t7)
   3: if ($t8) goto 4 else goto 10
-  4: label L0
+  4: label L1
   5: $t9 := copy($t0)
   6: $t10 := copy($t1)
   7: $t11 := >=($t9, $t10)
   8: $t2 := $t11
   9: goto 14
- 10: label L2
+ 10: label L0
  11: $t12 := false
  12: $t2 := $t12
  13: goto 14
- 14: label L3
+ 14: label L2
  15: $t13 := move($t2)
  16: $t4 := $t13
  17: $t14 := copy($t0)
@@ -96,13 +96,13 @@ fun SmokeTest::bool_ops($t0|a: u64, $t1|b: u64): (bool, bool) {
  22: $t17 := true
  23: $t3 := $t17
  24: goto 31
- 25: label L6
+ 25: label L3
  26: $t18 := move($t0)
  27: $t19 := move($t1)
  28: $t20 := <=($t18, $t19)
  29: $t3 := $t20
  30: goto 31
- 31: label L7
+ 31: label L5
  32: $t21 := move($t3)
  33: $t5 := $t21
  34: $t22 := copy($t4)
@@ -110,10 +110,10 @@ fun SmokeTest::bool_ops($t0|a: u64, $t1|b: u64): (bool, bool) {
  36: $t24 := !=($t22, $t23)
  37: $t25 := !($t24)
  38: if ($t25) goto 39 else goto 42
- 39: label L8
+ 39: label L7
  40: $t26 := 42
  41: abort($t26)
- 42: label L10
+ 42: label L6
  43: $t27 := move($t4)
  44: $t28 := move($t5)
  45: return ($t27, $t28)
@@ -122,25 +122,17 @@ fun SmokeTest::bool_ops($t0|a: u64, $t1|b: u64): (bool, bool) {
 
 [variant baseline]
 fun SmokeTest::borrow_global_mut_test($t0|a: address) {
-     var $t1|r: &mut SmokeTest::R
-     var $t2|r2: &mut SmokeTest::R
+     var $t1: address
+     var $t2: &mut SmokeTest::R
      var $t3: address
      var $t4: &mut SmokeTest::R
-     var $t5: &mut SmokeTest::R
-     var $t6: address
-     var $t7: &mut SmokeTest::R
-     var $t8: &mut SmokeTest::R
-  0: $t3 := copy($t0)
-  1: $t4 := borrow_global<SmokeTest::R>($t3)
-  2: $t1 := $t4
-  3: $t5 := move($t1)
-  4: destroy($t5)
-  5: $t6 := move($t0)
-  6: $t7 := borrow_global<SmokeTest::R>($t6)
-  7: $t2 := $t7
-  8: $t8 := move($t2)
-  9: destroy($t8)
- 10: return ()
+  0: $t1 := copy($t0)
+  1: $t2 := borrow_global<SmokeTest::R>($t1)
+  2: destroy($t2)
+  3: $t3 := move($t0)
+  4: $t4 := borrow_global<SmokeTest::R>($t3)
+  5: destroy($t4)
+  6: return ()
 }
 
 
@@ -196,43 +188,35 @@ fun SmokeTest::identity($t0|a: SmokeTest::A, $t1|b: SmokeTest::B, $t2|c: SmokeTe
 
 [variant baseline]
 fun SmokeTest::move_from_addr($t0|a: address) {
-     var $t1|r: SmokeTest::R
-     var $t2: address
-     var $t3: SmokeTest::R
-     var $t4: SmokeTest::R
-     var $t5: u64
-  0: $t2 := move($t0)
-  1: $t3 := move_from<SmokeTest::R>($t2)
-  2: $t1 := $t3
-  3: $t4 := move($t1)
-  4: $t5 := unpack SmokeTest::R($t4)
-  5: destroy($t5)
-  6: return ()
+     var $t1: address
+     var $t2: SmokeTest::R
+     var $t3: u64
+  0: $t1 := move($t0)
+  1: $t2 := move_from<SmokeTest::R>($t1)
+  2: $t3 := unpack SmokeTest::R($t2)
+  3: destroy($t3)
+  4: return ()
 }
 
 
 [variant baseline]
 fun SmokeTest::move_from_addr_to_sender($t0|sender: &signer, $t1|a: address) {
-     var $t2|r: SmokeTest::R
-     var $t3|x: u64
-     var $t4: address
-     var $t5: SmokeTest::R
-     var $t6: SmokeTest::R
+     var $t2|x: u64
+     var $t3: address
+     var $t4: SmokeTest::R
+     var $t5: u64
+     var $t6: &signer
      var $t7: u64
-     var $t8: &signer
-     var $t9: u64
-     var $t10: SmokeTest::R
-  0: $t4 := move($t1)
-  1: $t5 := move_from<SmokeTest::R>($t4)
-  2: $t2 := $t5
-  3: $t6 := move($t2)
-  4: $t7 := unpack SmokeTest::R($t6)
-  5: $t3 := $t7
-  6: $t8 := move($t0)
-  7: $t9 := move($t3)
-  8: $t10 := pack SmokeTest::R($t9)
-  9: move_to<SmokeTest::R>($t10, $t8)
- 10: return ()
+     var $t8: SmokeTest::R
+  0: $t3 := move($t1)
+  1: $t4 := move_from<SmokeTest::R>($t3)
+  2: $t5 := unpack SmokeTest::R($t4)
+  3: $t2 := $t5
+  4: $t6 := move($t0)
+  5: $t7 := move($t2)
+  6: $t8 := pack SmokeTest::R($t7)
+  7: move_to<SmokeTest::R>($t8, $t6)
+  8: return ()
 }
 
 
@@ -251,24 +235,20 @@ fun SmokeTest::pack_A($t0|a: address, $t1|va: u64): SmokeTest::A {
 [variant baseline]
 fun SmokeTest::pack_B($t0|a: address, $t1|va: u64, $t2|vb: u64): SmokeTest::B {
      var $t3|var_a: SmokeTest::A
-     var $t4|var_b: SmokeTest::B
-     var $t5: address
-     var $t6: u64
-     var $t7: SmokeTest::A
-     var $t8: u64
-     var $t9: SmokeTest::A
-     var $t10: SmokeTest::B
-     var $t11: SmokeTest::B
-  0: $t5 := move($t0)
-  1: $t6 := move($t1)
-  2: $t7 := pack SmokeTest::A($t5, $t6)
-  3: $t3 := $t7
-  4: $t8 := move($t2)
-  5: $t9 := move($t3)
-  6: $t10 := pack SmokeTest::B($t8, $t9)
-  7: $t4 := $t10
-  8: $t11 := move($t4)
-  9: return $t11
+     var $t4: address
+     var $t5: u64
+     var $t6: SmokeTest::A
+     var $t7: u64
+     var $t8: SmokeTest::A
+     var $t9: SmokeTest::B
+  0: $t4 := move($t0)
+  1: $t5 := move($t1)
+  2: $t6 := pack SmokeTest::A($t4, $t5)
+  3: $t3 := $t6
+  4: $t7 := move($t2)
+  5: $t8 := move($t3)
+  6: $t9 := pack SmokeTest::B($t7, $t8)
+  7: return $t9
 }
 
 
@@ -276,121 +256,93 @@ fun SmokeTest::pack_B($t0|a: address, $t1|va: u64, $t2|vb: u64): SmokeTest::B {
 fun SmokeTest::pack_C($t0|a: address, $t1|va: u64, $t2|vb: u64, $t3|vc: u64): SmokeTest::C {
      var $t4|var_a: SmokeTest::A
      var $t5|var_b: SmokeTest::B
-     var $t6|var_c: SmokeTest::C
-     var $t7: address
-     var $t8: u64
-     var $t9: SmokeTest::A
-     var $t10: u64
-     var $t11: SmokeTest::A
-     var $t12: SmokeTest::B
-     var $t13: u64
-     var $t14: SmokeTest::B
-     var $t15: SmokeTest::C
-     var $t16: SmokeTest::C
-  0: $t7 := move($t0)
-  1: $t8 := move($t1)
-  2: $t9 := pack SmokeTest::A($t7, $t8)
-  3: $t4 := $t9
-  4: $t10 := move($t2)
-  5: $t11 := move($t4)
-  6: $t12 := pack SmokeTest::B($t10, $t11)
-  7: $t5 := $t12
-  8: $t13 := move($t3)
-  9: $t14 := move($t5)
- 10: $t15 := pack SmokeTest::C($t13, $t14)
- 11: $t6 := $t15
- 12: $t16 := move($t6)
- 13: return $t16
+     var $t6: address
+     var $t7: u64
+     var $t8: SmokeTest::A
+     var $t9: u64
+     var $t10: SmokeTest::A
+     var $t11: SmokeTest::B
+     var $t12: u64
+     var $t13: SmokeTest::B
+     var $t14: SmokeTest::C
+  0: $t6 := move($t0)
+  1: $t7 := move($t1)
+  2: $t8 := pack SmokeTest::A($t6, $t7)
+  3: $t4 := $t8
+  4: $t9 := move($t2)
+  5: $t10 := move($t4)
+  6: $t11 := pack SmokeTest::B($t9, $t10)
+  7: $t5 := $t11
+  8: $t12 := move($t3)
+  9: $t13 := move($t5)
+ 10: $t14 := pack SmokeTest::C($t12, $t13)
+ 11: return $t14
 }
 
 
 [variant baseline]
 fun SmokeTest::ref_A($t0|a: address, $t1|b: bool): SmokeTest::A {
      var $t2|tmp#$2: SmokeTest::A
-     var $t3|b_val_ref: &u64
-     var $t4|b_var: u64
-     var $t5|var_a: SmokeTest::A
-     var $t6|var_a_ref: &SmokeTest::A
-     var $t7: bool
+     var $t3|var_a: SmokeTest::A
+     var $t4: bool
+     var $t5: address
+     var $t6: u64
+     var $t7: SmokeTest::A
      var $t8: address
      var $t9: u64
      var $t10: SmokeTest::A
-     var $t11: address
-     var $t12: u64
-     var $t13: SmokeTest::A
-     var $t14: SmokeTest::A
-     var $t15: &SmokeTest::A
-     var $t16: &SmokeTest::A
-     var $t17: &u64
-     var $t18: &u64
-     var $t19: u64
-     var $t20: u64
-     var $t21: u64
-     var $t22: bool
-     var $t23: u64
-     var $t24: SmokeTest::A
-  0: $t7 := move($t1)
-  1: if ($t7) goto 2 else goto 8
-  2: label L0
-  3: $t8 := move($t0)
-  4: $t9 := 1
-  5: $t10 := pack SmokeTest::A($t8, $t9)
-  6: $t2 := $t10
+     var $t11: SmokeTest::A
+     var $t12: &SmokeTest::A
+     var $t13: &u64
+     var $t14: u64
+     var $t15: u64
+     var $t16: bool
+     var $t17: u64
+     var $t18: SmokeTest::A
+  0: $t4 := move($t1)
+  1: if ($t4) goto 2 else goto 8
+  2: label L1
+  3: $t5 := move($t0)
+  4: $t6 := 1
+  5: $t7 := pack SmokeTest::A($t5, $t6)
+  6: $t2 := $t7
   7: goto 14
-  8: label L2
-  9: $t11 := move($t0)
- 10: $t12 := 42
- 11: $t13 := pack SmokeTest::A($t11, $t12)
- 12: $t2 := $t13
+  8: label L0
+  9: $t8 := move($t0)
+ 10: $t9 := 42
+ 11: $t10 := pack SmokeTest::A($t8, $t9)
+ 12: $t2 := $t10
  13: goto 14
- 14: label L3
- 15: $t14 := move($t2)
- 16: $t5 := $t14
- 17: $t15 := borrow_local($t5)
- 18: $t6 := $t15
- 19: $t16 := move($t6)
- 20: $t17 := borrow_field<SmokeTest::A>.val($t16)
- 21: $t3 := $t17
- 22: $t18 := move($t3)
- 23: $t19 := read_ref($t18)
- 24: $t4 := $t19
- 25: $t20 := move($t4)
- 26: $t21 := 42
- 27: $t22 := !=($t20, $t21)
- 28: if ($t22) goto 29 else goto 32
- 29: label L4
- 30: $t23 := 42
- 31: abort($t23)
- 32: label L6
- 33: $t24 := move($t5)
- 34: return $t24
+ 14: label L2
+ 15: $t11 := move($t2)
+ 16: $t3 := $t11
+ 17: $t12 := borrow_local($t3)
+ 18: $t13 := borrow_field<SmokeTest::A>.val($t12)
+ 19: $t14 := read_ref($t13)
+ 20: $t15 := 42
+ 21: $t16 := !=($t14, $t15)
+ 22: if ($t16) goto 23 else goto 26
+ 23: label L4
+ 24: $t17 := 42
+ 25: abort($t17)
+ 26: label L3
+ 27: $t18 := move($t3)
+ 28: return $t18
 }
 
 
 [variant baseline]
 fun SmokeTest::unpack_A($t0|a: address, $t1|va: u64): (address, u64) {
-     var $t2|aa: address
-     var $t3|v1: u64
-     var $t4|var_a: SmokeTest::A
+     var $t2: address
+     var $t3: u64
+     var $t4: SmokeTest::A
      var $t5: address
      var $t6: u64
-     var $t7: SmokeTest::A
-     var $t8: SmokeTest::A
-     var $t9: address
-     var $t10: u64
-     var $t11: address
-     var $t12: u64
-  0: $t5 := move($t0)
-  1: $t6 := move($t1)
-  2: $t7 := pack SmokeTest::A($t5, $t6)
-  3: $t4 := $t7
-  4: $t8 := move($t4)
-  5: ($t9, $t10) := unpack SmokeTest::A($t8)
-  6: $t3 := $t10
-  7: $t2 := $t9
-  8: $t11 := move($t2)
-  9: $t12 := move($t3)
- 10: return ($t11, $t12)
+  0: $t2 := move($t0)
+  1: $t3 := move($t1)
+  2: $t4 := pack SmokeTest::A($t2, $t3)
+  3: ($t5, $t6) := unpack SmokeTest::A($t4)
+  4: return ($t5, $t6)
 }
 
 
@@ -400,39 +352,35 @@ fun SmokeTest::unpack_B($t0|a: address, $t1|va: u64, $t2|vb: u64): (address, u64
      var $t4|v1: u64
      var $t5|v2: u64
      var $t6|var_a: SmokeTest::A
-     var $t7|var_b: SmokeTest::B
-     var $t8: address
-     var $t9: u64
-     var $t10: SmokeTest::A
-     var $t11: u64
-     var $t12: SmokeTest::A
-     var $t13: SmokeTest::B
-     var $t14: SmokeTest::B
-     var $t15: u64
-     var $t16: SmokeTest::A
+     var $t7: address
+     var $t8: u64
+     var $t9: SmokeTest::A
+     var $t10: u64
+     var $t11: SmokeTest::A
+     var $t12: SmokeTest::B
+     var $t13: u64
+     var $t14: SmokeTest::A
+     var $t15: address
+     var $t16: u64
      var $t17: address
      var $t18: u64
-     var $t19: address
-     var $t20: u64
-     var $t21: u64
-  0: $t8 := move($t0)
-  1: $t9 := move($t1)
-  2: $t10 := pack SmokeTest::A($t8, $t9)
-  3: $t6 := $t10
-  4: $t11 := move($t2)
-  5: $t12 := move($t6)
-  6: $t13 := pack SmokeTest::B($t11, $t12)
-  7: $t7 := $t13
-  8: $t14 := move($t7)
-  9: ($t15, $t16) := unpack SmokeTest::B($t14)
- 10: ($t17, $t18) := unpack SmokeTest::A($t16)
- 11: $t4 := $t18
- 12: $t3 := $t17
- 13: $t5 := $t15
- 14: $t19 := move($t3)
- 15: $t20 := move($t4)
- 16: $t21 := move($t5)
- 17: return ($t19, $t20, $t21)
+     var $t19: u64
+  0: $t7 := move($t0)
+  1: $t8 := move($t1)
+  2: $t9 := pack SmokeTest::A($t7, $t8)
+  3: $t6 := $t9
+  4: $t10 := move($t2)
+  5: $t11 := move($t6)
+  6: $t12 := pack SmokeTest::B($t10, $t11)
+  7: ($t13, $t14) := unpack SmokeTest::B($t12)
+  8: ($t15, $t16) := unpack SmokeTest::A($t14)
+  9: $t4 := $t16
+ 10: $t3 := $t15
+ 11: $t5 := $t13
+ 12: $t17 := move($t3)
+ 13: $t18 := move($t4)
+ 14: $t19 := move($t5)
+ 15: return ($t17, $t18, $t19)
 }
 
 
@@ -444,50 +392,46 @@ fun SmokeTest::unpack_C($t0|a: address, $t1|va: u64, $t2|vb: u64, $t3|vc: u64):
      var $t7|v3: u64
      var $t8|var_a: SmokeTest::A
      var $t9|var_b: SmokeTest::B
-     var $t10|var_c: SmokeTest::C
-     var $t11: address
-     var $t12: u64
-     var $t13: SmokeTest::A
-     var $t14: u64
-     var $t15: SmokeTest::A
-     var $t16: SmokeTest::B
-     var $t17: u64
-     var $t18: SmokeTest::B
-     var $t19: SmokeTest::C
-     var $t20: SmokeTest::C
+     var $t10: address
+     var $t11: u64
+     var $t12: SmokeTest::A
+     var $t13: u64
+     var $t14: SmokeTest::A
+     var $t15: SmokeTest::B
+     var $t16: u64
+     var $t17: SmokeTest::B
+     var $t18: SmokeTest::C
+     var $t19: u64
+     var $t20: SmokeTest::B
      var $t21: u64
-     var $t22: SmokeTest::B
-     var $t23: u64
-     var $t24: SmokeTest::A
+     var $t22: SmokeTest::A
+     var $t23: address
+     var $t24: u64
      var $t25: address
      var $t26: u64
-     var $t27: address
+     var $t27: u64
      var $t28: u64
-     var $t29: u64
-     var $t30: u64
-  0: $t11 := move($t0)
-  1: $t12 := move($t1)
-  2: $t13 := pack SmokeTest::A($t11, $t12)
-  3: $t8 := $t13
-  4: $t14 := move($t2)
-  5: $t15 := move($t8)
-  6: $t16 := pack SmokeTest::B($t14, $t15)
-  7: $t9 := $t16
-  8: $t17 := move($t3)
-  9: $t18 := move($t9)
- 10: $t19 := pack SmokeTest::C($t17, $t18)
- 11: $t10 := $t19
- 12: $t20 := move($t10)
- 13: ($t21, $t22) := unpack SmokeTest::C($t20)
- 14: ($t23, $t24) := unpack SmokeTest::B($t22)
- 15: ($t25, $t26) := unpack SmokeTest::A($t24)
- 16: $t5 := $t26
- 17: $t4 := $t25
- 18: $t6 := $t23
- 19: $t7 := $t21
- 20: $t27 := move($t4)
- 21: $t28 := move($t5)
- 22: $t29 := move($t6)
- 23: $t30 := move($t7)
- 24: return ($t27, $t28, $t29, $t30)
+  0: $t10 := move($t0)
+  1: $t11 := move($t1)
+  2: $t12 := pack SmokeTest::A($t10, $t11)
+  3: $t8 := $t12
+  4: $t13 := move($t2)
+  5: $t14 := move($t8)
+  6: $t15 := pack SmokeTest::B($t13, $t14)
+  7: $t9 := $t15
+  8: $t16 := move($t3)
+  9: $t17 := move($t9)
+ 10: $t18 := pack SmokeTest::C($t16, $t17)
+ 11: ($t19, $t20) := unpack SmokeTest::C($t18)
+ 12: ($t21, $t22) := unpack SmokeTest::B($t20)
+ 13: ($t23, $t24) := unpack SmokeTest::A($t22)
+ 14: $t5 := $t24
+ 15: $t4 := $t23
+ 16: $t6 := $t21
+ 17: $t7 := $t19
+ 18: $t25 := move($t4)
+ 19: $t26 := move($t5)
+ 20: $t27 := move($t6)
+ 21: $t28 := move($t7)
+ 22: return ($t25, $t26, $t27, $t28)
 }
diff --git a/language/move-prover/bytecode/tests/from_move/specs-in-fun.exp b/language/move-prover/bytecode/tests/from_move/specs-in-fun.exp
index 6324c4d371..a245bfe242 100644
--- a/language/move-prover/bytecode/tests/from_move/specs-in-fun.exp
+++ b/language/move-prover/bytecode/tests/from_move/specs-in-fun.exp
@@ -15,18 +15,20 @@ fun TestSpecBlock::looping($t0|x: u64): u64 {
   3: $t1 := copy($t0)
   4: $t2 := 10
   5: $t3 := <($t1, $t2)
-  6: if ($t3) goto 7 else goto 14
-  7: label L0
-  8: assume Lt($t0, 10)
-  9: $t4 := move($t0)
- 10: $t5 := 1
- 11: $t6 := +($t4, $t5)
- 12: $t0 := $t6
- 13: goto 2
- 14: label L2
- 15: assert Eq<u64>($t0, 10)
- 16: $t7 := move($t0)
- 17: return $t7
+  6: if ($t3) goto 7 else goto 16
+  7: label L1
+  8: goto 9
+  9: label L2
+ 10: assume Lt($t0, 10)
+ 11: $t4 := move($t0)
+ 12: $t5 := 1
+ 13: $t6 := +($t4, $t5)
+ 14: $t0 := $t6
+ 15: goto 2
+ 16: label L0
+ 17: assert Eq<u64>($t0, 10)
+ 18: $t7 := move($t0)
+ 19: return $t7
 }
 
 
@@ -42,10 +44,10 @@ fun TestSpecBlock::simple1($t0|x: u64, $t1|y: u64) {
   2: $t4 := >($t2, $t3)
   3: $t5 := !($t4)
   4: if ($t5) goto 5 else goto 8
-  5: label L0
+  5: label L1
   6: $t6 := 1
   7: abort($t6)
-  8: label L2
+  8: label L0
   9: assert Gt($t0, $t1)
  10: return ()
 }
diff --git a/language/move-prover/bytecode/tests/from_move/vector_instructions.exp b/language/move-prover/bytecode/tests/from_move/vector_instructions.exp
new file mode 100644
index 0000000000..9b1f9299e3
--- /dev/null
+++ b/language/move-prover/bytecode/tests/from_move/vector_instructions.exp
@@ -0,0 +1,115 @@
+============ initial translation from Move ================
+
+[variant baseline]
+public intrinsic fun vector::contains<#0>($t0|v: &vector<#0>, $t1|e: &#0): bool;
+
+
+[variant baseline]
+public intrinsic fun vector::index_of<#0>($t0|v: &vector<#0>, $t1|e: &#0): (bool, u64);
+
+
+[variant baseline]
+public intrinsic fun vector::append<#0>($t0|lhs: &mut vector<#0>, $t1|other: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::borrow<#0>($t0|v: &vector<#0>, $t1|i: u64): &#0;
+
+
+[variant baseline]
+public native fun vector::borrow_mut<#0>($t0|v: &mut vector<#0>, $t1|i: u64): &mut #0;
+
+
+[variant baseline]
+public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
+
+
+[variant baseline]
+public native fun vector::empty<#0>(): vector<#0>;
+
+
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
+
+
+[variant baseline]
+public native fun vector::length<#0>($t0|v: &vector<#0>): u64;
+
+
+[variant baseline]
+public native fun vector::pop_back<#0>($t0|v: &mut vector<#0>): #0;
+
+
+[variant baseline]
+public native fun vector::push_back<#0>($t0|v: &mut vector<#0>, $t1|e: #0);
+
+
+[variant baseline]
+public intrinsic fun vector::remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+public intrinsic fun vector::reverse<#0>($t0|v: &mut vector<#0>);
+
+
+[variant baseline]
+public fun vector::singleton<#0>($t0|e: #0): vector<#0> {
+     var $t1|v: vector<#0>
+     var $t2: vector<#0>
+     var $t3: &mut vector<#0>
+     var $t4: #0
+     var $t5: vector<#0>
+  0: $t2 := vector::empty<#0>()
+  1: $t1 := $t2
+  2: $t3 := borrow_local($t1)
+  3: $t4 := move($t0)
+  4: vector::push_back<#0>($t3, $t4)
+  5: $t5 := move($t1)
+  6: return $t5
+}
+
+
+[variant baseline]
+public native fun vector::swap<#0>($t0|v: &mut vector<#0>, $t1|i: u64, $t2|j: u64);
+
+
+[variant baseline]
+public intrinsic fun vector::swap_remove<#0>($t0|v: &mut vector<#0>, $t1|i: u64): #0;
+
+
+[variant baseline]
+fun M::f() {
+     var $t0|v: vector<u8>
+     var $t1: u8
+     var $t2: u8
+     var $t3: vector<u8>
+     var $t4: &mut vector<u8>
+     var $t5: &vector<u8>
+     var $t6: u64
+     var $t7: u64
+     var $t8: bool
+     var $t9: u64
+  0: $t1 := 0
+  1: $t2 := 0
+  2: $t3 := vector::empty<u8>()
+  3: $t4 := borrow_local($t3)
+  4: vector::push_back<u8>($t4, $t1)
+  5: vector::push_back<u8>($t4, $t2)
+  6: $t0 := $t3
+  7: $t5 := borrow_local($t0)
+  8: $t6 := vector::length<u8>($t5)
+  9: $t7 := 1
+ 10: $t8 := ==($t6, $t7)
+ 11: if ($t8) goto 12 else goto 14
+ 12: label L1
+ 13: goto 17
+ 14: label L0
+ 15: $t9 := 0
+ 16: abort($t9)
+ 17: label L2
+ 18: return ()
+}
diff --git a/language/move-prover/bytecode/tests/from_move/vector_instructions.move b/language/move-prover/bytecode/tests/from_move/vector_instructions.move
new file mode 100644
index 0000000000..3ade6d3242
--- /dev/null
+++ b/language/move-prover/bytecode/tests/from_move/vector_instructions.move
@@ -0,0 +1,16 @@
+// dep: ../../move-stdlib/sources/vector.move
+
+module 0x42::M {
+    use std::vector;
+    const ZERO: u8 = 0;
+
+    fun f() {
+        let v = vector[ZERO, ZERO];
+        let len = vector::length(&v);
+        assert!(len == 1, 0);
+    }
+
+    spec f {
+        aborts_if true;
+    }
+}
diff --git a/language/move-prover/bytecode/tests/global_invariant_analysis/uninst_type_param_in_inv.exp b/language/move-prover/bytecode/tests/global_invariant_analysis/uninst_type_param_in_inv.exp
index 829751f9a8..ef36c8e42f 100644
--- a/language/move-prover/bytecode/tests/global_invariant_analysis/uninst_type_param_in_inv.exp
+++ b/language/move-prover/bytecode/tests/global_invariant_analysis/uninst_type_param_in_inv.exp
@@ -17,14 +17,14 @@ fun Demo::f1($t0|addr: address) {
   0: $t1 := copy($t0)
   1: $t2 := exists<Demo::S1<bool>>($t1)
   2: if ($t2) goto 3 else goto 10
-  3: label L0
+  3: label L1
   4: $t3 := 0
   5: $t4 := copy($t0)
   6: $t5 := borrow_global<Demo::S1<bool>>($t4)
   7: $t6 := borrow_field<Demo::S1<bool>>.v($t5)
   8: write_ref($t6, $t3)
   9: goto 10
- 10: label L2
+ 10: label L0
  11: $t7 := copy($t0)
  12: $t8 := exists<Demo::S1<u64>>($t7)
  13: if ($t8) goto 14 else goto 21
@@ -35,7 +35,7 @@ fun Demo::f1($t0|addr: address) {
  18: $t12 := borrow_field<Demo::S1<u64>>.v($t11)
  19: write_ref($t12, $t9)
  20: goto 21
- 21: label L5
+ 21: label L2
  22: return ()
 }
 
@@ -54,14 +54,14 @@ fun Demo::f1($t0|addr: address) {
      var $t9: &mut u8
   0: $t1 := exists<Demo::S1<bool>>($t0)
   1: if ($t1) goto 2 else goto 9
-  2: label L0
+  2: label L1
   3: $t2 := 0
   4: $t3 := borrow_global<Demo::S1<bool>>($t0) on_abort goto 22 with $t4
   5: $t5 := borrow_field<Demo::S1<bool>>.v($t3)
   6: write_ref($t5, $t2)
   7: write_back[Reference($t3).v (u8)]($t5)
   8: write_back[Demo::S1<bool>@]($t3)
-  9: label L2
+  9: label L0
  10: $t6 := exists<Demo::S1<u64>>($t0)
  11: if ($t6) goto 12 else goto 19
  12: label L3
@@ -71,10 +71,10 @@ fun Demo::f1($t0|addr: address) {
  16: write_ref($t9, $t7)
  17: write_back[Reference($t8).v (u8)]($t9)
  18: write_back[Demo::S1<u64>@]($t8)
- 19: label L5
- 20: label L6
+ 19: label L2
+ 20: label L4
  21: return ()
- 22: label L7
+ 22: label L5
  23: abort($t4)
 }
 
diff --git a/language/move-prover/bytecode/tests/livevar/basic_test.exp b/language/move-prover/bytecode/tests/livevar/basic_test.exp
index 4400b5a026..c000ec05cd 100644
--- a/language/move-prover/bytecode/tests/livevar/basic_test.exp
+++ b/language/move-prover/bytecode/tests/livevar/basic_test.exp
@@ -2,17 +2,13 @@
 
 [variant baseline]
 fun TestLiveVars::test1($t0|r_ref: &TestLiveVars::R): u64 {
-     var $t1|x_ref: &u64
-     var $t2: &TestLiveVars::R
-     var $t3: &u64
-     var $t4: &u64
-     var $t5: u64
-  0: $t2 := move($t0)
-  1: $t3 := borrow_field<TestLiveVars::R>.x($t2)
-  2: $t1 := $t3
-  3: $t4 := move($t1)
-  4: $t5 := read_ref($t4)
-  5: return $t5
+     var $t1: &TestLiveVars::R
+     var $t2: &u64
+     var $t3: u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_field<TestLiveVars::R>.x($t1)
+  2: $t3 := read_ref($t2)
+  3: return $t3
 }
 
 
@@ -41,13 +37,13 @@ fun TestLiveVars::test2($t0|b: bool): u64 {
   7: $t3 := $t8
   8: $t9 := move($t0)
   9: if ($t9) goto 10 else goto 16
- 10: label L0
+ 10: label L1
  11: $t10 := move($t3)
  12: destroy($t10)
  13: $t11 := borrow_local($t2)
  14: $t3 := $t11
  15: goto 16
- 16: label L2
+ 16: label L0
  17: $t12 := move($t3)
  18: $t13 := TestLiveVars::test1($t12)
  19: return $t13
@@ -85,50 +81,51 @@ fun TestLiveVars::test3($t0|n: u64, $t1|r_ref: &TestLiveVars::R): u64 {
   4: $t7 := pack TestLiveVars::R($t6)
   5: $t3 := $t7
   6: goto 7
-  7: label L7
+  7: label L6
   8: $t8 := 0
   9: $t9 := copy($t0)
  10: $t10 := <($t8, $t9)
- 11: if ($t10) goto 12 else goto 35
- 12: label L0
- 13: $t11 := move($t1)
- 14: destroy($t11)
- 15: $t12 := copy($t0)
- 16: $t13 := 2
- 17: $t14 := /($t12, $t13)
- 18: $t15 := 0
- 19: $t16 := ==($t14, $t15)
- 20: if ($t16) goto 21 else goto 25
- 21: label L3
- 22: $t17 := borrow_local($t2)
- 23: $t1 := $t17
- 24: goto 29
- 25: label L5
- 26: $t18 := borrow_local($t3)
- 27: $t1 := $t18
- 28: goto 29
- 29: label L6
- 30: $t19 := move($t0)
- 31: $t20 := 1
- 32: $t21 := -($t19, $t20)
- 33: $t0 := $t21
- 34: goto 7
- 35: label L2
- 36: $t22 := move($t1)
- 37: $t23 := TestLiveVars::test1($t22)
- 38: return $t23
+ 11: if ($t10) goto 12 else goto 37
+ 12: label L1
+ 13: goto 14
+ 14: label L2
+ 15: $t11 := move($t1)
+ 16: destroy($t11)
+ 17: $t12 := copy($t0)
+ 18: $t13 := 2
+ 19: $t14 := /($t12, $t13)
+ 20: $t15 := 0
+ 21: $t16 := ==($t14, $t15)
+ 22: if ($t16) goto 23 else goto 27
+ 23: label L4
+ 24: $t17 := borrow_local($t2)
+ 25: $t1 := $t17
+ 26: goto 31
+ 27: label L3
+ 28: $t18 := borrow_local($t3)
+ 29: $t1 := $t18
+ 30: goto 31
+ 31: label L5
+ 32: $t19 := move($t0)
+ 33: $t20 := 1
+ 34: $t21 := -($t19, $t20)
+ 35: $t0 := $t21
+ 36: goto 7
+ 37: label L0
+ 38: $t22 := move($t1)
+ 39: $t23 := TestLiveVars::test1($t22)
+ 40: return $t23
 }
 
 ============ after pipeline `livevar` ================
 
 [variant baseline]
 fun TestLiveVars::test1($t0|r_ref: TestLiveVars::R): u64 {
-     var $t1|x_ref: u64
-     var $t2: u64
+     var $t1: u64
      # live vars: r_ref
-  0: $t2 := get_field<TestLiveVars::R>.x($t0)
-     # live vars: $t2
-  1: return $t2
+  0: $t1 := get_field<TestLiveVars::R>.x($t0)
+     # live vars: $t1
+  1: return $t1
 }
 
 
@@ -152,20 +149,18 @@ fun TestLiveVars::test2($t0|b: bool): u64 {
   3: $t7 := pack TestLiveVars::R($t6)
      # live vars: b, $t5, $t7
   4: $t3 := $t5
-     # live vars: b, r_ref, $t5, $t7
-  5: if ($t0) goto 6 else goto 9
-     # live vars: $t5, $t7
-  6: label L0
-     # live vars: $t5, $t7
-  7: destroy($t5)
+     # live vars: b, r_ref, $t7
+  5: if ($t0) goto 6 else goto 8
      # live vars: $t7
-  8: $t3 := $t7
+  6: label L1
+     # live vars: $t7
+  7: $t3 := $t7
      # live vars: r_ref
-  9: label L2
+  8: label L0
      # live vars: r_ref
- 10: $t8 := TestLiveVars::test1($t3)
+  9: $t8 := TestLiveVars::test1($t3)
      # live vars: $t8
- 11: return $t8
+ 10: return $t8
 }
 
 
@@ -194,17 +189,17 @@ fun TestLiveVars::test3($t0|n: u64, $t1|r_ref: TestLiveVars::R): u64 {
      # live vars: n, r_ref, $t5, $t6
   3: $t7 := pack TestLiveVars::R($t6)
      # live vars: n, r_ref, $t5, $t7
-  4: label L7
+  4: label L6
      # live vars: n, r_ref, $t5, $t7
   5: $t8 := 0
      # live vars: n, r_ref, $t5, $t7, $t8
   6: $t9 := <($t8, $t0)
      # live vars: n, r_ref, $t5, $t7, $t9
   7: if ($t9) goto 8 else goto 24
-     # live vars: n, r_ref, $t5, $t7
-  8: label L0
-     # live vars: n, r_ref, $t5, $t7
-  9: destroy($t1)
+     # live vars: n, $t5, $t7
+  8: label L1
+     # live vars: n, $t5, $t7
+  9: label L2
      # live vars: n, $t5, $t7
  10: $t10 := 2
      # live vars: n, $t5, $t7, $t10
@@ -216,17 +211,17 @@ fun TestLiveVars::test3($t0|n: u64, $t1|r_ref: TestLiveVars::R): u64 {
      # live vars: n, $t5, $t7, $t13
  14: if ($t13) goto 15 else goto 18
      # live vars: n, $t5, $t7
- 15: label L3
+ 15: label L4
      # live vars: n, $t5, $t7
  16: $t1 := $t5
      # live vars: n, r_ref, $t5, $t7
  17: goto 20
      # live vars: n, $t5, $t7
- 18: label L5
+ 18: label L3
      # live vars: n, $t5, $t7
  19: $t1 := $t7
      # live vars: n, r_ref, $t5, $t7
- 20: label L6
+ 20: label L5
      # live vars: n, r_ref, $t5, $t7
  21: $t14 := 1
      # live vars: n, r_ref, $t5, $t7, $t14
@@ -234,7 +229,7 @@ fun TestLiveVars::test3($t0|n: u64, $t1|r_ref: TestLiveVars::R): u64 {
      # live vars: n, r_ref, $t5, $t7
  23: goto 4
      # live vars: r_ref
- 24: label L2
+ 24: label L0
      # live vars: r_ref
  25: $t15 := TestLiveVars::test1($t1)
      # live vars: $t15
diff --git a/language/move-prover/bytecode/tests/memory_instr/basic_test.exp b/language/move-prover/bytecode/tests/memory_instr/basic_test.exp
index ecec245e94..0e395d1c8f 100644
--- a/language/move-prover/bytecode/tests/memory_instr/basic_test.exp
+++ b/language/move-prover/bytecode/tests/memory_instr/basic_test.exp
@@ -3,29 +3,25 @@
 [variant baseline]
 fun TestPackref::test1(): TestPackref::R {
      var $t0|r: TestPackref::R
-     var $t1|r_ref: &mut TestPackref::R
-     var $t2|x_ref: &mut u64
-     var $t3: u64
-     var $t4: TestPackref::R
-     var $t5: &mut TestPackref::R
-     var $t6: &mut TestPackref::R
+     var $t1|x_ref: &mut u64
+     var $t2: u64
+     var $t3: TestPackref::R
+     var $t4: &mut TestPackref::R
+     var $t5: &mut u64
+     var $t6: u64
      var $t7: &mut u64
-     var $t8: u64
-     var $t9: &mut u64
-     var $t10: TestPackref::R
-  0: $t3 := 3
-  1: $t4 := pack TestPackref::R($t3)
-  2: $t0 := $t4
-  3: $t5 := borrow_local($t0)
-  4: $t1 := $t5
-  5: $t6 := move($t1)
-  6: $t7 := borrow_field<TestPackref::R>.x($t6)
-  7: $t2 := $t7
-  8: $t8 := 0
-  9: $t9 := move($t2)
- 10: write_ref($t9, $t8)
- 11: $t10 := move($t0)
- 12: return $t10
+     var $t8: TestPackref::R
+  0: $t2 := 3
+  1: $t3 := pack TestPackref::R($t2)
+  2: $t0 := $t3
+  3: $t4 := borrow_local($t0)
+  4: $t5 := borrow_field<TestPackref::R>.x($t4)
+  5: $t1 := $t5
+  6: $t6 := 0
+  7: $t7 := move($t1)
+  8: write_ref($t7, $t6)
+  9: $t8 := move($t0)
+ 10: return $t8
 }
 
 
@@ -42,41 +38,33 @@ fun TestPackref::test2($t0|x_ref: &mut u64, $t1|v: u64) {
 
 [variant baseline]
 public fun TestPackref::test3($t0|r_ref: &mut TestPackref::R, $t1|v: u64) {
-     var $t2|x_ref: &mut u64
-     var $t3: &mut TestPackref::R
-     var $t4: &mut u64
-     var $t5: &mut u64
-     var $t6: u64
-  0: $t3 := move($t0)
-  1: $t4 := borrow_field<TestPackref::R>.x($t3)
-  2: $t2 := $t4
-  3: $t5 := move($t2)
-  4: $t6 := move($t1)
-  5: TestPackref::test2($t5, $t6)
-  6: return ()
+     var $t2: &mut TestPackref::R
+     var $t3: &mut u64
+     var $t4: u64
+  0: $t2 := move($t0)
+  1: $t3 := borrow_field<TestPackref::R>.x($t2)
+  2: $t4 := move($t1)
+  3: TestPackref::test2($t3, $t4)
+  4: return ()
 }
 
 
 [variant baseline]
 fun TestPackref::test4(): TestPackref::R {
      var $t0|r: TestPackref::R
-     var $t1|r_ref: &mut TestPackref::R
-     var $t2: u64
-     var $t3: TestPackref::R
-     var $t4: &mut TestPackref::R
-     var $t5: &mut TestPackref::R
-     var $t6: u64
-     var $t7: TestPackref::R
-  0: $t2 := 3
-  1: $t3 := pack TestPackref::R($t2)
-  2: $t0 := $t3
-  3: $t4 := borrow_local($t0)
-  4: $t1 := $t4
-  5: $t5 := move($t1)
-  6: $t6 := 0
-  7: TestPackref::test3($t5, $t6)
-  8: $t7 := move($t0)
-  9: return $t7
+     var $t1: u64
+     var $t2: TestPackref::R
+     var $t3: &mut TestPackref::R
+     var $t4: u64
+     var $t5: TestPackref::R
+  0: $t1 := 3
+  1: $t2 := pack TestPackref::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := 0
+  5: TestPackref::test3($t3, $t4)
+  6: $t5 := move($t0)
+  7: return $t5
 }
 
 
@@ -93,29 +81,21 @@ public fun TestPackref::test5($t0|r_ref: &mut TestPackref::R): &mut u64 {
 [variant baseline]
 fun TestPackref::test6(): TestPackref::R {
      var $t0|r: TestPackref::R
-     var $t1|r_ref: &mut TestPackref::R
-     var $t2|x_ref: &mut u64
-     var $t3: u64
-     var $t4: TestPackref::R
-     var $t5: &mut TestPackref::R
-     var $t6: &mut TestPackref::R
-     var $t7: &mut u64
-     var $t8: &mut u64
-     var $t9: u64
-     var $t10: TestPackref::R
-  0: $t3 := 3
-  1: $t4 := pack TestPackref::R($t3)
-  2: $t0 := $t4
-  3: $t5 := borrow_local($t0)
-  4: $t1 := $t5
-  5: $t6 := move($t1)
-  6: $t7 := TestPackref::test5($t6)
-  7: $t2 := $t7
-  8: $t8 := move($t2)
-  9: $t9 := 0
- 10: TestPackref::test2($t8, $t9)
- 11: $t10 := move($t0)
- 12: return $t10
+     var $t1: u64
+     var $t2: TestPackref::R
+     var $t3: &mut TestPackref::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestPackref::R
+  0: $t1 := 3
+  1: $t2 := pack TestPackref::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := TestPackref::test5($t3)
+  5: $t5 := 0
+  6: TestPackref::test2($t4, $t5)
+  7: $t6 := move($t0)
+  8: return $t6
 }
 
 
@@ -144,13 +124,13 @@ fun TestPackref::test7($t0|b: bool) {
   7: $t3 := $t8
   8: $t9 := move($t0)
   9: if ($t9) goto 10 else goto 16
- 10: label L0
+ 10: label L1
  11: $t10 := move($t3)
  12: destroy($t10)
  13: $t11 := borrow_local($t2)
  14: $t3 := $t11
  15: goto 16
- 16: label L2
+ 16: label L0
  17: $t12 := move($t3)
  18: $t13 := 0
  19: TestPackref::test3($t12, $t13)
@@ -198,53 +178,55 @@ fun TestPackref::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestPackref::R)
   6: $t10 := borrow_local($t4)
   7: $t5 := $t10
   8: goto 9
-  9: label L7
+  9: label L6
  10: $t11 := 0
  11: $t12 := copy($t1)
  12: $t13 := <($t11, $t12)
- 13: if ($t13) goto 14 else goto 37
- 14: label L0
- 15: $t14 := move($t5)
- 16: destroy($t14)
- 17: $t15 := copy($t1)
- 18: $t16 := 2
- 19: $t17 := /($t15, $t16)
- 20: $t18 := 0
- 21: $t19 := ==($t17, $t18)
- 22: if ($t19) goto 23 else goto 27
- 23: label L3
- 24: $t20 := borrow_local($t3)
- 25: $t5 := $t20
- 26: goto 31
- 27: label L5
- 28: $t21 := borrow_local($t4)
- 29: $t5 := $t21
- 30: goto 31
- 31: label L6
- 32: $t22 := move($t1)
- 33: $t23 := 1
- 34: $t24 := -($t22, $t23)
- 35: $t1 := $t24
- 36: goto 9
- 37: label L2
- 38: $t25 := move($t0)
- 39: if ($t25) goto 40 else goto 47
- 40: label L8
- 41: $t26 := move($t5)
- 42: destroy($t26)
- 43: $t27 := move($t2)
- 44: $t28 := 0
- 45: TestPackref::test3($t27, $t28)
- 46: goto 54
- 47: label L10
- 48: $t29 := move($t2)
- 49: destroy($t29)
- 50: $t30 := move($t5)
- 51: $t31 := 0
- 52: TestPackref::test3($t30, $t31)
- 53: goto 54
- 54: label L11
- 55: return ()
+ 13: if ($t13) goto 14 else goto 39
+ 14: label L1
+ 15: goto 16
+ 16: label L2
+ 17: $t14 := move($t5)
+ 18: destroy($t14)
+ 19: $t15 := copy($t1)
+ 20: $t16 := 2
+ 21: $t17 := /($t15, $t16)
+ 22: $t18 := 0
+ 23: $t19 := ==($t17, $t18)
+ 24: if ($t19) goto 25 else goto 29
+ 25: label L4
+ 26: $t20 := borrow_local($t3)
+ 27: $t5 := $t20
+ 28: goto 33
+ 29: label L3
+ 30: $t21 := borrow_local($t4)
+ 31: $t5 := $t21
+ 32: goto 33
+ 33: label L5
+ 34: $t22 := move($t1)
+ 35: $t23 := 1
+ 36: $t24 := -($t22, $t23)
+ 37: $t1 := $t24
+ 38: goto 9
+ 39: label L0
+ 40: $t25 := move($t0)
+ 41: if ($t25) goto 42 else goto 49
+ 42: label L8
+ 43: $t26 := move($t5)
+ 44: destroy($t26)
+ 45: $t27 := move($t2)
+ 46: $t28 := 0
+ 47: TestPackref::test3($t27, $t28)
+ 48: goto 56
+ 49: label L7
+ 50: $t29 := move($t2)
+ 51: destroy($t29)
+ 52: $t30 := move($t5)
+ 53: $t31 := 0
+ 54: TestPackref::test3($t30, $t31)
+ 55: goto 56
+ 56: label L9
+ 57: return ()
 }
 
 ============ after pipeline `memory_instr` ================
@@ -252,24 +234,23 @@ fun TestPackref::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestPackref::R)
 [variant baseline]
 fun TestPackref::test1(): TestPackref::R {
      var $t0|r: TestPackref::R
-     var $t1|r_ref: &mut TestPackref::R
-     var $t2|x_ref: &mut u64
-     var $t3: u64
-     var $t4: &mut TestPackref::R
-     var $t5: &mut u64
-     var $t6: u64
-     var $t7: TestPackref::R
-  0: $t3 := 3
-  1: $t0 := pack TestPackref::R($t3)
-  2: $t4 := borrow_local($t0)
-  3: $t5 := borrow_field<TestPackref::R>.x($t4)
-  4: $t6 := 0
-  5: write_ref($t5, $t6)
-  6: write_back[Reference($t4).x (u64)]($t5)
-  7: write_back[LocalRoot($t0)@]($t4)
+     var $t1|x_ref: &mut u64
+     var $t2: u64
+     var $t3: &mut TestPackref::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestPackref::R
+  0: $t2 := 3
+  1: $t0 := pack TestPackref::R($t2)
+  2: $t3 := borrow_local($t0)
+  3: $t4 := borrow_field<TestPackref::R>.x($t3)
+  4: $t5 := 0
+  5: write_ref($t4, $t5)
+  6: write_back[Reference($t3).x (u64)]($t4)
+  7: write_back[LocalRoot($t0)@]($t3)
   8: trace_local[r]($t0)
-  9: $t7 := move($t0)
- 10: return $t7
+  9: $t6 := move($t0)
+ 10: return $t6
 }
 
 
@@ -283,11 +264,10 @@ fun TestPackref::test2($t0|x_ref: &mut u64, $t1|v: u64) {
 
 [variant baseline]
 public fun TestPackref::test3($t0|r_ref: &mut TestPackref::R, $t1|v: u64) {
-     var $t2|x_ref: &mut u64
-     var $t3: &mut u64
-  0: $t3 := borrow_field<TestPackref::R>.x($t0)
-  1: TestPackref::test2($t3, $t1)
-  2: write_back[Reference($t0).x (u64)]($t3)
+     var $t2: &mut u64
+  0: $t2 := borrow_field<TestPackref::R>.x($t0)
+  1: TestPackref::test2($t2, $t1)
+  2: write_back[Reference($t0).x (u64)]($t2)
   3: trace_local[r_ref]($t0)
   4: trace_local[r_ref]($t0)
   5: return ()
@@ -297,20 +277,19 @@ public fun TestPackref::test3($t0|r_ref: &mut TestPackref::R, $t1|v: u64) {
 [variant baseline]
 fun TestPackref::test4(): TestPackref::R {
      var $t0|r: TestPackref::R
-     var $t1|r_ref: &mut TestPackref::R
-     var $t2: u64
-     var $t3: &mut TestPackref::R
-     var $t4: u64
-     var $t5: TestPackref::R
-  0: $t2 := 3
-  1: $t0 := pack TestPackref::R($t2)
-  2: $t3 := borrow_local($t0)
-  3: $t4 := 0
-  4: TestPackref::test3($t3, $t4)
-  5: write_back[LocalRoot($t0)@]($t3)
+     var $t1: u64
+     var $t2: &mut TestPackref::R
+     var $t3: u64
+     var $t4: TestPackref::R
+  0: $t1 := 3
+  1: $t0 := pack TestPackref::R($t1)
+  2: $t2 := borrow_local($t0)
+  3: $t3 := 0
+  4: TestPackref::test3($t2, $t3)
+  5: write_back[LocalRoot($t0)@]($t2)
   6: trace_local[r]($t0)
-  7: $t5 := move($t0)
-  8: return $t5
+  7: $t4 := move($t0)
+  8: return $t4
 }
 
 
@@ -328,24 +307,22 @@ public fun TestPackref::test5($t0|r_ref: &mut TestPackref::R): &mut u64 {
 [variant baseline]
 fun TestPackref::test6(): TestPackref::R {
      var $t0|r: TestPackref::R
-     var $t1|r_ref: &mut TestPackref::R
-     var $t2|x_ref: &mut u64
-     var $t3: u64
-     var $t4: &mut TestPackref::R
-     var $t5: &mut u64
-     var $t6: u64
-     var $t7: TestPackref::R
-  0: $t3 := 3
-  1: $t0 := pack TestPackref::R($t3)
-  2: $t4 := borrow_local($t0)
-  3: $t5 := TestPackref::test5($t4)
-  4: $t6 := 0
-  5: TestPackref::test2($t5, $t6)
-  6: write_back[Reference($t4).x (u64)]($t5)
-  7: write_back[LocalRoot($t0)@]($t4)
+     var $t1: u64
+     var $t2: &mut TestPackref::R
+     var $t3: &mut u64
+     var $t4: u64
+     var $t5: TestPackref::R
+  0: $t1 := 3
+  1: $t0 := pack TestPackref::R($t1)
+  2: $t2 := borrow_local($t0)
+  3: $t3 := TestPackref::test5($t2)
+  4: $t4 := 0
+  5: TestPackref::test2($t3, $t4)
+  6: write_back[Reference($t2).x (u64)]($t3)
+  7: write_back[LocalRoot($t0)@]($t2)
   8: trace_local[r]($t0)
-  9: $t7 := move($t0)
- 10: return $t7
+  9: $t5 := move($t0)
+ 10: return $t5
 }
 
 
@@ -357,35 +334,48 @@ fun TestPackref::test7($t0|b: bool) {
      var $t4: u64
      var $t5: u64
      var $t6: &mut TestPackref::R
-     var $t7: u64
+     var $t7: &mut TestPackref::R
+     var $t8: u64
+     var $t9: bool
+     var $t10: bool
   0: $t4 := 3
   1: $t1 := pack TestPackref::R($t4)
   2: $t5 := 4
   3: $t2 := pack TestPackref::R($t5)
   4: $t6 := borrow_local($t1)
   5: $t3 := $t6
-  6: write_back[LocalRoot($t1)@]($t6)
-  7: trace_local[r1]($t1)
-  8: if ($t0) goto 20 else goto 25
-  9: label L0
+  6: if ($t0) goto 31 else goto 35
+  7: label L1
+  8: write_back[LocalRoot($t1)@]($t6)
+  9: trace_local[r1]($t1)
  10: destroy($t6)
- 11: $t3 := borrow_local($t2)
- 12: label L2
- 13: $t7 := 0
- 14: TestPackref::test3($t3, $t7)
- 15: write_back[LocalRoot($t1)@]($t3)
- 16: trace_local[r1]($t1)
- 17: write_back[LocalRoot($t2)@]($t3)
- 18: trace_local[r2]($t2)
- 19: return ()
- 20: label L3
- 21: write_back[LocalRoot($t1)@]($t3)
- 22: trace_local[r1]($t1)
- 23: destroy($t3)
- 24: goto 9
- 25: label L4
- 26: destroy($t6)
- 27: goto 12
+ 11: $t7 := borrow_local($t2)
+ 12: $t3 := $t7
+ 13: label L0
+ 14: $t8 := 0
+ 15: TestPackref::test3($t3, $t8)
+ 16: $t9 := is_parent[Reference($t6)@]($t3)
+ 17: if ($t9) goto 18 else goto 22
+ 18: label L4
+ 19: write_back[Reference($t6)@]($t3)
+ 20: write_back[LocalRoot($t1)@]($t6)
+ 21: trace_local[r1]($t1)
+ 22: label L5
+ 23: $t10 := is_parent[Reference($t7)@]($t3)
+ 24: if ($t10) goto 25 else goto 29
+ 25: label L6
+ 26: write_back[Reference($t7)@]($t3)
+ 27: write_back[LocalRoot($t2)@]($t7)
+ 28: trace_local[r2]($t2)
+ 29: label L7
+ 30: return ()
+ 31: label L2
+ 32: write_back[Reference($t6)@]($t3)
+ 33: destroy($t3)
+ 34: goto 7
+ 35: label L3
+ 36: destroy($t6)
+ 37: goto 13
 }
 
 
@@ -396,64 +386,131 @@ fun TestPackref::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestPackref::R)
      var $t5|t_ref: &mut TestPackref::R
      var $t6: u64
      var $t7: u64
-     var $t8: u64
-     var $t9: bool
-     var $t10: u64
+     var $t8: &mut TestPackref::R
+     var $t9: u64
+     var $t10: bool
      var $t11: u64
      var $t12: u64
-     var $t13: bool
-     var $t14: u64
-     var $t15: u64
-     var $t16: u64
+     var $t13: u64
+     var $t14: bool
+     var $t15: &mut TestPackref::R
+     var $t16: &mut TestPackref::R
+     var $t17: u64
+     var $t18: u64
+     var $t19: u64
+     var $t20: bool
+     var $t21: bool
+     var $t22: bool
+     var $t23: bool
+     var $t24: bool
+     var $t25: bool
+     var $t26: bool
+     var $t27: bool
+     var $t28: bool
   0: $t6 := 3
   1: $t3 := pack TestPackref::R($t6)
   2: $t7 := 4
   3: $t4 := pack TestPackref::R($t7)
-  4: $t5 := borrow_local($t4)
-  5: label L7
-  6: $t8 := 0
-  7: $t9 := <($t8, $t1)
-  8: if ($t9) goto 9 else goto 29
-  9: label L0
- 10: write_back[LocalRoot($t3)@]($t5)
- 11: trace_local[r1]($t3)
- 12: write_back[LocalRoot($t4)@]($t5)
- 13: trace_local[r2]($t4)
- 14: destroy($t5)
- 15: $t10 := 2
- 16: $t11 := /($t1, $t10)
- 17: $t12 := 0
- 18: $t13 := ==($t11, $t12)
- 19: if ($t13) goto 20 else goto 23
- 20: label L3
- 21: $t5 := borrow_local($t3)
- 22: goto 25
- 23: label L5
- 24: $t5 := borrow_local($t4)
- 25: label L6
- 26: $t14 := 1
- 27: $t1 := -($t1, $t14)
- 28: goto 5
- 29: label L2
- 30: if ($t0) goto 31 else goto 40
- 31: label L8
- 32: write_back[LocalRoot($t3)@]($t5)
- 33: trace_local[r1]($t3)
- 34: write_back[LocalRoot($t4)@]($t5)
- 35: trace_local[r2]($t4)
- 36: destroy($t5)
- 37: $t15 := 0
- 38: TestPackref::test3($t2, $t15)
- 39: goto 48
- 40: label L10
- 41: destroy($t2)
- 42: $t16 := 0
- 43: TestPackref::test3($t5, $t16)
- 44: write_back[LocalRoot($t3)@]($t5)
- 45: trace_local[r1]($t3)
- 46: write_back[LocalRoot($t4)@]($t5)
- 47: trace_local[r2]($t4)
- 48: label L11
- 49: trace_local[r_ref]($t2)
- 50: return ()
+  4: $t8 := borrow_local($t4)
+  5: $t5 := $t8
+  6: label L6
+  7: $t9 := 0
+  8: $t10 := <($t9, $t1)
+  9: if ($t10) goto 10 else goto 50
+ 10: label L1
+ 11: label L2
+ 12: $t20 := is_parent[Reference($t8)@]($t5)
+ 13: if ($t20) goto 14 else goto 18
+ 14: label L10
+ 15: write_back[Reference($t8)@]($t5)
+ 16: write_back[LocalRoot($t4)@]($t8)
+ 17: trace_local[r2]($t4)
+ 18: label L11
+ 19: $t21 := is_parent[Reference($t15)@]($t5)
+ 20: if ($t21) goto 21 else goto 25
+ 21: label L12
+ 22: write_back[Reference($t15)@]($t5)
+ 23: write_back[LocalRoot($t3)@]($t15)
+ 24: trace_local[r1]($t3)
+ 25: label L13
+ 26: $t22 := is_parent[Reference($t16)@]($t5)
+ 27: if ($t22) goto 28 else goto 32
+ 28: label L14
+ 29: write_back[Reference($t16)@]($t5)
+ 30: write_back[LocalRoot($t4)@]($t16)
+ 31: trace_local[r2]($t4)
+ 32: label L15
+ 33: destroy($t5)
+ 34: $t11 := 2
+ 35: $t12 := /($t1, $t11)
+ 36: $t13 := 0
+ 37: $t14 := ==($t12, $t13)
+ 38: if ($t14) goto 39 else goto 43
+ 39: label L4
+ 40: $t15 := borrow_local($t3)
+ 41: $t5 := $t15
+ 42: goto 46
+ 43: label L3
+ 44: $t16 := borrow_local($t4)
+ 45: $t5 := $t16
+ 46: label L5
+ 47: $t17 := 1
+ 48: $t1 := -($t1, $t17)
+ 49: goto 6
+ 50: label L0
+ 51: if ($t0) goto 52 else goto 78
+ 52: label L8
+ 53: $t23 := is_parent[Reference($t8)@]($t5)
+ 54: if ($t23) goto 55 else goto 59
+ 55: label L16
+ 56: write_back[Reference($t8)@]($t5)
+ 57: write_back[LocalRoot($t4)@]($t8)
+ 58: trace_local[r2]($t4)
+ 59: label L17
+ 60: $t24 := is_parent[Reference($t15)@]($t5)
+ 61: if ($t24) goto 62 else goto 66
+ 62: label L18
+ 63: write_back[Reference($t15)@]($t5)
+ 64: write_back[LocalRoot($t3)@]($t15)
+ 65: trace_local[r1]($t3)
+ 66: label L19
+ 67: $t25 := is_parent[Reference($t16)@]($t5)
+ 68: if ($t25) goto 69 else goto 73
+ 69: label L20
+ 70: write_back[Reference($t16)@]($t5)
+ 71: write_back[LocalRoot($t4)@]($t16)
+ 72: trace_local[r2]($t4)
+ 73: label L21
+ 74: destroy($t5)
+ 75: $t18 := 0
+ 76: TestPackref::test3($t2, $t18)
+ 77: goto 103
+ 78: label L7
+ 79: destroy($t2)
+ 80: $t19 := 0
+ 81: TestPackref::test3($t5, $t19)
+ 82: $t26 := is_parent[Reference($t8)@]($t5)
+ 83: if ($t26) goto 84 else goto 88
+ 84: label L22
+ 85: write_back[Reference($t8)@]($t5)
+ 86: write_back[LocalRoot($t4)@]($t8)
+ 87: trace_local[r2]($t4)
+ 88: label L23
+ 89: $t27 := is_parent[Reference($t15)@]($t5)
+ 90: if ($t27) goto 91 else goto 95
+ 91: label L24
+ 92: write_back[Reference($t15)@]($t5)
+ 93: write_back[LocalRoot($t3)@]($t15)
+ 94: trace_local[r1]($t3)
+ 95: label L25
+ 96: $t28 := is_parent[Reference($t16)@]($t5)
+ 97: if ($t28) goto 98 else goto 102
+ 98: label L26
+ 99: write_back[Reference($t16)@]($t5)
+100: write_back[LocalRoot($t4)@]($t16)
+101: trace_local[r2]($t4)
+102: label L27
+103: label L9
+104: trace_local[r_ref]($t2)
+105: return ()
 }
diff --git a/language/move-prover/bytecode/tests/mono_analysis/test.exp b/language/move-prover/bytecode/tests/mono_analysis/test.exp
index b21f7a8639..c6e5fe4a87 100644
--- a/language/move-prover/bytecode/tests/mono_analysis/test.exp
+++ b/language/move-prover/bytecode/tests/mono_analysis/test.exp
@@ -57,118 +57,6 @@ public fun Test::f5(): Test::B<u128> {
   2: return $t1
 }
 
-============ after pipeline `mono_analysis` ================
-
-[variant baseline]
-public fun Test::f1<#0>($t0|x1: #0): Test::A<#0, u64> {
-     var $t1: u64
-     var $t2: Test::A<#0, u64>
-  0: $t1 := 10
-  1: $t2 := pack Test::A<#0, u64>($t0, $t1)
-  2: label L1
-  3: return $t2
-}
-
-
-[variant verification]
-public fun Test::f1<#0>($t0|x1: #0): Test::A<#0, u64> {
-     var $t1: u64
-     var $t2: Test::A<#0, u64>
-  0: assume WellFormed($t0)
-  1: $t1 := 10
-  2: $t2 := pack Test::A<#0, u64>($t0, $t1)
-  3: label L1
-  4: return $t2
-}
-
-
-[variant verification]
-public fun Test::f2($t0|x: u8): Test::B<u8> {
-     var $t1: Test::A<u8, u64>
-     var $t2: num
-     var $t3: Test::B<u8>
-  0: assume WellFormed($t0)
-  1: $t1 := Test::f1<u8>($t0) on_abort goto 5 with $t2
-  2: $t3 := pack Test::B<u8>($t1)
-  3: label L1
-  4: return $t3
-  5: label L2
-  6: abort($t2)
-}
-
-
-[variant verification]
-public fun Test::f3<#0>($t0|x1: #0): Test::A<#0, u64> {
-     var $t1: u64
-     var $t2: Test::A<#0, u64>
-  0: assume WellFormed($t0)
-  1: $t1 := 1
-  2: $t2 := pack Test::A<#0, u64>($t0, $t1)
-  3: label L1
-  4: return $t2
-}
-
-
-[variant baseline]
-public fun Test::f4<#0>($t0|x1: #0): Test::B<#0> {
-     var $t1: Test::A<#0, u64>
-     var $t2: bool
-     var $t3: num
-     var $t4: Test::B<#0>
-  0: $t1 := opaque begin: Test::f3<#0>($t0)
-  1: havoc[val]($t2)
-  2: if ($t2) goto 3 else goto 6
-  3: label L4
-  4: trace_abort($t3)
-  5: goto 12
-  6: label L3
-  7: assume WellFormed($t1)
-  8: $t1 := opaque end: Test::f3<#0>($t0)
-  9: $t4 := pack Test::B<#0>($t1)
- 10: label L1
- 11: return $t4
- 12: label L2
- 13: abort($t3)
-}
-
-
-[variant verification]
-public fun Test::f4<#0>($t0|x1: #0): Test::B<#0> {
-     var $t1: Test::A<#0, u64>
-     var $t2: bool
-     var $t3: num
-     var $t4: Test::B<#0>
-  0: assume WellFormed($t0)
-  1: $t1 := opaque begin: Test::f3<#0>($t0)
-  2: havoc[val]($t2)
-  3: if ($t2) goto 4 else goto 7
-  4: label L4
-  5: trace_abort($t3)
-  6: goto 13
-  7: label L3
-  8: assume WellFormed($t1)
-  9: $t1 := opaque end: Test::f3<#0>($t0)
- 10: $t4 := pack Test::B<#0>($t1)
- 11: label L1
- 12: return $t4
- 13: label L2
- 14: abort($t3)
-}
-
-
-[variant verification]
-public fun Test::f5(): Test::B<u128> {
-     var $t0: u128
-     var $t1: Test::B<u128>
-     var $t2: num
-  0: $t0 := 1
-  1: $t1 := Test::f4<u128>($t0) on_abort goto 4 with $t2
-  2: label L1
-  3: return $t1
-  4: label L2
-  5: abort($t2)
-}
-
 
 
 ==== mono-analysis result ====
diff --git a/language/move-prover/bytecode/tests/mut_ref_instrumentation/basic_test.exp b/language/move-prover/bytecode/tests/mut_ref_instrumentation/basic_test.exp
index 7db4e86ce2..855dd40f3f 100644
--- a/language/move-prover/bytecode/tests/mut_ref_instrumentation/basic_test.exp
+++ b/language/move-prover/bytecode/tests/mut_ref_instrumentation/basic_test.exp
@@ -3,29 +3,25 @@
 [variant baseline]
 fun TestEliminateMutRefs::test1(): TestEliminateMutRefs::R {
      var $t0|r: TestEliminateMutRefs::R
-     var $t1|r_ref: &mut TestEliminateMutRefs::R
-     var $t2|x_ref: &mut u64
-     var $t3: u64
-     var $t4: TestEliminateMutRefs::R
-     var $t5: &mut TestEliminateMutRefs::R
-     var $t6: &mut TestEliminateMutRefs::R
+     var $t1|x_ref: &mut u64
+     var $t2: u64
+     var $t3: TestEliminateMutRefs::R
+     var $t4: &mut TestEliminateMutRefs::R
+     var $t5: &mut u64
+     var $t6: u64
      var $t7: &mut u64
-     var $t8: u64
-     var $t9: &mut u64
-     var $t10: TestEliminateMutRefs::R
-  0: $t3 := 3
-  1: $t4 := pack TestEliminateMutRefs::R($t3)
-  2: $t0 := $t4
-  3: $t5 := borrow_local($t0)
-  4: $t1 := $t5
-  5: $t6 := move($t1)
-  6: $t7 := borrow_field<TestEliminateMutRefs::R>.x($t6)
-  7: $t2 := $t7
-  8: $t8 := 0
-  9: $t9 := move($t2)
- 10: write_ref($t9, $t8)
- 11: $t10 := move($t0)
- 12: return $t10
+     var $t8: TestEliminateMutRefs::R
+  0: $t2 := 3
+  1: $t3 := pack TestEliminateMutRefs::R($t2)
+  2: $t0 := $t3
+  3: $t4 := borrow_local($t0)
+  4: $t5 := borrow_field<TestEliminateMutRefs::R>.x($t4)
+  5: $t1 := $t5
+  6: $t6 := 0
+  7: $t7 := move($t1)
+  8: write_ref($t7, $t6)
+  9: $t8 := move($t0)
+ 10: return $t8
 }
 
 
@@ -42,41 +38,33 @@ fun TestEliminateMutRefs::test2($t0|x_ref: &mut u64, $t1|v: u64) {
 
 [variant baseline]
 public fun TestEliminateMutRefs::test3($t0|r_ref: &mut TestEliminateMutRefs::R, $t1|v: u64) {
-     var $t2|x_ref: &mut u64
-     var $t3: &mut TestEliminateMutRefs::R
-     var $t4: &mut u64
-     var $t5: &mut u64
-     var $t6: u64
-  0: $t3 := move($t0)
-  1: $t4 := borrow_field<TestEliminateMutRefs::R>.x($t3)
-  2: $t2 := $t4
-  3: $t5 := move($t2)
-  4: $t6 := move($t1)
-  5: TestEliminateMutRefs::test2($t5, $t6)
-  6: return ()
+     var $t2: &mut TestEliminateMutRefs::R
+     var $t3: &mut u64
+     var $t4: u64
+  0: $t2 := move($t0)
+  1: $t3 := borrow_field<TestEliminateMutRefs::R>.x($t2)
+  2: $t4 := move($t1)
+  3: TestEliminateMutRefs::test2($t3, $t4)
+  4: return ()
 }
 
 
 [variant baseline]
 fun TestEliminateMutRefs::test4(): TestEliminateMutRefs::R {
      var $t0|r: TestEliminateMutRefs::R
-     var $t1|r_ref: &mut TestEliminateMutRefs::R
-     var $t2: u64
-     var $t3: TestEliminateMutRefs::R
-     var $t4: &mut TestEliminateMutRefs::R
-     var $t5: &mut TestEliminateMutRefs::R
-     var $t6: u64
-     var $t7: TestEliminateMutRefs::R
-  0: $t2 := 3
-  1: $t3 := pack TestEliminateMutRefs::R($t2)
-  2: $t0 := $t3
-  3: $t4 := borrow_local($t0)
-  4: $t1 := $t4
-  5: $t5 := move($t1)
-  6: $t6 := 0
-  7: TestEliminateMutRefs::test3($t5, $t6)
-  8: $t7 := move($t0)
-  9: return $t7
+     var $t1: u64
+     var $t2: TestEliminateMutRefs::R
+     var $t3: &mut TestEliminateMutRefs::R
+     var $t4: u64
+     var $t5: TestEliminateMutRefs::R
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateMutRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := 0
+  5: TestEliminateMutRefs::test3($t3, $t4)
+  6: $t5 := move($t0)
+  7: return $t5
 }
 
 
@@ -93,29 +81,21 @@ public fun TestEliminateMutRefs::test5($t0|r_ref: &mut TestEliminateMutRefs::R):
 [variant baseline]
 fun TestEliminateMutRefs::test6(): TestEliminateMutRefs::R {
      var $t0|r: TestEliminateMutRefs::R
-     var $t1|r_ref: &mut TestEliminateMutRefs::R
-     var $t2|x_ref: &mut u64
-     var $t3: u64
-     var $t4: TestEliminateMutRefs::R
-     var $t5: &mut TestEliminateMutRefs::R
-     var $t6: &mut TestEliminateMutRefs::R
-     var $t7: &mut u64
-     var $t8: &mut u64
-     var $t9: u64
-     var $t10: TestEliminateMutRefs::R
-  0: $t3 := 3
-  1: $t4 := pack TestEliminateMutRefs::R($t3)
-  2: $t0 := $t4
-  3: $t5 := borrow_local($t0)
-  4: $t1 := $t5
-  5: $t6 := move($t1)
-  6: $t7 := TestEliminateMutRefs::test5($t6)
-  7: $t2 := $t7
-  8: $t8 := move($t2)
-  9: $t9 := 0
- 10: TestEliminateMutRefs::test2($t8, $t9)
- 11: $t10 := move($t0)
- 12: return $t10
+     var $t1: u64
+     var $t2: TestEliminateMutRefs::R
+     var $t3: &mut TestEliminateMutRefs::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestEliminateMutRefs::R
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateMutRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := TestEliminateMutRefs::test5($t3)
+  5: $t5 := 0
+  6: TestEliminateMutRefs::test2($t4, $t5)
+  7: $t6 := move($t0)
+  8: return $t6
 }
 
 
@@ -144,13 +124,13 @@ fun TestEliminateMutRefs::test7($t0|b: bool) {
   7: $t3 := $t8
   8: $t9 := move($t0)
   9: if ($t9) goto 10 else goto 16
- 10: label L0
+ 10: label L1
  11: $t10 := move($t3)
  12: destroy($t10)
  13: $t11 := borrow_local($t2)
  14: $t3 := $t11
  15: goto 16
- 16: label L2
+ 16: label L0
  17: $t12 := move($t3)
  18: $t13 := 0
  19: TestEliminateMutRefs::test3($t12, $t13)
@@ -198,53 +178,55 @@ fun TestEliminateMutRefs::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestEli
   6: $t10 := borrow_local($t4)
   7: $t5 := $t10
   8: goto 9
-  9: label L7
+  9: label L6
  10: $t11 := 0
  11: $t12 := copy($t1)
  12: $t13 := <($t11, $t12)
- 13: if ($t13) goto 14 else goto 37
- 14: label L0
- 15: $t14 := move($t5)
- 16: destroy($t14)
- 17: $t15 := copy($t1)
- 18: $t16 := 2
- 19: $t17 := /($t15, $t16)
- 20: $t18 := 0
- 21: $t19 := ==($t17, $t18)
- 22: if ($t19) goto 23 else goto 27
- 23: label L3
- 24: $t20 := borrow_local($t3)
- 25: $t5 := $t20
- 26: goto 31
- 27: label L5
- 28: $t21 := borrow_local($t4)
- 29: $t5 := $t21
- 30: goto 31
- 31: label L6
- 32: $t22 := move($t1)
- 33: $t23 := 1
- 34: $t24 := -($t22, $t23)
- 35: $t1 := $t24
- 36: goto 9
- 37: label L2
- 38: $t25 := move($t0)
- 39: if ($t25) goto 40 else goto 47
- 40: label L8
- 41: $t26 := move($t5)
- 42: destroy($t26)
- 43: $t27 := move($t2)
- 44: $t28 := 0
- 45: TestEliminateMutRefs::test3($t27, $t28)
- 46: goto 54
- 47: label L10
- 48: $t29 := move($t2)
- 49: destroy($t29)
- 50: $t30 := move($t5)
- 51: $t31 := 0
- 52: TestEliminateMutRefs::test3($t30, $t31)
- 53: goto 54
- 54: label L11
- 55: return ()
+ 13: if ($t13) goto 14 else goto 39
+ 14: label L1
+ 15: goto 16
+ 16: label L2
+ 17: $t14 := move($t5)
+ 18: destroy($t14)
+ 19: $t15 := copy($t1)
+ 20: $t16 := 2
+ 21: $t17 := /($t15, $t16)
+ 22: $t18 := 0
+ 23: $t19 := ==($t17, $t18)
+ 24: if ($t19) goto 25 else goto 29
+ 25: label L4
+ 26: $t20 := borrow_local($t3)
+ 27: $t5 := $t20
+ 28: goto 33
+ 29: label L3
+ 30: $t21 := borrow_local($t4)
+ 31: $t5 := $t21
+ 32: goto 33
+ 33: label L5
+ 34: $t22 := move($t1)
+ 35: $t23 := 1
+ 36: $t24 := -($t22, $t23)
+ 37: $t1 := $t24
+ 38: goto 9
+ 39: label L0
+ 40: $t25 := move($t0)
+ 41: if ($t25) goto 42 else goto 49
+ 42: label L8
+ 43: $t26 := move($t5)
+ 44: destroy($t26)
+ 45: $t27 := move($t2)
+ 46: $t28 := 0
+ 47: TestEliminateMutRefs::test3($t27, $t28)
+ 48: goto 56
+ 49: label L7
+ 50: $t29 := move($t2)
+ 51: destroy($t29)
+ 52: $t30 := move($t5)
+ 53: $t31 := 0
+ 54: TestEliminateMutRefs::test3($t30, $t31)
+ 55: goto 56
+ 56: label L9
+ 57: return ()
 }
 
 ============ after pipeline `mut_ref_instrumentation` ================
@@ -252,29 +234,25 @@ fun TestEliminateMutRefs::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestEli
 [variant baseline]
 fun TestEliminateMutRefs::test1(): TestEliminateMutRefs::R {
      var $t0|r: TestEliminateMutRefs::R
-     var $t1|r_ref: &mut TestEliminateMutRefs::R
-     var $t2|x_ref: &mut u64
-     var $t3: u64
-     var $t4: TestEliminateMutRefs::R
-     var $t5: &mut TestEliminateMutRefs::R
-     var $t6: &mut TestEliminateMutRefs::R
+     var $t1|x_ref: &mut u64
+     var $t2: u64
+     var $t3: TestEliminateMutRefs::R
+     var $t4: &mut TestEliminateMutRefs::R
+     var $t5: &mut u64
+     var $t6: u64
      var $t7: &mut u64
-     var $t8: u64
-     var $t9: &mut u64
-     var $t10: TestEliminateMutRefs::R
-  0: $t3 := 3
-  1: $t4 := pack TestEliminateMutRefs::R($t3)
-  2: $t0 := $t4
-  3: $t5 := borrow_local($t0)
-  4: $t1 := $t5
-  5: $t6 := move($t1)
-  6: $t7 := borrow_field<TestEliminateMutRefs::R>.x($t6)
-  7: $t2 := $t7
-  8: $t8 := 0
-  9: $t9 := move($t2)
- 10: write_ref($t9, $t8)
- 11: $t10 := move($t0)
- 12: return $t10
+     var $t8: TestEliminateMutRefs::R
+  0: $t2 := 3
+  1: $t3 := pack TestEliminateMutRefs::R($t2)
+  2: $t0 := $t3
+  3: $t4 := borrow_local($t0)
+  4: $t5 := borrow_field<TestEliminateMutRefs::R>.x($t4)
+  5: $t1 := $t5
+  6: $t6 := 0
+  7: $t7 := move($t1)
+  8: write_ref($t7, $t6)
+  9: $t8 := move($t0)
+ 10: return $t8
 }
 
 
@@ -292,42 +270,34 @@ fun TestEliminateMutRefs::test2($t0|x_ref: &mut u64, $t1|v: u64) {
 
 [variant baseline]
 public fun TestEliminateMutRefs::test3($t0|r_ref: &mut TestEliminateMutRefs::R, $t1|v: u64) {
-     var $t2|x_ref: &mut u64
-     var $t3: &mut TestEliminateMutRefs::R
-     var $t4: &mut u64
-     var $t5: &mut u64
-     var $t6: u64
-  0: $t3 := copy($t0)
-  1: $t4 := borrow_field<TestEliminateMutRefs::R>.x($t3)
-  2: $t2 := $t4
-  3: $t5 := move($t2)
-  4: $t6 := move($t1)
-  5: TestEliminateMutRefs::test2($t5, $t6)
-  6: trace_local[r_ref]($t0)
-  7: return ()
+     var $t2: &mut TestEliminateMutRefs::R
+     var $t3: &mut u64
+     var $t4: u64
+  0: $t2 := copy($t0)
+  1: $t3 := borrow_field<TestEliminateMutRefs::R>.x($t2)
+  2: $t4 := move($t1)
+  3: TestEliminateMutRefs::test2($t3, $t4)
+  4: trace_local[r_ref]($t0)
+  5: return ()
 }
 
 
 [variant baseline]
 fun TestEliminateMutRefs::test4(): TestEliminateMutRefs::R {
      var $t0|r: TestEliminateMutRefs::R
-     var $t1|r_ref: &mut TestEliminateMutRefs::R
-     var $t2: u64
-     var $t3: TestEliminateMutRefs::R
-     var $t4: &mut TestEliminateMutRefs::R
-     var $t5: &mut TestEliminateMutRefs::R
-     var $t6: u64
-     var $t7: TestEliminateMutRefs::R
-  0: $t2 := 3
-  1: $t3 := pack TestEliminateMutRefs::R($t2)
-  2: $t0 := $t3
-  3: $t4 := borrow_local($t0)
-  4: $t1 := $t4
-  5: $t5 := move($t1)
-  6: $t6 := 0
-  7: TestEliminateMutRefs::test3($t5, $t6)
-  8: $t7 := move($t0)
-  9: return $t7
+     var $t1: u64
+     var $t2: TestEliminateMutRefs::R
+     var $t3: &mut TestEliminateMutRefs::R
+     var $t4: u64
+     var $t5: TestEliminateMutRefs::R
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateMutRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := 0
+  5: TestEliminateMutRefs::test3($t3, $t4)
+  6: $t5 := move($t0)
+  7: return $t5
 }
 
 
@@ -345,29 +315,21 @@ public fun TestEliminateMutRefs::test5($t0|r_ref: &mut TestEliminateMutRefs::R):
 [variant baseline]
 fun TestEliminateMutRefs::test6(): TestEliminateMutRefs::R {
      var $t0|r: TestEliminateMutRefs::R
-     var $t1|r_ref: &mut TestEliminateMutRefs::R
-     var $t2|x_ref: &mut u64
-     var $t3: u64
-     var $t4: TestEliminateMutRefs::R
-     var $t5: &mut TestEliminateMutRefs::R
-     var $t6: &mut TestEliminateMutRefs::R
-     var $t7: &mut u64
-     var $t8: &mut u64
-     var $t9: u64
-     var $t10: TestEliminateMutRefs::R
-  0: $t3 := 3
-  1: $t4 := pack TestEliminateMutRefs::R($t3)
-  2: $t0 := $t4
-  3: $t5 := borrow_local($t0)
-  4: $t1 := $t5
-  5: $t6 := move($t1)
-  6: $t7 := TestEliminateMutRefs::test5($t6)
-  7: $t2 := $t7
-  8: $t8 := move($t2)
-  9: $t9 := 0
- 10: TestEliminateMutRefs::test2($t8, $t9)
- 11: $t10 := move($t0)
- 12: return $t10
+     var $t1: u64
+     var $t2: TestEliminateMutRefs::R
+     var $t3: &mut TestEliminateMutRefs::R
+     var $t4: &mut u64
+     var $t5: u64
+     var $t6: TestEliminateMutRefs::R
+  0: $t1 := 3
+  1: $t2 := pack TestEliminateMutRefs::R($t1)
+  2: $t0 := $t2
+  3: $t3 := borrow_local($t0)
+  4: $t4 := TestEliminateMutRefs::test5($t3)
+  5: $t5 := 0
+  6: TestEliminateMutRefs::test2($t4, $t5)
+  7: $t6 := move($t0)
+  8: return $t6
 }
 
 
@@ -396,12 +358,12 @@ fun TestEliminateMutRefs::test7($t0|b: bool) {
   7: $t3 := $t8
   8: $t9 := move($t0)
   9: if ($t9) goto 10 else goto 15
- 10: label L0
+ 10: label L1
  11: $t10 := move($t3)
  12: destroy($t10)
  13: $t11 := borrow_local($t2)
  14: $t3 := $t11
- 15: label L2
+ 15: label L0
  16: $t12 := move($t3)
  17: $t13 := 0
  18: TestEliminateMutRefs::test3($t12, $t13)
@@ -448,50 +410,51 @@ fun TestEliminateMutRefs::test8($t0|b: bool, $t1|n: u64, $t2|r_ref: &mut TestEli
   5: $t4 := $t9
   6: $t10 := borrow_local($t4)
   7: $t5 := $t10
-  8: label L7
+  8: label L6
   9: $t11 := 0
  10: $t12 := copy($t1)
  11: $t13 := <($t11, $t12)
- 12: if ($t13) goto 13 else goto 35
- 13: label L0
- 14: $t14 := move($t5)
- 15: destroy($t14)
- 16: $t15 := copy($t1)
- 17: $t16 := 2
- 18: $t17 := /($t15, $t16)
- 19: $t18 := 0
- 20: $t19 := ==($t17, $t18)
- 21: if ($t19) goto 22 else goto 26
- 22: label L3
- 23: $t20 := borrow_local($t3)
- 24: $t5 := $t20
- 25: goto 29
- 26: label L5
- 27: $t21 := borrow_local($t4)
- 28: $t5 := $t21
- 29: label L6
- 30: $t22 := move($t1)
- 31: $t23 := 1
- 32: $t24 := -($t22, $t23)
- 33: $t1 := $t24
- 34: goto 8
- 35: label L2
- 36: $t25 := move($t0)
- 37: if ($t25) goto 38 else goto 45
- 38: label L8
- 39: $t26 := move($t5)
- 40: destroy($t26)
- 41: $t27 := copy($t2)
- 42: $t28 := 0
- 43: TestEliminateMutRefs::test3($t27, $t28)
- 44: goto 51
- 45: label L10
- 46: $t29 := copy($t2)
- 47: destroy($t29)
- 48: $t30 := move($t5)
- 49: $t31 := 0
- 50: TestEliminateMutRefs::test3($t30, $t31)
- 51: label L11
- 52: trace_local[r_ref]($t2)
- 53: return ()
+ 12: if ($t13) goto 13 else goto 36
+ 13: label L1
+ 14: label L2
+ 15: $t14 := move($t5)
+ 16: destroy($t14)
+ 17: $t15 := copy($t1)
+ 18: $t16 := 2
+ 19: $t17 := /($t15, $t16)
+ 20: $t18 := 0
+ 21: $t19 := ==($t17, $t18)
+ 22: if ($t19) goto 23 else goto 27
+ 23: label L4
+ 24: $t20 := borrow_local($t3)
+ 25: $t5 := $t20
+ 26: goto 30
+ 27: label L3
+ 28: $t21 := borrow_local($t4)
+ 29: $t5 := $t21
+ 30: label L5
+ 31: $t22 := move($t1)
+ 32: $t23 := 1
+ 33: $t24 := -($t22, $t23)
+ 34: $t1 := $t24
+ 35: goto 8
+ 36: label L0
+ 37: $t25 := move($t0)
+ 38: if ($t25) goto 39 else goto 46
+ 39: label L8
+ 40: $t26 := move($t5)
+ 41: destroy($t26)
+ 42: $t27 := copy($t2)
+ 43: $t28 := 0
+ 44: TestEliminateMutRefs::test3($t27, $t28)
+ 45: goto 52
+ 46: label L7
+ 47: $t29 := copy($t2)
+ 48: destroy($t29)
+ 49: $t30 := move($t5)
+ 50: $t31 := 0
+ 51: TestEliminateMutRefs::test3($t30, $t31)
+ 52: label L9
+ 53: trace_local[r_ref]($t2)
+ 54: return ()
 }
diff --git a/language/move-prover/bytecode/tests/reaching_def/basic_test.exp b/language/move-prover/bytecode/tests/reaching_def/basic_test.exp
index 5ff3af1a2b..baab1afae6 100644
--- a/language/move-prover/bytecode/tests/reaching_def/basic_test.exp
+++ b/language/move-prover/bytecode/tests/reaching_def/basic_test.exp
@@ -2,40 +2,35 @@
 
 [variant baseline]
 fun ReachingDefTest::basic($t0|a: u64, $t1|b: u64): u64 {
-     var $t2|x: u64
+     var $t2: u64
      var $t3: u64
      var $t4: u64
      var $t5: u64
      var $t6: u64
      var $t7: u64
      var $t8: u64
-     var $t9: u64
-     var $t10: u64
-  0: $t3 := copy($t0)
-  1: $t4 := move($t1)
-  2: $t5 := +($t3, $t4)
-  3: $t6 := move($t0)
-  4: $t7 := /($t5, $t6)
-  5: $t2 := $t7
-  6: $t8 := move($t2)
-  7: $t9 := 1
-  8: $t10 := +($t8, $t9)
-  9: return $t10
+  0: $t2 := copy($t0)
+  1: $t3 := move($t1)
+  2: $t4 := +($t2, $t3)
+  3: $t5 := move($t0)
+  4: $t6 := /($t4, $t5)
+  5: $t7 := 1
+  6: $t8 := +($t6, $t7)
+  7: return $t8
 }
 
 
 [variant baseline]
 fun ReachingDefTest::create_resource($t0|sender: &signer) {
-     var $t1|r: ReachingDefTest::R
-     var $t2: &signer
-     var $t3: u64
-     var $t4: bool
-     var $t5: ReachingDefTest::R
-  0: $t2 := move($t0)
-  1: $t3 := 1
-  2: $t4 := false
-  3: $t5 := pack ReachingDefTest::R($t3, $t4)
-  4: move_to<ReachingDefTest::R>($t5, $t2)
+     var $t1: &signer
+     var $t2: u64
+     var $t3: bool
+     var $t4: ReachingDefTest::R
+  0: $t1 := move($t0)
+  1: $t2 := 1
+  2: $t3 := false
+  3: $t4 := pack ReachingDefTest::R($t2, $t3)
+  4: move_to<ReachingDefTest::R>($t4, $t1)
   5: return ()
 }
 
@@ -43,39 +38,34 @@ fun ReachingDefTest::create_resource($t0|sender: &signer) {
 
 [variant baseline]
 fun ReachingDefTest::basic($t0|a: u64, $t1|b: u64): u64 {
-     var $t2|x: u64
+     var $t2: u64
      var $t3: u64
      var $t4: u64
      var $t5: u64
      var $t6: u64
      var $t7: u64
      var $t8: u64
-     var $t9: u64
-     var $t10: u64
-  0: $t3 := copy($t0)
-  1: $t4 := move($t1)
-  2: $t5 := +($t0, $t1)
-  3: $t6 := move($t0)
-  4: $t7 := /($t5, $t0)
-  5: $t2 := $t7
-  6: $t8 := move($t7)
-  7: $t9 := 1
-  8: $t10 := +($t7, $t9)
-  9: return $t10
+  0: $t2 := copy($t0)
+  1: $t3 := move($t1)
+  2: $t4 := +($t0, $t1)
+  3: $t5 := move($t0)
+  4: $t6 := /($t4, $t0)
+  5: $t7 := 1
+  6: $t8 := +($t6, $t7)
+  7: return $t8
 }
 
 
 [variant baseline]
 fun ReachingDefTest::create_resource($t0|sender: signer) {
-     var $t1|r: ReachingDefTest::R
-     var $t2: signer
-     var $t3: u64
-     var $t4: bool
-     var $t5: ReachingDefTest::R
-  0: $t2 := move($t0)
-  1: $t3 := 1
-  2: $t4 := false
-  3: $t5 := pack ReachingDefTest::R($t3, $t4)
-  4: move_to<ReachingDefTest::R>($t5, $t0)
+     var $t1: signer
+     var $t2: u64
+     var $t3: bool
+     var $t4: ReachingDefTest::R
+  0: $t1 := move($t0)
+  1: $t2 := 1
+  2: $t3 := false
+  3: $t4 := pack ReachingDefTest::R($t2, $t3)
+  4: move_to<ReachingDefTest::R>($t4, $t0)
   5: return ()
 }
diff --git a/language/move-prover/bytecode/tests/reaching_def/test_branching.exp b/language/move-prover/bytecode/tests/reaching_def/test_branching.exp
index a805579638..27b13bd829 100644
--- a/language/move-prover/bytecode/tests/reaching_def/test_branching.exp
+++ b/language/move-prover/bytecode/tests/reaching_def/test_branching.exp
@@ -3,27 +3,23 @@
 [variant baseline]
 fun TestBranching::branching($t0|cond: bool): u64 {
      var $t1|tmp#$1: u64
-     var $t2|x: u64
-     var $t3: bool
+     var $t2: bool
+     var $t3: u64
      var $t4: u64
      var $t5: u64
-     var $t6: u64
-     var $t7: u64
-  0: $t3 := move($t0)
-  1: if ($t3) goto 2 else goto 6
-  2: label L0
-  3: $t4 := 3
-  4: $t1 := $t4
+  0: $t2 := move($t0)
+  1: if ($t2) goto 2 else goto 6
+  2: label L1
+  3: $t3 := 3
+  4: $t1 := $t3
   5: goto 10
-  6: label L2
-  7: $t5 := 4
-  8: $t1 := $t5
+  6: label L0
+  7: $t4 := 4
+  8: $t1 := $t4
   9: goto 10
- 10: label L3
- 11: $t6 := move($t1)
- 12: $t2 := $t6
- 13: $t7 := move($t2)
- 14: return $t7
+ 10: label L2
+ 11: $t5 := move($t1)
+ 12: return $t5
 }
 
 ============ after pipeline `reaching_def` ================
@@ -31,24 +27,20 @@ fun TestBranching::branching($t0|cond: bool): u64 {
 [variant baseline]
 fun TestBranching::branching($t0|cond: bool): u64 {
      var $t1|tmp#$1: u64
-     var $t2|x: u64
-     var $t3: bool
+     var $t2: bool
+     var $t3: u64
      var $t4: u64
      var $t5: u64
-     var $t6: u64
-     var $t7: u64
-  0: $t3 := move($t0)
+  0: $t2 := move($t0)
   1: if ($t0) goto 2 else goto 6
-  2: label L0
-  3: $t4 := 3
-  4: $t1 := $t4
+  2: label L1
+  3: $t3 := 3
+  4: $t1 := $t3
   5: goto 9
-  6: label L2
-  7: $t5 := 4
-  8: $t1 := $t5
-  9: label L3
- 10: $t6 := move($t1)
- 11: $t2 := $t1
- 12: $t7 := move($t1)
- 13: return $t1
+  6: label L0
+  7: $t4 := 4
+  8: $t1 := $t4
+  9: label L2
+ 10: $t5 := move($t1)
+ 11: return $t1
 }
diff --git a/language/move-prover/bytecode/tests/read_write_set/bool_footprint.exp b/language/move-prover/bytecode/tests/read_write_set/bool_footprint.exp
index c765683e9d..8ef29fbc0e 100644
--- a/language/move-prover/bytecode/tests/read_write_set/bool_footprint.exp
+++ b/language/move-prover/bytecode/tests/read_write_set/bool_footprint.exp
@@ -7,12 +7,14 @@ public fun BoolFootprint::call_get($t0|a: address) {
      var $t3: u64
   0: $t1 := move($t0)
   1: $t2 := BoolFootprint::global_get($t1)
-  2: if ($t2) goto 6 else goto 3
+  2: if ($t2) goto 3 else goto 5
   3: label L1
-  4: $t3 := 22
-  5: abort($t3)
-  6: label L0
-  7: return ()
+  4: goto 8
+  5: label L0
+  6: $t3 := 22
+  7: abort($t3)
+  8: label L2
+  9: return ()
 }
 
 
@@ -30,18 +32,18 @@ public fun BoolFootprint::global_get($t0|a: address): bool {
   0: $t2 := copy($t0)
   1: $t3 := exists<BoolFootprint::B>($t2)
   2: if ($t3) goto 3 else goto 10
-  3: label L0
+  3: label L1
   4: $t4 := move($t0)
   5: $t5 := borrow_global<BoolFootprint::B>($t4)
   6: $t6 := borrow_field<BoolFootprint::B>.b($t5)
   7: $t7 := read_ref($t6)
   8: $t1 := $t7
   9: goto 14
- 10: label L2
+ 10: label L0
  11: $t8 := false
  12: $t1 := $t8
  13: goto 14
- 14: label L3
+ 14: label L2
  15: $t9 := move($t1)
  16: return $t9
 }
@@ -62,12 +64,14 @@ public fun BoolFootprint::call_get($t0|a: address) {
      #
   0: $t1 := move($t0)
   1: $t2 := BoolFootprint::global_get($t1)
-  2: if ($t2) goto 6 else goto 3
+  2: if ($t2) goto 3 else goto 5
   3: label L1
-  4: $t3 := 22
-  5: abort($t3)
-  6: label L0
-  7: return ()
+  4: goto 8
+  5: label L0
+  6: $t3 := 22
+  7: abort($t3)
+  8: label L2
+  9: return ()
 }
 
 
@@ -93,18 +97,18 @@ public fun BoolFootprint::global_get($t0|a: address): bool {
   0: $t2 := copy($t0)
   1: $t3 := exists<BoolFootprint::B>($t2)
   2: if ($t3) goto 3 else goto 10
-  3: label L0
+  3: label L1
   4: $t4 := move($t0)
   5: $t5 := borrow_global<BoolFootprint::B>($t4)
   6: $t6 := borrow_field<BoolFootprint::B>.b($t5)
   7: $t7 := read_ref($t6)
   8: $t1 := $t7
   9: goto 14
- 10: label L2
+ 10: label L0
  11: $t8 := false
  12: $t1 := $t8
  13: goto 14
- 14: label L3
+ 14: label L2
  15: $t9 := move($t1)
  16: return $t9
 }
diff --git a/language/move-prover/bytecode/tests/read_write_set/borrow.exp b/language/move-prover/bytecode/tests/read_write_set/borrow.exp
index 5d5d09acc4..1f659f5b5f 100644
--- a/language/move-prover/bytecode/tests/read_write_set/borrow.exp
+++ b/language/move-prover/bytecode/tests/read_write_set/borrow.exp
@@ -28,6 +28,10 @@ public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
 public native fun vector::empty<#0>(): vector<#0>;
 
 
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
 [variant baseline]
 public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
 
@@ -154,6 +158,10 @@ public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
 public native fun vector::empty<#0>(): vector<#0>;
 
 
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
 [variant baseline]
 public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
 
diff --git a/language/move-prover/bytecode/tests/read_write_set/footprint.exp b/language/move-prover/bytecode/tests/read_write_set/footprint.exp
index 0c635752d4..63d9d6e9dd 100644
--- a/language/move-prover/bytecode/tests/read_write_set/footprint.exp
+++ b/language/move-prover/bytecode/tests/read_write_set/footprint.exp
@@ -8,11 +8,11 @@ public fun Footprint::reassign_cond($t0|a: address, $t1|b: bool): address {
      var $t5: address
   0: $t2 := move($t1)
   1: if ($t2) goto 2 else goto 6
-  2: label L0
+  2: label L1
   3: $t3 := 0x2
   4: $t0 := $t3
   5: goto 6
-  6: label L2
+  6: label L0
   7: $t4 := 4
   8: destroy($t4)
   9: $t5 := move($t0)
@@ -23,11 +23,8 @@ public fun Footprint::reassign_cond($t0|a: address, $t1|b: bool): address {
 [variant baseline]
 public fun Footprint::reassign_constant($t0|a: address): address {
      var $t1: address
-     var $t2: address
   0: $t1 := 0x2
-  1: $t0 := $t1
-  2: $t2 := move($t0)
-  3: return $t2
+  1: return $t1
 }
 
 
@@ -53,17 +50,17 @@ public fun Footprint::reassign_field_cond($t0|s: &mut Footprint::S, $t1|b: bool)
      var $t6: &mut Footprint::S
   0: $t2 := move($t1)
   1: if ($t2) goto 2 else goto 8
-  2: label L0
+  2: label L1
   3: $t3 := 0x2
   4: $t4 := move($t0)
   5: $t5 := borrow_field<Footprint::S>.f($t4)
   6: write_ref($t5, $t3)
   7: goto 12
-  8: label L2
+  8: label L0
   9: $t6 := move($t0)
  10: destroy($t6)
  11: goto 12
- 12: label L3
+ 12: label L2
  13: return ()
 }
 
@@ -71,11 +68,8 @@ public fun Footprint::reassign_field_cond($t0|s: &mut Footprint::S, $t1|b: bool)
 [variant baseline]
 public fun Footprint::reassign_other_param($t0|a1: address, $t1|a2: address): address {
      var $t2: address
-     var $t3: address
   0: $t2 := move($t1)
-  1: $t0 := $t2
-  2: $t3 := move($t0)
-  3: return $t3
+  1: return $t2
 }
 
 ============ after pipeline `read_write_set` ================
@@ -95,11 +89,11 @@ public fun Footprint::reassign_cond($t0|a: address, $t1|b: bool): address {
      #
   0: $t2 := move($t1)
   1: if ($t2) goto 2 else goto 6
-  2: label L0
+  2: label L1
   3: $t3 := 0x2
   4: $t0 := $t3
   5: goto 6
-  6: label L2
+  6: label L0
   7: $t4 := 4
   8: destroy($t4)
   9: $t5 := move($t0)
@@ -110,16 +104,13 @@ public fun Footprint::reassign_cond($t0|a: address, $t1|b: bool): address {
 [variant baseline]
 public fun Footprint::reassign_constant($t0|a: address): address {
      var $t1: address
-     var $t2: address
      # Accesses:
      #
      # Locals:
      # Ret(0): 0x2
      #
   0: $t1 := 0x2
-  1: $t0 := $t1
-  2: $t2 := move($t0)
-  3: return $t2
+  1: return $t1
 }
 
 
@@ -160,17 +151,17 @@ public fun Footprint::reassign_field_cond($t0|s: &mut Footprint::S, $t1|b: bool)
      #
   0: $t2 := move($t1)
   1: if ($t2) goto 2 else goto 8
-  2: label L0
+  2: label L1
   3: $t3 := 0x2
   4: $t4 := move($t0)
   5: $t5 := borrow_field<Footprint::S>.f($t4)
   6: write_ref($t5, $t3)
   7: goto 12
-  8: label L2
+  8: label L0
   9: $t6 := move($t0)
  10: destroy($t6)
  11: goto 12
- 12: label L3
+ 12: label L2
  13: return ()
 }
 
@@ -178,7 +169,6 @@ public fun Footprint::reassign_field_cond($t0|s: &mut Footprint::S, $t1|b: bool)
 [variant baseline]
 public fun Footprint::reassign_other_param($t0|a1: address, $t1|a2: address): address {
      var $t2: address
-     var $t3: address
      # Accesses:
      # Formal(1): Read
      #
@@ -186,7 +176,5 @@ public fun Footprint::reassign_other_param($t0|a1: address, $t1|a2: address): ad
      # Ret(0): Formal(1)
      #
   0: $t2 := move($t1)
-  1: $t0 := $t2
-  2: $t3 := move($t0)
-  3: return $t3
+  1: return $t2
 }
diff --git a/language/move-prover/bytecode/tests/read_write_set/functions.exp b/language/move-prover/bytecode/tests/read_write_set/functions.exp
index 2a29accb2f..d87913e23e 100644
--- a/language/move-prover/bytecode/tests/read_write_set/functions.exp
+++ b/language/move-prover/bytecode/tests/read_write_set/functions.exp
@@ -22,15 +22,15 @@ public fun Funtions::choice($t0|a: vector<address>, $t1|b: vector<address>, $t2|
      var $t7: vector<address>
   0: $t4 := move($t2)
   1: if ($t4) goto 2 else goto 6
-  2: label L0
+  2: label L1
   3: $t5 := move($t0)
   4: $t3 := $t5
   5: goto 10
-  6: label L2
+  6: label L0
   7: $t6 := move($t1)
   8: $t3 := $t6
   9: goto 10
- 10: label L3
+ 10: label L2
  11: $t7 := move($t3)
  12: return $t7
 }
@@ -120,15 +120,15 @@ public fun Funtions::choice($t0|a: vector<address>, $t1|b: vector<address>, $t2|
      #
   0: $t4 := move($t2)
   1: if ($t4) goto 2 else goto 6
-  2: label L0
+  2: label L1
   3: $t5 := move($t0)
   4: $t3 := $t5
   5: goto 10
-  6: label L2
+  6: label L0
   7: $t6 := move($t1)
   8: $t3 := $t6
   9: goto 10
- 10: label L3
+ 10: label L2
  11: $t7 := move($t3)
  12: return $t7
 }
diff --git a/language/move-prover/bytecode/tests/read_write_set/multi_deps.exp b/language/move-prover/bytecode/tests/read_write_set/multi_deps.exp
index dfccabdfcb..29f703d49d 100644
--- a/language/move-prover/bytecode/tests/read_write_set/multi_deps.exp
+++ b/language/move-prover/bytecode/tests/read_write_set/multi_deps.exp
@@ -16,7 +16,7 @@ fun MultiDeps::add_to($t0|s: &mut MultiDeps::S, $t1|t: &MultiDeps::T, $t2|v: boo
      var $t14: &mut u64
   0: $t4 := move($t2)
   1: if ($t4) goto 2 else goto 10
-  2: label L0
+  2: label L1
   3: $t5 := move($t1)
   4: destroy($t5)
   5: $t6 := copy($t0)
@@ -24,13 +24,13 @@ fun MultiDeps::add_to($t0|s: &mut MultiDeps::S, $t1|t: &MultiDeps::T, $t2|v: boo
   7: $t8 := read_ref($t7)
   8: $t3 := $t8
   9: goto 16
- 10: label L2
+ 10: label L0
  11: $t9 := move($t1)
  12: $t10 := borrow_field<MultiDeps::T>.f($t9)
  13: $t11 := read_ref($t10)
  14: $t3 := $t11
  15: goto 16
- 16: label L3
+ 16: label L2
  17: $t12 := move($t3)
  18: $t13 := move($t0)
  19: $t14 := borrow_field<MultiDeps::S>.f($t13)
@@ -66,7 +66,7 @@ fun MultiDeps::add_to($t0|s: &mut MultiDeps::S, $t1|t: &MultiDeps::T, $t2|v: boo
      #
   0: $t4 := move($t2)
   1: if ($t4) goto 2 else goto 10
-  2: label L0
+  2: label L1
   3: $t5 := move($t1)
   4: destroy($t5)
   5: $t6 := copy($t0)
@@ -74,13 +74,13 @@ fun MultiDeps::add_to($t0|s: &mut MultiDeps::S, $t1|t: &MultiDeps::T, $t2|v: boo
   7: $t8 := read_ref($t7)
   8: $t3 := $t8
   9: goto 16
- 10: label L2
+ 10: label L0
  11: $t9 := move($t1)
  12: $t10 := borrow_field<MultiDeps::T>.f($t9)
  13: $t11 := read_ref($t10)
  14: $t3 := $t11
  15: goto 16
- 16: label L3
+ 16: label L2
  17: $t12 := move($t3)
  18: $t13 := move($t0)
  19: $t14 := borrow_field<MultiDeps::S>.f($t13)
diff --git a/language/move-prover/bytecode/tests/read_write_set/nested_fields.exp b/language/move-prover/bytecode/tests/read_write_set/nested_fields.exp
index bda9184287..fd8ee07db8 100644
--- a/language/move-prover/bytecode/tests/read_write_set/nested_fields.exp
+++ b/language/move-prover/bytecode/tests/read_write_set/nested_fields.exp
@@ -58,7 +58,7 @@ fun NestedFields::nested_fields_interproc($t0|a1: &NestedFields::A, $t1|a2: &Nes
      var $t14: address
   0: $t4 := move($t2)
   1: if ($t4) goto 2 else goto 11
-  2: label L0
+  2: label L1
   3: $t5 := move($t1)
   4: destroy($t5)
   5: $t6 := move($t0)
@@ -67,7 +67,7 @@ fun NestedFields::nested_fields_interproc($t0|a1: &NestedFields::A, $t1|a2: &Nes
   8: $t9 := NestedFields::nested_fields_helper1($t8)
   9: $t3 := $t9
  10: goto 19
- 11: label L2
+ 11: label L0
  12: $t10 := move($t0)
  13: destroy($t10)
  14: $t11 := move($t1)
@@ -75,7 +75,7 @@ fun NestedFields::nested_fields_interproc($t0|a1: &NestedFields::A, $t1|a2: &Nes
  16: $t13 := NestedFields::nested_fields_helper2($t12)
  17: $t3 := $t13
  18: goto 19
- 19: label L3
+ 19: label L2
  20: $t14 := move($t3)
  21: return $t14
 }
@@ -173,7 +173,7 @@ fun NestedFields::nested_fields_interproc($t0|a1: &NestedFields::A, $t1|a2: &Nes
      #
   0: $t4 := move($t2)
   1: if ($t4) goto 2 else goto 11
-  2: label L0
+  2: label L1
   3: $t5 := move($t1)
   4: destroy($t5)
   5: $t6 := move($t0)
@@ -182,7 +182,7 @@ fun NestedFields::nested_fields_interproc($t0|a1: &NestedFields::A, $t1|a2: &Nes
   8: $t9 := NestedFields::nested_fields_helper1($t8)
   9: $t3 := $t9
  10: goto 19
- 11: label L2
+ 11: label L0
  12: $t10 := move($t0)
  13: destroy($t10)
  14: $t11 := move($t1)
@@ -190,7 +190,7 @@ fun NestedFields::nested_fields_interproc($t0|a1: &NestedFields::A, $t1|a2: &Nes
  16: $t13 := NestedFields::nested_fields_helper2($t12)
  17: $t3 := $t13
  18: goto 19
- 19: label L3
+ 19: label L2
  20: $t14 := move($t3)
  21: return $t14
 }
diff --git a/language/move-prover/bytecode/tests/read_write_set/pack_unpack.exp b/language/move-prover/bytecode/tests/read_write_set/pack_unpack.exp
index 1e1fa22d9d..9690fd79a1 100644
--- a/language/move-prover/bytecode/tests/read_write_set/pack_unpack.exp
+++ b/language/move-prover/bytecode/tests/read_write_set/pack_unpack.exp
@@ -71,15 +71,15 @@ fun PackUnpack::read_unpacked_addr($t0|s: PackUnpack::S): address {
   6: $t2 := $t6
   7: $t11 := move($t4)
   8: if ($t11) goto 9 else goto 13
-  9: label L0
+  9: label L1
  10: $t12 := move($t2)
  11: $t1 := $t12
  12: goto 17
- 13: label L2
+ 13: label L0
  14: $t13 := move($t3)
  15: $t1 := $t13
  16: goto 17
- 17: label L3
+ 17: label L2
  18: $t14 := move($t1)
  19: return $t14
 }
@@ -87,25 +87,21 @@ fun PackUnpack::read_unpacked_addr($t0|s: PackUnpack::S): address {
 
 [variant baseline]
 fun PackUnpack::read_unpacked_borrow_glob($t0|s: PackUnpack::S): bool {
-     var $t1|a1: address
-     var $t2: PackUnpack::S
-     var $t3: address
-     var $t4: PackUnpack::T
-     var $t5: u64
-     var $t6: address
-     var $t7: &PackUnpack::Glob
-     var $t8: &bool
-     var $t9: bool
-  0: $t2 := move($t0)
-  1: ($t3, $t4, $t5) := unpack PackUnpack::S($t2)
-  2: destroy($t5)
-  3: destroy($t4)
-  4: $t1 := $t3
-  5: $t6 := move($t1)
-  6: $t7 := borrow_global<PackUnpack::Glob>($t6)
-  7: $t8 := borrow_field<PackUnpack::Glob>.b($t7)
-  8: $t9 := read_ref($t8)
-  9: return $t9
+     var $t1: PackUnpack::S
+     var $t2: address
+     var $t3: PackUnpack::T
+     var $t4: u64
+     var $t5: &PackUnpack::Glob
+     var $t6: &bool
+     var $t7: bool
+  0: $t1 := move($t0)
+  1: ($t2, $t3, $t4) := unpack PackUnpack::S($t1)
+  2: destroy($t4)
+  3: destroy($t3)
+  4: $t5 := borrow_global<PackUnpack::Glob>($t2)
+  5: $t6 := borrow_field<PackUnpack::Glob>.b($t5)
+  6: $t7 := read_ref($t6)
+  7: return $t7
 }
 
 
@@ -115,57 +111,46 @@ fun PackUnpack::reassign_packed_addr($t0|a2: address): address {
      var $t2: address
      var $t3: bool
      var $t4: PackUnpack::T
-     var $t5: PackUnpack::T
-     var $t6: address
-     var $t7: bool
-     var $t8: PackUnpack::T
-     var $t9: &PackUnpack::T
-     var $t10: &address
-     var $t11: address
+     var $t5: address
+     var $t6: bool
+     var $t7: PackUnpack::T
+     var $t8: &PackUnpack::T
+     var $t9: &address
+     var $t10: address
   0: $t2 := 0x7
   1: $t3 := false
   2: $t4 := pack PackUnpack::T($t2, $t3)
-  3: $t1 := $t4
-  4: $t5 := move($t1)
-  5: destroy($t5)
-  6: $t6 := move($t0)
-  7: $t7 := false
-  8: $t8 := pack PackUnpack::T($t6, $t7)
-  9: $t1 := $t8
- 10: $t9 := borrow_local($t1)
- 11: $t10 := borrow_field<PackUnpack::T>.a2($t9)
- 12: $t11 := read_ref($t10)
- 13: return $t11
+  3: destroy($t4)
+  4: $t5 := move($t0)
+  5: $t6 := false
+  6: $t7 := pack PackUnpack::T($t5, $t6)
+  7: $t1 := $t7
+  8: $t8 := borrow_local($t1)
+  9: $t9 := borrow_field<PackUnpack::T>.a2($t8)
+ 10: $t10 := read_ref($t9)
+ 11: return $t10
 }
 
 
 [variant baseline]
 fun PackUnpack::use_results($t0|_: u64, $t1|a: address): address {
-     var $t2|a1: address
-     var $t3|s: PackUnpack::S
+     var $t2: address
+     var $t3: address
      var $t4: address
-     var $t5: address
-     var $t6: address
-     var $t7: address
-     var $t8: bool
-     var $t9: PackUnpack::T
-     var $t10: u64
-     var $t11: PackUnpack::S
-     var $t12: PackUnpack::S
-     var $t13: address
-  0: $t4 := move($t1)
-  1: $t5 := PackUnpack::pack_then_read($t4)
-  2: $t2 := $t5
-  3: $t6 := move($t2)
-  4: $t7 := 0x7
-  5: $t8 := true
-  6: $t9 := pack PackUnpack::T($t7, $t8)
-  7: $t10 := 10
-  8: $t11 := pack PackUnpack::S($t6, $t9, $t10)
-  9: $t3 := $t11
- 10: $t12 := move($t3)
- 11: $t13 := PackUnpack::read_unpacked_addr($t12)
- 12: return $t13
+     var $t5: bool
+     var $t6: PackUnpack::T
+     var $t7: u64
+     var $t8: PackUnpack::S
+     var $t9: address
+  0: $t2 := move($t1)
+  1: $t3 := PackUnpack::pack_then_read($t2)
+  2: $t4 := 0x7
+  3: $t5 := true
+  4: $t6 := pack PackUnpack::T($t4, $t5)
+  5: $t7 := 10
+  6: $t8 := pack PackUnpack::S($t3, $t6, $t7)
+  7: $t9 := PackUnpack::read_unpacked_addr($t8)
+  8: return $t9
 }
 
 ============ after pipeline `read_write_set` ================
@@ -262,15 +247,15 @@ fun PackUnpack::read_unpacked_addr($t0|s: PackUnpack::S): address {
   6: $t2 := $t6
   7: $t11 := move($t4)
   8: if ($t11) goto 9 else goto 13
-  9: label L0
+  9: label L1
  10: $t12 := move($t2)
  11: $t1 := $t12
  12: goto 17
- 13: label L2
+ 13: label L0
  14: $t13 := move($t3)
  15: $t1 := $t13
  16: goto 17
- 17: label L3
+ 17: label L2
  18: $t14 := move($t1)
  19: return $t14
 }
@@ -278,33 +263,28 @@ fun PackUnpack::read_unpacked_addr($t0|s: PackUnpack::S): address {
 
 [variant baseline]
 fun PackUnpack::read_unpacked_borrow_glob($t0|s: PackUnpack::S): bool {
-     var $t1|a1: address
-     var $t2: PackUnpack::S
-     var $t3: address
-     var $t4: PackUnpack::T
-     var $t5: u64
-     var $t6: address
-     var $t7: &PackUnpack::Glob
-     var $t8: &bool
-     var $t9: bool
+     var $t1: PackUnpack::S
+     var $t2: address
+     var $t3: PackUnpack::T
+     var $t4: u64
+     var $t5: &PackUnpack::Glob
+     var $t6: &bool
+     var $t7: bool
      # Accesses:
      # Formal(0): Read
-     # Formal(0)/a1: Read
      # Formal(0)/a1/0x1::PackUnpack::Glob/b: Read
      #
      # Locals:
      # Ret(0): Formal(0)/a1/0x1::PackUnpack::Glob/b
      #
-  0: $t2 := move($t0)
-  1: ($t3, $t4, $t5) := unpack PackUnpack::S($t2)
-  2: destroy($t5)
-  3: destroy($t4)
-  4: $t1 := $t3
-  5: $t6 := move($t1)
-  6: $t7 := borrow_global<PackUnpack::Glob>($t6)
-  7: $t8 := borrow_field<PackUnpack::Glob>.b($t7)
-  8: $t9 := read_ref($t8)
-  9: return $t9
+  0: $t1 := move($t0)
+  1: ($t2, $t3, $t4) := unpack PackUnpack::S($t1)
+  2: destroy($t4)
+  3: destroy($t3)
+  4: $t5 := borrow_global<PackUnpack::Glob>($t2)
+  5: $t6 := borrow_field<PackUnpack::Glob>.b($t5)
+  6: $t7 := read_ref($t6)
+  7: return $t7
 }
 
 
@@ -314,13 +294,12 @@ fun PackUnpack::reassign_packed_addr($t0|a2: address): address {
      var $t2: address
      var $t3: bool
      var $t4: PackUnpack::T
-     var $t5: PackUnpack::T
-     var $t6: address
-     var $t7: bool
-     var $t8: PackUnpack::T
-     var $t9: &PackUnpack::T
-     var $t10: &address
-     var $t11: address
+     var $t5: address
+     var $t6: bool
+     var $t7: PackUnpack::T
+     var $t8: &PackUnpack::T
+     var $t9: &address
+     var $t10: address
      # Accesses:
      # Formal(0): Read
      #
@@ -330,51 +309,41 @@ fun PackUnpack::reassign_packed_addr($t0|a2: address): address {
   0: $t2 := 0x7
   1: $t3 := false
   2: $t4 := pack PackUnpack::T($t2, $t3)
-  3: $t1 := $t4
-  4: $t5 := move($t1)
-  5: destroy($t5)
-  6: $t6 := move($t0)
-  7: $t7 := false
-  8: $t8 := pack PackUnpack::T($t6, $t7)
-  9: $t1 := $t8
- 10: $t9 := borrow_local($t1)
- 11: $t10 := borrow_field<PackUnpack::T>.a2($t9)
- 12: $t11 := read_ref($t10)
- 13: return $t11
+  3: destroy($t4)
+  4: $t5 := move($t0)
+  5: $t6 := false
+  6: $t7 := pack PackUnpack::T($t5, $t6)
+  7: $t1 := $t7
+  8: $t8 := borrow_local($t1)
+  9: $t9 := borrow_field<PackUnpack::T>.a2($t8)
+ 10: $t10 := read_ref($t9)
+ 11: return $t10
 }
 
 
 [variant baseline]
 fun PackUnpack::use_results($t0|_: u64, $t1|a: address): address {
-     var $t2|a1: address
-     var $t3|s: PackUnpack::S
+     var $t2: address
+     var $t3: address
      var $t4: address
-     var $t5: address
-     var $t6: address
-     var $t7: address
-     var $t8: bool
-     var $t9: PackUnpack::T
-     var $t10: u64
-     var $t11: PackUnpack::S
-     var $t12: PackUnpack::S
-     var $t13: address
+     var $t5: bool
+     var $t6: PackUnpack::T
+     var $t7: u64
+     var $t8: PackUnpack::S
+     var $t9: address
      # Accesses:
      # Formal(1): Read
      #
      # Locals:
      # Ret(0): {0x7, Formal(1), }
      #
-  0: $t4 := move($t1)
-  1: $t5 := PackUnpack::pack_then_read($t4)
-  2: $t2 := $t5
-  3: $t6 := move($t2)
-  4: $t7 := 0x7
-  5: $t8 := true
-  6: $t9 := pack PackUnpack::T($t7, $t8)
-  7: $t10 := 10
-  8: $t11 := pack PackUnpack::S($t6, $t9, $t10)
-  9: $t3 := $t11
- 10: $t12 := move($t3)
- 11: $t13 := PackUnpack::read_unpacked_addr($t12)
- 12: return $t13
+  0: $t2 := move($t1)
+  1: $t3 := PackUnpack::pack_then_read($t2)
+  2: $t4 := 0x7
+  3: $t5 := true
+  4: $t6 := pack PackUnpack::T($t4, $t5)
+  5: $t7 := 10
+  6: $t8 := pack PackUnpack::S($t3, $t6, $t7)
+  7: $t9 := PackUnpack::read_unpacked_addr($t8)
+  8: return $t9
 }
diff --git a/language/move-prover/bytecode/tests/read_write_set/read_vector.exp b/language/move-prover/bytecode/tests/read_write_set/read_vector.exp
index 7bd471106f..1e57fe29d7 100644
--- a/language/move-prover/bytecode/tests/read_write_set/read_vector.exp
+++ b/language/move-prover/bytecode/tests/read_write_set/read_vector.exp
@@ -28,6 +28,10 @@ public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
 public native fun vector::empty<#0>(): vector<#0>;
 
 
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
 [variant baseline]
 public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
 
@@ -99,21 +103,17 @@ fun ReadVector::extract_addr_from_vec($t0|s: ReadVector::S): address {
 
 [variant baseline]
 fun ReadVector::read_addr_from_vec($t0|s: ReadVector::S): bool {
-     var $t1|a: address
-     var $t2: ReadVector::S
-     var $t3: address
-     var $t4: address
-     var $t5: &ReadVector::Glob
-     var $t6: &bool
-     var $t7: bool
-  0: $t2 := move($t0)
-  1: $t3 := ReadVector::extract_addr_from_vec($t2)
-  2: $t1 := $t3
-  3: $t4 := move($t1)
-  4: $t5 := borrow_global<ReadVector::Glob>($t4)
-  5: $t6 := borrow_field<ReadVector::Glob>.b($t5)
-  6: $t7 := read_ref($t6)
-  7: return $t7
+     var $t1: ReadVector::S
+     var $t2: address
+     var $t3: &ReadVector::Glob
+     var $t4: &bool
+     var $t5: bool
+  0: $t1 := move($t0)
+  1: $t2 := ReadVector::extract_addr_from_vec($t1)
+  2: $t3 := borrow_global<ReadVector::Glob>($t2)
+  3: $t4 := borrow_field<ReadVector::Glob>.b($t3)
+  4: $t5 := read_ref($t4)
+  5: return $t5
 }
 
 ============ after pipeline `read_write_set` ================
@@ -146,6 +146,10 @@ public native fun vector::destroy_empty<#0>($t0|v: vector<#0>);
 public native fun vector::empty<#0>(): vector<#0>;
 
 
+[variant baseline]
+public intrinsic fun vector::insert<#0>($t0|v: &mut vector<#0>, $t1|e: #0, $t2|i: u64);
+
+
 [variant baseline]
 public intrinsic fun vector::is_empty<#0>($t0|v: &vector<#0>): bool;
 
@@ -230,13 +234,11 @@ fun ReadVector::extract_addr_from_vec($t0|s: ReadVector::S): address {
 
 [variant baseline]
 fun ReadVector::read_addr_from_vec($t0|s: ReadVector::S): bool {
-     var $t1|a: address
-     var $t2: ReadVector::S
-     var $t3: address
-     var $t4: address
-     var $t5: &ReadVector::Glob
-     var $t6: &bool
-     var $t7: bool
+     var $t1: ReadVector::S
+     var $t2: address
+     var $t3: &ReadVector::Glob
+     var $t4: &bool
+     var $t5: bool
      # Accesses:
      # Formal(0): Read
      # Formal(0)/a: Read
@@ -246,12 +248,10 @@ fun ReadVector::read_addr_from_vec($t0|s: ReadVector::S): bool {
      # Locals:
      # Ret(0): Formal(0)/a/[_]/0x2::ReadVector::Glob/b
      #
-  0: $t2 := move($t0)
-  1: $t3 := ReadVector::extract_addr_from_vec($t2)
-  2: $t1 := $t3
-  3: $t4 := move($t1)
-  4: $t5 := borrow_global<ReadVector::Glob>($t4)
-  5: $t6 := borrow_field<ReadVector::Glob>.b($t5)
-  6: $t7 := read_ref($t6)
-  7: return $t7
+  0: $t1 := move($t0)
+  1: $t2 := ReadVector::extract_addr_from_vec($t1)
+  2: $t3 := borrow_global<ReadVector::Glob>($t2)
+  3: $t4 := borrow_field<ReadVector::Glob>.b($t3)
+  4: $t5 := read_ref($t4)
+  5: return $t5
 }
diff --git a/language/move-prover/bytecode/tests/read_write_set/secondary_index.exp b/language/move-prover/bytecode/tests/read_write_set/secondary_index.exp
index 66b019c289..691dfc1c32 100644
--- a/language/move-prover/bytecode/tests/read_write_set/secondary_index.exp
+++ b/language/move-prover/bytecode/tests/read_write_set/secondary_index.exp
@@ -48,25 +48,21 @@ fun SecondaryIndex::read_secondary_index_from_formal_interproc($t0|a_addr: addre
 
 [variant baseline]
 fun SecondaryIndex::read_secondary_index_from_global($t0|a: address): address {
-     var $t1|addr: address
-     var $t2: address
-     var $t3: &SecondaryIndex::A
-     var $t4: &address
-     var $t5: address
-     var $t6: address
-     var $t7: &SecondaryIndex::B
-     var $t8: &address
-     var $t9: address
-  0: $t2 := move($t0)
-  1: $t3 := borrow_global<SecondaryIndex::A>($t2)
-  2: $t4 := borrow_field<SecondaryIndex::A>.a_addr($t3)
-  3: $t5 := read_ref($t4)
-  4: $t1 := $t5
-  5: $t6 := move($t1)
-  6: $t7 := borrow_global<SecondaryIndex::B>($t6)
-  7: $t8 := borrow_field<SecondaryIndex::B>.b_addr($t7)
-  8: $t9 := read_ref($t8)
-  9: return $t9
+     var $t1: address
+     var $t2: &SecondaryIndex::A
+     var $t3: &address
+     var $t4: address
+     var $t5: &SecondaryIndex::B
+     var $t6: &address
+     var $t7: address
+  0: $t1 := move($t0)
+  1: $t2 := borrow_global<SecondaryIndex::A>($t1)
+  2: $t3 := borrow_field<SecondaryIndex::A>.a_addr($t2)
+  3: $t4 := read_ref($t3)
+  4: $t5 := borrow_global<SecondaryIndex::B>($t4)
+  5: $t6 := borrow_field<SecondaryIndex::B>.b_addr($t5)
+  6: $t7 := read_ref($t6)
+  7: return $t7
 }
 
 
@@ -101,7 +97,7 @@ fun SecondaryIndex::two_secondary_indexes($t0|s: &SecondaryIndex::S, $t1|b: bool
      var $t16: address
   0: $t3 := move($t1)
   1: if ($t3) goto 2 else goto 11
-  2: label L0
+  2: label L1
   3: $t4 := move($t0)
   4: $t5 := borrow_field<SecondaryIndex::S>.f($t4)
   5: $t6 := read_ref($t5)
@@ -110,7 +106,7 @@ fun SecondaryIndex::two_secondary_indexes($t0|s: &SecondaryIndex::S, $t1|b: bool
   8: $t9 := read_ref($t8)
   9: $t2 := $t9
  10: goto 20
- 11: label L2
+ 11: label L0
  12: $t10 := move($t0)
  13: $t11 := borrow_field<SecondaryIndex::S>.g($t10)
  14: $t12 := read_ref($t11)
@@ -119,7 +115,7 @@ fun SecondaryIndex::two_secondary_indexes($t0|s: &SecondaryIndex::S, $t1|b: bool
  17: $t15 := read_ref($t14)
  18: $t2 := $t15
  19: goto 20
- 20: label L3
+ 20: label L2
  21: $t16 := move($t2)
  22: return $t16
 }
@@ -139,13 +135,13 @@ fun SecondaryIndex::write_both_fields($t0|c: &mut SecondaryIndex::C, $t1|b: Seco
      var $t13: &mut SecondaryIndex::C
   0: $t4 := copy($t3)
   1: if ($t4) goto 2 else goto 8
-  2: label L0
+  2: label L1
   3: $t5 := move($t1)
   4: $t6 := copy($t0)
   5: $t7 := borrow_field<SecondaryIndex::C>.b($t6)
   6: write_ref($t7, $t5)
   7: goto 8
-  8: label L2
+  8: label L0
   9: $t8 := move($t3)
  10: if ($t8) goto 11 else goto 18
  11: label L3
@@ -155,11 +151,11 @@ fun SecondaryIndex::write_both_fields($t0|c: &mut SecondaryIndex::C, $t1|b: Seco
  15: $t12 := borrow_field<SecondaryIndex::B>.b_addr($t11)
  16: write_ref($t12, $t9)
  17: goto 22
- 18: label L5
+ 18: label L2
  19: $t13 := move($t0)
  20: destroy($t13)
  21: goto 22
- 22: label L6
+ 22: label L4
  23: return ()
 }
 
@@ -238,15 +234,13 @@ fun SecondaryIndex::read_secondary_index_from_formal_interproc($t0|a_addr: addre
 
 [variant baseline]
 fun SecondaryIndex::read_secondary_index_from_global($t0|a: address): address {
-     var $t1|addr: address
-     var $t2: address
-     var $t3: &SecondaryIndex::A
-     var $t4: &address
-     var $t5: address
-     var $t6: address
-     var $t7: &SecondaryIndex::B
-     var $t8: &address
-     var $t9: address
+     var $t1: address
+     var $t2: &SecondaryIndex::A
+     var $t3: &address
+     var $t4: address
+     var $t5: &SecondaryIndex::B
+     var $t6: &address
+     var $t7: address
      # Accesses:
      # Formal(0): Read
      # Formal(0)/0x1::SecondaryIndex::A/a_addr: Read
@@ -255,16 +249,14 @@ fun SecondaryIndex::read_secondary_index_from_global($t0|a: address): address {
      # Locals:
      # Ret(0): Formal(0)/0x1::SecondaryIndex::A/a_addr/0x1::SecondaryIndex::B/b_addr
      #
-  0: $t2 := move($t0)
-  1: $t3 := borrow_global<SecondaryIndex::A>($t2)
-  2: $t4 := borrow_field<SecondaryIndex::A>.a_addr($t3)
-  3: $t5 := read_ref($t4)
-  4: $t1 := $t5
-  5: $t6 := move($t1)
-  6: $t7 := borrow_global<SecondaryIndex::B>($t6)
-  7: $t8 := borrow_field<SecondaryIndex::B>.b_addr($t7)
-  8: $t9 := read_ref($t8)
-  9: return $t9
+  0: $t1 := move($t0)
+  1: $t2 := borrow_global<SecondaryIndex::A>($t1)
+  2: $t3 := borrow_field<SecondaryIndex::A>.a_addr($t2)
+  3: $t4 := read_ref($t3)
+  4: $t5 := borrow_global<SecondaryIndex::B>($t4)
+  5: $t6 := borrow_field<SecondaryIndex::B>.b_addr($t5)
+  6: $t7 := read_ref($t6)
+  7: return $t7
 }
 
 
@@ -319,7 +311,7 @@ fun SecondaryIndex::two_secondary_indexes($t0|s: &SecondaryIndex::S, $t1|b: bool
      #
   0: $t3 := move($t1)
   1: if ($t3) goto 2 else goto 11
-  2: label L0
+  2: label L1
   3: $t4 := move($t0)
   4: $t5 := borrow_field<SecondaryIndex::S>.f($t4)
   5: $t6 := read_ref($t5)
@@ -328,7 +320,7 @@ fun SecondaryIndex::two_secondary_indexes($t0|s: &SecondaryIndex::S, $t1|b: bool
   8: $t9 := read_ref($t8)
   9: $t2 := $t9
  10: goto 20
- 11: label L2
+ 11: label L0
  12: $t10 := move($t0)
  13: $t11 := borrow_field<SecondaryIndex::S>.g($t10)
  14: $t12 := read_ref($t11)
@@ -337,7 +329,7 @@ fun SecondaryIndex::two_secondary_indexes($t0|s: &SecondaryIndex::S, $t1|b: bool
  17: $t15 := read_ref($t14)
  18: $t2 := $t15
  19: goto 20
- 20: label L3
+ 20: label L2
  21: $t16 := move($t2)
  22: return $t16
 }
@@ -369,13 +361,13 @@ fun SecondaryIndex::write_both_fields($t0|c: &mut SecondaryIndex::C, $t1|b: Seco
      #
   0: $t4 := copy($t3)
   1: if ($t4) goto 2 else goto 8
-  2: label L0
+  2: label L1
   3: $t5 := move($t1)
   4: $t6 := copy($t0)
   5: $t7 := borrow_field<SecondaryIndex::C>.b($t6)
   6: write_ref($t7, $t5)
   7: goto 8
-  8: label L2
+  8: label L0
   9: $t8 := move($t3)
  10: if ($t8) goto 11 else goto 18
  11: label L3
@@ -385,10 +377,10 @@ fun SecondaryIndex::write_both_fields($t0|c: &mut SecondaryIndex::C, $t1|b: Seco
  15: $t12 := borrow_field<SecondaryIndex::B>.b_addr($t11)
  16: write_ref($t12, $t9)
  17: goto 22
- 18: label L5
+ 18: label L2
  19: $t13 := move($t0)
  20: destroy($t13)
  21: goto 22
- 22: label L6
+ 22: label L4
  23: return ()
 }
diff --git a/language/move-prover/bytecode/tests/read_write_set/simple_pack_unpack.exp b/language/move-prover/bytecode/tests/read_write_set/simple_pack_unpack.exp
index 1d37c0d587..3fd12ae56c 100644
--- a/language/move-prover/bytecode/tests/read_write_set/simple_pack_unpack.exp
+++ b/language/move-prover/bytecode/tests/read_write_set/simple_pack_unpack.exp
@@ -2,17 +2,13 @@
 
 [variant baseline]
 fun SimplePackUnpack::pack_unpack($t0|a: address): address {
-     var $t1|s: SimplePackUnpack::S
-     var $t2: address
-     var $t3: SimplePackUnpack::S
-     var $t4: SimplePackUnpack::S
-     var $t5: address
-  0: $t2 := move($t0)
-  1: $t3 := pack SimplePackUnpack::S($t2)
-  2: $t1 := $t3
-  3: $t4 := move($t1)
-  4: $t5 := SimplePackUnpack::unpack($t4)
-  5: return $t5
+     var $t1: address
+     var $t2: SimplePackUnpack::S
+     var $t3: address
+  0: $t1 := move($t0)
+  1: $t2 := pack SimplePackUnpack::S($t1)
+  2: $t3 := SimplePackUnpack::unpack($t2)
+  3: return $t3
 }
 
 
@@ -31,23 +27,19 @@ fun SimplePackUnpack::unpack($t0|s: SimplePackUnpack::S): address {
 
 [variant baseline]
 fun SimplePackUnpack::pack_unpack($t0|a: address): address {
-     var $t1|s: SimplePackUnpack::S
-     var $t2: address
-     var $t3: SimplePackUnpack::S
-     var $t4: SimplePackUnpack::S
-     var $t5: address
+     var $t1: address
+     var $t2: SimplePackUnpack::S
+     var $t3: address
      # Accesses:
      # Formal(0): Read
      #
      # Locals:
      # Ret(0): Formal(0)
      #
-  0: $t2 := move($t0)
-  1: $t3 := pack SimplePackUnpack::S($t2)
-  2: $t1 := $t3
-  3: $t4 := move($t1)
-  4: $t5 := SimplePackUnpack::unpack($t4)
-  5: return $t5
+  0: $t1 := move($t0)
+  1: $t2 := pack SimplePackUnpack::S($t1)
+  2: $t3 := SimplePackUnpack::unpack($t2)
+  3: return $t3
 }
 
 
diff --git a/language/move-prover/bytecode/tests/read_write_set/update_return.exp b/language/move-prover/bytecode/tests/read_write_set/update_return.exp
index e5d48b46cc..7ed892af8d 100644
--- a/language/move-prover/bytecode/tests/read_write_set/update_return.exp
+++ b/language/move-prover/bytecode/tests/read_write_set/update_return.exp
@@ -10,12 +10,12 @@ public fun UpdateReturn::abort_or_write($t0|s: &mut UpdateReturn::S, $t1|b: bool
      var $t8: u64
   0: $t3 := move($t1)
   1: if ($t3) goto 2 else goto 7
-  2: label L0
+  2: label L1
   3: $t4 := move($t0)
   4: destroy($t4)
   5: $t5 := 77
   6: abort($t5)
-  7: label L2
+  7: label L0
   8: $t6 := move($t0)
   9: $t7 := move($t2)
  10: $t8 := UpdateReturn::write_f($t6, $t7)
@@ -58,12 +58,12 @@ public fun UpdateReturn::abort_or_write($t0|s: &mut UpdateReturn::S, $t1|b: bool
      #
   0: $t3 := move($t1)
   1: if ($t3) goto 2 else goto 7
-  2: label L0
+  2: label L1
   3: $t4 := move($t0)
   4: destroy($t4)
   5: $t5 := 77
   6: abort($t5)
-  7: label L2
+  7: label L0
   8: $t6 := move($t0)
   9: $t7 := move($t2)
  10: $t8 := UpdateReturn::write_f($t6, $t7)
diff --git a/language/move-prover/bytecode/tests/spec_instrumentation/fun_spec.exp b/language/move-prover/bytecode/tests/spec_instrumentation/fun_spec.exp
index e93dcd1a3e..5c25bf46e8 100644
--- a/language/move-prover/bytecode/tests/spec_instrumentation/fun_spec.exp
+++ b/language/move-prover/bytecode/tests/spec_instrumentation/fun_spec.exp
@@ -13,19 +13,19 @@ fun Test::branching_result($t0|is_div: bool, $t1|a: u64, $t2|b: u64): u64 {
      var $t11: u64
   0: $t4 := move($t0)
   1: if ($t4) goto 2 else goto 8
-  2: label L0
+  2: label L1
   3: $t5 := move($t1)
   4: $t6 := move($t2)
   5: $t7 := /($t5, $t6)
   6: $t3 := $t7
   7: goto 14
-  8: label L2
+  8: label L0
   9: $t8 := move($t1)
  10: $t9 := move($t2)
  11: $t10 := *($t8, $t9)
  12: $t3 := $t10
  13: goto 14
- 14: label L3
+ 14: label L2
  15: $t11 := move($t3)
  16: return $t11
 }
@@ -44,10 +44,10 @@ fun Test::implicit_and_explicit_abort($t0|a: u64, $t1|b: u64): u64 {
   1: $t3 := 0
   2: $t4 := !=($t2, $t3)
   3: if ($t4) goto 4 else goto 7
-  4: label L0
+  4: label L1
   5: $t5 := 22
   6: abort($t5)
-  7: label L2
+  7: label L0
   8: $t6 := move($t0)
   9: $t7 := move($t1)
  10: $t8 := /($t6, $t7)
@@ -146,10 +146,10 @@ fun Test::resource_with_old($t0|val: u64) {
   1: $t3 := exists<Test::R>($t2)
   2: $t4 := !($t3)
   3: if ($t4) goto 4 else goto 7
-  4: label L0
+  4: label L1
   5: $t5 := 33
   6: abort($t5)
-  7: label L2
+  7: label L0
   8: $t6 := 0x0
   9: $t7 := borrow_global<Test::R>($t6)
  10: $t1 := $t7
@@ -171,13 +171,13 @@ fun Test::branching_result($t0|is_div: bool, $t1|a: u64, $t2|b: u64): u64 {
      var $t3|tmp#$3: u64
      var $t4: num
   0: if ($t0) goto 1 else goto 4
-  1: label L0
+  1: label L1
   2: $t3 := /($t1, $t2) on_abort goto 12 with $t4
   3: goto 6
-  4: label L2
+  4: label L0
   5: $t3 := *($t1, $t2) on_abort goto 12 with $t4
-  6: label L3
-  7: label L4
+  6: label L2
+  7: label L3
      # VC: function does not abort under this condition at tests/spec_instrumentation/fun_spec.move:27:6+50
   8: assert Not(And($t0, Eq<u64>($t2, 0)))
      # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:28:6+35
@@ -185,7 +185,7 @@ fun Test::branching_result($t0|is_div: bool, $t1|a: u64, $t2|b: u64): u64 {
      # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:29:6+36
  10: assert Implies(Not($t0), Eq<u64>($t3, Mul($t1, $t2)))
  11: return $t3
- 12: label L5
+ 12: label L4
      # VC: abort not covered by any of the `aborts_if` clauses at tests/spec_instrumentation/fun_spec.move:26:2+165
  13: assert And($t0, Eq<u64>($t2, 0))
      # VC: abort code not covered by any of the `aborts_if` or `aborts_with` clauses at tests/spec_instrumentation/fun_spec.move:26:2+165
@@ -204,13 +204,13 @@ fun Test::implicit_and_explicit_abort($t0|a: u64, $t1|b: u64): u64 {
   0: $t2 := 0
   1: $t3 := !=($t1, $t2)
   2: if ($t3) goto 3 else goto 7
-  3: label L0
+  3: label L1
   4: $t4 := 22
   5: $t5 := move($t4)
   6: goto 14
-  7: label L2
+  7: label L0
   8: $t6 := /($t0, $t1) on_abort goto 14 with $t5
-  9: label L3
+  9: label L2
      # VC: function does not abort under this condition at tests/spec_instrumentation/fun_spec.move:9:6+25
  10: assert Not(Eq<u64>($t1, 0))
      # VC: function does not abort under this condition at tests/spec_instrumentation/fun_spec.move:10:6+17
@@ -218,7 +218,7 @@ fun Test::implicit_and_explicit_abort($t0|a: u64, $t1|b: u64): u64 {
      # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:11:6+24
  12: assert Eq<u64>($t6, Div($t0, $t1))
  13: return $t6
- 14: label L4
+ 14: label L3
      # VC: abort not covered by any of the `aborts_if` clauses at tests/spec_instrumentation/fun_spec.move:8:2+121
  15: assert Or(Eq<u64>($t1, 0), Eq<u64>($t0, 0))
      # VC: abort code not covered by any of the `aborts_if` or `aborts_with` clauses at tests/spec_instrumentation/fun_spec.move:8:2+121
@@ -330,11 +330,11 @@ fun Test::resource_with_old($t0|val: u64) {
   4: $t3 := exists<Test::R>($t2)
   5: $t4 := !($t3)
   6: if ($t4) goto 7 else goto 11
-  7: label L0
+  7: label L1
   8: $t5 := 33
   9: $t6 := move($t5)
  10: goto 26
- 11: label L2
+ 11: label L0
  12: $t7 := 0x0
      # VC: caller does not have permission to modify `Test::R` at given address at tests/spec_instrumentation/fun_spec.move:36:14+17
  13: assert CanModify<Test::R>($t7)
@@ -345,7 +345,7 @@ fun Test::resource_with_old($t0|val: u64) {
  18: write_ref($t11, $t10)
  19: write_back[Reference($t8).v (u64)]($t11)
  20: write_back[Test::R@]($t8)
- 21: label L3
+ 21: label L2
      # VC: function does not abort under this condition at tests/spec_instrumentation/fun_spec.move:41:6+35
  22: assert Not(Not(exists[@0]<Test::R>(0)))
      # VC: function does not abort under this condition at tests/spec_instrumentation/fun_spec.move:42:6+58
@@ -353,7 +353,7 @@ fun Test::resource_with_old($t0|val: u64) {
      # VC: post-condition does not hold at tests/spec_instrumentation/fun_spec.move:43:6+58
  24: assert Eq<u64>(select Test::R.v(global<Test::R>(0)), Add(select Test::R.v(global[@0]<Test::R>(0)), $t0))
  25: return ()
- 26: label L4
+ 26: label L3
      # VC: abort not covered by any of the `aborts_if` clauses at tests/spec_instrumentation/fun_spec.move:39:2+250
  27: assert Or(Not(exists[@0]<Test::R>(0)), Ge(Add(select Test::R.v(global[@0]<Test::R>(0)), $t0), 18446744073709551615))
      # VC: abort code not covered by any of the `aborts_if` or `aborts_with` clauses at tests/spec_instrumentation/fun_spec.move:39:2+250
diff --git a/language/move-prover/bytecode/tests/spec_instrumentation/generics.exp b/language/move-prover/bytecode/tests/spec_instrumentation/generics.exp
index 841fdb3efe..82dcdda4e7 100644
--- a/language/move-prover/bytecode/tests/spec_instrumentation/generics.exp
+++ b/language/move-prover/bytecode/tests/spec_instrumentation/generics.exp
@@ -47,7 +47,7 @@ fun Generics::remove_u64($t0|a: address): Generics::R<u64> {
      # VC: caller does not have permission to modify `Generics::R<u64>` at given address at tests/spec_instrumentation/generics.move:24:9+14
   1: assert CanModify<Generics::R<u64>>($t0)
   2: $t1 := opaque begin: Generics::remove<u64>($t0)
-  3: havoc[val]($t2)
+  3: $t2 := havoc[val]()
   4: if ($t2) goto 5 else goto 8
   5: label L4
   6: trace_abort($t3)
diff --git a/language/move-prover/bytecode/tests/spec_instrumentation/modifies.exp b/language/move-prover/bytecode/tests/spec_instrumentation/modifies.exp
index 3e636e2ae0..b30e8e98e0 100644
--- a/language/move-prover/bytecode/tests/spec_instrumentation/modifies.exp
+++ b/language/move-prover/bytecode/tests/spec_instrumentation/modifies.exp
@@ -21,19 +21,15 @@ public fun A::mutate_at($t0|addr: address) {
 
 [variant baseline]
 public fun A::read_at($t0|addr: address): u64 {
-     var $t1|s: &A::S
-     var $t2: address
-     var $t3: &A::S
-     var $t4: &A::S
-     var $t5: &u64
-     var $t6: u64
-  0: $t2 := move($t0)
-  1: $t3 := borrow_global<A::S>($t2)
-  2: $t1 := $t3
-  3: $t4 := move($t1)
-  4: $t5 := borrow_field<A::S>.x($t4)
-  5: $t6 := read_ref($t5)
-  6: return $t6
+     var $t1: address
+     var $t2: &A::S
+     var $t3: &u64
+     var $t4: u64
+  0: $t1 := move($t0)
+  1: $t2 := borrow_global<A::S>($t1)
+  2: $t3 := borrow_field<A::S>.x($t2)
+  3: $t4 := read_ref($t3)
+  4: return $t4
 }
 
 
@@ -199,23 +195,22 @@ public fun A::mutate_at($t0|addr: address) {
 
 [variant verification]
 public fun A::read_at($t0|addr: address): u64 {
-     var $t1|s: A::S
-     var $t2: A::S
-     var $t3: num
-     var $t4: u64
+     var $t1: A::S
+     var $t2: num
+     var $t3: u64
   0: @0 := save_mem(A::S)
-  1: $t2 := get_global<A::S>($t0) on_abort goto 7 with $t3
-  2: $t4 := get_field<A::S>.x($t2)
+  1: $t1 := get_global<A::S>($t0) on_abort goto 7 with $t2
+  2: $t3 := get_field<A::S>.x($t1)
   3: label L1
      # VC: function does not abort under this condition at tests/spec_instrumentation/modifies.move:13:9+27
   4: assert Not(Not(exists[@0]<A::S>($t0)))
      # VC: post-condition does not hold at tests/spec_instrumentation/modifies.move:14:9+36
-  5: assert Eq<u64>($t4, select A::S.x(global<A::S>($t0)))
-  6: return $t4
+  5: assert Eq<u64>($t3, select A::S.x(global<A::S>($t0)))
+  6: return $t3
   7: label L2
      # VC: abort not covered by any of the `aborts_if` clauses at tests/spec_instrumentation/modifies.move:11:5+131
   8: assert Not(exists[@0]<A::S>($t0))
-  9: abort($t3)
+  9: abort($t2)
 }
 
 
diff --git a/language/move-prover/bytecode/tests/spec_instrumentation/opaque_call.exp b/language/move-prover/bytecode/tests/spec_instrumentation/opaque_call.exp
index 616df64848..1ae6a3e4af 100644
--- a/language/move-prover/bytecode/tests/spec_instrumentation/opaque_call.exp
+++ b/language/move-prover/bytecode/tests/spec_instrumentation/opaque_call.exp
@@ -25,10 +25,10 @@ fun Test::get_and_incr($t0|addr: address): u64 {
   1: $t4 := exists<Test::R>($t3)
   2: $t5 := !($t4)
   3: if ($t5) goto 4 else goto 7
-  4: label L0
+  4: label L1
   5: $t6 := 33
   6: abort($t6)
-  7: label L2
+  7: label L0
   8: $t7 := move($t0)
   9: $t8 := borrow_global<Test::R>($t7)
  10: $t1 := $t8
@@ -86,11 +86,11 @@ fun Test::get_and_incr($t0|addr: address): u64 {
   3: $t3 := exists<Test::R>($t0)
   4: $t4 := !($t3)
   5: if ($t4) goto 6 else goto 10
-  6: label L0
+  6: label L1
   7: $t5 := 33
   8: $t6 := move($t5)
   9: goto 27
- 10: label L2
+ 10: label L0
      # VC: caller does not have permission to modify `Test::R` at given address at tests/spec_instrumentation/opaque_call.move:8:14+17
  11: assert CanModify<Test::R>($t0)
  12: $t7 := borrow_global<Test::R>($t0) on_abort goto 27 with $t6
@@ -102,7 +102,7 @@ fun Test::get_and_incr($t0|addr: address): u64 {
  18: write_ref($t12, $t11)
  19: write_back[Reference($t7).v (u64)]($t12)
  20: write_back[Test::R@]($t7)
- 21: label L3
+ 21: label L2
      # VC: function does not abort under this condition at tests/spec_instrumentation/opaque_call.move:16:6+35
  22: assert Not(Not(exists[@0]<Test::R>($t0)))
      # VC: function does not abort under this condition at tests/spec_instrumentation/opaque_call.move:17:6+56
@@ -112,7 +112,7 @@ fun Test::get_and_incr($t0|addr: address): u64 {
      # VC: post-condition does not hold at tests/spec_instrumentation/opaque_call.move:20:6+36
  25: assert Eq<u64>($t8, select Test::R.v(global<Test::R>($t0)))
  26: return $t8
- 27: label L4
+ 27: label L3
      # VC: abort not covered by any of the `aborts_if` clauses at tests/spec_instrumentation/opaque_call.move:13:2+308
  28: assert Or(Not(exists[@0]<Test::R>($t0)), Ge(Add(select Test::R.v(global[@0]<Test::R>($t0)), 1), 18446744073709551615))
      # VC: abort code not covered by any of the `aborts_if` or `aborts_with` clauses at tests/spec_instrumentation/opaque_call.move:13:2+308
diff --git a/language/move-prover/bytecode/tests/testsuite.rs b/language/move-prover/bytecode/tests/testsuite.rs
index 21e7cd225a..b57183db60 100644
--- a/language/move-prover/bytecode/tests/testsuite.rs
+++ b/language/move-prover/bytecode/tests/testsuite.rs
@@ -274,7 +274,7 @@ fn test_runner(path: &Path) -> datatest_stable::Result<()> {
         if env.has_errors() || env.has_warnings() {
             env.report_diag(&mut error_writer, Severity::Warning);
             text += "============ Diagnostics ================\n";
-            text += &String::from_utf8_lossy(&error_writer.into_inner()).to_string();
+            text += &String::from_utf8_lossy(&error_writer.into_inner());
         }
         text
     };
diff --git a/language/move-prover/doc/user/prover-guide.md b/language/move-prover/doc/user/prover-guide.md
index b95418bdf1..250fa9fabc 100644
--- a/language/move-prover/doc/user/prover-guide.md
+++ b/language/move-prover/doc/user/prover-guide.md
@@ -29,15 +29,15 @@ alias move="cargo run --release --quiet --package move-cli --"
 We assume in the sequel that the Move CLI is reachable from the command line via the `move` command
 (defined by an alias as above or by other means).
 
-In order to call the CLI, you must have a [*move package*](https://move-language.github.io/move/packages.html). In the simplest
+In order to call the CLI, you must have a [*move *](https://move-language.github.io/move/packages.html). In the simplest
 case, a Move package is defined by a directory with a set of `.move` files in it and a manifest of the name `Move.toml`.
-You can create a package `<name>` in a sub-directory by calling `move package new <name>`.
+You can create a package `<name>` in a sub-directory by calling `move new <name>`.
 
 Now, to call the prover simply use one of the following commands:
 
 ```shell script
-move package -p <path> prove  # Prove the sources of the package at <path>
-move package prove            # Equivalent to `move package -p . prove`
+move -p <path> prove  # Prove the sources of the package at <path>
+move prove            # Equivalent to `move -p . prove`
 ```
 
 ### Target Filtering
@@ -47,7 +47,7 @@ often more effective to focus verification on particular files. You do this with
 `-t` (`--target`) option:
 
 ```shell script
-move package prove -t DiemConfig
+move prove -t DiemConfig
 ```
 
 In general, if the string provided via the `-t` option is contained somewhere in the file name of a source, that source
@@ -55,19 +55,19 @@ will be included for verification.
 
 > NOTE: the Move prover ensures that there is no semantic difference between verifying modules one-by-one
 > or all at once. However, if your goal is to verify all modules, verifying them in a single
-> `move package prove` run will be significantly faster then sequentially.
+> `move prove` run will be significantly faster then sequentially.
 
 ### Prover Options
 
 The prover has a number of options which are not directly handled by the CLI but rather passed through. You pass options
-through with an invocation like `move package prove -- <options>`. The most commonly used option is the `-t` (`--trace`)
+through with an invocation like `move prove -- <options>`. The most commonly used option is the `-t` (`--trace`)
 option which lets the prover produce richer diagnosis when it encounters errors:
 
 ```shell script
-move package prove -t DiemConfig -- -t
+move prove -t DiemConfig -- -t
 ```
 
-To see the list of all command line options, use `move package prove -- --help`.
+To see the list of all command line options, use `move prove -- --help`.
 
 ### Prover Configuration File
 
@@ -113,7 +113,7 @@ proc_cores = 4
 > HINT: for local verification, you may want to set proc_cores to an aggressive number
 > (your actual cores) to speed up the turn-around cycle.
 
-> NOTE: To let the prover dump all the available toml options, use `move package prove -- --print-config`. This
+> NOTE: To let the prover dump all the available toml options, use `move prove -- --print-config`. This
 > will, however, contain many more unrelated and potentially defunct experimental options.
 
 ## Prover Tests
@@ -190,7 +190,7 @@ error: abort not covered by any of the `aborts_if` clauses
 ```
 
 The prover has generated a counter example which leads to an overflow when adding 1 the value of 255 for an `u8`. This
-happens if the function specification states something abort abort behavior, but the condition under which the function
+happens if the function specification states something abort behavior, but the condition under which the function
 is aborting is not covered by the specification. And in fact, with `aborts_if !exists<Counter>(a)` we only cover the
 abort if the resource does not exists, but not the overflow.
 
diff --git a/language/move-prover/doc/user/spec-lang.md b/language/move-prover/doc/user/spec-lang.md
index 71a165dff6..8a90c15793 100644
--- a/language/move-prover/doc/user/spec-lang.md
+++ b/language/move-prover/doc/user/spec-lang.md
@@ -92,11 +92,17 @@ discussed in the following sections.
 
 The type system of MSL is similar to that of Move, with the following differences:
 
-- All integer types of Move (`u8`, `u64`, and `u128`) are treated as the same type. In
+- There are two types of encodings for integer types: `num` and `bv` (bit vector).
+  If an integer (either a constant or a variable) does not involve in any bitwise operations directly or indirectly,
+  regardless of its type in Move (`u8`, `u16`, `u32`, `u64`, `u128` and `u256`), it is treated as the same type. In
   specifications, this type is called `num`, which is an arbitrary precision *signed* integer type.
   When MSL refers to a Move name which represents an `u8` or such, it will be automatically widened
   to `num`. This allows writing MSL expressions like `x + 1 <= MAX_U128` or `x - y >= 0` without
   needing to worry about overflow or underflow.
+  Different from `num`, `bv` cannot and does not need to be explicitly used in specifications: if an integer involves in bitwise operations such as `&`, `|` or `^`, it will be automatically encoded as `bv`at the backend.
+  Moreover, a `bv` integer has a fixed precision, which is consistent with its precision in Move (`bv8`, `bv16`, `bv32`, `bv64`, `bv128` and `bv256`).
+  Note that, in general using `bv` is not so efficient as `num` in the SMT solver. Consequently,
+  the prover has some restrictions when using bitwise operations, which will stated in detail below.
 - The Move types `&T`, `&mut T`, and `T` are considered equivalent for MSL. Equality is interpreted
   as value equality. There is no need to worry about dereferencing a reference from the Move
   program: these are automatically dereferenced as needed. This simplification is possible because
@@ -206,6 +212,68 @@ The choice also comes in a form to select the *minimal* value from a set of inte
 choose min i: num where in_range(v, i) && v[i] == 2
 ```
 
+## Cast Operator
+
+In the specification language, we can use the same syntax `(e as T)` to cast an expression `e` with one integer type to
+`T`, an integer type of another size.
+
+
+## Shift Operator
+
+Shift operators `<<` and `>>` are supported in the specification language and both of them have the same semantics with the Move language.
+As for abort, if a value `v` has width `n`, then `v << m` or `v >> m` will abort if `m >= n`.
+
+## Bitwise Operators
+
+Move programs using bitwise operators `&`, `|` and `^` can be verified in the prover and these operators are also supported in the specification language.
+Due to encoding and efficiency issues, using bitwise operators has more caveats:
+
+- Integers involved in bitwise operations are encoded as `bv` types at the backend and two encodings of integers are not compatible. For instance,
+if a variable `v` involves in a bitwise operation such as `v & 2` or `v = a ^ b`, then when it is used in an arithmetic operation `v * w` or a shift operation `v << w`, `w` will be implicitly cast to a `bv` type in the Move program.
+However, the specification language does not support implicit type cast so users must explicitly use the builtin function `int2bv` in the specification: `v << int2bv(w)`.
+Not that since each `bv` type has a fixed length (from 8 to 256), values with type `num` cannot be converted into `bv`.
+
+
+- Verification of `bv` types is not efficient and may lead to timeout. As a result, users may prefer isolating bitwise operations from other operations and not using `int2bv`
+  if possible. Moreover, users need to use pragmas to explicitly specify which integer-typed function arguments or struct fields will be used in bitwise computations:
+
+```move
+    struct C has drop {
+        a: u64,
+        b: u64
+    }
+    spec C {
+        // b, the second field of C, will be of bv type
+        pragma bv=b"1";
+    }
+    public fun foo_generic<T>(i: T): T {
+      i
+    }
+
+    spec foo_generic {
+     // The first parameter will be of bv type if T is instantiated as a number type
+      pragma bv=b"0";
+     // The first return value will be of bv type if T is instantiated as a number type
+      pragma bv_ret=b"0";
+    }
+
+    public fun test(i: C): u64 {
+      let x1 = foo_generic(C.b);
+      x1 ^ x1
+    }
+
+    spec test {
+      // Explicit type cast is mandatory for generating correct boogie program
+      ensures result == (0 as u64);
+    }
+```
+
+Note that if arguments or fields of a generic function or struct are specified with `bv` types,
+they will be of `bv` types in all instances of the function or the struct when the instantiated type is an integer type.
+
+
+- Values with integer types in vectors and tables can be encoded as `bv` types; indices and keys in tables cannot be `bv` types for now. Using other types will lead to internal errors.
+
 ## Builtin Functions
 
 MSL supports a number of builtin constants and functions. Most of them are not available in the Move
@@ -237,6 +305,8 @@ language:
   certain forms of invariants, as discussed later.
 - `TRACE(T): T` is semantically the identity function and causes visualization of the argument's
   value in error messages created by the prover.
+- `int2bv(v)` explicitly converts an integer `v` into its `bv` representation.
+- `bv2int(b)` explicitly converts a 'bv' integer 'b' into the `num` representation. However it is not encouraged to use it due to efficiency issue.
 
 Builtin functions live in an unnamed outer scope of a module. If the module defines a function `len`
 then this definition will shadow that of the according builtin function. To access the builtin
@@ -859,7 +929,14 @@ after the call to `publish1` and before the call to `publish2`.
 If either of `publish1` or `publish2` is without the other, the prover
 will also report a violation of the invariant.
 
-To prove that the invariant holds everywhere else, there is a pragma
+By default, a global invariant is checked immediately after the instruction `I` that touches the resources mentioned in the global invariant.
+The `[suspendable]` attribute (at the invariant side) together with two pragmas
+(specified in function spec block) provides fine-grained control on where we hope this invariant to be checked:
+
+- `disable_invariants_in_body`: the invariant will be checked at the end of the function where `I` resides.
+- `delegate_invariants_to_caller`: the invariant will be checked by all callers of the function where `I` resides.
+
+For the example above, we can add the pragma `disable_invariants_in_body`:
 ```move
 spec setup {
     pragma disable_invariants_in_body;
@@ -898,7 +975,7 @@ the user to declare that a function be treated like `publish1`.
 
 For example, if `publish2` is *only* called from the setup function above,
 and we did *not* disable invariants in `setup`, we could achieve a similar
-effect by using this pragma, instead.
+effect by using the pragma `delegate_invariants_to_caller`, instead.
 
 ```move
 spec setup {
@@ -928,7 +1005,6 @@ the function cannot possibly invalidate an invariant because it
 doesn't change any of the state mentioned in `exists` and `global`
 expressions appearing in the invariant.
 
-
 #### Update Invariants
 
 The `update` form of a global invariant allows to express a relation
@@ -1135,6 +1211,7 @@ spec Counter {
     invariant unpack sum_of_counters = sum_of_counters - value;
 }
 ```
+> TODO: `invariant pack` and `invariant unpack` are currently not implemented
 
 Now we may for example want to specify that the sum of all Counter instances in the global state
 should never exceed a particular value. We can do this as follows:
diff --git a/language/move-prover/interpreter-testsuite/Cargo.toml b/language/move-prover/interpreter-testsuite/Cargo.toml
index 31fec11941..83a268cdc2 100644
--- a/language/move-prover/interpreter-testsuite/Cargo.toml
+++ b/language/move-prover/interpreter-testsuite/Cargo.toml
@@ -3,7 +3,7 @@ name = "bytecode-interpreter-testsuite"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dev-dependencies]
diff --git a/language/move-prover/interpreter-testsuite/tests/concrete_check/bcs.move b/language/move-prover/interpreter-testsuite/tests/concrete_check/bcs.move
index d0eecca9f3..c6087dbd20 100644
--- a/language/move-prover/interpreter-testsuite/tests/concrete_check/bcs.move
+++ b/language/move-prover/interpreter-testsuite/tests/concrete_check/bcs.move
@@ -4,9 +4,11 @@ module 0x2::A {
     #[test]
     public fun bcs_ops() {
         // address
+        /* deactivate because of variable address size
         let addr = @0x89b9f9d1fadc027cf9532d6f99041522;
         let expected_output = x"89b9f9d1fadc027cf9532d6f99041522";
         assert!(bcs::to_bytes(&addr) == expected_output, 8001);
+        */
 
         // bool
         let b = true;
diff --git a/language/move-prover/interpreter-testsuite/tests/concrete_check/choice.exp b/language/move-prover/interpreter-testsuite/tests/concrete_check/choice.exp
new file mode 100644
index 0000000000..c32e377b3f
--- /dev/null
+++ b/language/move-prover/interpreter-testsuite/tests/concrete_check/choice.exp
@@ -0,0 +1,80 @@
+Running Move unit tests
+[ FAIL    ] 0x2::A::simple_number_min_range_failure
+[ FAIL    ] 0x2::A::simple_number_range_failure
+[ PASS    ] 0x2::A::unroll_address_success
+[ FAIL    ] 0x2::A::unroll_address_unsatisfied_predicate
+[ FAIL    ] 0x2::A::vector_choose_min_unsatisfied_predicate
+[ PASS    ] 0x2::A::vector_choose_success
+[ FAIL    ] 0x2::A::vector_choose_unsatisfied_predicate
+
+Test failures:
+
+Failures in 0x2::A:
+
+┌── simple_number_min_range_failure ──────
+│ error: failed to evaluate expression: enumeration of a non-address type domain is not supported
+│    ┌─ tests/concrete_check/choice.move:78:42
+│    │
+│ 78 │         ensures result <= (choose min x: u64 where x >= 4);
+│    │                                          ^^^
+│
+│ error: failed to evaluate expression: unexpected error code
+│    ┌─ tests/concrete_check/choice.move:78:17
+│    │
+│ 78 │         ensures result <= (choose min x: u64 where x >= 4);
+│    │                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+│
+│
+└──────────────────
+
+
+┌── simple_number_range_failure ──────
+│ error: failed to evaluate expression: enumeration of a non-address type domain is not supported
+│    ┌─ tests/concrete_check/choice.move:71:38
+│    │
+│ 71 │         ensures result <= (choose x: u64 where x >= 4);
+│    │                                      ^^^
+│
+│ error: failed to evaluate expression: unexpected error code
+│    ┌─ tests/concrete_check/choice.move:71:17
+│    │
+│ 71 │         ensures result <= (choose x: u64 where x >= 4);
+│    │                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+│
+│
+└──────────────────
+
+
+┌── unroll_address_unsatisfied_predicate ──────
+│ error: failed to evaluate expression: choose fails to satisfy a predicate
+│    ┌─ tests/concrete_check/choice.move:23:51
+│    │
+│ 23 │         let post choice = choose a: address where !exists<R>(a);
+│    │                                                   ^^^^^^^^^^^^^
+│
+│
+└──────────────────
+
+
+┌── vector_choose_min_unsatisfied_predicate ──────
+│ error: failed to evaluate expression: choose min fails to satisfy a predicate
+│    ┌─ tests/concrete_check/choice.move:64:68
+│    │
+│ 64 │         let post choice_min = choose min i in 0..len(result) where result[i] == 3;
+│    │                                                                    ^^^^^^^^^^^^^^
+│
+│
+└──────────────────
+
+
+┌── vector_choose_unsatisfied_predicate ──────
+│ error: failed to evaluate expression: choose fails to satisfy a predicate
+│    ┌─ tests/concrete_check/choice.move:51:60
+│    │
+│ 51 │         let post choice = choose i in 0..len(result) where result[i] == 3;
+│    │                                                            ^^^^^^^^^^^^^^
+│
+│
+└──────────────────
+
+Test result: FAILED. Total tests: 7; passed: 2; failed: 5
diff --git a/language/move-prover/interpreter-testsuite/tests/concrete_check/choice.move b/language/move-prover/interpreter-testsuite/tests/concrete_check/choice.move
new file mode 100644
index 0000000000..096726d0cf
--- /dev/null
+++ b/language/move-prover/interpreter-testsuite/tests/concrete_check/choice.move
@@ -0,0 +1,80 @@
+module 0x2::A {
+    use std::vector;
+
+    struct R has key { i: u64 }
+
+    #[test(a=@0x2)]
+    public fun unroll_address_success(a: &signer) {
+        let r = R{i: 1};
+        move_to(a, r);
+    }
+
+    spec unroll_address_success {
+        let post choice = choose a: address where exists<R>(a) && global<R>(a).i == 1;
+    }
+
+    #[test(a=@0x2)]
+    public fun unroll_address_unsatisfied_predicate(a: &signer) {
+        let r = R{i: 1};
+        move_to(a, r);
+    }
+
+    spec unroll_address_unsatisfied_predicate {
+        let post choice = choose a: address where !exists<R>(a);
+    }
+
+    #[test]
+    public fun vector_choose_success(): vector<u64> {
+        let v = vector::empty<u64>();
+        vector::push_back(&mut v, 1);
+        vector::push_back(&mut v, 2);
+        vector::push_back(&mut v, 1);
+        v
+    }
+
+    spec vector_choose_success {
+        let post choice = choose i in 0..len(result) where result[i] == 1;
+        ensures choice == 0 || choice == 2;
+        ensures (choose min i in 0..len(result) where result[i] == 1) == 0;
+    }
+
+    #[test]
+    public fun vector_choose_unsatisfied_predicate(): vector<u64> {
+        let v = vector::empty<u64>();
+        vector::push_back(&mut v, 1);
+        vector::push_back(&mut v, 2);
+        vector::push_back(&mut v, 1);
+        v
+    }
+
+    spec vector_choose_unsatisfied_predicate {
+        let post choice = choose i in 0..len(result) where result[i] == 3;
+    }
+
+    #[test]
+    public fun vector_choose_min_unsatisfied_predicate(): vector<u64> {
+        let v = vector::empty<u64>();
+        vector::push_back(&mut v, 1);
+        vector::push_back(&mut v, 2);
+        vector::push_back(&mut v, 1);
+        v
+    }
+
+    spec vector_choose_min_unsatisfied_predicate {
+        let post choice_min = choose min i in 0..len(result) where result[i] == 3;
+    }
+
+    #[test]
+    public fun simple_number_range_failure(): u64 { 1 }
+
+    spec simple_number_range_failure {
+        ensures result <= (choose x: u64 where x >= 4);
+    }
+
+    #[test]
+    public fun simple_number_min_range_failure(): u64 { 1 }
+
+    spec simple_number_min_range_failure {
+        ensures result <= (choose min x: u64 where x >= 4);
+    }
+}
diff --git a/language/move-prover/interpreter-testsuite/tests/concrete_check/destroy.exp b/language/move-prover/interpreter-testsuite/tests/concrete_check/destroy.exp
index be28cc6e9c..14fea56e3c 100644
--- a/language/move-prover/interpreter-testsuite/tests/concrete_check/destroy.exp
+++ b/language/move-prover/interpreter-testsuite/tests/concrete_check/destroy.exp
@@ -1,2 +1,3 @@
 Running Move unit tests
-Test result: OK. Total tests: 0; passed: 0; failed: 0
+[ PASS    ] 0x2::A::destroy
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/language/move-prover/interpreter-testsuite/tests/concrete_check/destroy.move b/language/move-prover/interpreter-testsuite/tests/concrete_check/destroy.move
index 319b45e5d9..ac49ff3e12 100644
--- a/language/move-prover/interpreter-testsuite/tests/concrete_check/destroy.move
+++ b/language/move-prover/interpreter-testsuite/tests/concrete_check/destroy.move
@@ -8,8 +8,7 @@ module 0x2::A {
         s.f2
     }
 
-    // TODO (mengxu) there is a bug that tries to destroy a value instead of reference
-    // #[test]
+    #[test]
     public fun destroy(): S {
         let s = S { f1: true, f2: 42 };
         let p = &s;
diff --git a/language/move-prover/interpreter-testsuite/tests/concrete_check/if_else.exp b/language/move-prover/interpreter-testsuite/tests/concrete_check/if_else.exp
index 95cffca6eb..30578ec20c 100644
--- a/language/move-prover/interpreter-testsuite/tests/concrete_check/if_else.exp
+++ b/language/move-prover/interpreter-testsuite/tests/concrete_check/if_else.exp
@@ -1,3 +1,4 @@
 Running Move unit tests
-[ PASS    ] 0x2::A::if_else
-Test result: OK. Total tests: 1; passed: 1; failed: 0
+[ PASS    ] 0x2::A::if_else_1
+[ PASS    ] 0x2::A::if_else_2
+Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/language/move-prover/interpreter-testsuite/tests/concrete_check/if_else.move b/language/move-prover/interpreter-testsuite/tests/concrete_check/if_else.move
index d08dc5e541..7a790d828b 100644
--- a/language/move-prover/interpreter-testsuite/tests/concrete_check/if_else.move
+++ b/language/move-prover/interpreter-testsuite/tests/concrete_check/if_else.move
@@ -1,10 +1,20 @@
 module 0x2::A {
     #[test]
-    public fun if_else(): (u64, u64) {
+    public fun if_else_1(): (u64, u64) {
         let a = 1;
         let b = 2;
         let r = if (a > b) { &mut a } else  { &mut b };
         *r = 3;
         (a, b)
     }
+
+    #[test]
+    public fun if_else_2(): (u64, u64) {
+        let a = 2;
+        let b = 1;
+        let r = if (a > b) { &mut a } else  { &mut b };
+        *r = 3;
+        (a, b)
+    }
+
 }
diff --git a/language/move-prover/interpreter-testsuite/tests/concrete_check/load_constant_number_literal.exp b/language/move-prover/interpreter-testsuite/tests/concrete_check/load_constant_number_literal.exp
new file mode 100644
index 0000000000..cfa1425346
--- /dev/null
+++ b/language/move-prover/interpreter-testsuite/tests/concrete_check/load_constant_number_literal.exp
@@ -0,0 +1,5 @@
+Running Move unit tests
+[ PASS    ] 0x2::A::load_constant_number_literal_u128
+[ PASS    ] 0x2::A::load_constant_number_literal_u64
+[ PASS    ] 0x2::A::load_constant_number_literal_u8
+Test result: OK. Total tests: 3; passed: 3; failed: 0
diff --git a/language/move-prover/interpreter-testsuite/tests/concrete_check/load_constant_number_literal.move b/language/move-prover/interpreter-testsuite/tests/concrete_check/load_constant_number_literal.move
new file mode 100644
index 0000000000..4e8006dd44
--- /dev/null
+++ b/language/move-prover/interpreter-testsuite/tests/concrete_check/load_constant_number_literal.move
@@ -0,0 +1,22 @@
+module 0x2::A {
+    #[test]
+    public fun load_constant_number_literal_u8() {
+        let a = 1_0u8;
+        let b: u8 = 10;
+        assert!(a == b, 1);
+    }
+
+    #[test]
+    public fun load_constant_number_literal_u64() {
+        let a = 100_000u64;
+        let b = 100000;
+        assert!(a == b, 1);
+    }
+
+    #[test]
+    public fun load_constant_number_literal_u128() {
+        let a = 100_000_000000000000u128;
+        let b: u128 = 100000000000000000;
+        assert!(a == b, 1);
+    }
+}
diff --git a/language/move-prover/interpreter-testsuite/tests/concrete_check/loop.exp b/language/move-prover/interpreter-testsuite/tests/concrete_check/loop.exp
index 2660fa9555..be28cc6e9c 100644
--- a/language/move-prover/interpreter-testsuite/tests/concrete_check/loop.exp
+++ b/language/move-prover/interpreter-testsuite/tests/concrete_check/loop.exp
@@ -1,4 +1,2 @@
 Running Move unit tests
-[ PASS    ] 0x2::A::loop_ind_ref
-[ PASS    ] 0x2::A::loop_ind_var
-Test result: OK. Total tests: 2; passed: 2; failed: 0
+Test result: OK. Total tests: 0; passed: 0; failed: 0
diff --git a/language/move-prover/interpreter-testsuite/tests/concrete_check/loop.move b/language/move-prover/interpreter-testsuite/tests/concrete_check/loop.move
index 160ff4a39a..81263623fa 100644
--- a/language/move-prover/interpreter-testsuite/tests/concrete_check/loop.move
+++ b/language/move-prover/interpreter-testsuite/tests/concrete_check/loop.move
@@ -1,5 +1,5 @@
 module 0x2::A {
-    #[test]
+    // #[test]
     public fun loop_ind_var() {
         let i = 0;
         while (i < 10) {
@@ -7,7 +7,7 @@ module 0x2::A {
         };
     }
 
-    #[test]
+    // #[test]
     public fun loop_ind_ref() {
         let i = 0;
         let p = &mut i;
@@ -15,4 +15,6 @@ module 0x2::A {
             *p = *p + 1;
         };
     }
+
+    // TODO(mengxu): needs to fill the havoc-ed value
 }
diff --git a/language/move-prover/interpreter-testsuite/tests/concrete_check/property/mono.exp b/language/move-prover/interpreter-testsuite/tests/concrete_check/property/mono.exp
index be28cc6e9c..29c4eb99a6 100644
--- a/language/move-prover/interpreter-testsuite/tests/concrete_check/property/mono.exp
+++ b/language/move-prover/interpreter-testsuite/tests/concrete_check/property/mono.exp
@@ -1,2 +1,19 @@
 Running Move unit tests
-Test result: OK. Total tests: 0; passed: 0; failed: 0
+[ FAIL    ] 0x2::Test::check_0x1_fail
+[ PASS    ] 0x2::Test::check_0x2_pass
+
+Test failures:
+
+Failures in 0x2::Test:
+
+┌── check_0x1_fail ──────
+│ error: property does not hold
+│    ┌─ tests/concrete_check/property/mono.move:50:13
+│    │
+│ 50 │             (Base::has_b() && has_r<T>()) ==> old(has_r<T>());
+│    │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+│
+│
+└──────────────────
+
+Test result: FAILED. Total tests: 2; passed: 1; failed: 1
diff --git a/language/move-prover/interpreter-testsuite/tests/concrete_check/property/mono.move b/language/move-prover/interpreter-testsuite/tests/concrete_check/property/mono.move
index 4352b2610b..a8fe2d3bd4 100644
--- a/language/move-prover/interpreter-testsuite/tests/concrete_check/property/mono.move
+++ b/language/move-prover/interpreter-testsuite/tests/concrete_check/property/mono.move
@@ -29,14 +29,12 @@ module Test {
         move_to(s, R { f: v });
     }
 
-    // TODO (mengxu), after mono, the global invariant is changed to Base::has_b() ==> true...
-    // #[test(s=@0x2)]
+    #[test(s=@0x2)]
     public fun check_0x2_pass(s: &signer) {
         put_r(s, true);
     }
 
-    // TODO (mengxu), after mono, the global invariant is changed to Base::has_b() ==> true...
-    // #[test(s=@0x1)]
+    #[test(s=@0x1)]
     public fun check_0x1_fail(s: &signer) {
         put_r(s, true);
     }
@@ -48,9 +46,8 @@ module Test {
     }
 
     spec module {
-        invariant update
-            Base::has_b() ==>
-                (forall t: type where has_r<t>(): old(has_r<t>()));
+        invariant<T> update
+            (Base::has_b() && has_r<T>()) ==> old(has_r<T>());
     }
 }
 }
diff --git a/language/move-prover/interpreter-testsuite/tests/concrete_check/quantifier.move b/language/move-prover/interpreter-testsuite/tests/concrete_check/quantifier.move
index f8e8eb683d..985cf03d6f 100644
--- a/language/move-prover/interpreter-testsuite/tests/concrete_check/quantifier.move
+++ b/language/move-prover/interpreter-testsuite/tests/concrete_check/quantifier.move
@@ -31,7 +31,7 @@ module 0x2::A {
         ensures exists i in 0..len(result): result[i] == 1;
     }
 
-    #[test, expected_failure]
+    #[test]
     public fun init_vector_failure(): vector<u64> {
         let v = vector::empty<u64>();
         vector::push_back(&mut v, 1);
diff --git a/language/move-prover/interpreter-testsuite/tests/concrete_check/return_mut_ref.exp b/language/move-prover/interpreter-testsuite/tests/concrete_check/return_mut_ref.exp
index 0a71d9a67c..6fe1a05174 100644
--- a/language/move-prover/interpreter-testsuite/tests/concrete_check/return_mut_ref.exp
+++ b/language/move-prover/interpreter-testsuite/tests/concrete_check/return_mut_ref.exp
@@ -1,4 +1,5 @@
 Running Move unit tests
 [ PASS    ] 0x2::A::return_ref_path
+[ PASS    ] 0x2::A::return_ref_path_vec_1
 [ PASS    ] 0x2::A::return_ref_root
-Test result: OK. Total tests: 2; passed: 2; failed: 0
+Test result: OK. Total tests: 3; passed: 3; failed: 0
diff --git a/language/move-prover/interpreter-testsuite/tests/concrete_check/return_mut_ref.move b/language/move-prover/interpreter-testsuite/tests/concrete_check/return_mut_ref.move
index b2bcdb3b01..93d1d22d63 100644
--- a/language/move-prover/interpreter-testsuite/tests/concrete_check/return_mut_ref.move
+++ b/language/move-prover/interpreter-testsuite/tests/concrete_check/return_mut_ref.move
@@ -47,8 +47,7 @@ module 0x2::A {
         }
     }
 
-    // TODO there is a bug in spec_instrumenter that produces wrong goto labels:
-    // #[test]
+    #[test]
     public fun return_ref_path_vec_1(): V {
         let is = vector::empty();
         let ts = vector::empty();
diff --git a/language/move-prover/interpreter-testsuite/tests/concrete_check_testsuite.rs b/language/move-prover/interpreter-testsuite/tests/concrete_check_testsuite.rs
index 5ff9d9d4bf..329ac07732 100644
--- a/language/move-prover/interpreter-testsuite/tests/concrete_check_testsuite.rs
+++ b/language/move-prover/interpreter-testsuite/tests/concrete_check_testsuite.rs
@@ -14,7 +14,7 @@ fn test_runner(path: &Path) -> datatest_stable::Result<()> {
 
     let source_files = vec![path.to_str().unwrap().to_owned()];
     let config = UnitTestingConfig {
-        instruction_execution_bound: 5000,
+        gas_limit: Some(5000),
         num_threads: 1,
         source_files,
         dep_files: move_stdlib_files(),
@@ -29,7 +29,7 @@ fn test_runner(path: &Path) -> datatest_stable::Result<()> {
 
     let test_plan = config.build_test_plan().unwrap();
     let mut buffer = vec![];
-    config.run_and_report_unit_tests(test_plan, None, &mut buffer)?;
+    config.run_and_report_unit_tests(test_plan, None, None, &mut buffer)?;
     let output = String::from_utf8(buffer)?;
 
     let baseline_path = path.with_extension(EXP_EXT);
diff --git a/language/move-prover/interpreter/Cargo.toml b/language/move-prover/interpreter/Cargo.toml
index ce71900c71..40cd3a0019 100644
--- a/language/move-prover/interpreter/Cargo.toml
+++ b/language/move-prover/interpreter/Cargo.toml
@@ -3,7 +3,7 @@ name = "move-stackless-bytecode-interpreter"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
diff --git a/language/move-prover/interpreter/crypto/Cargo.toml b/language/move-prover/interpreter/crypto/Cargo.toml
index e703ce5d63..db309a5a83 100644
--- a/language/move-prover/interpreter/crypto/Cargo.toml
+++ b/language/move-prover/interpreter/crypto/Cargo.toml
@@ -3,7 +3,7 @@ name = "bytecode-interpreter-crypto"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
diff --git a/language/move-prover/interpreter/src/concrete/evaluator.rs b/language/move-prover/interpreter/src/concrete/evaluator.rs
index 80c6acaca1..5af3a63632 100644
--- a/language/move-prover/interpreter/src/concrete/evaluator.rs
+++ b/language/move-prover/interpreter/src/concrete/evaluator.rs
@@ -8,7 +8,7 @@ use itertools::Itertools;
 use num::{BigInt, ToPrimitive, Zero};
 use std::{cell::Cell, collections::BTreeMap, rc::Rc};
 
-use move_core_types::account_address::AccountAddress;
+use move_core_types::{account_address::AccountAddress, u256};
 use move_model::{
     ast::{
         Exp, ExpData, LocalVarDecl, MemoryLabel, Operation, QuantKind, SpecFunDecl, TempIndex,
@@ -142,7 +142,7 @@ impl<'env> Evaluator<'env> {
     /// Check whether an assume expression holds, unless the assume expression represents a `let`
     /// binding. In that case, return the `TypedValue` of the let-binding as well as the local
     /// variable (index) the value should bind to.
-    pub fn check_assume(&self, exp: &Exp) -> Option<(TempIndex, TypedValue)> {
+    pub fn check_assume(&self, exp: &Exp) -> Option<EvalResult<(TempIndex, TypedValue)>> {
         // NOTE: `let` bindings are translated to `Assume(Identical($t, <exp>));`. This should be
         // treated as an assignment.
         if let ExpData::Call(_, Operation::Identical, args) = exp.as_ref() {
@@ -164,8 +164,10 @@ impl<'env> Evaluator<'env> {
                     self.local_state.get_type(local_idx).get_base_type()
                 );
             }
-            let local_val = self.evaluate(&args[1]).unwrap();
-            Some((local_idx, TypedValue::fuse_base(local_ty, local_val)))
+            match self.evaluate(&args[1]) {
+                Ok(val) => Some(Ok((local_idx, TypedValue::fuse_base(local_ty, val)))),
+                Err(err) => Some(Err(err)),
+            }
         } else {
             // for all other cases, treat with as an assertion
             self.check_assert(exp);
@@ -244,6 +246,16 @@ impl<'env> Evaluator<'env> {
             Value::ByteArray(v) => {
                 BaseValue::mk_vector(v.iter().map(|e| BaseValue::mk_u8(*e)).collect())
             }
+            Value::AddressArray(v) => BaseValue::mk_vector(
+                v.iter()
+                    .map(|e| {
+                        BaseValue::mk_address(
+                            AccountAddress::from_hex_literal(&format!("{:#x}", e)).unwrap(),
+                        )
+                    })
+                    .collect(),
+            ),
+            _ => unimplemented!(),
         }
     }
 
@@ -465,6 +477,18 @@ impl<'env> Evaluator<'env> {
                 }
                 BaseValue::mk_num(BigInt::from(u8::MAX))
             }
+            Operation::MaxU16 => {
+                if cfg!(debug_assertions) {
+                    assert!(arg_vals.is_empty());
+                }
+                BaseValue::mk_num(BigInt::from(u16::MAX))
+            }
+            Operation::MaxU32 => {
+                if cfg!(debug_assertions) {
+                    assert!(arg_vals.is_empty());
+                }
+                BaseValue::mk_num(BigInt::from(u32::MAX))
+            }
             Operation::MaxU64 => {
                 if cfg!(debug_assertions) {
                     assert!(arg_vals.is_empty());
@@ -477,6 +501,12 @@ impl<'env> Evaluator<'env> {
                 }
                 BaseValue::mk_num(BigInt::from(u128::MAX))
             }
+            Operation::MaxU256 => {
+                if cfg!(debug_assertions) {
+                    assert!(arg_vals.is_empty());
+                }
+                BaseValue::mk_num(BigInt::from(&u256::U256::max_value()))
+            }
             Operation::AbortFlag => {
                 if cfg!(debug_assertions) {
                     assert!(arg_vals.is_empty());
@@ -529,6 +559,10 @@ impl<'env> Evaluator<'env> {
             | Operation::InRangeRange => {
                 unreachable!()
             }
+
+            Operation::Cast | Operation::Bv2Int | Operation::Int2Bv => {
+                unreachable!()
+            }
         };
         Ok(result)
     }
@@ -651,6 +685,13 @@ impl<'env> Evaluator<'env> {
             let r_vals = self.prepare_range(r_exp)?;
             vals_vec.push(r_vals);
         }
+        let choose_val_range = match kind {
+            QuantKind::Forall | QuantKind::Exists => None,
+            QuantKind::Choose | QuantKind::ChooseMin => {
+                assert_eq!(vals_vec.len(), 1);
+                Some(vals_vec[0].clone())
+            }
+        };
 
         let mut loop_results = vec![];
         for val_vec in vals_vec.into_iter().multi_cartesian_product() {
@@ -682,19 +723,49 @@ impl<'env> Evaluator<'env> {
             }
         }
 
-        let quant_result = match kind {
+        match kind {
             QuantKind::Forall => {
                 let v = loop_results.into_iter().all(|r| r.into_bool());
-                BaseValue::mk_bool(v)
+                let quant_result = BaseValue::mk_bool(v);
+                Ok(quant_result)
             }
             QuantKind::Exists => {
                 let v = loop_results.into_iter().any(|r| r.into_bool());
-                BaseValue::mk_bool(v)
+                let quant_result = BaseValue::mk_bool(v);
+                Ok(quant_result)
             }
-            // TODO (mengxu) support choose operators
-            QuantKind::Choose | QuantKind::ChooseMin => unimplemented!(),
-        };
-        Ok(quant_result)
+            QuantKind::Choose => {
+                let choose_val_range_vec = choose_val_range.unwrap();
+                let mut v_results: Vec<_> = choose_val_range_vec
+                    .into_iter()
+                    .zip(loop_results.into_iter())
+                    .filter_map(|(val, r)| if r.into_bool() { Some(val) } else { None })
+                    .collect();
+
+                match v_results.pop() {
+                    None => {
+                        self.record_evaluation_failure(body, "choose fails to satisfy a predicate");
+                        Err(Self::eval_failure_code())
+                    }
+                    Some(v) => Ok(v),
+                }
+            }
+            QuantKind::ChooseMin => {
+                let choose_val_range_vec = choose_val_range.unwrap();
+                let mut v_results: Vec<_> = choose_val_range_vec
+                    .into_iter()
+                    .zip(loop_results.into_iter())
+                    .filter_map(|(val, r)| if r.into_bool() { Some(val) } else { None })
+                    .collect();
+
+                if v_results.is_empty() {
+                    self.record_evaluation_failure(body, "choose min fails to satisfy a predicate");
+                    Err(Self::eval_failure_code())
+                } else {
+                    Ok(v_results.remove(0))
+                }
+            }
+        }
     }
 
     //
diff --git a/language/move-prover/interpreter/src/concrete/local_state.rs b/language/move-prover/interpreter/src/concrete/local_state.rs
index cec52f03e7..efb21fa360 100644
--- a/language/move-prover/interpreter/src/concrete/local_state.rs
+++ b/language/move-prover/interpreter/src/concrete/local_state.rs
@@ -5,7 +5,7 @@
 //! This file implements the information needed in the local interpretation context, i.e., the
 //! context created and updated when interpreting a single function.
 
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, BTreeSet};
 
 use move_binary_format::errors::{Location, PartialVMError, VMError};
 use move_core_types::vm_status::StatusCode;
@@ -69,16 +69,22 @@ pub struct LocalState {
     termination: TerminationStatus,
     /// mutable parameters that gets destroyed during the execution
     destroyed_args: BTreeMap<TempIndex, TypedValue>,
+    /// whether specification checking needs to be skipped
+    skip_specs: bool,
+    /// local mutable references that are explicitly marked as uninit
+    uninit_mut_refs: BTreeSet<TempIndex>,
 }
 
 impl LocalState {
-    pub fn new(slots: Vec<LocalSlot>) -> Self {
+    pub fn new(slots: Vec<LocalSlot>, skip_specs: bool) -> Self {
         Self {
             slots,
             pc: 0,
             pc_branch: false,
             termination: TerminationStatus::None,
             destroyed_args: BTreeMap::new(),
+            skip_specs,
+            uninit_mut_refs: BTreeSet::new(),
         }
     }
 
@@ -125,6 +131,18 @@ impl LocalState {
         self.destroyed_args.remove(&index).unwrap()
     }
 
+    /// Mark a mutable reference is uninitialized explicitly
+    pub fn mark_uninit(&mut self, index: TempIndex) {
+        let inserted = self.uninit_mut_refs.insert(index);
+        if cfg!(debug_assertions) {
+            assert!(inserted);
+        }
+    }
+    /// Unset the mark that the mutable reference is uninitialized, return True if unset
+    pub fn unset_uninit(&mut self, index: TempIndex) -> bool {
+        self.uninit_mut_refs.remove(&index)
+    }
+
     /// Get the current PC location (i.e., which bytecode to be executed)
     pub fn get_pc(&self) -> CodeOffset {
         self.pc
@@ -152,6 +170,11 @@ impl LocalState {
             .iter()
             .enumerate()
             .filter_map(|(idx, slot)| slot.get_content().map(|(_, ptr)| (idx, ptr)))
+            .chain(
+                self.destroyed_args
+                    .iter()
+                    .map(|(idx, val)| (*idx, val.get_ptr())),
+            )
             .collect()
     }
 
@@ -208,4 +231,14 @@ impl LocalState {
     pub fn into_termination_status(self) -> TerminationStatus {
         self.termination
     }
+
+    /// Mark the spec checking disabled for the rest of the function
+    pub fn skip_specs(&mut self) {
+        self.skip_specs = true;
+    }
+
+    /// Check whether we are skipping the specs
+    pub fn is_spec_skipped(&self) -> bool {
+        self.skip_specs
+    }
 }
diff --git a/language/move-prover/interpreter/src/concrete/player.rs b/language/move-prover/interpreter/src/concrete/player.rs
index 35961145e9..b8371c7b97 100644
--- a/language/move-prover/interpreter/src/concrete/player.rs
+++ b/language/move-prover/interpreter/src/concrete/player.rs
@@ -4,9 +4,10 @@
 
 //! This file implements the statement interpretation part of the stackless bytecode interpreter.
 
-use num::{BigInt, ToPrimitive, Zero};
 use std::{collections::BTreeMap, rc::Rc};
 
+use num::{BigInt, ToPrimitive, Zero};
+
 use bytecode_interpreter_crypto::{
     ed25519_deserialize_public_key, ed25519_deserialize_signature, ed25519_verify_signature,
     sha2_256_of, sha3_256_of,
@@ -40,7 +41,7 @@ use crate::{
             convert_model_base_type, convert_model_local_type, convert_model_partial_struct_type,
             convert_model_struct_type, BaseType, CodeOffset, Type,
         },
-        value::{EvalState, GlobalState, LocalSlot, Pointer, TypedValue},
+        value::{BaseValue, EvalState, GlobalState, LocalSlot, Pointer, TypedValue},
     },
     shared::variant::choose_variant,
 };
@@ -71,7 +72,6 @@ pub struct FunctionContext<'env> {
     holder: &'env FunctionTargetsHolder,
     target: FunctionTarget<'env>,
     ty_args: Vec<BaseType>,
-    skip_specs: bool,
     label_offsets: BTreeMap<Label, CodeOffset>,
     // debug
     level: usize,
@@ -82,7 +82,6 @@ impl<'env> FunctionContext<'env> {
         holder: &'env FunctionTargetsHolder,
         target: FunctionTarget<'env>,
         ty_args: Vec<BaseType>,
-        skip_specs: bool,
         level: usize,
     ) -> Self {
         let label_offsets = Bytecode::label_offsets(target.get_bytecode());
@@ -90,7 +89,6 @@ impl<'env> FunctionContext<'env> {
             holder,
             target,
             ty_args,
-            skip_specs,
             label_offsets,
             level,
         }
@@ -112,16 +110,41 @@ impl<'env> FunctionContext<'env> {
     // execution
     //
 
+    /// Collect addresses stored in the value recursively
+    fn collect_addresses(val: &BaseValue, addresses: &mut Vec<AccountAddress>) {
+        match val {
+            BaseValue::Address(v) | BaseValue::Signer(v) => {
+                addresses.push(*v);
+            }
+            BaseValue::Vector(vec) | BaseValue::Struct(vec) => {
+                for (_, val) in vec.iter().enumerate() {
+                    Self::collect_addresses(val, addresses);
+                }
+            }
+            BaseValue::Bool(_) => (),
+            BaseValue::Int(_) => (),
+        }
+    }
+
     /// Execute a user function with value arguments.
     pub fn exec_user_function(
         &self,
+        skip_specs: bool,
         typed_args: Vec<TypedValue>,
         global_state: &mut GlobalState,
         eval_state: &mut EvalState,
     ) -> ExecResult<LocalState> {
+        // collect addresses
+        for (_, typed_arg) in typed_args.iter().enumerate() {
+            let mut addresses = vec![];
+            Self::collect_addresses(typed_arg.get_val(), &mut addresses);
+            global_state.put_touched_addresses(&addresses);
+        }
+
+        // execute the user function
         let instructions = self.target.get_bytecode();
         let debug_bytecode = self.get_settings().verbose_bytecode;
-        let mut local_state = self.prepare_local_state(typed_args);
+        let mut local_state = self.prepare_local_state(skip_specs, typed_args);
         while !local_state.is_terminated() {
             let pc = local_state.get_pc() as usize;
             let bytecode = instructions.get(pc).unwrap();
@@ -147,7 +170,7 @@ impl<'env> FunctionContext<'env> {
         local_state: &mut LocalState,
         global_state: &mut GlobalState,
     ) -> ExecResult<Vec<TypedValue>> {
-        let mut dummy_state = self.prepare_local_state(typed_args);
+        let mut dummy_state = self.prepare_local_state(local_state.is_spec_skipped(), typed_args);
         if cfg!(debug_assertions) {
             assert_eq!(dummy_state.num_slots(), srcs.len());
         }
@@ -188,7 +211,7 @@ impl<'env> FunctionContext<'env> {
                     assert_eq!(srcs.len(), 2);
                 }
                 self.native_vector_borrow_mut(
-                    *srcs.get(0).unwrap(),
+                    *srcs.first().unwrap(),
                     dummy_state.del_value(0),
                     dummy_state.del_value(1),
                 )
@@ -200,7 +223,7 @@ impl<'env> FunctionContext<'env> {
                 }
                 let res = self
                     .native_vector_push_back(dummy_state.del_value(0), dummy_state.del_value(1));
-                local_state.put_value_override(*srcs.get(0).unwrap(), res);
+                local_state.put_value_override(*srcs.first().unwrap(), res);
                 Ok(vec![])
             }
             (DIEM_CORE_ADDR, "vector", "pop_back") => {
@@ -210,7 +233,7 @@ impl<'env> FunctionContext<'env> {
                 let res = self.native_vector_pop_back(dummy_state.del_value(0));
                 match res {
                     Ok((new_vec, elem_val)) => {
-                        local_state.put_value_override(*srcs.get(0).unwrap(), new_vec);
+                        local_state.put_value_override(*srcs.first().unwrap(), new_vec);
                         Ok(vec![elem_val])
                     }
                     Err(e) => Err(e),
@@ -223,7 +246,7 @@ impl<'env> FunctionContext<'env> {
                 let res = self.native_vector_destroy_empty(dummy_state.del_value(0));
                 match res {
                     Ok(_) => {
-                        local_state.del_value(*srcs.get(0).unwrap());
+                        local_state.del_value(*srcs.first().unwrap());
                         Ok(vec![])
                     }
                     Err(e) => Err(e),
@@ -240,7 +263,7 @@ impl<'env> FunctionContext<'env> {
                 );
                 match res {
                     Ok(new_vec) => {
-                        local_state.put_value_override(*srcs.get(0).unwrap(), new_vec);
+                        local_state.put_value_override(*srcs.first().unwrap(), new_vec);
                         Ok(vec![])
                     }
                     Err(e) => Err(e),
@@ -359,13 +382,13 @@ impl<'env> FunctionContext<'env> {
                 eval_state,
             ),
             Bytecode::Prop(_, PropKind::Assert, exp) => {
-                if !self.skip_specs {
+                if !local_state.is_spec_skipped() {
                     self.handle_prop_assert(exp, eval_state, local_state, global_state)
                 }
             }
             Bytecode::Prop(_, PropKind::Assume, exp) => {
-                if !self.skip_specs {
-                    self.handle_prop_assume(exp, eval_state, local_state, global_state)
+                if !local_state.is_spec_skipped() {
+                    self.handle_prop_assume(exp, eval_state, local_state, global_state)?
                 }
             }
             // expressions (TODO: not supported yet)
@@ -388,12 +411,25 @@ impl<'env> FunctionContext<'env> {
         kind: &AssignKind,
         local_state: &mut LocalState,
     ) {
-        let from_val = match kind {
-            AssignKind::Move => local_state.del_value(src),
-            // TODO (mengxu): what exactly is the semantic of Store here? Why not just use Copy?
-            AssignKind::Copy | AssignKind::Store => local_state.get_value(src),
+        let into_val = match kind {
+            AssignKind::Move => {
+                let from_val = local_state.del_value(src);
+                from_val.assign_cast(local_state.get_type(dst).clone())
+            }
+            AssignKind::Copy => {
+                let from_val = local_state.get_value(src);
+                from_val.assign_cast(local_state.get_type(dst).clone())
+            }
+            AssignKind::Store => {
+                let from_val = local_state.get_value(src);
+                let into_ty = local_state.get_type(dst).clone();
+                if from_val.get_ty().is_ref(Some(true)) {
+                    from_val.borrow_direct(into_ty, src)
+                } else {
+                    from_val.assign_cast(into_ty)
+                }
+            }
         };
-        let into_val = from_val.assign_cast(local_state.get_type(dst).clone());
         local_state.put_value_override(dst, into_val);
     }
 
@@ -401,6 +437,8 @@ impl<'env> FunctionContext<'env> {
         let val = match constant {
             Constant::Bool(v) => TypedValue::mk_bool(*v),
             Constant::U8(v) => TypedValue::mk_u8(*v),
+            Constant::U16(v) => TypedValue::mk_u16(*v),
+            Constant::U32(v) => TypedValue::mk_u32(*v),
             Constant::U64(v) => TypedValue::mk_u64(*v),
             Constant::U128(v) => TypedValue::mk_u128(*v),
             Constant::U256(_) => unimplemented!(),
@@ -411,6 +449,18 @@ impl<'env> FunctionContext<'env> {
                 let elems = v.iter().map(|e| TypedValue::mk_u8(*e)).collect();
                 TypedValue::mk_vector(BaseType::mk_u8(), elems)
             }
+            Constant::AddressArray(v) => {
+                let elems = v
+                    .iter()
+                    .map(|e| {
+                        TypedValue::mk_address(
+                            AccountAddress::from_hex_literal(&format!("{:#x}", *e)).unwrap(),
+                        )
+                    })
+                    .collect();
+                TypedValue::mk_vector(BaseType::mk_address(), elems)
+            }
+            Constant::Vector(_) => unimplemented!(),
         };
         local_state.put_value_override(dst, val);
     }
@@ -441,10 +491,28 @@ impl<'env> FunctionContext<'env> {
         // operations that does not need to have the argument in storage
         match op {
             // built-ins
-            Operation::Havoc(kind) => {
+            Operation::Uninit => {
                 if cfg!(debug_assertions) {
                     assert_eq!(srcs.len(), 1);
-                    let target_ty = local_state.get_type(*srcs.get(0).unwrap());
+                }
+                self.handle_uninit(srcs[0], local_state);
+                return Ok(());
+            }
+            Operation::Destroy => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(srcs.len(), 1);
+                }
+                self.handle_destroy(srcs[0], local_state);
+                return Ok(());
+            }
+            Operation::Stop => {
+                // we should never see the Stop operation in interpreter mode
+                unreachable!()
+            }
+            Operation::Havoc(kind) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(dsts.len(), 1);
+                    let target_ty = local_state.get_type(*dsts.first().unwrap());
                     match kind {
                         HavocKind::Value => {
                             assert!(target_ty.is_base());
@@ -703,7 +771,7 @@ impl<'env> FunctionContext<'env> {
                         typed_args.remove(0),
                         local_state,
                     ),
-                    BorrowEdge::Index => {
+                    BorrowEdge::Index(_) => {
                         self.handle_write_back_ref_element(*idx, typed_args.remove(0), local_state)
                     }
                     BorrowEdge::Hyper(hyper) => self.handle_write_back_ref_hyper(
@@ -749,28 +817,24 @@ impl<'env> FunctionContext<'env> {
                 let object = self.handle_freeze_ref(typed_args.remove(0));
                 Ok(vec![object])
             }
-            // built-in
-            Operation::Destroy => {
-                if cfg!(debug_assertions) {
-                    assert_eq!(typed_args.len(), 1);
-                }
-                self.handle_destroy(srcs[0], local_state);
-                Ok(vec![])
-            }
-            Operation::Stop => {
-                // we should never see the Stop operation in interpreter mode
-                unreachable!()
-            }
             // cast
-            Operation::CastU8 | Operation::CastU64 | Operation::CastU128 => {
+            Operation::CastU8
+            | Operation::CastU16
+            | Operation::CastU32
+            | Operation::CastU64
+            | Operation::CastU128
+            | Operation::CastU256 => {
                 if cfg!(debug_assertions) {
                     assert_eq!(typed_args.len(), 1);
                 }
                 let val = typed_args.remove(0);
                 match op {
                     Operation::CastU8 => self.handle_cast_u8(val),
+                    Operation::CastU16 => self.handle_cast_u16(val),
+                    Operation::CastU32 => self.handle_cast_u32(val),
                     Operation::CastU64 => self.handle_cast_u64(val),
                     Operation::CastU128 => self.handle_cast_u128(val),
+                    Operation::CastU256 => self.handle_cast_u256(val),
                     _ => unreachable!(),
                 }
                 .map(|casted| vec![casted])
@@ -852,13 +916,15 @@ impl<'env> FunctionContext<'env> {
             // event (TODO: not supported yet)
             Operation::EmitEvent | Operation::EventStoreDiverge => Ok(vec![]),
             // already handled
-            Operation::Havoc(..)
+            Operation::Stop
+            | Operation::Uninit
+            | Operation::Destroy
+            | Operation::Havoc(..)
             | Operation::TraceLocal(..)
             | Operation::TraceReturn(..)
             | Operation::TraceAbort
             | Operation::TraceExp(..)
-            | Operation::TraceGlobalMem(..)
-            | Operation::CastU256 => {
+            | Operation::TraceGlobalMem(..) => {
                 unreachable!();
             }
         };
@@ -940,8 +1006,12 @@ impl<'env> FunctionContext<'env> {
             .collect();
 
         // execute the user function
-        let mut callee_state =
-            callee_ctxt.exec_user_function(typed_args, global_state, eval_state)?;
+        let mut callee_state = callee_ctxt.exec_user_function(
+            local_state.is_spec_skipped(),
+            typed_args,
+            global_state,
+            eval_state,
+        )?;
 
         // update mutable arguments
         for (callee_idx, origin_idx) in mut_args {
@@ -1149,7 +1219,7 @@ impl<'env> FunctionContext<'env> {
                 (Pointer::RefField(_, p_field_num), BorrowEdge::Field(_, e_field_num)) => {
                     p_field_num == e_field_num
                 }
-                (Pointer::RefElement(_, _), BorrowEdge::Index) => true,
+                (Pointer::RefElement(_, _), BorrowEdge::Index(_)) => true,
                 _ => false,
             }
         }
@@ -1165,6 +1235,7 @@ impl<'env> FunctionContext<'env> {
 
         let (_, _, ptr) = op_val.decompose();
         let is_parent = match ptr {
+            Pointer::RefDirect(idx) => idx == parent_idx,
             Pointer::RefField(idx, _) => idx == parent_idx,
             Pointer::RefElement(idx, _) => idx == parent_idx,
             Pointer::ArgRef(idx, _) => idx == parent_idx,
@@ -1232,9 +1303,10 @@ impl<'env> FunctionContext<'env> {
         }
         match op_val.get_ptr() {
             Pointer::Local(root_idx) => {
-                if *root_idx == local_root {
-                    local_state.put_value_override(local_root, op_val.read_ref());
+                if cfg!(debug_assertions) {
+                    assert_eq!(*root_idx, local_root);
                 }
+                local_state.put_value_override(local_root, op_val.read_ref());
             }
             _ => unreachable!(),
         }
@@ -1251,10 +1323,18 @@ impl<'env> FunctionContext<'env> {
             let new_ty = op_val.get_ty();
             assert!(new_ty.is_ref(Some(true)));
             assert_eq!(new_ty, old_val.get_ty());
+        }
 
-            // check pointer validity
-            match op_val.get_ptr() {
-                Pointer::RetRef(trace) => {
+        let new_val = match op_val.get_ptr() {
+            Pointer::RefDirect(parent_idx) => {
+                if cfg!(debug_assertions) {
+                    assert_eq!(*parent_idx, local_ref);
+                }
+                old_val.update_ref_direct(op_val)
+            }
+            Pointer::RetRef(trace) => {
+                // check pointer validity
+                if cfg!(debug_assertions) {
                     assert_eq!(trace.len(), 1);
                     match trace.get(0).unwrap() {
                         Pointer::ArgRef(ref_idx, original_ptr) => {
@@ -1264,10 +1344,10 @@ impl<'env> FunctionContext<'env> {
                         _ => unreachable!(),
                     }
                 }
-                _ => unreachable!(),
+                op_val.unbox_from_mut_ref_ret()
             }
-        }
-        let new_val = op_val.unbox_from_mut_ref_ret();
+            _ => unreachable!(),
+        };
         local_state.put_value(local_ref, new_val);
     }
 
@@ -1391,7 +1471,7 @@ impl<'env> FunctionContext<'env> {
                             // NOTE: the local_idx argument can be any dummy value here
                             cur.borrow_ref_struct_field(*field_num, true, *callee_idx)
                         }
-                        (Pointer::RefElement(callee_idx, elem_num), BorrowEdge::Index) => {
+                        (Pointer::RefElement(callee_idx, elem_num), BorrowEdge::Index(_)) => {
                             if cfg!(debug_assertions) {
                                 assert!(cur.get_ty().is_ref_vector(Some(true)));
                             }
@@ -1414,12 +1494,12 @@ impl<'env> FunctionContext<'env> {
                 // TODO (mengxu): refactor the code to remove this clone
                 let mut cur = op_val.clone();
                 for (i, (val, edge)) in path.into_iter().zip(edges.iter()).rev().enumerate() {
-                    let ptr = trace.get(steps - 1 - i).unwrap();
+                    let ptr = trace.get(i).unwrap();
                     let sub = match edge {
                         BorrowEdge::Field(_, field_num) => {
                             val.update_ref_struct_field(*field_num, cur)
                         }
-                        BorrowEdge::Index => {
+                        BorrowEdge::Index(_) => {
                             let elem_num = match ptr {
                                 Pointer::RefElement(_, elem_num) => elem_num,
                                 _ => unreachable!(),
@@ -1469,10 +1549,23 @@ impl<'env> FunctionContext<'env> {
         ref_val.freeze_ref()
     }
 
+    fn handle_uninit(&self, local_idx: TempIndex, local_state: &mut LocalState) {
+        if cfg!(debug_assertions) {
+            assert!(!local_state.has_value(local_idx));
+        }
+        local_state.mark_uninit(local_idx);
+    }
+
     fn handle_destroy(&self, local_idx: TempIndex, local_state: &mut LocalState) {
-        let val = local_state.del_value(local_idx);
-        if local_idx < self.target.get_parameter_count() {
-            local_state.save_destroyed_arg(local_idx, val);
+        if local_state.unset_uninit(local_idx) {
+            if cfg!(debug_assertions) {
+                assert!(!local_state.has_value(local_idx));
+            }
+        } else {
+            let val = local_state.del_value(local_idx);
+            if local_idx < self.target.get_parameter_count() {
+                local_state.save_destroyed_arg(local_idx, val);
+            }
         }
     }
 
@@ -1480,6 +1573,18 @@ impl<'env> FunctionContext<'env> {
         let (ty, val, _) = val.decompose();
         let v = if ty.is_u8() {
             val.into_u8()
+        } else if ty.is_u16() {
+            let v = val.into_u16();
+            if v > (u8::MAX as u16) {
+                return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+            }
+            v as u8
+        } else if ty.is_u32() {
+            let v = val.into_u32();
+            if v > (u8::MAX as u32) {
+                return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+            }
+            v as u8
         } else if ty.is_u64() {
             let v = val.into_u64();
             if v > (u8::MAX as u64) {
@@ -1504,10 +1609,82 @@ impl<'env> FunctionContext<'env> {
         Ok(TypedValue::mk_u8(v))
     }
 
+    fn handle_cast_u16(&self, val: TypedValue) -> Result<TypedValue, AbortInfo> {
+        let (ty, val, _) = val.decompose();
+        let v = if ty.is_u8() {
+            val.into_u8() as u16
+        } else if ty.is_u16() {
+            val.into_u16()
+        } else if ty.is_u32() {
+            let v = val.into_u32();
+            if v > (u16::MAX as u32) {
+                return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+            }
+            v as u16
+        } else if ty.is_u64() {
+            let v = val.into_u64();
+            if v > (u16::MAX as u64) {
+                return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+            }
+            v as u16
+        } else if ty.is_u128() {
+            let v = val.into_u128();
+            if v > (u16::MAX as u128) {
+                return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+            }
+            v as u16
+        } else {
+            let n = val.into_num();
+            match n.to_u16() {
+                None => {
+                    return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+                }
+                Some(v) => v,
+            }
+        };
+        Ok(TypedValue::mk_u16(v))
+    }
+
+    fn handle_cast_u32(&self, val: TypedValue) -> Result<TypedValue, AbortInfo> {
+        let (ty, val, _) = val.decompose();
+        let v = if ty.is_u8() {
+            val.into_u8() as u32
+        } else if ty.is_u16() {
+            val.into_u16() as u32
+        } else if ty.is_u32() {
+            val.into_u32()
+        } else if ty.is_u64() {
+            let v = val.into_u64();
+            if v > (u32::MAX as u64) {
+                return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+            }
+            v as u32
+        } else if ty.is_u128() {
+            let v = val.into_u128();
+            if v > (u32::MAX as u128) {
+                return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+            }
+            v as u32
+        } else {
+            let n = val.into_num();
+            match n.to_u32() {
+                None => {
+                    return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+                }
+                Some(v) => v,
+            }
+        };
+        Ok(TypedValue::mk_u32(v))
+    }
+
     fn handle_cast_u64(&self, val: TypedValue) -> Result<TypedValue, AbortInfo> {
         let (ty, val, _) = val.decompose();
         let v = if ty.is_u8() {
             val.into_u8() as u64
+        } else if ty.is_u16() {
+            val.into_u16() as u64
+        } else if ty.is_u32() {
+            val.into_u32() as u64
         } else if ty.is_u64() {
             val.into_u64()
         } else if ty.is_u128() {
@@ -1532,6 +1709,34 @@ impl<'env> FunctionContext<'env> {
         let (ty, val, _) = val.decompose();
         let v = if ty.is_u8() {
             val.into_u8() as u128
+        } else if ty.is_u16() {
+            val.into_u16() as u128
+        } else if ty.is_u32() {
+            val.into_u32() as u128
+        } else if ty.is_u64() {
+            val.into_u64() as u128
+        } else if ty.is_u128() {
+            val.into_u128()
+        } else {
+            let n = val.into_num();
+            match n.to_u128() {
+                None => {
+                    return Err(self.sys_abort(StatusCode::ARITHMETIC_ERROR));
+                }
+                Some(v) => v,
+            }
+        };
+        Ok(TypedValue::mk_u128(v))
+    }
+
+    fn handle_cast_u256(&self, val: TypedValue) -> Result<TypedValue, AbortInfo> {
+        let (ty, val, _) = val.decompose();
+        let v = if ty.is_u8() {
+            val.into_u8() as u128
+        } else if ty.is_u16() {
+            val.into_u16() as u128
+        } else if ty.is_u32() {
+            val.into_u32() as u128
         } else if ty.is_u64() {
             val.into_u64() as u128
         } else if ty.is_u128() {
@@ -1847,7 +2052,7 @@ impl<'env> FunctionContext<'env> {
         eval_state: &EvalState,
         local_state: &mut LocalState,
         global_state: &GlobalState,
-    ) {
+    ) -> ExecResult<()> {
         let evaluator = Evaluator::new(
             self.holder,
             &self.target,
@@ -1861,10 +2066,15 @@ impl<'env> FunctionContext<'env> {
         match evaluator.check_assume(exp) {
             None => (),
             // handle let-bindings
-            Some((local_idx, local_val)) => {
+            Some(Ok((local_idx, local_val))) => {
                 local_state.put_value_override(local_idx, local_val);
             }
+            Some(Err(_)) => {
+                // unable to find a satisfiable value for a let-binding
+                local_state.skip_specs();
+            }
         }
+        Ok(())
     }
 
     //
@@ -2188,16 +2398,10 @@ impl<'env> FunctionContext<'env> {
             .collect();
 
         // build the context
-        FunctionContext::new(
-            self.holder,
-            callee_target,
-            callee_ty_insts,
-            self.skip_specs,
-            self.level + 1,
-        )
+        FunctionContext::new(self.holder, callee_target, callee_ty_insts, self.level + 1)
     }
 
-    fn prepare_local_state(&self, typed_args: Vec<TypedValue>) -> LocalState {
+    fn prepare_local_state(&self, skip_specs: bool, typed_args: Vec<TypedValue>) -> LocalState {
         let target = &self.target;
         let env = target.global_env();
 
@@ -2241,7 +2445,7 @@ impl<'env> FunctionContext<'env> {
             let slot = LocalSlot::new_tmp(name, ty);
             local_slots.push(slot);
         }
-        LocalState::new(local_slots)
+        LocalState::new(local_slots, skip_specs)
     }
 }
 
@@ -2260,8 +2464,9 @@ pub fn entrypoint(
     global_state: &mut GlobalState,
 ) -> ExecResult<Vec<TypedValue>> {
     let mut eval_state = EvalState::default();
-    let ctxt = FunctionContext::new(holder, target, ty_args.to_vec(), skip_specs, level);
-    let local_state = ctxt.exec_user_function(typed_args, global_state, &mut eval_state)?;
+    let ctxt = FunctionContext::new(holder, target, ty_args.to_vec(), level);
+    let local_state =
+        ctxt.exec_user_function(skip_specs, typed_args, global_state, &mut eval_state)?;
     let termination = local_state.into_termination_status();
     match termination {
         TerminationStatus::Abort(abort_info) => Err(abort_info),
diff --git a/language/move-prover/interpreter/src/concrete/runtime.rs b/language/move-prover/interpreter/src/concrete/runtime.rs
index 12a9c46571..f330a5f99f 100644
--- a/language/move-prover/interpreter/src/concrete/runtime.rs
+++ b/language/move-prover/interpreter/src/concrete/runtime.rs
@@ -150,7 +150,7 @@ fn check_and_convert_type_args_and_args(
             }
             _ => {
                 let base_ty = convert_model_base_type(env, &local_ty, &converted_ty_args);
-                let converted = convert_move_value(env, arg, &base_ty)?;
+                let converted = convert_move_value(arg, &base_ty)?;
                 converted_args.push(converted);
             }
         }
@@ -163,8 +163,11 @@ pub fn convert_move_type_tag(env: &GlobalEnv, tag: &TypeTag) -> PartialVMResult<
     let converted = match tag {
         TypeTag::Bool => BaseType::mk_bool(),
         TypeTag::U8 => BaseType::mk_u8(),
+        TypeTag::U16 => BaseType::mk_u16(),
+        TypeTag::U32 => BaseType::mk_u32(),
         TypeTag::U64 => BaseType::mk_u64(),
         TypeTag::U128 => BaseType::mk_u128(),
+        TypeTag::U256 => BaseType::mk_u256(),
         TypeTag::Address => BaseType::mk_address(),
         TypeTag::Signer => BaseType::mk_signer(),
         TypeTag::Vector(elem_tag) => BaseType::mk_vector(convert_move_type_tag(env, elem_tag)?),
@@ -223,11 +226,7 @@ pub fn convert_move_struct_tag(
     })
 }
 
-pub fn convert_move_value(
-    env: &GlobalEnv,
-    val: &MoveValue,
-    ty: &BaseType,
-) -> PartialVMResult<TypedValue> {
+pub fn convert_move_value(val: &MoveValue, ty: &BaseType) -> PartialVMResult<TypedValue> {
     let converted = match (val, ty) {
         (MoveValue::Bool(v), BaseType::Primitive(PrimitiveType::Bool)) => TypedValue::mk_bool(*v),
         (MoveValue::U8(v), BaseType::Primitive(PrimitiveType::Int(IntType::U8))) => {
@@ -248,7 +247,7 @@ pub fn convert_move_value(
         (MoveValue::Vector(v), BaseType::Vector(elem)) => {
             let converted = v
                 .iter()
-                .map(|e| convert_move_value(env, e, elem))
+                .map(|e| convert_move_value(e, elem))
                 .collect::<PartialVMResult<Vec<_>>>()?;
             TypedValue::mk_vector(*elem.clone(), converted)
         }
@@ -260,7 +259,7 @@ pub fn convert_move_value(
             let converted = fields
                 .iter()
                 .zip(inst.fields.iter())
-                .map(|(f, info)| convert_move_value(env, f, &info.ty))
+                .map(|(f, info)| convert_move_value(f, &info.ty))
                 .collect::<PartialVMResult<Vec<_>>>()?;
             TypedValue::mk_struct(inst.clone(), converted)
         }
@@ -291,9 +290,14 @@ fn check_type_instantiation(
 
 fn get_abilities(env: &GlobalEnv, ty: &TypeTag) -> PartialVMResult<AbilitySet> {
     match ty {
-        TypeTag::Bool | TypeTag::U8 | TypeTag::U64 | TypeTag::U128 | TypeTag::Address => {
-            Ok(AbilitySet::PRIMITIVES)
-        }
+        TypeTag::Bool
+        | TypeTag::U8
+        | TypeTag::U16
+        | TypeTag::U32
+        | TypeTag::U64
+        | TypeTag::U128
+        | TypeTag::U256
+        | TypeTag::Address => Ok(AbilitySet::PRIMITIVES),
         TypeTag::Signer => Ok(AbilitySet::SIGNER),
         TypeTag::Vector(elem_ty) => AbilitySet::polymorphic_abilities(
             AbilitySet::VECTOR,
diff --git a/language/move-prover/interpreter/src/concrete/ty.rs b/language/move-prover/interpreter/src/concrete/ty.rs
index befda52c72..60145f0606 100644
--- a/language/move-prover/interpreter/src/concrete/ty.rs
+++ b/language/move-prover/interpreter/src/concrete/ty.rs
@@ -39,6 +39,10 @@ pub enum IntType {
     U8,
     U64,
     U128,
+    // NOTE: Added in bytecode version v6, do not reorder!
+    U16,
+    U32,
+    U256,
 }
 
 #[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
@@ -105,8 +109,11 @@ impl fmt::Display for IntType {
         let repr = match self {
             Self::Num => "num",
             Self::U8 => "u8",
+            Self::U16 => "u16",
+            Self::U32 => "u32",
             Self::U64 => "u64",
             Self::U128 => "u128",
+            Self::U256 => "u256",
         };
         f.write_str(repr)
     }
@@ -228,6 +235,14 @@ impl BaseType {
         BaseType::Primitive(PrimitiveType::Int(IntType::U8))
     }
 
+    pub fn mk_u16() -> Self {
+        BaseType::Primitive(PrimitiveType::Int(IntType::U16))
+    }
+
+    pub fn mk_u32() -> Self {
+        BaseType::Primitive(PrimitiveType::Int(IntType::U32))
+    }
+
     pub fn mk_u64() -> Self {
         BaseType::Primitive(PrimitiveType::Int(IntType::U64))
     }
@@ -236,6 +251,10 @@ impl BaseType {
         BaseType::Primitive(PrimitiveType::Int(IntType::U128))
     }
 
+    pub fn mk_u256() -> Self {
+        BaseType::Primitive(PrimitiveType::Int(IntType::U256))
+    }
+
     pub fn mk_num() -> Self {
         BaseType::Primitive(PrimitiveType::Int(IntType::Num))
     }
@@ -272,6 +291,14 @@ impl BaseType {
         matches!(self, BaseType::Primitive(PrimitiveType::Int(IntType::U8)))
     }
 
+    pub fn is_u16(&self) -> bool {
+        matches!(self, BaseType::Primitive(PrimitiveType::Int(IntType::U16)))
+    }
+
+    pub fn is_u32(&self) -> bool {
+        matches!(self, BaseType::Primitive(PrimitiveType::Int(IntType::U32)))
+    }
+
     pub fn is_u64(&self) -> bool {
         matches!(self, BaseType::Primitive(PrimitiveType::Int(IntType::U64)))
     }
@@ -280,6 +307,10 @@ impl BaseType {
         matches!(self, BaseType::Primitive(PrimitiveType::Int(IntType::U128)))
     }
 
+    pub fn is_u256(&self) -> bool {
+        matches!(self, BaseType::Primitive(PrimitiveType::Int(IntType::U256)))
+    }
+
     pub fn is_num(&self) -> bool {
         matches!(self, BaseType::Primitive(PrimitiveType::Int(IntType::Num)))
     }
@@ -422,13 +453,16 @@ impl BaseType {
         match self {
             BaseType::Primitive(PrimitiveType::Bool) => TypeTag::Bool,
             BaseType::Primitive(PrimitiveType::Int(IntType::U8)) => TypeTag::U8,
+            BaseType::Primitive(PrimitiveType::Int(IntType::U16)) => TypeTag::U16,
+            BaseType::Primitive(PrimitiveType::Int(IntType::U32)) => TypeTag::U32,
             BaseType::Primitive(PrimitiveType::Int(IntType::U64)) => TypeTag::U64,
             BaseType::Primitive(PrimitiveType::Int(IntType::U128)) => TypeTag::U128,
+            BaseType::Primitive(PrimitiveType::Int(IntType::U256)) => TypeTag::U256,
             BaseType::Primitive(PrimitiveType::Int(IntType::Num)) => unreachable!(),
             BaseType::Primitive(PrimitiveType::Address) => TypeTag::Address,
             BaseType::Primitive(PrimitiveType::Signer) => TypeTag::Signer,
             BaseType::Vector(elem) => TypeTag::Vector(Box::new(elem.to_move_type_tag())),
-            BaseType::Struct(inst) => TypeTag::Struct(inst.to_move_struct_tag()),
+            BaseType::Struct(inst) => TypeTag::Struct(Box::new(inst.to_move_struct_tag())),
         }
     }
 
@@ -436,8 +470,11 @@ impl BaseType {
         match self {
             BaseType::Primitive(PrimitiveType::Bool) => MoveTypeLayout::Bool,
             BaseType::Primitive(PrimitiveType::Int(IntType::U8)) => MoveTypeLayout::U8,
+            BaseType::Primitive(PrimitiveType::Int(IntType::U16)) => MoveTypeLayout::U16,
+            BaseType::Primitive(PrimitiveType::Int(IntType::U32)) => MoveTypeLayout::U32,
             BaseType::Primitive(PrimitiveType::Int(IntType::U64)) => MoveTypeLayout::U64,
             BaseType::Primitive(PrimitiveType::Int(IntType::U128)) => MoveTypeLayout::U128,
+            BaseType::Primitive(PrimitiveType::Int(IntType::U256)) => MoveTypeLayout::U256,
             BaseType::Primitive(PrimitiveType::Int(IntType::Num)) => unreachable!(),
             BaseType::Primitive(PrimitiveType::Address) => MoveTypeLayout::Address,
             BaseType::Primitive(PrimitiveType::Signer) => MoveTypeLayout::Signer,
@@ -537,8 +574,11 @@ impl Type {
 
     gen!(mk_bool, mk_ref_bool, is_bool, is_ref_bool);
     gen!(mk_u8, mk_ref_u8, is_u8, is_ref_u8);
+    gen!(mk_u16, mk_ref_u16, is_u16, is_ref_u16);
+    gen!(mk_u32, mk_ref_u32, is_u32, is_ref_u32);
     gen!(mk_u64, mk_ref_u64, is_u64, is_ref_u64);
     gen!(mk_u128, mk_ref_u128, is_u128, is_ref_u128);
+    gen!(mk_u256, mk_ref_u256, is_u256, is_ref_u256);
     gen!(mk_num, mk_ref_num, is_num, is_ref_num);
     gen!(mk_address, mk_ref_address, is_address, is_ref_address);
     gen!(mk_signer, mk_ref_signer, is_signer, is_ref_signer);
diff --git a/language/move-prover/interpreter/src/concrete/value.rs b/language/move-prover/interpreter/src/concrete/value.rs
index 09135291fd..e347e6e422 100644
--- a/language/move-prover/interpreter/src/concrete/value.rs
+++ b/language/move-prover/interpreter/src/concrete/value.rs
@@ -13,7 +13,8 @@ use std::collections::{BTreeMap, BTreeSet};
 
 use move_core_types::{
     account_address::AccountAddress,
-    effects::ChangeSet,
+    effects::{ChangeSet, Op},
+    u256,
     value::{MoveStruct, MoveValue},
 };
 use move_model::ast::{MemoryLabel, TempIndex};
@@ -46,12 +47,21 @@ impl BaseValue {
     pub fn mk_u8(v: u8) -> Self {
         Self::Int(BigInt::from(v))
     }
+    pub fn mk_u16(v: u16) -> Self {
+        Self::Int(BigInt::from(v))
+    }
+    pub fn mk_u32(v: u32) -> Self {
+        Self::Int(BigInt::from(v))
+    }
     pub fn mk_u64(v: u64) -> Self {
         Self::Int(BigInt::from(v))
     }
     pub fn mk_u128(v: u128) -> Self {
         Self::Int(BigInt::from(v))
     }
+    pub fn mk_u256(v: u256::U256) -> Self {
+        Self::Int(BigInt::from(&v))
+    }
     pub fn mk_num(v: BigInt) -> Self {
         Self::Int(v)
     }
@@ -80,6 +90,18 @@ impl BaseValue {
             _ => unreachable!(),
         }
     }
+    pub fn into_u16(self) -> u16 {
+        match self {
+            Self::Int(v) => v.to_u16().unwrap(),
+            _ => unreachable!(),
+        }
+    }
+    pub fn into_u32(self) -> u32 {
+        match self {
+            Self::Int(v) => v.to_u32().unwrap(),
+            _ => unreachable!(),
+        }
+    }
     pub fn into_u64(self) -> u64 {
         match self {
             Self::Int(v) => v.to_u64().unwrap(),
@@ -92,6 +114,17 @@ impl BaseValue {
             _ => unreachable!(),
         }
     }
+    pub fn into_u256(self) -> u256::U256 {
+        match self {
+            Self::Int(v) => u256::U256::from_le_bytes(
+                &v.to_bytes_le()
+                    .1
+                    .try_into()
+                    .unwrap_or_else(|_| panic!("Cannot convert {} to U256", v)),
+            ),
+            _ => unreachable!(),
+        }
+    }
     pub fn into_num(self) -> BigInt {
         match self {
             Self::Int(v) => v,
@@ -135,6 +168,7 @@ pub enum Pointer {
     None,
     Global(AccountAddress),
     Local(TempIndex),
+    RefDirect(TempIndex),
     RefField(TempIndex, usize),
     RefElement(TempIndex, usize),
     ArgRef(TempIndex, Box<Pointer>),
@@ -199,6 +233,23 @@ impl TypedValue {
             ptr: Pointer::None,
         }
     }
+
+    pub fn mk_u16(v: u16) -> Self {
+        Self {
+            ty: Type::mk_u16(),
+            val: BaseValue::mk_u16(v),
+            ptr: Pointer::None,
+        }
+    }
+
+    pub fn mk_u32(v: u32) -> Self {
+        Self {
+            ty: Type::mk_u32(),
+            val: BaseValue::mk_u32(v),
+            ptr: Pointer::None,
+        }
+    }
+
     pub fn mk_u64(v: u64) -> Self {
         Self {
             ty: Type::mk_u64(),
@@ -288,6 +339,13 @@ impl TypedValue {
             ptr,
         }
     }
+    pub fn mk_ref_u256(v: u256::U256, is_mut: bool, ptr: Pointer) -> Self {
+        Self {
+            ty: Type::mk_ref_u256(is_mut),
+            val: BaseValue::mk_u256(v),
+            ptr,
+        }
+    }
     pub fn mk_ref_num(v: BigInt, is_mut: bool, ptr: Pointer) -> Self {
         Self {
             ty: Type::mk_ref_num(is_mut),
@@ -417,6 +475,18 @@ impl TypedValue {
         }
         (self.val.into_u8(), self.ty.into_ref_type().0, self.ptr)
     }
+    pub fn into_ref_u16(self) -> (u16, bool, Pointer) {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_ref_u16(None));
+        }
+        (self.val.into_u16(), self.ty.into_ref_type().0, self.ptr)
+    }
+    pub fn into_ref_u32(self) -> (u32, bool, Pointer) {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_ref_u32(None));
+        }
+        (self.val.into_u32(), self.ty.into_ref_type().0, self.ptr)
+    }
     pub fn into_ref_u64(self) -> (u64, bool, Pointer) {
         if cfg!(debug_assertions) {
             assert!(self.ty.is_ref_u64(None));
@@ -429,6 +499,12 @@ impl TypedValue {
         }
         (self.val.into_u128(), self.ty.into_ref_type().0, self.ptr)
     }
+    pub fn into_ref_u256(self) -> (u256::U256, bool, Pointer) {
+        if cfg!(debug_assertions) {
+            assert!(self.ty.is_ref_u256(None));
+        }
+        (self.val.into_u256(), self.ty.into_ref_type().0, self.ptr)
+    }
     pub fn into_ref_num(self) -> (BigInt, bool, Pointer) {
         if cfg!(debug_assertions) {
             assert!(self.ty.is_ref_num(None));
@@ -493,6 +569,18 @@ impl TypedValue {
         }
     }
 
+    /// Create a reference that is a direct borrow of another reference value
+    pub fn borrow_direct(self, ty: Type, local_idx: TempIndex) -> TypedValue {
+        if cfg!(debug_assertions) {
+            assert!(ty.is_compatible_for_assign(&self.ty));
+        }
+        TypedValue {
+            ty,
+            val: self.val,
+            ptr: Pointer::RefDirect(local_idx),
+        }
+    }
+
     /// Create a reference to the base value
     pub fn borrow_local(self, is_mut: bool, local_idx: TempIndex) -> TypedValue {
         TypedValue {
@@ -572,6 +660,9 @@ impl TypedValue {
         ) {
             match cur {
                 Pointer::ArgRef(_, _) => trace.push(cur.clone()),
+                Pointer::RefDirect(idx) => {
+                    follow_return_pointers_recursive(ptrs.get(idx).unwrap(), ptrs, trace);
+                }
                 Pointer::RefField(idx, _) | Pointer::RefElement(idx, _) => {
                     trace.push(cur.clone());
                     follow_return_pointers_recursive(ptrs.get(idx).unwrap(), ptrs, trace);
@@ -623,6 +714,21 @@ impl TypedValue {
         }
     }
 
+    /// update the reference directly
+    pub fn update_ref_direct(self, ref_val: TypedValue) -> TypedValue {
+        let (old_ty, _, old_ptr) = self.decompose();
+        let (new_ty, new_val, _) = ref_val.decompose();
+        if cfg!(debug_assertions) {
+            assert!(old_ty.is_ref(Some(true)));
+            assert_eq!(old_ty, new_ty);
+        }
+        TypedValue {
+            ty: old_ty,
+            val: new_val,
+            ptr: old_ptr,
+        }
+    }
+
     /// Retrieve an element from a vector at the given index. Return None of index out-of-bounds.
     pub fn get_vector_element(self, elem_num: usize) -> Option<TypedValue> {
         let elem_ty = self.ty.into_vector_elem();
@@ -1108,6 +1214,11 @@ impl GlobalState {
         &self.touched_addresses
     }
 
+    /// Put new addresses to all the addresses that are touched by the bytecode
+    pub fn put_touched_addresses(&mut self, addresses: &[AccountAddress]) {
+        self.touched_addresses.extend(addresses);
+    }
+
     /// Calculate the delta (i.e., a ChangeSet) against the old state
     pub fn delta(&self, old_state: &GlobalState) -> ChangeSet {
         fn bcs_serialize_resource(key: &StructInstantiation, val: &BaseValue) -> Vec<u8> {
@@ -1128,19 +1239,21 @@ impl GlobalState {
             for (key, val) in &account_state.storage {
                 match old_account_state.storage.get(key) {
                     None => change_set
-                        .publish_resource(
+                        .add_resource_op(
                             *addr,
                             key.to_move_struct_tag(),
-                            bcs_serialize_resource(key, val),
+                            Op::New(bcs_serialize_resource(key, val)),
                         )
                         .unwrap(),
                     Some(old_val) => {
                         if val != old_val {
-                            change_set.publish_or_overwrite_resource(
-                                *addr,
-                                key.to_move_struct_tag(),
-                                bcs_serialize_resource(key, val),
-                            );
+                            change_set
+                                .add_resource_op(
+                                    *addr,
+                                    key.to_move_struct_tag(),
+                                    Op::Modify(bcs_serialize_resource(key, val)),
+                                )
+                                .unwrap();
                         }
                     }
                 }
@@ -1153,7 +1266,7 @@ impl GlobalState {
             for old_key in old_account_state.storage.keys() {
                 if !account_state.storage.contains_key(old_key) {
                     change_set
-                        .unpublish_resource(*old_addr, old_key.to_move_struct_tag())
+                        .add_resource_op(*old_addr, old_key.to_move_struct_tag(), Op::Delete)
                         .unwrap();
                 }
             }
@@ -1238,8 +1351,7 @@ impl EvalState {
     pub fn all_addresses(&self) -> BTreeSet<AccountAddress> {
         self.saved_memory
             .values()
-            .map(|v1| v1.values().map(|v2| v2.values().map(|v3| v3.keys())))
-            .flatten()
+            .flat_map(|v1| v1.values().map(|v2| v2.values().map(|v3| v3.keys())))
             .flatten()
             .flatten()
             .copied()
diff --git a/language/move-prover/interpreter/src/lib.rs b/language/move-prover/interpreter/src/lib.rs
index 955f309055..d7a7c3a3ce 100644
--- a/language/move-prover/interpreter/src/lib.rs
+++ b/language/move-prover/interpreter/src/lib.rs
@@ -1,10 +1,10 @@
 // Copyright (c) The Diem Core Contributors
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
-
 use anyhow::{bail, Result};
 use clap::Parser;
 use codespan_reporting::{diagnostic::Severity, term::termcolor::Buffer};
+use std::fmt::Write;
 
 use move_binary_format::errors::{Location, PartialVMError, PartialVMResult, VMResult};
 use move_core_types::{
@@ -124,6 +124,9 @@ pub fn interpret_with_options(
             TransactionArgument::U8Vector(v) => {
                 MoveValue::Vector(v.into_iter().map(MoveValue::U8).collect())
             }
+            TransactionArgument::U16(v) => MoveValue::U16(v),
+            TransactionArgument::U32(v) => MoveValue::U32(v),
+            TransactionArgument::U256(v) => MoveValue::U256(v),
         }))
         .collect();
 
@@ -202,7 +205,7 @@ impl<'env> StacklessBytecodeInterpreter<'env> {
                 for func_env in module_env.get_functions() {
                     for (variant, target) in targets.get_targets(&func_env) {
                         target.register_annotation_formatters_for_test();
-                        text += &format!("[variant {}]\n{}\n", variant, target);
+                        writeln!(&mut text, "[variant {}]\n{}", variant, target).unwrap();
                     }
                 }
             }
@@ -339,7 +342,8 @@ fn verbose_stepwise_processing(
             for (_, target) in targets.get_targets(&func_env) {
                 if !target.data.code.is_empty() {
                     target.register_annotation_formatters_for_test();
-                    text += &format!("[{}-{}]\n{}\n", step, name, target);
+
+                    writeln!(&mut text, "[{}-{}]\n{}", step, name, target).unwrap();
                 }
             }
         }
@@ -371,8 +375,11 @@ fn convert_typed_value_to_move_value(ty: &BaseType, val: BaseValue) -> MoveValue
     match ty {
         BaseType::Primitive(PrimitiveType::Bool) => MoveValue::Bool(val.into_bool()),
         BaseType::Primitive(PrimitiveType::Int(IntType::U8)) => MoveValue::U8(val.into_u8()),
+        BaseType::Primitive(PrimitiveType::Int(IntType::U16)) => MoveValue::U16(val.into_u16()),
+        BaseType::Primitive(PrimitiveType::Int(IntType::U32)) => MoveValue::U32(val.into_u32()),
         BaseType::Primitive(PrimitiveType::Int(IntType::U64)) => MoveValue::U64(val.into_u64()),
         BaseType::Primitive(PrimitiveType::Int(IntType::U128)) => MoveValue::U128(val.into_u128()),
+        BaseType::Primitive(PrimitiveType::Int(IntType::U256)) => MoveValue::U256(val.into_u256()),
         BaseType::Primitive(PrimitiveType::Int(IntType::Num)) => unreachable!(),
         BaseType::Primitive(PrimitiveType::Address) => MoveValue::Address(val.into_address()),
         BaseType::Primitive(PrimitiveType::Signer) => MoveValue::Signer(val.into_signer()),
diff --git a/language/move-prover/interpreter/src/shared/bridge.rs b/language/move-prover/interpreter/src/shared/bridge.rs
index 4c738867c4..f13e612d2c 100644
--- a/language/move-prover/interpreter/src/shared/bridge.rs
+++ b/language/move-prover/interpreter/src/shared/bridge.rs
@@ -3,7 +3,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use move_binary_format::errors::{PartialVMError, VMResult};
-use move_core_types::{effects::ChangeSet, language_storage::ModuleId, resolver::MoveResolver};
+use move_core_types::{
+    effects::{AccountChangeSet, ChangeSet, Op},
+    resolver::MoveResolver,
+};
 
 /// The result returned by the stackless VM does not contain code offsets and indices. In order to
 /// do cross-vm comparison, we need to adapt the Move VM result by removing these fields.
@@ -38,32 +41,24 @@ fn adapt_move_vm_change_set_internal<S: MoveResolver>(
     let mut adapted = ChangeSet::new();
     for (addr, state) in change_set.into_inner() {
         let (modules, resources) = state.into_inner();
-        for (tag, val) in resources {
-            match val {
-                // deletion
-                None => adapted.unpublish_resource(addr, tag).unwrap(),
-                // addition / modification
-                Some(new_val) => match old_storage.get_resource(&addr, &tag).unwrap() {
-                    // addition
-                    None => adapted.publish_resource(addr, tag, new_val).unwrap(),
-                    // modification is only added to change_set if the values actually change
-                    Some(old_val) => {
-                        if new_val != old_val {
-                            adapted.publish_resource(addr, tag, new_val).unwrap();
-                        }
-                    }
+
+        let resources = resources
+            .into_iter()
+            .filter(|(tag, op)| match op {
+                Op::New(_) | Op::Delete => true,
+                Op::Modify(new_val) => match old_storage.get_resource(&addr, tag).unwrap() {
+                    Some(old_val) => new_val != &old_val,
+                    None => true,
                 },
-            }
-        }
-        for (module_name, blob_opt) in modules {
-            let module_id = ModuleId::new(addr, module_name);
-            match blob_opt {
-                // deletion
-                None => adapted.unpublish_module(module_id).unwrap(),
-                // addition
-                Some(blob) => adapted.publish_module(module_id, blob).unwrap(),
-            }
-        }
+            })
+            .collect();
+
+        adapted
+            .add_account_changeset(
+                addr,
+                AccountChangeSet::from_modules_resources(modules, resources),
+            )
+            .unwrap();
     }
     adapted
 }
diff --git a/language/move-prover/interpreter/src/shared/variant.rs b/language/move-prover/interpreter/src/shared/variant.rs
index 35bc7606d8..8acb49d05a 100644
--- a/language/move-prover/interpreter/src/shared/variant.rs
+++ b/language/move-prover/interpreter/src/shared/variant.rs
@@ -23,7 +23,10 @@ pub fn choose_variant<'env>(
                 }
             }
             FunctionVariant::Verification(VerificationFlavor::Regular) => {
-                target_variant = Some(target);
+                // TODO (mengxu): think about a way to handle ghost type parameters
+                if target.data.ghost_type_param_count == 0 {
+                    target_variant = Some(target);
+                }
             }
             _ => (),
         }
diff --git a/language/move-prover/lab/Cargo.toml b/language/move-prover/lab/Cargo.toml
index e6ad76c0af..1457db23a7 100644
--- a/language/move-prover/lab/Cargo.toml
+++ b/language/move-prover/lab/Cargo.toml
@@ -3,7 +3,7 @@ name = "prover-lab"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
diff --git a/language/move-prover/lab/data/quantifiers/notebook.ipynb b/language/move-prover/lab/data/quantifiers/notebook.ipynb
index 8c816fc7eb..026255daf1 100644
--- a/language/move-prover/lab/data/quantifiers/notebook.ipynb
+++ b/language/move-prover/lab/data/quantifiers/notebook.ipynb
@@ -28,7 +28,7 @@
    "outputs": [],
    "source": [
     "use prover_lab::z3log::*;\n",
-    "\n",
+    '\n',
     "let model = process_file(\"/tmp/mvp.z3log\")?;"
    ]
   },
diff --git a/language/move-prover/lab/src/plot.rs b/language/move-prover/lab/src/plot.rs
index 58111523c8..df74cf1ac2 100644
--- a/language/move-prover/lab/src/plot.rs
+++ b/language/move-prover/lab/src/plot.rs
@@ -155,8 +155,7 @@ pub fn plot_benchmarks_to_file(fname: &str, benchmarks: &[Benchmark]) -> anyhow:
     let data_points = joined.len() as u32;
     let max_duration = joined
         .iter()
-        .map(|(_, e)| e.iter().map(|(_, d)| *d))
-        .flatten()
+        .flat_map(|(_, e)| e.iter().map(|(_, d)| *d))
         .filter_map(|r| {
             if let Result::Duration(d) | Result::Error(d) = r {
                 Some(d)
diff --git a/language/move-prover/move-abigen/Cargo.toml b/language/move-prover/move-abigen/Cargo.toml
index 5a28aaf10b..f4eb6ae5dc 100644
--- a/language/move-prover/move-abigen/Cargo.toml
+++ b/language/move-prover/move-abigen/Cargo.toml
@@ -3,16 +3,18 @@ name = "move-abigen"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-# diem dependencies
+# Move dependencies
 move-model = { path = "../../move-model" }
 move-core-types = { path = "../../move-core/types" }
+move-binary-format = { path = "../../move-binary-format" }
 move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
 move-command-line-common = { path = "../../move-command-line-common" }
-bcs = "0.1.2"
+
+bcs.workspace = true
 
 # external dependencies
 log = "0.4.14"
diff --git a/language/move-prover/move-abigen/src/abigen.rs b/language/move-prover/move-abigen/src/abigen.rs
index bdff55dc74..c2cc0e4df8 100644
--- a/language/move-prover/move-abigen/src/abigen.rs
+++ b/language/move-prover/move-abigen/src/abigen.rs
@@ -7,12 +7,13 @@ use log::{debug, info, warn};
 
 use anyhow::bail;
 use heck::SnakeCase;
+use move_binary_format::file_format::Ability;
 use move_bytecode_verifier::script_signature;
 use move_command_line_common::files::MOVE_COMPILED_EXTENSION;
 use move_core_types::{
     abi::{ArgumentABI, ScriptABI, ScriptFunctionABI, TransactionScriptABI, TypeArgumentABI},
     identifier::IdentStr,
-    language_storage::TypeTag,
+    language_storage::{StructTag, TypeTag},
 };
 use move_model::{
     model::{FunctionEnv, GlobalEnv, ModuleEnv},
@@ -150,7 +151,10 @@ impl<'env> Abigen<'env> {
                                 _ => false,
                             })
                             .all(|param| {
-                                matches!(self.get_type_tag(&param.1), Err(_) | Ok(Some(_)))
+                                matches!(
+                                    Self::get_type_tag(&param.1, module_env),
+                                    Err(_) | Ok(Some(_))
+                                )
                             })
                         && func.get_return_count() == 0
                 })
@@ -188,10 +192,15 @@ impl<'env> Abigen<'env> {
                 ty::Type::Reference(false, inner) => {
                     !matches!(&**inner, ty::Type::Primitive(ty::PrimitiveType::Signer))
                 }
+                ty::Type::Struct(module_id, struct_id, _) => {
+                    let struct_module_env = module_env.env.get_module(*module_id);
+                    let abilities = struct_module_env.get_struct(*struct_id).get_abilities();
+                    abilities.has_ability(Ability::Copy) && !abilities.has_ability(Ability::Key)
+                }
                 _ => true,
             })
             .map(|param| {
-                let tag = self.get_type_tag(&param.1)?.unwrap();
+                let tag = Self::get_type_tag(&param.1, module_env)?.unwrap();
                 Ok(ArgumentABI::new(
                     symbol_pool.string(param.0).to_string(),
                     tag,
@@ -247,7 +256,10 @@ impl<'env> Abigen<'env> {
         }
     }
 
-    fn get_type_tag(&self, ty0: &ty::Type) -> anyhow::Result<Option<TypeTag>> {
+    fn get_type_tag(
+        ty0: &ty::Type,
+        module_env: &ModuleEnv<'env>,
+    ) -> anyhow::Result<Option<TypeTag>> {
         use ty::Type::*;
         let tag = match ty0 {
             Primitive(prim) => {
@@ -255,8 +267,11 @@ impl<'env> Abigen<'env> {
                 match prim {
                     Bool => TypeTag::Bool,
                     U8 => TypeTag::U8,
+                    U16 => TypeTag::U16,
+                    U32 => TypeTag::U32,
                     U64 => TypeTag::U64,
                     U128 => TypeTag::U128,
+                    U256 => TypeTag::U256,
                     Address => TypeTag::Address,
                     Signer => TypeTag::Signer,
                     Num | Range | EventStore => {
@@ -265,14 +280,38 @@ impl<'env> Abigen<'env> {
                 }
             }
             Vector(ty) => {
-                let tag = match self.get_type_tag(ty)? {
+                let tag = match Self::get_type_tag(ty, module_env)? {
                     Some(tag) => tag,
                     None => return Ok(None),
                 };
                 TypeTag::Vector(Box::new(tag))
             }
+            Struct(module_id, struct_id, vec_type) => {
+                let expect_msg = format!("type {:?} is not allowed in scription function", ty0);
+                let struct_module_env = module_env.env.get_module(*module_id);
+                let abilities = struct_module_env.get_struct(*struct_id).get_abilities();
+                if abilities.has_ability(Ability::Copy) && !abilities.has_ability(Ability::Key) {
+                    TypeTag::Struct(Box::new(StructTag {
+                        address: *struct_module_env.self_address(),
+                        module: struct_module_env.get_identifier(),
+                        name: struct_module_env
+                            .get_struct(*struct_id)
+                            .get_identifier()
+                            .unwrap_or_else(|| panic!("{}", expect_msg)),
+                        type_params: vec_type
+                            .iter()
+                            .map(|e| {
+                                Self::get_type_tag(e, module_env)
+                                    .unwrap_or_else(|_| panic!("{}", expect_msg))
+                            })
+                            .map(|e| e.unwrap_or_else(|| panic!("{}", expect_msg)))
+                            .collect(),
+                    }))
+                } else {
+                    return Ok(None);
+                }
+            }
             Tuple(_)
-            | Struct(_, _, _)
             | TypeParameter(_)
             | Fun(_, _)
             | TypeDomain(_)
diff --git a/language/move-prover/move-abigen/src/lib.rs b/language/move-prover/move-abigen/src/lib.rs
index 758d2500fa..5abe5ae7d2 100644
--- a/language/move-prover/move-abigen/src/lib.rs
+++ b/language/move-prover/move-abigen/src/lib.rs
@@ -4,6 +4,8 @@
 
 #![forbid(unsafe_code)]
 
+extern crate core;
+
 mod abigen;
 
 pub use crate::abigen::*;
diff --git a/language/move-prover/move-abigen/tests/sources/script_fun_in_module.move b/language/move-prover/move-abigen/tests/sources/script_fun_in_module.move
index 27e6f34995..1d4548fbd9 100644
--- a/language/move-prover/move-abigen/tests/sources/script_fun_in_module.move
+++ b/language/move-prover/move-abigen/tests/sources/script_fun_in_module.move
@@ -1,5 +1,7 @@
 address 0x1 {
 module ScriptFunInModule {
+    use std::string::String;
+
     struct NoCall has drop {}
 
     /// This is a doc comment on this script fun
@@ -26,6 +28,8 @@ module ScriptFunInModule {
     /// This is a comment on a non-callable script function
     public entry fun this_is_script_fun_with_signer(account: signer, _another_arg: u64) { }
 
+    /// This is a comment on a non-callable script function
+    public entry fun this_is_script_fun_with_string_args(account: &signer, _val: String) { }
     public fun foo() { }
 
     fun bar() { }
diff --git a/language/move-prover/move-abigen/tests/sources/script_fun_in_module/this_is_script_fun_with_string_args.abi b/language/move-prover/move-abigen/tests/sources/script_fun_in_module/this_is_script_fun_with_string_args.abi
new file mode 100644
index 0000000000..43d35aca5e
Binary files /dev/null and b/language/move-prover/move-abigen/tests/sources/script_fun_in_module/this_is_script_fun_with_string_args.abi differ
diff --git a/language/move-prover/move-abigen/tests/testsuite.rs b/language/move-prover/move-abigen/tests/testsuite.rs
index a795bf5747..0faa75fec5 100644
--- a/language/move-prover/move-abigen/tests/testsuite.rs
+++ b/language/move-prover/move-abigen/tests/testsuite.rs
@@ -27,6 +27,10 @@ fn test_runner(path: &Path) -> datatest_stable::Result<()> {
     let mut options = Options::create_from_args(&args)?;
     options.setup_logging_for_test();
     options.abigen.compiled_script_directory = "tests/sources".to_string();
+    options.move_deps.push("../../move-stdlib".to_string());
+    options
+        .move_named_address_values
+        .push("std=0x1".to_string());
 
     test_abigen(path, options, "abi")?;
 
@@ -70,7 +74,7 @@ fn test_abigen(path: &Path, mut options: Options, suffix: &str) -> anyhow::Resul
         }
         Err(err) => {
             let mut contents = format!("Move prover abigen returns: {}\n", err);
-            contents += &String::from_utf8_lossy(&error_writer.into_inner()).to_string();
+            contents += &String::from_utf8_lossy(&error_writer.into_inner());
             let baseline_path = path.with_extension(suffix);
             verify_or_update_baseline(&baseline_path, &contents)?;
         }
diff --git a/language/move-prover/move-docgen/Cargo.toml b/language/move-prover/move-docgen/Cargo.toml
index 91a71f4ca2..ac51fa3b11 100644
--- a/language/move-prover/move-docgen/Cargo.toml
+++ b/language/move-prover/move-docgen/Cargo.toml
@@ -3,7 +3,7 @@ name = "move-docgen"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
@@ -17,7 +17,7 @@ codespan-reporting = "0.11.1"
 itertools = "0.10.0"
 log = "0.4.14"
 num = "0.4.0"
-regex = "1.4.3"
+regex = "1.5.5"
 anyhow = "1.0.52"
 serde = { version = "1.0.124", features = ["derive"] }
 once_cell = "1.7.2"
diff --git a/language/move-prover/move-docgen/src/docgen.rs b/language/move-prover/move-docgen/src/docgen.rs
index e6ebd477f3..8a3629e476 100644
--- a/language/move-prover/move-docgen/src/docgen.rs
+++ b/language/move-prover/move-docgen/src/docgen.rs
@@ -26,6 +26,7 @@ use serde::{Deserialize, Serialize};
 use std::{
     cell::RefCell,
     collections::{BTreeMap, BTreeSet, VecDeque},
+    fmt::Write as FmtWrite,
     fs::{self, File},
     io::{Read, Write},
     path::{Path, PathBuf},
@@ -773,7 +774,7 @@ impl<'env> Docgen<'env> {
 
         let mut child = match Command::new("dot")
             .arg("-Tsvg")
-            .args(&["-o", out_file_path.to_str().unwrap()])
+            .args(["-o", out_file_path.to_str().unwrap()])
             .stdin(Stdio::piped())
             .stderr(Stdio::piped())
             .stdout(Stdio::piped())
@@ -881,6 +882,11 @@ impl<'env> Docgen<'env> {
         self.begin_items();
         for (id, _) in sorted_infos {
             let module_env = self.env.get_module(*id);
+            if !module_env.is_target() {
+                // Do not include modules which are not target (outside of the package)
+                // into the index.
+                continue;
+            }
             self.item_text(&format!(
                 "[`{}`]({})",
                 module_env.get_name().display_full(module_env.symbol_pool()),
@@ -1071,9 +1077,15 @@ impl<'env> Docgen<'env> {
                 return_types.iter().map(|ty| ty.display(tctx)).join(", ")
             ),
         };
+        let entry_str = if func_env.is_entry() && !func_env.module_env.is_script_module() {
+            "entry ".to_owned()
+        } else {
+            "".to_owned()
+        };
         format!(
-            "{}fun {}{}({}){}",
+            "{}{}fun {}{}({}){}",
             func_env.visibility_str(),
+            entry_str,
             name,
             self.type_parameter_list_display(&func_env.get_named_type_parameters()),
             params,
@@ -1467,7 +1479,13 @@ impl<'env> Docgen<'env> {
                                             "Missing backtick found in {} while generating documentation for the following text: \"{}\"",
                                             self.current_module.as_ref().unwrap().get_name().display_full(self.env.symbol_pool()), text,
                                         );
-                    decorated_text += &format!("<code>{}</code>", self.decorate_code(&code));
+
+                    write!(
+                        &mut decorated_text,
+                        "<code>{}</code>",
+                        self.decorate_code(&code)
+                    )
+                    .unwrap()
                 }
             } else {
                 decorated_text.push(chr);
@@ -1533,7 +1551,7 @@ impl<'env> Docgen<'env> {
                 }
             };
             if replacement.is_empty() {
-                r += &code[at..at + cap.get(0).unwrap().end()].replace("<", "&lt;");
+                r += &code[at..at + cap.get(0).unwrap().end()].replace('<', "&lt;");
             } else {
                 r += &code[at..at + cap.get(0).unwrap().start()];
                 r += &replacement;
@@ -1541,7 +1559,7 @@ impl<'env> Docgen<'env> {
                     // Append the call or generic open we may have also matched to distinguish
                     // a simple name from a function call or generic instantiation. Need to
                     // replace the `<` as well.
-                    r += &m.as_str().replace("<", "&lt;");
+                    r += &m.as_str().replace('<', "&lt;");
                 }
             }
             at += cap.get(0).unwrap().end();
diff --git a/language/move-prover/move-docgen/tests/sources/different_visbilities.spec_inline.md b/language/move-prover/move-docgen/tests/sources/different_visbilities.spec_inline.md
index 385fadf14f..a23dbcbcca 100644
--- a/language/move-prover/move-docgen/tests/sources/different_visbilities.spec_inline.md
+++ b/language/move-prover/move-docgen/tests/sources/different_visbilities.spec_inline.md
@@ -44,7 +44,7 @@ This is a public function
 This is a public entry function
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_public_script_fun">this_is_a_public_script_fun</a>()
+<pre><code><b>public</b> entry <b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_public_script_fun">this_is_a_public_script_fun</a>()
 </code></pre>
 
 
diff --git a/language/move-prover/move-docgen/tests/sources/different_visbilities.spec_inline_no_fold.md b/language/move-prover/move-docgen/tests/sources/different_visbilities.spec_inline_no_fold.md
index c3299a95ea..02eb1509ab 100644
--- a/language/move-prover/move-docgen/tests/sources/different_visbilities.spec_inline_no_fold.md
+++ b/language/move-prover/move-docgen/tests/sources/different_visbilities.spec_inline_no_fold.md
@@ -41,7 +41,7 @@ This is a public function
 This is a public entry function
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_public_script_fun">this_is_a_public_script_fun</a>()
+<pre><code><b>public</b> entry <b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_public_script_fun">this_is_a_public_script_fun</a>()
 </code></pre>
 
 
diff --git a/language/move-prover/move-docgen/tests/sources/different_visbilities.spec_separate.md b/language/move-prover/move-docgen/tests/sources/different_visbilities.spec_separate.md
index 385fadf14f..a23dbcbcca 100644
--- a/language/move-prover/move-docgen/tests/sources/different_visbilities.spec_separate.md
+++ b/language/move-prover/move-docgen/tests/sources/different_visbilities.spec_separate.md
@@ -44,7 +44,7 @@ This is a public function
 This is a public entry function
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_public_script_fun">this_is_a_public_script_fun</a>()
+<pre><code><b>public</b> entry <b>fun</b> <a href="different_visbilities.md#0x2_TestViz_this_is_a_public_script_fun">this_is_a_public_script_fun</a>()
 </code></pre>
 
 
diff --git a/language/move-prover/move-docgen/tests/sources/root_template.spec_inline.md b/language/move-prover/move-docgen/tests/sources/root_template.spec_inline.md
index 946ee08dd2..9da618f47b 100644
--- a/language/move-prover/move-docgen/tests/sources/root_template.spec_inline.md
+++ b/language/move-prover/move-docgen/tests/sources/root_template.spec_inline.md
@@ -147,7 +147,7 @@ This script does also abort.
 This is a script
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script1">script1</a>()
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script1">script1</a>()
 </code></pre>
 
 
@@ -170,7 +170,7 @@ This is a script
 This is another script
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script2">script2</a>()
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script2">script2</a>()
 </code></pre>
 
 
@@ -207,7 +207,7 @@ This is another module full of script funs too:
 This is a script
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script3">script3</a>()
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script3">script3</a>()
 </code></pre>
 
 
@@ -230,7 +230,7 @@ This is a script
 This is another script
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script4">script4</a>()
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script4">script4</a>()
 </code></pre>
 
 
diff --git a/language/move-prover/move-docgen/tests/sources/root_template.spec_inline_no_fold.md b/language/move-prover/move-docgen/tests/sources/root_template.spec_inline_no_fold.md
index 3f5cacbab5..e7a8d12af3 100644
--- a/language/move-prover/move-docgen/tests/sources/root_template.spec_inline_no_fold.md
+++ b/language/move-prover/move-docgen/tests/sources/root_template.spec_inline_no_fold.md
@@ -135,7 +135,7 @@ This script does also abort.
 This is a script
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script1">script1</a>()
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script1">script1</a>()
 </code></pre>
 
 
@@ -155,7 +155,7 @@ This is a script
 This is another script
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script2">script2</a>()
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script2">script2</a>()
 </code></pre>
 
 
@@ -189,7 +189,7 @@ This is another module full of script funs too:
 This is a script
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script3">script3</a>()
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script3">script3</a>()
 </code></pre>
 
 
@@ -209,7 +209,7 @@ This is a script
 This is another script
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script4">script4</a>()
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script4">script4</a>()
 </code></pre>
 
 
diff --git a/language/move-prover/move-docgen/tests/sources/root_template.spec_separate.md b/language/move-prover/move-docgen/tests/sources/root_template.spec_separate.md
index 226dbc9f07..c4aa58a96e 100644
--- a/language/move-prover/move-docgen/tests/sources/root_template.spec_separate.md
+++ b/language/move-prover/move-docgen/tests/sources/root_template.spec_separate.md
@@ -167,7 +167,7 @@ This script does also abort.
 This is a script
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script1">script1</a>()
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script1">script1</a>()
 </code></pre>
 
 
@@ -190,7 +190,7 @@ This is a script
 This is another script
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script2">script2</a>()
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_OneTypeOfScript_script2">script2</a>()
 </code></pre>
 
 
@@ -227,7 +227,7 @@ This is another module full of script funs too:
 This is a script
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script3">script3</a>()
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script3">script3</a>()
 </code></pre>
 
 
@@ -250,7 +250,7 @@ This is a script
 This is another script
 
 
-<pre><code><b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script4">script4</a>()
+<pre><code>entry <b>fun</b> <a href="root.md#0x1_AnotherTypeOfScript_script4">script4</a>()
 </code></pre>
 
 
diff --git a/language/move-prover/move-docgen/tests/testsuite.rs b/language/move-prover/move-docgen/tests/testsuite.rs
index 41d4b01e37..285fd7fbd1 100644
--- a/language/move-prover/move-docgen/tests/testsuite.rs
+++ b/language/move-prover/move-docgen/tests/testsuite.rs
@@ -96,7 +96,7 @@ fn test_docgen(path: &Path, mut options: Options, suffix: &str) -> anyhow::Resul
         }
         Err(err) => format!("Move prover docgen returns: {}\n", err),
     };
-    output += &String::from_utf8_lossy(&error_writer.into_inner()).to_string();
+    output += &String::from_utf8_lossy(&error_writer.into_inner());
     let baseline_path = path.with_extension(suffix);
     verify_or_update_baseline(baseline_path.as_path(), &output)?;
     Ok(())
diff --git a/language/move-prover/move-errmapgen/Cargo.toml b/language/move-prover/move-errmapgen/Cargo.toml
index 05754cf803..a6650ebc79 100644
--- a/language/move-prover/move-errmapgen/Cargo.toml
+++ b/language/move-prover/move-errmapgen/Cargo.toml
@@ -3,15 +3,16 @@ name = "move-errmapgen"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-# diem dependencies
+# Move dependencies
 move-command-line-common = { path = "../../move-command-line-common" }
 move-model = { path = "../../move-model" }
 move-core-types = { path = "../../move-core/types" }
-bcs = "0.1.2"
+
+bcs.workspace = true
 
 # external dependencies
 log = "0.4.14"
diff --git a/language/move-prover/mutation/Cargo.toml b/language/move-prover/mutation/Cargo.toml
index 77d4c4e5f1..9119f17d88 100644
--- a/language/move-prover/mutation/Cargo.toml
+++ b/language/move-prover/mutation/Cargo.toml
@@ -3,7 +3,7 @@ name = "prover-mutation"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
diff --git a/language/move-prover/src/cli.rs b/language/move-prover/src/cli.rs
index 9afbc0d385..d75f68cd3a 100644
--- a/language/move-prover/src/cli.rs
+++ b/language/move-prover/src/cli.rs
@@ -181,14 +181,14 @@ impl Options {
                     .short('v')
                     .long("verbose")
                     .takes_value(true)
-                    .possible_values(&["error", "warn", "info", "debug"])
+                    .possible_values(["error", "warn", "info", "debug"])
                     .help("verbosity level"),
             )
             .arg(
                 Arg::new("vector-theory")
                     .long("vector-theory")
                     .takes_value(true)
-                    .possible_values(&["BoogieArray", "BoogieArrayIntern",
+                    .possible_values(["BoogieArray", "BoogieArrayIntern",
                                               "SmtArray", "SmtArrayExt", "SmtSeq"])
                     .help("vector theory to use"),
             )
@@ -203,7 +203,7 @@ impl Options {
                     .long("severity")
                     .short('s')
                     .takes_value(true)
-                    .possible_values(&["bug", "error", "warn", "note"])
+                    .possible_values(["bug", "error", "warn", "note"])
                     .help("The minimall level on which diagnostics are reported")
             )
             .arg(
@@ -326,7 +326,7 @@ impl Options {
                 Arg::new("verify")
                     .long("verify")
                     .takes_value(true)
-                    .possible_values(&["public", "all", "none"])
+                    .possible_values(["public", "all", "none"])
                     .value_name("SCOPE")
                     .help("default scope of verification \
                     (can be overridden by `pragma verify=true|false`)"),
@@ -530,6 +530,11 @@ impl Options {
                     .help("For each script function which is verification target, \
                     print out the names of all called functions, directly or indirectly.")
             )
+            .arg(
+                Arg::new("ban-int-2-bv")
+                    .long("ban-int-2-bv")
+                    .long("whether allow converting int to bit vector when generating the boogie file")
+            )
             .after_help("More options available via `--config file` or `--config-str str`. \
             Use `--print-config` to see format and current values. \
             See `move-prover/src/cli.rs::Option` for documentation.");
@@ -775,6 +780,10 @@ impl Options {
             options.script_reach = true;
         }
 
+        if matches.is_present("ban-int-2-bv") {
+            options.prover.ban_int_2_bv = true;
+        }
+
         options.backend.derive_options();
 
         if matches.is_present("print-config") {
diff --git a/language/move-prover/src/lib.rs b/language/move-prover/src/lib.rs
index f958162ac1..f0237fbdc4 100644
--- a/language/move-prover/src/lib.rs
+++ b/language/move-prover/src/lib.rs
@@ -6,10 +6,7 @@
 
 use crate::cli::Options;
 use anyhow::anyhow;
-use codespan_reporting::{
-    diagnostic::Severity,
-    term::termcolor::{Buffer, ColorChoice, StandardStream, WriteColor},
-};
+use codespan_reporting::term::termcolor::{Buffer, ColorChoice, StandardStream, WriteColor};
 #[allow(unused_imports)]
 use log::{debug, info, warn};
 use move_abigen::Abigen;
@@ -26,6 +23,7 @@ use move_prover_boogie_backend::{
 use move_stackless_bytecode::{
     escape_analysis::EscapeAnalysisProcessor,
     function_target_pipeline::{FunctionTargetPipeline, FunctionTargetsHolder},
+    number_operation::GlobalNumberOperationState,
     pipeline_factory,
     read_write_set_analysis::{self, ReadWriteSetProcessor},
 };
@@ -69,6 +67,21 @@ pub fn run_move_prover<W: WriteColor>(
     run_move_prover_with_model(&env, error_writer, options, Some(now))
 }
 
+/// Create the initial number operation state for each function and struct
+pub fn create_init_num_operation_state(env: &GlobalEnv) {
+    let mut global_state: GlobalNumberOperationState = Default::default();
+    for module_env in env.get_modules() {
+        for struct_env in module_env.get_structs() {
+            global_state.create_initial_struct_oper_state(&struct_env);
+        }
+        for fun_env in module_env.get_functions() {
+            global_state.create_initial_func_oper_state(&fun_env);
+        }
+    }
+    //global_state.create_initial_exp_oper_state(env);
+    env.set_extension(global_state);
+}
+
 pub fn run_move_prover_with_model<W: WriteColor>(
     env: &GlobalEnv,
     error_writer: &mut W,
@@ -90,6 +103,9 @@ pub fn run_move_prover_with_model<W: WriteColor>(
     // from there.
     env.set_extension(options.prover.clone());
 
+    // Populate initial number operation state for each function and struct based on the pragma
+    create_init_num_operation_state(env);
+
     // Until this point, prover and docgen have same code. Here we part ways.
     if options.run_docgen {
         return run_docgen(env, &options, error_writer, now);
@@ -407,19 +423,9 @@ fn run_escape(env: &GlobalEnv, options: &Options, now: Instant) {
     pipeline.run(env, &mut targets);
     let end = now.elapsed();
 
-    // print escaped internal refs flagged by analysis. do not report errors in dependencies
+    // print all escaped internal refs flagged by analysis
     let mut error_writer = Buffer::no_color();
-    env.report_diag_with_filter(&mut error_writer, |d| {
-        let fname = env.get_file(d.labels[0].file_id).to_str().unwrap();
-        options.move_sources.iter().any(|d| {
-            let p = Path::new(d);
-            if p.is_file() {
-                d == fname
-            } else {
-                Path::new(fname).parent().unwrap() == p
-            }
-        }) && d.severity >= Severity::Error
-    });
+    env.report_diag(&mut error_writer, options.prover.report_severity);
     println!("{}", String::from_utf8_lossy(&error_writer.into_inner()));
     info!("in ms, analysis took {:.3}", (end - start).as_millis())
 }
diff --git a/language/move-prover/test-utils/Cargo.toml b/language/move-prover/test-utils/Cargo.toml
index fc5ff22f1f..35f072e97d 100644
--- a/language/move-prover/test-utils/Cargo.toml
+++ b/language/move-prover/test-utils/Cargo.toml
@@ -2,12 +2,12 @@
 name = "move-prover-test-utils"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 license = "Apache-2.0"
 
 [dependencies]
 prettydiff = "0.4.0"
 anyhow = "1.0.52"
-regex = "1.4.3"
+regex = "1.5.5"
 move-command-line-common = { path = "../../move-command-line-common" }
diff --git a/language/move-prover/tests/README.md b/language/move-prover/tests/README.md
index f10e9bb641..b3b4acbea5 100644
--- a/language/move-prover/tests/README.md
+++ b/language/move-prover/tests/README.md
@@ -88,26 +88,8 @@ MVP_TEST_FLAGS="-T=20" cargo test -p move-prover
 
 If the flag `--check-inconsistency` is given, the prover not only verifies a target, but also checks if there is any
 inconsistent assumption in the verification. If the environment variable `MVP_TEST_INCONSISTENCY=1` is set, `cargo test`
-will perform the inconsistency check while running the tests in `../../../diem-move/diem-framework`
-and `../../move-stdlib` (i.e., the prover will run those tests with the flag `--check-inconsistency`).
+will perform the inconsistency check while running the tests in `sources` (i.e., the prover will run those tests with the flag `--check-inconsistency`).
 
 ```shell script
 MVP_TEST_INCONSISTENCY=1 cargo test -p move-prover
 ```
-
-## Code coverage
-
-Analyzing the test coverage of the diem repo is regularly done in CI, and the result updates the online report at
-
-* https://ci-artifacts.diem.com/coverage/unit-coverage/latest/index.html
-* https://codecov.io/gh/diem/diem (reports significantly less coverage due to panic unwinding being considered a branch)
-
-Note that this report is based on the the coverage test when the environment variable `BOOGIE_EXE`
-is not set. So, the coverage result may not be as accurate as expected because all verifications with Boogie/Z3 are
-skipped during the test.
-
-To run the coverage test locally, one can use `cargo xtest html-cov-dir="/some/dir"`. Keep in mind what is compiled and
-run when targeting a single crate is not the same as is run/built with multiple crates due to cargo's feature
-unification.
-
-For any questions regarding code coverage, please use the Cadiem slack channel "#code_coverage".
diff --git a/language/move-prover/tests/sources/functional/aborts_if.exp b/language/move-prover/tests/sources/functional/aborts_if.exp
index 25a1a2bf86..093ba27969 100644
--- a/language/move-prover/tests/sources/functional/aborts_if.exp
+++ b/language/move-prover/tests/sources/functional/aborts_if.exp
@@ -63,7 +63,6 @@ error: function does not abort under this condition
     =     at tests/sources/functional/aborts_if.move:145: abort_at_2_or_3_spec_incorrect
     =         x = <redacted>
     =     at tests/sources/functional/aborts_if.move:146: abort_at_2_or_3_spec_incorrect
-    =         <redacted> = <redacted>
     =     at tests/sources/functional/aborts_if.move:147: abort_at_2_or_3_spec_incorrect
     =     at tests/sources/functional/aborts_if.move:151: abort_at_2_or_3_spec_incorrect (spec)
 
@@ -82,8 +81,6 @@ error: abort not covered by any of the `aborts_if` clauses
     =     at tests/sources/functional/aborts_if.move:154: abort_at_2_or_3_strict_incorrect
     =         x = <redacted>
     =     at tests/sources/functional/aborts_if.move:155: abort_at_2_or_3_strict_incorrect
-    =         <redacted> = <redacted>
-    =     at tests/sources/functional/aborts_if.move:155: abort_at_2_or_3_strict_incorrect
     =         ABORTED
 
 error: abort not covered by any of the `aborts_if` clauses
@@ -102,8 +99,6 @@ error: abort not covered by any of the `aborts_if` clauses
     =     at tests/sources/functional/aborts_if.move:136: abort_at_2_or_3_total_incorrect
     =         x = <redacted>
     =     at tests/sources/functional/aborts_if.move:137: abort_at_2_or_3_total_incorrect
-    =         <redacted> = <redacted>
-    =     at tests/sources/functional/aborts_if.move:137: abort_at_2_or_3_total_incorrect
     =         ABORTED
 
 error: function does not abort under this condition
diff --git a/language/move-prover/tests/sources/functional/aborts_if_with_code.exp b/language/move-prover/tests/sources/functional/aborts_if_with_code.exp
index 4086da54df..a0a440d95b 100644
--- a/language/move-prover/tests/sources/functional/aborts_if_with_code.exp
+++ b/language/move-prover/tests/sources/functional/aborts_if_with_code.exp
@@ -14,6 +14,7 @@ error: abort code not covered by any of the `aborts_if` or `aborts_with` clauses
    =     at tests/sources/functional/aborts_if_with_code.move:69: aborts_if_with_code_mixed_invalid
    =         x = <redacted>
    =     at tests/sources/functional/aborts_if_with_code.move:70: aborts_if_with_code_mixed_invalid
+   =     at tests/sources/functional/aborts_if_with_code.move:73: aborts_if_with_code_mixed_invalid
    =     at tests/sources/functional/aborts_if_with_code.move:74: aborts_if_with_code_mixed_invalid
    =         ABORTED
 
@@ -31,6 +32,7 @@ error: abort code not covered by any of the `aborts_if` or `aborts_with` clauses
     =     at tests/sources/functional/aborts_if_with_code.move:97: aborts_with_invalid
     =         x = <redacted>
     =     at tests/sources/functional/aborts_if_with_code.move:98: aborts_with_invalid
+    =     at tests/sources/functional/aborts_if_with_code.move:101: aborts_with_invalid
     =     at tests/sources/functional/aborts_if_with_code.move:102: aborts_with_invalid
     =         ABORTED
 
@@ -50,6 +52,7 @@ error: abort code not covered by any of the `aborts_if` or `aborts_with` clauses
     =     at tests/sources/functional/aborts_if_with_code.move:123: aborts_with_mixed_invalid
     =         x = <redacted>
     =     at tests/sources/functional/aborts_if_with_code.move:124: aborts_with_mixed_invalid
+    =     at tests/sources/functional/aborts_if_with_code.move:127: aborts_with_mixed_invalid
     =     at tests/sources/functional/aborts_if_with_code.move:128: aborts_with_mixed_invalid
     =         ABORTED
 
diff --git a/language/move-prover/tests/sources/functional/arithm.exp b/language/move-prover/tests/sources/functional/arithm.exp
index 299d202b1e..9b13379e1b 100644
--- a/language/move-prover/tests/sources/functional/arithm.exp
+++ b/language/move-prover/tests/sources/functional/arithm.exp
@@ -17,37 +17,37 @@ error: abort not covered by any of the `aborts_if` clauses
     =         ABORTED
 
 error: abort not covered by any of the `aborts_if` clauses
-    ┌─ tests/sources/functional/arithm.move:180:5
+    ┌─ tests/sources/functional/arithm.move:212:5
     │
-178 │           x + y
+210 │           x + y
     │             - abort happened here with execution failure
-179 │       }
-180 │ ╭     spec overflow_u128_add_incorrect {
-181 │ │         aborts_if false;
-182 │ │     }
+211 │       }
+212 │ ╭     spec overflow_u128_add_incorrect {
+213 │ │         aborts_if false;
+214 │ │     }
     │ ╰─────^
     │
-    =     at tests/sources/functional/arithm.move:177: overflow_u128_add_incorrect
+    =     at tests/sources/functional/arithm.move:209: overflow_u128_add_incorrect
     =         x = <redacted>
     =         y = <redacted>
-    =     at tests/sources/functional/arithm.move:178: overflow_u128_add_incorrect
+    =     at tests/sources/functional/arithm.move:210: overflow_u128_add_incorrect
     =         ABORTED
 
 error: abort not covered by any of the `aborts_if` clauses
-    ┌─ tests/sources/functional/arithm.move:232:5
+    ┌─ tests/sources/functional/arithm.move:312:5
     │
-230 │           x * y
+310 │           x * y
     │             - abort happened here with execution failure
-231 │       }
-232 │ ╭     spec overflow_u128_mul_incorrect {
-233 │ │         aborts_if false;
-234 │ │     }
+311 │       }
+312 │ ╭     spec overflow_u128_mul_incorrect {
+313 │ │         aborts_if false;
+314 │ │     }
     │ ╰─────^
     │
-    =     at tests/sources/functional/arithm.move:229: overflow_u128_mul_incorrect
+    =     at tests/sources/functional/arithm.move:309: overflow_u128_mul_incorrect
     =         x = <redacted>
     =         y = <redacted>
-    =     at tests/sources/functional/arithm.move:230: overflow_u128_mul_incorrect
+    =     at tests/sources/functional/arithm.move:310: overflow_u128_mul_incorrect
     =         ABORTED
 
 error: abort not covered by any of the `aborts_if` clauses
@@ -56,32 +56,134 @@ error: abort not covered by any of the `aborts_if` clauses
 162 │           x + y
     │             - abort happened here with execution failure
 163 │       }
-164 │ ╭     spec overflow_u64_add_incorrect {
+164 │ ╭     spec overflow_u16_add_incorrect {
 165 │ │         aborts_if false;
 166 │ │     }
     │ ╰─────^
     │
-    =     at tests/sources/functional/arithm.move:161: overflow_u64_add_incorrect
+    =     at tests/sources/functional/arithm.move:161: overflow_u16_add_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/arithm.move:162: overflow_u16_add_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/arithm.move:265:5
+    │
+263 │           x * y
+    │             - abort happened here with execution failure
+264 │       }
+265 │ ╭     spec overflow_u16_mul_incorrect {
+266 │ │         aborts_if false;
+267 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/arithm.move:262: overflow_u16_mul_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/arithm.move:263: overflow_u16_mul_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/arithm.move:228:5
+    │
+226 │           x + y
+    │             - abort happened here with execution failure
+227 │       }
+228 │ ╭     spec overflow_u256_add_incorrect {
+229 │ │         aborts_if false;
+230 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/arithm.move:225: overflow_u256_add_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/arithm.move:226: overflow_u256_add_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/arithm.move:327:5
+    │
+325 │           x * y
+    │             - abort happened here with execution failure
+326 │       }
+327 │ ╭     spec overflow_u256_mul_incorrect {
+328 │ │         aborts_if false;
+329 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/arithm.move:324: overflow_u256_mul_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/arithm.move:325: overflow_u256_mul_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/arithm.move:180:5
+    │
+178 │           x + y
+    │             - abort happened here with execution failure
+179 │       }
+180 │ ╭     spec overflow_u32_add_incorrect {
+181 │ │         aborts_if false;
+182 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/arithm.move:177: overflow_u32_add_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/arithm.move:178: overflow_u32_add_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/arithm.move:281:5
+    │
+279 │           x * y
+    │             - abort happened here with execution failure
+280 │       }
+281 │ ╭     spec overflow_u32_mul_incorrect {
+282 │ │         aborts_if false;
+283 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/arithm.move:278: overflow_u32_mul_incorrect
+    =         x = <redacted>
+    =         y = <redacted>
+    =     at tests/sources/functional/arithm.move:279: overflow_u32_mul_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/arithm.move:196:5
+    │
+194 │           x + y
+    │             - abort happened here with execution failure
+195 │       }
+196 │ ╭     spec overflow_u64_add_incorrect {
+197 │ │         aborts_if false;
+198 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/arithm.move:193: overflow_u64_add_incorrect
     =         x = <redacted>
     =         y = <redacted>
-    =     at tests/sources/functional/arithm.move:162: overflow_u64_add_incorrect
+    =     at tests/sources/functional/arithm.move:194: overflow_u64_add_incorrect
     =         ABORTED
 
 error: abort not covered by any of the `aborts_if` clauses
-    ┌─ tests/sources/functional/arithm.move:217:5
+    ┌─ tests/sources/functional/arithm.move:297:5
     │
-215 │           x * y
+295 │           x * y
     │             - abort happened here with execution failure
-216 │       }
-217 │ ╭     spec overflow_u64_mul_incorrect {
-218 │ │         aborts_if false;
-219 │ │     }
+296 │       }
+297 │ ╭     spec overflow_u64_mul_incorrect {
+298 │ │         aborts_if false;
+299 │ │     }
     │ ╰─────^
     │
-    =     at tests/sources/functional/arithm.move:214: overflow_u64_mul_incorrect
+    =     at tests/sources/functional/arithm.move:294: overflow_u64_mul_incorrect
     =         x = <redacted>
     =         y = <redacted>
-    =     at tests/sources/functional/arithm.move:215: overflow_u64_mul_incorrect
+    =     at tests/sources/functional/arithm.move:295: overflow_u64_mul_incorrect
     =         ABORTED
 
 error: abort not covered by any of the `aborts_if` clauses
@@ -102,18 +204,18 @@ error: abort not covered by any of the `aborts_if` clauses
     =         ABORTED
 
 error: abort not covered by any of the `aborts_if` clauses
-    ┌─ tests/sources/functional/arithm.move:201:5
+    ┌─ tests/sources/functional/arithm.move:249:5
     │
-199 │           x * y
+247 │           x * y
     │             - abort happened here with execution failure
-200 │       }
-201 │ ╭     spec overflow_u8_mul_incorrect {
-202 │ │         aborts_if false;
-203 │ │     }
+248 │       }
+249 │ ╭     spec overflow_u8_mul_incorrect {
+250 │ │         aborts_if false;
+251 │ │     }
     │ ╰─────^
     │
-    =     at tests/sources/functional/arithm.move:198: overflow_u8_mul_incorrect
+    =     at tests/sources/functional/arithm.move:246: overflow_u8_mul_incorrect
     =         x = <redacted>
     =         y = <redacted>
-    =     at tests/sources/functional/arithm.move:199: overflow_u8_mul_incorrect
+    =     at tests/sources/functional/arithm.move:247: overflow_u8_mul_incorrect
     =         ABORTED
diff --git a/language/move-prover/tests/sources/functional/arithm.move b/language/move-prover/tests/sources/functional/arithm.move
index eef1865fd6..f146fd4119 100644
--- a/language/move-prover/tests/sources/functional/arithm.move
+++ b/language/move-prover/tests/sources/functional/arithm.move
@@ -157,6 +157,38 @@ module 0x42::TestArithmetic {
         aborts_if x + y > max_u8();
     }
 
+    // fails.
+    fun overflow_u16_add_incorrect(x: u16, y: u16): u16 {
+        x + y
+    }
+    spec overflow_u16_add_incorrect {
+        aborts_if false;
+    }
+
+    // succeeds.
+    fun overflow_u16_add(x: u16, y: u16): u16 {
+        x + y
+    }
+    spec overflow_u16_add {
+        aborts_if x + y > max_u16();
+    }
+
+    // fails.
+    fun overflow_u32_add_incorrect(x: u32, y: u32): u32 {
+        x + y
+    }
+    spec overflow_u32_add_incorrect {
+        aborts_if false;
+    }
+
+    // succeeds.
+    fun overflow_u32_add(x: u32, y: u32): u32 {
+        x + y
+    }
+    spec overflow_u32_add {
+        aborts_if x + y > max_u32();
+    }
+
     // fails.
     fun overflow_u64_add_incorrect(x: u64, y: u64): u64 {
         x + y
@@ -189,6 +221,22 @@ module 0x42::TestArithmetic {
         aborts_if x + y > max_u128();
     }
 
+    // fails.
+    fun overflow_u256_add_incorrect(x: u256, y: u256): u256 {
+        x + y
+    }
+    spec overflow_u256_add_incorrect {
+        aborts_if false;
+    }
+
+    // succeeds.
+    fun overflow_u256_add(x: u256, y: u256): u256 {
+        x + y
+    }
+    spec overflow_u256_add {
+        aborts_if x + y > max_u256();
+    }
+
 
     // --------------------------
     // Overflow by multiplication
@@ -210,6 +258,38 @@ module 0x42::TestArithmetic {
         aborts_if x * y > max_u8();
     }
 
+    // fails.
+    fun overflow_u16_mul_incorrect(x: u16, y: u16): u16 {
+        x * y
+    }
+    spec overflow_u16_mul_incorrect {
+        aborts_if false;
+    }
+
+    // succeeds.
+    fun overflow_u16_mul(x: u16, y: u16): u16 {
+        x * y
+    }
+    spec overflow_u16_mul {
+        aborts_if x * y > max_u16();
+    }
+
+    // fails.
+    fun overflow_u32_mul_incorrect(x: u32, y: u32): u32 {
+        x * y
+    }
+    spec overflow_u32_mul_incorrect {
+        aborts_if false;
+    }
+
+    // succeeds.
+    fun overflow_u32_mul(x: u32, y: u32): u32 {
+        x * y
+    }
+    spec overflow_u32_mul {
+        aborts_if x * y > max_u32();
+    }
+
     // fails.
     fun overflow_u64_mul_incorrect(x: u64, y: u64): u64 {
         x * y
@@ -240,4 +320,19 @@ module 0x42::TestArithmetic {
         aborts_if x * y > max_u128(); // U128_MAX
     }
 
+    // fails.
+    fun overflow_u256_mul_incorrect(x: u256, y: u256): u256 {
+        x * y
+    }
+    spec overflow_u256_mul_incorrect {
+        aborts_if false;
+    }
+
+    fun overflow_u256_mul(x: u256, y: u256): u256 {
+        x * y
+    }
+    spec overflow_u256_mul {
+        aborts_if x * y > max_u256(); // U256_MAX
+    }
+
 }
diff --git a/language/move-prover/tests/sources/functional/axiom_generic.move b/language/move-prover/tests/sources/functional/axiom_generic.move
new file mode 100644
index 0000000000..0ca83ffae5
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/axiom_generic.move
@@ -0,0 +1,13 @@
+module 0x1::Test {
+    struct S<phantom K, phantom V> {
+    }
+
+    public fun f<K, V>(): S<K, V> {
+        S {
+        }
+    }
+
+    spec module {
+        axiom<T> forall v1: T: true;
+    }
+}
diff --git a/language/move-prover/tests/sources/functional/axioms.move b/language/move-prover/tests/sources/functional/axioms.move
index af56ddd718..21c5173400 100644
--- a/language/move-prover/tests/sources/functional/axioms.move
+++ b/language/move-prover/tests/sources/functional/axioms.move
@@ -4,6 +4,9 @@ module 0x42::TestAxioms {
         pragma verify = true;
     }
 
+    // ----------------------------------------------------
+    // Non-generic axiom
+
     spec module {
         fun spec_incr(x: num): num;
         axiom forall x: num: spec_incr(x) == x + 1;
@@ -16,12 +19,12 @@ module 0x42::TestAxioms {
         ensures result == TRACE(spec_incr(x));
     }
 
-    // TODO: reactivate this test when generic axiom instantiation is done
-    /*
-    // Axiom over generic function, using type quantification which is expected to be eliminated.
+    // ----------------------------------------------------
+    // Generic axiom
+
     spec module {
         fun spec_id<T>(x: T): T;
-        axiom forall t: type, x: t: spec_id(x) == x;
+        axiom<T> forall x: T: spec_id(x) == x;
     }
 
     fun id_T<T>(x: T): T {
@@ -37,5 +40,14 @@ module 0x42::TestAxioms {
     spec id_u64 {
         ensures result == spec_id(x);
     }
-    */
+
+    // ----------------------------------------------------
+    // Generic axiom calling spec function
+
+    spec module {
+        use std::bcs::serialize;
+        fun deserialize<T>(bytes: vector<u8>): T;
+        // We need the trigger annotation below, otherwise timeout
+        axiom<T> forall v: T {serialize(v)}: deserialize<T>(serialize(v)) == v;
+    }
 }
diff --git a/language/move-prover/tests/sources/functional/bitset.move b/language/move-prover/tests/sources/functional/bitset.move
new file mode 100644
index 0000000000..2d2c198bf2
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/bitset.move
@@ -0,0 +1,91 @@
+module 0x42::bitset128 {
+    struct BitSet128 has drop {
+        s: u128
+    }
+
+    spec BitSet128 {
+        pragma bv=b"0";
+    }
+
+    public fun empty(): BitSet128 {
+        BitSet128 {
+            s: 0
+        }
+    }
+
+    public fun insert(s: &mut BitSet128, i: u64) {
+        assert!(i < 128, 0);
+        s.s = s.s | (1 << (i as u8));
+    }
+
+
+    public fun remove(s: &mut BitSet128, i: u64) {
+        assert!(i < 128, 0);
+        s.s = s.s & (0xffff ^ (1 << (i as u8)));
+    }
+
+    public fun contains(s: &BitSet128, i: u64): bool {
+        assert!(i < 128, 0);
+        (s.s & (1 << (i as u8))) > 0
+    }
+
+    public fun union(s1: &BitSet128, s2: &BitSet128): BitSet128 {
+        BitSet128 {
+            s: s1.s | s2.s
+        }
+    }
+
+    public fun intersect(s1: &BitSet128, s2: &BitSet128): BitSet128 {
+        BitSet128 {
+            s: s1.s & s2.s
+        }
+    }
+
+
+    public fun complement(s: &BitSet128): BitSet128 {
+        BitSet128 {
+            s: (0xffffffffffffffffffffffffffffffff ^ s.s)
+        }
+    }
+
+    public fun difference(s1: &BitSet128, s2: &BitSet128): BitSet128 {
+        BitSet128 {
+            s: s1.s & complement(s2).s
+        }
+    }
+
+    #[verify_only]
+    fun ident(s: &BitSet128) {
+        let s2 = intersect(s, s);
+        let s3 = union(s, s);
+        //let s4 = complement(&complement(s));
+
+        spec {
+            assert s == s2;
+            assert s == s3;
+            //assert s == s4; // timeout
+        };
+    }
+
+    /*
+    // timeout
+    #[verify_only]
+    fun de_morgan_1(s1: &BitSet128, s2: &BitSet128) {
+        let s3 = complement(&intersect(s1, s2));
+        let s4 = union(&complement(s1), &complement(s2));
+        spec {
+            assert s3 == s4;
+        };
+    }
+    */
+
+    #[verify_only]
+    fun de_morgan_2(s1: &BitSet128, s2: &BitSet128) {
+        let s3 = complement(&union(s1, s2));
+        let s4 = intersect(&complement(s1), &complement(s2));
+        spec {
+            assert s3 == s4;
+        };
+    }
+
+}
diff --git a/language/move-prover/tests/sources/functional/bitwise_features.move b/language/move-prover/tests/sources/functional/bitwise_features.move
new file mode 100644
index 0000000000..f3f2d22741
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/bitwise_features.move
@@ -0,0 +1,181 @@
+// exclude_for: cvc5
+address 0x123 {
+
+module TestFeatures {
+    use std::vector;
+    use std::error;
+    use std::signer;
+
+    /// The enabled features, represented by a bitset stored on chain.
+    struct Features has key {
+        features: vector<u8>,
+    }
+
+    spec Features {
+        pragma bv=b"0";
+    }
+
+    /// Helper to check whether a feature flag is enabled.
+    fun contains(features: &vector<u8>, feature: u64): bool {
+        let byte_index = feature / 8;
+        let bit_mask = 1 << ((feature % 8) as u8);
+        byte_index < vector::length(features) && ((*vector::borrow(features, byte_index))) & bit_mask != 0
+    }
+
+    spec contains {
+        pragma bv=b"0";
+        pragma opaque;
+        aborts_if false;
+        ensures result == ((feature / 8) < len(features) && spec_contains(features, feature));
+    }
+
+    fun is_enabled(feature: u64): bool acquires Features {
+        exists<Features>(@std) &&
+            contains(&borrow_global<Features>(@std).features, feature)
+    }
+
+    spec is_enabled {
+        aborts_if false;
+        pragma timeout = 120;
+        ensures result == (
+            exists<Features>(@std) // this one does not verify
+                && (((feature / 8) < len(global<Features>(@std).features)
+                && spec_contains(global<Features>(@std).features, feature)))
+        );
+    }
+
+    fun set(features: &mut vector<u8>, feature: u64, include: bool) {
+        let old_n = vector::length(features); // ghost var
+        let old_features = *features; // ghost var
+        let n = old_n; // ghost var
+
+        let byte_index = feature / 8;
+        let bit_mask = 1 << ((feature % 8) as u8);
+        while({
+            spec {
+                invariant n == len(features);
+                invariant n >= old_n;
+                invariant byte_index < old_n ==> len(features) == old_n;
+                invariant byte_index >= old_n ==> len(features) <= byte_index + 1;
+                invariant forall i in 0..old_n: features[i] == old_features[i];
+                invariant forall i in old_n..n: (features[i] as u8) == (0 as u8);
+            };
+            vector::length(features) <= byte_index
+        }) {
+            vector::push_back(features, 0);
+            n = n + 1;
+        };
+        let entry = vector::borrow_mut(features, byte_index);
+        if (include)
+            *entry = *entry | bit_mask
+        else
+            *entry = *entry & (0xff ^ bit_mask)
+    }
+
+    spec set {
+        pragma bv=b"0";
+        pragma timeout = 120;
+        aborts_if false;
+        ensures feature / 8 < len(features);
+        ensures include == spec_contains(features, feature);
+    }
+
+    const EFRAMEWORK_SIGNER_NEEDED: u64 = 1;
+
+    /// Function to enable and disable features. Can only be called by a signer of @std.
+    public fun change_feature_flags(framework: &signer, enable: vector<u64>, disable: vector<u64>)
+    acquires Features {
+        assert!(signer::address_of(framework) == @std, error::permission_denied(EFRAMEWORK_SIGNER_NEEDED));
+        if (!exists<Features>(@std)) {
+            move_to<Features>(framework, Features{features: vector[]})
+        };
+        let features = &mut borrow_global_mut<Features>(@std).features;
+        let i = 0;
+        let n = vector::length(&enable);
+        while (i < n) {
+            set(features, *vector::borrow(&enable, i), true);
+            spec {
+                assert spec_contains(features, enable[i]);
+            };
+            i = i + 1
+        };
+        let i = 0;
+        let n = vector::length(&disable);
+        while (i < n) {
+            set(features, *vector::borrow(&disable, i), false);
+            spec {
+                assert spec_compute_feature_flag(features, disable[i]) == (0 as u8);
+            };
+            i = i + 1
+        };
+    }
+
+    spec fun spec_compute_feature_flag(features: vector<u8>, feature: u64): u8 {
+        ((int2bv((((1 as u8) << ((feature % (8 as u64)) as u64)) as u8)) as u8)
+            & features[feature/8] as u8)
+    }
+
+    spec fun spec_contains(features: vector<u8>, feature: u64): bool {
+        spec_compute_feature_flag(features, feature) > (0 as u8)
+    }
+
+    spec change_feature_flags {
+        aborts_if signer::address_of(framework) != @std;
+    }
+
+    public fun disable_feature_flags(disable: vector<u64>) acquires Features {
+        let features = &mut borrow_global_mut<Features>(@std).features;
+        let i = 0;
+        let n = vector::length(&disable);
+        while ({
+            spec {
+                invariant i <= n;
+                invariant forall j in 0..i: disable[j] / 8 < len(features) && !spec_contains(features, disable[j]);
+            };
+            i < n
+        }) {
+            set(features, *vector::borrow(&disable, i), false);
+            spec {
+                assert (disable[i] / 8 < len(features) && !spec_contains(features, disable[i]));
+            };
+            i = i + 1;
+        };
+    }
+
+    spec disable_feature_flags {
+        pragma opaque;
+        pragma timeout = 120;
+        modifies global<Features>(@std);
+        let post features = global<Features>(@std).features;
+        ensures forall i in 0..len(disable): (disable[i] / 8 < len(features) && !spec_contains(features, disable[i]));
+    }
+
+    public fun enable_feature_flags(enable: vector<u64>) acquires Features {
+        let features = &mut borrow_global_mut<Features>(@std).features;
+        let i = 0;
+        let n = vector::length(&enable);
+        while ({
+            spec {
+                invariant i <= n;
+                invariant forall j in 0..i: enable[j] / 8 < len(features) && spec_contains(features, enable[j]);
+            };
+            i < n
+        }) {
+            set(features, *vector::borrow(&enable, i), true);
+            spec {
+                assert (enable[i] / 8 < len(features) && spec_contains(features, enable[i]));
+            };
+            i = i + 1;
+        };
+    }
+
+    spec enable_feature_flags {
+        pragma opaque;
+        pragma timeout = 120;
+        modifies global<Features>(@std);
+        let post features = global<Features>(@std).features;
+        ensures forall i in 0..len(enable): (enable[i] / 8 < len(features) && spec_contains(features, enable[i]));
+    }
+
+}
+}
diff --git a/language/move-prover/tests/sources/functional/bitwise_operators.move b/language/move-prover/tests/sources/functional/bitwise_operators.move
new file mode 100644
index 0000000000..ffb4c96aab
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/bitwise_operators.move
@@ -0,0 +1,82 @@
+// exclude_for: cvc5
+address 0x123 {
+
+  module M {
+
+    public fun foo(): u64 {
+      let a = A {
+        f1: 1
+      };
+      let b = B {
+        a: a
+      };
+      let c = C {
+        a: 1,
+        b: b.a.f1
+      };
+      (a.f1 & 0) | (b.a.f1 & 1) | (c.b ^ 2)
+    }
+
+    spec foo {
+      pragma bv_ret=b"0";
+      ensures result == (((((1 as u64) & (0 as u64)) as u64) | (((1 as u64) & (1 as u64)) as u64) as u64) | (((1 as u64) ^ (2 as u64)) as u64) as u64);
+    }
+
+    struct A<T> has copy, drop {
+      f1: T
+    }
+    spec A{
+      pragma bv=b"0";
+    }
+
+    struct B<T> has drop {
+      a: A<T>
+    }
+
+    struct C has drop {
+      a: u64,
+      b: u64
+    }
+    spec C {
+      pragma bv=b"1";
+    }
+
+    public fun foo_generic<T>(i: T): T {
+      i
+    }
+
+    spec foo_generic {
+      pragma bv=b"0"; // This is necessary because the calling function may not infer the number operation
+      pragma bv_ret=b"0"; // This is necessary because the calling function may not infer the number operation
+    }
+
+    public fun test(i: u8): u8 {
+      let x1 = foo_generic(i);
+      x1 ^ x1
+    }
+
+    spec test {
+      ensures result == (0 as u8);
+    }
+
+    public fun bv_and(n: u64, e: u64): u64 {
+      if (e == 0) {
+        1
+      } else {
+        n & bv_and(n, e - 1)
+      }
+    }
+    spec bv_and {
+      pragma opaque;
+      pragma bv=b"0,1";
+      pragma bv_ret=b"0";
+      ensures result == spec_bv_and(n, e);
+    }
+
+    spec fun spec_bv_and(n: u64, e: u64): u64 {
+      if (e == (0 as u64)) { int2bv((1 as u64)) } else { n & spec_bv_and(n, e - int2bv((1 as u64))) }
+    }
+
+  }
+
+}
diff --git a/language/move-prover/tests/sources/functional/bitwise_table.move b/language/move-prover/tests/sources/functional/bitwise_table.move
new file mode 100644
index 0000000000..4388c2516c
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/bitwise_table.move
@@ -0,0 +1,130 @@
+module 0x42::VerifyBitwiseTable {
+    use extensions::table::{Self, Table};
+    use extensions::table::{spec_get, spec_len, spec_contains};
+
+    fun add(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        table::add(&mut t, 3, 4);
+        t
+    }
+    spec add {
+        pragma bv_ret=b"0";
+        ensures spec_contains(result, 1) && spec_contains(result, 2) && spec_contains(result, 3);
+        ensures spec_len(result) == 3;
+        ensures spec_get(result, 1) == (2 as u64);
+        ensures spec_get(result, 2) == (3 as u64);
+        ensures spec_get(result, 3) == (4 as u64);
+    }
+
+    fun add_fail_exists(k1: u8, k2: u8): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, k1, 2);
+        table::add(&mut t, k2, 3);
+        t
+    }
+    spec add_fail_exists {
+        pragma bv_ret=b"0";
+        aborts_if k1 == k2;
+    }
+
+    fun remove(): Table<u8, u64> {
+        let t = add();
+        table::remove(&mut t, 2);
+        t
+    }
+    spec remove {
+        pragma bv_ret=b"0";
+        ensures spec_contains(result, 1) && spec_contains(result, 3);
+        ensures spec_len(result) == 2;
+        ensures spec_get(result, 1) == (2 as u64);
+        ensures spec_get(result, 3) == (4 as u64);
+    }
+
+    fun contains_and_length(): (bool, bool, u64, Table<u8, u64>) {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        (table::contains(&t, 1), table::contains(&t, 3), table::length(&t), t)
+    }
+    spec contains_and_length {
+        pragma bv_ret=b"3";
+        ensures result_1 == true;
+        ensures result_2 == false;
+        ensures result_3 == 2;
+    }
+
+    fun borrow(): (u64, Table<u8, u64>) {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        let r = table::borrow(&t, 1);
+        (*r, t)
+    }
+    spec borrow {
+        pragma bv_ret=b"1";
+        ensures result_1 == (2 as u64);
+        ensures spec_len(result_2) == 1;
+        ensures spec_get(result_2, 1) == (2 as u64);
+    }
+
+    fun borrow_mut(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        let r = table::borrow_mut(&mut t, 1);
+        *r = 4;
+        t
+    }
+    spec borrow_mut {
+        pragma bv_ret=b"1";
+        ensures spec_contains(result, 1) && spec_contains(result, 2);
+        ensures spec_len(result) == 2;
+        ensures spec_get(result, 1) == (4 as u64);
+        ensures spec_get(result, 2) == (3 as u64);
+    }
+
+
+    // ====================================================================================================
+    // Tables with structured keys
+
+
+    struct Key has copy, drop {
+        v: vector<u8>       // Use a vector so we do not have extensional equality
+    }
+
+    struct R {
+        t: Table<Key, u64>
+    }
+
+
+    spec R {
+        pragma bv=b"0";
+    }
+
+
+    fun make_R(): R {
+        let t = table::new<Key, u64>();
+        // let t = table::new<u8, u64>();
+        table::add(&mut t, Key{v: vector[1, 2]}, 22);
+        table::add(&mut t, Key{v: vector[2, 3]}, 23);
+        let x = table::borrow_mut(&mut t, Key{v: vector[1, 2]});
+        *x = *x & 1;
+        let r = R{t};
+        r
+    }
+
+
+    fun add_R(): R {
+        make_R()
+    }
+    spec add_R {
+        let k1 = Key{v: concat(vec(1u8), vec(2u8))};
+        let k2 = Key{v: concat(vec(2u8), vec(3u8))};
+        ensures spec_len(result.t) == 2;
+        ensures spec_contains(result.t, k1) && spec_contains(result.t, k2);
+        ensures spec_get(result.t, k1) == (0 as u64);
+        ensures spec_get(result.t, k2) == (23 as u64);
+    }
+
+}
diff --git a/language/move-prover/tests/sources/functional/cast.exp b/language/move-prover/tests/sources/functional/cast.exp
index 6c7456287a..d043243adc 100644
--- a/language/move-prover/tests/sources/functional/cast.exp
+++ b/language/move-prover/tests/sources/functional/cast.exp
@@ -1,32 +1,64 @@
 Move prover returns: exiting with verification errors
 error: abort not covered by any of the `aborts_if` clauses
-   ┌─ tests/sources/functional/cast.move:47:5
+   ┌─ tests/sources/functional/cast.move:67:5
    │
-45 │           (x as u64)
+65 │           (x as u16)
    │           ---------- abort happened here with execution failure
-46 │       }
-47 │ ╭     spec aborting_u64_cast_incorrect {
-48 │ │         aborts_if false;
-49 │ │     }
+66 │       }
+67 │ ╭     spec aborting_u16_cast_incorrect {
+68 │ │         aborts_if false;
+69 │ │     }
    │ ╰─────^
    │
-   =     at tests/sources/functional/cast.move:44: aborting_u64_cast_incorrect
+   =     at tests/sources/functional/cast.move:64: aborting_u16_cast_incorrect
    =         x = <redacted>
-   =     at tests/sources/functional/cast.move:45: aborting_u64_cast_incorrect
+   =     at tests/sources/functional/cast.move:65: aborting_u16_cast_incorrect
    =         ABORTED
 
 error: abort not covered by any of the `aborts_if` clauses
-   ┌─ tests/sources/functional/cast.move:33:5
+   ┌─ tests/sources/functional/cast.move:81:5
    │
-31 │           (x as u8)
+79 │           (x as u32)
+   │           ---------- abort happened here with execution failure
+80 │       }
+81 │ ╭     spec aborting_u32_cast_incorrect {
+82 │ │         aborts_if false;
+83 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/cast.move:78: aborting_u32_cast_incorrect
+   =         x = <redacted>
+   =     at tests/sources/functional/cast.move:79: aborting_u32_cast_incorrect
+   =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+    ┌─ tests/sources/functional/cast.move:109:5
+    │
+ 93 │           (x as u64)
+    │           ---------- abort happened here with execution failure
+    ·
+109 │ ╭     spec aborting_u64_cast_incorrect {
+110 │ │         aborts_if false;
+111 │ │     }
+    │ ╰─────^
+    │
+    =     at tests/sources/functional/cast.move:92: aborting_u64_cast_incorrect
+    =         x = <redacted>
+    =     at tests/sources/functional/cast.move:93: aborting_u64_cast_incorrect
+    =         ABORTED
+
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/cast.move:53:5
+   │
+51 │           (x as u8)
    │           --------- abort happened here with execution failure
-32 │       }
-33 │ ╭     spec aborting_u8_cast_incorrect {
-34 │ │         aborts_if false;
-35 │ │     }
+52 │       }
+53 │ ╭     spec aborting_u8_cast_incorrect {
+54 │ │         aborts_if false;
+55 │ │     }
    │ ╰─────^
    │
-   =     at tests/sources/functional/cast.move:30: aborting_u8_cast_incorrect
+   =     at tests/sources/functional/cast.move:50: aborting_u8_cast_incorrect
    =         x = <redacted>
-   =     at tests/sources/functional/cast.move:31: aborting_u8_cast_incorrect
+   =     at tests/sources/functional/cast.move:51: aborting_u8_cast_incorrect
    =         ABORTED
diff --git a/language/move-prover/tests/sources/functional/cast.move b/language/move-prover/tests/sources/functional/cast.move
index 2f10d00417..076e4ab542 100644
--- a/language/move-prover/tests/sources/functional/cast.move
+++ b/language/move-prover/tests/sources/functional/cast.move
@@ -15,6 +15,20 @@ module 0x42::TestCast {
         aborts_if false;
     }
 
+    fun u16_cast_incorrect(x: u16): u64 {
+        (x as u64)
+    }
+    spec u16_cast_incorrect {
+        aborts_if false;
+    }
+
+    fun u32_cast_incorrect(x: u32): u64 {
+        (x as u64)
+    }
+    spec u8_cast_incorrect {
+        aborts_if false;
+    }
+
     fun u64_cast(x: u64): u128 {
         (x as u128)
     }
@@ -22,6 +36,12 @@ module 0x42::TestCast {
         aborts_if false;
     }
 
+    fun u128_cast(x: u128): u256 {
+        (x as u256)
+    }
+    spec aborting_u128_cast {
+        aborts_if false;
+    }
 
     // -------------
     // Type demotion
@@ -41,6 +61,34 @@ module 0x42::TestCast {
         aborts_if x > 255;
     }
 
+    fun aborting_u16_cast_incorrect(x: u64): u16 {
+        (x as u16)
+    }
+    spec aborting_u16_cast_incorrect {
+        aborts_if false;
+    }
+
+    fun aborting_u16_cast(x: u64): u16 {
+        (x as u16)
+    }
+    spec aborting_u16_cast {
+        aborts_if x > 65535;
+    }
+
+    fun aborting_u32_cast_incorrect(x: u64): u32 {
+        (x as u32)
+    }
+    spec aborting_u32_cast_incorrect {
+        aborts_if false;
+    }
+
+    fun aborting_u32_cast(x: u64): u32 {
+        (x as u32)
+    }
+    spec aborting_u16_cast {
+        aborts_if x > 4294967295;
+    }
+
     fun aborting_u64_cast_incorrect(x: u128): u64 {
         (x as u64)
     }
@@ -54,4 +102,19 @@ module 0x42::TestCast {
     spec aborting_u64_cast {
         aborts_if x > 18446744073709551615;
     }
+
+    fun aborting_u128_cast_incorrect(x: u256): u128 {
+        (x as u128)
+    }
+    spec aborting_u64_cast_incorrect {
+        aborts_if false;
+    }
+
+    fun aborting_u128_cast(x: u256): u128 {
+        (x as u128)
+    }
+    spec aborting_u128_cast {
+        aborts_if x > 340282366920938463463374607431768211455;
+    }
+
 }
diff --git a/language/move-prover/tests/sources/functional/choice.cvc5_exp b/language/move-prover/tests/sources/functional/choice.cvc5_exp
index 4df12401db..31e7d2c92d 100644
--- a/language/move-prover/tests/sources/functional/choice.cvc5_exp
+++ b/language/move-prover/tests/sources/functional/choice.cvc5_exp
@@ -51,7 +51,6 @@ error: post-condition does not hold
    =     at tests/sources/functional/choice.move:16: simple_incorrect
    =         b = <redacted>
    =     at tests/sources/functional/choice.move:17: simple_incorrect
-   =         <redacted> = <redacted>
    =         result = <redacted>
    =     at tests/sources/functional/choice.move:18: simple_incorrect
    =     at tests/sources/functional/choice.move:22: simple_incorrect (spec)
diff --git a/language/move-prover/tests/sources/functional/choice.exp b/language/move-prover/tests/sources/functional/choice.exp
index 9427b07747..95e6461727 100644
--- a/language/move-prover/tests/sources/functional/choice.exp
+++ b/language/move-prover/tests/sources/functional/choice.exp
@@ -1,46 +1,45 @@
 Move prover returns: exiting with verification errors
 error: post-condition does not hold
-    ┌─ tests/sources/functional/choice.move:301:9
+    ┌─ tests/sources/functional/choice.move:302:9
     │
-301 │ ╭         ensures !(get_ballot<Proposal>(signer::address_of(ballot_account), result).expiration_timestamp_secs
-302 │ │             <= 0);
+302 │ ╭         ensures !(get_ballot<Proposal>(signer::address_of(ballot_account), result).expiration_timestamp_secs
+303 │ │             <= 0);
     │ ╰──────────────────^
     │
-    =     at tests/sources/functional/choice.move:279: create_ballot
+    =     at tests/sources/functional/choice.move:280: create_ballot
     =         ballot_account = <redacted>
+    =     at tests/sources/functional/choice.move:284: create_ballot
     =     at tests/sources/functional/choice.move:283: create_ballot
-    =     at tests/sources/functional/choice.move:282: create_ballot
-    =     at tests/sources/functional/choice.move:290
-    =     at tests/sources/functional/choice.move:285: create_ballot
-    =     at tests/sources/functional/choice.move:271: new_ballot_id
-    =         counter = <redacted>
-    =     at tests/sources/functional/choice.move:274: new_ballot_id
-    =         result = <redacted>
-    =     at tests/sources/functional/choice.move:277: new_ballot_id
-    =         ballot_id = <redacted>
+    =     at tests/sources/functional/choice.move:291
     =     at tests/sources/functional/choice.move:286: create_ballot
+    =     at tests/sources/functional/choice.move:272: new_ballot_id
+    =         counter = <redacted>
+    =     at tests/sources/functional/choice.move:275: new_ballot_id
     =         result = <redacted>
+    =     at tests/sources/functional/choice.move:278: new_ballot_id
     =     at tests/sources/functional/choice.move:287: create_ballot
-    =     at tests/sources/functional/choice.move:301: create_ballot (spec)
+    =         result = <redacted>
+    =     at tests/sources/functional/choice.move:288: create_ballot
+    =     at tests/sources/functional/choice.move:302: create_ballot (spec)
 
 error: post-condition does not hold
-   ┌─ tests/sources/functional/choice.move:55:9
+   ┌─ tests/sources/functional/choice.move:56:9
    │
-55 │         ensures choice == signer::address_of(s2);
+56 │         ensures choice == signer::address_of(s2);
    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    │
-   =     at tests/sources/functional/choice.move:45: populate_R
-   =     at tests/sources/functional/choice.move:50: populate_R (spec)
+   =     at tests/sources/functional/choice.move:46: populate_R
    =     at tests/sources/functional/choice.move:51: populate_R (spec)
+   =     at tests/sources/functional/choice.move:52: populate_R (spec)
+   =     at tests/sources/functional/choice.move:55: populate_R (spec)
    =     at tests/sources/functional/choice.move:54: populate_R (spec)
-   =     at tests/sources/functional/choice.move:53: populate_R (spec)
-   =     at tests/sources/functional/choice.move:45: populate_R
+   =     at tests/sources/functional/choice.move:46: populate_R
    =         s1 = <redacted>
    =         s2 = <redacted>
-   =     at tests/sources/functional/choice.move:46: populate_R
    =     at tests/sources/functional/choice.move:47: populate_R
    =     at tests/sources/functional/choice.move:48: populate_R
-   =     at tests/sources/functional/choice.move:55: populate_R (spec)
+   =     at tests/sources/functional/choice.move:49: populate_R
+   =     at tests/sources/functional/choice.move:56: populate_R (spec)
 
 error: post-condition does not hold
    ┌─ tests/sources/functional/choice.move:22:9
@@ -51,90 +50,89 @@ error: post-condition does not hold
    =     at tests/sources/functional/choice.move:16: simple_incorrect
    =         b = <redacted>
    =     at tests/sources/functional/choice.move:17: simple_incorrect
-   =         <redacted> = <redacted>
    =         result = <redacted>
    =     at tests/sources/functional/choice.move:18: simple_incorrect
    =     at tests/sources/functional/choice.move:22: simple_incorrect (spec)
    =         `TRACE(choose x: u64 where x >= 4 && x <= 5)` = <redacted>
 
 error: post-condition does not hold
-   ┌─ tests/sources/functional/choice.move:99:9
-   │
-99 │         ensures result == TRACE(choose y: u64 where y > x);
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   │
-   =     at tests/sources/functional/choice.move:94: test_choice_dup_expected_fail
-   =         x = <redacted>
-   =     at tests/sources/functional/choice.move:95: test_choice_dup_expected_fail
-   =         result = <redacted>
-   =     at tests/sources/functional/choice.move:96: test_choice_dup_expected_fail
-   =     at tests/sources/functional/choice.move:99: test_choice_dup_expected_fail (spec)
-   =         `TRACE(choose y: u64 where y > x)` = <redacted>
+    ┌─ tests/sources/functional/choice.move:100:9
+    │
+100 │         ensures result == TRACE(choose y: u64 where y > x);
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/choice.move:95: test_choice_dup_expected_fail
+    =         x = <redacted>
+    =     at tests/sources/functional/choice.move:96: test_choice_dup_expected_fail
+    =         result = <redacted>
+    =     at tests/sources/functional/choice.move:97: test_choice_dup_expected_fail
+    =     at tests/sources/functional/choice.move:100: test_choice_dup_expected_fail (spec)
+    =         `TRACE(choose y: u64 where y > x)` = <redacted>
 
 error: post-condition does not hold
-    ┌─ tests/sources/functional/choice.move:157:9
+    ┌─ tests/sources/functional/choice.move:158:9
     │
-157 │         ensures evidence1 == evidence2;
+158 │         ensures evidence1 == evidence2;
     │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     │
-    =     at tests/sources/functional/choice.move:155: test_different_choice_via_let (spec)
     =     at tests/sources/functional/choice.move:156: test_different_choice_via_let (spec)
-    =     at tests/sources/functional/choice.move:153: test_different_choice_via_let
     =     at tests/sources/functional/choice.move:157: test_different_choice_via_let (spec)
+    =     at tests/sources/functional/choice.move:154: test_different_choice_via_let
+    =     at tests/sources/functional/choice.move:158: test_different_choice_via_let (spec)
 
 error: post-condition does not hold
-    ┌─ tests/sources/functional/choice.move:181:9
+    ┌─ tests/sources/functional/choice.move:182:9
     │
-181 │         ensures choose_some_positive_u64() == choose_another_positive_u64();
+182 │         ensures choose_some_positive_u64() == choose_another_positive_u64();
     │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     │
-    =     at tests/sources/functional/choice.move:179: test_different_choice_via_spec_fun
-    =     at tests/sources/functional/choice.move:181: test_different_choice_via_spec_fun (spec)
+    =     at tests/sources/functional/choice.move:180: test_different_choice_via_spec_fun
+    =     at tests/sources/functional/choice.move:182: test_different_choice_via_spec_fun (spec)
 
 error: post-condition does not hold
-   ┌─ tests/sources/functional/choice.move:86:9
+   ┌─ tests/sources/functional/choice.move:87:9
    │
-86 │         ensures TRACE(choose i in 0..len(result) where result[i] == 2) == 1;
+87 │         ensures TRACE(choose i in 0..len(result) where result[i] == 2) == 1;
    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    │
-   =     at tests/sources/functional/choice.move:75: test_not_using_min_incorrect
-   =         v = <redacted>
    =     at tests/sources/functional/choice.move:76: test_not_using_min_incorrect
-   =         v_ref = <redacted>
+   =         v = <redacted>
    =     at tests/sources/functional/choice.move:77: test_not_using_min_incorrect
+   =         v_ref = <redacted>
    =     at tests/sources/functional/choice.move:78: test_not_using_min_incorrect
    =     at tests/sources/functional/choice.move:79: test_not_using_min_incorrect
    =     at tests/sources/functional/choice.move:80: test_not_using_min_incorrect
    =     at tests/sources/functional/choice.move:81: test_not_using_min_incorrect
-   =         v = <redacted>
    =     at tests/sources/functional/choice.move:82: test_not_using_min_incorrect
-   =         result = <redacted>
+   =         v = <redacted>
    =     at tests/sources/functional/choice.move:83: test_not_using_min_incorrect
-   =     at tests/sources/functional/choice.move:86: test_not_using_min_incorrect (spec)
+   =         result = <redacted>
+   =     at tests/sources/functional/choice.move:84: test_not_using_min_incorrect
+   =     at tests/sources/functional/choice.move:87: test_not_using_min_incorrect (spec)
    =         `TRACE(choose i in 0..len(result) where result[i] == 2)` = <redacted>
 
 error: post-condition does not hold
-    ┌─ tests/sources/functional/choice.move:218:9
+    ┌─ tests/sources/functional/choice.move:219:9
     │
-218 │         ensures result != (choose i: u64 where i >= k);
+219 │         ensures result != (choose i: u64 where i >= k);
     │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     │
-    =     at tests/sources/functional/choice.move:235: test_same_choice_different_args_via_schema_2
-    =         result = <redacted>
     =     at tests/sources/functional/choice.move:236: test_same_choice_different_args_via_schema_2
-    =     at tests/sources/functional/choice.move:218
+    =         result = <redacted>
+    =     at tests/sources/functional/choice.move:237: test_same_choice_different_args_via_schema_2
+    =     at tests/sources/functional/choice.move:219
 
 error: post-condition does not hold
-    ┌─ tests/sources/functional/choice.move:209:9
+    ┌─ tests/sources/functional/choice.move:210:9
     │
-209 │         ensures evidence1 == evidence2;
+210 │         ensures evidence1 == evidence2;
     │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     │
-    =     at tests/sources/functional/choice.move:205: test_same_choice_different_args_via_spec_fun
-    =     at tests/sources/functional/choice.move:207: test_same_choice_different_args_via_spec_fun (spec)
+    =     at tests/sources/functional/choice.move:206: test_same_choice_different_args_via_spec_fun
     =     at tests/sources/functional/choice.move:208: test_same_choice_different_args_via_spec_fun (spec)
-    =     at tests/sources/functional/choice.move:205: test_same_choice_different_args_via_spec_fun
+    =     at tests/sources/functional/choice.move:209: test_same_choice_different_args_via_spec_fun (spec)
+    =     at tests/sources/functional/choice.move:206: test_same_choice_different_args_via_spec_fun
     =         x = <redacted>
     =         y = <redacted>
     =         result = <redacted>
-    =     at tests/sources/functional/choice.move:209: test_same_choice_different_args_via_spec_fun (spec)
+    =     at tests/sources/functional/choice.move:210: test_same_choice_different_args_via_spec_fun (spec)
diff --git a/language/move-prover/tests/sources/functional/choice.move b/language/move-prover/tests/sources/functional/choice.move
index 2f732e6186..b47faa814a 100644
--- a/language/move-prover/tests/sources/functional/choice.move
+++ b/language/move-prover/tests/sources/functional/choice.move
@@ -32,7 +32,8 @@ module 0x42::TestSome {
         x + 42
     }
     spec with_spec_fun_choice {
-        ensures result <= TRACE(spec_fun_choice(x + 42));
+        //ensures result <= TRACE(spec_fun_choice(x + 42)); // TODO(tengzhang): the prover will fail with TRACE
+        ensures result <= spec_fun_choice(x + 42);
     }
 
     // Testing choices using memory
diff --git a/language/move-prover/tests/sources/functional/conditional_write_back.move b/language/move-prover/tests/sources/functional/conditional_write_back.move
new file mode 100644
index 0000000000..77e6b7a8e8
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/conditional_write_back.move
@@ -0,0 +1,130 @@
+module 0x42::Test {
+    struct S {
+        x: u64,
+        y: u64,
+    }
+
+    struct T has key {
+        x: u64,
+    }
+
+    struct R has key {
+        x: u64,
+    }
+
+    public fun diff_field(cond: bool): S {
+        let s = S { x: 0, y: 0  };
+
+        let f = if (cond) {
+            &mut s.x
+        } else {
+            &mut s.y
+        };
+        *f = 1;
+
+        s
+    }
+    spec diff_field {
+        ensures cond ==> (result.x == 1 && result.y == 0);
+        ensures (!cond) ==> (result.x == 0 && result.y == 1);
+    }
+
+    public fun diff_address(cond: bool, a1: address, a2: address) acquires T {
+        let x = if (cond) {
+            let t1 = borrow_global_mut<T>(a1);
+            &mut t1.x
+        } else {
+            let t2 = borrow_global_mut<T>(a2);
+            &mut t2.x
+        };
+        *x = 0;
+    }
+    spec diff_address {
+        aborts_if cond && !exists<T>(a1);
+        aborts_if !cond && !exists<T>(a2);
+        ensures if (cond) global<T>(a1).x == 0 else global<T>(a2).x == 0;
+    }
+
+    public fun diff_location(cond: bool, a: address, l: &mut T) acquires T {
+        let x = if (cond) {
+            let t1 = borrow_global_mut<T>(a);
+            &mut t1.x
+        } else {
+            let t2 = l;
+            &mut t2.x
+        };
+        *x = 0;
+    }
+    spec diff_location {
+        aborts_if cond && !exists<T>(a);
+        ensures if (cond) global<T>(a).x == 0 else l.x == 0;
+    }
+
+    public fun diff_resource(cond: bool, a: address) acquires T, R {
+        let x = if (cond) {
+            let t1 = borrow_global_mut<T>(a);
+            &mut t1.x
+        } else {
+            let t2 = borrow_global_mut<R>(a);
+            &mut t2.x
+        };
+        *x = 0;
+    }
+    spec diff_resource {
+        aborts_if cond && !exists<T>(a);
+        aborts_if !cond && !exists<R>(a);
+        ensures if (cond) global<T>(a).x == 0 else global<R>(a).x == 0;
+    }
+
+    struct V<T: store> has key {
+        x: u64,
+        y: T,
+    }
+
+    public fun diff_resource_generic<A: store, B: store>(cond: bool, a: address) acquires V {
+        let x = if (cond) {
+            let t1 = borrow_global_mut<V<A>>(a);
+            &mut t1.x
+        } else {
+            let t2 = borrow_global_mut<V<B>>(a);
+            &mut t2.x
+        };
+        *x = 0;
+    }
+    spec diff_resource_generic {
+        aborts_if cond && !exists<V<A>>(a);
+        aborts_if !cond && !exists<V<B>>(a);
+        ensures if (cond) global<V<A>>(a).x == 0 else global<V<B>>(a).x == 0;
+    }
+
+    public fun diff_local_simple(cond: bool) {
+        let v1 = 0;
+        let v2 = 0;
+
+        let r = if (cond) { &mut v1  } else { &mut v2  };
+        *r = 1;
+
+        spec {
+            assert (cond)  ==> (v1 == 1 && v2 == 0);
+            assert (!cond) ==> (v1 == 0 && v2 == 1);
+        }
+    }
+
+    public fun diff_local_global_mix_simple(cond: bool) acquires T {
+        let t = T { x : 0  };
+        let r = if (cond) { borrow_global_mut<T>(@0x1) } else { &mut t  };
+        r.x = 1;
+
+        spec {
+            assert (cond)  ==> t.x == 0;
+            assert (!cond) ==> t.x == 1;
+        };
+
+        let T { x : _ } = t;
+    }
+    spec diff_local_global_mix_simple {
+        aborts_if cond && !exists<T>(@0x1);
+        ensures (cond)  ==> global<T>(@0x1).x == 1;
+        ensures (!cond) ==> global<T>(@0x1).x == old(global<T>(@0x1).x);
+    }
+}
diff --git a/language/move-prover/tests/sources/functional/consts.exp b/language/move-prover/tests/sources/functional/consts.exp
index 2058422246..360744c0a6 100644
--- a/language/move-prover/tests/sources/functional/consts.exp
+++ b/language/move-prover/tests/sources/functional/consts.exp
@@ -1,12 +1,48 @@
 Move prover returns: exiting with verification errors
+error: unknown assertion failed
+   ┌─ tests/sources/functional/consts.move:45:13
+   │
+45 │             assert BYTE_ARRAY[0] == 22;
+   │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/consts.move:45: array_1_incorrect
+
+error: unknown assertion failed
+   ┌─ tests/sources/functional/consts.move:51:13
+   │
+51 │             assert ADDRESS_ARRAY[0] == @0x222;
+   │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/consts.move:51: array_2_incorrect
+
+error: unknown assertion failed
+   ┌─ tests/sources/functional/consts.move:67:13
+   │
+67 │             assert v1[0] == @0x111 && v1[1] == @0x222 && v1[2] == @0x333;
+   │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/consts.move:65: array_in_fun_incorrect
+   =         v1 = <redacted>
+   =     at tests/sources/functional/consts.move:67: array_in_fun_incorrect
+
+error: unknown assertion failed
+   ┌─ tests/sources/functional/consts.move:74:13
+   │
+74 │             assert v1[0] == false && v1[1] == false && v1[2] == false;
+   │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/consts.move:72: array_in_fun_incorrect_bool
+   =         v1 = <redacted>
+   =     at tests/sources/functional/consts.move:74: array_in_fun_incorrect_bool
+
 error: post-condition does not hold
-   ┌─ tests/sources/functional/consts.move:29:9
+   ┌─ tests/sources/functional/consts.move:32:9
    │
-29 │         ensures !result.b;
+32 │         ensures !result.b;
    │         ^^^^^^^^^^^^^^^^^^
    │
-   =     at tests/sources/functional/consts.move:24: init_incorrect
+   =     at tests/sources/functional/consts.move:27: init_incorrect
    =         result = <redacted>
-   =     at tests/sources/functional/consts.move:25: init_incorrect
-   =     at tests/sources/functional/consts.move:28: init_incorrect (spec)
-   =     at tests/sources/functional/consts.move:29: init_incorrect (spec)
+   =     at tests/sources/functional/consts.move:28: init_incorrect
+   =     at tests/sources/functional/consts.move:31: init_incorrect (spec)
+   =     at tests/sources/functional/consts.move:32: init_incorrect (spec)
diff --git a/language/move-prover/tests/sources/functional/consts.move b/language/move-prover/tests/sources/functional/consts.move
index 60b0398108..696fcb382f 100644
--- a/language/move-prover/tests/sources/functional/consts.move
+++ b/language/move-prover/tests/sources/functional/consts.move
@@ -10,6 +10,9 @@ module 0x42::TestConst {
     const INIT_VAL_BOOL: bool = true;
     const ONE: u64 = 1;
     const ADDR: address = @0x2;
+    const BYTE_ARRAY: vector<u8> = vector<u8>[11, 22, 33];
+    const ADDRESS_ARRAY: vector<address> = vector<address>[@0x111, @0x222, @0x333];
+    const BOOL_ARRAY: vector<bool> = vector<bool>[true, false, true];
 
     public fun init(): T {
         T { x: 43, b: !INIT_VAL_BOOL, a: ADDR }
@@ -29,4 +32,46 @@ module 0x42::TestConst {
         ensures !result.b;
     }
 
+    public fun array_correct() {
+        spec {
+            assert BYTE_ARRAY[0] == 11 && BYTE_ARRAY[1] == 22 && BYTE_ARRAY[2] == 33;
+            assert ADDRESS_ARRAY[0] == @0x111 && ADDRESS_ARRAY[1] == @0x222 && ADDRESS_ARRAY[2] == @0x333;
+            assert BOOL_ARRAY[0] == true && BOOL_ARRAY[1] == false && BOOL_ARRAY[2] == true;
+        };
+    }
+
+    public fun array_1_incorrect() {
+        spec {
+            assert BYTE_ARRAY[0] == 22;
+        };
+    }
+
+    public fun array_2_incorrect() {
+        spec {
+            assert ADDRESS_ARRAY[0] == @0x222;
+        };
+    }
+
+    public fun array_in_fun() {
+        let v1 = vector<address> [@0x1, @0x2, @0x3];
+        let v2 = vector<bool> [false, true, false];
+        spec {
+            assert v2[0] == false && v2[1] == true && v2[2] == false;
+            assert v1[0] == @0x1 && v1[1] == @0x2 && v1[2] == @0x3;
+        };
+    }
+
+    public fun array_in_fun_incorrect() {
+        let v1 = vector<address> [@0x1, @0x2, @0x3];
+        spec {
+            assert v1[0] == @0x111 && v1[1] == @0x222 && v1[2] == @0x333;
+        };
+    }
+
+    public fun array_in_fun_incorrect_bool() {
+        let v1 = vector<bool> [false, true, false];
+        spec {
+            assert v1[0] == false && v1[1] == false && v1[2] == false;
+        };
+    }
 }
diff --git a/language/move-prover/tests/sources/functional/data_invariant_for_mut_ref_arg.exp b/language/move-prover/tests/sources/functional/data_invariant_for_mut_ref_arg.exp
new file mode 100644
index 0000000000..aec50869ea
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/data_invariant_for_mut_ref_arg.exp
@@ -0,0 +1,46 @@
+Move prover returns: exiting with verification errors
+error: data invariant does not hold
+  ┌─ tests/sources/functional/data_invariant_for_mut_ref_arg.move:8:9
+  │
+8 │         invariant len(v) == 0;
+  │         ^^^^^^^^^^^^^^^^^^^^^^
+  │
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:15: push_1
+  =         s = <redacted>
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:17: push_1
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:19: push_1
+  =         s = <redacted>
+  =         s = <redacted>
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:8
+
+error: data invariant does not hold
+  ┌─ tests/sources/functional/data_invariant_for_mut_ref_arg.move:8:9
+  │
+8 │         invariant len(v) == 0;
+  │         ^^^^^^^^^^^^^^^^^^^^^^
+  │
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:22: push_2
+  =         s = <redacted>
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:24: push_2
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:26: push_2
+  =         s = <redacted>
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:27: push_2
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:28: push_2
+  =         s = <redacted>
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:8
+
+error: data invariant does not hold
+  ┌─ tests/sources/functional/data_invariant_for_mut_ref_arg.move:8:9
+  │
+8 │         invariant len(v) == 0;
+  │         ^^^^^^^^^^^^^^^^^^^^^^
+  │
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:31: push_3
+  =         s = <redacted>
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:33: push_3
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:35: push_3
+  =         s = <redacted>
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:36: push_3
+  =         result = <redacted>
+  =         s = <redacted>
+  =     at tests/sources/functional/data_invariant_for_mut_ref_arg.move:8
diff --git a/language/move-prover/tests/sources/functional/data_invariant_for_mut_ref_arg.move b/language/move-prover/tests/sources/functional/data_invariant_for_mut_ref_arg.move
new file mode 100644
index 0000000000..7541d6c73d
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/data_invariant_for_mut_ref_arg.move
@@ -0,0 +1,78 @@
+module 0x42::struct_invariant_mut_ref_param {
+    use std::vector;
+
+    struct S {
+        v: vector<u64>,
+    }
+    spec S {
+        invariant len(v) == 0;
+    }
+
+    public fun empty(): S {
+        S { v: vector::empty<u64>() }
+    }
+
+    public fun push_1(s: &mut S) {
+        spec {
+            assert len(s.v) == 0;
+        };
+        vector::push_back(&mut s.v, 1);
+    }
+
+    public fun push_2(s: &mut S) {
+        spec {
+            assert len(s.v) == 0;
+        };
+        vector::push_back(&mut s.v, 2);
+        let t = freeze(s);
+        let _ = vector::length(&t.v);
+    }
+
+    public fun push_3(s: &mut S): &mut S {
+        spec {
+            assert len(s.v) == 0;
+        };
+        vector::push_back(&mut s.v, 3);
+        s
+    }
+
+    public fun push_and_pop_correct_1(s: &mut S) {
+        spec {
+            assert len(s.v) == 0;
+        };
+        vector::push_back(&mut s.v, 0);
+
+        // NOTE: data invariant violation for `&mut` param is allowed within
+        // function body (in this example, the data invariant does not hold
+        // in the time window between push and pop).
+        //
+        // Implementation-wise, a data invariant is enforced when a `&mut` param
+        // gets destroyed instead of when a `&mut` param is written-back to.
+
+        vector::pop_back(&mut s.v);
+    }
+
+    public fun push_and_pop_correct_2(s: &mut S) {
+        spec {
+            assert len(s.v) == 0;
+        };
+        let v = &mut s.v;
+        vector::push_back(v, 0);
+        vector::pop_back(v);
+    }
+
+    struct A {
+        v1: vector<u64>,
+        v2: vector<u64>,
+    }
+    spec A {
+        invariant len(v1) == len(v2);
+    }
+
+    public fun push_A_in_sync(a: &mut A) {
+        let v1 = &mut a.v1;
+        let v2 = &mut a.v2;
+        vector::push_back(v1, 42);
+        vector::push_back(v2, 42);
+    }
+}
diff --git a/language/move-prover/tests/sources/functional/data_invariant_in_loop.move b/language/move-prover/tests/sources/functional/data_invariant_in_loop.move
new file mode 100644
index 0000000000..ed8a65821c
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/data_invariant_in_loop.move
@@ -0,0 +1,13 @@
+module 0x42::data_inv_in_loop {
+    use std::option::{Self, Option};
+    use std::vector;
+
+    public fun test() {
+        let i = 0;
+        let r = vector::empty<Option<u64>>();
+        while(i < 10) {
+            vector::push_back(&mut r, option::none());
+            i = i + 1;
+        }
+    }
+}
diff --git a/language/move-prover/tests/sources/functional/data_invariant_in_map.exp b/language/move-prover/tests/sources/functional/data_invariant_in_map.exp
new file mode 100644
index 0000000000..72c3d31e14
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/data_invariant_in_map.exp
@@ -0,0 +1,13 @@
+Move prover returns: exiting with verification errors
+error: data invariant does not hold
+  ┌─ tests/sources/functional/data_invariant_in_map.move:8:9
+  │
+8 │         invariant value != 0;
+  │         ^^^^^^^^^^^^^^^^^^^^^
+  │
+  =     at tests/sources/functional/data_invariant_in_map.move:20: violation_1
+  =     at tests/sources/functional/data_invariant_in_map.move:21: violation_1
+  =     at tests/sources/functional/data_invariant_in_map.move:22: violation_1
+  =         s = <redacted>
+  =     at tests/sources/functional/data_invariant_in_map.move:23: violation_1
+  =     at tests/sources/functional/data_invariant_in_map.move:8
diff --git a/language/move-prover/tests/sources/functional/data_invariant_in_map.move b/language/move-prover/tests/sources/functional/data_invariant_in_map.move
new file mode 100644
index 0000000000..7d43487a59
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/data_invariant_in_map.move
@@ -0,0 +1,25 @@
+module 0x42::data_inv_in_map {
+    use extensions::table;
+
+    struct S has store {
+        value: u64
+    }
+    spec S {
+        invariant value != 0;
+    }
+
+    struct R has key {
+        map: table::Table<address, S>
+    }
+
+    fun no_violation() acquires R {
+        let t = &mut borrow_global_mut<R>(@0x42).map;
+        table::add(t, @0x43, S { value: 1 });
+    }
+
+    fun violation_1() acquires R {
+        let t = &mut borrow_global_mut<R>(@0x42).map;
+        let s = table::borrow_mut(t, @0x43);
+        *&mut s.value = 0;
+    }
+}
diff --git a/language/move-prover/tests/sources/functional/fixed_point_arithm.exp b/language/move-prover/tests/sources/functional/fixed_point_arithm.exp
index e85c31b9bd..971d1ab700 100644
--- a/language/move-prover/tests/sources/functional/fixed_point_arithm.exp
+++ b/language/move-prover/tests/sources/functional/fixed_point_arithm.exp
@@ -47,7 +47,6 @@ error: post-condition does not hold
     =     at ../move-stdlib/sources/fixed_point32.move:150: get_raw_value
     =         y_raw_val = <redacted>
     =     at tests/sources/functional/fixed_point_arithm.move:106: mul_div_incorrect
-    =         z = <redacted>
     =     at tests/sources/functional/fixed_point_arithm.move:107: mul_div_incorrect
     =         result = <redacted>
     =     at tests/sources/functional/fixed_point_arithm.move:108: mul_div_incorrect
@@ -70,12 +69,10 @@ error: post-condition does not hold
     =     at ../move-stdlib/sources/fixed_point32.move:150: get_raw_value
     =         y_raw_val = <redacted>
     =     at tests/sources/functional/fixed_point_arithm.move:106: mul_div_incorrect
-    =         z = <redacted>
     =     at tests/sources/functional/fixed_point_arithm.move:107: mul_div_incorrect
     =         result = <redacted>
     =     at tests/sources/functional/fixed_point_arithm.move:108: mul_div_incorrect
     =     at tests/sources/functional/fixed_point_arithm.move:110: mul_div_incorrect (spec)
-    =     at tests/sources/functional/fixed_point_arithm.move:111: mul_div_incorrect (spec)
     =     at tests/sources/functional/fixed_point_arithm.move:112: mul_div_incorrect (spec)
 
 error: post-condition does not hold
diff --git a/language/move-prover/tests/sources/functional/fixed_point_arithm.move b/language/move-prover/tests/sources/functional/fixed_point_arithm.move
index 7308089fae..a2216227f4 100644
--- a/language/move-prover/tests/sources/functional/fixed_point_arithm.move
+++ b/language/move-prover/tests/sources/functional/fixed_point_arithm.move
@@ -108,7 +108,7 @@ module 0x42::FixedPointArithmetic {
     }
     spec mul_div_incorrect {
         ensures result >= x; // disproved
-        ensures result == x; // disproved
+        //ensures result == x; // TODO: this can be disproved when given enought time, commented out because of timeout
         ensures result < x; // disproved
         ensures result > x; // disproved
     }
diff --git a/language/move-prover/tests/sources/functional/global_invariants.exp b/language/move-prover/tests/sources/functional/global_invariants.exp
index 976f3a7033..a8ab0fa7e5 100644
--- a/language/move-prover/tests/sources/functional/global_invariants.exp
+++ b/language/move-prover/tests/sources/functional/global_invariants.exp
@@ -26,6 +26,8 @@ error: global memory invariant does not hold
    =     at ../move-stdlib/sources/signer.move:13: address_of
    =         result = <redacted>
    =     at ../move-stdlib/sources/signer.move:14: address_of
+   =     at tests/sources/functional/global_invariants.move:64: remove_R_invalid
+   =     at tests/sources/functional/global_invariants.move:65: remove_R_invalid
    =     at ../move-stdlib/sources/signer.move:12: address_of
    =         s = <redacted>
    =     at ../move-stdlib/sources/signer.move:13: address_of
@@ -50,6 +52,8 @@ error: global memory invariant does not hold
    =     at ../move-stdlib/sources/signer.move:13: address_of
    =         result = <redacted>
    =     at ../move-stdlib/sources/signer.move:14: address_of
+   =     at tests/sources/functional/global_invariants.move:55: remove_S_invalid
+   =     at tests/sources/functional/global_invariants.move:56: remove_S_invalid
    =     at ../move-stdlib/sources/signer.move:12: address_of
    =         s = <redacted>
    =     at ../move-stdlib/sources/signer.move:13: address_of
diff --git a/language/move-prover/tests/sources/functional/global_vars.exp b/language/move-prover/tests/sources/functional/global_vars.exp
index 2a3e67574c..2d0a0d8a38 100644
--- a/language/move-prover/tests/sources/functional/global_vars.exp
+++ b/language/move-prover/tests/sources/functional/global_vars.exp
@@ -8,14 +8,14 @@ error: post-condition does not hold
    =     at tests/sources/functional/global_vars.move:37: call_add_sub_invalid
    =     at tests/sources/functional/global_vars.move:38: call_add_sub_invalid
    =     at tests/sources/functional/global_vars.move:17: add
-   =     at tests/sources/functional/global_vars.move:18: add
-   =     at tests/sources/functional/global_vars.move:20: add (spec)
+   =     at tests/sources/functional/global_vars.move:19: add
+   =     at tests/sources/functional/global_vars.move:21: add
    =     at tests/sources/functional/global_vars.move:24: sub
-   =     at tests/sources/functional/global_vars.move:25: sub
-   =     at tests/sources/functional/global_vars.move:27: sub (spec)
+   =     at tests/sources/functional/global_vars.move:26: sub
+   =     at tests/sources/functional/global_vars.move:28: sub
    =     at tests/sources/functional/global_vars.move:17: add
-   =     at tests/sources/functional/global_vars.move:18: add
-   =     at tests/sources/functional/global_vars.move:20: add (spec)
+   =     at tests/sources/functional/global_vars.move:19: add
+   =     at tests/sources/functional/global_vars.move:21: add
    =     at tests/sources/functional/global_vars.move:39: call_add_sub_invalid
    =     at tests/sources/functional/global_vars.move:41: call_add_sub_invalid (spec)
 
diff --git a/language/move-prover/tests/sources/functional/global_vars.move b/language/move-prover/tests/sources/functional/global_vars.move
index 640a55bf7a..27413b1a60 100644
--- a/language/move-prover/tests/sources/functional/global_vars.move
+++ b/language/move-prover/tests/sources/functional/global_vars.move
@@ -14,17 +14,17 @@ module 0x42::TestGlobalVars {
     }
 
     fun add() acquires T {
-        borrow_global_mut<T>(@0).i = borrow_global_mut<T>(@0).i + 1
-    }
-    spec add {
-        update sum_of_T = sum_of_T + 1;
+        borrow_global_mut<T>(@0).i = borrow_global_mut<T>(@0).i + 1;
+        spec {
+            update sum_of_T = sum_of_T + 1;
+        };
     }
 
     fun sub() acquires T {
-        borrow_global_mut<T>(@0).i = borrow_global_mut<T>(@0).i - 1
-    }
-    spec sub {
-        update sum_of_T = sum_of_T - 1;
+        borrow_global_mut<T>(@0).i = borrow_global_mut<T>(@0).i - 1;
+        spec {
+            update sum_of_T = sum_of_T - 1;
+        };
     }
 
     fun call_add_sub() acquires T {
diff --git a/language/move-prover/tests/sources/functional/invariants.exp b/language/move-prover/tests/sources/functional/invariants.exp
index 7b5c7d4113..cb7c939c1a 100644
--- a/language/move-prover/tests/sources/functional/invariants.exp
+++ b/language/move-prover/tests/sources/functional/invariants.exp
@@ -19,7 +19,6 @@ error: data invariant does not hold
    =     at tests/sources/functional/invariants.move:113: lifetime_invalid_R
    =         r = <redacted>
    =     at tests/sources/functional/invariants.move:114: lifetime_invalid_R
-   =         r_ref = <redacted>
    =     at tests/sources/functional/invariants.move:115: lifetime_invalid_R
    =         x_ref = <redacted>
    =     at tests/sources/functional/invariants.move:116: lifetime_invalid_R
@@ -49,10 +48,10 @@ error: data invariant does not hold
     =     at tests/sources/functional/invariants.move:143
     =     at tests/sources/functional/invariants.move:158: lifetime_invalid_S_branching
     =         a = <redacted>
-    =         <redacted> = <redacted>
+    =     at tests/sources/functional/invariants.move:158: lifetime_invalid_S_branching
     =         x_ref = <redacted>
     =     at tests/sources/functional/invariants.move:160: lifetime_invalid_S_branching
-    =     at tests/sources/functional/invariants.move:143
     =     at tests/sources/functional/invariants.move:163: lifetime_invalid_S_branching
-    =         a = <redacted>
+    =     at <internal>:1
+    =     at tests/sources/functional/invariants.move:163: lifetime_invalid_S_branching
     =     at tests/sources/functional/invariants.move:150
diff --git a/language/move-prover/tests/sources/functional/is_txn_signer.exp b/language/move-prover/tests/sources/functional/is_txn_signer.exp
index 0b34fa194a..10e0b83097 100644
--- a/language/move-prover/tests/sources/functional/is_txn_signer.exp
+++ b/language/move-prover/tests/sources/functional/is_txn_signer.exp
@@ -31,6 +31,8 @@ error: unknown assertion failed
    =     at ../move-stdlib/sources/signer.move:13: address_of
    =         result = <redacted>
    =     at ../move-stdlib/sources/signer.move:14: address_of
+   =     at tests/sources/functional/is_txn_signer.move:30: f4_incorrect
+   =     at tests/sources/functional/is_txn_signer.move:31: f4_incorrect
 
 error: precondition does not hold at this call
    ┌─ tests/sources/functional/is_txn_signer.move:38:9
diff --git a/language/move-prover/tests/sources/functional/loop_inv.move b/language/move-prover/tests/sources/functional/loop_inv.move
new file mode 100644
index 0000000000..5a084fe0eb
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/loop_inv.move
@@ -0,0 +1,14 @@
+module 0x42::loop_inv {
+    use std::vector;
+
+    fun g() {
+        let v = vector::empty<u64>();
+        let i = 0;
+        while (i < 5) {
+            vector::push_back(&mut v, 0);
+        };
+        spec {
+            assert true;
+        };
+    }
+}
diff --git a/language/move-prover/tests/sources/functional/loop_with_two_back_edges.move b/language/move-prover/tests/sources/functional/loop_with_two_back_edges.move
new file mode 100644
index 0000000000..cbd4492b07
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/loop_with_two_back_edges.move
@@ -0,0 +1,30 @@
+module 0x42::loop_inv {
+    use std::vector;
+
+    fun f() {
+        let v1 = vector::empty<u64>();
+        let v2 = vector::empty<u64>();
+        let index = 0;
+        let i = 0;
+
+        while ({
+            spec {
+                invariant index == len(v1);
+            };
+            i < 10000
+        }) {
+            i = i + 1;
+            if (i == 100) {
+                continue
+            };
+            vector::push_back(&mut v1, index);
+            vector::push_back(&mut v2, index);
+            index = index + 1;
+        };
+
+
+        spec {
+            assert index == len(v1);
+        };
+    }
+}
diff --git a/language/move-prover/tests/sources/functional/loops.exp b/language/move-prover/tests/sources/functional/loops.exp
index a4b4605d06..f22d614317 100644
--- a/language/move-prover/tests/sources/functional/loops.exp
+++ b/language/move-prover/tests/sources/functional/loops.exp
@@ -14,6 +14,9 @@ error: abort not covered by any of the `aborts_if` clauses
    =     at tests/sources/functional/loops.move:77: iter10_abort_incorrect
    =         i = <redacted>
    =     at tests/sources/functional/loops.move:79: iter10_abort_incorrect
+   =     enter loop, variable(s) i havocked and reassigned
+   =         i = <redacted>
+   =     loop invariant holds at current state
    =     at tests/sources/functional/loops.move:80: iter10_abort_incorrect
    =     at tests/sources/functional/loops.move:78: iter10_abort_incorrect
    =     at tests/sources/functional/loops.move:82: iter10_abort_incorrect
@@ -28,6 +31,8 @@ error: unknown assertion failed
     =     at tests/sources/functional/loops.move:233: iter10_assert_instead_of_invariant
     =         i = <redacted>
     =     at tests/sources/functional/loops.move:235: iter10_assert_instead_of_invariant
+    =     enter loop, variable(s) i havocked and reassigned
+    =         i = <redacted>
 
 error: function does not abort under this condition
    ┌─ tests/sources/functional/loops.move:58:9
@@ -38,6 +43,9 @@ error: function does not abort under this condition
    =     at tests/sources/functional/loops.move:48: iter10_no_abort_incorrect
    =         i = <redacted>
    =     at tests/sources/functional/loops.move:50: iter10_no_abort_incorrect
+   =     enter loop, variable(s) i havocked and reassigned
+   =         i = <redacted>
+   =     loop invariant holds at current state
    =     at tests/sources/functional/loops.move:51: iter10_no_abort_incorrect
    =     at tests/sources/functional/loops.move:49: iter10_no_abort_incorrect
    =     at tests/sources/functional/loops.move:58: iter10_no_abort_incorrect (spec)
@@ -67,16 +75,20 @@ error: induction case of the loop invariant does not hold
     =         x = <redacted>
     =     at tests/sources/functional/loops.move:222: loop_invariant_induction_invalid
     =     at tests/sources/functional/loops.move:223: loop_invariant_induction_invalid
+    =     enter loop, variable(s) x havocked and reassigned
+    =         x = <redacted>
+    =     loop invariant holds at current state
     =     at tests/sources/functional/loops.move:225: loop_invariant_induction_invalid
     =     at tests/sources/functional/loops.move:221: loop_invariant_induction_invalid
+    =     at tests/sources/functional/loops.move:227: loop_invariant_induction_invalid
     =         x = <redacted>
     =     at tests/sources/functional/loops.move:223: loop_invariant_induction_invalid
 
 error: induction case of the loop invariant does not hold
     ┌─ tests/sources/functional/loops.move:189:17
     │
-189 │                 invariant x != y;
-    │                 ^^^^^^^^^^^^^^^^^
+189 │                 invariant x < y;
+    │                 ^^^^^^^^^^^^^^^^
     │
     =     at tests/sources/functional/loops.move:183: loop_with_two_back_edges_incorrect
     =         x = <redacted>
@@ -84,9 +96,15 @@ error: induction case of the loop invariant does not hold
     =     at tests/sources/functional/loops.move:185: loop_with_two_back_edges_incorrect
     =     at tests/sources/functional/loops.move:188: loop_with_two_back_edges_incorrect
     =     at tests/sources/functional/loops.move:189: loop_with_two_back_edges_incorrect
-    =     at tests/sources/functional/loops.move:191: loop_with_two_back_edges_incorrect
+    =     enter loop, variable(s) x, y havocked and reassigned
+    =         x = <redacted>
     =         y = <redacted>
-    =     at tests/sources/functional/loops.move:193: loop_with_two_back_edges_incorrect
+    =     loop invariant holds at current state
+    =     at tests/sources/functional/loops.move:191: loop_with_two_back_edges_incorrect
+    =     at tests/sources/functional/loops.move:195: loop_with_two_back_edges_incorrect
+    =     at tests/sources/functional/loops.move:196: loop_with_two_back_edges_incorrect
+    =         x = <redacted>
+    =     at tests/sources/functional/loops.move:197: loop_with_two_back_edges_incorrect
     =     at tests/sources/functional/loops.move:189: loop_with_two_back_edges_incorrect
 
 error: base case of the loop invariant does not hold
@@ -100,6 +118,9 @@ error: base case of the loop invariant does not hold
     =         y = <redacted>
     =     at tests/sources/functional/loops.move:140: nested_loop_inner_invariant_incorrect
     =     at tests/sources/functional/loops.move:143: nested_loop_inner_invariant_incorrect
+    =     enter loop, variable(s) x, y havocked and reassigned
+    =         x = <redacted>
+    =         y = <redacted>
     =     at tests/sources/functional/loops.move:144: nested_loop_inner_invariant_incorrect
     =     at tests/sources/functional/loops.move:145: nested_loop_inner_invariant_incorrect
 
@@ -114,9 +135,16 @@ error: induction case of the loop invariant does not hold
     =         y = <redacted>
     =     at tests/sources/functional/loops.move:140: nested_loop_inner_invariant_incorrect
     =     at tests/sources/functional/loops.move:143: nested_loop_inner_invariant_incorrect
+    =     enter loop, variable(s) x, y havocked and reassigned
+    =         x = <redacted>
+    =         y = <redacted>
     =     at tests/sources/functional/loops.move:144: nested_loop_inner_invariant_incorrect
     =     at tests/sources/functional/loops.move:145: nested_loop_inner_invariant_incorrect
+    =     enter loop, variable(s) y havocked and reassigned
+    =         y = <redacted>
+    =     loop invariant holds at current state
     =     at tests/sources/functional/loops.move:147: nested_loop_inner_invariant_incorrect
+    =     at tests/sources/functional/loops.move:150: nested_loop_inner_invariant_incorrect
     =         y = <redacted>
     =     at tests/sources/functional/loops.move:145: nested_loop_inner_invariant_incorrect
 
@@ -132,6 +160,15 @@ error: induction case of the loop invariant does not hold
     =     at tests/sources/functional/loops.move:115: nested_loop_outer_invariant_incorrect
     =     at tests/sources/functional/loops.move:118: nested_loop_outer_invariant_incorrect
     =     at tests/sources/functional/loops.move:119: nested_loop_outer_invariant_incorrect
+    =     enter loop, variable(s) x, y havocked and reassigned
+    =         x = <redacted>
+    =         y = <redacted>
+    =     loop invariant holds at current state
+    =     at tests/sources/functional/loops.move:122: nested_loop_outer_invariant_incorrect
+    =     enter loop, variable(s) y havocked and reassigned
+    =         y = <redacted>
     =     at tests/sources/functional/loops.move:122: nested_loop_outer_invariant_incorrect
+    =     at tests/sources/functional/loops.move:128: nested_loop_outer_invariant_incorrect
+    =     at tests/sources/functional/loops.move:131: nested_loop_outer_invariant_incorrect
     =         x = <redacted>
     =     at tests/sources/functional/loops.move:119: nested_loop_outer_invariant_incorrect
diff --git a/language/move-prover/tests/sources/functional/loops.move b/language/move-prover/tests/sources/functional/loops.move
index 8a2bea52fd..9006d06d51 100644
--- a/language/move-prover/tests/sources/functional/loops.move
+++ b/language/move-prover/tests/sources/functional/loops.move
@@ -182,11 +182,11 @@ module 0x42::VerifyLoops {
 
     public fun loop_with_two_back_edges_incorrect(x: u64, y: u64) {
         spec {
-            assume x != y;
+            assume x < y;
         };
         loop {
             spec {
-                invariant x != y;
+                invariant x < y;
             };
             if (x > y) {
                 y = y + 1;
diff --git a/language/move-prover/tests/sources/functional/loops_with_memory_ops.cvc5_exp b/language/move-prover/tests/sources/functional/loops_with_memory_ops.cvc5_exp
new file mode 100644
index 0000000000..c121682eda
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/loops_with_memory_ops.cvc5_exp
@@ -0,0 +1,115 @@
+Move prover returns: exiting with verification errors
+error: unknown assertion failed
+   ┌─ tests/sources/functional/loops_with_memory_ops.move:93:13
+   │
+93 │             assert forall m in 0..length: a[m] == b[m];
+   │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/loops_with_memory_ops.move:56: nested_loop2
+   =         a = <redacted>
+   =         b = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:57: nested_loop2
+   =         length = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:59: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:60: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:62: nested_loop2
+   =         i = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:63: nested_loop2
+   =         x = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:64: nested_loop2
+   =         y = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:66: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:69: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:70: nested_loop2
+   =     enter loop, variable(s) a, b, i, x, y havocked and reassigned
+   =         a = <redacted>
+   =         b = <redacted>
+   =         i = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     loop invariant holds at current state
+   =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:69: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:70: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:73: nested_loop2
+   =     enter loop, variable(s) x, y havocked and reassigned
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:74: nested_loop2
+   =     enter loop, variable(s) y havocked and reassigned
+   =         y = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:74: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:80: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:81: nested_loop2
+   =         b = <redacted>
+   =         b = <redacted>
+   =         a = <redacted>
+   =         a = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:85: nested_loop2
+   =         i = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:86: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:93: nested_loop2
+
+error: induction case of the loop invariant does not hold
+   ┌─ tests/sources/functional/loops_with_memory_ops.move:70:17
+   │
+70 │                 invariant forall n in 0..i: a[n] == b[n];
+   │                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/loops_with_memory_ops.move:56: nested_loop2
+   =         a = <redacted>
+   =         b = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:57: nested_loop2
+   =         length = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:59: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:60: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:62: nested_loop2
+   =         i = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:63: nested_loop2
+   =         x = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:64: nested_loop2
+   =         y = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:66: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:69: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:70: nested_loop2
+   =     enter loop, variable(s) a, b, i, x, y havocked and reassigned
+   =         a = <redacted>
+   =         b = <redacted>
+   =         i = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     loop invariant holds at current state
+   =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:69: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:70: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:73: nested_loop2
+   =     enter loop, variable(s) x, y havocked and reassigned
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:74: nested_loop2
+   =     enter loop, variable(s) y havocked and reassigned
+   =         y = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:74: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:80: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:81: nested_loop2
+   =         b = <redacted>
+   =         b = <redacted>
+   =         a = <redacted>
+   =         a = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:85: nested_loop2
+   =         i = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:86: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:89: nested_loop2
+   =         x = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:90: nested_loop2
+   =         y = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:69: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:70: nested_loop2
diff --git a/language/move-prover/tests/sources/functional/loops_with_memory_ops.exp b/language/move-prover/tests/sources/functional/loops_with_memory_ops.exp
index 4dca2b7daa..f7ecd6434f 100644
--- a/language/move-prover/tests/sources/functional/loops_with_memory_ops.exp
+++ b/language/move-prover/tests/sources/functional/loops_with_memory_ops.exp
@@ -15,24 +15,40 @@ error: unknown assertion failed
    =     at tests/sources/functional/loops_with_memory_ops.move:62: nested_loop2
    =         i = <redacted>
    =     at tests/sources/functional/loops_with_memory_ops.move:63: nested_loop2
-   =         a = <redacted>
    =         x = <redacted>
    =     at tests/sources/functional/loops_with_memory_ops.move:64: nested_loop2
-   =         b = <redacted>
    =         y = <redacted>
    =     at tests/sources/functional/loops_with_memory_ops.move:66: nested_loop2
    =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
    =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
    =     at tests/sources/functional/loops_with_memory_ops.move:69: nested_loop2
    =     at tests/sources/functional/loops_with_memory_ops.move:70: nested_loop2
+   =     enter loop, variable(s) a, b, i, x, y havocked and reassigned
+   =         a = <redacted>
+   =         b = <redacted>
+   =         i = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     loop invariant holds at current state
    =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
    =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
    =     at tests/sources/functional/loops_with_memory_ops.move:69: nested_loop2
    =     at tests/sources/functional/loops_with_memory_ops.move:70: nested_loop2
    =     at tests/sources/functional/loops_with_memory_ops.move:73: nested_loop2
+   =     enter loop, variable(s) x, y havocked and reassigned
+   =         x = <redacted>
+   =         y = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:74: nested_loop2
+   =     enter loop, variable(s) y havocked and reassigned
+   =         y = <redacted>
    =     at tests/sources/functional/loops_with_memory_ops.move:74: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:80: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:81: nested_loop2
+   =     at <internal>:1
+   =     at tests/sources/functional/loops_with_memory_ops.move:81: nested_loop2
    =         b = <redacted>
    =         a = <redacted>
+   =         a = <redacted>
    =     at tests/sources/functional/loops_with_memory_ops.move:85: nested_loop2
    =         i = <redacted>
    =     at tests/sources/functional/loops_with_memory_ops.move:86: nested_loop2
@@ -54,31 +70,45 @@ error: induction case of the loop invariant does not hold
    =     at tests/sources/functional/loops_with_memory_ops.move:62: nested_loop2
    =         i = <redacted>
    =     at tests/sources/functional/loops_with_memory_ops.move:63: nested_loop2
-   =         a = <redacted>
    =         x = <redacted>
    =     at tests/sources/functional/loops_with_memory_ops.move:64: nested_loop2
-   =         b = <redacted>
    =         y = <redacted>
    =     at tests/sources/functional/loops_with_memory_ops.move:66: nested_loop2
    =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
    =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
    =     at tests/sources/functional/loops_with_memory_ops.move:69: nested_loop2
    =     at tests/sources/functional/loops_with_memory_ops.move:70: nested_loop2
+   =     enter loop, variable(s) a, b, i, x, y havocked and reassigned
+   =         a = <redacted>
+   =         b = <redacted>
+   =         i = <redacted>
+   =         x = <redacted>
+   =         y = <redacted>
+   =     loop invariant holds at current state
    =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
    =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
    =     at tests/sources/functional/loops_with_memory_ops.move:69: nested_loop2
    =     at tests/sources/functional/loops_with_memory_ops.move:70: nested_loop2
    =     at tests/sources/functional/loops_with_memory_ops.move:73: nested_loop2
+   =     enter loop, variable(s) x, y havocked and reassigned
+   =         x = <redacted>
+   =         y = <redacted>
    =     at tests/sources/functional/loops_with_memory_ops.move:74: nested_loop2
+   =     enter loop, variable(s) y havocked and reassigned
+   =         y = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:74: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:80: nested_loop2
+   =     at tests/sources/functional/loops_with_memory_ops.move:81: nested_loop2
+   =         b = <redacted>
    =         b = <redacted>
    =         a = <redacted>
+   =         a = <redacted>
    =     at tests/sources/functional/loops_with_memory_ops.move:85: nested_loop2
    =         i = <redacted>
    =     at tests/sources/functional/loops_with_memory_ops.move:86: nested_loop2
-   =         a = <redacted>
+   =     at tests/sources/functional/loops_with_memory_ops.move:89: nested_loop2
    =         x = <redacted>
    =     at tests/sources/functional/loops_with_memory_ops.move:90: nested_loop2
-   =         b = <redacted>
    =         y = <redacted>
    =     at tests/sources/functional/loops_with_memory_ops.move:67: nested_loop2
    =     at tests/sources/functional/loops_with_memory_ops.move:68: nested_loop2
diff --git a/language/move-prover/tests/sources/functional/loops_with_memory_ops.move b/language/move-prover/tests/sources/functional/loops_with_memory_ops.move
index dd858d320f..9badb37647 100644
--- a/language/move-prover/tests/sources/functional/loops_with_memory_ops.move
+++ b/language/move-prover/tests/sources/functional/loops_with_memory_ops.move
@@ -1,5 +1,5 @@
+// separate_baseline: cvc5
 module 0x42::VerifyLoopsWithMemoryOps {
-
     use std::vector;
     spec module {
         pragma verify=true;
diff --git a/language/move-prover/tests/sources/functional/macro_verification.exp b/language/move-prover/tests/sources/functional/macro_verification.exp
index 9178f31524..2a1211ee2e 100644
--- a/language/move-prover/tests/sources/functional/macro_verification.exp
+++ b/language/move-prover/tests/sources/functional/macro_verification.exp
@@ -23,6 +23,21 @@ error: post-condition does not hold
    =     at tests/sources/functional/macro_verification.move:26: foreach
    =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
    =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =     enter loop, variable(s) v, i havocked and reassigned
+   =         v = <redacted>
+   =         i = <redacted>
+   =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
+   =     loop invariant holds at current state
    =     at tests/sources/functional/macro_verification.move:23: foreach
    =         `invariant i >= 0 && i <= len(v);` = <redacted>
    =     at tests/sources/functional/macro_verification.move:24: foreach
@@ -32,6 +47,7 @@ error: post-condition does not hold
    =     at tests/sources/functional/macro_verification.move:26: foreach
    =         `invariant forall j in i..len(v): v[j] == old(v)[j];` = <redacted>
    =     at tests/sources/functional/macro_verification.move:17: foreach
+   =     at tests/sources/functional/macro_verification.move:27: foreach
    =         v = <redacted>
    =     at tests/sources/functional/macro_verification.move:30: foreach (spec)
    =         `ensures len(v) == len(old(v));` = <redacted>
@@ -63,11 +79,24 @@ error: post-condition does not hold
    =     at tests/sources/functional/macro_verification.move:50: reduce
    =         `invariant sum == spec_sum(v, i);` = <redacted>
    =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =     enter loop, variable(s) i, sum havocked and reassigned
+   =         i = <redacted>
+   =         sum = <redacted>
+   =         `invariant sum == spec_sum(v, i);` = <redacted>
+   =     loop invariant holds at current state
    =     at tests/sources/functional/macro_verification.move:49: reduce
    =         `invariant i >= 0 && i <= len(v);` = <redacted>
    =     at tests/sources/functional/macro_verification.move:50: reduce
    =         `invariant sum == spec_sum(v, i);` = <redacted>
    =     at tests/sources/functional/macro_verification.move:43: reduce
+   =     at tests/sources/functional/macro_verification.move:52: reduce
    =         result = <redacted>
    =     at tests/sources/functional/macro_verification.move:55: reduce (spec)
    =         `ensures result == spec_sum(v, len(v));` = <redacted>
@@ -108,10 +137,16 @@ error: post-condition does not hold
    =     at tests/sources/functional/macro_verification.move:48: reduce
    =     at tests/sources/functional/macro_verification.move:49: reduce
    =     at tests/sources/functional/macro_verification.move:50: reduce
+   =     enter loop, variable(s) i, sum havocked and reassigned
+   =         i = <redacted>
+   =         sum = <redacted>
+   =     loop invariant holds at current state
    =     at tests/sources/functional/macro_verification.move:49: reduce
    =     at tests/sources/functional/macro_verification.move:50: reduce
    =     at tests/sources/functional/macro_verification.move:43: reduce
+   =     at tests/sources/functional/macro_verification.move:52: reduce
    =         result = <redacted>
+   =     at tests/sources/functional/macro_verification.move:53: reduce
    =         result = <redacted>
    =     at tests/sources/functional/macro_verification.move:73: reduce_test
    =     at tests/sources/functional/macro_verification.move:75: reduce_test (spec)
diff --git a/language/move-prover/tests/sources/functional/mut_ref.exp b/language/move-prover/tests/sources/functional/mut_ref.exp
index d0e3055ba5..7b8f95897e 100644
--- a/language/move-prover/tests/sources/functional/mut_ref.exp
+++ b/language/move-prover/tests/sources/functional/mut_ref.exp
@@ -34,11 +34,8 @@ error: data invariant does not hold
   =         b = <redacted>
   =         x = <redacted>
   =     at tests/sources/functional/mut_ref.move:91: return_ref_different_path_vec2
-  =         <redacted> = <redacted>
   =         result = <redacted>
   =         x = <redacted>
-  =         x = <redacted>
-  =         x = <redacted>
   =     at tests/sources/functional/mut_ref.move:92: return_ref_different_path_vec2
   =         r = <redacted>
   =     at tests/sources/functional/mut_ref.move:122: call_return_ref_different_path_vec2_incorrect
diff --git a/language/move-prover/tests/sources/functional/mut_ref_arg_return.move b/language/move-prover/tests/sources/functional/mut_ref_arg_return.move
new file mode 100644
index 0000000000..70bc9f80bc
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/mut_ref_arg_return.move
@@ -0,0 +1,36 @@
+module 0x42::Test {
+    // test case 1
+    fun one_of_two(cond: bool, r1: &mut u64, r2: &mut u64): &mut u64 {
+        if (cond) {r1} else {r2}
+    }
+
+    fun test1(cond: bool, v1: u64, v2: u64) {
+        let r = one_of_two(cond, &mut v1, &mut v2);
+        *r = 0;
+
+        spec {
+            assert cond ==> v1 == 0;
+            assert !cond ==> v2 == 0;
+        }
+    }
+
+    // test case 2
+    fun max_mut(ma: &mut u64, mb: &mut u64): &mut u64 {
+        if (*ma >= *mb) {
+            ma
+        } else {
+            mb
+        }
+    }
+
+    fun test2(a: u64, b: u64) {
+        let mc = max_mut(&mut a, &mut b);
+        *mc = *mc + 7;
+
+        spec {
+            assert a != b;
+            assert (a > b) ==> (a - b >= 7);
+            assert (a < b) ==> (b - a >= 7);
+        }
+    }
+}
diff --git a/language/move-prover/tests/sources/functional/nonlinear_arithm.exp b/language/move-prover/tests/sources/functional/nonlinear_arithm.exp
index ad35f744ac..7eba875c35 100644
--- a/language/move-prover/tests/sources/functional/nonlinear_arithm.exp
+++ b/language/move-prover/tests/sources/functional/nonlinear_arithm.exp
@@ -1,40 +1,40 @@
 Move prover returns: exiting with verification errors
 error: post-condition does not hold
-    ┌─ tests/sources/functional/nonlinear_arithm.move:226:9
+    ┌─ tests/sources/functional/nonlinear_arithm.move:228:9
     │
-226 │         ensures result == a*b*c + a*b*d + a*b;
+228 │         ensures result == a*b*c + a*b*d + a*b;
     │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     │
-    =     at tests/sources/functional/nonlinear_arithm.move:222: distribution_law_incorrect
+    =     at tests/sources/functional/nonlinear_arithm.move:224: distribution_law_incorrect
     =         a = <redacted>
     =         b = <redacted>
     =         c = <redacted>
     =         d = <redacted>
-    =     at tests/sources/functional/nonlinear_arithm.move:223: distribution_law_incorrect
+    =     at tests/sources/functional/nonlinear_arithm.move:225: distribution_law_incorrect
     =         result = <redacted>
-    =     at tests/sources/functional/nonlinear_arithm.move:224: distribution_law_incorrect
-    =     at tests/sources/functional/nonlinear_arithm.move:226: distribution_law_incorrect (spec)
+    =     at tests/sources/functional/nonlinear_arithm.move:226: distribution_law_incorrect
+    =     at tests/sources/functional/nonlinear_arithm.move:228: distribution_law_incorrect (spec)
 
 error: post-condition does not hold
-    ┌─ tests/sources/functional/nonlinear_arithm.move:212:9
+    ┌─ tests/sources/functional/nonlinear_arithm.move:214:9
     │
-212 │         ensures result != 720;
+214 │         ensures result != 720;
     │         ^^^^^^^^^^^^^^^^^^^^^^
     │
-    =     at tests/sources/functional/nonlinear_arithm.move:201: mul5_incorrect
+    =     at tests/sources/functional/nonlinear_arithm.move:203: mul5_incorrect
     =         a = <redacted>
     =         b = <redacted>
     =         c = <redacted>
     =         d = <redacted>
     =         e = <redacted>
-    =     at tests/sources/functional/nonlinear_arithm.move:203: mul5_incorrect
-    =     at tests/sources/functional/nonlinear_arithm.move:204: mul5_incorrect
     =     at tests/sources/functional/nonlinear_arithm.move:205: mul5_incorrect
     =     at tests/sources/functional/nonlinear_arithm.move:206: mul5_incorrect
+    =     at tests/sources/functional/nonlinear_arithm.move:207: mul5_incorrect
     =     at tests/sources/functional/nonlinear_arithm.move:208: mul5_incorrect
+    =     at tests/sources/functional/nonlinear_arithm.move:210: mul5_incorrect
     =         result = <redacted>
-    =     at tests/sources/functional/nonlinear_arithm.move:209: mul5_incorrect
-    =     at tests/sources/functional/nonlinear_arithm.move:212: mul5_incorrect (spec)
+    =     at tests/sources/functional/nonlinear_arithm.move:211: mul5_incorrect
+    =     at tests/sources/functional/nonlinear_arithm.move:214: mul5_incorrect (spec)
 
 error: abort not covered by any of the `aborts_if` clauses
    ┌─ tests/sources/functional/nonlinear_arithm.move:51:5
@@ -54,25 +54,6 @@ error: abort not covered by any of the `aborts_if` clauses
    =     at tests/sources/functional/nonlinear_arithm.move:49: overflow_u128_mul_3_incorrect
    =         ABORTED
 
-error: abort not covered by any of the `aborts_if` clauses
-    ┌─ tests/sources/functional/nonlinear_arithm.move:107:5
-    │
-105 │           a * b * c * d
-    │             - abort happened here with execution failure
-106 │       }
-107 │ ╭     spec overflow_u128_mul_4_incorrect {
-108 │ │         aborts_if false;
-109 │ │     }
-    │ ╰─────^
-    │
-    =     at tests/sources/functional/nonlinear_arithm.move:104: overflow_u128_mul_4_incorrect
-    =         a = <redacted>
-    =         b = <redacted>
-    =         c = <redacted>
-    =         d = <redacted>
-    =     at tests/sources/functional/nonlinear_arithm.move:105: overflow_u128_mul_4_incorrect
-    =         ABORTED
-
 error: abort not covered by any of the `aborts_if` clauses
    ┌─ tests/sources/functional/nonlinear_arithm.move:35:5
    │
@@ -111,23 +92,23 @@ error: abort not covered by any of the `aborts_if` clauses
    =         ABORTED
 
 error: abort not covered by any of the `aborts_if` clauses
-    ┌─ tests/sources/functional/nonlinear_arithm.move:148:5
+    ┌─ tests/sources/functional/nonlinear_arithm.move:150:5
     │
-146 │           a * b * c * d * e
+148 │           a * b * c * d * e
     │             - abort happened here with execution failure
-147 │       }
-148 │ ╭     spec overflow_u64_mul_5_incorrect {
-149 │ │         aborts_if false;
-150 │ │     }
+149 │       }
+150 │ ╭     spec overflow_u64_mul_5_incorrect {
+151 │ │         aborts_if false;
+152 │ │     }
     │ ╰─────^
     │
-    =     at tests/sources/functional/nonlinear_arithm.move:145: overflow_u64_mul_5_incorrect
+    =     at tests/sources/functional/nonlinear_arithm.move:147: overflow_u64_mul_5_incorrect
     =         a = <redacted>
     =         b = <redacted>
     =         c = <redacted>
     =         d = <redacted>
     =         e = <redacted>
-    =     at tests/sources/functional/nonlinear_arithm.move:146: overflow_u64_mul_5_incorrect
+    =     at tests/sources/functional/nonlinear_arithm.move:148: overflow_u64_mul_5_incorrect
     =         ABORTED
 
 error: abort not covered by any of the `aborts_if` clauses
@@ -168,21 +149,21 @@ error: abort not covered by any of the `aborts_if` clauses
    =         ABORTED
 
 error: abort not covered by any of the `aborts_if` clauses
-    ┌─ tests/sources/functional/nonlinear_arithm.move:129:5
+    ┌─ tests/sources/functional/nonlinear_arithm.move:131:5
     │
-127 │           a * b * c * d * e
+129 │           a * b * c * d * e
     │             - abort happened here with execution failure
-128 │       }
-129 │ ╭     spec overflow_u8_mul_5_incorrect {
-130 │ │         aborts_if false;
-131 │ │     }
+130 │       }
+131 │ ╭     spec overflow_u8_mul_5_incorrect {
+132 │ │         aborts_if false;
+133 │ │     }
     │ ╰─────^
     │
-    =     at tests/sources/functional/nonlinear_arithm.move:126: overflow_u8_mul_5_incorrect
+    =     at tests/sources/functional/nonlinear_arithm.move:128: overflow_u8_mul_5_incorrect
     =         a = <redacted>
     =         b = <redacted>
     =         c = <redacted>
     =         d = <redacted>
     =         e = <redacted>
-    =     at tests/sources/functional/nonlinear_arithm.move:127: overflow_u8_mul_5_incorrect
+    =     at tests/sources/functional/nonlinear_arithm.move:129: overflow_u8_mul_5_incorrect
     =         ABORTED
diff --git a/language/move-prover/tests/sources/functional/nonlinear_arithm.move b/language/move-prover/tests/sources/functional/nonlinear_arithm.move
index e6d9976f0c..3551ddf3bf 100644
--- a/language/move-prover/tests/sources/functional/nonlinear_arithm.move
+++ b/language/move-prover/tests/sources/functional/nonlinear_arithm.move
@@ -1,6 +1,6 @@
 // exclude_for: simplify
 // exclude_for: cvc5
-// simplify and cvc5 are exculded due to timeout
+// flag: --timeout=160
 module 0x42::TestNonlinearArithmetic {
 
     spec module {
@@ -105,6 +105,7 @@ module 0x42::TestNonlinearArithmetic {
         a * b * c * d
     }
     spec overflow_u128_mul_4_incorrect {
+        pragma verify = false; // times out on smaller machines
         aborts_if false;
     }
 
@@ -112,6 +113,7 @@ module 0x42::TestNonlinearArithmetic {
         a * b * c * d
     }
     spec overflow_u128_mul_4 {
+        pragma verify = false; // times out on smaller machines
         aborts_if a * b > max_u128();
         aborts_if a * b * c > max_u128();
         aborts_if a * b * c * d > max_u128();
diff --git a/language/move-prover/tests/sources/functional/old_in_inlined.move b/language/move-prover/tests/sources/functional/old_in_inlined.move
new file mode 100644
index 0000000000..75a531d66f
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/old_in_inlined.move
@@ -0,0 +1,19 @@
+module 0x42::OldInInlined {
+
+    // tests the case when an inlined spec uses "old" and a function containing it (bar in this
+    // case) is itself called from another function (foo in this case) - "old" value must be
+    // recorded not only in the "verified" (bar) function variant but also in the baseline variant
+    // if it's called from another function
+
+    fun foo() {
+        let x = 0;
+        bar(&mut x);
+    }
+
+    fun bar(y: &mut u64) {
+        *y = *y + 2;
+        spec {
+            assert y > old(y) + 1;
+        }
+    }
+}
diff --git a/language/move-prover/tests/sources/functional/opaque_native.move b/language/move-prover/tests/sources/functional/opaque_native.move
new file mode 100644
index 0000000000..347c563423
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/opaque_native.move
@@ -0,0 +1,56 @@
+module 0x42::OpaqueNative {
+
+    spec module {
+        pragma aborts_if_is_strict = true;
+
+        // Uninterpreted spec function with axiom.
+        fun injection(v: vector<u8>): u64;
+        axiom forall v1: vector<u8>, v2: vector<u8>: v1 == v2 <==> injection(v1) == injection(v2);
+
+        // Uninterpreted generic spec function with axiom.
+        fun generic_injection<T>(x: T): u64;
+        axiom<T> forall v1: T, v2: T: v1 == v2 <==> generic_injection(v1) == generic_injection(v2);
+
+    }
+
+    // Axiomatized native function
+    native fun hash(v: vector<u8>): u64;
+    spec hash {
+        pragma opaque;
+        ensures result == injection(v);
+    }
+
+    // Positive Test.
+    fun test(v1: vector<u8>, v2: vector<u8>) {
+        assert!(hash(v1) == hash(v1), 1);
+        assert!(v1 == v2 || hash(v1) != hash(v2), 2);
+    }
+
+    // Negative Test.
+    fun negative_test(v1: vector<u8>, v2: vector<u8>) {
+        assert!(hash(v1) != hash(v2), 1);
+    }
+    spec negative_test {
+        aborts_if v1 == v2 with 1;
+    }
+
+    native fun hash_generic<T>(x: T): u64;
+    spec hash_generic {
+        pragma opaque;
+        ensures result == generic_injection(x);
+    }
+
+    // Positive Test.
+    fun test_generic(v1: vector<u8>, v2: vector<u8>) {
+        assert!(hash_generic(v1) == hash_generic(v1), 1);
+        assert!(v1 == v2 || hash(v1) != hash(v2), 2);
+    }
+
+    // Negative Test.
+    fun negative_test_generic(v1: vector<u8>, v2: vector<u8>) {
+        assert!(hash_generic(v1) != hash_generic(v2), 1);
+    }
+    spec negative_test_generic {
+        aborts_if v1 == v2 with 1;
+    }
+}
diff --git a/language/move-prover/tests/sources/functional/recursive_move_fun.move b/language/move-prover/tests/sources/functional/recursive_move_fun.move
new file mode 100644
index 0000000000..1e4db05b8e
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/recursive_move_fun.move
@@ -0,0 +1,34 @@
+module 0x1::test {
+    public fun pow(n: u64, e: u64): u64 {
+        if (e == 0) {
+            1
+        } else {
+            n * pow(n, e - 1)
+        }
+    }
+    spec pow {
+        // NOTE: opaque declaration is necessary for a recursive move function
+        pragma opaque;
+        ensures result == spec_pow(n, e);
+    }
+
+    spec fun spec_pow(n: num, e: num): num {
+        if (e == 0) { 1 } else { n * spec_pow(n, e - 1) }
+    }
+
+    public fun foo_1() {
+        foo_2();
+    }
+
+    fun foo_2() {
+        foo_3();
+        foo_2();
+    }
+    spec foo_2 {
+        pragma opaque;
+    }
+
+    fun foo_3() {
+    }
+
+}
diff --git a/language/move-prover/tests/sources/functional/recursive_move_funs_multi_hop.move b/language/move-prover/tests/sources/functional/recursive_move_funs_multi_hop.move
new file mode 100644
index 0000000000..11db9b0e95
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/recursive_move_funs_multi_hop.move
@@ -0,0 +1,31 @@
+module 0x42::m {
+    fun foo_1() {
+        foo_2();
+    }
+
+    fun foo_2() {
+        foo_3();
+    }
+
+    fun foo_3() {
+        foo_1();
+    }
+    spec foo_3 {
+        // NOTE: our current verification setup
+        // requires at least one function in a
+        // recursive function group to be marked
+        // as opaque (with preferably a complete
+        // set of aborts and ensures conditions).
+        //
+        // In this case, at least one of
+        // - foo_1()
+        // - foo_2()
+        // - foo_3()
+        // must be marked as opaque
+        //
+        // This is simiar to requiring annotations
+        // of loop invariants to break the cycles.
+
+        pragma opaque;
+    }
+}
diff --git a/language/move-prover/tests/sources/functional/references.exp b/language/move-prover/tests/sources/functional/references.exp
index e00cb08585..e4ffad5922 100644
--- a/language/move-prover/tests/sources/functional/references.exp
+++ b/language/move-prover/tests/sources/functional/references.exp
@@ -17,7 +17,6 @@ error: function does not abort under this condition
    =     at tests/sources/functional/references.move:52: mut_b
    =     at tests/sources/functional/references.move:72: mut_ref_incorrect
    =         b = <redacted>
-   =         b = <redacted>
    =     at tests/sources/functional/references.move:73: mut_ref_incorrect
    =     at tests/sources/functional/references.move:74: mut_ref_incorrect
    =     at tests/sources/functional/references.move:76: mut_ref_incorrect (spec)
diff --git a/language/move-prover/tests/sources/functional/script_incorrect.cvc5_exp b/language/move-prover/tests/sources/functional/script_incorrect.cvc5_exp
deleted file mode 100644
index 83fa6caf9d..0000000000
--- a/language/move-prover/tests/sources/functional/script_incorrect.cvc5_exp
+++ /dev/null
@@ -1,28 +0,0 @@
-Move prover returns: exiting with verification errors
-error: abort not covered by any of the `aborts_if` clauses
-   ┌─ tests/sources/functional/script_incorrect.move:11:1
-   │
-11 │ ╭ spec main {
-12 │ │     pragma verify = true;
-13 │ │     aborts_if false;
-14 │ │ }
-   │ ╰─^
-   │
-   ┌─ tests/sources/functional/script_provider.move:16:9
-   │
-16 │         move_to(account, Info<T>{})
-   │         ------- abort happened here with execution failure
-   │
-   =     at tests/sources/functional/script_incorrect.move:7: main
-   =         account = <redacted>
-   =     at tests/sources/functional/script_incorrect.move:8: main
-   =     at tests/sources/functional/script_provider.move:14: register
-   =         account = <redacted>
-   =     at tests/sources/functional/script_provider.move:15: register
-   =     at ../move-stdlib/sources/signer.move:12: address_of
-   =         s = <redacted>
-   =     at ../move-stdlib/sources/signer.move:13: address_of
-   =         result = <redacted>
-   =     at ../move-stdlib/sources/signer.move:14: address_of
-   =     at tests/sources/functional/script_provider.move:16: register
-   =         ABORTED
diff --git a/language/move-prover/tests/sources/functional/script_incorrect.exp b/language/move-prover/tests/sources/functional/script_incorrect.exp
index 07d38f0367..518b136ed2 100644
--- a/language/move-prover/tests/sources/functional/script_incorrect.exp
+++ b/language/move-prover/tests/sources/functional/script_incorrect.exp
@@ -1,28 +1,29 @@
 Move prover returns: exiting with verification errors
 error: abort not covered by any of the `aborts_if` clauses
-   ┌─ tests/sources/functional/script_incorrect.move:11:1
+   ┌─ tests/sources/functional/script_incorrect.move:12:5
    │
-11 │ ╭ spec main {
-12 │ │     pragma verify = true;
-13 │ │     aborts_if false;
-14 │ │ }
-   │ ╰─^
+12 │ ╭     spec main {
+13 │ │         aborts_if false;
+14 │ │     }
+   │ ╰─────^
    │
-   ┌─ tests/sources/functional/script_provider.move:15:9
+   ┌─ tests/sources/functional/script_provider.move:10:9
    │
-15 │         assert!(signer::address_of(account) == @0x1, 1);
-   │         ----------------------------------------------- abort happened here with code 0x1
+10 │         move_to(account, Info<T>{})
+   │         ------- abort happened here with execution failure
    │
-   =     at tests/sources/functional/script_incorrect.move:7: main
+   =     at tests/sources/functional/script_incorrect.move:6: main
    =         account = <redacted>
    =     at tests/sources/functional/script_incorrect.move:8: main
-   =     at tests/sources/functional/script_provider.move:14: register
+   =     at tests/sources/functional/script_incorrect.move:10: main
+   =     at tests/sources/functional/script_provider.move:8: register
    =         account = <redacted>
-   =     at tests/sources/functional/script_provider.move:15: register
+   =     at tests/sources/functional/script_provider.move:9: register
    =     at ../move-stdlib/sources/signer.move:12: address_of
    =         s = <redacted>
    =     at ../move-stdlib/sources/signer.move:13: address_of
    =         result = <redacted>
    =     at ../move-stdlib/sources/signer.move:14: address_of
-   =     at tests/sources/functional/script_provider.move:15: register
+   =     at tests/sources/functional/script_provider.move:9: register
+   =     at tests/sources/functional/script_provider.move:10: register
    =         ABORTED
diff --git a/language/move-prover/tests/sources/functional/script_incorrect.move b/language/move-prover/tests/sources/functional/script_incorrect.move
index d006678b15..d04884e8b2 100644
--- a/language/move-prover/tests/sources/functional/script_incorrect.move
+++ b/language/move-prover/tests/sources/functional/script_incorrect.move
@@ -1,15 +1,15 @@
 // flag: --dependency=tests/sources/functional/script_provider.move
-// separate_baseline: cvc5
 script {
-use 0x1::ScriptProvider;
+    use 0x1::ScriptProvider;
+    use std::signer;
 
-
-fun main<Token: store>(account: signer) {
-    ScriptProvider::register<Token>(&account);
-}
-
-spec main {
-    pragma verify = true;
-    aborts_if false;
-}
+    fun main<Token: store>(account: signer) {
+        spec {
+            assume signer::address_of(account) == @0x1;
+        };
+        ScriptProvider::register<Token>(&account);
+    }
+    spec main {
+        aborts_if false;
+    }
 }
diff --git a/language/move-prover/tests/sources/functional/script_provider.move b/language/move-prover/tests/sources/functional/script_provider.move
index 046fd50401..8f529fbed0 100644
--- a/language/move-prover/tests/sources/functional/script_provider.move
+++ b/language/move-prover/tests/sources/functional/script_provider.move
@@ -3,12 +3,6 @@ address 0x1 {
 module ScriptProvider {
     use std::signer;
 
-    spec module {
-        // TODO: This file gets errors for reasons I do not understand.
-        // The errors are produced non-deterministically, therefore turned off.
-        pragma verify = false;
-    }
-
     struct Info<phantom T> has key {}
 
     public fun register<T: store>(account: &signer) {
diff --git a/language/move-prover/tests/sources/functional/shift.exp b/language/move-prover/tests/sources/functional/shift.exp
index e16f0c79a9..daaab9068e 100644
--- a/language/move-prover/tests/sources/functional/shift.exp
+++ b/language/move-prover/tests/sources/functional/shift.exp
@@ -1,8 +1,8 @@
 Move prover returns: exiting with verification errors
 error: post-condition does not hold
-   ┌─ tests/sources/functional/shift.move:79:9
+   ┌─ tests/sources/functional/shift.move:95:9
    │
-79 │         ensures result == x << 10u8;
+95 │         ensures result == x << 10u8;
    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    │
    =     at tests/sources/functional/shift.move:65: shift_l_11_incorrect
@@ -10,20 +10,7 @@ error: post-condition does not hold
    =     at tests/sources/functional/shift.move:66: shift_l_11_incorrect
    =         result = <redacted>
    =     at tests/sources/functional/shift.move:67: shift_l_11_incorrect
-   =     at tests/sources/functional/shift.move:79: shift_l_11_incorrect (spec)
-
-error: post-condition does not hold
-   ┌─ tests/sources/functional/shift.move:30:9
-   │
-30 │         ensures result == x * 64 + 1;
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   │
-   =     at tests/sources/functional/shift.move:25: shiftl_64_incorrect
-   =         x = <redacted>
-   =     at tests/sources/functional/shift.move:26: shiftl_64_incorrect
-   =         result = <redacted>
-   =     at tests/sources/functional/shift.move:27: shiftl_64_incorrect
-   =     at tests/sources/functional/shift.move:30: shiftl_64_incorrect (spec)
+   =     at tests/sources/functional/shift.move:95: shift_l_11_incorrect (spec)
 
 error: post-condition does not hold
    ┌─ tests/sources/functional/shift.move:38:9
@@ -38,19 +25,6 @@ error: post-condition does not hold
    =     at tests/sources/functional/shift.move:35: shiftl_7_incorrect
    =     at tests/sources/functional/shift.move:38: shiftl_7_incorrect (spec)
 
-error: post-condition does not hold
-   ┌─ tests/sources/functional/shift.move:46:9
-   │
-46 │         ensures result == x / 64 + 1;
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   │
-   =     at tests/sources/functional/shift.move:41: shiftr_64_incorrect
-   =         x = <redacted>
-   =     at tests/sources/functional/shift.move:42: shiftr_64_incorrect
-   =         result = <redacted>
-   =     at tests/sources/functional/shift.move:43: shiftr_64_incorrect
-   =     at tests/sources/functional/shift.move:46: shiftr_64_incorrect (spec)
-
 error: post-condition does not hold
    ┌─ tests/sources/functional/shift.move:54:9
    │
@@ -63,17 +37,3 @@ error: post-condition does not hold
    =         result = <redacted>
    =     at tests/sources/functional/shift.move:51: shiftr_7_incorrect
    =     at tests/sources/functional/shift.move:54: shiftr_7_incorrect (spec)
-
-error: post-condition does not hold
-   ┌─ tests/sources/functional/shift.move:89:9
-   │
-89 │         ensures result == x << a;
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^
-   │
-   =     at tests/sources/functional/shift.move:82: var_shift_l_incorrect
-   =         x = <redacted>
-   =         a = <redacted>
-   =     at tests/sources/functional/shift.move:83: var_shift_l_incorrect
-   =         result = <redacted>
-   =     at tests/sources/functional/shift.move:84: var_shift_l_incorrect
-   =     at tests/sources/functional/shift.move:89: var_shift_l_incorrect (spec)
diff --git a/language/move-prover/tests/sources/functional/shift.move b/language/move-prover/tests/sources/functional/shift.move
index 6340d07b78..a7610b3247 100644
--- a/language/move-prover/tests/sources/functional/shift.move
+++ b/language/move-prover/tests/sources/functional/shift.move
@@ -27,7 +27,7 @@ module 0x42::TestShift {
     }
 
     spec shiftl_64_incorrect {
-        ensures result == x * 64 + 1;
+        aborts_if true;
     }
 
     fun shiftl_7_incorrect(x: u64): u64 {
@@ -43,7 +43,7 @@ module 0x42::TestShift {
     }
 
     spec shiftr_64_incorrect {
-        ensures result == x / 64 + 1;
+        aborts_if true;
     }
 
     fun shiftr_7_incorrect(x: u64): u64 {
@@ -66,6 +66,22 @@ module 0x42::TestShift {
         x << 11u8
     }
 
+    fun shift_r_11_correct_u32(x: u32): u32 {
+        x >> 11u8
+    }
+
+    spec shift_r_11_correct_u32 {
+        ensures result == x / (1 << 11);
+    }
+
+    fun shift_r_11_correct_u256(x: u256): u256 {
+        x >> 11u8
+    }
+
+    spec shift_r_11_correct_u256 {
+        ensures result == x / (1 << 11);
+    }
+
     fun shift_r_11_correct(x: u64): u64 {
         x >> 11u8
     }
@@ -79,13 +95,11 @@ module 0x42::TestShift {
         ensures result == x << 10u8;
     }
 
-    fun var_shift_l_incorrect(x: u64, a: u8): u64 {
+    fun var_shift_l_correct_1(x: u64, a: u8): u64 {
         x << a
     }
 
-    spec var_shift_l_incorrect {
-        // The spec allows bits to be shifted beyond destination.
-        // E.g., x = 2, a = 99
+    spec var_shift_l_correct_1 {
         ensures result == x << a;
     }
 
@@ -96,9 +110,48 @@ module 0x42::TestShift {
     spec var_shift_l_correct {
         // The spec allows bits to be shifted beyond destination.
         // E.g., x = 2, a = 99
+        aborts_if a >= 64;
         ensures result == (x << a) % (1 << 64);
     }
 
+    fun var_shift_l_incorrect_u32_1(x: u32, a: u8): u32 {
+        x << a
+    }
+
+    spec var_shift_l_incorrect_u32_1 {
+        ensures result == x << a;
+    }
+
+    fun var_shift_l_correct_u32(x: u32, a: u8): u32 {
+        x << a
+    }
+
+    spec var_shift_l_correct_u32 {
+        // The spec allows bits to be shifted beyond destination.
+        // E.g., x = 2, a = 99
+        aborts_if a >= 32;
+        ensures result == (x << a) % (1 << 32);
+    }
+
+    fun var_shift_l_incorrect_u256_1(x: u256, a: u8): u256 {
+        x << a
+    }
+
+    spec var_shift_l_incorrect_u256_1 {
+        ensures result == x << a;
+    }
+
+    fun var_shift_l_correct_u256(x: u256, a: u8): u256 {
+        x << a
+    }
+
+    spec var_shift_l_correct_u256 {
+        // The spec allows bits to be shifted beyond destination.
+        // E.g., x = 2, a = 99
+        aborts_if false;
+        ensures result == (x << a) % (max_u256() + 1);
+    }
+
     fun var_shift_r_correct(x: u64, a: u8): u64 {
         x >> a
     }
@@ -106,6 +159,29 @@ module 0x42::TestShift {
     spec var_shift_r_correct {
         // The spec allows bits to be shifted beyond destination.
         // E.g., x = 2, a = 99
+        aborts_if a >= 64;
+        ensures result == (x >> a);
+    }
+
+    fun var_shift_r_correct_u32(x: u32, a: u8): u32 {
+        x >> a
+    }
+
+    spec var_shift_r_correct_u32 {
+        // The spec allows bits to be shifted beyond destination.
+        // E.g., x = 2, a = 99
+        aborts_if a >= 32;
+        ensures result == (x >> a);
+    }
+
+    fun var_shift_r_correct_u256(x: u256, a: u8): u256 {
+        x >> a
+    }
+
+    spec var_shift_r_correct_u256 {
+        // The spec allows bits to be shifted beyond destination.
+        // E.g., x = 2, a = 99
+        aborts_if false;
         ensures result == (x >> a);
     }
 
diff --git a/language/move-prover/tests/sources/functional/table_contais_to_length.move b/language/move-prover/tests/sources/functional/table_contais_to_length.move
new file mode 100644
index 0000000000..9373cfe2a0
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/table_contais_to_length.move
@@ -0,0 +1,9 @@
+module 0x42::table_contains_to_length {
+    use extensions::table;
+
+    fun test(_t: &mut table::Table<address, u64>, _k: address) {}
+    spec test {
+        ensures table::spec_contains(old(_t), _k) ==> table::spec_len(old(_t)) > 0;
+        ensures table::spec_contains(old(_t), _k) ==> table::spec_len(_t) > 0;
+    }
+}
diff --git a/language/move-prover/tests/sources/functional/trace.exp b/language/move-prover/tests/sources/functional/trace.exp
index ea08b2a3c9..8e1a738de5 100644
--- a/language/move-prover/tests/sources/functional/trace.exp
+++ b/language/move-prover/tests/sources/functional/trace.exp
@@ -45,7 +45,7 @@ error: post-condition does not hold
    │
    = Related Global Memory:
    =         Resource name: TestTracing_R
-   =         Values:  {Address(26500): <redacted>, Default: empty}
+   =         Values:  {Address(18467): <redacted>, Default: empty}
    = Related Bindings:
    =         addr = <redacted>
    =         exists<R>(addr) = <redacted>
diff --git a/language/move-prover/tests/sources/functional/type_reflection.exp b/language/move-prover/tests/sources/functional/type_reflection.exp
new file mode 100644
index 0000000000..ecd3713943
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/type_reflection.exp
@@ -0,0 +1,15 @@
+Move prover returns: exiting with verification errors
+error: abort not covered by any of the `aborts_if` clauses
+   ┌─ tests/sources/functional/type_reflection.move:86:5
+   │
+84 │           type_info::type_of<T>()
+   │           ----------------------- abort happened here with execution failure
+85 │       }
+86 │ ╭     spec test_type_info_can_abort {
+87 │ │         // this should not pass
+88 │ │         aborts_if false;
+89 │ │     }
+   │ ╰─────^
+   │
+   =     at tests/sources/functional/type_reflection.move:84: test_type_info_can_abort
+   =         ABORTED
diff --git a/language/move-prover/tests/sources/functional/type_reflection.move b/language/move-prover/tests/sources/functional/type_reflection.move
new file mode 100644
index 0000000000..2e0ba200d3
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/type_reflection.move
@@ -0,0 +1,136 @@
+module extensions::type_info {
+    use std::string;
+
+    struct TypeInfo has copy, drop, store {
+        account_address: address,
+        module_name: vector<u8>,
+        struct_name: vector<u8>,
+    }
+
+    // these are mocks of the type reflection scheme
+    public native fun type_of<T>(): TypeInfo;
+    public native fun type_name<T>(): string::String;
+    spec native fun spec_is_struct<T>(): bool;
+
+    public fun account_address(type_info: &TypeInfo): address {
+        type_info.account_address
+    }
+
+    public fun module_name(type_info: &TypeInfo): vector<u8> {
+        type_info.module_name
+    }
+
+    public fun struct_name(type_info: &TypeInfo): vector<u8> {
+        type_info.struct_name
+    }
+}
+
+module 0x42::test {
+    use extensions::type_info;
+    use std::string;
+
+    struct MyTable<phantom K, phantom V> {}
+
+    fun test_type_name_concrete(): string::String {
+        spec {
+            assert type_info::type_name<bool>().bytes == b"bool";
+        };
+        type_info::type_name<MyTable<vector<bool>, address>>()
+    }
+    spec test_type_name_concrete {
+        ensures result.bytes == b"0x42::test::MyTable<vector<bool>, address>";
+    }
+
+    fun test_type_info_concrete(): type_info::TypeInfo {
+        spec {
+            assert type_info::type_of<MyTable<address, u128>>().account_address == @0x42;
+            assert type_info::type_of<MyTable<address, u128>>().module_name == b"test";
+            assert type_info::type_of<MyTable<address, u128>>().struct_name == b"MyTable";
+        };
+        type_info::type_of<MyTable<vector<bool>, address>>()
+    }
+    spec test_type_info_concrete {
+        ensures result.account_address == @0x42;
+        ensures result.module_name == b"test";
+        ensures result.struct_name == b"MyTable";
+    }
+
+    fun test_type_info_symbolic<T>(): type_info::TypeInfo {
+        spec {
+            assert type_info::type_of<T>().account_address == type_info::type_of<T>().account_address;
+            assert type_info::type_of<T>().module_name == type_info::type_of<T>().module_name;
+            assert type_info::type_of<T>().struct_name == type_info::type_of<T>().struct_name;
+        };
+        let info = type_info::type_of<T>();
+        assert!(type_info::account_address(&info) == @0x42, 1);
+        assert!(type_info::module_name(&info) == b"test", 2);
+        assert!(type_info::struct_name(&info) == b"MyTable", 2);
+        info
+    }
+    spec test_type_info_symbolic {
+        ensures result.account_address == @0x42;
+        ensures result.module_name == b"test";
+        ensures result.struct_name == b"MyTable";
+    }
+
+    fun test_type_info_ignores_type_param<T>(): type_info::TypeInfo {
+        type_info::type_of<MyTable<T, address>>()
+    }
+    spec test_type_info_ignores_type_param {
+        ensures result == type_info::type_of<MyTable<address, T>>();
+    }
+
+    fun test_type_info_can_abort<T>(): type_info::TypeInfo {
+        type_info::type_of<T>()
+    }
+    spec test_type_info_can_abort {
+        // this should not pass
+        aborts_if false;
+    }
+
+    fun test_type_info_aborts_if_partial<T>(): (type_info::TypeInfo, string::String) {
+        (type_info::type_of<T>(), type_info::type_name<T>())
+    }
+    spec test_type_info_aborts_if_partial {
+        pragma aborts_if_is_partial = true;
+        aborts_if type_info::type_name<T>().bytes == b"bool";
+        aborts_if type_info::type_name<T>().bytes == b"u64";
+        aborts_if type_info::type_name<T>().bytes == b"signer";
+        aborts_if type_info::type_name<T>().bytes == b"vector<address>";
+    }
+
+    fun test_type_info_aborts_if_full<T>(): (type_info::TypeInfo, string::String) {
+        (type_info::type_of<T>(), type_info::type_name<T>())
+    }
+    spec test_type_info_aborts_if_full {
+        aborts_if !type_info::spec_is_struct<T>();
+    }
+}
+
+module 0x43::test {
+    use std::ascii;
+    use std::type_name;
+
+    struct Pair<phantom K, phantom V> {}
+
+    fun test_type_name_concrete_simple(): ascii::String {
+        type_name::into_string(type_name::get<bool>())
+    }
+    spec test_type_name_concrete_simple {
+        ensures result.bytes == b"bool";
+    }
+
+    fun test_type_name_concrete_vector(): ascii::String {
+        type_name::into_string(type_name::get<vector<vector<u8>>>())
+    }
+    spec test_type_name_concrete_vector {
+        ensures result.bytes == b"vector<vector<u8>>";
+    }
+
+    fun test_type_name_concrete_struct(): ascii::String {
+        type_name::into_string(type_name::get<Pair<address, bool>>())
+    }
+    spec test_type_name_concrete_struct {
+        ensures result.bytes == b"00000000000000000000000000000043::test::Pair<address, bool>";
+    }
+}
diff --git a/language/move-prover/tests/sources/functional/type_reflection_ext.move b/language/move-prover/tests/sources/functional/type_reflection_ext.move
new file mode 100644
index 0000000000..8250f8ed69
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/type_reflection_ext.move
@@ -0,0 +1,36 @@
+// flag: --vector-theory=SmtArrayExt
+module extensions::type_info {
+    use std::string;
+
+    // these are mocks of the type reflection scheme
+    public native fun type_name<T>(): string::String;
+}
+
+module 0x42::test {
+    use extensions::type_info;
+    use std::string;
+
+    struct MyTable<phantom K, phantom V> {}
+
+    fun test_type_name_symbolic<T>(): string::String {
+        type_info::type_name<MyTable<T, T>>()
+    }
+    spec test_type_name_symbolic {
+        ensures result.bytes != b"vector<bool>";
+        ensures result != type_info::type_name<vector<T>>();
+    }
+}
+
+module 0x43::test {
+    use std::type_name;
+
+    struct Pair<phantom K, phantom V> {}
+
+    fun test_type_name_symbolic<T>(): type_name::TypeName {
+        type_name::get<Pair<T, T>>()
+    }
+    spec test_type_name_symbolic {
+        ensures result.name.bytes != b"vector<bool>";
+        ensures result != type_name::get<vector<T>>();
+    }
+}
diff --git a/language/move-prover/tests/sources/functional/unsupported.exp b/language/move-prover/tests/sources/functional/unsupported.exp
deleted file mode 100644
index 4282eeb945..0000000000
--- a/language/move-prover/tests/sources/functional/unsupported.exp
+++ /dev/null
@@ -1,6 +0,0 @@
-Move prover returns: exiting with condition generation errors
-error: Unsupported operator
-  ┌─ tests/sources/functional/unsupported.move:7:37
-  │
-7 │     public fun foo(i: u64): u64 { i & 0 }
-  │                                     ^
diff --git a/language/move-prover/tests/sources/functional/unsupported.move b/language/move-prover/tests/sources/functional/unsupported.move
deleted file mode 100644
index 8cfc6daa23..0000000000
--- a/language/move-prover/tests/sources/functional/unsupported.move
+++ /dev/null
@@ -1,13 +0,0 @@
-// false negatives for unsupported operators
-
-address 0x123 {
-
-  module M {
-
-    public fun foo(i: u64): u64 { i & 0 }
-
-    spec foo { ensures false; } // :(
-
-  }
-
-}
diff --git a/language/move-prover/tests/sources/functional/verify_custom_table.exp b/language/move-prover/tests/sources/functional/verify_custom_table.exp
new file mode 100644
index 0000000000..f7d8098222
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/verify_custom_table.exp
@@ -0,0 +1,88 @@
+Move prover returns: exiting with verification errors
+error: post-condition does not hold
+    ┌─ tests/sources/functional/verify_custom_table.move:249:9
+    │
+249 │         ensures spec_get(result.t, k1) == 23;
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/verify_custom_table.move:245: add_R_fail (spec)
+    =     at tests/sources/functional/verify_custom_table.move:246: add_R_fail (spec)
+    =     at tests/sources/functional/verify_custom_table.move:242: add_R_fail
+    =     at tests/sources/functional/verify_custom_table.move:223: make_R
+    =         t = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:224: make_R
+    =         t = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:225: make_R
+    =         t = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:226: make_R
+    =         result = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:227: make_R
+    =         result = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:243: add_R_fail
+    =     at tests/sources/functional/verify_custom_table.move:247: add_R_fail (spec)
+    =     at tests/sources/functional/verify_custom_table.move:248: add_R_fail (spec)
+    =     at tests/sources/functional/verify_custom_table.move:249: add_R_fail (spec)
+
+error: post-condition does not hold
+   ┌─ tests/sources/functional/verify_custom_table.move:74:9
+   │
+74 │         ensures spec_get(result, 1) == 1;
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   │
+   =     at tests/sources/functional/verify_custom_table.move:67: add_fail
+   =         t = <redacted>
+   =     at tests/sources/functional/verify_custom_table.move:68: add_fail
+   =         t = <redacted>
+   =     at tests/sources/functional/verify_custom_table.move:69: add_fail
+   =         t = <redacted>
+   =     at tests/sources/functional/verify_custom_table.move:70: add_fail
+   =         t = <redacted>
+   =     at tests/sources/functional/verify_custom_table.move:71: add_fail
+   =         result = <redacted>
+   =     at tests/sources/functional/verify_custom_table.move:72: add_fail
+   =     at tests/sources/functional/verify_custom_table.move:74: add_fail (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/verify_custom_table.move:199:9
+    │
+199 │         ensures result == spec_new();
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/verify_custom_table.move:194: create_and_insert_fail1
+    =         t = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:195: create_and_insert_fail1
+    =         t = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:196: create_and_insert_fail1
+    =         result = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:197: create_and_insert_fail1
+    =     at tests/sources/functional/verify_custom_table.move:199: create_and_insert_fail1 (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/verify_custom_table.move:208:9
+    │
+208 │         ensures result == spec_set(spec_new(), 1, 2);
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/verify_custom_table.move:203: create_and_insert_fail2
+    =         t = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:204: create_and_insert_fail2
+    =         t = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:205: create_and_insert_fail2
+    =         result = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:206: create_and_insert_fail2
+    =     at tests/sources/functional/verify_custom_table.move:208: create_and_insert_fail2 (spec)
+
+error: post-condition does not hold
+    ┌─ tests/sources/functional/verify_custom_table.move:190:9
+    │
+190 │         ensures result == spec_set(spec_new(), 1, 2);
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    │
+    =     at tests/sources/functional/verify_custom_table.move:182: create_and_insert_fail_due_to_typed_key_encoding
+    =         t = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:183: create_and_insert_fail_due_to_typed_key_encoding
+    =         t = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:184: create_and_insert_fail_due_to_typed_key_encoding
+    =         result = <redacted>
+    =     at tests/sources/functional/verify_custom_table.move:185: create_and_insert_fail_due_to_typed_key_encoding
+    =     at tests/sources/functional/verify_custom_table.move:190: create_and_insert_fail_due_to_typed_key_encoding (spec)
diff --git a/language/move-prover/tests/sources/functional/verify_custom_table.move b/language/move-prover/tests/sources/functional/verify_custom_table.move
new file mode 100644
index 0000000000..324e3fddc3
--- /dev/null
+++ b/language/move-prover/tests/sources/functional/verify_custom_table.move
@@ -0,0 +1,266 @@
+// Similar to `verify_table.move`, but against a custom implementation.
+module 0x42::table {
+    struct Table<phantom K: copy + drop, phantom V> has store {}
+    spec Table {
+        pragma intrinsic = map,
+        map_new = new,
+        map_destroy_empty = destroy_empty,
+        map_len = length,
+        map_is_empty = empty,
+        map_has_key = contains,
+        map_add_no_override = add,
+        map_add_override_if_exists = upsert,
+        map_del_must_exist = remove,
+        map_del_return_key = remove_return_key,
+        map_borrow = borrow,
+        map_borrow_mut = borrow_mut,
+        map_spec_new = spec_new,
+        map_spec_get = spec_get,
+        map_spec_set = spec_set,
+        map_spec_del = spec_remove,
+        map_spec_len = spec_len,
+        map_spec_has_key = spec_contains;
+    }
+
+    public native fun new<K: copy + drop, V: store>(): Table<K, V>;
+    public native fun destroy_empty<K: copy + drop, V>(table: Table<K, V>);
+    public native fun add<K: copy + drop, V>(table: &mut Table<K, V>, key: K, val: V);
+    public native fun upsert<K: copy + drop, V>(table: &mut Table<K, V>, key: K, val: V);
+    public native fun borrow<K: copy + drop, V>(table: &Table<K, V>, key: K): &V;
+    public native fun borrow_mut<K: copy + drop, V>(table: &mut Table<K, V>, key: K): &mut V;
+    public native fun length<K: copy + drop, V>(table: &Table<K, V>): u64;
+    public native fun empty<K: copy + drop, V>(table: &Table<K, V>): bool;
+    public native fun remove<K: copy + drop, V>(table: &mut Table<K, V>, key: K): V;
+    public native fun remove_return_key<K: copy + drop, V>(table: &mut Table<K, V>, key: K): (K, V);
+    public native fun contains<K: copy + drop, V>(table: &Table<K, V>, key: K): bool;
+
+    spec native fun spec_new<K, V>(): Table<K, V>;
+    spec native fun spec_len<K, V>(t: Table<K, V>): num;
+    spec native fun spec_contains<K, V>(t: Table<K, V>, k: K): bool;
+    spec native fun spec_set<K, V>(t: Table<K, V>, k: K, v: V): Table<K, V>;
+    spec native fun spec_remove<K, V>(t: Table<K, V>, k: K): Table<K, V>;
+    spec native fun spec_get<K, V>(t: Table<K, V>, k: K): V;
+}
+
+module 0x42::VerifyTable {
+    use 0x42::table::{Self, Table};
+    use 0x42::table::{spec_new, spec_get, spec_set, spec_len, spec_contains};
+
+    // TODO: test precise aborts behavior of all table functions
+
+    fun add(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        table::add(&mut t, 3, 4);
+        t
+    }
+    spec add {
+        ensures spec_contains(result, 1) && spec_contains(result, 2) && spec_contains(result, 3);
+        ensures spec_len(result) == 3;
+        ensures spec_get(result, 1) == 2;
+        ensures spec_get(result, 2) == 3;
+        ensures spec_get(result, 3) == 4;
+    }
+
+    fun add_fail(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        table::add(&mut t, 3, 4);
+        t
+    }
+    spec add_fail {
+        ensures spec_get(result, 1) == 1;
+    }
+
+    fun add_fail_exists(k1: u8, k2: u8): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, k1, 2);
+        table::add(&mut t, k2, 3);
+        t
+    }
+    spec add_fail_exists {
+        aborts_if k1 == k2;
+    }
+
+    fun add_override_if_exists(k1: u8, k2: u8): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, k1, 2);
+        table::upsert(&mut t, k2, 3);
+        t
+    }
+    spec add_override_if_exists {
+        aborts_if false;
+        ensures spec_get(result, k2) == 3;
+        ensures (k1 != k2) ==> spec_get(result, k1) == 2;
+    }
+
+    fun remove(): Table<u8, u64> {
+        let t = add();
+        table::remove(&mut t, 2);
+        t
+    }
+    spec remove {
+        ensures spec_contains(result, 1) && spec_contains(result, 3);
+        ensures spec_len(result) == 2;
+        ensures spec_get(result, 1) == 2;
+        ensures spec_get(result, 3) == 4;
+    }
+
+    fun remove_return_key(): Table<u8, u64> {
+        let t = add();
+        let (k, v) = table::remove_return_key(&mut t, 2);
+        spec {
+            assert (k == 2) && (v == 3);
+        };
+        t
+    }
+    spec remove_return_key {
+        ensures spec_contains(result, 1) && spec_contains(result, 3);
+        ensures spec_len(result) == 2;
+        ensures spec_get(result, 1) == 2;
+        ensures spec_get(result, 3) == 4;
+    }
+
+    fun contains_and_length(): (bool, bool, u64, Table<u8, u64>) {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        (table::contains(&t, 1), table::contains(&t, 3), table::length(&t), t)
+    }
+    spec contains_and_length {
+        ensures result_1 == true;
+        ensures result_2 == false;
+        ensures result_3 == 2;
+    }
+
+    fun borrow(): (u64, Table<u8, u64>) {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        let r = table::borrow(&t, 1);
+        (*r, t)
+    }
+    spec borrow {
+        ensures result_1 == 2;
+        ensures spec_len(result_2) == 1;
+        ensures spec_get(result_2, 1) == 2;
+    }
+
+    fun borrow_mut(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        let r = table::borrow_mut(&mut t, 1);
+        *r = 4;
+        t
+    }
+    spec borrow_mut {
+        ensures spec_contains(result, 1) && spec_contains(result, 2);
+        ensures spec_len(result) == 2;
+        ensures spec_get(result, 1) == 4;
+        ensures spec_get(result, 2) == 3;
+    }
+
+    fun create_empty(): Table<u8, u64> {
+        table::new()
+    }
+    spec create_empty {
+        ensures result == spec_new();
+    }
+
+    fun create_and_insert(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        t
+    }
+    spec create_and_insert {
+        ensures result == spec_set<u8, u64>(spec_new(), 1, 2);
+    }
+
+    fun create_and_insert_fail_due_to_typed_key_encoding(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        t
+    }
+    spec create_and_insert_fail_due_to_typed_key_encoding {
+        // TODO: this will fail potentially due to an error in type inference.
+        // `spec_set` should receive a type parameter of `<u8, u64>`, (see the
+        // example above) but the derived type is `<u256, u256>`.
+        ensures result == spec_set(spec_new(), 1, 2);
+    }
+
+    fun create_and_insert_fail1(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 1);
+        t
+    }
+    spec create_and_insert_fail1 {
+        ensures result == spec_new();
+    }
+
+    fun create_and_insert_fail2(): Table<u8, u64> {
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 1);
+        t
+    }
+    spec create_and_insert_fail2 {
+        ensures result == spec_set(spec_new(), 1, 2);
+    }
+
+    // ====================================================================================================
+    // Tables with structured keys
+
+    struct Key has copy, drop {
+        v: vector<u8>       // Use a vector so we do not have extensional equality
+    }
+
+    struct R {
+        t: Table<Key, u64>
+    }
+
+    fun make_R(): R {
+        let t = table::new<Key, u64>();
+        table::add(&mut t, Key{v: vector[1, 2]}, 22);
+        table::add(&mut t, Key{v: vector[2, 3]}, 23);
+        R{t}
+    }
+
+    fun add_R(): R {
+        make_R()
+    }
+    spec add_R {
+        let k1 = Key{v: concat(vec(1u8), vec(2u8))};
+        let k2 = Key{v: concat(vec(2u8), vec(3u8))};
+        ensures spec_len(result.t) == 2;
+        ensures spec_contains(result.t, k1) && spec_contains(result.t, k2);
+        ensures spec_get(result.t, k1) == 22;
+        ensures spec_get(result.t, k2) == 23;
+    }
+
+    fun add_R_fail(): R {
+        make_R()
+    }
+    spec add_R_fail {
+        let k1 = Key{v: concat(vec(1u8), vec(2u8))};
+        let k2 = Key{v: concat(vec(2u8), vec(3u8))};
+        ensures spec_len(result.t) == 2;
+        ensures spec_contains(result.t, k1) && spec_contains(result.t, k2);
+        ensures spec_get(result.t, k1) == 23;
+        ensures spec_get(result.t, k2) == 22;
+    }
+
+    fun borrow_mut_R(): R {
+        let r = make_R();
+        let x = table::borrow_mut(&mut r.t, Key{v: vector[1, 2]});
+        *x = *x * 2;
+        r
+    }
+    spec borrow_mut_R {
+        let k1 = Key{v: concat(vec(1u8), vec(2u8))};
+        let k2 = Key{v: concat(vec(2u8), vec(3u8))};
+        ensures spec_len(result.t) == 2;
+        ensures spec_get(result.t, k1) == 44;
+        ensures spec_get(result.t, k2) == 23;
+    }
+}
diff --git a/language/move-prover/tests/sources/functional/verify_table.move b/language/move-prover/tests/sources/functional/verify_table.move
index b3e1aa2b38..d7df2106f6 100644
--- a/language/move-prover/tests/sources/functional/verify_table.move
+++ b/language/move-prover/tests/sources/functional/verify_table.move
@@ -1,15 +1,15 @@
 // This file verifies the intrinsic Table implementation.
 module 0x42::VerifyTable {
-    use Extensions::Table::{Self, Table};
-    use Extensions::Table::{spec_get, spec_len, spec_contains};
+    use extensions::table::{Self, Table};
+    use extensions::table::{spec_get, spec_len, spec_contains};
 
     // TODO: test precise aborts behavior of all table functions
 
     fun add(): Table<u8, u64> {
-        let t = Table::new<u8, u64>();
-        Table::add(&mut t, 1, 2);
-        Table::add(&mut t, 2, 3);
-        Table::add(&mut t, 3, 4);
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        table::add(&mut t, 3, 4);
         t
     }
     spec add {
@@ -21,10 +21,10 @@ module 0x42::VerifyTable {
     }
 
     fun add_fail(): Table<u8, u64> {
-        let t = Table::new<u8, u64>();
-        Table::add(&mut t, 1, 2);
-        Table::add(&mut t, 2, 3);
-        Table::add(&mut t, 3, 4);
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        table::add(&mut t, 3, 4);
         t
     }
     spec add_fail {
@@ -32,9 +32,9 @@ module 0x42::VerifyTable {
     }
 
     fun add_fail_exists(k1: u8, k2: u8): Table<u8, u64> {
-        let t = Table::new<u8, u64>();
-        Table::add(&mut t, k1, 2);
-        Table::add(&mut t, k2, 3);
+        let t = table::new<u8, u64>();
+        table::add(&mut t, k1, 2);
+        table::add(&mut t, k2, 3);
         t
     }
     spec add_fail_exists {
@@ -43,7 +43,7 @@ module 0x42::VerifyTable {
 
     fun remove(): Table<u8, u64> {
         let t = add();
-        Table::remove(&mut t, 2);
+        table::remove(&mut t, 2);
         t
     }
     spec remove {
@@ -54,10 +54,10 @@ module 0x42::VerifyTable {
     }
 
     fun contains_and_length(): (bool, bool, u64, Table<u8, u64>) {
-        let t = Table::new<u8, u64>();
-        Table::add(&mut t, 1, 2);
-        Table::add(&mut t, 2, 3);
-        (Table::contains(&t, 1), Table::contains(&t, 3), Table::length(&t), t)
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        (table::contains(&t, 1), table::contains(&t, 3), table::length(&t), t)
     }
     spec contains_and_length {
         ensures result_1 == true;
@@ -66,9 +66,9 @@ module 0x42::VerifyTable {
     }
 
     fun borrow(): (u64, Table<u8, u64>) {
-        let t = Table::new<u8, u64>();
-        Table::add(&mut t, 1, 2);
-        let r = Table::borrow(&t, 1);
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        let r = table::borrow(&t, 1);
         (*r, t)
     }
     spec borrow {
@@ -78,10 +78,10 @@ module 0x42::VerifyTable {
     }
 
     fun borrow_mut(): Table<u8, u64> {
-        let t = Table::new<u8, u64>();
-        Table::add(&mut t, 1, 2);
-        Table::add(&mut t, 2, 3);
-        let r = Table::borrow_mut(&mut t, 1);
+        let t = table::new<u8, u64>();
+        table::add(&mut t, 1, 2);
+        table::add(&mut t, 2, 3);
+        let r = table::borrow_mut(&mut t, 1);
         *r = 4;
         t
     }
@@ -104,9 +104,9 @@ module 0x42::VerifyTable {
     }
 
     fun make_R(): R {
-        let t = Table::new<Key, u64>();
-        Table::add(&mut t, Key{v: vector[1, 2]}, 22);
-        Table::add(&mut t, Key{v: vector[2, 3]}, 23);
+        let t = table::new<Key, u64>();
+        table::add(&mut t, Key{v: vector[1, 2]}, 22);
+        table::add(&mut t, Key{v: vector[2, 3]}, 23);
         R{t}
     }
 
@@ -136,7 +136,7 @@ module 0x42::VerifyTable {
 
     fun borrow_mut_R(): R {
         let r = make_R();
-        let x = Table::borrow_mut(&mut r.t, Key{v: vector[1, 2]});
+        let x = table::borrow_mut(&mut r.t, Key{v: vector[1, 2]});
         *x = *x * 2;
         r
     }
diff --git a/language/move-prover/tests/sources/functional/verify_vector.move b/language/move-prover/tests/sources/functional/verify_vector.move
index fafcbbf092..ce18e656ca 100644
--- a/language/move-prover/tests/sources/functional/verify_vector.move
+++ b/language/move-prover/tests/sources/functional/verify_vector.move
@@ -291,6 +291,18 @@ module 0x42::VerifyVector {
         ensures old(v[i]) == result;
     }
 
+    // Add an element to the vector at index.
+    fun verify_model_insert<Element>(v: &mut vector<Element>, e: Element, i: u64) {
+        vector::insert(v, e, i); // inlining the built-in Boogie procedure
+    }
+    spec verify_model_insert {
+        aborts_if i > len(v);
+        ensures len(v) == len(old(v)) + 1;
+        ensures v[i] == e;
+        ensures old(v[0..i]) == v[0..i];
+        ensures old(v)[i..len(old(v))] == v[i+1..len(v)];
+    }
+
     // Remove the `i`th element E of the vector by swapping it with the last element,
     // and then popping it off
     // It is O(1), but does not preserve ordering
diff --git a/language/move-prover/tests/sources/regression/bug_828.move b/language/move-prover/tests/sources/regression/bug_828.move
new file mode 100644
index 0000000000..72235dcc8b
--- /dev/null
+++ b/language/move-prover/tests/sources/regression/bug_828.move
@@ -0,0 +1,24 @@
+module 0x42::test {
+    fun foo(i: u64) {
+        assert!(i == 50, 0);
+        let old_i = i;
+        spec {
+            assert old_i == 50;
+        };
+        while ({
+            spec {
+                invariant old_i <= i && i <= 100;
+            };
+            i < 100
+        }) {
+            spec {
+                // fail to prove before the fix
+                assert old_i == 50;
+            };
+            i = i + 1;
+        };
+        spec {
+            assert i == 100;
+        };
+    }
+}
diff --git a/language/move-prover/tests/sources/regression/map_equality_encoding.move b/language/move-prover/tests/sources/regression/map_equality_encoding.move
new file mode 100644
index 0000000000..ebd4f10217
--- /dev/null
+++ b/language/move-prover/tests/sources/regression/map_equality_encoding.move
@@ -0,0 +1,9 @@
+module 0x42::map_equality {
+    use extensions::table;
+
+    fun test(_t: &mut table::Table<address, u64>, _k: address) {}
+    spec test {
+        let old_v = table::spec_get(_t, _k);
+        ensures table::spec_contains(old(_t), _k) ==> _t == table::spec_set(old(_t), _k, old_v + 0);
+    }
+}
diff --git a/language/move-prover/tests/sources/regression/mono_on_axiom_spec_type.move b/language/move-prover/tests/sources/regression/mono_on_axiom_spec_type.move
new file mode 100644
index 0000000000..c43b2d9768
--- /dev/null
+++ b/language/move-prover/tests/sources/regression/mono_on_axiom_spec_type.move
@@ -0,0 +1,22 @@
+module 0x42::mono_on_axiom_spec_type {
+    struct SetByVec {
+        elems: vector<u8>,
+    }
+    spec SetByVec {
+        invariant forall i in 0..len(elems), j in 0..len(elems):
+            elems[i] == elems[j] ==> i == j;
+    }
+
+    fun new_set(): SetByVec {
+        SetByVec {
+            elems: std::vector::empty(),
+        }
+    }
+
+    spec module {
+        fun deserialize<T>(bytes: vector<u8>): T;
+
+        axiom<T> forall b1: vector<u8>, b2: vector<u8>:
+            (deserialize<T>(b1) == deserialize<T>(b2) ==> b1 == b2);
+    }
+}
diff --git a/language/move-prover/tests/sources/regression/moved_local_with_refs.move b/language/move-prover/tests/sources/regression/moved_local_with_refs.move
new file mode 100644
index 0000000000..2bc16f0613
--- /dev/null
+++ b/language/move-prover/tests/sources/regression/moved_local_with_refs.move
@@ -0,0 +1,33 @@
+module 0x42::MovedLocalWithRefs {
+    use std::vector;
+
+    struct S has drop {
+        x: u64,
+    }
+
+    fun moved_local_in_loop(length: u64, limit: u64): vector<S> {
+        let v = vector::empty();
+        let i = 0;
+        while ({
+            spec {
+                invariant i <= length;
+                invariant len(v) == i;
+                invariant forall k in 0..i: v[k].x <= limit;
+            };
+            (i < length)
+        }) {
+            let s = S { x : 100 };
+            if (s.x >= limit) {
+                s.x = limit;
+            };
+            vector::push_back(&mut v, s);
+            i = i + 1;
+        };
+        v
+    }
+
+    spec moved_local_in_loop {
+        ensures len(result) == length;
+        ensures forall e in result: e.x <= limit;
+    }
+}
diff --git a/language/move-prover/tests/sources/regression/vector_200630.move b/language/move-prover/tests/sources/regression/vector_200630.move
index b8ad276187..1e6968ec5a 100644
--- a/language/move-prover/tests/sources/regression/vector_200630.move
+++ b/language/move-prover/tests/sources/regression/vector_200630.move
@@ -15,7 +15,7 @@ module 0x42::TestVector {
 
         *int_ref = 42;
         spec {
-            assert 42 == v[i].x;
+            assert 42u64 == v[i].x;
         };
         true
     }
diff --git a/language/move-prover/tests/testsuite.rs b/language/move-prover/tests/testsuite.rs
index 0fdf62b1e3..28637688f9 100644
--- a/language/move-prover/tests/testsuite.rs
+++ b/language/move-prover/tests/testsuite.rs
@@ -157,7 +157,7 @@ fn test_runner_for_feature(path: &Path, feature: &Feature) -> datatest_stable::R
         Err(err) => format!("Move prover returns: {}\n", err),
     };
     if baseline_valid {
-        diags += &String::from_utf8_lossy(&error_writer.into_inner()).to_string();
+        diags += &String::from_utf8_lossy(&error_writer.into_inner());
         if let Some(ref path) = baseline_path {
             verify_or_update_baseline(path.as_path(), &diags)?
         } else if !diags.is_empty() {
@@ -207,7 +207,7 @@ fn get_flags_and_baseline(
     flags.push("--named-addresses=std=0x1".to_string());
 
     // Add flag assigning an address to stdlib extensions.
-    flags.push("--named-addresses=Extensions=0x2".to_string());
+    flags.push("--named-addresses=extensions=0x2".to_string());
 
     // Add flags specific to the feature.
     flags.extend(feature.flags.iter().map(|f| f.to_string()));
diff --git a/language/move-prover/tools/spec-flatten/Cargo.toml b/language/move-prover/tools/spec-flatten/Cargo.toml
index a24c5b9c96..2f974e4e67 100644
--- a/language/move-prover/tools/spec-flatten/Cargo.toml
+++ b/language/move-prover/tools/spec-flatten/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Formal specification flattening tool"
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
diff --git a/language/move-prover/tools/spec-flatten/src/ast_print.rs b/language/move-prover/tools/spec-flatten/src/ast_print.rs
index 4d56d49970..32a06b207e 100644
--- a/language/move-prover/tools/spec-flatten/src/ast_print.rs
+++ b/language/move-prover/tools/spec-flatten/src/ast_print.rs
@@ -49,6 +49,11 @@ impl SpecPrinter<'_> {
                     v.iter().map(|e| format!("{:02x}", e)).join(""),
                 )),
             },
+            Value::AddressArray(v) => Self::doc(format!(
+                "x\"{}\"",
+                v.iter().map(|e| format!("@{:#x}", e)).join(""),
+            )),
+            Value::Vector(v) => Self::doc(v.iter().map(|e| format!("{}", e)).join(",")),
         }
     }
 
@@ -56,8 +61,11 @@ impl SpecPrinter<'_> {
         match ty {
             Type::Primitive(PrimitiveType::Bool) => Self::doc("bool"),
             Type::Primitive(PrimitiveType::U8) => Self::doc("u8"),
+            Type::Primitive(PrimitiveType::U16) => Self::doc("u16"),
+            Type::Primitive(PrimitiveType::U32) => Self::doc("u32"),
             Type::Primitive(PrimitiveType::U64) => Self::doc("u64"),
             Type::Primitive(PrimitiveType::U128) => Self::doc("u128"),
+            Type::Primitive(PrimitiveType::U256) => Self::doc("u256"),
             Type::Primitive(PrimitiveType::Address) => Self::doc("address"),
             Type::Primitive(PrimitiveType::Signer) => Self::doc("signer"),
             Type::Primitive(PrimitiveType::Num) => Self::doc("num"),
@@ -304,6 +312,9 @@ impl SpecPrinter<'_> {
                     Ge => print_call_binary(">="),
                     // unary operators
                     Not => print_call_unary("!"),
+                    Cast => print_call_unary("cast"),
+                    Int2Bv => print_call_unary("int2bv"),
+                    Bv2Int => print_call_unary("bv2int"),
                     // built-in functions
                     Len => print_call_fun("len"),
                     Old => print_call_fun("old"),
@@ -323,8 +334,11 @@ impl SpecPrinter<'_> {
                     TypeDomain => self.print_type(&self.env.get_node_type(*node_id), ty_params),
                     ResourceDomain => self.print_type(&self.env.get_node_type(*node_id), ty_params),
                     MaxU8 => Self::doc("MAX_U8"),
+                    MaxU16 => Self::doc("MAX_U16"),
+                    MaxU32 => Self::doc("MAX_U32"),
                     MaxU64 => Self::doc("MAX_U64"),
                     MaxU128 => Self::doc("MAX_U128"),
+                    MaxU256 => Self::doc("MAX_U256"),
                     // unable to be specified by users
                     CanModify | AbortFlag | AbortCode | WellFormed | BoxValue | UnboxValue
                     | EmptyEventStore | ExtendEventStore | EventStoreIncludes
@@ -535,7 +549,7 @@ impl SpecPrinter<'_> {
     {
         Self::concat([
             base,
-            Self::wrap("<", Self::sep_comma_space(items.into_iter().map(func)), ">"),
+            Self::wrap('<', Self::sep_comma_space(items.into_iter().map(func)), ">"),
         ])
     }
 
diff --git a/language/move-stdlib/Cargo.toml b/language/move-stdlib/Cargo.toml
index 5ed780418b..50f552e08e 100644
--- a/language/move-stdlib/Cargo.toml
+++ b/language/move-stdlib/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "move-stdlib"
 version = "0.1.1"
-edition = "2018"
+edition = "2021"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem stdlib"
 repository = "https://github.com/diem/diem"
@@ -26,6 +26,7 @@ smallvec = "1.6.1"
 sha2 = "0.9.3"
 sha3 = "0.9.1"
 anyhow = "1.0.52"
+hex = "0.4.3"
 
 [dev-dependencies]
 move-unit-test = { path = "../tools/move-unit-test" }
diff --git a/language/move-stdlib/docs/ascii.md b/language/move-stdlib/docs/ascii.md
index 093f67d161..108a9367b8 100644
--- a/language/move-stdlib/docs/ascii.md
+++ b/language/move-stdlib/docs/ascii.md
@@ -123,7 +123,7 @@ An ASCII character.
 An invalid ASCII character was encountered when creating an ASCII string.
 
 
-<pre><code><b>const</b> <a href="ascii.md#0x1_ascii_EINVALID_ASCII_CHARACTER">EINVALID_ASCII_CHARACTER</a>: u64 = 0;
+<pre><code><b>const</b> <a href="ascii.md#0x1_ascii_EINVALID_ASCII_CHARACTER">EINVALID_ASCII_CHARACTER</a>: u64 = 65536;
 </code></pre>
 
 
@@ -174,7 +174,7 @@ Convert a vector of bytes <code>bytes</code> into an <code><a href="ascii.md#0x1
 <code>bytes</code> contains non-ASCII characters.
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_string">string</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ascii.md#0x1_ascii_String">ascii::String</a>
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string">string</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ascii.md#0x1_ascii_String">ascii::String</a>
 </code></pre>
 
 
@@ -183,7 +183,7 @@ Convert a vector of bytes <code>bytes</code> into an <code><a href="ascii.md#0x1
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_string">string</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ascii.md#0x1_ascii_String">String</a> {
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string">string</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="ascii.md#0x1_ascii_String">String</a> {
    <b>let</b> x = <a href="ascii.md#0x1_ascii_try_string">try_string</a>(bytes);
    <b>assert</b>!(
         <a href="option.md#0x1_option_is_some">option::is_some</a>(&x),
@@ -257,11 +257,11 @@ characters. Otherwise returns <code>None</code>.
 
 ## Function `all_characters_printable`
 
-Returns <code><b>true</b></code> if all characters in <code>string</code> are printable characters
+Returns <code><b>true</b></code> if all characters in <code><a href="string.md#0x1_string">string</a></code> are printable characters
 Returns <code><b>false</b></code> otherwise. Not all <code><a href="ascii.md#0x1_ascii_String">String</a></code>s are printable strings.
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_all_characters_printable">all_characters_printable</a>(string: &<a href="ascii.md#0x1_ascii_String">ascii::String</a>): bool
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_all_characters_printable">all_characters_printable</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">ascii::String</a>): bool
 </code></pre>
 
 
@@ -270,23 +270,23 @@ Returns <code><b>false</b></code> otherwise. Not all <code><a href="ascii.md#0x1
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_all_characters_printable">all_characters_printable</a>(string: &<a href="ascii.md#0x1_ascii_String">String</a>): bool {
-   <b>let</b> len = <a href="vector.md#0x1_vector_length">vector::length</a>(&string.bytes);
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_all_characters_printable">all_characters_printable</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">String</a>): bool {
+   <b>let</b> len = <a href="vector.md#0x1_vector_length">vector::length</a>(&<a href="string.md#0x1_string">string</a>.bytes);
    <b>let</b> i = 0;
    <b>while</b> ({
        <b>spec</b> {
            <b>invariant</b> i &lt;= len;
-           <b>invariant</b> <b>forall</b> j in 0..i: <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(string.bytes[j]);
+           <b>invariant</b> <b>forall</b> j in 0..i: <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(<a href="string.md#0x1_string">string</a>.bytes[j]);
        };
        i &lt; len
    }) {
-       <b>let</b> byte = *<a href="vector.md#0x1_vector_borrow">vector::borrow</a>(&string.bytes, i);
+       <b>let</b> byte = *<a href="vector.md#0x1_vector_borrow">vector::borrow</a>(&<a href="string.md#0x1_string">string</a>.bytes, i);
        <b>if</b> (!<a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(byte)) <b>return</b> <b>false</b>;
        i = i + 1;
    };
    <b>spec</b> {
        <b>assert</b> i == len;
-       <b>assert</b> <b>forall</b> j in 0..len: <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(string.bytes[j]);
+       <b>assert</b> <b>forall</b> j in 0..len: <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(<a href="string.md#0x1_string">string</a>.bytes[j]);
    };
    <b>true</b>
 }
@@ -301,7 +301,7 @@ Returns <code><b>false</b></code> otherwise. Not all <code><a href="ascii.md#0x1
 
 
 
-<pre><code><b>ensures</b> result ==&gt; (<b>forall</b> j in 0..len(string.bytes): <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(string.bytes[j]));
+<pre><code><b>ensures</b> result ==&gt; (<b>forall</b> j in 0..len(<a href="string.md#0x1_string">string</a>.bytes): <a href="ascii.md#0x1_ascii_is_printable_char">is_printable_char</a>(<a href="string.md#0x1_string">string</a>.bytes[j]));
 </code></pre>
 
 
@@ -314,7 +314,7 @@ Returns <code><b>false</b></code> otherwise. Not all <code><a href="ascii.md#0x1
 
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_push_char">push_char</a>(string: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">ascii::String</a>, char: <a href="ascii.md#0x1_ascii_Char">ascii::Char</a>)
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_push_char">push_char</a>(<a href="string.md#0x1_string">string</a>: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">ascii::String</a>, char: <a href="ascii.md#0x1_ascii_Char">ascii::Char</a>)
 </code></pre>
 
 
@@ -323,8 +323,8 @@ Returns <code><b>false</b></code> otherwise. Not all <code><a href="ascii.md#0x1
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_push_char">push_char</a>(string: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">String</a>, char: <a href="ascii.md#0x1_ascii_Char">Char</a>) {
-    <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> string.bytes, char.byte);
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_push_char">push_char</a>(<a href="string.md#0x1_string">string</a>: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">String</a>, char: <a href="ascii.md#0x1_ascii_Char">Char</a>) {
+    <a href="vector.md#0x1_vector_push_back">vector::push_back</a>(&<b>mut</b> <a href="string.md#0x1_string">string</a>.bytes, char.byte);
 }
 </code></pre>
 
@@ -337,7 +337,7 @@ Returns <code><b>false</b></code> otherwise. Not all <code><a href="ascii.md#0x1
 
 
 
-<pre><code><b>ensures</b> len(string.bytes) == len(<b>old</b>(string.bytes)) + 1;
+<pre><code><b>ensures</b> len(<a href="string.md#0x1_string">string</a>.bytes) == len(<b>old</b>(<a href="string.md#0x1_string">string</a>.bytes)) + 1;
 </code></pre>
 
 
@@ -350,7 +350,7 @@ Returns <code><b>false</b></code> otherwise. Not all <code><a href="ascii.md#0x1
 
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_pop_char">pop_char</a>(string: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">ascii::String</a>): <a href="ascii.md#0x1_ascii_Char">ascii::Char</a>
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_pop_char">pop_char</a>(<a href="string.md#0x1_string">string</a>: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">ascii::String</a>): <a href="ascii.md#0x1_ascii_Char">ascii::Char</a>
 </code></pre>
 
 
@@ -359,8 +359,8 @@ Returns <code><b>false</b></code> otherwise. Not all <code><a href="ascii.md#0x1
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_pop_char">pop_char</a>(string: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">String</a>): <a href="ascii.md#0x1_ascii_Char">Char</a> {
-    <a href="ascii.md#0x1_ascii_Char">Char</a> { byte: <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> string.bytes) }
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_pop_char">pop_char</a>(<a href="string.md#0x1_string">string</a>: &<b>mut</b> <a href="ascii.md#0x1_ascii_String">String</a>): <a href="ascii.md#0x1_ascii_Char">Char</a> {
+    <a href="ascii.md#0x1_ascii_Char">Char</a> { byte: <a href="vector.md#0x1_vector_pop_back">vector::pop_back</a>(&<b>mut</b> <a href="string.md#0x1_string">string</a>.bytes) }
 }
 </code></pre>
 
@@ -373,7 +373,7 @@ Returns <code><b>false</b></code> otherwise. Not all <code><a href="ascii.md#0x1
 
 
 
-<pre><code><b>ensures</b> len(string.bytes) == len(<b>old</b>(string.bytes)) - 1;
+<pre><code><b>ensures</b> len(<a href="string.md#0x1_string">string</a>.bytes) == len(<b>old</b>(<a href="string.md#0x1_string">string</a>.bytes)) - 1;
 </code></pre>
 
 
@@ -386,7 +386,7 @@ Returns <code><b>false</b></code> otherwise. Not all <code><a href="ascii.md#0x1
 
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_length">length</a>(string: &<a href="ascii.md#0x1_ascii_String">ascii::String</a>): u64
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_length">length</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">ascii::String</a>): u64
 </code></pre>
 
 
@@ -395,8 +395,8 @@ Returns <code><b>false</b></code> otherwise. Not all <code><a href="ascii.md#0x1
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_length">length</a>(string: &<a href="ascii.md#0x1_ascii_String">String</a>): u64 {
-    <a href="vector.md#0x1_vector_length">vector::length</a>(<a href="ascii.md#0x1_ascii_as_bytes">as_bytes</a>(string))
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_length">length</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">String</a>): u64 {
+    <a href="vector.md#0x1_vector_length">vector::length</a>(<a href="ascii.md#0x1_ascii_as_bytes">as_bytes</a>(<a href="string.md#0x1_string">string</a>))
 }
 </code></pre>
 
@@ -408,10 +408,10 @@ Returns <code><b>false</b></code> otherwise. Not all <code><a href="ascii.md#0x1
 
 ## Function `as_bytes`
 
-Get the inner bytes of the <code>string</code> as a reference
+Get the inner bytes of the <code><a href="string.md#0x1_string">string</a></code> as a reference
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_as_bytes">as_bytes</a>(string: &<a href="ascii.md#0x1_ascii_String">ascii::String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_as_bytes">as_bytes</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">ascii::String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
 </code></pre>
 
 
@@ -420,8 +420,8 @@ Get the inner bytes of the <code>string</code> as a reference
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_as_bytes">as_bytes</a>(string: &<a href="ascii.md#0x1_ascii_String">String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt; {
-   &string.bytes
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_as_bytes">as_bytes</a>(<a href="string.md#0x1_string">string</a>: &<a href="ascii.md#0x1_ascii_String">String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+   &<a href="string.md#0x1_string">string</a>.bytes
 }
 </code></pre>
 
@@ -433,10 +433,10 @@ Get the inner bytes of the <code>string</code> as a reference
 
 ## Function `into_bytes`
 
-Unpack the <code>string</code> to get its backing bytes
+Unpack the <code><a href="string.md#0x1_string">string</a></code> to get its backing bytes
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_into_bytes">into_bytes</a>(string: <a href="ascii.md#0x1_ascii_String">ascii::String</a>): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_into_bytes">into_bytes</a>(<a href="string.md#0x1_string">string</a>: <a href="ascii.md#0x1_ascii_String">ascii::String</a>): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
 </code></pre>
 
 
@@ -445,8 +445,8 @@ Unpack the <code>string</code> to get its backing bytes
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_into_bytes">into_bytes</a>(string: <a href="ascii.md#0x1_ascii_String">String</a>): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt; {
-   <b>let</b> <a href="ascii.md#0x1_ascii_String">String</a> { bytes } = string;
+<pre><code><b>public</b> <b>fun</b> <a href="ascii.md#0x1_ascii_into_bytes">into_bytes</a>(<a href="string.md#0x1_string">string</a>: <a href="ascii.md#0x1_ascii_String">String</a>): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+   <b>let</b> <a href="ascii.md#0x1_ascii_String">String</a> { bytes } = <a href="string.md#0x1_string">string</a>;
    bytes
 }
 </code></pre>
diff --git a/language/move-stdlib/docs/bit_vector.md b/language/move-stdlib/docs/bit_vector.md
index 83eb31e106..5916e183de 100644
--- a/language/move-stdlib/docs/bit_vector.md
+++ b/language/move-stdlib/docs/bit_vector.md
@@ -63,7 +63,7 @@
 The provided index is out of bounds
 
 
-<pre><code><b>const</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>: u64 = 0;
+<pre><code><b>const</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>: u64 = 131072;
 </code></pre>
 
 
@@ -73,7 +73,7 @@ The provided index is out of bounds
 An invalid length of bitvector was given
 
 
-<pre><code><b>const</b> <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>: u64 = 1;
+<pre><code><b>const</b> <a href="bit_vector.md#0x1_bit_vector_ELENGTH">ELENGTH</a>: u64 = 131073;
 </code></pre>
 
 
@@ -219,21 +219,28 @@ Set the bit at <code>bit_index</code> in the <code>bitvector</code> regardless o
 
 
 
+</details>
 
-<pre><code><b>include</b> <a href="bit_vector.md#0x1_bit_vector_UnsetAbortsIf">UnsetAbortsIf</a>;
-<b>ensures</b> bitvector.bit_field[bit_index];
-</code></pre>
+<a name="0x1_bit_vector_unset"></a>
 
+## Function `unset`
 
+Unset the bit at <code>bit_index</code> in the <code>bitvector</code> regardless of its previous state.
 
 
-<a name="0x1_bit_vector_UnsetAbortsIf"></a>
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, bit_index: u64)
+</code></pre>
 
 
-<pre><code><b>schema</b> <a href="bit_vector.md#0x1_bit_vector_UnsetAbortsIf">UnsetAbortsIf</a> {
-    bitvector: <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>;
-    bit_index: u64;
-    <b>aborts_if</b> bit_index &gt;= <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector) <b>with</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>;
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, bit_index: u64) {
+    <b>assert</b>!(bit_index &lt; <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field), <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>);
+    <b>let</b> x = <a href="vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> bitvector.bit_field, bit_index);
+    *x = <b>false</b>;
 }
 </code></pre>
 
@@ -241,26 +248,25 @@ Set the bit at <code>bit_index</code> in the <code>bitvector</code> regardless o
 
 </details>
 
-<a name="0x1_bit_vector_unset"></a>
+<details>
+<summary>Specification</summary>
 
-## Function `unset`
 
-Unset the bit at <code>bit_index</code> in the <code>bitvector</code> regardless of its previous state.
 
-
-<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">bit_vector::BitVector</a>, bit_index: u64)
+<pre><code><b>include</b> <a href="bit_vector.md#0x1_bit_vector_UnsetAbortsIf">UnsetAbortsIf</a>;
+<b>ensures</b> !bitvector.bit_field[bit_index];
 </code></pre>
 
 
 
-<details>
-<summary>Implementation</summary>
 
+<a name="0x1_bit_vector_UnsetAbortsIf"></a>
 
-<pre><code><b>public</b> <b>fun</b> <a href="bit_vector.md#0x1_bit_vector_unset">unset</a>(bitvector: &<b>mut</b> <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>, bit_index: u64) {
-    <b>assert</b>!(bit_index &lt; <a href="vector.md#0x1_vector_length">vector::length</a>(&bitvector.bit_field), <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>);
-    <b>let</b> x = <a href="vector.md#0x1_vector_borrow_mut">vector::borrow_mut</a>(&<b>mut</b> bitvector.bit_field, bit_index);
-    *x = <b>false</b>;
+
+<pre><code><b>schema</b> <a href="bit_vector.md#0x1_bit_vector_UnsetAbortsIf">UnsetAbortsIf</a> {
+    bitvector: <a href="bit_vector.md#0x1_bit_vector_BitVector">BitVector</a>;
+    bit_index: u64;
+    <b>aborts_if</b> bit_index &gt;= <a href="bit_vector.md#0x1_bit_vector_length">length</a>(bitvector) <b>with</b> <a href="bit_vector.md#0x1_bit_vector_EINDEX">EINDEX</a>;
 }
 </code></pre>
 
diff --git a/language/move-stdlib/docs/error.md b/language/move-stdlib/docs/error.md
new file mode 100644
index 0000000000..0cc2487da9
--- /dev/null
+++ b/language/move-stdlib/docs/error.md
@@ -0,0 +1,475 @@
+
+<a name="0x1_error"></a>
+
+# Module `0x1::error`
+
+This module defines a set of canonical error codes which are optional to use by applications for the
+<code><b>abort</b></code> and <code><b>assert</b>!</code> features.
+
+Canonical error codes use the 3 lowest bytes of the u64 abort code range (the upper 5 bytes are free for other use).
+Of those, the highest byte represents the *error category* and the lower two bytes the *error reason*.
+Given an error category <code>0x1</code> and a reason <code>0x3</code>, a canonical abort code looks as <code>0x10003</code>.
+
+A module can use a canonical code with a constant declaration of the following form:
+
+```
+///  An invalid ASCII character was encountered when creating a string.
+const EINVALID_CHARACTER: u64 = 0x010003;
+```
+
+This code is both valid in the worlds with and without canonical errors. It can be used as a plain module local
+error reason understand by the existing error map tooling, or as a canonical code.
+
+The actual canonical categories have been adopted from Google's canonical error codes, which in turn are derived
+from Unix error codes [see here](https://cloud.google.com/apis/design/errors#handling_errors). Each code has an
+associated HTTP error code which can be used in REST apis. The mapping from error code to http code is not 1:1;
+error codes here are a bit richer than HTTP codes.
+
+
+-  [Constants](#@Constants_0)
+-  [Function `canonical`](#0x1_error_canonical)
+-  [Function `invalid_argument`](#0x1_error_invalid_argument)
+-  [Function `out_of_range`](#0x1_error_out_of_range)
+-  [Function `invalid_state`](#0x1_error_invalid_state)
+-  [Function `unauthenticated`](#0x1_error_unauthenticated)
+-  [Function `permission_denied`](#0x1_error_permission_denied)
+-  [Function `not_found`](#0x1_error_not_found)
+-  [Function `aborted`](#0x1_error_aborted)
+-  [Function `already_exists`](#0x1_error_already_exists)
+-  [Function `resource_exhausted`](#0x1_error_resource_exhausted)
+-  [Function `internal`](#0x1_error_internal)
+-  [Function `not_implemented`](#0x1_error_not_implemented)
+-  [Function `unavailable`](#0x1_error_unavailable)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_error_ABORTED"></a>
+
+Concurrency conflict, such as read-modify-write conflict (http: 409)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_ABORTED">ABORTED</a>: u64 = 7;
+</code></pre>
+
+
+
+<a name="0x1_error_ALREADY_EXISTS"></a>
+
+The resource that a client tried to create already exists (http: 409)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_ALREADY_EXISTS">ALREADY_EXISTS</a>: u64 = 8;
+</code></pre>
+
+
+
+<a name="0x1_error_CANCELLED"></a>
+
+Request cancelled by the client (http: 499)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_CANCELLED">CANCELLED</a>: u64 = 10;
+</code></pre>
+
+
+
+<a name="0x1_error_INTERNAL"></a>
+
+Internal error (http: 500)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_INTERNAL">INTERNAL</a>: u64 = 11;
+</code></pre>
+
+
+
+<a name="0x1_error_INVALID_ARGUMENT"></a>
+
+Caller specified an invalid argument (http: 400)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_INVALID_ARGUMENT">INVALID_ARGUMENT</a>: u64 = 1;
+</code></pre>
+
+
+
+<a name="0x1_error_INVALID_STATE"></a>
+
+The system is not in a state where the operation can be performed (http: 400)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_INVALID_STATE">INVALID_STATE</a>: u64 = 3;
+</code></pre>
+
+
+
+<a name="0x1_error_NOT_FOUND"></a>
+
+A specified resource is not found (http: 404)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_NOT_FOUND">NOT_FOUND</a>: u64 = 6;
+</code></pre>
+
+
+
+<a name="0x1_error_NOT_IMPLEMENTED"></a>
+
+Feature not implemented (http: 501)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_NOT_IMPLEMENTED">NOT_IMPLEMENTED</a>: u64 = 12;
+</code></pre>
+
+
+
+<a name="0x1_error_OUT_OF_RANGE"></a>
+
+An input or result of a computation is out of range (http: 400)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_OUT_OF_RANGE">OUT_OF_RANGE</a>: u64 = 2;
+</code></pre>
+
+
+
+<a name="0x1_error_PERMISSION_DENIED"></a>
+
+client does not have sufficient permission (http: 403)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_PERMISSION_DENIED">PERMISSION_DENIED</a>: u64 = 5;
+</code></pre>
+
+
+
+<a name="0x1_error_RESOURCE_EXHAUSTED"></a>
+
+Out of gas or other forms of quota (http: 429)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_RESOURCE_EXHAUSTED">RESOURCE_EXHAUSTED</a>: u64 = 9;
+</code></pre>
+
+
+
+<a name="0x1_error_UNAUTHENTICATED"></a>
+
+Request not authenticated due to missing, invalid, or expired auth token (http: 401)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_UNAUTHENTICATED">UNAUTHENTICATED</a>: u64 = 4;
+</code></pre>
+
+
+
+<a name="0x1_error_UNAVAILABLE"></a>
+
+The service is currently unavailable. Indicates that a retry could solve the issue (http: 503)
+
+
+<pre><code><b>const</b> <a href="error.md#0x1_error_UNAVAILABLE">UNAVAILABLE</a>: u64 = 13;
+</code></pre>
+
+
+
+<a name="0x1_error_canonical"></a>
+
+## Function `canonical`
+
+Construct a canonical error code from a category and a reason.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_canonical">canonical</a>(category: u64, reason: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_canonical">canonical</a>(category: u64, reason: u64): u64 {
+  (category &lt;&lt; 16) + reason
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_invalid_argument"></a>
+
+## Function `invalid_argument`
+
+Functions to construct a canonical error code of the given category.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_argument">invalid_argument</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_argument">invalid_argument</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_INVALID_ARGUMENT">INVALID_ARGUMENT</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_out_of_range"></a>
+
+## Function `out_of_range`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_out_of_range">out_of_range</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_out_of_range">out_of_range</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_OUT_OF_RANGE">OUT_OF_RANGE</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_invalid_state"></a>
+
+## Function `invalid_state`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_state">invalid_state</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_invalid_state">invalid_state</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_INVALID_STATE">INVALID_STATE</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_unauthenticated"></a>
+
+## Function `unauthenticated`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unauthenticated">unauthenticated</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unauthenticated">unauthenticated</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_UNAUTHENTICATED">UNAUTHENTICATED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_permission_denied"></a>
+
+## Function `permission_denied`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_permission_denied">permission_denied</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_permission_denied">permission_denied</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_PERMISSION_DENIED">PERMISSION_DENIED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_not_found"></a>
+
+## Function `not_found`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_found">not_found</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_found">not_found</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_NOT_FOUND">NOT_FOUND</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_aborted"></a>
+
+## Function `aborted`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_aborted">aborted</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_aborted">aborted</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_ABORTED">ABORTED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_already_exists"></a>
+
+## Function `already_exists`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_already_exists">already_exists</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_already_exists">already_exists</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_ALREADY_EXISTS">ALREADY_EXISTS</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_resource_exhausted"></a>
+
+## Function `resource_exhausted`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_resource_exhausted">resource_exhausted</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_resource_exhausted">resource_exhausted</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_RESOURCE_EXHAUSTED">RESOURCE_EXHAUSTED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_internal"></a>
+
+## Function `internal`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <b>internal</b>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <b>internal</b>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_INTERNAL">INTERNAL</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_not_implemented"></a>
+
+## Function `not_implemented`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_implemented">not_implemented</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_not_implemented">not_implemented</a>(r: u64): u64 {  <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_NOT_IMPLEMENTED">NOT_IMPLEMENTED</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_error_unavailable"></a>
+
+## Function `unavailable`
+
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unavailable">unavailable</a>(r: u64): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="error.md#0x1_error_unavailable">unavailable</a>(r: u64): u64 { <a href="error.md#0x1_error_canonical">canonical</a>(<a href="error.md#0x1_error_UNAVAILABLE">UNAVAILABLE</a>, r) }
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/language/move-stdlib/docs/fixed_point32.md b/language/move-stdlib/docs/fixed_point32.md
index 92fce71d1d..55848f5f7c 100644
--- a/language/move-stdlib/docs/fixed_point32.md
+++ b/language/move-stdlib/docs/fixed_point32.md
@@ -15,6 +15,12 @@ a 32-bit fractional part.
 -  [Function `create_from_raw_value`](#0x1_fixed_point32_create_from_raw_value)
 -  [Function `get_raw_value`](#0x1_fixed_point32_get_raw_value)
 -  [Function `is_zero`](#0x1_fixed_point32_is_zero)
+-  [Function `min`](#0x1_fixed_point32_min)
+-  [Function `max`](#0x1_fixed_point32_max)
+-  [Function `create_from_u64`](#0x1_fixed_point32_create_from_u64)
+-  [Function `floor`](#0x1_fixed_point32_floor)
+-  [Function `ceil`](#0x1_fixed_point32_ceil)
+-  [Function `round`](#0x1_fixed_point32_round)
 -  [Module Specification](#@Module_Specification_1)
 
 
@@ -78,7 +84,7 @@ decimal.
 The denominator provided was zero
 
 
-<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EDENOMINATOR">EDENOMINATOR</a>: u64 = 0;
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EDENOMINATOR">EDENOMINATOR</a>: u64 = 65537;
 </code></pre>
 
 
@@ -88,7 +94,7 @@ The denominator provided was zero
 The quotient value would be too large to be held in a <code>u64</code>
 
 
-<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION">EDIVISION</a>: u64 = 1;
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION">EDIVISION</a>: u64 = 131074;
 </code></pre>
 
 
@@ -98,7 +104,7 @@ The quotient value would be too large to be held in a <code>u64</code>
 A division by zero was encountered
 
 
-<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION_BY_ZERO">EDIVISION_BY_ZERO</a>: u64 = 3;
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION_BY_ZERO">EDIVISION_BY_ZERO</a>: u64 = 65540;
 </code></pre>
 
 
@@ -108,7 +114,7 @@ A division by zero was encountered
 The multiplied value would be too large to be held in a <code>u64</code>
 
 
-<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EMULTIPLICATION">EMULTIPLICATION</a>: u64 = 2;
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_EMULTIPLICATION">EMULTIPLICATION</a>: u64 = 131075;
 </code></pre>
 
 
@@ -118,7 +124,7 @@ The multiplied value would be too large to be held in a <code>u64</code>
 The computed ratio when converting to a <code><a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a></code> would be unrepresentable
 
 
-<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>: u64 = 4;
+<pre><code><b>const</b> <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>: u64 = 131077;
 </code></pre>
 
 
@@ -225,7 +231,7 @@ is zero or if the quotient overflows.
     // Check whether the value is too large.
     <b>assert</b>!(quotient &lt;= <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>, <a href="fixed_point32.md#0x1_fixed_point32_EDIVISION">EDIVISION</a>);
     // the value may be too large, which will cause the cast <b>to</b> fail
-    // <b>with</b> an arithmetic error.
+    // <b>with</b> an arithmetic <a href="error.md#0x1_error">error</a>.
     (quotient <b>as</b> u64)
 }
 </code></pre>
@@ -338,8 +344,8 @@ rounding, e.g., 0.0125 will round down to 0.012 instead of up to 0.013.
 <pre><code><b>schema</b> <a href="fixed_point32.md#0x1_fixed_point32_CreateFromRationalAbortsIf">CreateFromRationalAbortsIf</a> {
     numerator: u64;
     denominator: u64;
-    <b>let</b> scaled_numerator = numerator &lt;&lt; 64;
-    <b>let</b> scaled_denominator = denominator &lt;&lt; 32;
+    <b>let</b> scaled_numerator = (numerator <b>as</b> u128) &lt;&lt; 64;
+    <b>let</b> scaled_denominator = (denominator <b>as</b> u128) &lt;&lt; 32;
     <b>let</b> quotient = scaled_numerator / scaled_denominator;
     <b>aborts_if</b> scaled_denominator == 0 <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_EDENOMINATOR">EDENOMINATOR</a>;
     <b>aborts_if</b> quotient == 0 && scaled_numerator != 0 <b>with</b> <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>;
@@ -451,6 +457,366 @@ Returns true if the ratio is zero.
 
 
 
+</details>
+
+<a name="0x1_fixed_point32_min"></a>
+
+## Function `min`
+
+Returns the smaller of the two FixedPoint32 numbers.
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <b>min</b>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    <b>if</b> (num1.value &lt; num2.value) {
+        num1
+    } <b>else</b> {
+        num2
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_min">spec_min</a>(num1, num2);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_min"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_min">spec_min</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+   <b>if</b> (num1.value &lt; num2.value) {
+       num1
+   } <b>else</b> {
+       num2
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_max"></a>
+
+## Function `max`
+
+Returns the larger of the two FixedPoint32 numbers.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_max">max</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_max">max</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    <b>if</b> (num1.value &gt; num2.value) {
+        num1
+    } <b>else</b> {
+        num2
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_max">spec_max</a>(num1, num2);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_max"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_max">spec_max</a>(num1: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>, num2: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+   <b>if</b> (num1.value &gt; num2.value) {
+       num1
+   } <b>else</b> {
+       num2
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_create_from_u64"></a>
+
+## Function `create_from_u64`
+
+Create a fixedpoint value from a u64 value.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_u64">create_from_u64</a>(val: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_create_from_u64">create_from_u64</a>(val: u64): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+    <b>let</b> value = (val <b>as</b> u128) &lt;&lt; 32;
+    <b>assert</b>!(value &lt;= <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>, <a href="fixed_point32.md#0x1_fixed_point32_ERATIO_OUT_OF_RANGE">ERATIO_OUT_OF_RANGE</a>);
+    <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>{value: (value <b>as</b> u64)}
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>include</b> <a href="fixed_point32.md#0x1_fixed_point32_CreateFromU64AbortsIf">CreateFromU64AbortsIf</a>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_create_from_u64">spec_create_from_u64</a>(val);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_CreateFromU64AbortsIf"></a>
+
+
+<pre><code><b>schema</b> <a href="fixed_point32.md#0x1_fixed_point32_CreateFromU64AbortsIf">CreateFromU64AbortsIf</a> {
+    val: num;
+    <b>let</b> scaled_value = (val <b>as</b> u128) &lt;&lt; 32;
+    <b>aborts_if</b> scaled_value &gt; <a href="fixed_point32.md#0x1_fixed_point32_MAX_U64">MAX_U64</a>;
+}
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_create_from_u64"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_create_from_u64">spec_create_from_u64</a>(val: num): <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {
+   <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a> {value: val &lt;&lt; 32}
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_floor"></a>
+
+## Function `floor`
+
+Returns the largest integer less than or equal to a given number.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    num.value &gt;&gt; 32
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_floor">spec_floor</a>(num);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_floor"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_floor">spec_floor</a>(val: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+   <b>let</b> fractional = val.value % (1 &lt;&lt; 32);
+   <b>if</b> (fractional == 0) {
+       val.value &gt;&gt; 32
+   } <b>else</b> {
+       (val.value - fractional) &gt;&gt; 32
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_ceil"></a>
+
+## Function `ceil`
+
+Rounds up the given FixedPoint32 to the next largest integer.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_ceil">ceil</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_ceil">ceil</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    <b>let</b> floored_num = <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num) &lt;&lt; 32;
+    <b>if</b> (num.value == floored_num) {
+        <b>return</b> floored_num &gt;&gt; 32
+    };
+    <b>let</b> val = ((floored_num <b>as</b> u128) + (1 &lt;&lt; 32));
+    (val &gt;&gt; 32 <b>as</b> u64)
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_ceil">spec_ceil</a>(num);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_ceil"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_ceil">spec_ceil</a>(val: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+   <b>let</b> fractional = val.value % (1 &lt;&lt; 32);
+   <b>let</b> one = 1 &lt;&lt; 32;
+   <b>if</b> (fractional == 0) {
+       val.value &gt;&gt; 32
+   } <b>else</b> {
+       (val.value - fractional + one) &gt;&gt; 32
+   }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_fixed_point32_round"></a>
+
+## Function `round`
+
+Returns the value of a FixedPoint32 to the nearest integer.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_round">round</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">fixed_point32::FixedPoint32</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_round">round</a>(num: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+    <b>let</b> floored_num = <a href="fixed_point32.md#0x1_fixed_point32_floor">floor</a>(num) &lt;&lt; 32;
+    <b>let</b> boundary = floored_num + ((1 &lt;&lt; 32) / 2);
+    <b>if</b> (num.value &lt; boundary) {
+        floored_num &gt;&gt; 32
+    } <b>else</b> {
+        <a href="fixed_point32.md#0x1_fixed_point32_ceil">ceil</a>(num)
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> opaque;
+<b>aborts_if</b> <b>false</b>;
+<b>ensures</b> result == <a href="fixed_point32.md#0x1_fixed_point32_spec_round">spec_round</a>(num);
+</code></pre>
+
+
+
+
+<a name="0x1_fixed_point32_spec_round"></a>
+
+
+<pre><code><b>fun</b> <a href="fixed_point32.md#0x1_fixed_point32_spec_round">spec_round</a>(val: <a href="fixed_point32.md#0x1_fixed_point32_FixedPoint32">FixedPoint32</a>): u64 {
+   <b>let</b> fractional = val.value % (1 &lt;&lt; 32);
+   <b>let</b> boundary = (1 &lt;&lt; 32) / 2;
+   <b>let</b> one = 1 &lt;&lt; 32;
+   <b>if</b> (fractional &lt; boundary) {
+       (val.value - fractional) &gt;&gt; 32
+   } <b>else</b> {
+       (val.value - fractional + one) &gt;&gt; 32
+   }
+}
+</code></pre>
+
+
+
 </details>
 
 <a name="@Module_Specification_1"></a>
diff --git a/language/move-stdlib/docs/option.md b/language/move-stdlib/docs/option.md
index 40dd8471d0..730dfc98c1 100644
--- a/language/move-stdlib/docs/option.md
+++ b/language/move-stdlib/docs/option.md
@@ -89,7 +89,7 @@ The <code><a href="option.md#0x1_option_Option">Option</a></code> is in an inval
 The <code><a href="option.md#0x1_option_Option">Option</a></code> is <code>Some</code> while it should be <code>None</code>.
 
 
-<pre><code><b>const</b> <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>: u64 = 0;
+<pre><code><b>const</b> <a href="option.md#0x1_option_EOPTION_IS_SET">EOPTION_IS_SET</a>: u64 = 262144;
 </code></pre>
 
 
@@ -100,7 +100,7 @@ The <code><a href="option.md#0x1_option_Option">Option</a></code> is in an inval
 The <code><a href="option.md#0x1_option_Option">Option</a></code> is <code>None</code> while it should be <code>Some</code>.
 
 
-<pre><code><b>const</b> <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>: u64 = 1;
+<pre><code><b>const</b> <a href="option.md#0x1_option_EOPTION_NOT_SET">EOPTION_NOT_SET</a>: u64 = 262145;
 </code></pre>
 
 
@@ -582,6 +582,7 @@ Aborts if <code>t</code> does not hold a value
 <pre><code><b>pragma</b> opaque;
 <b>include</b> <a href="option.md#0x1_option_AbortsIfNone">AbortsIfNone</a>&lt;Element&gt;;
 <b>ensures</b> result == <a href="option.md#0x1_option_borrow">borrow</a>(t);
+<b>ensures</b> t == <b>old</b>(t);
 </code></pre>
 
 
diff --git a/language/move-stdlib/docs/overview.md b/language/move-stdlib/docs/overview.md
index 15dd170a3a..e8aff3f041 100644
--- a/language/move-stdlib/docs/overview.md
+++ b/language/move-stdlib/docs/overview.md
@@ -15,10 +15,13 @@ This is the root document for the Move stdlib module documentation. The Move std
 -  [`0x1::ascii`](ascii.md#0x1_ascii)
 -  [`0x1::bcs`](bcs.md#0x1_bcs)
 -  [`0x1::bit_vector`](bit_vector.md#0x1_bit_vector)
+-  [`0x1::error`](error.md#0x1_error)
 -  [`0x1::fixed_point32`](fixed_point32.md#0x1_fixed_point32)
 -  [`0x1::hash`](hash.md#0x1_hash)
 -  [`0x1::option`](option.md#0x1_option)
 -  [`0x1::signer`](signer.md#0x1_signer)
+-  [`0x1::string`](string.md#0x1_string)
+-  [`0x1::type_name`](type_name.md#0x1_type_name)
 -  [`0x1::vector`](vector.md#0x1_vector)
 
 
diff --git a/language/move-stdlib/docs/string.md b/language/move-stdlib/docs/string.md
new file mode 100644
index 0000000000..eae6e89293
--- /dev/null
+++ b/language/move-stdlib/docs/string.md
@@ -0,0 +1,446 @@
+
+<a name="0x1_string"></a>
+
+# Module `0x1::string`
+
+The <code><a href="string.md#0x1_string">string</a></code> module defines the <code><a href="string.md#0x1_string_String">String</a></code> type which represents UTF8 encoded strings.
+
+
+-  [Struct `String`](#0x1_string_String)
+-  [Constants](#@Constants_0)
+-  [Function `utf8`](#0x1_string_utf8)
+-  [Function `try_utf8`](#0x1_string_try_utf8)
+-  [Function `bytes`](#0x1_string_bytes)
+-  [Function `is_empty`](#0x1_string_is_empty)
+-  [Function `length`](#0x1_string_length)
+-  [Function `append`](#0x1_string_append)
+-  [Function `append_utf8`](#0x1_string_append_utf8)
+-  [Function `insert`](#0x1_string_insert)
+-  [Function `sub_string`](#0x1_string_sub_string)
+-  [Function `index_of`](#0x1_string_index_of)
+-  [Function `internal_check_utf8`](#0x1_string_internal_check_utf8)
+-  [Function `internal_is_char_boundary`](#0x1_string_internal_is_char_boundary)
+-  [Function `internal_sub_string`](#0x1_string_internal_sub_string)
+-  [Function `internal_index_of`](#0x1_string_internal_index_of)
+
+
+<pre><code><b>use</b> <a href="option.md#0x1_option">0x1::option</a>;
+<b>use</b> <a href="vector.md#0x1_vector">0x1::vector</a>;
+</code></pre>
+
+
+
+<a name="0x1_string_String"></a>
+
+## Struct `String`
+
+A <code><a href="string.md#0x1_string_String">String</a></code> holds a sequence of bytes which is guaranteed to be in utf8 format.
+
+
+<pre><code><b>struct</b> <a href="string.md#0x1_string_String">String</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="@Constants_0"></a>
+
+## Constants
+
+
+<a name="0x1_string_EINVALID_INDEX"></a>
+
+Index out of range.
+
+
+<pre><code><b>const</b> <a href="string.md#0x1_string_EINVALID_INDEX">EINVALID_INDEX</a>: u64 = 2;
+</code></pre>
+
+
+
+<a name="0x1_string_EINVALID_UTF8"></a>
+
+An invalid UTF8 encoding.
+
+
+<pre><code><b>const</b> <a href="string.md#0x1_string_EINVALID_UTF8">EINVALID_UTF8</a>: u64 = 1;
+</code></pre>
+
+
+
+<a name="0x1_string_utf8"></a>
+
+## Function `utf8`
+
+Creates a new string from a sequence of bytes. Aborts if the bytes do not represent valid utf8.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_utf8">utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_utf8">utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="string.md#0x1_string_String">String</a> {
+    <b>assert</b>!(<a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(&bytes), <a href="string.md#0x1_string_EINVALID_UTF8">EINVALID_UTF8</a>);
+    <a href="string.md#0x1_string_String">String</a> { bytes }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_try_utf8"></a>
+
+## Function `try_utf8`
+
+Tries to create a new string from a sequence of bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_try_utf8">try_utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): <a href="option.md#0x1_option_Option">option::Option</a>&lt;<a href="string.md#0x1_string_String">string::String</a>&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_try_utf8">try_utf8</a>(bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): Option&lt;<a href="string.md#0x1_string_String">String</a>&gt; {
+    <b>if</b> (<a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(&bytes)) {
+        <a href="option.md#0x1_option_some">option::some</a>(<a href="string.md#0x1_string_String">String</a> { bytes })
+    } <b>else</b> {
+        <a href="option.md#0x1_option_none">option::none</a>()
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_bytes"></a>
+
+## Function `bytes`
+
+Returns a reference to the underlying byte vector.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_bytes">bytes</a>(s: &<a href="string.md#0x1_string_String">string::String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_bytes">bytes</a>(s: &<a href="string.md#0x1_string_String">String</a>): &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt; {
+    &s.bytes
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_is_empty"></a>
+
+## Function `is_empty`
+
+Checks whether this string is empty.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_is_empty">is_empty</a>(s: &<a href="string.md#0x1_string_String">string::String</a>): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_is_empty">is_empty</a>(s: &<a href="string.md#0x1_string_String">String</a>): bool {
+    <a href="vector.md#0x1_vector_is_empty">vector::is_empty</a>(&s.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_length"></a>
+
+## Function `length`
+
+Returns the length of this string, in bytes.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_length">length</a>(s: &<a href="string.md#0x1_string_String">string::String</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_length">length</a>(s: &<a href="string.md#0x1_string_String">String</a>): u64 {
+    <a href="vector.md#0x1_vector_length">vector::length</a>(&s.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_append"></a>
+
+## Function `append`
+
+Appends a string.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append">append</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">string::String</a>, r: <a href="string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append">append</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">String</a>, r: <a href="string.md#0x1_string_String">String</a>) {
+    <a href="vector.md#0x1_vector_append">vector::append</a>(&<b>mut</b> s.bytes, r.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_append_utf8"></a>
+
+## Function `append_utf8`
+
+Appends bytes which must be in valid utf8 format.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append_utf8">append_utf8</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">string::String</a>, bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_append_utf8">append_utf8</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">String</a>, bytes: <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;) {
+    <a href="string.md#0x1_string_append">append</a>(s, <a href="string.md#0x1_string_utf8">utf8</a>(bytes))
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_insert"></a>
+
+## Function `insert`
+
+Insert the other string at the byte index in given string. The index must be at a valid utf8 char
+boundary.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_insert">insert</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">string::String</a>, at: u64, o: <a href="string.md#0x1_string_String">string::String</a>)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_insert">insert</a>(s: &<b>mut</b> <a href="string.md#0x1_string_String">String</a>, at: u64, o: <a href="string.md#0x1_string_String">String</a>) {
+    <b>let</b> bytes = &s.bytes;
+    <b>assert</b>!(at &lt;= <a href="vector.md#0x1_vector_length">vector::length</a>(bytes) && <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(bytes, at), <a href="string.md#0x1_string_EINVALID_INDEX">EINVALID_INDEX</a>);
+    <b>let</b> l = <a href="string.md#0x1_string_length">length</a>(s);
+    <b>let</b> front = <a href="string.md#0x1_string_sub_string">sub_string</a>(s, 0, at);
+    <b>let</b> end = <a href="string.md#0x1_string_sub_string">sub_string</a>(s, at, l);
+    <a href="string.md#0x1_string_append">append</a>(&<b>mut</b> front, o);
+    <a href="string.md#0x1_string_append">append</a>(&<b>mut</b> front, end);
+    *s = front;
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_sub_string"></a>
+
+## Function `sub_string`
+
+Returns a sub-string using the given byte indices, where <code>i</code> is the first byte position and <code>j</code> is the start
+of the first byte not included (or the length of the string). The indices must be at valid utf8 char boundaries,
+guaranteeing that the result is valid utf8.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_sub_string">sub_string</a>(s: &<a href="string.md#0x1_string_String">string::String</a>, i: u64, j: u64): <a href="string.md#0x1_string_String">string::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_sub_string">sub_string</a>(s: &<a href="string.md#0x1_string_String">String</a>, i: u64, j: u64): <a href="string.md#0x1_string_String">String</a> {
+    <b>let</b> bytes = &s.bytes;
+    <b>let</b> l = <a href="vector.md#0x1_vector_length">vector::length</a>(bytes);
+    <b>assert</b>!(
+        j &lt;= l && i &lt;= j && <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(bytes, i) && <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(bytes, j),
+        <a href="string.md#0x1_string_EINVALID_INDEX">EINVALID_INDEX</a>
+    );
+    <a href="string.md#0x1_string_String">String</a> { bytes: <a href="string.md#0x1_string_internal_sub_string">internal_sub_string</a>(bytes, i, j) }
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_index_of"></a>
+
+## Function `index_of`
+
+Computes the index of the first occurrence of a string. Returns <code><a href="string.md#0x1_string_length">length</a>(s)</code> if no occurrence found.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_index_of">index_of</a>(s: &<a href="string.md#0x1_string_String">string::String</a>, r: &<a href="string.md#0x1_string_String">string::String</a>): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="string.md#0x1_string_index_of">index_of</a>(s: &<a href="string.md#0x1_string_String">String</a>, r: &<a href="string.md#0x1_string_String">String</a>): u64 {
+    <a href="string.md#0x1_string_internal_index_of">internal_index_of</a>(&s.bytes, &r.bytes)
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_internal_check_utf8"></a>
+
+## Function `internal_check_utf8`
+
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_check_utf8">internal_check_utf8</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): bool;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_internal_is_char_boundary"></a>
+
+## Function `internal_is_char_boundary`
+
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64): bool
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_is_char_boundary">internal_is_char_boundary</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64): bool;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_internal_sub_string"></a>
+
+## Function `internal_sub_string`
+
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_sub_string">internal_sub_string</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64, j: u64): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_sub_string">internal_sub_string</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, i: u64, j: u64): <a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_string_internal_index_of"></a>
+
+## Function `internal_index_of`
+
+
+
+<pre><code><b>fun</b> <a href="string.md#0x1_string_internal_index_of">internal_index_of</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, r: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>native</b> <b>fun</b> <a href="string.md#0x1_string_internal_index_of">internal_index_of</a>(v: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;, r: &<a href="vector.md#0x1_vector">vector</a>&lt;u8&gt;): u64;
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/language/move-stdlib/docs/type_name.md b/language/move-stdlib/docs/type_name.md
new file mode 100644
index 0000000000..35fd1f9003
--- /dev/null
+++ b/language/move-stdlib/docs/type_name.md
@@ -0,0 +1,127 @@
+
+<a name="0x1_type_name"></a>
+
+# Module `0x1::type_name`
+
+Functionality for converting Move types into values. Use with care!
+
+
+-  [Struct `TypeName`](#0x1_type_name_TypeName)
+-  [Function `get`](#0x1_type_name_get)
+-  [Function `borrow_string`](#0x1_type_name_borrow_string)
+-  [Function `into_string`](#0x1_type_name_into_string)
+
+
+<pre><code><b>use</b> <a href="ascii.md#0x1_ascii">0x1::ascii</a>;
+</code></pre>
+
+
+
+<a name="0x1_type_name_TypeName"></a>
+
+## Struct `TypeName`
+
+
+
+<pre><code><b>struct</b> <a href="type_name.md#0x1_type_name_TypeName">TypeName</a> <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>name: <a href="ascii.md#0x1_ascii_String">ascii::String</a></code>
+</dt>
+<dd>
+ String representation of the type. All types are represented
+ using their source syntax:
+ "u8", "u64", "u128", "bool", "address", "vector", "signer" for ground types.
+ Struct types are represented as fully qualified type names; e.g.
+ <code>00000000000000000000000000000001::string::String</code> or
+ <code>0000000000000000000000000000000a::module_name1::type_name1&lt;0000000000000000000000000000000a::module_name2::type_name2&lt;u64&gt;&gt;</code>
+ Addresses are hex-encoded lowercase values of length ADDRESS_LENGTH (16, 20, or 32 depending on the Move platform)
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x1_type_name_get"></a>
+
+## Function `get`
+
+Return a value representation of the type <code>T</code>.
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_get">get</a>&lt;T&gt;(): <a href="type_name.md#0x1_type_name_TypeName">type_name::TypeName</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>native</b> <b>fun</b> <a href="type_name.md#0x1_type_name_get">get</a>&lt;T&gt;(): <a href="type_name.md#0x1_type_name_TypeName">TypeName</a>;
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_type_name_borrow_string"></a>
+
+## Function `borrow_string`
+
+Get the String representation of <code>self</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_borrow_string">borrow_string</a>(self: &<a href="type_name.md#0x1_type_name_TypeName">type_name::TypeName</a>): &<a href="ascii.md#0x1_ascii_String">ascii::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_borrow_string">borrow_string</a>(self: &<a href="type_name.md#0x1_type_name_TypeName">TypeName</a>): &String {
+    &self.name
+}
+</code></pre>
+
+
+
+</details>
+
+<a name="0x1_type_name_into_string"></a>
+
+## Function `into_string`
+
+Convert <code>self</code> into its inner String
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_into_string">into_string</a>(self: <a href="type_name.md#0x1_type_name_TypeName">type_name::TypeName</a>): <a href="ascii.md#0x1_ascii_String">ascii::String</a>
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="type_name.md#0x1_type_name_into_string">into_string</a>(self: <a href="type_name.md#0x1_type_name_TypeName">TypeName</a>): String {
+    self.name
+}
+</code></pre>
+
+
+
+</details>
+
+
+[//]: # ("File containing references which can be used from documentation")
diff --git a/language/move-stdlib/docs/vector.md b/language/move-stdlib/docs/vector.md
index 1b5cb61611..dfadab2f55 100644
--- a/language/move-stdlib/docs/vector.md
+++ b/language/move-stdlib/docs/vector.md
@@ -31,6 +31,7 @@ the return on investment didn't seem worth it for these simple functions.
 -  [Function `contains`](#0x1_vector_contains)
 -  [Function `index_of`](#0x1_vector_index_of)
 -  [Function `remove`](#0x1_vector_remove)
+-  [Function `insert`](#0x1_vector_insert)
 -  [Function `swap_remove`](#0x1_vector_swap_remove)
 -  [Module Specification](#@Module_Specification_1)
     -  [Helper Functions](#@Helper_Functions_2)
@@ -50,7 +51,7 @@ the return on investment didn't seem worth it for these simple functions.
 The index into the vector is out of bounds
 
 
-<pre><code><b>const</b> <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>: u64 = 0;
+<pre><code><b>const</b> <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>: u64 = 131072;
 </code></pre>
 
 
@@ -411,6 +412,7 @@ Return <code><b>true</b></code> if the vector <code>v</code> has no elements and
 ## Function `contains`
 
 Return true if <code>e</code> is in the vector <code>v</code>.
+Otherwise, returns false.
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_contains">contains</a>&lt;Element&gt;(v: &<a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: &Element): bool
@@ -536,6 +538,55 @@ Aborts if <code>i</code> is out of bounds.
 
 
 
+</details>
+
+<a name="0x1_vector_insert"></a>
+
+## Function `insert`
+
+Insert <code>e</code> at position <code>i</code> in the vector <code>v</code>.
+If <code>i</code> is in bounds, this shifts the old <code>v[i]</code> and all subsequent elements to the right.
+If <code>i == <a href="vector.md#0x1_vector_length">length</a>(v)</code>, this adds <code>e</code> to the end of the vector.
+This is O(n) and preserves ordering of elements in the vector.
+Aborts if <code>i &gt; <a href="vector.md#0x1_vector_length">length</a>(v)</code>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_insert">insert</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element, i: u64)
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>public</b> <b>fun</b> <a href="vector.md#0x1_vector_insert">insert</a>&lt;Element&gt;(v: &<b>mut</b> <a href="vector.md#0x1_vector">vector</a>&lt;Element&gt;, e: Element, i: u64) {
+    <b>let</b> len = <a href="vector.md#0x1_vector_length">length</a>(v);
+    // i too big <b>abort</b>
+    <b>if</b> (i &gt; len) <b>abort</b> <a href="vector.md#0x1_vector_EINDEX_OUT_OF_BOUNDS">EINDEX_OUT_OF_BOUNDS</a>;
+
+    <a href="vector.md#0x1_vector_push_back">push_back</a>(v, e);
+    <b>while</b> (i &lt; len) {
+        <a href="vector.md#0x1_vector_swap">swap</a>(v, i, len);
+        i = i + 1
+    }
+}
+</code></pre>
+
+
+
+</details>
+
+<details>
+<summary>Specification</summary>
+
+
+
+<pre><code><b>pragma</b> intrinsic = <b>true</b>;
+</code></pre>
+
+
+
 </details>
 
 <a name="0x1_vector_swap_remove"></a>
diff --git a/language/move-stdlib/error_description.errmap b/language/move-stdlib/error_description.errmap
index 80f5ba1bd2..4fed4031e4 100644
Binary files a/language/move-stdlib/error_description.errmap and b/language/move-stdlib/error_description.errmap differ
diff --git a/language/move-stdlib/nursery/docs/capability.md b/language/move-stdlib/nursery/docs/capability.md
index a10a54f7d2..312f5905b6 100644
--- a/language/move-stdlib/nursery/docs/capability.md
+++ b/language/move-stdlib/nursery/docs/capability.md
@@ -110,7 +110,7 @@ is_valid_delegate_for_feature(d);
 -  [Module Specification](#@Module_Specification_4)
 
 
-<pre><code><b>use</b> <a href="errors.md#0x1_errors">0x1::errors</a>;
+<pre><code><b>use</b> <a href="">0x1::error</a>;
 <b>use</b> <a href="">0x1::signer</a>;
 <b>use</b> <a href="">0x1::vector</a>;
 </code></pre>
@@ -272,7 +272,7 @@ they own the <code>Feature</code> type parameter.
 
 <pre><code><b>public</b> <b>fun</b> <a href="capability.md#0x1_capability_create">create</a>&lt;Feature&gt;(owner: &<a href="">signer</a>, _feature_witness: &Feature) {
     <b>let</b> addr = <a href="_address_of">signer::address_of</a>(owner);
-    <b>assert</b>!(!<b>exists</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(addr), <a href="errors.md#0x1_errors_already_published">errors::already_published</a>(<a href="capability.md#0x1_capability_ECAP">ECAP</a>));
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(addr), <a href="_already_exists">error::already_exists</a>(<a href="capability.md#0x1_capability_ECAP">ECAP</a>));
     <b>move_to</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(owner, <a href="capability.md#0x1_capability_CapState">CapState</a>{ delegates: <a href="_empty">vector::empty</a>() });
 }
 </code></pre>
@@ -358,12 +358,12 @@ Helper to validate an acquire. Returns the root address of the capability.
     <b>if</b> (<b>exists</b>&lt;<a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt;&gt;(addr)) {
         <b>let</b> root_addr = <b>borrow_global</b>&lt;<a href="capability.md#0x1_capability_CapDelegateState">CapDelegateState</a>&lt;Feature&gt;&gt;(addr).root;
         // double check that requester is actually registered <b>as</b> a delegate
-        <b>assert</b>!(<b>exists</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(root_addr), <a href="errors.md#0x1_errors_invalid_state">errors::invalid_state</a>(<a href="capability.md#0x1_capability_EDELEGATE">EDELEGATE</a>));
+        <b>assert</b>!(<b>exists</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(root_addr), <a href="_invalid_state">error::invalid_state</a>(<a href="capability.md#0x1_capability_EDELEGATE">EDELEGATE</a>));
         <b>assert</b>!(<a href="_contains">vector::contains</a>(&<b>borrow_global</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(root_addr).delegates, &addr),
-               <a href="errors.md#0x1_errors_invalid_state">errors::invalid_state</a>(<a href="capability.md#0x1_capability_EDELEGATE">EDELEGATE</a>));
+               <a href="_invalid_state">error::invalid_state</a>(<a href="capability.md#0x1_capability_EDELEGATE">EDELEGATE</a>));
         root_addr
     } <b>else</b> {
-        <b>assert</b>!(<b>exists</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(addr), <a href="errors.md#0x1_errors_not_published">errors::not_published</a>(<a href="capability.md#0x1_capability_ECAP">ECAP</a>));
+        <b>assert</b>!(<b>exists</b>&lt;<a href="capability.md#0x1_capability_CapState">CapState</a>&lt;Feature&gt;&gt;(addr), <a href="_not_found">error::not_found</a>(<a href="capability.md#0x1_capability_ECAP">ECAP</a>));
         addr
     }
 }
diff --git a/language/move-stdlib/nursery/docs/compare.md b/language/move-stdlib/nursery/docs/compare.md
index bd7300f904..d000527662 100644
--- a/language/move-stdlib/nursery/docs/compare.md
+++ b/language/move-stdlib/nursery/docs/compare.md
@@ -65,7 +65,7 @@ following guarantees w.r.t the original values t1 and t2:
 <code>compare::cmp&lt;T&gt;(t1, t2) != <a href="compare.md#0x1_compare_EQUAL">EQUAL</a></code> iff <code>t1 != t2</code>, where <code>==</code> and <code>!=</code> denote the Move
 bytecode operations for polymorphic equality.
 - for all primitive types <code>T</code> with <code>&lt;</code> and <code>&gt;</code> comparison operators exposed in Move bytecode
-(<code>u8</code>, <code>u64</code>, <code>u128</code>), we have
+(<code>u8</code>, <code>u16</code>, <code>u32</code>, <code>u64</code>, <code>u128</code>, <code>u256</code>), we have
 <code>compare_bcs_bytes(<a href="">bcs</a>(t1), <a href="">bcs</a>(t2)) == <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> iff <code>t1 &lt; t2</code> and (similarly)
 <code>compare_bcs_bytes(<a href="">bcs</a>(t1), <a href="">bcs</a>(t2)) == <a href="compare.md#0x1_compare_LESS_THAN">LESS_THAN</a></code> iff <code>t1 &gt; t2</code>.
 
diff --git a/language/move-stdlib/nursery/docs/debug.md b/language/move-stdlib/nursery/docs/debug.md
index e7b34f1af2..33bd18df12 100644
--- a/language/move-stdlib/nursery/docs/debug.md
+++ b/language/move-stdlib/nursery/docs/debug.md
@@ -18,6 +18,7 @@ Module providing debug functionality.
 
 ## Function `print`
 
+Pretty-prints any Move value. For a Move struct, includes its field names, their types and their values.
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print">print</a>&lt;T&gt;(x: &T)
@@ -40,6 +41,7 @@ Module providing debug functionality.
 
 ## Function `print_stack_trace`
 
+Prints the calling function's stack trace.
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="debug.md#0x1_debug_print_stack_trace">print_stack_trace</a>()
diff --git a/language/move-stdlib/nursery/docs/offer.md b/language/move-stdlib/nursery/docs/offer.md
index b434d07a28..59238b5443 100644
--- a/language/move-stdlib/nursery/docs/offer.md
+++ b/language/move-stdlib/nursery/docs/offer.md
@@ -33,7 +33,7 @@ redeemed it.
     -  [Helper Functions](#@Helper_Functions_5)
 
 
-<pre><code><b>use</b> <a href="errors.md#0x1_errors">0x1::errors</a>;
+<pre><code><b>use</b> <a href="">0x1::error</a>;
 <b>use</b> <a href="">0x1::signer</a>;
 </code></pre>
 
@@ -126,7 +126,7 @@ either the <code>for</code> address or the transaction sender.
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="offer.md#0x1_offer_create">create</a>&lt;Offered: store&gt;(account: &<a href="">signer</a>, offered: Offered, for: <b>address</b>) {
-  <b>assert</b>!(!<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(<a href="_address_of">signer::address_of</a>(account)), <a href="errors.md#0x1_errors_already_published">errors::already_published</a>(<a href="offer.md#0x1_offer_EOFFER_ALREADY_CREATED">EOFFER_ALREADY_CREATED</a>));
+  <b>assert</b>!(!<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(<a href="_address_of">signer::address_of</a>(account)), <a href="_already_exists">error::already_exists</a>(<a href="offer.md#0x1_offer_EOFFER_ALREADY_CREATED">EOFFER_ALREADY_CREATED</a>));
   <b>move_to</b>(account, <a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt; { offered, for });
 }
 </code></pre>
@@ -143,8 +143,7 @@ Offer a struct to the account under address <code>for</code> by
 placing the offer under the signer's address
 
 
-<pre><code><b>aborts_if</b> <b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(<a href="_address_of">signer::address_of</a>(account))
-    <b>with</b> <a href="errors.md#0x1_errors_ALREADY_PUBLISHED">errors::ALREADY_PUBLISHED</a>;
+<pre><code><b>aborts_if</b> <b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(<a href="_address_of">signer::address_of</a>(account));
 <b>ensures</b> <b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(<a href="_address_of">signer::address_of</a>(account));
 <b>ensures</b> <b>global</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(<a href="_address_of">signer::address_of</a>(account)) == <a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt; { offered: offered, for: for };
 </code></pre>
@@ -173,10 +172,10 @@ Also fails if there is no <code><a href="offer.md#0x1_offer_Offer">Offer</a>&lt;
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="offer.md#0x1_offer_redeem">redeem</a>&lt;Offered: store&gt;(account: &<a href="">signer</a>, offer_address: <b>address</b>): Offered <b>acquires</b> <a href="offer.md#0x1_offer_Offer">Offer</a> {
-  <b>assert</b>!(<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address), <a href="errors.md#0x1_errors_not_published">errors::not_published</a>(<a href="offer.md#0x1_offer_EOFFER_DOES_NOT_EXIST">EOFFER_DOES_NOT_EXIST</a>));
+  <b>assert</b>!(<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address), <a href="_not_found">error::not_found</a>(<a href="offer.md#0x1_offer_EOFFER_DOES_NOT_EXIST">EOFFER_DOES_NOT_EXIST</a>));
   <b>let</b> <a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt; { offered, for } = <b>move_from</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address);
   <b>let</b> sender = <a href="_address_of">signer::address_of</a>(account);
-  <b>assert</b>!(sender == for || sender == offer_address, <a href="errors.md#0x1_errors_invalid_argument">errors::invalid_argument</a>(<a href="offer.md#0x1_offer_EOFFER_DNE_FOR_ACCOUNT">EOFFER_DNE_FOR_ACCOUNT</a>));
+  <b>assert</b>!(sender == for || sender == offer_address, <a href="_invalid_argument">error::invalid_argument</a>(<a href="offer.md#0x1_offer_EOFFER_DNE_FOR_ACCOUNT">EOFFER_DNE_FOR_ACCOUNT</a>));
   offered
 }
 </code></pre>
@@ -194,10 +193,8 @@ cannot redeem the offer.
 Ensures that the offered struct under <code>offer_address</code> is removed.
 
 
-<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address)
-    <b>with</b> <a href="errors.md#0x1_errors_NOT_PUBLISHED">errors::NOT_PUBLISHED</a>;
-<b>aborts_if</b> !<a href="offer.md#0x1_offer_is_allowed_recipient">is_allowed_recipient</a>&lt;Offered&gt;(offer_address, <a href="_address_of">signer::address_of</a>(account))
-    <b>with</b> <a href="errors.md#0x1_errors_INVALID_ARGUMENT">errors::INVALID_ARGUMENT</a>;
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address);
+<b>aborts_if</b> !<a href="offer.md#0x1_offer_is_allowed_recipient">is_allowed_recipient</a>&lt;Offered&gt;(offer_address, <a href="_address_of">signer::address_of</a>(account));
 <b>ensures</b> !<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address);
 <b>ensures</b> result == <b>old</b>(<b>global</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address).offered);
 </code></pre>
@@ -265,7 +262,7 @@ Returns whether or not an <code><a href="offer.md#0x1_offer_Offer">Offer</a></co
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="offer.md#0x1_offer_address_of">address_of</a>&lt;Offered: store&gt;(offer_address: <b>address</b>): <b>address</b> <b>acquires</b> <a href="offer.md#0x1_offer_Offer">Offer</a> {
-  <b>assert</b>!(<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address), <a href="errors.md#0x1_errors_not_published">errors::not_published</a>(<a href="offer.md#0x1_offer_EOFFER_DOES_NOT_EXIST">EOFFER_DOES_NOT_EXIST</a>));
+  <b>assert</b>!(<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address), <a href="_not_found">error::not_found</a>(<a href="offer.md#0x1_offer_EOFFER_DOES_NOT_EXIST">EOFFER_DOES_NOT_EXIST</a>));
   <b>borrow_global</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address).for
 }
 </code></pre>
@@ -283,7 +280,7 @@ Returns the address of the intended recipient of the Offer
 under the <code>offer_address</code>.
 
 
-<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address) <b>with</b> <a href="errors.md#0x1_errors_NOT_PUBLISHED">errors::NOT_PUBLISHED</a>;
+<pre><code><b>aborts_if</b> !<b>exists</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address);
 <b>ensures</b> result == <b>global</b>&lt;<a href="offer.md#0x1_offer_Offer">Offer</a>&lt;Offered&gt;&gt;(offer_address).for;
 </code></pre>
 
diff --git a/language/move-stdlib/nursery/docs/role.md b/language/move-stdlib/nursery/docs/role.md
index bd3c9b6987..e01331891d 100644
--- a/language/move-stdlib/nursery/docs/role.md
+++ b/language/move-stdlib/nursery/docs/role.md
@@ -14,7 +14,7 @@ A generic module for role-based access control (RBAC).
 -  [Function `assert_has_role`](#0x1_role_assert_has_role)
 
 
-<pre><code><b>use</b> <a href="errors.md#0x1_errors">0x1::errors</a>;
+<pre><code><b>use</b> <a href="">0x1::error</a>;
 <b>use</b> <a href="">0x1::signer</a>;
 </code></pre>
 
@@ -79,7 +79,7 @@ expected to be a function of the module that defines <code>Type</code>.
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="role.md#0x1_role_assign_role">assign_role</a>&lt;Type&gt;(<b>to</b>: &<a href="">signer</a>, _witness: &Type) {
-    <b>assert</b>!(!<a href="role.md#0x1_role_has_role">has_role</a>&lt;Type&gt;(<a href="_address_of">signer::address_of</a>(<b>to</b>)), <a href="errors.md#0x1_errors_already_published">errors::already_published</a>(<a href="role.md#0x1_role_EROLE">EROLE</a>));
+    <b>assert</b>!(!<a href="role.md#0x1_role_has_role">has_role</a>&lt;Type&gt;(<a href="_address_of">signer::address_of</a>(<b>to</b>)), <a href="_already_exists">error::already_exists</a>(<a href="role.md#0x1_role_EROLE">EROLE</a>));
     <b>move_to</b>&lt;<a href="role.md#0x1_role_Role">Role</a>&lt;Type&gt;&gt;(<b>to</b>, <a href="role.md#0x1_role_Role">Role</a>&lt;Type&gt;{});
 }
 </code></pre>
@@ -106,7 +106,7 @@ expected to be a function of the module that defines <code>Type</code>.
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="role.md#0x1_role_revoke_role">revoke_role</a>&lt;Type&gt;(from: &<a href="">signer</a>, _witness: &Type) <b>acquires</b> <a href="role.md#0x1_role_Role">Role</a> {
-    <b>assert</b>!(<a href="role.md#0x1_role_has_role">has_role</a>&lt;Type&gt;(<a href="_address_of">signer::address_of</a>(from)), <a href="errors.md#0x1_errors_not_published">errors::not_published</a>(<a href="role.md#0x1_role_EROLE">EROLE</a>));
+    <b>assert</b>!(<a href="role.md#0x1_role_has_role">has_role</a>&lt;Type&gt;(<a href="_address_of">signer::address_of</a>(from)), <a href="_not_found">error::not_found</a>(<a href="role.md#0x1_role_EROLE">EROLE</a>));
     <b>let</b> <a href="role.md#0x1_role_Role">Role</a>&lt;Type&gt;{} = <b>move_from</b>&lt;<a href="role.md#0x1_role_Role">Role</a>&lt;Type&gt;&gt;(<a href="_address_of">signer::address_of</a>(from));
 }
 </code></pre>
@@ -157,7 +157,7 @@ assert! that the account has the role.
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="role.md#0x1_role_assert_has_role">assert_has_role</a>&lt;Type&gt;(account: &<a href="">signer</a>) {
-    <b>assert</b>!(<a href="role.md#0x1_role_has_role">has_role</a>&lt;Type&gt;(<a href="_address_of">signer::address_of</a>(account)), <a href="errors.md#0x1_errors_not_published">errors::not_published</a>(<a href="role.md#0x1_role_EROLE">EROLE</a>));
+    <b>assert</b>!(<a href="role.md#0x1_role_has_role">has_role</a>&lt;Type&gt;(<a href="_address_of">signer::address_of</a>(account)), <a href="_not_found">error::not_found</a>(<a href="role.md#0x1_role_EROLE">EROLE</a>));
 }
 </code></pre>
 
diff --git a/language/move-stdlib/nursery/docs/vault.md b/language/move-stdlib/nursery/docs/vault.md
index bcb2a8de60..8576539895 100644
--- a/language/move-stdlib/nursery/docs/vault.md
+++ b/language/move-stdlib/nursery/docs/vault.md
@@ -147,7 +147,7 @@ language to have 'phantom type parameters' or similar features added, which will
 -  [Function `transfer`](#0x1_vault_transfer)
 
 
-<pre><code><b>use</b> <a href="errors.md#0x1_errors">0x1::errors</a>;
+<pre><code><b>use</b> <a href="">0x1::error</a>;
 <b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
 <b>use</b> <a href="">0x1::option</a>;
 <b>use</b> <a href="">0x1::signer</a>;
@@ -806,7 +806,7 @@ Creates new vault for the given signer. The vault is populated with the <code>in
 
 <pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_new">new</a>&lt;Content: store&gt;(owner: &<a href="">signer</a>,  initial_content: Content) {
     <b>let</b> addr = <a href="_address_of">signer::address_of</a>(owner);
-    <b>assert</b>!(!<b>exists</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(addr), <a href="errors.md#0x1_errors_already_published">errors::already_published</a>(<a href="vault.md#0x1_vault_EVAULT">EVAULT</a>));
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(addr), <a href="_already_exists">error::already_exists</a>(<a href="vault.md#0x1_vault_EVAULT">EVAULT</a>));
     <b>move_to</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(
         owner,
         <a href="vault.md#0x1_vault_Vault">Vault</a>{
@@ -839,7 +839,7 @@ Returns <code><b>false</b></code> otherwise.
 
 <pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_is_delegation_enabled">is_delegation_enabled</a>&lt;Content: store&gt;(owner: &<a href="">signer</a>): bool {
     <b>let</b> addr = <a href="_address_of">signer::address_of</a>(owner);
-    <b>assert</b>!(<b>exists</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(addr), <a href="errors.md#0x1_errors_not_published">errors::not_published</a>(<a href="vault.md#0x1_vault_EVAULT">EVAULT</a>));
+    <b>assert</b>!(<b>exists</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(addr), <a href="_not_found">error::not_found</a>(<a href="vault.md#0x1_vault_EVAULT">EVAULT</a>));
     <b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>&lt;Content&gt;&gt;(addr)
 }
 </code></pre>
@@ -865,7 +865,7 @@ Enables delegation functionality for this vault. By default, vaults to not suppo
 
 
 <pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_enable_delegation">enable_delegation</a>&lt;Content: store&gt;(owner: &<a href="">signer</a>) {
-    <b>assert</b>!(!<a href="vault.md#0x1_vault_is_delegation_enabled">is_delegation_enabled</a>&lt;Content&gt;(owner), <a href="errors.md#0x1_errors_already_published">errors::already_published</a>(<a href="vault.md#0x1_vault_EDELEGATE">EDELEGATE</a>));
+    <b>assert</b>!(!<a href="vault.md#0x1_vault_is_delegation_enabled">is_delegation_enabled</a>&lt;Content&gt;(owner), <a href="_already_exists">error::already_exists</a>(<a href="vault.md#0x1_vault_EDELEGATE">EDELEGATE</a>));
     <b>move_to</b>&lt;<a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>&lt;Content&gt;&gt;(owner, <a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>{delegates: <a href="_empty">vector::empty</a>()})
 }
 </code></pre>
@@ -893,8 +893,8 @@ the vault in events.
 
 <pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_enable_events">enable_events</a>&lt;Content: store&gt;(owner: &<a href="">signer</a>, metadata: <a href="">vector</a>&lt;u8&gt;) {
     <b>let</b> addr = <a href="_address_of">signer::address_of</a>(owner);
-    <b>assert</b>!(<b>exists</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(addr), <a href="errors.md#0x1_errors_not_published">errors::not_published</a>(<a href="vault.md#0x1_vault_EVAULT">EVAULT</a>));
-    <b>assert</b>!(!<b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a>&lt;Content&gt;&gt;(addr), <a href="errors.md#0x1_errors_already_published">errors::already_published</a>(<a href="vault.md#0x1_vault_EEVENT">EEVENT</a>));
+    <b>assert</b>!(<b>exists</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(addr), <a href="_not_found">error::not_found</a>(<a href="vault.md#0x1_vault_EVAULT">EVAULT</a>));
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a>&lt;Content&gt;&gt;(addr), <a href="_already_exists">error::already_exists</a>(<a href="vault.md#0x1_vault_EEVENT">EEVENT</a>));
     <b>move_to</b>&lt;<a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a>&lt;Content&gt;&gt;(
         owner,
         <a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a>{
@@ -930,9 +930,9 @@ this to succeed, there must be no active accessor for the vault.
 <pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_remove_vault">remove_vault</a>&lt;Content: store + drop&gt;(owner: &<a href="">signer</a>): Content
 <b>acquires</b> <a href="vault.md#0x1_vault_Vault">Vault</a>, <a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>, <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>, <a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a> {
     <b>let</b> addr = <a href="_address_of">signer::address_of</a>(owner);
-    <b>assert</b>!(<b>exists</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(addr), <a href="errors.md#0x1_errors_not_published">errors::not_published</a>(<a href="vault.md#0x1_vault_EVAULT">EVAULT</a>));
+    <b>assert</b>!(<b>exists</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(addr), <a href="_not_found">error::not_found</a>(<a href="vault.md#0x1_vault_EVAULT">EVAULT</a>));
     <b>let</b> <a href="vault.md#0x1_vault_Vault">Vault</a>{content} = <b>move_from</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(addr);
-    <b>assert</b>!(<a href="_is_some">option::is_some</a>(&content), <a href="errors.md#0x1_errors_invalid_state">errors::invalid_state</a>(<a href="vault.md#0x1_vault_EACCESSOR_IN_USE">EACCESSOR_IN_USE</a>));
+    <b>assert</b>!(<a href="_is_some">option::is_some</a>(&content), <a href="_invalid_state">error::invalid_state</a>(<a href="vault.md#0x1_vault_EACCESSOR_IN_USE">EACCESSOR_IN_USE</a>));
 
     <b>if</b> (<b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>&lt;Content&gt;&gt;(addr)) {
         <b>let</b> delegate_cap = <a href="vault.md#0x1_vault_DelegateCap">DelegateCap</a>&lt;Content&gt;{vault_address: addr, authority: addr};
@@ -1088,11 +1088,11 @@ pair of the vault address and the used authority.
     <b>if</b> (<b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>&lt;Content&gt;&gt;(addr)) {
         // The <a href="">signer</a> is a delegate. Check it's granted capabilities.
         <b>let</b> delegate = <b>borrow_global</b>&lt;<a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>&lt;Content&gt;&gt;(addr);
-        <b>assert</b>!(<a href="_contains">vector::contains</a>(&delegate.granted_caps, &cap), <a href="errors.md#0x1_errors_requires_capability">errors::requires_capability</a>(<a href="vault.md#0x1_vault_EDELEGATE">EDELEGATE</a>));
+        <b>assert</b>!(<a href="_contains">vector::contains</a>(&delegate.granted_caps, &cap), <a href="_permission_denied">error::permission_denied</a>(<a href="vault.md#0x1_vault_EDELEGATE">EDELEGATE</a>));
         (delegate.vault_address, addr)
     } <b>else</b> {
         // If it is not a delegate, it must be the owner <b>to</b> succeed.
-        <b>assert</b>!(<b>exists</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(addr), <a href="errors.md#0x1_errors_not_published">errors::not_published</a>(<a href="vault.md#0x1_vault_EVAULT">EVAULT</a>));
+        <b>assert</b>!(<b>exists</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(addr), <a href="_not_found">error::not_found</a>(<a href="vault.md#0x1_vault_EVAULT">EVAULT</a>));
         (addr, addr)
     }
 }
@@ -1125,7 +1125,7 @@ function will abort if one is in use. An accessor must be explicitly released us
 <pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_read_accessor">read_accessor</a>&lt;Content: store + drop&gt;(cap: &<a href="vault.md#0x1_vault_ReadCap">ReadCap</a>&lt;Content&gt;): <a href="vault.md#0x1_vault_ReadAccessor">ReadAccessor</a>&lt;Content&gt;
 <b>acquires</b> <a href="vault.md#0x1_vault_Vault">Vault</a> {
     <b>let</b> content = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(cap.vault_address).content;
-    <b>assert</b>!(<a href="_is_some">option::is_some</a>(content), <a href="errors.md#0x1_errors_invalid_state">errors::invalid_state</a>(<a href="vault.md#0x1_vault_EACCESSOR_IN_USE">EACCESSOR_IN_USE</a>));
+    <b>assert</b>!(<a href="_is_some">option::is_some</a>(content), <a href="_invalid_state">error::invalid_state</a>(<a href="vault.md#0x1_vault_EACCESSOR_IN_USE">EACCESSOR_IN_USE</a>));
     <a href="vault.md#0x1_vault_ReadAccessor">ReadAccessor</a>{ vault_address: cap.vault_address, content: <a href="_extract">option::extract</a>(content) }
 }
 </code></pre>
@@ -1181,7 +1181,7 @@ Releases read accessor.
     <b>let</b> content = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(vault_address).content;
     // We (should be/are) able <b>to</b> prove that the below cannot happen, but we leave the assertion
     // here anyway for double safety.
-    <b>assert</b>!(<a href="_is_none">option::is_none</a>(content), <a href="errors.md#0x1_errors_internal">errors::internal</a>(<a href="vault.md#0x1_vault_EACCESSOR_INCONSISTENCY">EACCESSOR_INCONSISTENCY</a>));
+    <b>assert</b>!(<a href="_is_none">option::is_none</a>(content), <a href="_internal">error::internal</a>(<a href="vault.md#0x1_vault_EACCESSOR_INCONSISTENCY">EACCESSOR_INCONSISTENCY</a>));
     <a href="_fill">option::fill</a>(content, new_content);
 }
 </code></pre>
@@ -1211,7 +1211,7 @@ the content.
 <pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_modify_accessor">modify_accessor</a>&lt;Content: store + drop&gt;(cap: &<a href="vault.md#0x1_vault_ModifyCap">ModifyCap</a>&lt;Content&gt;): <a href="vault.md#0x1_vault_ModifyAccessor">ModifyAccessor</a>&lt;Content&gt;
 <b>acquires</b> <a href="vault.md#0x1_vault_Vault">Vault</a> {
     <b>let</b> content = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(cap.vault_address).content;
-    <b>assert</b>!(<a href="_is_some">option::is_some</a>(content), <a href="errors.md#0x1_errors_invalid_state">errors::invalid_state</a>(<a href="vault.md#0x1_vault_EACCESSOR_IN_USE">EACCESSOR_IN_USE</a>));
+    <b>assert</b>!(<a href="_is_some">option::is_some</a>(content), <a href="_invalid_state">error::invalid_state</a>(<a href="vault.md#0x1_vault_EACCESSOR_IN_USE">EACCESSOR_IN_USE</a>));
     <a href="vault.md#0x1_vault_ModifyAccessor">ModifyAccessor</a>{ vault_address: cap.vault_address, content: <a href="_extract">option::extract</a>(content) }
 }
 </code></pre>
@@ -1268,7 +1268,7 @@ to the vault.
     <b>let</b> content = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(vault_address).content;
     // We (should be/are) able <b>to</b> prove that the below cannot happen, but we leave the assertion
     // here anyway for double safety.
-    <b>assert</b>!(<a href="_is_none">option::is_none</a>(content), <a href="errors.md#0x1_errors_internal">errors::internal</a>(<a href="vault.md#0x1_vault_EACCESSOR_INCONSISTENCY">EACCESSOR_INCONSISTENCY</a>));
+    <b>assert</b>!(<a href="_is_none">option::is_none</a>(content), <a href="_internal">error::internal</a>(<a href="vault.md#0x1_vault_EACCESSOR_INCONSISTENCY">EACCESSOR_INCONSISTENCY</a>));
     <a href="_fill">option::fill</a>(content, new_content);
 }
 </code></pre>
@@ -1298,11 +1298,11 @@ during vault creation for this to succeed.
 <b>acquires</b> <a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>, <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>, <a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a> {
     <b>assert</b>!(
         <b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>&lt;Content&gt;&gt;(cap.vault_address),
-        <a href="errors.md#0x1_errors_invalid_state">errors::invalid_state</a>(<a href="vault.md#0x1_vault_EDELEGATION_NOT_ENABLED">EDELEGATION_NOT_ENABLED</a>)
+        <a href="_invalid_state">error::invalid_state</a>(<a href="vault.md#0x1_vault_EDELEGATION_NOT_ENABLED">EDELEGATION_NOT_ENABLED</a>)
     );
 
     <b>let</b> addr = <a href="_address_of">signer::address_of</a>(to_signer);
-    <b>assert</b>!(addr != cap.vault_address, <a href="errors.md#0x1_errors_invalid_argument">errors::invalid_argument</a>(<a href="vault.md#0x1_vault_EDELEGATE_TO_SELF">EDELEGATE_TO_SELF</a>));
+    <b>assert</b>!(addr != cap.vault_address, <a href="_invalid_argument">error::invalid_argument</a>(<a href="vault.md#0x1_vault_EDELEGATE_TO_SELF">EDELEGATE_TO_SELF</a>));
 
     <b>if</b> (!<b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>&lt;Content&gt;&gt;(addr)) {
         // Create <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a> <b>if</b> it is not yet existing.
@@ -1348,9 +1348,9 @@ Revokes the delegated right to acquire a capability of given type.
 <b>acquires</b> <a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>, <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>, <a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a> {
     <b>assert</b>!(
         <b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>&lt;Content&gt;&gt;(cap.vault_address),
-        <a href="errors.md#0x1_errors_invalid_state">errors::invalid_state</a>(<a href="vault.md#0x1_vault_EDELEGATION_NOT_ENABLED">EDELEGATION_NOT_ENABLED</a>)
+        <a href="_invalid_state">error::invalid_state</a>(<a href="vault.md#0x1_vault_EDELEGATION_NOT_ENABLED">EDELEGATION_NOT_ENABLED</a>)
     );
-    <b>assert</b>!(<b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>&lt;Content&gt;&gt;(addr), <a href="errors.md#0x1_errors_not_published">errors::not_published</a>(<a href="vault.md#0x1_vault_EDELEGATE">EDELEGATE</a>));
+    <b>assert</b>!(<b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>&lt;Content&gt;&gt;(addr), <a href="_not_found">error::not_found</a>(<a href="vault.md#0x1_vault_EDELEGATE">EDELEGATE</a>));
 
     <b>let</b> delegate = <b>borrow_global_mut</b>&lt;<a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>&lt;Content&gt;&gt;(addr);
     <a href="vault.md#0x1_vault_remove_element">remove_element</a>(&<b>mut</b> delegate.granted_caps, &cap_type);
@@ -1392,7 +1392,7 @@ Revokes all delegate rights for this vault.
 <b>acquires</b> <a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>, <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>, <a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a> {
     <b>assert</b>!(
         <b>exists</b>&lt;<a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>&lt;Content&gt;&gt;(cap.vault_address),
-        <a href="errors.md#0x1_errors_invalid_state">errors::invalid_state</a>(<a href="vault.md#0x1_vault_EDELEGATION_NOT_ENABLED">EDELEGATION_NOT_ENABLED</a>)
+        <a href="_invalid_state">error::invalid_state</a>(<a href="vault.md#0x1_vault_EDELEGATION_NOT_ENABLED">EDELEGATION_NOT_ENABLED</a>)
     );
     <b>let</b> delegates = &<b>mut</b> <b>borrow_global_mut</b>&lt;<a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a>&lt;Content&gt;&gt;(cap.vault_address).delegates;
     <b>while</b> (!<a href="_is_empty">vector::is_empty</a>(delegates)) {
@@ -1526,10 +1526,10 @@ and the new owner must re-create delegates as needed.
 <pre><code><b>public</b> <b>fun</b> <a href="vault.md#0x1_vault_transfer">transfer</a>&lt;Content: store + drop&gt;(cap: &<a href="vault.md#0x1_vault_TransferCap">TransferCap</a>&lt;Content&gt;, to_owner: &<a href="">signer</a>)
 <b>acquires</b> <a href="vault.md#0x1_vault_Vault">Vault</a>, <a href="vault.md#0x1_vault_VaultEvents">VaultEvents</a>, <a href="vault.md#0x1_vault_VaultDelegate">VaultDelegate</a>, <a href="vault.md#0x1_vault_VaultDelegates">VaultDelegates</a> {
     <b>let</b> new_addr = <a href="_address_of">signer::address_of</a>(to_owner);
-    <b>assert</b>!(!<b>exists</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(new_addr), <a href="errors.md#0x1_errors_already_published">errors::already_published</a>(<a href="vault.md#0x1_vault_EVAULT">EVAULT</a>));
+    <b>assert</b>!(!<b>exists</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(new_addr), <a href="_already_exists">error::already_exists</a>(<a href="vault.md#0x1_vault_EVAULT">EVAULT</a>));
     <b>assert</b>!(
         <a href="_is_some">option::is_some</a>(&<b>borrow_global</b>&lt;<a href="vault.md#0x1_vault_Vault">Vault</a>&lt;Content&gt;&gt;(cap.vault_address).content),
-        <a href="errors.md#0x1_errors_invalid_state">errors::invalid_state</a>(<a href="vault.md#0x1_vault_EACCESSOR_IN_USE">EACCESSOR_IN_USE</a>)
+        <a href="_invalid_state">error::invalid_state</a>(<a href="vault.md#0x1_vault_EACCESSOR_IN_USE">EACCESSOR_IN_USE</a>)
     );
 
     // Revoke all delegates.
diff --git a/language/move-stdlib/nursery/sources/capability.move b/language/move-stdlib/nursery/sources/capability.move
index 461945f61b..85d0487202 100644
--- a/language/move-stdlib/nursery/sources/capability.move
+++ b/language/move-stdlib/nursery/sources/capability.move
@@ -72,7 +72,7 @@
 /// ```
 ///
 module std::capability {
-    use std::errors;
+    use std::error;
     use std::signer;
     use std::vector;
 
@@ -104,7 +104,7 @@ module std::capability {
     /// they own the `Feature` type parameter.
     public fun create<Feature>(owner: &signer, _feature_witness: &Feature) {
         let addr = signer::address_of(owner);
-        assert!(!exists<CapState<Feature>>(addr), errors::already_published(ECAP));
+        assert!(!exists<CapState<Feature>>(addr), error::already_exists(ECAP));
         move_to<CapState<Feature>>(owner, CapState{ delegates: vector::empty() });
     }
 
@@ -130,12 +130,12 @@ module std::capability {
         if (exists<CapDelegateState<Feature>>(addr)) {
             let root_addr = borrow_global<CapDelegateState<Feature>>(addr).root;
             // double check that requester is actually registered as a delegate
-            assert!(exists<CapState<Feature>>(root_addr), errors::invalid_state(EDELEGATE));
+            assert!(exists<CapState<Feature>>(root_addr), error::invalid_state(EDELEGATE));
             assert!(vector::contains(&borrow_global<CapState<Feature>>(root_addr).delegates, &addr),
-                   errors::invalid_state(EDELEGATE));
+                   error::invalid_state(EDELEGATE));
             root_addr
         } else {
-            assert!(exists<CapState<Feature>>(addr), errors::not_published(ECAP));
+            assert!(exists<CapState<Feature>>(addr), error::not_found(ECAP));
             addr
         }
     }
diff --git a/language/move-stdlib/nursery/sources/compare.move b/language/move-stdlib/nursery/sources/compare.move
index e4d5dc6d8f..73793c2006 100644
--- a/language/move-stdlib/nursery/sources/compare.move
+++ b/language/move-stdlib/nursery/sources/compare.move
@@ -22,7 +22,7 @@ module std::compare {
     ///   `compare::cmp<T>(t1, t2) != EQUAL` iff `t1 != t2`, where `==` and `!=` denote the Move
     ///    bytecode operations for polymorphic equality.
     /// - for all primitive types `T` with `<` and `>` comparison operators exposed in Move bytecode
-    ///   (`u8`, `u64`, `u128`), we have
+    ///   (`u8`, `u16`, `u32`, `u64`, `u128`, `u256`), we have
     ///   `compare_bcs_bytes(bcs(t1), bcs(t2)) == LESS_THAN` iff `t1 < t2` and (similarly)
     ///   `compare_bcs_bytes(bcs(t1), bcs(t2)) == LESS_THAN` iff `t1 > t2`.
     ///
diff --git a/language/move-stdlib/nursery/sources/debug.move b/language/move-stdlib/nursery/sources/debug.move
index 1232b0f5ab..d4a506d10f 100644
--- a/language/move-stdlib/nursery/sources/debug.move
+++ b/language/move-stdlib/nursery/sources/debug.move
@@ -1,6 +1,18 @@
 /// Module providing debug functionality.
 module std::debug {
+
+    /// Pretty-prints any Move value. For a Move struct, includes its field names, their types and their values.
     native public fun print<T>(x: &T);
 
+    /// Prints the calling function's stack trace.
     native public fun print_stack_trace();
+
+    #[test_only]
+    use std::string;
+
+    #[test_only]
+    /// Utility function for printing a sequence of UTF8 bytes as a string (e.g., `b"Hello"`).
+    public fun print_string(utf8_bytes: vector<u8>) {
+        print<string::String>(&string::utf8(utf8_bytes));
+    }
 }
diff --git a/language/move-stdlib/nursery/sources/offer.move b/language/move-stdlib/nursery/sources/offer.move
index d47b6a7bf0..06366db573 100644
--- a/language/move-stdlib/nursery/sources/offer.move
+++ b/language/move-stdlib/nursery/sources/offer.move
@@ -15,7 +15,7 @@
 /// redeemed it.
 module std::offer {
   use std::signer;
-  use std::errors;
+  use std::error;
 
   /// A wrapper around value `offered` that can be claimed by the address stored in `for`.
   struct Offer<Offered> has key { offered: Offered, for: address }
@@ -32,14 +32,13 @@ module std::offer {
   /// Publish a value of type `Offered` under the sender's account. The value can be claimed by
   /// either the `for` address or the transaction sender.
   public fun create<Offered: store>(account: &signer, offered: Offered, for: address) {
-    assert!(!exists<Offer<Offered>>(signer::address_of(account)), errors::already_published(EOFFER_ALREADY_CREATED));
+    assert!(!exists<Offer<Offered>>(signer::address_of(account)), error::already_exists(EOFFER_ALREADY_CREATED));
     move_to(account, Offer<Offered> { offered, for });
   }
   spec create {
     /// Offer a struct to the account under address `for` by
     /// placing the offer under the signer's address
-    aborts_if exists<Offer<Offered>>(signer::address_of(account))
-        with errors::ALREADY_PUBLISHED;
+    aborts_if exists<Offer<Offered>>(signer::address_of(account));
     ensures exists<Offer<Offered>>(signer::address_of(account));
     ensures global<Offer<Offered>>(signer::address_of(account)) == Offer<Offered> { offered: offered, for: for };
   }
@@ -49,20 +48,18 @@ module std::offer {
   /// publisher `offer_address`.
   /// Also fails if there is no `Offer<Offered>` published.
   public fun redeem<Offered: store>(account: &signer, offer_address: address): Offered acquires Offer {
-    assert!(exists<Offer<Offered>>(offer_address), errors::not_published(EOFFER_DOES_NOT_EXIST));
+    assert!(exists<Offer<Offered>>(offer_address), error::not_found(EOFFER_DOES_NOT_EXIST));
     let Offer<Offered> { offered, for } = move_from<Offer<Offered>>(offer_address);
     let sender = signer::address_of(account);
-    assert!(sender == for || sender == offer_address, errors::invalid_argument(EOFFER_DNE_FOR_ACCOUNT));
+    assert!(sender == for || sender == offer_address, error::invalid_argument(EOFFER_DNE_FOR_ACCOUNT));
     offered
   }
   spec redeem {
     /// Aborts if there is no offer under `offer_address` or if the account
     /// cannot redeem the offer.
     /// Ensures that the offered struct under `offer_address` is removed.
-    aborts_if !exists<Offer<Offered>>(offer_address)
-        with errors::NOT_PUBLISHED;
-    aborts_if !is_allowed_recipient<Offered>(offer_address, signer::address_of(account))
-        with errors::INVALID_ARGUMENT;
+    aborts_if !exists<Offer<Offered>>(offer_address);
+    aborts_if !is_allowed_recipient<Offered>(offer_address, signer::address_of(account));
     ensures !exists<Offer<Offered>>(offer_address);
     ensures result == old(global<Offer<Offered>>(offer_address).offered);
   }
@@ -81,14 +78,14 @@ module std::offer {
   // Returns the address of the `Offered` type stored at `offer_address.
   // Fails if no such `Offer` exists.
   public fun address_of<Offered: store>(offer_address: address): address acquires Offer {
-    assert!(exists<Offer<Offered>>(offer_address), errors::not_published(EOFFER_DOES_NOT_EXIST));
+    assert!(exists<Offer<Offered>>(offer_address), error::not_found(EOFFER_DOES_NOT_EXIST));
     borrow_global<Offer<Offered>>(offer_address).for
   }
   spec address_of {
     /// Aborts is there is no offer resource `Offer` at the `offer_address`.
     /// Returns the address of the intended recipient of the Offer
     /// under the `offer_address`.
-    aborts_if !exists<Offer<Offered>>(offer_address) with errors::NOT_PUBLISHED;
+    aborts_if !exists<Offer<Offered>>(offer_address);
     ensures result == global<Offer<Offered>>(offer_address).for;
   }
 
diff --git a/language/move-stdlib/nursery/sources/role.move b/language/move-stdlib/nursery/sources/role.move
index 5d09960dd5..468a8d7a79 100644
--- a/language/move-stdlib/nursery/sources/role.move
+++ b/language/move-stdlib/nursery/sources/role.move
@@ -1,7 +1,7 @@
 /// A generic module for role-based access control (RBAC).
 
 module std::role {
-    use std::errors;
+    use std::error;
     use std::signer;
 
     const EROLE: u64 = 0;
@@ -11,14 +11,14 @@ module std::role {
     /// Assign the role to the account. The caller must pass a witness, so is
     /// expected to be a function of the module that defines `Type`.
     public fun assign_role<Type>(to: &signer, _witness: &Type) {
-        assert!(!has_role<Type>(signer::address_of(to)), errors::already_published(EROLE));
+        assert!(!has_role<Type>(signer::address_of(to)), error::already_exists(EROLE));
         move_to<Role<Type>>(to, Role<Type>{});
     }
 
     /// Revoke the role from the account. The caller must pass a witness, so is
     /// expected to be a function of the module that defines `Type`.
     public fun revoke_role<Type>(from: &signer, _witness: &Type) acquires Role {
-        assert!(has_role<Type>(signer::address_of(from)), errors::not_published(EROLE));
+        assert!(has_role<Type>(signer::address_of(from)), error::not_found(EROLE));
         let Role<Type>{} = move_from<Role<Type>>(signer::address_of(from));
     }
 
@@ -29,6 +29,6 @@ module std::role {
 
     /// assert! that the account has the role.
     public fun assert_has_role<Type>(account: &signer) {
-        assert!(has_role<Type>(signer::address_of(account)), errors::not_published(EROLE));
+        assert!(has_role<Type>(signer::address_of(account)), error::not_found(EROLE));
     }
 }
diff --git a/language/move-stdlib/nursery/sources/vault.move b/language/move-stdlib/nursery/sources/vault.move
index b443233ad6..7316a0ec15 100644
--- a/language/move-stdlib/nursery/sources/vault.move
+++ b/language/move-stdlib/nursery/sources/vault.move
@@ -80,7 +80,7 @@
 /// `ReadCap<Content>` droppable and copyable without `Content` needing the same.
 module std::vault {
 
-    use std::errors;
+    use std::error;
     use std::event;
     use std::option;
     use std::signer;
@@ -205,7 +205,7 @@ module std::vault {
     /// Creates new vault for the given signer. The vault is populated with the `initial_content`.
     public fun new<Content: store>(owner: &signer,  initial_content: Content) {
         let addr = signer::address_of(owner);
-        assert!(!exists<Vault<Content>>(addr), errors::already_published(EVAULT));
+        assert!(!exists<Vault<Content>>(addr), error::already_exists(EVAULT));
         move_to<Vault<Content>>(
             owner,
             Vault{
@@ -218,13 +218,13 @@ module std::vault {
     /// Returns `false` otherwise.
     public fun is_delegation_enabled<Content: store>(owner: &signer): bool {
         let addr = signer::address_of(owner);
-        assert!(exists<Vault<Content>>(addr), errors::not_published(EVAULT));
+        assert!(exists<Vault<Content>>(addr), error::not_found(EVAULT));
         exists<VaultDelegates<Content>>(addr)
     }
 
     /// Enables delegation functionality for this vault. By default, vaults to not support delegation.
     public fun enable_delegation<Content: store>(owner: &signer) {
-        assert!(!is_delegation_enabled<Content>(owner), errors::already_published(EDELEGATE));
+        assert!(!is_delegation_enabled<Content>(owner), error::already_exists(EDELEGATE));
         move_to<VaultDelegates<Content>>(owner, VaultDelegates{delegates: vector::empty()})
     }
 
@@ -232,8 +232,8 @@ module std::vault {
     /// the vault in events.
     public fun enable_events<Content: store>(owner: &signer, metadata: vector<u8>) {
         let addr = signer::address_of(owner);
-        assert!(exists<Vault<Content>>(addr), errors::not_published(EVAULT));
-        assert!(!exists<VaultEvents<Content>>(addr), errors::already_published(EEVENT));
+        assert!(exists<Vault<Content>>(addr), error::not_found(EVAULT));
+        assert!(!exists<VaultEvents<Content>>(addr), error::already_exists(EEVENT));
         move_to<VaultEvents<Content>>(
             owner,
             VaultEvents{
@@ -249,9 +249,9 @@ module std::vault {
     public fun remove_vault<Content: store + drop>(owner: &signer): Content
     acquires Vault, VaultDelegates, VaultDelegate, VaultEvents {
         let addr = signer::address_of(owner);
-        assert!(exists<Vault<Content>>(addr), errors::not_published(EVAULT));
+        assert!(exists<Vault<Content>>(addr), error::not_found(EVAULT));
         let Vault{content} = move_from<Vault<Content>>(addr);
-        assert!(option::is_some(&content), errors::invalid_state(EACCESSOR_IN_USE));
+        assert!(option::is_some(&content), error::invalid_state(EACCESSOR_IN_USE));
 
         if (exists<VaultDelegates<Content>>(addr)) {
             let delegate_cap = DelegateCap<Content>{vault_address: addr, authority: addr};
@@ -310,11 +310,11 @@ module std::vault {
         if (exists<VaultDelegate<Content>>(addr)) {
             // The signer is a delegate. Check it's granted capabilities.
             let delegate = borrow_global<VaultDelegate<Content>>(addr);
-            assert!(vector::contains(&delegate.granted_caps, &cap), errors::requires_capability(EDELEGATE));
+            assert!(vector::contains(&delegate.granted_caps, &cap), error::permission_denied(EDELEGATE));
             (delegate.vault_address, addr)
         } else {
             // If it is not a delegate, it must be the owner to succeed.
-            assert!(exists<Vault<Content>>(addr), errors::not_published(EVAULT));
+            assert!(exists<Vault<Content>>(addr), error::not_found(EVAULT));
             (addr, addr)
         }
     }
@@ -337,7 +337,7 @@ module std::vault {
     public fun read_accessor<Content: store + drop>(cap: &ReadCap<Content>): ReadAccessor<Content>
     acquires Vault {
         let content = &mut borrow_global_mut<Vault<Content>>(cap.vault_address).content;
-        assert!(option::is_some(content), errors::invalid_state(EACCESSOR_IN_USE));
+        assert!(option::is_some(content), error::invalid_state(EACCESSOR_IN_USE));
         ReadAccessor{ vault_address: cap.vault_address, content: option::extract(content) }
     }
 
@@ -353,7 +353,7 @@ module std::vault {
         let content = &mut borrow_global_mut<Vault<Content>>(vault_address).content;
         // We (should be/are) able to prove that the below cannot happen, but we leave the assertion
         // here anyway for double safety.
-        assert!(option::is_none(content), errors::internal(EACCESSOR_INCONSISTENCY));
+        assert!(option::is_none(content), error::internal(EACCESSOR_INCONSISTENCY));
         option::fill(content, new_content);
     }
 
@@ -372,7 +372,7 @@ module std::vault {
     public fun modify_accessor<Content: store + drop>(cap: &ModifyCap<Content>): ModifyAccessor<Content>
     acquires Vault {
         let content = &mut borrow_global_mut<Vault<Content>>(cap.vault_address).content;
-        assert!(option::is_some(content), errors::invalid_state(EACCESSOR_IN_USE));
+        assert!(option::is_some(content), error::invalid_state(EACCESSOR_IN_USE));
         ModifyAccessor{ vault_address: cap.vault_address, content: option::extract(content) }
     }
 
@@ -389,7 +389,7 @@ module std::vault {
         let content = &mut borrow_global_mut<Vault<Content>>(vault_address).content;
         // We (should be/are) able to prove that the below cannot happen, but we leave the assertion
         // here anyway for double safety.
-        assert!(option::is_none(content), errors::internal(EACCESSOR_INCONSISTENCY));
+        assert!(option::is_none(content), error::internal(EACCESSOR_INCONSISTENCY));
         option::fill(content, new_content);
     }
 
@@ -403,11 +403,11 @@ module std::vault {
     acquires VaultDelegates, VaultDelegate, VaultEvents {
         assert!(
             exists<VaultDelegates<Content>>(cap.vault_address),
-            errors::invalid_state(EDELEGATION_NOT_ENABLED)
+            error::invalid_state(EDELEGATION_NOT_ENABLED)
         );
 
         let addr = signer::address_of(to_signer);
-        assert!(addr != cap.vault_address, errors::invalid_argument(EDELEGATE_TO_SELF));
+        assert!(addr != cap.vault_address, error::invalid_argument(EDELEGATE_TO_SELF));
 
         if (!exists<VaultDelegate<Content>>(addr)) {
             // Create VaultDelegate if it is not yet existing.
@@ -433,9 +433,9 @@ module std::vault {
     acquires VaultDelegates, VaultDelegate, VaultEvents {
         assert!(
             exists<VaultDelegates<Content>>(cap.vault_address),
-            errors::invalid_state(EDELEGATION_NOT_ENABLED)
+            error::invalid_state(EDELEGATION_NOT_ENABLED)
         );
-        assert!(exists<VaultDelegate<Content>>(addr), errors::not_published(EDELEGATE));
+        assert!(exists<VaultDelegate<Content>>(addr), error::not_found(EDELEGATE));
 
         let delegate = borrow_global_mut<VaultDelegate<Content>>(addr);
         remove_element(&mut delegate.granted_caps, &cap_type);
@@ -457,7 +457,7 @@ module std::vault {
     acquires VaultDelegates, VaultDelegate, VaultEvents {
         assert!(
             exists<VaultDelegates<Content>>(cap.vault_address),
-            errors::invalid_state(EDELEGATION_NOT_ENABLED)
+            error::invalid_state(EDELEGATION_NOT_ENABLED)
         );
         let delegates = &mut borrow_global_mut<VaultDelegates<Content>>(cap.vault_address).delegates;
         while (!vector::is_empty(delegates)) {
@@ -514,10 +514,10 @@ module std::vault {
     public fun transfer<Content: store + drop>(cap: &TransferCap<Content>, to_owner: &signer)
     acquires Vault, VaultEvents, VaultDelegate, VaultDelegates {
         let new_addr = signer::address_of(to_owner);
-        assert!(!exists<Vault<Content>>(new_addr), errors::already_published(EVAULT));
+        assert!(!exists<Vault<Content>>(new_addr), error::already_exists(EVAULT));
         assert!(
             option::is_some(&borrow_global<Vault<Content>>(cap.vault_address).content),
-            errors::invalid_state(EACCESSOR_IN_USE)
+            error::invalid_state(EACCESSOR_IN_USE)
         );
 
         // Revoke all delegates.
diff --git a/language/move-stdlib/nursery/tests/acl_tests.move b/language/move-stdlib/nursery/tests/acl_tests.move
index aa06d888bd..6617f1b5d9 100644
--- a/language/move-stdlib/nursery/tests/acl_tests.move
+++ b/language/move-stdlib/nursery/tests/acl_tests.move
@@ -23,7 +23,7 @@ module std::aclTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 7)]
+    #[expected_failure(abort_code = 7, location = std::acl)]
     fun test_add_failure() acquires Data {
         let (alice, bob) = create_two_signers();
         let acl = acl::empty();
@@ -36,7 +36,7 @@ module std::aclTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 263)]
+    #[expected_failure(abort_code = 263, location = std::acl)]
     fun test_remove_failure() acquires Data {
         let (alice, bob) = create_two_signers();
         let acl = acl::empty();
diff --git a/language/move-stdlib/nursery/tests/capability_tests.move b/language/move-stdlib/nursery/tests/capability_tests.move
index 4fa13c3e33..a62506bed7 100644
--- a/language/move-stdlib/nursery/tests/capability_tests.move
+++ b/language/move-stdlib/nursery/tests/capability_tests.move
@@ -15,7 +15,7 @@ module std::capability_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 0x60000, location = std::capability)]
     fun test_failure() {
         let (owner, other) = create_two_signers();
         capability::create(&owner, &Feature{});
@@ -32,7 +32,7 @@ module std::capability_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 0x60000, location = std::capability)]
     fun test_delegate_failure_after_revoke() {
         let (owner, delegate) = create_two_signers();
         capability::create(&owner, &Feature{});
diff --git a/language/move-stdlib/nursery/tests/compare_tests.move b/language/move-stdlib/nursery/tests/compare_tests.move
index 743f032f6d..4af198639f 100644
--- a/language/move-stdlib/nursery/tests/compare_tests.move
+++ b/language/move-stdlib/nursery/tests/compare_tests.move
@@ -13,8 +13,11 @@ module std::compareTests {
     fun equality_of_simple_types() {
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&true), &bcs::to_bytes(&true)) == EQUAL, 0);
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u8), &bcs::to_bytes(&1u8)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u16), &bcs::to_bytes(&1u16)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u32), &bcs::to_bytes(&1u32)) == EQUAL, 0);
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1), &bcs::to_bytes(&1)) == EQUAL, 0);
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u128), &bcs::to_bytes(&1u128)) == EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u256), &bcs::to_bytes(&1u256)) == EQUAL, 0);
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x1), &bcs::to_bytes(&@0x1)) == EQUAL, 0);
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"01"), &bcs::to_bytes(&x"01")) == EQUAL, 0);
     }
@@ -24,8 +27,11 @@ module std::compareTests {
         // inequality of simple types
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&true), &bcs::to_bytes(&false)) != EQUAL, 0);
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u8), &bcs::to_bytes(&0u8)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u16), &bcs::to_bytes(&0u16)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u32), &bcs::to_bytes(&0u32)) != EQUAL, 0);
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1), &bcs::to_bytes(&0)) != EQUAL, 0);
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u128), &bcs::to_bytes(&0u128)) != EQUAL, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u256), &bcs::to_bytes(&0u256)) != EQUAL, 0);
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&@0x1), &bcs::to_bytes(&@0x0)) != EQUAL, 0);
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&x"01"), &bcs::to_bytes(&x"00")) != EQUAL, 0);
     }
@@ -35,8 +41,11 @@ module std::compareTests {
         // less than for types with a natural ordering exposed via bytecode operations
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&false), &bcs::to_bytes(&true)) == LESS_THAN, 0);
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u8), &bcs::to_bytes(&1u8)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u16), &bcs::to_bytes(&1u16)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u32), &bcs::to_bytes(&1u32)) == LESS_THAN, 0);
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0), &bcs::to_bytes(&1)) == LESS_THAN, 0);
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u128), &bcs::to_bytes(&1u128)) == LESS_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&0u256), &bcs::to_bytes(&1u256)) == LESS_THAN, 0);
     }
 
     #[test]
@@ -56,8 +65,11 @@ module std::compareTests {
         // greater than for types with a natural ordering exposed by bytecode operations
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&true), &bcs::to_bytes(&false)) == GREATER_THAN, 0);
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u8), &bcs::to_bytes(&0u8)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u16), &bcs::to_bytes(&0u16)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u32), &bcs::to_bytes(&0u32)) == GREATER_THAN, 0);
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1), &bcs::to_bytes(&0)) == GREATER_THAN, 0);
         assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u128), &bcs::to_bytes(&0u128)) == GREATER_THAN, 0);
+        assert!(compare::cmp_bcs_bytes(&bcs::to_bytes(&1u256), &bcs::to_bytes(&0u256)) == GREATER_THAN, 0);
     }
 
     #[test]
diff --git a/language/move-stdlib/nursery/tests/event_tests.move b/language/move-stdlib/nursery/tests/event_tests.move
index cd8da3e547..3ab19d53cb 100644
--- a/language/move-stdlib/nursery/tests/event_tests.move
+++ b/language/move-stdlib/nursery/tests/event_tests.move
@@ -73,7 +73,7 @@ module std::event_tests {
     }
 
     #[test(s = @0x42)]
-    #[expected_failure(abort_code = 0)]
+    #[expected_failure] // VM_MAX_VALUE_DEPTH_REACHED
     fun test_event_129(s: signer) acquires MyEvent {
         event_129(&s);
     }
diff --git a/language/move-stdlib/nursery/tests/role_tests.move b/language/move-stdlib/nursery/tests/role_tests.move
index 768ce6ec34..cbad4cd7f8 100644
--- a/language/move-stdlib/nursery/tests/role_tests.move
+++ b/language/move-stdlib/nursery/tests/role_tests.move
@@ -21,7 +21,7 @@ module std::roleTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 6)]
+    #[expected_failure(abort_code = 0x80000, location = std::role)]
     fun test_assign_failure() {
         let alice = create_signer();
         role::assign_role<Developer>(&alice, &Developer{});
@@ -29,7 +29,7 @@ module std::roleTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 5)]
+    #[expected_failure(abort_code = 0x60000, location = std::role)]
     fun test_revoke_failure() {
         let alice = create_signer();
         role::revoke_role<Developer>(&alice, &Developer{});
diff --git a/language/move-stdlib/sources/ascii.move b/language/move-stdlib/sources/ascii.move
index 930705b0d8..f3c9daec54 100644
--- a/language/move-stdlib/sources/ascii.move
+++ b/language/move-stdlib/sources/ascii.move
@@ -5,7 +5,7 @@ module std::ascii {
     use std::option::{Self, Option};
 
     /// An invalid ASCII character was encountered when creating an ASCII string.
-    const EINVALID_ASCII_CHARACTER: u64 = 0;
+    const EINVALID_ASCII_CHARACTER: u64 = 0x10000;
 
    /// The `String` struct holds a vector of bytes that all represent
    /// valid ASCII characters. Note that these ASCII characters may not all
diff --git a/language/move-stdlib/sources/bit_vector.move b/language/move-stdlib/sources/bit_vector.move
index 500d8dd347..e89795422c 100644
--- a/language/move-stdlib/sources/bit_vector.move
+++ b/language/move-stdlib/sources/bit_vector.move
@@ -2,9 +2,9 @@ module std::bit_vector {
     use std::vector;
 
     /// The provided index is out of bounds
-    const EINDEX: u64 = 0;
+    const EINDEX: u64 = 0x20000;
     /// An invalid length of bitvector was given
-    const ELENGTH: u64 = 1;
+    const ELENGTH: u64 = 0x20001;
 
     const WORD_SIZE: u64 = 1;
     /// The maximum allowed bitvector size
@@ -71,9 +71,9 @@ module std::bit_vector {
         let x = vector::borrow_mut(&mut bitvector.bit_field, bit_index);
         *x = false;
     }
-    spec set {
+    spec unset {
         include UnsetAbortsIf;
-        ensures bitvector.bit_field[bit_index];
+        ensures !bitvector.bit_field[bit_index];
     }
     spec schema UnsetAbortsIf {
         bitvector: BitVector;
diff --git a/language/move-stdlib/sources/error.move b/language/move-stdlib/sources/error.move
new file mode 100644
index 0000000000..32ba1d6164
--- /dev/null
+++ b/language/move-stdlib/sources/error.move
@@ -0,0 +1,81 @@
+/// This module defines a set of canonical error codes which are optional to use by applications for the
+/// `abort` and `assert!` features.
+///
+/// Canonical error codes use the 3 lowest bytes of the u64 abort code range (the upper 5 bytes are free for other use).
+/// Of those, the highest byte represents the *error category* and the lower two bytes the *error reason*.
+/// Given an error category `0x1` and a reason `0x3`, a canonical abort code looks as `0x10003`.
+///
+/// A module can use a canonical code with a constant declaration of the following form:
+///
+/// ```
+/// ///  An invalid ASCII character was encountered when creating a string.
+/// const EINVALID_CHARACTER: u64 = 0x010003;
+/// ```
+///
+/// This code is both valid in the worlds with and without canonical errors. It can be used as a plain module local
+/// error reason understand by the existing error map tooling, or as a canonical code.
+///
+/// The actual canonical categories have been adopted from Google's canonical error codes, which in turn are derived
+/// from Unix error codes [see here](https://cloud.google.com/apis/design/errors#handling_errors). Each code has an
+/// associated HTTP error code which can be used in REST apis. The mapping from error code to http code is not 1:1;
+/// error codes here are a bit richer than HTTP codes.
+module std::error {
+
+  /// Caller specified an invalid argument (http: 400)
+  const INVALID_ARGUMENT: u64 = 0x1;
+
+  /// An input or result of a computation is out of range (http: 400)
+  const OUT_OF_RANGE: u64 = 0x2;
+
+  /// The system is not in a state where the operation can be performed (http: 400)
+  const INVALID_STATE: u64 = 0x3;
+
+  /// Request not authenticated due to missing, invalid, or expired auth token (http: 401)
+  const UNAUTHENTICATED: u64 = 0x4;
+
+  /// client does not have sufficient permission (http: 403)
+  const PERMISSION_DENIED: u64 = 0x5;
+
+  /// A specified resource is not found (http: 404)
+  const NOT_FOUND: u64 = 0x6;
+
+  /// Concurrency conflict, such as read-modify-write conflict (http: 409)
+  const ABORTED: u64 = 0x7;
+
+  /// The resource that a client tried to create already exists (http: 409)
+  const ALREADY_EXISTS: u64 = 0x8;
+
+  /// Out of gas or other forms of quota (http: 429)
+  const RESOURCE_EXHAUSTED: u64 = 0x9;
+
+  /// Request cancelled by the client (http: 499)
+  const CANCELLED: u64 = 0xA;
+
+  /// Internal error (http: 500)
+  const INTERNAL: u64 = 0xB;
+
+  /// Feature not implemented (http: 501)
+  const NOT_IMPLEMENTED: u64 = 0xC;
+
+  /// The service is currently unavailable. Indicates that a retry could solve the issue (http: 503)
+  const UNAVAILABLE: u64 = 0xD;
+
+  /// Construct a canonical error code from a category and a reason.
+  public fun canonical(category: u64, reason: u64): u64 {
+    (category << 16) + reason
+  }
+
+  /// Functions to construct a canonical error code of the given category.
+  public fun invalid_argument(r: u64): u64 {  canonical(INVALID_ARGUMENT, r) }
+  public fun out_of_range(r: u64): u64 {  canonical(OUT_OF_RANGE, r) }
+  public fun invalid_state(r: u64): u64 {  canonical(INVALID_STATE, r) }
+  public fun unauthenticated(r: u64): u64 { canonical(UNAUTHENTICATED, r) }
+  public fun permission_denied(r: u64): u64 { canonical(PERMISSION_DENIED, r) }
+  public fun not_found(r: u64): u64 { canonical(NOT_FOUND, r) }
+  public fun aborted(r: u64): u64 { canonical(ABORTED, r) }
+  public fun already_exists(r: u64): u64 { canonical(ALREADY_EXISTS, r) }
+  public fun resource_exhausted(r: u64): u64 {  canonical(RESOURCE_EXHAUSTED, r) }
+  public fun internal(r: u64): u64 {  canonical(INTERNAL, r) }
+  public fun not_implemented(r: u64): u64 {  canonical(NOT_IMPLEMENTED, r) }
+  public fun unavailable(r: u64): u64 { canonical(UNAVAILABLE, r) }
+}
diff --git a/language/move-stdlib/sources/fixed_point32.move b/language/move-stdlib/sources/fixed_point32.move
index d052815ea6..05f2614fe2 100644
--- a/language/move-stdlib/sources/fixed_point32.move
+++ b/language/move-stdlib/sources/fixed_point32.move
@@ -18,15 +18,15 @@ module std::fixed_point32 {
     const MAX_U64: u128 = 18446744073709551615;
 
     /// The denominator provided was zero
-    const EDENOMINATOR: u64 = 0;
+    const EDENOMINATOR: u64 = 0x10001;
     /// The quotient value would be too large to be held in a `u64`
-    const EDIVISION: u64 = 1;
+    const EDIVISION: u64 = 0x20002;
     /// The multiplied value would be too large to be held in a `u64`
-    const EMULTIPLICATION: u64 = 2;
+    const EMULTIPLICATION: u64 = 0x20003;
     /// A division by zero was encountered
-    const EDIVISION_BY_ZERO: u64 = 3;
+    const EDIVISION_BY_ZERO: u64 = 0x10004;
     /// The computed ratio when converting to a `FixedPoint32` would be unrepresentable
-    const ERATIO_OUT_OF_RANGE: u64 = 4;
+    const ERATIO_OUT_OF_RANGE: u64 = 0x20005;
 
     /// Multiply a u64 integer by a fixed-point number, truncating any
     /// fractional part of the product. This will abort if the product
@@ -121,8 +121,8 @@ module std::fixed_point32 {
     spec schema CreateFromRationalAbortsIf {
         numerator: u64;
         denominator: u64;
-        let scaled_numerator = numerator << 64;
-        let scaled_denominator = denominator << 32;
+        let scaled_numerator = (numerator as u128) << 64;
+        let scaled_denominator = (denominator as u128) << 32;
         let quotient = scaled_numerator / scaled_denominator;
         aborts_if scaled_denominator == 0 with EDENOMINATOR;
         aborts_if quotient == 0 && scaled_numerator != 0 with ERATIO_OUT_OF_RANGE;
@@ -154,6 +154,136 @@ module std::fixed_point32 {
         num.value == 0
     }
 
+    /// Returns the smaller of the two FixedPoint32 numbers.
+    public fun min(num1: FixedPoint32, num2: FixedPoint32): FixedPoint32 {
+        if (num1.value < num2.value) {
+            num1
+        } else {
+            num2
+        }
+    }
+    spec min {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_min(num1, num2);
+    }
+    spec fun spec_min(num1: FixedPoint32, num2: FixedPoint32): FixedPoint32 {
+        if (num1.value < num2.value) {
+            num1
+        } else {
+            num2
+        }
+    }
+
+    /// Returns the larger of the two FixedPoint32 numbers.
+    public fun max(num1: FixedPoint32, num2: FixedPoint32): FixedPoint32 {
+        if (num1.value > num2.value) {
+            num1
+        } else {
+            num2
+        }
+    }
+    spec max {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_max(num1, num2);
+    }
+    spec fun spec_max(num1: FixedPoint32, num2: FixedPoint32): FixedPoint32 {
+        if (num1.value > num2.value) {
+            num1
+        } else {
+            num2
+        }
+    }
+
+    /// Create a fixedpoint value from a u64 value.
+    public fun create_from_u64(val: u64): FixedPoint32 {
+        let value = (val as u128) << 32;
+        assert!(value <= MAX_U64, ERATIO_OUT_OF_RANGE);
+        FixedPoint32{value: (value as u64)}
+    }
+    spec create_from_u64 {
+        pragma opaque;
+        include CreateFromU64AbortsIf;
+        ensures result == spec_create_from_u64(val);
+    }
+    spec schema CreateFromU64AbortsIf {
+        val: num;
+        let scaled_value = (val as u128) << 32;
+        aborts_if scaled_value > MAX_U64;
+    }
+    spec fun spec_create_from_u64(val: num): FixedPoint32 {
+        FixedPoint32 {value: val << 32}
+    }
+
+    /// Returns the largest integer less than or equal to a given number.
+    public fun floor(num: FixedPoint32): u64 {
+        num.value >> 32
+    }
+    spec floor {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_floor(num);
+    }
+    spec fun spec_floor(val: FixedPoint32): u64 {
+        let fractional = val.value % (1 << 32);
+        if (fractional == 0) {
+            val.value >> 32
+        } else {
+            (val.value - fractional) >> 32
+        }
+    }
+
+    /// Rounds up the given FixedPoint32 to the next largest integer.
+    public fun ceil(num: FixedPoint32): u64 {
+        let floored_num = floor(num) << 32;
+        if (num.value == floored_num) {
+            return floored_num >> 32
+        };
+        let val = ((floored_num as u128) + (1 << 32));
+        (val >> 32 as u64)
+    }
+    spec ceil {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_ceil(num);
+    }
+    spec fun spec_ceil(val: FixedPoint32): u64 {
+        let fractional = val.value % (1 << 32);
+        let one = 1 << 32;
+        if (fractional == 0) {
+            val.value >> 32
+        } else {
+            (val.value - fractional + one) >> 32
+        }
+    }
+
+    /// Returns the value of a FixedPoint32 to the nearest integer.
+    public fun round(num: FixedPoint32): u64 {
+        let floored_num = floor(num) << 32;
+        let boundary = floored_num + ((1 << 32) / 2);
+        if (num.value < boundary) {
+            floored_num >> 32
+        } else {
+            ceil(num)
+        }
+    }
+    spec round {
+        pragma opaque;
+        aborts_if false;
+        ensures result == spec_round(num);
+    }
+    spec fun spec_round(val: FixedPoint32): u64 {
+        let fractional = val.value % (1 << 32);
+        let boundary = (1 << 32) / 2;
+        let one = 1 << 32;
+        if (fractional < boundary) {
+            (val.value - fractional) >> 32
+        } else {
+            (val.value - fractional + one) >> 32
+        }
+    }
+
     // **************** SPECIFICATIONS ****************
 
     spec module {} // switch documentation context to module level
diff --git a/language/move-stdlib/sources/option.move b/language/move-stdlib/sources/option.move
index 537ddce5ea..e734806db9 100644
--- a/language/move-stdlib/sources/option.move
+++ b/language/move-stdlib/sources/option.move
@@ -15,10 +15,10 @@ module std::option {
 
     /// The `Option` is in an invalid state for the operation attempted.
     /// The `Option` is `Some` while it should be `None`.
-    const EOPTION_IS_SET: u64 = 0;
+    const EOPTION_IS_SET: u64 = 0x40000;
     /// The `Option` is in an invalid state for the operation attempted.
     /// The `Option` is `None` while it should be `Some`.
-    const EOPTION_NOT_SET: u64 = 1;
+    const EOPTION_NOT_SET: u64 = 0x40001;
 
     /// Return an empty `Option`
     public fun none<Element>(): Option<Element> {
@@ -158,6 +158,7 @@ module std::option {
         pragma opaque;
         include AbortsIfNone<Element>;
         ensures result == borrow(t);
+        ensures t == old(t);
     }
 
     /// Swap the old value inside `t` with `e` and return the old value
diff --git a/language/move-stdlib/sources/string.move b/language/move-stdlib/sources/string.move
new file mode 100644
index 0000000000..14c3c5144e
--- /dev/null
+++ b/language/move-stdlib/sources/string.move
@@ -0,0 +1,94 @@
+/// The `string` module defines the `String` type which represents UTF8 encoded strings.
+module std::string {
+    use std::vector;
+    use std::option::{Self, Option};
+
+    /// An invalid UTF8 encoding.
+    const EINVALID_UTF8: u64 = 1;
+
+    /// Index out of range.
+    const EINVALID_INDEX: u64 = 2;
+
+    /// A `String` holds a sequence of bytes which is guaranteed to be in utf8 format.
+    struct String has copy, drop, store {
+        bytes: vector<u8>,
+    }
+
+    /// Creates a new string from a sequence of bytes. Aborts if the bytes do not represent valid utf8.
+    public fun utf8(bytes: vector<u8>): String {
+        assert!(internal_check_utf8(&bytes), EINVALID_UTF8);
+        String { bytes }
+    }
+
+    /// Tries to create a new string from a sequence of bytes.
+    public fun try_utf8(bytes: vector<u8>): Option<String> {
+        if (internal_check_utf8(&bytes)) {
+            option::some(String { bytes })
+        } else {
+            option::none()
+        }
+    }
+
+    /// Returns a reference to the underlying byte vector.
+    public fun bytes(s: &String): &vector<u8> {
+        &s.bytes
+    }
+
+    /// Checks whether this string is empty.
+    public fun is_empty(s: &String): bool {
+        vector::is_empty(&s.bytes)
+    }
+
+    /// Returns the length of this string, in bytes.
+    public fun length(s: &String): u64 {
+        vector::length(&s.bytes)
+    }
+
+    /// Appends a string.
+    public fun append(s: &mut String, r: String) {
+        vector::append(&mut s.bytes, r.bytes)
+    }
+
+    /// Appends bytes which must be in valid utf8 format.
+    public fun append_utf8(s: &mut String, bytes: vector<u8>) {
+        append(s, utf8(bytes))
+    }
+
+    /// Insert the other string at the byte index in given string. The index must be at a valid utf8 char
+    /// boundary.
+    public fun insert(s: &mut String, at: u64, o: String) {
+        let bytes = &s.bytes;
+        assert!(at <= vector::length(bytes) && internal_is_char_boundary(bytes, at), EINVALID_INDEX);
+        let l = length(s);
+        let front = sub_string(s, 0, at);
+        let end = sub_string(s, at, l);
+        append(&mut front, o);
+        append(&mut front, end);
+        *s = front;
+    }
+
+    /// Returns a sub-string using the given byte indices, where `i` is the first byte position and `j` is the start
+    /// of the first byte not included (or the length of the string). The indices must be at valid utf8 char boundaries,
+    /// guaranteeing that the result is valid utf8.
+    public fun sub_string(s: &String, i: u64, j: u64): String {
+        let bytes = &s.bytes;
+        let l = vector::length(bytes);
+        assert!(
+            j <= l && i <= j && internal_is_char_boundary(bytes, i) && internal_is_char_boundary(bytes, j),
+            EINVALID_INDEX
+        );
+        String { bytes: internal_sub_string(bytes, i, j) }
+    }
+
+    /// Computes the index of the first occurrence of a string. Returns `length(s)` if no occurrence found.
+    public fun index_of(s: &String, r: &String): u64 {
+        internal_index_of(&s.bytes, &r.bytes)
+    }
+
+
+    // Native API
+    native fun internal_check_utf8(v: &vector<u8>): bool;
+    native fun internal_is_char_boundary(v: &vector<u8>, i: u64): bool;
+    native fun internal_sub_string(v: &vector<u8>, i: u64, j: u64): vector<u8>;
+    native fun internal_index_of(v: &vector<u8>, r: &vector<u8>): u64;
+}
diff --git a/language/move-stdlib/sources/type_name.move b/language/move-stdlib/sources/type_name.move
new file mode 100644
index 0000000000..e1d973b03b
--- /dev/null
+++ b/language/move-stdlib/sources/type_name.move
@@ -0,0 +1,28 @@
+/// Functionality for converting Move types into values. Use with care!
+module std::type_name {
+    use std::ascii::String;
+
+    struct TypeName has copy, drop, store {
+        /// String representation of the type. All types are represented
+        /// using their source syntax:
+        /// "u8", "u64", "u128", "bool", "address", "vector", "signer" for ground types.
+        /// Struct types are represented as fully qualified type names; e.g.
+        /// `00000000000000000000000000000001::string::String` or
+        /// `0000000000000000000000000000000a::module_name1::type_name1<0000000000000000000000000000000a::module_name2::type_name2<u64>>`
+        /// Addresses are hex-encoded lowercase values of length ADDRESS_LENGTH (16, 20, or 32 depending on the Move platform)
+        name: String
+    }
+
+    /// Return a value representation of the type `T`.
+    public native fun get<T>(): TypeName;
+
+    /// Get the String representation of `self`
+    public fun borrow_string(self: &TypeName): &String {
+        &self.name
+    }
+
+    /// Convert `self` into its inner String
+    public fun into_string(self: TypeName): String {
+        self.name
+    }
+}
diff --git a/language/move-stdlib/sources/vector.move b/language/move-stdlib/sources/vector.move
index 4cd636f8a8..32d895002a 100644
--- a/language/move-stdlib/sources/vector.move
+++ b/language/move-stdlib/sources/vector.move
@@ -11,7 +11,7 @@
 module std::vector {
 
     /// The index into the vector is out of bounds
-    const EINDEX_OUT_OF_BOUNDS: u64 = 0;
+    const EINDEX_OUT_OF_BOUNDS: u64 = 0x20000;
 
     #[bytecode_instruction]
     /// Create an empty vector.
@@ -101,6 +101,7 @@ module std::vector {
     }
 
     /// Return true if `e` is in the vector `v`.
+    /// Otherwise, returns false.
     public fun contains<Element>(v: &vector<Element>, e: &Element): bool {
         let i = 0;
         let len = length(v);
@@ -145,6 +146,26 @@ module std::vector {
         pragma intrinsic = true;
     }
 
+    /// Insert `e` at position `i` in the vector `v`.
+    /// If `i` is in bounds, this shifts the old `v[i]` and all subsequent elements to the right.
+    /// If `i == length(v)`, this adds `e` to the end of the vector.
+    /// This is O(n) and preserves ordering of elements in the vector.
+    /// Aborts if `i > length(v)`
+    public fun insert<Element>(v: &mut vector<Element>, e: Element, i: u64) {
+        let len = length(v);
+        // i too big abort
+        if (i > len) abort EINDEX_OUT_OF_BOUNDS;
+
+        push_back(v, e);
+        while (i < len) {
+            swap(v, i, len);
+            i = i + 1
+        }
+    }
+    spec insert {
+        pragma intrinsic = true;
+    }
+
     /// Swap the `i`th element of the vector `v` with the last element and then pop the vector.
     /// This is O(1), but does not preserve ordering of elements in the vector.
     /// Aborts if `i` is out of bounds.
@@ -193,5 +214,4 @@ module std::vector {
             v1[i..len(v1)] == v2[i + 1..len(v2)]
         }
     }
-
 }
diff --git a/language/move-stdlib/src/natives/bcs.rs b/language/move-stdlib/src/natives/bcs.rs
index a0d075f8f1..d6094d6891 100644
--- a/language/move-stdlib/src/natives/bcs.rs
+++ b/language/move-stdlib/src/natives/bcs.rs
@@ -2,21 +2,43 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::natives::helpers::make_module_natives;
 use move_binary_format::errors::PartialVMResult;
-use move_core_types::vm_status::sub_status::NFE_BCS_SERIALIZATION_FAILURE;
-use move_vm_runtime::native_functions::NativeContext;
+use move_core_types::{
+    gas_algebra::{InternalGas, InternalGasPerByte, NumBytes},
+    vm_status::sub_status::NFE_BCS_SERIALIZATION_FAILURE,
+};
+use move_vm_runtime::native_functions::{NativeContext, NativeFunction};
 use move_vm_types::{
-    gas_schedule::NativeCostIndex,
     loaded_data::runtime_types::Type,
-    natives::function::{native_gas, NativeResult},
+    natives::function::NativeResult,
     pop_arg,
     values::{values_impl::Reference, Value},
 };
 use smallvec::smallvec;
-use std::collections::VecDeque;
+use std::{collections::VecDeque, sync::Arc};
+/***************************************************************************************************
+ * native fun to_bytes
+ *
+ *   gas cost: size_of(val_type) * input_unit_cost +        | get type layout
+ *             size_of(val) * input_unit_cost +             | serialize value
+ *             max(size_of(output), 1) * output_unit_cost
+ *
+ *             If any of the first two steps fails, a partial cost + an additional failure_cost
+ *             will be charged.
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct ToBytesGasParameters {
+    pub per_byte_serialized: InternalGasPerByte,
+    pub legacy_min_output_size: NumBytes,
+    pub failure: InternalGas,
+}
 
 /// Rust implementation of Move's `native public fun to_bytes<T>(&T): vector<u8>`
-pub fn native_to_bytes(
+#[inline]
+fn native_to_bytes(
+    gas_params: &ToBytesGasParameters,
     context: &mut NativeContext,
     mut ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
@@ -24,31 +46,59 @@ pub fn native_to_bytes(
     debug_assert!(ty_args.len() == 1);
     debug_assert!(args.len() == 1);
 
-    let ref_to_val = pop_arg!(args, Reference);
+    let mut cost = 0.into();
 
+    // pop type and value
+    let ref_to_val = pop_arg!(args, Reference);
     let arg_type = ty_args.pop().unwrap();
-    // delegate to the BCS serialization for `Value`
-    let serialized_value_opt = match context.type_to_type_layout(&arg_type)? {
-        None => None,
-        Some(layout) => ref_to_val.read_ref()?.simple_serialize(&layout),
-    };
-    let serialized_value = match serialized_value_opt {
+
+    // get type layout
+    let layout = match context.type_to_type_layout(&arg_type)? {
+        Some(layout) => layout,
         None => {
-            let cost = native_gas(context.cost_table(), NativeCostIndex::BCS_TO_BYTES, 1);
+            cost += gas_params.failure;
             return Ok(NativeResult::err(cost, NFE_BCS_SERIALIZATION_FAILURE));
         }
+    };
+    // serialize value
+    let val = ref_to_val.read_ref()?;
+    let serialized_value = match val.simple_serialize(&layout) {
         Some(serialized_value) => serialized_value,
+        None => {
+            cost += gas_params.failure;
+            return Ok(NativeResult::err(cost, NFE_BCS_SERIALIZATION_FAILURE));
+        }
     };
-
-    // cost is proportional to the size of the serialized value
-    let cost = native_gas(
-        context.cost_table(),
-        NativeCostIndex::BCS_TO_BYTES,
-        serialized_value.len(),
-    );
+    cost += gas_params.per_byte_serialized
+        * std::cmp::max(
+            NumBytes::new(serialized_value.len() as u64),
+            gas_params.legacy_min_output_size,
+        );
 
     Ok(NativeResult::ok(
         cost,
         smallvec![Value::vector_u8(serialized_value)],
     ))
 }
+
+pub fn make_native_to_bytes(gas_params: ToBytesGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_to_bytes(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub to_bytes: ToBytesGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [("to_bytes", make_native_to_bytes(gas_params.to_bytes))];
+
+    make_module_natives(natives)
+}
diff --git a/language/move-stdlib/src/natives/debug.rs b/language/move-stdlib/src/natives/debug.rs
index b2c4701854..e93c5a967c 100644
--- a/language/move-stdlib/src/natives/debug.rs
+++ b/language/move-stdlib/src/natives/debug.rs
@@ -2,44 +2,96 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::natives::helpers::make_module_natives;
 use move_binary_format::errors::PartialVMResult;
-use move_core_types::gas_schedule::ONE_GAS_UNIT;
-use move_vm_runtime::native_functions::NativeContext;
-#[allow(unused_imports)]
-use move_vm_types::values::{values_impl::debug::print_reference, Reference};
+use move_core_types::{account_address::AccountAddress, gas_algebra::InternalGas};
+use move_vm_runtime::native_functions::{NativeContext, NativeFunction};
 #[allow(unused_imports)]
 use move_vm_types::{
-    loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value,
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    pop_arg,
+    values::{Reference, Value},
 };
 use smallvec::smallvec;
-use std::collections::VecDeque;
+use std::{collections::VecDeque, sync::Arc};
 
-#[allow(unused_mut)]
-#[allow(unused_variables)]
-pub fn native_print(
-    context: &mut NativeContext,
+/***************************************************************************************************
+ * native fun print
+ *
+ *   gas cost: base_cost
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct PrintGasParameters {
+    pub base_cost: InternalGas,
+}
+
+#[inline]
+fn native_print(
+    gas_params: &PrintGasParameters,
+    _context: &mut NativeContext,
     mut ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
+    _move_std_addr: AccountAddress,
 ) -> PartialVMResult<NativeResult> {
     debug_assert!(ty_args.len() == 1);
     debug_assert!(args.len() == 1);
 
+    let _val = args.pop_back().unwrap();
+    let _ty = ty_args.pop().unwrap();
+
     // No-op if the feature flag is not present.
     #[cfg(feature = "testing")]
     {
-        let ty = ty_args.pop().unwrap();
-        let r = pop_arg!(args, Reference);
+        let canonical = false;
+        let single_line = false;
+        let include_int_types = false;
+
+        let mut out = "[debug] ".to_string();
+        let val = _val.value_as::<Reference>()?.read_ref()?;
 
-        let mut buf = String::new();
-        print_reference(&mut buf, &r)?;
-        println!("[debug] {}", buf);
+        testing::print_value(
+            _context,
+            &mut out,
+            val,
+            _ty,
+            &_move_std_addr,
+            0,
+            canonical,
+            single_line,
+            include_int_types,
+        )?;
+        println!("{}", out);
     }
 
-    Ok(NativeResult::ok(ONE_GAS_UNIT, smallvec![]))
+    Ok(NativeResult::ok(gas_params.base_cost, smallvec![]))
+}
+
+pub fn make_native_print(
+    gas_params: PrintGasParameters,
+    move_std_addr: AccountAddress,
+) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_print(&gas_params, context, ty_args, args, move_std_addr)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun print_stack_trace
+ *
+ *   gas cost: base_cost
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct PrintStackTraceGasParameters {
+    pub base_cost: InternalGas,
 }
 
 #[allow(unused_variables)]
-pub fn native_print_stack_trace(
+#[inline]
+fn native_print_stack_trace(
+    gas_params: &PrintStackTraceGasParameters,
     context: &mut NativeContext,
     ty_args: Vec<Type>,
     args: VecDeque<Value>,
@@ -54,5 +106,547 @@ pub fn native_print_stack_trace(
         println!("{}", s);
     }
 
-    Ok(NativeResult::ok(ONE_GAS_UNIT, smallvec![]))
+    Ok(NativeResult::ok(gas_params.base_cost, smallvec![]))
+}
+
+pub fn make_native_print_stack_trace(gas_params: PrintStackTraceGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_print_stack_trace(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub print: PrintGasParameters,
+    pub print_stack_trace: PrintStackTraceGasParameters,
+}
+
+pub fn make_all(
+    gas_params: GasParameters,
+    move_std_addr: AccountAddress,
+) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [
+        ("print", make_native_print(gas_params.print, move_std_addr)),
+        (
+            "print_stack_trace",
+            make_native_print_stack_trace(gas_params.print_stack_trace),
+        ),
+    ];
+
+    make_module_natives(natives)
+}
+
+#[cfg(feature = "testing")]
+mod testing {
+    use move_binary_format::errors::{PartialVMError, PartialVMResult};
+    use move_core_types::{
+        account_address::AccountAddress,
+        language_storage::TypeTag,
+        value::{MoveStruct, MoveStructLayout, MoveTypeLayout, MoveValue},
+        vm_status::StatusCode,
+    };
+    use move_vm_runtime::native_functions::NativeContext;
+    use move_vm_types::{loaded_data::runtime_types::Type, values::Value};
+    use std::{fmt, fmt::Write};
+
+    const VECTOR_BEGIN: &str = "[";
+
+    const VECTOR_OR_STRUCT_SEP: &str = ",";
+
+    const VECTOR_END: &str = "]";
+
+    const STRUCT_BEGIN: &str = "{";
+
+    const STRUCT_END: &str = "}";
+
+    fn fmt_error_to_partial_vm_error(e: fmt::Error) -> PartialVMError {
+        PartialVMError::new(StatusCode::UNKNOWN_STATUS)
+            .with_message("write! macro failed with: ".to_string() + e.to_string().as_str())
+    }
+
+    fn to_vec_u8_type_err<E>(_e: E) -> PartialVMError {
+        PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+            .with_message("Could not convert Vec<MoveValue> to Vec<u8>: ".to_string())
+    }
+
+    fn get_annotated_struct_layout(
+        context: &NativeContext,
+        ty: &Type,
+    ) -> PartialVMResult<MoveStructLayout> {
+        let annotated_type_layout = context.type_to_fully_annotated_layout(ty)?.unwrap();
+        match annotated_type_layout {
+            MoveTypeLayout::Struct(annotated_struct_layout) => Ok(annotated_struct_layout),
+            _ => Err(
+                PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(
+                    "Could not convert Type to fully-annotated MoveTypeLayout via NativeContext"
+                        .to_string(),
+                ),
+            ),
+        }
+    }
+
+    fn get_vector_inner_type(ty: &Type) -> PartialVMResult<&Type> {
+        match ty {
+            Type::Vector(ty) => Ok(ty),
+            _ => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message("Could not get the inner Type of a vector's Type".to_string())),
+        }
+    }
+
+    /// Converts a `MoveValue::Vector` of `u8`'s to a `String` by wrapping it in double quotes and
+    /// escaping double quotes and backslashes.
+    ///
+    /// Examples:
+    ///  - 'Hello' returns "Hello"
+    ///  - '"Hello?" What are you saying?' returns "\"Hello?\" What are you saying?"
+    ///  - '\ and " are escaped' returns "\\ and \" are escaped"
+    fn move_value_as_escaped_string(val: MoveValue) -> PartialVMResult<String> {
+        match val {
+            MoveValue::Vector(bytes) => {
+                let buf = MoveValue::vec_to_vec_u8(bytes).map_err(to_vec_u8_type_err)?;
+
+                let str = String::from_utf8(buf).map_err(|e| {
+                    PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(
+                        "Could not parse UTF8 bytes: ".to_string() + e.to_string().as_str(),
+                    )
+                })?;
+
+                // We need to escape displayed double quotes " as \" and, as a result, also escape
+                // displayed \ as \\.
+                Ok(str.replace('\\', "\\\\").replace('"', "\\\""))
+            }
+            _ => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message("Expected a MoveValue::Vector of u8's".to_string())),
+        }
+    }
+
+    fn print_padding_at_depth(out: &mut String, depth: usize) -> PartialVMResult<()> {
+        for _ in 0..depth {
+            // add 2 spaces
+            write!(out, "  ").map_err(fmt_error_to_partial_vm_error)?;
+        }
+
+        Ok(())
+    }
+
+    fn is_non_empty_vector_u8(vec: &Vec<MoveValue>) -> bool {
+        if vec.is_empty() {
+            false
+        } else {
+            matches!(vec.last().unwrap(), MoveValue::U8(_))
+        }
+    }
+
+    fn is_vector_or_struct_move_value(mv: &MoveValue) -> bool {
+        matches!(mv, MoveValue::Vector(_) | MoveValue::Struct(_))
+    }
+
+    /// Prints any `Value` in a user-friendly manner.
+    pub(crate) fn print_value(
+        context: &NativeContext,
+        out: &mut String,
+        val: Value,
+        ty: Type,
+        move_std_addr: &AccountAddress,
+        depth: usize,
+        canonicalize: bool,
+        single_line: bool,
+        include_int_types: bool,
+    ) -> PartialVMResult<()> {
+        // get type layout in VM format
+        let ty_layout = context.type_to_type_layout(&ty)?.unwrap();
+
+        match &ty_layout {
+            MoveTypeLayout::Vector(_) => {
+                // get the inner type T of a vector<T>
+                let inner_ty = get_vector_inner_type(&ty)?;
+                let inner_tyl = context.type_to_type_layout(inner_ty)?.unwrap();
+
+                match inner_tyl {
+                    // We cannot simply convert a `Value` (of type vector) to a `MoveValue` because
+                    // there might be a struct in the vector that needs to be "decorated" using the
+                    // logic in this function. Instead, we recursively "unpack" the vector until we
+                    // get down to either (1) a primitive type, which we can forward to
+                    // `print_move_value`, or (2) a struct type, which we can decorate and forward
+                    // to `print_move_value`.
+                    MoveTypeLayout::Vector(_) | MoveTypeLayout::Struct(_) => {
+                        // `val` is either a `Vec<Vec<Value>>`, a `Vec<Struct>`,  or a `Vec<signer>`, so we cast `val` as a `Vec<Value>` and call ourselves recursively
+                        let vec = val.value_as::<Vec<Value>>()?;
+
+                        let print_inner_value =
+                            |out: &mut String,
+                             val: Value,
+                             move_std_addr: &AccountAddress,
+                             depth: usize,
+                             canonicalize: bool,
+                             single_line: bool,
+                             include_int_types: bool| {
+                                print_value(
+                                    context,
+                                    out,
+                                    val,
+                                    inner_ty.clone(),
+                                    move_std_addr,
+                                    depth,
+                                    canonicalize,
+                                    single_line,
+                                    include_int_types,
+                                )
+                            };
+
+                        print_non_u8_vector(
+                            out,
+                            move_std_addr,
+                            depth,
+                            canonicalize,
+                            single_line,
+                            include_int_types,
+                            vec,
+                            print_inner_value,
+                            true,
+                        )?;
+                    }
+                    // If the inner type T of this vector<T> is a primitive bool/unsigned integer/address type, we convert the
+                    // vector<T> to a MoveValue and print it.
+                    _ => {
+                        let mv = val.as_move_value(&ty_layout);
+                        print_move_value(
+                            out,
+                            mv,
+                            move_std_addr,
+                            depth,
+                            canonicalize,
+                            single_line,
+                            include_int_types,
+                        )?;
+                    }
+                };
+            }
+            // For a struct, we convert it to a MoveValue annotated with its field names and types and print it
+            MoveTypeLayout::Struct(_) => {
+                let move_struct = match val.as_move_value(&ty_layout) {
+                    MoveValue::Struct(s) => s,
+                    _ => {
+                        return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                            .with_message("Expected MoveValue::MoveStruct".to_string()))
+                    }
+                };
+
+                let annotated_struct_layout = get_annotated_struct_layout(context, &ty)?;
+                let decorated_struct = move_struct.decorate(&annotated_struct_layout);
+
+                print_move_value(
+                    out,
+                    MoveValue::Struct(decorated_struct),
+                    move_std_addr,
+                    depth,
+                    canonicalize,
+                    single_line,
+                    include_int_types,
+                )?;
+            }
+            // For non-structs and non-vectors, convert them to a MoveValue and print them
+            _ => {
+                print_move_value(
+                    out,
+                    val.as_move_value(&ty_layout),
+                    move_std_addr,
+                    depth,
+                    canonicalize,
+                    single_line,
+                    include_int_types,
+                )?;
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Prints the MoveValue in `mv`, optionally-printing integer types if `include_int_type` is
+    /// true.
+    fn print_move_value(
+        out: &mut String,
+        mv: MoveValue,
+        move_std_addr: &AccountAddress,
+        depth: usize,
+        canonicalize: bool,
+        single_line: bool,
+        include_int_types: bool,
+    ) -> PartialVMResult<()> {
+        match mv {
+            MoveValue::U8(u8) => {
+                write!(out, "{}", u8).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u8").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            MoveValue::U16(u16) => {
+                write!(out, "{}", u16).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u16").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            MoveValue::U32(u32) => {
+                write!(out, "{}", u32).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u32").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            MoveValue::U64(u64) => {
+                write!(out, "{}", u64).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u64").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            MoveValue::U128(u128) => {
+                write!(out, "{}", u128).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u128").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            MoveValue::U256(u256) => {
+                write!(out, "{}", u256).map_err(fmt_error_to_partial_vm_error)?;
+                if include_int_types {
+                    write!(out, "u256").map_err(fmt_error_to_partial_vm_error)?;
+                }
+            }
+            MoveValue::Bool(b) => {
+                // Note that when `include_int_types` is enabled, the boolean `true` and `false`
+                // values unambiguously encode their type, since they are different than any integer
+                // type value, address value, signer value, vector value and struct value.
+                write!(out, "{}", if b { "true" } else { "false" })
+                    .map_err(fmt_error_to_partial_vm_error)?;
+            }
+            MoveValue::Address(a) => {
+                let str = if canonicalize {
+                    a.to_canonical_string()
+                } else {
+                    a.to_hex_literal()
+                };
+                write!(out, "@{}", str).map_err(fmt_error_to_partial_vm_error)?;
+            }
+            MoveValue::Signer(s) => {
+                let str = if canonicalize {
+                    s.to_canonical_string()
+                } else {
+                    s.to_hex_literal()
+                };
+                write!(out, "signer({})", str).map_err(fmt_error_to_partial_vm_error)?;
+            }
+            MoveValue::Vector(vec) => {
+                // If this is a vector<u8> we print it in hex (as most users would expect us to)
+                if is_non_empty_vector_u8(&vec) {
+                    let bytes = MoveValue::vec_to_vec_u8(vec).map_err(to_vec_u8_type_err)?;
+                    write!(out, "0x{}", hex::encode(&bytes))
+                        .map_err(fmt_error_to_partial_vm_error)?;
+                } else {
+                    let is_complex_inner_type =
+                        vec.last().map_or(false, is_vector_or_struct_move_value);
+                    print_non_u8_vector(
+                        out,
+                        move_std_addr,
+                        depth,
+                        canonicalize,
+                        single_line,
+                        include_int_types,
+                        vec,
+                        print_move_value,
+                        is_complex_inner_type,
+                    )?;
+                }
+            }
+            MoveValue::Struct(move_struct) => match move_struct {
+                MoveStruct::WithTypes { type_, mut fields } => {
+                    let type_tag = TypeTag::from(type_.clone());
+
+                    // Check if struct is an std::string::String
+                    if !canonicalize && type_.is_std_string(move_std_addr) {
+                        if fields.len() != 1 {
+                            return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                                .with_message(
+                                    "Expected std::string::String struct to have just one field"
+                                        .to_string(),
+                                ));
+                        }
+
+                        let (id, val) = fields.pop().unwrap();
+                        if id.into_string() != "bytes" {
+                            return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                                .with_message(
+                                    "Expected std::string::String struct to have a `bytes` field"
+                                        .to_string(),
+                                ));
+                        }
+
+                        let str = move_value_as_escaped_string(val)?;
+                        write!(out, "\"{}\"", str).map_err(fmt_error_to_partial_vm_error)?
+                    } else if !canonicalize && type_.is_ascii_string(move_std_addr) {
+                        if fields.len() != 1 {
+                            return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                                .with_message(
+                                    "Expected std::ascii::String struct to have just one field"
+                                        .to_string(),
+                                ));
+                        }
+
+                        let (id, val) = fields.pop().unwrap();
+                        if id.into_string() != "bytes" {
+                            return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                                .with_message(
+                                    "Expected std::ascii::String struct to have a `bytes` field"
+                                        .to_string(),
+                                ));
+                        }
+
+                        let str = move_value_as_escaped_string(val)?;
+                        write!(out, "\"{}\"", str).map_err(fmt_error_to_partial_vm_error)?
+                    } else {
+                        write!(out, "{} ", type_tag).map_err(fmt_error_to_partial_vm_error)?;
+                        write!(out, "{}", STRUCT_BEGIN).map_err(fmt_error_to_partial_vm_error)?;
+
+                        // For each field, print its name and value (and type)
+                        let mut iter = fields.into_iter();
+                        if let Some((field_name, field_value)) = iter.next() {
+                            // Start an indented new line
+                            if !single_line {
+                                writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                                print_padding_at_depth(out, depth + 1)?;
+                            }
+
+                            write!(out, "{}: ", field_name.into_string())
+                                .map_err(fmt_error_to_partial_vm_error)?;
+                            print_move_value(
+                                out,
+                                field_value,
+                                move_std_addr,
+                                depth + 1,
+                                canonicalize,
+                                single_line,
+                                include_int_types,
+                            )?;
+
+                            for (field_name, field_value) in iter {
+                                write!(out, "{}", VECTOR_OR_STRUCT_SEP)
+                                    .map_err(fmt_error_to_partial_vm_error)?;
+
+                                if !single_line {
+                                    writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                                    print_padding_at_depth(out, depth + 1)?;
+                                } else {
+                                    write!(out, " ").map_err(fmt_error_to_partial_vm_error)?;
+                                }
+                                write!(out, "{}: ", field_name.into_string())
+                                    .map_err(fmt_error_to_partial_vm_error)?;
+                                print_move_value(
+                                    out,
+                                    field_value,
+                                    move_std_addr,
+                                    depth + 1,
+                                    canonicalize,
+                                    single_line,
+                                    include_int_types,
+                                )?;
+                            }
+                        }
+
+                        // Ends printing the struct with "}", which could be on its own line
+                        if !single_line {
+                            writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                            print_padding_at_depth(out, depth)?;
+                        }
+                        write!(out, "{}", STRUCT_END).map_err(fmt_error_to_partial_vm_error)?;
+                    }
+                }
+                _ => {
+                    return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                        .with_message("Expected MoveStruct::WithTypes".to_string()))
+                }
+            },
+        }
+
+        Ok(())
+    }
+
+    fn print_non_u8_vector<ValType>(
+        out: &mut String,
+        move_std_addr: &AccountAddress,
+        depth: usize,
+        canonicalize: bool,
+        single_line: bool,
+        include_int_types: bool,
+        vec: Vec<ValType>,
+        print_inner_value: impl Fn(
+            &mut String,
+            ValType,
+            &AccountAddress,
+            usize,
+            bool,
+            bool,
+            bool,
+        ) -> PartialVMResult<()>,
+        is_complex_inner_type: bool,
+    ) -> PartialVMResult<()> {
+        write!(out, "{}", VECTOR_BEGIN).map_err(fmt_error_to_partial_vm_error)?;
+        let mut iter = vec.into_iter();
+        let mut empty_vec = true;
+
+        if let Some(first_elem) = iter.next() {
+            empty_vec = false;
+
+            // For vectors-of-vectors, and for vectors-of-structs, we start a newline for each element
+            if !single_line && is_complex_inner_type {
+                writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                print_padding_at_depth(out, depth + 1)?;
+            } else {
+                write!(out, " ").map_err(fmt_error_to_partial_vm_error)?;
+            }
+
+            print_inner_value(
+                out,
+                first_elem,
+                move_std_addr,
+                depth + 1,
+                canonicalize,
+                single_line,
+                include_int_types,
+            )?;
+
+            for elem in iter {
+                write!(out, "{}", VECTOR_OR_STRUCT_SEP).map_err(fmt_error_to_partial_vm_error)?;
+
+                // For vectors of vectors or vectors of structs, we start a newline for each element
+                if !single_line && is_complex_inner_type {
+                    writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+                    print_padding_at_depth(out, depth + 1)?;
+                } else {
+                    write!(out, " ").map_err(fmt_error_to_partial_vm_error)?;
+                }
+                print_inner_value(
+                    out,
+                    elem,
+                    move_std_addr,
+                    depth + 1,
+                    canonicalize,
+                    single_line,
+                    include_int_types,
+                )?;
+            }
+        }
+
+        // For vectors of vectors or vectors of structs, we display the closing ] on a newline
+        if !single_line && is_complex_inner_type {
+            writeln!(out).map_err(fmt_error_to_partial_vm_error)?;
+            print_padding_at_depth(out, depth)?;
+        } else if !empty_vec {
+            write!(out, " ").map_err(fmt_error_to_partial_vm_error)?;
+        }
+        write!(out, "{}", VECTOR_END).map_err(fmt_error_to_partial_vm_error)?;
+
+        Ok(())
+    }
 }
diff --git a/language/move-stdlib/src/natives/event.rs b/language/move-stdlib/src/natives/event.rs
index 802564c19e..1301574bbd 100644
--- a/language/move-stdlib/src/natives/event.rs
+++ b/language/move-stdlib/src/natives/event.rs
@@ -2,20 +2,31 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::natives::helpers::make_module_natives;
 use move_binary_format::errors::PartialVMResult;
-use move_core_types::gas_schedule::GasAlgebra;
-use move_vm_runtime::native_functions::NativeContext;
+use move_core_types::gas_algebra::InternalGasPerAbstractMemoryUnit;
+use move_vm_runtime::native_functions::{NativeContext, NativeFunction};
 use move_vm_types::{
-    gas_schedule::NativeCostIndex,
-    loaded_data::runtime_types::Type,
-    natives::function::{native_gas, NativeResult},
-    pop_arg,
-    values::Value,
+    loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value,
+    views::ValueView,
 };
 use smallvec::smallvec;
-use std::collections::VecDeque;
+use std::{collections::VecDeque, sync::Arc};
 
-pub fn write_to_event_store(
+/***************************************************************************************************
+ * [NURSERY-ONLY] native fun write_to_event_store
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct WriteToEventStoreGasParameters {
+    pub unit_cost: InternalGasPerAbstractMemoryUnit,
+}
+
+#[inline]
+fn native_write_to_event_store(
+    gas_params: &WriteToEventStoreGasParameters,
     context: &mut NativeContext,
     mut ty_args: Vec<Type>,
     mut arguments: VecDeque<Value>,
@@ -28,11 +39,7 @@ pub fn write_to_event_store(
     let seq_num = pop_arg!(arguments, u64);
     let guid = pop_arg!(arguments, Vec<u8>);
 
-    let cost = native_gas(
-        context.cost_table(),
-        NativeCostIndex::EMIT_EVENT,
-        msg.size().get() as usize,
-    );
+    let cost = gas_params.unit_cost * std::cmp::max(msg.legacy_abstract_memory_size(), 1.into());
 
     if !context.save_event(guid, seq_num, ty, msg)? {
         return Ok(NativeResult::err(cost, 0));
@@ -40,3 +47,30 @@ pub fn write_to_event_store(
 
     Ok(NativeResult::ok(cost, smallvec![]))
 }
+
+pub fn make_native_write_to_event_store(
+    gas_params: WriteToEventStoreGasParameters,
+) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_write_to_event_store(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub write_to_event_store: WriteToEventStoreGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [(
+        "write_to_event_store",
+        make_native_write_to_event_store(gas_params.write_to_event_store),
+    )];
+
+    make_module_natives(natives)
+}
diff --git a/language/move-stdlib/src/natives/hash.rs b/language/move-stdlib/src/natives/hash.rs
index 62e9b8cc4d..e0130aad48 100644
--- a/language/move-stdlib/src/natives/hash.rs
+++ b/language/move-stdlib/src/natives/hash.rs
@@ -2,22 +2,35 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::natives::helpers::make_module_natives;
 use move_binary_format::errors::PartialVMResult;
-use move_vm_runtime::native_functions::NativeContext;
+use move_core_types::gas_algebra::{InternalGas, InternalGasPerByte, NumBytes};
+use move_vm_runtime::native_functions::{NativeContext, NativeFunction};
 use move_vm_types::{
-    gas_schedule::NativeCostIndex,
-    loaded_data::runtime_types::Type,
-    natives::function::{native_gas, NativeResult},
-    pop_arg,
-    values::Value,
+    loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value,
 };
 use sha2::{Digest, Sha256};
 use sha3::Sha3_256;
 use smallvec::smallvec;
-use std::collections::VecDeque;
+use std::{collections::VecDeque, sync::Arc};
 
-pub fn native_sha2_256(
-    context: &mut NativeContext,
+/***************************************************************************************************
+ * native fun sha2_256
+ *
+ *   gas cost: base_cost + unit_cost * max(input_length_in_bytes, legacy_min_input_len)
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct Sha2_256GasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+    pub legacy_min_input_len: NumBytes,
+}
+
+#[inline]
+fn native_sha2_256(
+    gas_params: &Sha2_256GasParameters,
+    _context: &mut NativeContext,
     _ty_args: Vec<Type>,
     mut arguments: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
@@ -26,11 +39,12 @@ pub fn native_sha2_256(
 
     let hash_arg = pop_arg!(arguments, Vec<u8>);
 
-    let cost = native_gas(
-        context.cost_table(),
-        NativeCostIndex::SHA2_256,
-        hash_arg.len(),
-    );
+    let cost = gas_params.base
+        + gas_params.per_byte
+            * std::cmp::max(
+                NumBytes::new(hash_arg.len() as u64),
+                gas_params.legacy_min_input_len,
+            );
 
     let hash_vec = Sha256::digest(hash_arg.as_slice()).to_vec();
     Ok(NativeResult::ok(
@@ -39,8 +53,31 @@ pub fn native_sha2_256(
     ))
 }
 
-pub fn native_sha3_256(
-    context: &mut NativeContext,
+pub fn make_native_sha2_256(gas_params: Sha2_256GasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_sha2_256(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun sha3_256
+ *
+ *   gas cost: base_cost + unit_cost * max(input_length_in_bytes, legacy_min_input_len)
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct Sha3_256GasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+    pub legacy_min_input_len: NumBytes,
+}
+
+#[inline]
+fn native_sha3_256(
+    gas_params: &Sha3_256GasParameters,
+    _context: &mut NativeContext,
     _ty_args: Vec<Type>,
     mut arguments: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
@@ -49,11 +86,12 @@ pub fn native_sha3_256(
 
     let hash_arg = pop_arg!(arguments, Vec<u8>);
 
-    let cost = native_gas(
-        context.cost_table(),
-        NativeCostIndex::SHA3_256,
-        hash_arg.len(),
-    );
+    let cost = gas_params.base
+        + gas_params.per_byte
+            * std::cmp::max(
+                NumBytes::new(hash_arg.len() as u64),
+                gas_params.legacy_min_input_len,
+            );
 
     let hash_vec = Sha3_256::digest(hash_arg.as_slice()).to_vec();
     Ok(NativeResult::ok(
@@ -61,3 +99,29 @@ pub fn native_sha3_256(
         smallvec![Value::vector_u8(hash_vec)],
     ))
 }
+
+pub fn make_native_sha3_256(gas_params: Sha3_256GasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_sha3_256(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub sha2_256: Sha2_256GasParameters,
+    pub sha3_256: Sha3_256GasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [
+        ("sha2_256", make_native_sha2_256(gas_params.sha2_256)),
+        ("sha3_256", make_native_sha3_256(gas_params.sha3_256)),
+    ];
+
+    make_module_natives(natives)
+}
diff --git a/language/move-stdlib/src/natives/helpers.rs b/language/move-stdlib/src/natives/helpers.rs
new file mode 100644
index 0000000000..1a8b8a88cf
--- /dev/null
+++ b/language/move-stdlib/src/natives/helpers.rs
@@ -0,0 +1,12 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_vm_runtime::native_functions::NativeFunction;
+
+pub fn make_module_natives(
+    natives: impl IntoIterator<Item = (impl Into<String>, NativeFunction)>,
+) -> impl Iterator<Item = (String, NativeFunction)> {
+    natives
+        .into_iter()
+        .map(|(func_name, func)| (func_name.into(), func))
+}
diff --git a/language/move-stdlib/src/natives/mod.rs b/language/move-stdlib/src/natives/mod.rs
index b054dd578d..fe97636884 100644
--- a/language/move-stdlib/src/natives/mod.rs
+++ b/language/move-stdlib/src/natives/mod.rs
@@ -3,85 +3,175 @@
 // SPDX-License-Identifier: Apache-2.0
 
 pub mod bcs;
+pub mod debug;
 pub mod event;
 pub mod hash;
 pub mod signer;
-pub mod vector;
-
+pub mod string;
+pub mod type_name;
 #[cfg(feature = "testing")]
 pub mod unit_test;
+pub mod vector;
 
-#[cfg(feature = "testing")]
-pub mod debug;
+mod helpers;
 
 use move_core_types::account_address::AccountAddress;
-use move_vm_runtime::{
-    native_functions,
-    native_functions::{NativeFunction, NativeFunctionTable},
-};
-
-pub fn all_natives(move_std_addr: AccountAddress) -> NativeFunctionTable {
-    const NATIVES: &[(&str, &str, NativeFunction)] = &[
-        ("bcs", "to_bytes", bcs::native_to_bytes),
-        ("event", "write_to_event_store", event::write_to_event_store),
-        ("hash", "sha2_256", hash::native_sha2_256),
-        ("hash", "sha3_256", hash::native_sha3_256),
-        ("signer", "borrow_address", signer::native_borrow_address),
-        ("vector", "length", vector::native_length),
-        ("vector", "empty", vector::native_empty),
-        ("vector", "borrow", vector::native_borrow),
-        ("vector", "borrow_mut", vector::native_borrow),
-        ("vector", "push_back", vector::native_push_back),
-        ("vector", "pop_back", vector::native_pop),
-        ("vector", "destroy_empty", vector::native_destroy_empty),
-        ("vector", "swap", vector::native_swap),
-        #[cfg(feature = "testing")]
-        ("debug", "print", debug::native_print),
-        #[cfg(feature = "testing")]
-        (
-            "debug",
-            "print_stack_trace",
-            debug::native_print_stack_trace,
-        ),
-        #[cfg(feature = "testing")]
-        (
-            "unit_test",
-            "create_signers_for_testing",
-            unit_test::native_create_signers_for_testing,
-        ),
-    ];
-    native_functions::make_table(move_std_addr, NATIVES)
+use move_vm_runtime::native_functions::{make_table_from_iter, NativeFunctionTable};
+
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub bcs: bcs::GasParameters,
+    pub hash: hash::GasParameters,
+    pub signer: signer::GasParameters,
+    pub string: string::GasParameters,
+    pub type_name: type_name::GasParameters,
+    pub vector: vector::GasParameters,
+
+    #[cfg(feature = "testing")]
+    pub unit_test: unit_test::GasParameters,
+}
+
+impl GasParameters {
+    pub fn zeros() -> Self {
+        Self {
+            bcs: bcs::GasParameters {
+                to_bytes: bcs::ToBytesGasParameters {
+                    per_byte_serialized: 0.into(),
+                    legacy_min_output_size: 0.into(),
+                    failure: 0.into(),
+                },
+            },
+
+            hash: hash::GasParameters {
+                sha2_256: hash::Sha2_256GasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                    legacy_min_input_len: 0.into(),
+                },
+                sha3_256: hash::Sha3_256GasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                    legacy_min_input_len: 0.into(),
+                },
+            },
+            type_name: type_name::GasParameters {
+                get: type_name::GetGasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                },
+            },
+            signer: signer::GasParameters {
+                borrow_address: signer::BorrowAddressGasParameters { base: 0.into() },
+            },
+            string: string::GasParameters {
+                check_utf8: string::CheckUtf8GasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                },
+                is_char_boundary: string::IsCharBoundaryGasParameters { base: 0.into() },
+                sub_string: string::SubStringGasParameters {
+                    base: 0.into(),
+                    per_byte: 0.into(),
+                },
+                index_of: string::IndexOfGasParameters {
+                    base: 0.into(),
+                    per_byte_pattern: 0.into(),
+                    per_byte_searched: 0.into(),
+                },
+            },
+            vector: vector::GasParameters {
+                empty: vector::EmptyGasParameters { base: 0.into() },
+                length: vector::LengthGasParameters { base: 0.into() },
+                push_back: vector::PushBackGasParameters {
+                    base: 0.into(),
+                    legacy_per_abstract_memory_unit: 0.into(),
+                },
+                borrow: vector::BorrowGasParameters { base: 0.into() },
+                pop_back: vector::PopBackGasParameters { base: 0.into() },
+                destroy_empty: vector::DestroyEmptyGasParameters { base: 0.into() },
+                swap: vector::SwapGasParameters { base: 0.into() },
+            },
+            #[cfg(feature = "testing")]
+            unit_test: unit_test::GasParameters {
+                create_signers_for_testing: unit_test::CreateSignersForTestingGasParameters {
+                    base_cost: 0.into(),
+                    unit_cost: 0.into(),
+                },
+            },
+        }
+    }
 }
 
-pub fn all_natives_old_names(move_std_addr: AccountAddress) -> NativeFunctionTable {
-    const NATIVES: &[(&str, &str, NativeFunction)] = &[
-        ("BCS", "to_bytes", bcs::native_to_bytes),
-        ("Event", "write_to_event_store", event::write_to_event_store),
-        ("Hash", "sha2_256", hash::native_sha2_256),
-        ("Hash", "sha3_256", hash::native_sha3_256),
-        ("Signer", "borrow_address", signer::native_borrow_address),
-        ("Vector", "length", vector::native_length),
-        ("Vector", "empty", vector::native_empty),
-        ("Vector", "borrow", vector::native_borrow),
-        ("Vector", "borrow_mut", vector::native_borrow),
-        ("Vector", "push_back", vector::native_push_back),
-        ("Vector", "pop_back", vector::native_pop),
-        ("Vector", "destroy_empty", vector::native_destroy_empty),
-        ("Vector", "swap", vector::native_swap),
-        #[cfg(feature = "testing")]
-        ("Debug", "print", debug::native_print),
-        #[cfg(feature = "testing")]
-        (
-            "Debug",
-            "print_stack_trace",
-            debug::native_print_stack_trace,
-        ),
-        #[cfg(feature = "testing")]
-        (
-            "UnitTest",
-            "create_signers_for_testing",
-            unit_test::native_create_signers_for_testing,
-        ),
-    ];
-    native_functions::make_table(move_std_addr, NATIVES)
+pub fn all_natives(
+    move_std_addr: AccountAddress,
+    gas_params: GasParameters,
+) -> NativeFunctionTable {
+    let mut natives = vec![];
+
+    macro_rules! add_natives {
+        ($module_name: expr, $natives: expr) => {
+            natives.extend(
+                $natives.map(|(func_name, func)| ($module_name.to_string(), func_name, func)),
+            );
+        };
+    }
+
+    add_natives!("bcs", bcs::make_all(gas_params.bcs));
+    add_natives!("hash", hash::make_all(gas_params.hash));
+    add_natives!("signer", signer::make_all(gas_params.signer));
+    add_natives!("string", string::make_all(gas_params.string));
+    add_natives!("type_name", type_name::make_all(gas_params.type_name));
+    add_natives!("vector", vector::make_all(gas_params.vector));
+    #[cfg(feature = "testing")]
+    {
+        add_natives!("unit_test", unit_test::make_all(gas_params.unit_test));
+    }
+
+    make_table_from_iter(move_std_addr, natives)
+}
+
+#[derive(Debug, Clone)]
+pub struct NurseryGasParameters {
+    event: event::GasParameters,
+    debug: debug::GasParameters,
+}
+
+impl NurseryGasParameters {
+    pub fn zeros() -> Self {
+        Self {
+            event: event::GasParameters {
+                write_to_event_store: event::WriteToEventStoreGasParameters {
+                    unit_cost: 0.into(),
+                },
+            },
+            debug: debug::GasParameters {
+                print: debug::PrintGasParameters {
+                    base_cost: 0.into(),
+                },
+                print_stack_trace: debug::PrintStackTraceGasParameters {
+                    base_cost: 0.into(),
+                },
+            },
+        }
+    }
+}
+
+pub fn nursery_natives(
+    move_std_addr: AccountAddress,
+    gas_params: NurseryGasParameters,
+) -> NativeFunctionTable {
+    let mut natives = vec![];
+
+    macro_rules! add_natives {
+        ($module_name: expr, $natives: expr) => {
+            natives.extend(
+                $natives.map(|(func_name, func)| ($module_name.to_string(), func_name, func)),
+            );
+        };
+    }
+
+    add_natives!("event", event::make_all(gas_params.event));
+    add_natives!("debug", debug::make_all(gas_params.debug, move_std_addr));
+
+    make_table_from_iter(move_std_addr, natives)
 }
diff --git a/language/move-stdlib/src/natives/signer.rs b/language/move-stdlib/src/natives/signer.rs
index b9da26847f..f6ae868f04 100644
--- a/language/move-stdlib/src/natives/signer.rs
+++ b/language/move-stdlib/src/natives/signer.rs
@@ -2,20 +2,34 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::natives::helpers::make_module_natives;
 use move_binary_format::errors::PartialVMResult;
-use move_vm_runtime::native_functions::NativeContext;
+use move_core_types::gas_algebra::InternalGas;
+use move_vm_runtime::native_functions::{NativeContext, NativeFunction};
 use move_vm_types::{
-    gas_schedule::NativeCostIndex,
     loaded_data::runtime_types::Type,
-    natives::function::{native_gas, NativeResult},
+    natives::function::NativeResult,
     pop_arg,
     values::{values_impl::SignerRef, Value},
 };
 use smallvec::smallvec;
-use std::collections::VecDeque;
+use std::{collections::VecDeque, sync::Arc};
 
-pub fn native_borrow_address(
-    context: &mut NativeContext,
+/***************************************************************************************************
+ * native fun borrow_address
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct BorrowAddressGasParameters {
+    pub base: InternalGas,
+}
+
+#[inline]
+fn native_borrow_address(
+    gas_params: &BorrowAddressGasParameters,
+    _context: &mut NativeContext,
     _ty_args: Vec<Type>,
     mut arguments: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
@@ -23,10 +37,34 @@ pub fn native_borrow_address(
     debug_assert!(arguments.len() == 1);
 
     let signer_reference = pop_arg!(arguments, SignerRef);
-    let cost = native_gas(context.cost_table(), NativeCostIndex::SIGNER_BORROW, 1);
 
     Ok(NativeResult::ok(
-        cost,
+        gas_params.base,
         smallvec![signer_reference.borrow_signer()?],
     ))
 }
+
+pub fn make_native_borrow_address(gas_params: BorrowAddressGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_borrow_address(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub borrow_address: BorrowAddressGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [(
+        "borrow_address",
+        make_native_borrow_address(gas_params.borrow_address),
+    )];
+
+    make_module_natives(natives)
+}
diff --git a/language/move-stdlib/src/natives/string.rs b/language/move-stdlib/src/natives/string.rs
new file mode 100644
index 0000000000..24b1074dc0
--- /dev/null
+++ b/language/move-stdlib/src/natives/string.rs
@@ -0,0 +1,225 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Implementation of native functions for utf8 strings.
+
+use crate::natives::helpers::make_module_natives;
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::gas_algebra::{InternalGas, InternalGasPerByte, NumBytes};
+use move_vm_runtime::native_functions::{NativeContext, NativeFunction};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    pop_arg,
+    values::{Value, VectorRef},
+};
+use std::{collections::VecDeque, sync::Arc};
+
+// The implementation approach delegates all utf8 handling to Rust.
+// This is possible without copying of bytes because (a) we can
+// get a `std::cell::Ref<Vec<u8>>` from a `vector<u8>` and in turn a `&[u8]`
+// from that (b) assuming that `vector<u8>` embedded in a string
+// is already valid utf8, we can use `str::from_utf8_unchecked` to
+// create a `&str` view on the bytes without a copy. Once we have this
+// view, we can call ut8 functions like length, substring, etc.
+
+/***************************************************************************************************
+ * native fun internal_check_utf8
+ *
+ *   gas cost: base_cost + unit_cost * length_in_bytes
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct CheckUtf8GasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+}
+
+fn native_check_utf8(
+    gas_params: &CheckUtf8GasParameters,
+    _context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(args.len() == 1);
+    let s_arg = pop_arg!(args, VectorRef);
+    let s_ref = s_arg.as_bytes_ref();
+    let ok = std::str::from_utf8(s_ref.as_slice()).is_ok();
+    // TODO: extensible native cost tables
+
+    let cost = gas_params.base + gas_params.per_byte * NumBytes::new(s_ref.as_slice().len() as u64);
+
+    NativeResult::map_partial_vm_result_one(cost, Ok(Value::bool(ok)))
+}
+
+pub fn make_native_check_utf8(gas_params: CheckUtf8GasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_check_utf8(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun internal_is_char_boundary
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct IsCharBoundaryGasParameters {
+    pub base: InternalGas,
+}
+
+fn native_is_char_boundary(
+    gas_params: &IsCharBoundaryGasParameters,
+    _context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(args.len() == 2);
+    let i = pop_arg!(args, u64);
+    let s_arg = pop_arg!(args, VectorRef);
+    let s_ref = s_arg.as_bytes_ref();
+    let ok = unsafe {
+        // This is safe because we guarantee the bytes to be utf8.
+        std::str::from_utf8_unchecked(s_ref.as_slice()).is_char_boundary(i as usize)
+    };
+    NativeResult::map_partial_vm_result_one(gas_params.base, Ok(Value::bool(ok)))
+}
+
+pub fn make_native_is_char_boundary(gas_params: IsCharBoundaryGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_is_char_boundary(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun internal_sub_string
+ *
+ *   gas cost: base_cost + unit_cost * sub_string_length_in_bytes
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct SubStringGasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+}
+
+fn native_sub_string(
+    gas_params: &SubStringGasParameters,
+    _context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(args.len() == 3);
+    let j = pop_arg!(args, u64) as usize;
+    let i = pop_arg!(args, u64) as usize;
+
+    if j < i {
+        // TODO: what abort code should we use here?
+        return Ok(NativeResult::err(gas_params.base, 1));
+    }
+
+    let s_arg = pop_arg!(args, VectorRef);
+    let s_ref = s_arg.as_bytes_ref();
+    let s_str = unsafe {
+        // This is safe because we guarantee the bytes to be utf8.
+        std::str::from_utf8_unchecked(s_ref.as_slice())
+    };
+    let v = Value::vector_u8(s_str[i..j].as_bytes().iter().cloned());
+
+    let cost = gas_params.base + gas_params.per_byte * NumBytes::new((j - i) as u64);
+    NativeResult::map_partial_vm_result_one(cost, Ok(v))
+}
+
+pub fn make_native_sub_string(gas_params: SubStringGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_sub_string(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun internal_index_of
+ *
+ *   gas cost: base_cost + unit_cost * bytes_searched
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct IndexOfGasParameters {
+    pub base: InternalGas,
+    pub per_byte_pattern: InternalGasPerByte,
+    pub per_byte_searched: InternalGasPerByte,
+}
+
+fn native_index_of(
+    gas_params: &IndexOfGasParameters,
+    _context: &mut NativeContext,
+    _ty_args: Vec<Type>,
+    mut args: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert!(args.len() == 2);
+    let r_arg = pop_arg!(args, VectorRef);
+    let r_ref = r_arg.as_bytes_ref();
+    let r_str = unsafe { std::str::from_utf8_unchecked(r_ref.as_slice()) };
+    let s_arg = pop_arg!(args, VectorRef);
+    let s_ref = s_arg.as_bytes_ref();
+    let s_str = unsafe { std::str::from_utf8_unchecked(s_ref.as_slice()) };
+    let pos = match s_str.find(r_str) {
+        Some(size) => size,
+        None => s_str.len(),
+    };
+    // TODO(Gas): What is the algorithm used for the search?
+    //            Ideally it should be something like KMP with O(n) time complexity...
+    let cost = gas_params.base
+        + gas_params.per_byte_pattern * NumBytes::new(r_str.len() as u64)
+        + gas_params.per_byte_searched * NumBytes::new(pos as u64);
+    NativeResult::map_partial_vm_result_one(cost, Ok(Value::u64(pos as u64)))
+}
+
+pub fn make_native_index_of(gas_params: IndexOfGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_index_of(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub check_utf8: CheckUtf8GasParameters,
+    pub is_char_boundary: IsCharBoundaryGasParameters,
+    pub sub_string: SubStringGasParameters,
+    pub index_of: IndexOfGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [
+        (
+            "internal_check_utf8",
+            make_native_check_utf8(gas_params.check_utf8),
+        ),
+        (
+            "internal_is_char_boundary",
+            make_native_is_char_boundary(gas_params.is_char_boundary),
+        ),
+        (
+            "internal_sub_string",
+            make_native_sub_string(gas_params.sub_string),
+        ),
+        (
+            "internal_index_of",
+            make_native_index_of(gas_params.index_of),
+        ),
+    ];
+
+    make_module_natives(natives)
+}
diff --git a/language/move-stdlib/src/natives/type_name.rs b/language/move-stdlib/src/natives/type_name.rs
new file mode 100644
index 0000000000..6808289f20
--- /dev/null
+++ b/language/move-stdlib/src/natives/type_name.rs
@@ -0,0 +1,58 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::gas_algebra::{InternalGas, InternalGasPerByte, NumBytes};
+use move_vm_runtime::native_functions::{NativeContext, NativeFunction};
+use move_vm_types::{
+    loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
+    values::{Struct, Value},
+};
+
+use smallvec::smallvec;
+use std::{collections::VecDeque, sync::Arc};
+
+#[derive(Debug, Clone)]
+pub struct GetGasParameters {
+    pub base: InternalGas,
+    pub per_byte: InternalGasPerByte,
+}
+
+fn native_get(
+    gas_params: &GetGasParameters,
+    context: &mut NativeContext,
+    ty_args: Vec<Type>,
+    arguments: VecDeque<Value>,
+) -> PartialVMResult<NativeResult> {
+    debug_assert_eq!(ty_args.len(), 1);
+    debug_assert!(arguments.is_empty());
+
+    let type_tag = context.type_to_type_tag(&ty_args[0])?;
+    let type_name = type_tag.to_canonical_string();
+    // make a std::string::String
+    let string_val = Value::struct_(Struct::pack(vec![Value::vector_u8(
+        type_name.as_bytes().to_vec(),
+    )]));
+    // make a std::type_name::TypeName
+    let type_name_val = Value::struct_(Struct::pack(vec![string_val]));
+
+    let cost = gas_params.base + gas_params.per_byte * NumBytes::new(type_name.len() as u64);
+
+    Ok(NativeResult::ok(cost, smallvec![type_name_val]))
+}
+
+pub fn make_native_get(gas_params: GetGasParameters) -> NativeFunction {
+    Arc::new(move |context, ty_args, args| native_get(&gas_params, context, ty_args, args))
+}
+
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub get: GetGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [("get", make_native_get(gas_params.get))];
+
+    crate::natives::helpers::make_module_natives(natives)
+}
diff --git a/language/move-stdlib/src/natives/unit_test.rs b/language/move-stdlib/src/natives/unit_test.rs
index e68ae3454c..31fe78d549 100644
--- a/language/move-stdlib/src/natives/unit_test.rs
+++ b/language/move-stdlib/src/natives/unit_test.rs
@@ -2,17 +2,25 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::natives::helpers::make_module_natives;
 use move_binary_format::errors::PartialVMResult;
-use move_core_types::gas_schedule::ONE_GAS_UNIT;
-use move_vm_runtime::native_functions::NativeContext;
+use move_core_types::{
+    account_address::AccountAddress,
+    gas_algebra::{InternalGas, InternalGasPerArg, NumArgs},
+};
+use move_vm_runtime::native_functions::{NativeContext, NativeFunction};
 use move_vm_types::{
     loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value,
 };
 use smallvec::smallvec;
-use std::collections::VecDeque;
-
-use move_core_types::account_address::AccountAddress;
+use std::{collections::VecDeque, sync::Arc};
 
+/***************************************************************************************************
+ * native fun create_signers_for_testing
+ *
+ *   gas cost: base_cost + unit_cost * num_of_signers
+ *
+ **************************************************************************************************/
 fn to_le_bytes(i: u64) -> [u8; AccountAddress::LENGTH] {
     let bytes = i.to_le_bytes();
     let mut result = [0u8; AccountAddress::LENGTH];
@@ -20,7 +28,14 @@ fn to_le_bytes(i: u64) -> [u8; AccountAddress::LENGTH] {
     result
 }
 
-pub fn native_create_signers_for_testing(
+#[derive(Debug, Clone)]
+pub struct CreateSignersForTestingGasParameters {
+    pub base_cost: InternalGas,
+    pub unit_cost: InternalGasPerArg,
+}
+
+fn native_create_signers_for_testing(
+    gas_params: &CreateSignersForTestingGasParameters,
     _context: &mut NativeContext,
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
@@ -33,5 +48,34 @@ pub fn native_create_signers_for_testing(
         (0..num_signers).map(|i| Value::signer(AccountAddress::new(to_le_bytes(i)))),
     );
 
-    Ok(NativeResult::ok(ONE_GAS_UNIT, smallvec![signers]))
+    let cost = gas_params.base_cost + gas_params.unit_cost * NumArgs::new(num_signers);
+
+    Ok(NativeResult::ok(cost, smallvec![signers]))
+}
+
+pub fn make_native_create_signers_for_testing(
+    gas_params: CreateSignersForTestingGasParameters,
+) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_create_signers_for_testing(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub create_signers_for_testing: CreateSignersForTestingGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [(
+        "create_signers_for_testing",
+        make_native_create_signers_for_testing(gas_params.create_signers_for_testing),
+    )];
+
+    make_module_natives(natives)
 }
diff --git a/language/move-stdlib/src/natives/vector.rs b/language/move-stdlib/src/natives/vector.rs
index d312b6cc32..de71a7d6c1 100644
--- a/language/move-stdlib/src/natives/vector.rs
+++ b/language/move-stdlib/src/natives/vector.rs
@@ -2,33 +2,67 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::natives::helpers::make_module_natives;
 use move_binary_format::errors::{PartialVMError, PartialVMResult};
-use move_core_types::{gas_schedule::GasAlgebra, vm_status::StatusCode};
-use move_vm_runtime::native_functions::NativeContext;
+use move_core_types::{
+    gas_algebra::{InternalGas, InternalGasPerAbstractMemoryUnit},
+    vm_status::StatusCode,
+};
+use move_vm_runtime::native_functions::{NativeContext, NativeFunction};
 use move_vm_types::{
-    gas_schedule::NativeCostIndex,
     loaded_data::runtime_types::Type,
-    natives::function::{native_gas, NativeResult},
+    natives::function::NativeResult,
     pop_arg,
     values::{Value, Vector, VectorRef},
+    views::ValueView,
 };
+use std::{collections::VecDeque, sync::Arc};
 
-use std::collections::VecDeque;
+/***************************************************************************************************
+ * native fun empty
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct EmptyGasParameters {
+    pub base: InternalGas,
+}
 
 pub fn native_empty(
-    context: &mut NativeContext,
+    gas_params: &EmptyGasParameters,
+    _context: &mut NativeContext,
     ty_args: Vec<Type>,
     args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
     debug_assert!(ty_args.len() == 1);
     debug_assert!(args.is_empty());
 
-    let cost = native_gas(context.cost_table(), NativeCostIndex::EMPTY, 1);
-    NativeResult::map_partial_vm_result_one(cost, Vector::empty(&ty_args[0]))
+    NativeResult::map_partial_vm_result_one(gas_params.base, Vector::empty(&ty_args[0]))
+}
+
+pub fn make_native_empty(gas_params: EmptyGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_empty(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun length
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct LengthGasParameters {
+    pub base: InternalGas,
 }
 
 pub fn native_length(
-    context: &mut NativeContext,
+    gas_params: &LengthGasParameters,
+    _context: &mut NativeContext,
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
@@ -36,12 +70,32 @@ pub fn native_length(
     debug_assert!(args.len() == 1);
 
     let r = pop_arg!(args, VectorRef);
-    let cost = native_gas(context.cost_table(), NativeCostIndex::LENGTH, 1);
-    NativeResult::map_partial_vm_result_one(cost, r.len(&ty_args[0]))
+    NativeResult::map_partial_vm_result_one(gas_params.base, r.len(&ty_args[0]))
+}
+
+pub fn make_native_length(gas_params: LengthGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_length(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun push_back
+ *
+ *   gas cost: base_cost + legacy_unit_cost * max(1, size_of(val))
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct PushBackGasParameters {
+    pub base: InternalGas,
+    pub legacy_per_abstract_memory_unit: InternalGasPerAbstractMemoryUnit,
 }
 
 pub fn native_push_back(
-    context: &mut NativeContext,
+    gas_params: &PushBackGasParameters,
+    _context: &mut NativeContext,
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
@@ -50,16 +104,38 @@ pub fn native_push_back(
 
     let e = args.pop_back().unwrap();
     let r = pop_arg!(args, VectorRef);
-    let cost = native_gas(
-        context.cost_table(),
-        NativeCostIndex::PUSH_BACK,
-        e.size().get() as usize,
-    );
+
+    let mut cost = gas_params.base;
+    if gas_params.legacy_per_abstract_memory_unit != 0.into() {
+        cost += gas_params.legacy_per_abstract_memory_unit
+            * std::cmp::max(e.legacy_abstract_memory_size(), 1.into());
+    }
+
     NativeResult::map_partial_vm_result_empty(cost, r.push_back(e, &ty_args[0]))
 }
 
+pub fn make_native_push_back(gas_params: PushBackGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_push_back(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun borrow
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct BorrowGasParameters {
+    pub base: InternalGas,
+}
+
 pub fn native_borrow(
-    context: &mut NativeContext,
+    gas_params: &BorrowGasParameters,
+    _context: &mut NativeContext,
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
@@ -68,16 +144,35 @@ pub fn native_borrow(
 
     let idx = pop_arg!(args, u64) as usize;
     let r = pop_arg!(args, VectorRef);
-    let cost = native_gas(context.cost_table(), NativeCostIndex::BORROW, 1);
     NativeResult::map_partial_vm_result_one(
-        cost,
+        gas_params.base,
         r.borrow_elem(idx, &ty_args[0])
             .map_err(native_error_to_abort),
     )
 }
 
-pub fn native_pop(
-    context: &mut NativeContext,
+pub fn make_native_borrow(gas_params: BorrowGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_borrow(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun pop
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct PopBackGasParameters {
+    pub base: InternalGas,
+}
+
+pub fn native_pop_back(
+    gas_params: &PopBackGasParameters,
+    _context: &mut NativeContext,
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
@@ -85,12 +180,34 @@ pub fn native_pop(
     debug_assert!(args.len() == 1);
 
     let r = pop_arg!(args, VectorRef);
-    let cost = native_gas(context.cost_table(), NativeCostIndex::POP_BACK, 1);
-    NativeResult::map_partial_vm_result_one(cost, r.pop(&ty_args[0]).map_err(native_error_to_abort))
+    NativeResult::map_partial_vm_result_one(
+        gas_params.base,
+        r.pop(&ty_args[0]).map_err(native_error_to_abort),
+    )
+}
+
+pub fn make_native_pop_back(gas_params: PopBackGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_pop_back(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun destroy_empty
+ *
+ *   gas cost: base_cost
+ *
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct DestroyEmptyGasParameters {
+    pub base: InternalGas,
 }
 
 pub fn native_destroy_empty(
-    context: &mut NativeContext,
+    gas_params: &DestroyEmptyGasParameters,
+    _context: &mut NativeContext,
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
@@ -98,15 +215,31 @@ pub fn native_destroy_empty(
     debug_assert!(args.len() == 1);
 
     let v = pop_arg!(args, Vector);
-    let cost = native_gas(context.cost_table(), NativeCostIndex::DESTROY_EMPTY, 1);
     NativeResult::map_partial_vm_result_empty(
-        cost,
+        gas_params.base,
         v.destroy_empty(&ty_args[0]).map_err(native_error_to_abort),
     )
 }
 
+pub fn make_native_destroy_empty(gas_params: DestroyEmptyGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_destroy_empty(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
+/***************************************************************************************************
+ * native fun swap
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct SwapGasParameters {
+    pub base: InternalGas,
+}
+
 pub fn native_swap(
-    context: &mut NativeContext,
+    gas_params: &SwapGasParameters,
+    _context: &mut NativeContext,
     ty_args: Vec<Type>,
     mut args: VecDeque<Value>,
 ) -> PartialVMResult<NativeResult> {
@@ -116,14 +249,21 @@ pub fn native_swap(
     let idx2 = pop_arg!(args, u64) as usize;
     let idx1 = pop_arg!(args, u64) as usize;
     let r = pop_arg!(args, VectorRef);
-    let cost = native_gas(context.cost_table(), NativeCostIndex::SWAP, 1);
     NativeResult::map_partial_vm_result_empty(
-        cost,
+        gas_params.base,
         r.swap(idx1, idx2, &ty_args[0])
             .map_err(native_error_to_abort),
     )
 }
 
+pub fn make_native_swap(gas_params: SwapGasParameters) -> NativeFunction {
+    Arc::new(
+        move |context, ty_args, args| -> PartialVMResult<NativeResult> {
+            native_swap(&gas_params, context, ty_args, args)
+        },
+    )
+}
+
 fn native_error_to_abort(err: PartialVMError) -> PartialVMError {
     let (major_status, sub_status_opt, message_opt, exec_state_opt, indices, offsets) =
         err.all_data();
@@ -145,3 +285,35 @@ fn native_error_to_abort(err: PartialVMError) -> PartialVMError {
     };
     new_err.at_indices(indices).at_code_offsets(offsets)
 }
+
+/***************************************************************************************************
+ * module
+ **************************************************************************************************/
+#[derive(Debug, Clone)]
+pub struct GasParameters {
+    pub empty: EmptyGasParameters,
+    pub length: LengthGasParameters,
+    pub push_back: PushBackGasParameters,
+    pub borrow: BorrowGasParameters,
+    pub pop_back: PopBackGasParameters,
+    pub destroy_empty: DestroyEmptyGasParameters,
+    pub swap: SwapGasParameters,
+}
+
+pub fn make_all(gas_params: GasParameters) -> impl Iterator<Item = (String, NativeFunction)> {
+    let natives = [
+        ("empty", make_native_empty(gas_params.empty)),
+        ("length", make_native_length(gas_params.length)),
+        ("push_back", make_native_push_back(gas_params.push_back)),
+        ("borrow", make_native_borrow(gas_params.borrow.clone())),
+        ("borrow_mut", make_native_borrow(gas_params.borrow)),
+        ("pop_back", make_native_pop_back(gas_params.pop_back)),
+        (
+            "destroy_empty",
+            make_native_destroy_empty(gas_params.destroy_empty),
+        ),
+        ("swap", make_native_swap(gas_params.swap)),
+    ];
+
+    make_module_natives(natives)
+}
diff --git a/language/move-stdlib/tests/bcs_tests.move b/language/move-stdlib/tests/bcs_tests.move
index af900ac41a..0c84da6936 100644
--- a/language/move-stdlib/tests/bcs_tests.move
+++ b/language/move-stdlib/tests/bcs_tests.move
@@ -29,6 +29,18 @@ module std::bcs_tests {
         assert!(bcs::to_bytes(&1u8) == expected_output, 0);
     }
 
+    #[test]
+    fun bcs_u16() {
+        let expected_output = x"0100";
+        assert!(bcs::to_bytes(&1u16) == expected_output, 0);
+    }
+
+    #[test]
+    fun bcs_u32() {
+        let expected_output = x"01000000";
+        assert!(bcs::to_bytes(&1u32) == expected_output, 0);
+    }
+
     #[test]
     fun bcs_u64() {
         let expected_output = x"0100000000000000";
@@ -41,6 +53,12 @@ module std::bcs_tests {
         assert!(bcs::to_bytes(&1u128) == expected_output, 0);
     }
 
+    #[test]
+    fun bcs_u256() {
+        let expected_output = x"0100000000000000000000000000000000000000000000000000000000000000";
+        assert!(bcs::to_bytes(&1u256) == expected_output, 0);
+    }
+
     #[test]
     fun bcs_vec_u8() {
         let v = x"0f";
@@ -78,7 +96,7 @@ module std::bcs_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 453)]
+    #[expected_failure] // VM_MAX_VALUE_DEPTH_REACHED
     fun encode_129() {
         bcs::to_bytes(&Box { x: box127(true) });
     }
diff --git a/language/move-stdlib/tests/bit_vector_tests.move b/language/move-stdlib/tests/bit_vector_tests.move
index 20fb9b0426..c03322fa92 100644
--- a/language/move-stdlib/tests/bit_vector_tests.move
+++ b/language/move-stdlib/tests/bit_vector_tests.move
@@ -32,21 +32,21 @@ module std::bit_vector_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 0)]
+    #[expected_failure(abort_code = bit_vector::EINDEX)]
     fun set_bit_out_of_bounds() {
         let bitvector = bit_vector::new(bit_vector::word_size());
         bit_vector::set(&mut bitvector, bit_vector::word_size());
     }
 
     #[test]
-    #[expected_failure(abort_code = 0)]
+    #[expected_failure(abort_code = bit_vector::EINDEX)]
     fun unset_bit_out_of_bounds() {
         let bitvector = bit_vector::new(bit_vector::word_size());
         bit_vector::unset(&mut bitvector, bit_vector::word_size());
     }
 
     #[test]
-    #[expected_failure(abort_code = 0)]
+    #[expected_failure(abort_code = bit_vector::EINDEX)]
     fun index_bit_out_of_bounds() {
         let bitvector = bit_vector::new(bit_vector::word_size());
         bit_vector::is_index_set(&mut bitvector, bit_vector::word_size());
@@ -210,7 +210,7 @@ module std::bit_vector_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = bit_vector::ELENGTH)]
     fun empty_bitvector() {
         bit_vector::new(0);
     }
diff --git a/language/move-stdlib/tests/fixedpoint32_tests.move b/language/move-stdlib/tests/fixedpoint32_tests.move
index 8fa666eb8b..83513dbe0c 100644
--- a/language/move-stdlib/tests/fixedpoint32_tests.move
+++ b/language/move-stdlib/tests/fixedpoint32_tests.move
@@ -3,14 +3,14 @@ module std::fixed_point32_tests {
     use std::fixed_point32;
 
     #[test]
-    #[expected_failure(abort_code = 0)]
+    #[expected_failure(abort_code = fixed_point32::EDENOMINATOR)]
     fun create_div_zero() {
         // A denominator of zero should cause an arithmetic error.
         fixed_point32::create_from_rational(2, 0);
     }
 
     #[test]
-    #[expected_failure(abort_code = 4)]
+    #[expected_failure(abort_code = fixed_point32::ERATIO_OUT_OF_RANGE)]
     fun create_overflow() {
         // The maximum value is 2^32 - 1. Check that anything larger aborts
         // with an overflow.
@@ -18,7 +18,7 @@ module std::fixed_point32_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 4)]
+    #[expected_failure(abort_code = fixed_point32::ERATIO_OUT_OF_RANGE)]
     fun create_underflow() {
         // The minimum non-zero value is 2^-32. Check that anything smaller
         // aborts.
@@ -32,7 +32,7 @@ module std::fixed_point32_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 3)]
+    #[expected_failure(abort_code = fixed_point32::EDIVISION_BY_ZERO)]
     fun divide_by_zero() {
         // Dividing by zero should cause an arithmetic error.
         let f = fixed_point32::create_from_raw_value(0);
@@ -40,7 +40,7 @@ module std::fixed_point32_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = fixed_point32::EDIVISION)]
     fun divide_overflow_small_divisore() {
         let f = fixed_point32::create_from_raw_value(1); // 0x0.00000001
         // Divide 2^32 by the minimum fractional value. This should overflow.
@@ -48,7 +48,7 @@ module std::fixed_point32_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = fixed_point32::EDIVISION)]
     fun divide_overflow_large_numerator() {
         let f = fixed_point32::create_from_rational(1, 2); // 0.5
         // Divide the maximum u64 value by 0.5. This should overflow.
@@ -56,7 +56,7 @@ module std::fixed_point32_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 2)]
+    #[expected_failure(abort_code = fixed_point32::EMULTIPLICATION)]
     fun multiply_overflow_small_multiplier() {
         let f = fixed_point32::create_from_rational(3, 2); // 1.5
         // Multiply the maximum u64 value by 1.5. This should overflow.
@@ -64,7 +64,7 @@ module std::fixed_point32_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 2)]
+    #[expected_failure(abort_code = fixed_point32::EMULTIPLICATION)]
     fun multiply_overflow_large_multiplier() {
         let f = fixed_point32::create_from_raw_value(18446744073709551615);
         // Multiply 2^33 by the maximum fixed-point value. This should overflow.
@@ -106,4 +106,83 @@ module std::fixed_point32_tests {
         let one = fixed_point32::get_raw_value(f);
         assert!(one == 4294967296, 0); // 0x1.00000000
     }
+
+    #[test]
+    fun min_can_return_smaller_fixed_point_number() {
+        let one = fixed_point32::create_from_rational(1, 1);
+        let two = fixed_point32::create_from_rational(2, 1);
+        let smaller_number1 = fixed_point32::min(one, two);
+        let val1 = fixed_point32::get_raw_value(smaller_number1);
+        assert!(val1 == 4294967296, 0);  // 0x1.00000000
+        let smaller_number2 = fixed_point32::min(two, one);
+        let val2 = fixed_point32::get_raw_value(smaller_number2);
+        assert!(val2 == 4294967296, 0);  // 0x1.00000000
+    }
+
+    #[test]
+    fun max_can_return_larger_fixed_point_number() {
+        let one = fixed_point32::create_from_rational(1, 1);
+        let two = fixed_point32::create_from_rational(2, 1);
+        let larger_number1 = fixed_point32::max(one, two);
+        let larger_number2 = fixed_point32::max(two, one);
+        let val1 = fixed_point32::get_raw_value(larger_number1);
+        assert!(val1 == 8589934592, 0);  // 0x2.00000000
+        let val2 = fixed_point32::get_raw_value(larger_number2);
+        assert!(val2 == 8589934592, 0);  // 0x2.00000000
+    }
+
+    #[test]
+    fun floor_can_return_the_correct_number_zero() {
+        let point_five = fixed_point32::create_from_rational(1, 2);
+        let val = fixed_point32::floor(point_five);
+        assert!(val == 0, 0);
+    }
+
+    #[test]
+    fun create_from_u64_create_correct_fixed_point_number() {
+        let one = fixed_point32::create_from_u64(1);
+        let val = fixed_point32::get_raw_value(one);
+        assert!(val == 4294967296, 0);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = fixed_point32::ERATIO_OUT_OF_RANGE)]
+    fun create_from_u64_throw_error_when_number_too_large() {
+        fixed_point32::create_from_u64(4294967296); // (u64 >> 32) + 1
+    }
+
+    #[test]
+    fun floor_can_return_the_correct_number_one() {
+        let three_point_five = fixed_point32::create_from_rational(7, 2); // 3.5
+        let val = fixed_point32::floor(three_point_five);
+        assert!(val == 3, 0);
+    }
+
+    #[test]
+    fun ceil_can_round_up_correctly() {
+        let point_five = fixed_point32::create_from_rational(1, 2); // 0.5
+        let val = fixed_point32::ceil(point_five);
+        assert!(val == 1, 0);
+    }
+
+    #[test]
+    fun ceil_will_not_change_if_number_already_integer() {
+        let one = fixed_point32::create_from_rational(1, 1); // 0.5
+        let val = fixed_point32::ceil(one);
+        assert!(val == 1, 0);
+    }
+
+    #[test]
+    fun round_can_round_up_correctly() {
+        let point_five = fixed_point32::create_from_rational(1, 2); // 0.5
+        let val = fixed_point32::round(point_five);
+        assert!(val == 1, 0);
+    }
+
+    #[test]
+    fun round_can_round_down_correctly() {
+        let num = fixed_point32::create_from_rational(499, 1000); // 0.499
+        let val = fixed_point32::round(num);
+        assert!(val == 0, 0);
+    }
 }
diff --git a/language/move-stdlib/tests/move_unit_test.rs b/language/move-stdlib/tests/move_unit_test.rs
index 37bd61c72b..6c18fba476 100644
--- a/language/move-stdlib/tests/move_unit_test.rs
+++ b/language/move-stdlib/tests/move_unit_test.rs
@@ -2,15 +2,30 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use move_cli::package::{cli, cli::UnitTestResult};
+use move_cli::base::test::{run_move_unit_tests, UnitTestResult};
 use move_core_types::account_address::AccountAddress;
-use move_stdlib::{natives::all_natives, path_in_crate};
+use move_stdlib::{
+    natives::{all_natives, nursery_natives, GasParameters, NurseryGasParameters},
+    path_in_crate,
+};
 use move_unit_test::UnitTestingConfig;
 use tempfile::tempdir;
 
-fn run_tests_for_pkg(path_to_pkg: impl Into<String>) {
+fn run_tests_for_pkg(path_to_pkg: impl Into<String>, include_nursery_natives: bool) {
     let pkg_path = path_in_crate(path_to_pkg);
-    let result = cli::run_move_unit_tests(
+
+    let mut natives = all_natives(
+        AccountAddress::from_hex_literal("0x1").unwrap(),
+        GasParameters::zeros(),
+    );
+    if include_nursery_natives {
+        natives.extend(nursery_natives(
+            AccountAddress::from_hex_literal("0x1").unwrap(),
+            NurseryGasParameters::zeros(),
+        ))
+    }
+
+    let result = run_move_unit_tests(
         &pkg_path,
         move_package::BuildConfig {
             test_mode: true,
@@ -18,8 +33,10 @@ fn run_tests_for_pkg(path_to_pkg: impl Into<String>) {
             ..Default::default()
         },
         UnitTestingConfig::default_with_bound(Some(100_000)),
-        all_natives(AccountAddress::from_hex_literal("0x1").unwrap()),
+        natives,
+        None,
         /* compute_coverage */ false,
+        &mut std::io::stdout(),
     )
     .unwrap();
     if result != UnitTestResult::Success {
@@ -29,6 +46,6 @@ fn run_tests_for_pkg(path_to_pkg: impl Into<String>) {
 
 #[test]
 fn move_unit_tests() {
-    run_tests_for_pkg(".");
-    run_tests_for_pkg("nursery");
+    run_tests_for_pkg(".", false);
+    run_tests_for_pkg("nursery", true);
 }
diff --git a/language/move-stdlib/tests/move_verification_test.rs b/language/move-stdlib/tests/move_verification_test.rs
index 783b91353e..70b42a8317 100644
--- a/language/move-stdlib/tests/move_verification_test.rs
+++ b/language/move-stdlib/tests/move_verification_test.rs
@@ -2,7 +2,7 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use move_cli::package::prover::ProverTest;
+use move_cli::base::prove::ProverTest;
 
 // TODO: split this into individual tests once the package system supports this.
 
diff --git a/language/move-stdlib/tests/option_tests.move b/language/move-stdlib/tests/option_tests.move
index 7097221797..950a940dc4 100644
--- a/language/move-stdlib/tests/option_tests.move
+++ b/language/move-stdlib/tests/option_tests.move
@@ -37,7 +37,7 @@ module std::option_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = option::EOPTION_NOT_SET)]
     fun option_borrow_none() {
         option::borrow(&option::none<u64>());
     }
@@ -51,7 +51,7 @@ module std::option_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = option::EOPTION_NOT_SET)]
     fun borrow_mut_none() {
         option::borrow_mut(&mut option::none<u64>());
     }
@@ -80,7 +80,7 @@ module std::option_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = option::EOPTION_NOT_SET)]
     fun extract_none() {
         option::extract(&mut option::none<u64>());
     }
@@ -107,7 +107,7 @@ module std::option_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = option::EOPTION_NOT_SET)]
     fun swap_none() {
         option::swap(&mut option::none<u64>(), 1);
     }
@@ -121,7 +121,7 @@ module std::option_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 0)]
+    #[expected_failure(abort_code = option::EOPTION_IS_SET)]
     fun fill_some() {
         option::fill(&mut option::some(3), 0);
     }
@@ -138,7 +138,7 @@ module std::option_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = option::EOPTION_NOT_SET)]
     fun destroy_some_none() {
         option::destroy_some(option::none<u64>());
     }
@@ -149,7 +149,7 @@ module std::option_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 0)]
+    #[expected_failure(abort_code = option::EOPTION_IS_SET)]
     fun destroy_none_some() {
         option::destroy_none(option::some<u64>(0));
     }
diff --git a/language/move-stdlib/tests/string_tests.move b/language/move-stdlib/tests/string_tests.move
new file mode 100644
index 0000000000..e7810a3422
--- /dev/null
+++ b/language/move-stdlib/tests/string_tests.move
@@ -0,0 +1,78 @@
+#[test_only]
+module std::string_tests {
+    use std::string;
+
+    #[test]
+    fun test_valid_utf8() {
+        let sparkle_heart = vector[240, 159, 146, 150];
+        let s = string::utf8(sparkle_heart);
+        assert!(string::length(&s) == 4, 22);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = string::EINVALID_UTF8)]
+    fun test_invalid_utf8() {
+        let no_sparkle_heart = vector[0, 159, 146, 150];
+        let s = string::utf8(no_sparkle_heart);
+        assert!(string::length(&s) == 1, 22);
+    }
+
+    #[test]
+    fun test_sub_string() {
+        let s = string::utf8(b"abcd");
+        let sub = string::sub_string(&s, 2, 4);
+        assert!(sub == string::utf8(b"cd"), 22)
+    }
+
+    #[test]
+    #[expected_failure(abort_code = string::EINVALID_INDEX)]
+    fun test_sub_string_invalid_boundary() {
+        let sparkle_heart = vector[240, 159, 146, 150];
+        let s = string::utf8(sparkle_heart);
+        let _sub = string::sub_string(&s, 1, 4);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = string::EINVALID_INDEX)]
+    fun test_sub_string_invalid_index() {
+        let s = string::utf8(b"abcd");
+        let _sub = string::sub_string(&s, 4, 5);
+    }
+
+    #[test]
+    fun test_sub_string_empty() {
+        let s = string::utf8(b"abcd");
+        let sub = string::sub_string(&s, 4, 4);
+        assert!(string::is_empty(&sub), 22)
+    }
+
+    #[test]
+    fun test_index_of() {
+        let s = string::utf8(b"abcd");
+        let r = string::utf8(b"bc");
+        let p = string::index_of(&s, &r);
+        assert!(p == 1, 22)
+    }
+
+    #[test]
+    fun test_index_of_fail() {
+        let s = string::utf8(b"abcd");
+        let r = string::utf8(b"bce");
+        let p = string::index_of(&s, &r);
+        assert!(p == 4, 22)
+    }
+
+    #[test]
+    fun test_append() {
+        let s = string::utf8(b"abcd");
+        string::append(&mut s, string::utf8(b"ef"));
+        assert!(s == string::utf8(b"abcdef"), 22)
+    }
+
+    #[test]
+    fun test_insert() {
+        let s = string::utf8(b"abcd");
+        string::insert(&mut s, 1, string::utf8(b"xy"));
+        assert!(s == string::utf8(b"axybcd"), 22)
+    }
+}
diff --git a/language/move-stdlib/tests/type_name_tests.move b/language/move-stdlib/tests/type_name_tests.move
new file mode 100644
index 0000000000..c278defc15
--- /dev/null
+++ b/language/move-stdlib/tests/type_name_tests.move
@@ -0,0 +1,47 @@
+// note: intentionally using 0xa here to test non-0x1 module addresses
+module 0xA::type_name_tests {
+    #[test_only]
+    use std::type_name::{get, into_string};
+    #[test_only]
+    use std::ascii::string;
+
+    struct TestStruct {}
+
+    struct TestGenerics<phantom T> { }
+
+    struct TestMultiGenerics<phantom T1, phantom T2, phantom T3> { }
+
+    #[test]
+    fun test_ground_types() {
+        assert!(into_string(get<u8>()) == string(b"u8"), 0);
+        assert!(into_string(get<u64>()) == string(b"u64"), 0);
+        assert!(into_string(get<u128>()) == string(b"u128"), 0);
+        assert!(into_string(get<address>()) == string(b"address"), 0);
+        assert!(into_string(get<signer>()) == string(b"signer"), 0);
+        assert!(into_string(get<vector<u8>>()) == string(b"vector<u8>"), 0)
+    }
+
+    // Note: these tests assume a 16 byte address length, and will fail on platforms where addresses are 20 or 32 bytes
+    #[test]
+    fun test_structs() {
+        assert!(into_string(get<TestStruct>()) == string(b"0000000000000000000000000000000a::type_name_tests::TestStruct"), 0);
+        assert!(into_string(get<std::ascii::String>()) == string(b"00000000000000000000000000000001::ascii::String"), 0);
+        assert!(into_string(get<std::option::Option<u64>>()) == string(b"00000000000000000000000000000001::option::Option<u64>"), 0);
+        assert!(into_string(get<std::string::String>()) == string(b"00000000000000000000000000000001::string::String"), 0);
+    }
+
+    // Note: these tests assume a 16 byte address length, and will fail on platforms where addresses are 20 or 32 bytes
+    #[test]
+    fun test_generics() {
+        assert!(into_string(get<TestGenerics<std::string::String>>()) == string(b"0000000000000000000000000000000a::type_name_tests::TestGenerics<00000000000000000000000000000001::string::String>"), 0);
+        assert!(into_string(get<vector<TestGenerics<u64>>>()) == string(b"vector<0000000000000000000000000000000a::type_name_tests::TestGenerics<u64>>"), 0);
+        assert!(into_string(get<std::option::Option<TestGenerics<u8>>>()) == string(b"00000000000000000000000000000001::option::Option<0000000000000000000000000000000a::type_name_tests::TestGenerics<u8>>"), 0);
+    }
+
+    // Note: these tests assume a 16 byte address length, and will fail on platforms where addresses are 20 or 32 bytes
+    #[test]
+    fun test_multi_generics() {
+        assert!(into_string(get<TestMultiGenerics<bool, u64, u128>>()) == string(b"0000000000000000000000000000000a::type_name_tests::TestMultiGenerics<bool,u64,u128>"), 0);
+        assert!(into_string(get<TestMultiGenerics<bool, vector<u64>, TestGenerics<u128>>>()) == string(b"0000000000000000000000000000000a::type_name_tests::TestMultiGenerics<bool,vector<u64>,0000000000000000000000000000000a::type_name_tests::TestGenerics<u128>>"), 0);
+    }
+}
diff --git a/language/move-stdlib/tests/vector_tests.move b/language/move-stdlib/tests/vector_tests.move
index 37a8da66d7..e32eabc441 100644
--- a/language/move-stdlib/tests/vector_tests.move
+++ b/language/move-stdlib/tests/vector_tests.move
@@ -90,7 +90,7 @@ module std::vector_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(vector_error, minor_status = 1, location = Self)]
     fun borrow_out_of_range() {
         let v = V::empty();
         V::push_back(&mut v, 7);
@@ -133,7 +133,7 @@ module std::vector_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 3)]
+    #[expected_failure(vector_error, minor_status = 3, location = Self)]
     fun destroy_non_empty() {
         let v = V::empty();
         V::push_back(&mut v, 42);
@@ -154,7 +154,7 @@ module std::vector_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 2)]
+    #[expected_failure(vector_error, minor_status = 2, location = Self)]
     fun pop_out_of_range() {
         let v = V::empty<u64>();
         V::pop_back(&mut v);
@@ -228,14 +228,14 @@ module std::vector_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 0)]
+    #[expected_failure(abort_code = V::EINDEX_OUT_OF_BOUNDS)]
     fun remove_empty_vector() {
         let v = V::empty<u64>();
         V::remove(&mut v, 0);
     }
 
     #[test]
-    #[expected_failure(abort_code = 0)]
+    #[expected_failure(abort_code = V::EINDEX_OUT_OF_BOUNDS)]
     fun remove_out_of_bound_index() {
         let v = V::empty<u64>();
         V::push_back(&mut v, 0);
@@ -299,14 +299,14 @@ module std::vector_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(vector_error, minor_status = 1, location = Self)]
     fun swap_empty() {
         let v = V::empty<u64>();
         V::swap(&mut v, 0, 0);
     }
 
     #[test]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(vector_error, minor_status = 1, location = Self)]
     fun swap_out_of_range() {
         let v = V::empty<u64>();
 
@@ -319,7 +319,7 @@ module std::vector_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 0)]
+    #[expected_failure(abort_code = V::EINDEX_OUT_OF_BOUNDS)]
     fun swap_remove_empty() {
         let v = V::empty<u64>();
         V::swap_remove(&mut v, 0);
@@ -377,7 +377,7 @@ module std::vector_tests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(vector_error, minor_status = 1, location = std::vector)]
     fun swap_remove_out_of_range() {
         let v = V::empty();
         V::push_back(&mut v, 0);
@@ -487,8 +487,11 @@ module std::vector_tests {
     #[test]
     fun test_natives_with_different_instantiations() {
         test_natives_with_type<u8>(1u8, 2u8);
+        test_natives_with_type<u16>(45356u16, 25345u16);
+        test_natives_with_type<u32>(45356u32, 28768867u32);
         test_natives_with_type<u64>(1u64, 2u64);
         test_natives_with_type<u128>(1u128, 2u128);
+        test_natives_with_type<u256>(45356u256, 253458768867u256);
         test_natives_with_type<bool>(true, false);
         test_natives_with_type<address>(@0x1, @0x2);
 
@@ -500,4 +503,40 @@ module std::vector_tests {
             NotDroppable {}
         );
     }
+
+    #[test]
+    fun test_insert() {
+        let v = vector[7];
+        V::insert(&mut v, 6, 0);
+        assert!(v == vector[6, 7], 0);
+
+        let v = vector[7, 9];
+        V::insert(&mut v, 8, 1);
+        assert!(v == vector[7, 8, 9], 0);
+
+        let v = vector[6, 7];
+        V::insert(&mut v, 5, 0);
+        assert!(v == vector[5, 6, 7], 0);
+
+        let v = vector[5, 6, 8];
+        V::insert(&mut v, 7, 2);
+        assert!(v == vector[5, 6, 7, 8], 0);
+    }
+
+    #[test]
+    fun insert_at_end() {
+        let v = vector[];
+        V::insert(&mut v, 6, 0);
+        assert!(v == vector[6], 0);
+
+        V::insert(&mut v, 7, 1);
+        assert!(v == vector[6, 7], 0);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = V::EINDEX_OUT_OF_BOUNDS)]
+    fun insert_out_of_range() {
+        let v = vector[7];
+        V::insert(&mut v, 6, 2);
+    }
 }
diff --git a/language/move-symbol-pool/Cargo.toml b/language/move-symbol-pool/Cargo.toml
index 6cc5b14748..db132c8990 100644
--- a/language/move-symbol-pool/Cargo.toml
+++ b/language/move-symbol-pool/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 once_cell = "1.7.2"
diff --git a/language/move-vm/integration-tests/Cargo.toml b/language/move-vm/integration-tests/Cargo.toml
index 67b82cf73e..343e4e15de 100644
--- a/language/move-vm/integration-tests/Cargo.toml
+++ b/language/move-vm/integration-tests/Cargo.toml
@@ -7,16 +7,18 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 anyhow = "1.0.52"
 tempfile = "3.2.0"
+memory-stats = "1.0.0"
 
 move-core-types = {path = "../../move-core/types" }
 move-binary-format = { path = "../../move-binary-format" }
+move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
 move-compiler = { path = "../../move-compiler" }
 move-vm-runtime = { path = "../runtime" }
 move-vm-types = { path = "../types" }
@@ -30,3 +32,7 @@ table-extension = [
     "move-table-extension",
     "move-vm-test-utils/table-extension"
 ]
+
+[[bin]]
+name = "instantiation"
+path = "src/tests/instantiation_tests.rs"
diff --git a/language/move-vm/integration-tests/src/tests/bad_entry_point_tests.rs b/language/move-vm/integration-tests/src/tests/bad_entry_point_tests.rs
index 1d22c8a4e9..1287861869 100644
--- a/language/move-vm/integration-tests/src/tests/bad_entry_point_tests.rs
+++ b/language/move-vm/integration-tests/src/tests/bad_entry_point_tests.rs
@@ -12,7 +12,7 @@ use move_core_types::{
 };
 use move_vm_runtime::move_vm::MoveVM;
 use move_vm_test_utils::{BlankStorage, InMemoryStorage};
-use move_vm_types::gas_schedule::GasStatus;
+use move_vm_types::gas::UnmeteredGasMeter;
 
 const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
 
@@ -24,7 +24,6 @@ fn call_non_existent_module() {
     let mut sess = vm.new_session(&storage);
     let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
     let fun_name = Identifier::new("foo").unwrap();
-    let mut gas_status = GasStatus::new_unmetered();
 
     let err = sess
         .execute_function_bypass_visibility(
@@ -32,7 +31,7 @@ fn call_non_existent_module() {
             &fun_name,
             vec![],
             serialize_values(&vec![MoveValue::Signer(TEST_ADDR)]),
-            &mut gas_status,
+            &mut UnmeteredGasMeter,
         )
         .unwrap_err();
 
@@ -59,7 +58,6 @@ fn call_non_existent_function() {
     let mut sess = vm.new_session(&storage);
 
     let fun_name = Identifier::new("foo").unwrap();
-    let mut gas_status = GasStatus::new_unmetered();
 
     let err = sess
         .execute_function_bypass_visibility(
@@ -67,7 +65,7 @@ fn call_non_existent_function() {
             &fun_name,
             vec![],
             serialize_values(&vec![MoveValue::Signer(TEST_ADDR)]),
-            &mut gas_status,
+            &mut UnmeteredGasMeter,
         )
         .unwrap_err();
 
diff --git a/language/move-vm/integration-tests/src/tests/bad_storage_tests.rs b/language/move-vm/integration-tests/src/tests/bad_storage_tests.rs
index a1c94b4041..533d007d00 100644
--- a/language/move-vm/integration-tests/src/tests/bad_storage_tests.rs
+++ b/language/move-vm/integration-tests/src/tests/bad_storage_tests.rs
@@ -6,7 +6,7 @@ use crate::compiler::{as_module, as_script, compile_units};
 use move_binary_format::errors::{Location, PartialVMError, VMError};
 use move_core_types::{
     account_address::AccountAddress,
-    effects::ChangeSet,
+    effects::{ChangeSet, Op},
     identifier::Identifier,
     language_storage::{ModuleId, StructTag},
     resolver::{ModuleResolver, ResourceResolver},
@@ -15,7 +15,7 @@ use move_core_types::{
 };
 use move_vm_runtime::move_vm::MoveVM;
 use move_vm_test_utils::{DeltaStorage, InMemoryStorage};
-use move_vm_types::gas_schedule::GasStatus;
+use move_vm_types::gas::UnmeteredGasMeter;
 
 const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
 
@@ -86,11 +86,10 @@ fn test_malformed_resource() {
 
     let vm = MoveVM::new(move_stdlib::natives::all_natives(
         AccountAddress::from_hex_literal("0x1").unwrap(),
+        move_stdlib::natives::GasParameters::zeros(),
     ))
     .unwrap();
 
-    let mut gas_status = GasStatus::new_unmetered();
-
     // Execute the first script to publish a resource Foo.
     let mut script_blob = vec![];
     s1.serialize(&mut script_blob).unwrap();
@@ -99,7 +98,7 @@ fn test_malformed_resource() {
         script_blob,
         vec![],
         vec![MoveValue::Signer(TEST_ADDR).simple_serialize().unwrap()],
-        &mut gas_status,
+        &mut UnmeteredGasMeter,
     )
     .map(|_| ())
     .unwrap();
@@ -117,7 +116,7 @@ fn test_malformed_resource() {
             script_blob.clone(),
             vec![],
             vec![MoveValue::Signer(TEST_ADDR).simple_serialize().unwrap()],
-            &mut gas_status,
+            &mut UnmeteredGasMeter,
         )
         .map(|_| ())
         .unwrap();
@@ -144,7 +143,7 @@ fn test_malformed_resource() {
                 script_blob,
                 vec![],
                 vec![MoveValue::Signer(TEST_ADDR).simple_serialize().unwrap()],
-                &mut gas_status,
+                &mut UnmeteredGasMeter,
             )
             .map(|_| ())
             .unwrap_err();
@@ -172,8 +171,6 @@ fn test_malformed_module() {
     let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
     let fun_name = Identifier::new("foo").unwrap();
 
-    let mut gas_status = GasStatus::new_unmetered();
-
     // Publish M and call M::foo. No errors should be thrown.
     {
         let mut storage = InMemoryStorage::new();
@@ -185,7 +182,7 @@ fn test_malformed_module() {
             &fun_name,
             vec![],
             Vec::<Vec<u8>>::new(),
-            &mut gas_status,
+            &mut UnmeteredGasMeter,
         )
         .unwrap();
     }
@@ -211,7 +208,7 @@ fn test_malformed_module() {
                 &fun_name,
                 vec![],
                 Vec::<Vec<u8>>::new(),
-                &mut gas_status,
+                &mut UnmeteredGasMeter,
             )
             .unwrap_err();
         assert_eq!(err.status_type(), StatusType::InvariantViolation);
@@ -231,7 +228,6 @@ fn test_unverifiable_module() {
     let mut units = compile_units(&code).unwrap();
     let m = as_module(units.pop().unwrap());
 
-    let mut gas_status = GasStatus::new_unmetered();
     let module_id = ModuleId::new(TEST_ADDR, Identifier::new("M").unwrap());
     let fun_name = Identifier::new("foo").unwrap();
 
@@ -251,7 +247,7 @@ fn test_unverifiable_module() {
             &fun_name,
             vec![],
             Vec::<Vec<u8>>::new(),
-            &mut gas_status,
+            &mut UnmeteredGasMeter,
         )
         .unwrap();
     }
@@ -276,7 +272,7 @@ fn test_unverifiable_module() {
                 &fun_name,
                 vec![],
                 Vec::<Vec<u8>>::new(),
-                &mut gas_status,
+                &mut UnmeteredGasMeter,
             )
             .unwrap_err();
 
@@ -308,8 +304,6 @@ fn test_missing_module_dependency() {
     let mut blob_n = vec![];
     n.serialize(&mut blob_n).unwrap();
 
-    let mut gas_status = GasStatus::new_unmetered();
-
     let module_id = ModuleId::new(TEST_ADDR, Identifier::new("N").unwrap());
     let fun_name = Identifier::new("bar").unwrap();
 
@@ -328,7 +322,7 @@ fn test_missing_module_dependency() {
             &fun_name,
             vec![],
             Vec::<Vec<u8>>::new(),
-            &mut gas_status,
+            &mut UnmeteredGasMeter,
         )
         .unwrap();
     }
@@ -348,7 +342,7 @@ fn test_missing_module_dependency() {
                 &fun_name,
                 vec![],
                 Vec::<Vec<u8>>::new(),
-                &mut gas_status,
+                &mut UnmeteredGasMeter,
             )
             .unwrap_err();
 
@@ -357,7 +351,7 @@ fn test_missing_module_dependency() {
 }
 
 #[test]
-fn test_malformed_module_denpency() {
+fn test_malformed_module_dependency() {
     // Compile two modules M, N where N depends on M.
     let code = r#"
         module {{ADDR}}::M {
@@ -380,8 +374,6 @@ fn test_malformed_module_denpency() {
     let mut blob_n = vec![];
     n.serialize(&mut blob_n).unwrap();
 
-    let mut gas_status = GasStatus::new_unmetered();
-
     let module_id = ModuleId::new(TEST_ADDR, Identifier::new("N").unwrap());
     let fun_name = Identifier::new("bar").unwrap();
 
@@ -400,7 +392,7 @@ fn test_malformed_module_denpency() {
             &fun_name,
             vec![],
             Vec::<Vec<u8>>::new(),
-            &mut gas_status,
+            &mut UnmeteredGasMeter,
         )
         .unwrap();
     }
@@ -426,7 +418,7 @@ fn test_malformed_module_denpency() {
                 &fun_name,
                 vec![],
                 Vec::<Vec<u8>>::new(),
-                &mut gas_status,
+                &mut UnmeteredGasMeter,
             )
             .unwrap_err();
 
@@ -456,8 +448,6 @@ fn test_unverifiable_module_dependency() {
     let mut blob_n = vec![];
     n.serialize(&mut blob_n).unwrap();
 
-    let mut gas_status = GasStatus::new_unmetered();
-
     let module_id = ModuleId::new(TEST_ADDR, Identifier::new("N").unwrap());
     let fun_name = Identifier::new("bar").unwrap();
 
@@ -479,7 +469,7 @@ fn test_unverifiable_module_dependency() {
             &fun_name,
             vec![],
             Vec::<Vec<u8>>::new(),
-            &mut gas_status,
+            &mut UnmeteredGasMeter,
         )
         .unwrap();
     }
@@ -505,7 +495,7 @@ fn test_unverifiable_module_dependency() {
                 &fun_name,
                 vec![],
                 Vec::<Vec<u8>>::new(),
-                &mut gas_status,
+                &mut UnmeteredGasMeter,
             )
             .unwrap_err();
 
@@ -549,7 +539,6 @@ const LIST_OF_ERROR_CODES: &[StatusCode] = &[
 
 #[test]
 fn test_storage_returns_bogus_error_when_loading_module() {
-    let mut gas_status = GasStatus::new_unmetered();
     let module_id = ModuleId::new(TEST_ADDR, Identifier::new("N").unwrap());
     let fun_name = Identifier::new("bar").unwrap();
 
@@ -566,7 +555,7 @@ fn test_storage_returns_bogus_error_when_loading_module() {
                 &fun_name,
                 vec![],
                 Vec::<Vec<u8>>::new(),
-                &mut gas_status,
+                &mut UnmeteredGasMeter,
             )
             .unwrap_err();
 
@@ -576,8 +565,6 @@ fn test_storage_returns_bogus_error_when_loading_module() {
 
 #[test]
 fn test_storage_returns_bogus_error_when_loading_resource() {
-    let mut gas_status = GasStatus::new_unmetered();
-
     let code = r#"
         address std {
             module signer {
@@ -611,8 +598,8 @@ fn test_storage_returns_bogus_error_when_loading_resource() {
     m.serialize(&mut m_blob).unwrap();
     s.serialize(&mut s_blob).unwrap();
     let mut delta = ChangeSet::new();
-    delta.publish_module(m.self_id(), m_blob).unwrap();
-    delta.publish_module(s.self_id(), s_blob).unwrap();
+    delta.add_module_op(m.self_id(), Op::New(m_blob)).unwrap();
+    delta.add_module_op(s.self_id(), Op::New(s_blob)).unwrap();
 
     let m_id = m.self_id();
     let foo_name = Identifier::new("foo").unwrap();
@@ -626,6 +613,7 @@ fn test_storage_returns_bogus_error_when_loading_resource() {
 
         let vm = MoveVM::new(move_stdlib::natives::all_natives(
             AccountAddress::from_hex_literal("0x1").unwrap(),
+            move_stdlib::natives::GasParameters::zeros(),
         ))
         .unwrap();
         let mut sess = vm.new_session(&storage);
@@ -635,7 +623,7 @@ fn test_storage_returns_bogus_error_when_loading_resource() {
             &foo_name,
             vec![],
             Vec::<Vec<u8>>::new(),
-            &mut gas_status,
+            &mut UnmeteredGasMeter,
         )
         .unwrap();
 
@@ -645,7 +633,7 @@ fn test_storage_returns_bogus_error_when_loading_resource() {
                 &bar_name,
                 vec![],
                 serialize_values(&vec![MoveValue::Signer(TEST_ADDR)]),
-                &mut gas_status,
+                &mut UnmeteredGasMeter,
             )
             .unwrap_err();
 
diff --git a/language/move-vm/integration-tests/src/tests/binary_format_version.rs b/language/move-vm/integration-tests/src/tests/binary_format_version.rs
new file mode 100644
index 0000000000..bacba7ec27
--- /dev/null
+++ b/language/move-vm/integration-tests/src/tests/binary_format_version.rs
@@ -0,0 +1,139 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    file_format::{basic_test_module, basic_test_script},
+    file_format_common::VERSION_MAX,
+};
+use move_core_types::{account_address::AccountAddress, vm_status::StatusCode};
+use move_vm_runtime::{config::VMConfig, move_vm::MoveVM};
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
+
+#[test]
+fn test_publish_module_with_custom_max_binary_format_version() {
+    let m = basic_test_module();
+    let mut b_new = vec![];
+    let mut b_old = vec![];
+    m.serialize_for_version(Some(VERSION_MAX), &mut b_new)
+        .unwrap();
+    m.serialize_for_version(Some(VERSION_MAX.checked_sub(1).unwrap()), &mut b_old)
+        .unwrap();
+
+    // Should accept both modules with the default settings
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new(move_stdlib::natives::all_natives(
+            AccountAddress::from_hex_literal("0x1").unwrap(),
+            move_stdlib::natives::GasParameters::zeros(),
+        ))
+        .unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        sess.publish_module(
+            b_new.clone(),
+            *m.self_id().address(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+
+        sess.publish_module(
+            b_old.clone(),
+            *m.self_id().address(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+    }
+
+    // Should reject the module with newer version with max binary format version being set to VERSION_MAX - 1
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            VMConfig {
+                max_binary_format_version: VERSION_MAX.checked_sub(1).unwrap(),
+                ..Default::default()
+            },
+        )
+        .unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        assert_eq!(
+            sess.publish_module(
+                b_new.clone(),
+                *m.self_id().address(),
+                &mut UnmeteredGasMeter,
+            )
+            .unwrap_err()
+            .major_status(),
+            StatusCode::UNKNOWN_VERSION
+        );
+
+        sess.publish_module(
+            b_old.clone(),
+            *m.self_id().address(),
+            &mut UnmeteredGasMeter,
+        )
+        .unwrap();
+    }
+}
+
+#[test]
+fn test_run_script_with_custom_max_binary_format_version() {
+    let s = basic_test_script();
+    let mut b_new = vec![];
+    let mut b_old = vec![];
+    s.serialize_for_version(Some(VERSION_MAX), &mut b_new)
+        .unwrap();
+    s.serialize_for_version(Some(VERSION_MAX.checked_sub(1).unwrap()), &mut b_old)
+        .unwrap();
+
+    // Should accept both modules with the default settings
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new(move_stdlib::natives::all_natives(
+            AccountAddress::from_hex_literal("0x1").unwrap(),
+            move_stdlib::natives::GasParameters::zeros(),
+        ))
+        .unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        let args: Vec<Vec<u8>> = vec![];
+        sess.execute_script(b_new.clone(), vec![], args.clone(), &mut UnmeteredGasMeter)
+            .unwrap();
+
+        sess.execute_script(b_old.clone(), vec![], args, &mut UnmeteredGasMeter)
+            .unwrap();
+    }
+
+    // Should reject the module with newer version with max binary format version being set to VERSION_MAX - 1
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            VMConfig {
+                max_binary_format_version: VERSION_MAX.checked_sub(1).unwrap(),
+                ..Default::default()
+            },
+        )
+        .unwrap();
+        let mut sess = vm.new_session(&storage);
+
+        let args: Vec<Vec<u8>> = vec![];
+        assert_eq!(
+            sess.execute_script(b_new.clone(), vec![], args.clone(), &mut UnmeteredGasMeter)
+                .unwrap_err()
+                .major_status(),
+            StatusCode::CODE_DESERIALIZATION_ERROR
+        );
+
+        sess.execute_script(b_old.clone(), vec![], args, &mut UnmeteredGasMeter)
+            .unwrap();
+    }
+}
diff --git a/language/move-vm/integration-tests/src/tests/exec_func_effects_tests.rs b/language/move-vm/integration-tests/src/tests/exec_func_effects_tests.rs
index 205cc79f70..cfbeb95c27 100644
--- a/language/move-vm/integration-tests/src/tests/exec_func_effects_tests.rs
+++ b/language/move-vm/integration-tests/src/tests/exec_func_effects_tests.rs
@@ -9,15 +9,15 @@ use move_binary_format::errors::VMResult;
 use move_core_types::{
     account_address::AccountAddress,
     effects::{ChangeSet, Event},
-    gas_schedule::GasAlgebra,
     identifier::Identifier,
     language_storage::ModuleId,
+    u256::U256,
     value::{serialize_values, MoveValue},
     vm_status::StatusCode,
 };
 use move_vm_runtime::{move_vm::MoveVM, session::SerializedReturnValues};
 use move_vm_test_utils::InMemoryStorage;
-use move_vm_types::gas_schedule::GasStatus;
+use move_vm_types::gas::UnmeteredGasMeter;
 
 const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
 const TEST_MODULE_ID: &str = "M";
@@ -33,13 +33,15 @@ fn fail_arg_deserialize() {
     // all of these should fail to deserialize because the functions expect u64 args
     let values = vec![
         MoveValue::U8(16),
+        MoveValue::U16(1006),
+        MoveValue::U32(16000),
         MoveValue::U128(512),
+        MoveValue::U256(U256::from(12345u32)),
         MoveValue::Bool(true),
     ];
     for value in values {
         for name in FUN_NAMES {
             let err = run(&mod_code, name, value.clone())
-                .1
                 .map(|_| ())
                 .expect_err("Should have failed to deserialize non-u64 type to u64");
             assert_eq!(
@@ -54,7 +56,7 @@ fn fail_arg_deserialize() {
 #[test]
 fn mutref_output_success() {
     let mod_code = setup_module();
-    let (_gas_used, result) = run(&mod_code, USE_MUTREF_LABEL, MoveValue::U64(1));
+    let result = run(&mod_code, USE_MUTREF_LABEL, MoveValue::U64(1));
     let (_, _, ret_values) = result.unwrap();
     assert_eq!(1, ret_values.mutable_reference_outputs.len());
     let parsed = parse_u64_arg(&ret_values.mutable_reference_outputs.first().unwrap().1);
@@ -84,32 +86,26 @@ fn run(
     module: &ModuleCode,
     fun_name: &str,
     arg_val0: MoveValue,
-) -> (
-    /* gas used */ u64,
-    VMResult<(ChangeSet, Vec<Event>, SerializedReturnValues)>,
-) {
+) -> VMResult<(ChangeSet, Vec<Event>, SerializedReturnValues)> {
     let module_id = &module.0;
     let modules = vec![module.clone()];
     let (vm, storage) = setup_vm(&modules);
     let mut session = vm.new_session(&storage);
 
     let fun_name = Identifier::new(fun_name).unwrap();
-    let mut gas_status = GasStatus::new_unmetered();
-    let gas_start = gas_status.remaining_gas().get();
-    let res = session
+
+    session
         .execute_function_bypass_visibility(
             module_id,
             &fun_name,
             vec![],
             serialize_values(&vec![arg_val0]),
-            &mut gas_status,
+            &mut UnmeteredGasMeter,
         )
         .and_then(|ret_values| {
             let (change_set, events) = session.finish()?;
             Ok((change_set, events, ret_values))
-        });
-    let gas_used = gas_start - gas_status.remaining_gas().get();
-    (gas_used, res)
+        })
 }
 
 type ModuleCode = (ModuleId, String);
@@ -121,9 +117,9 @@ fn setup_vm(modules: &[ModuleCode]) -> (MoveVM, InMemoryStorage) {
     (MoveVM::new(vec![]).unwrap(), storage)
 }
 
-fn compile_modules(mut storage: &mut InMemoryStorage, modules: &[ModuleCode]) {
+fn compile_modules(storage: &mut InMemoryStorage, modules: &[ModuleCode]) {
     modules.iter().for_each(|(id, code)| {
-        compile_module(&mut storage, id, code);
+        compile_module(storage, id, code);
     });
 }
 
diff --git a/language/move-vm/integration-tests/src/tests/function_arg_tests.rs b/language/move-vm/integration-tests/src/tests/function_arg_tests.rs
index 52fbb910e5..375c470845 100644
--- a/language/move-vm/integration-tests/src/tests/function_arg_tests.rs
+++ b/language/move-vm/integration-tests/src/tests/function_arg_tests.rs
@@ -8,12 +8,13 @@ use move_core_types::{
     account_address::AccountAddress,
     identifier::Identifier,
     language_storage::{ModuleId, TypeTag},
+    u256::U256,
     value::{MoveStruct, MoveValue},
     vm_status::StatusCode,
 };
 use move_vm_runtime::move_vm::MoveVM;
 use move_vm_test_utils::InMemoryStorage;
-use move_vm_types::gas_schedule::GasStatus;
+use move_vm_types::gas::UnmeteredGasMeter;
 
 const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
 
@@ -60,14 +61,19 @@ fn run(
     let mut sess = vm.new_session(&storage);
 
     let fun_name = Identifier::new("foo").unwrap();
-    let mut gas_status = GasStatus::new_unmetered();
 
     let args: Vec<_> = args
         .into_iter()
         .map(|val| val.simple_serialize().unwrap())
         .collect();
 
-    sess.execute_function_bypass_visibility(&module_id, &fun_name, ty_args, args, &mut gas_status)?;
+    sess.execute_function_bypass_visibility(
+        &module_id,
+        &fun_name,
+        ty_args,
+        args,
+        &mut UnmeteredGasMeter,
+    )?;
 
     Ok(())
 }
@@ -207,6 +213,24 @@ fn expected_A_B__A_u64_vector_B_got_u8_u128__u8_u64_vector_u128() {
     )
 }
 
+#[test]
+#[allow(non_snake_case)]
+fn expected_A_B__A_u32_vector_B_got_u16_u256__u16_u32_vector_u256() {
+    expect_ok_generic(
+        &["A", "B"],
+        &["A", "u32", "vector<B>"],
+        vec![TypeTag::U16, TypeTag::U256],
+        vec![
+            MoveValue::U16(0),
+            MoveValue::U32(0),
+            MoveValue::Vector(vec![
+                MoveValue::U256(U256::from(0u8)),
+                MoveValue::U256(U256::from(0u8)),
+            ]),
+        ],
+    )
+}
+
 #[test]
 #[allow(non_snake_case)]
 fn expected_T__Bar_T_got_bool__Bar_bool() {
diff --git a/language/move-vm/integration-tests/src/tests/instantiation_tests.rs b/language/move-vm/integration-tests/src/tests/instantiation_tests.rs
new file mode 100644
index 0000000000..bddb54a0b6
--- /dev/null
+++ b/language/move-vm/integration-tests/src/tests/instantiation_tests.rs
@@ -0,0 +1,1279 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+#![allow(dead_code)]
+#![allow(unused_must_use)]
+#![allow(unused_imports)]
+
+use move_binary_format::{
+    errors::VMResult,
+    file_format::{
+        AbilitySet, AddressIdentifierIndex, Bytecode, Bytecode::*, CodeUnit, CompiledModule,
+        Constant, ConstantPoolIndex, FieldDefinition, FunctionDefinition, FunctionHandle,
+        FunctionHandleIndex, FunctionInstantiation, FunctionInstantiationIndex, IdentifierIndex,
+        ModuleHandle, ModuleHandleIndex, Signature, SignatureIndex, SignatureToken,
+        SignatureToken::*, StructDefInstantiation, StructDefInstantiationIndex, StructDefinition,
+        StructDefinitionIndex, StructFieldInformation, StructHandle, StructHandleIndex,
+        StructTypeParameter, TypeSignature,
+    },
+};
+use move_core_types::{
+    account_address::AccountAddress,
+    identifier::Identifier,
+    language_storage::{ModuleId, StructTag, TypeTag},
+    vm_status::StatusCode,
+};
+use move_vm_runtime::{
+    move_vm::MoveVM,
+    session::{SerializedReturnValues, Session},
+};
+use move_vm_test_utils::{
+    gas_schedule::{Gas, GasStatus, INITIAL_COST_SCHEDULE},
+    InMemoryStorage,
+};
+use std::time::Instant;
+
+const MODULE_NAME: &str = "Mod";
+const STRUCT_NAME: &str = "S";
+const FIELD_NAME: &str = "field";
+const ENTRY_POINT_NAME: &str = "entry_point";
+const RECURSIVE_NAME: &str = "recursive";
+const EMPTY_NAME: &str = "empty";
+
+fn main() {
+    main_run(10000);
+}
+
+// Get a `GasStatus` to be used when running code.
+// A `gas_val` of 0 returns an unmetered `GasStatus` which means code in this test will
+// run forever (we always and only generate infinite loops)
+fn get_gas_meter<'a>(gas_val: u64) -> GasStatus<'a> {
+    if gas_val == 0 {
+        GasStatus::new_unmetered()
+    } else {
+        GasStatus::new(&INITIAL_COST_SCHEDULE, Gas::new(gas_val))
+    }
+}
+
+// With proper gas_val units this function can be used to profile the VM.
+// All code generated is an infinite loop and with 0 unit we run forever which
+// can be used for profiling
+fn main_run(gas_val: u64) {
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), load_pop);
+    println!(
+        "* load_pop: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), vec_pack_instantiated);
+    println!(
+        "* vec_pack_instantiated: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), vec_pack_gen_simple);
+    println!(
+        "* vec_pack_gen_simple: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), vec_pack_gen_deep);
+    println!(
+        "* vec_pack_gen_deep: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), vec_pack_gen_deep_50);
+    println!(
+        "* vec_pack_gen_deep_50: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), vec_pack_gen_deep_500);
+    println!(
+        "* vec_pack_gen_deep_500: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), instantiated_gen_exists);
+    println!(
+        "* instantiated_gen_exists: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), simple_gen_exists);
+    println!(
+        "* simple_gen_exists: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), deep_gen_exists);
+    println!(
+        "* deep_gen_exists: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), deep_gen_exists_50);
+    println!(
+        "* deep_gen_exists_50: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), deep_gen_exists_500);
+    println!(
+        "* deep_gen_exists_500: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), instantiated_gen_call);
+    println!(
+        "* instantiated_gen_call: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), simple_gen_call);
+    println!(
+        "* simple_gen_call: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), deep_gen_call);
+    println!(
+        "* deep_gen_call: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), deep_gen_call_50);
+    println!(
+        "* deep_gen_call_50: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), deep_gen_call_500);
+    println!(
+        "* deep_gen_call_500: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), instantiated_rec_gen_call);
+    println!(
+        "* instantiated_rec_gen_call: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), simple_rec_gen_call);
+    println!(
+        "* simple_rec_gen_call: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+    let (res, time) = run_with_module(&mut get_gas_meter(gas_val), deep_rec_gen_call);
+    println!(
+        "* deep_rec_gen_call: {} - Status: {:?}",
+        time,
+        res.err().unwrap().major_status()
+    );
+}
+
+#[test]
+fn test_instantiation_no_instantiation() {
+    let (res, ref_time) = run_with_module(&mut get_gas_meter(1000), load_pop);
+    let err = res.err().unwrap().major_status();
+    println!("* load_pop: {} - Status: {:?}", ref_time, err);
+    assert_eq!(err, StatusCode::OUT_OF_GAS, "Must finish OutOfGas");
+}
+
+// Common runner for all tests.
+// Run a control test (load_pop) and an instantiation test which is then
+// compared against the control.
+// Ensure that tests complete with "out of gas" and withing a given time range.
+fn test_runner(
+    gas_val: u64,
+    test_name: &str,
+    entry_spec: fn(
+        AccountAddress,
+        &mut Session<InMemoryStorage>,
+    ) -> (ModuleId, Identifier, Vec<TypeTag>),
+    check_result: fn(u128, u128) -> bool,
+) {
+    assert!(gas_val > 0, "Must provide a positive gas budget");
+    let mut gas: GasStatus = get_gas_meter(gas_val);
+    let (res, ref_time) = run_with_module(&mut gas, load_pop);
+    assert_eq!(
+        res.err().unwrap().major_status(),
+        StatusCode::OUT_OF_GAS,
+        "Must finish OutOfGas"
+    );
+    let mut gas: GasStatus = get_gas_meter(gas_val);
+    let (res, time) = run_with_module(&mut gas, entry_spec);
+    let err = res.err().unwrap().major_status();
+    println!("* {}: {}ms - Status: {:?}", test_name, time, err);
+    // assert_eq!(err, StatusCode::OUT_OF_GAS, "Must finish OutOfGas");
+    assert!(
+        check_result(time, ref_time),
+        "Instantion test taking too long {}",
+        time
+    );
+}
+
+#[test]
+fn test_instantiation_vec_pack_instantiated() {
+    test_runner(
+        1000,
+        "vec_pack_instantiated",
+        vec_pack_instantiated,
+        |time, ref_time| time < ref_time * 10,
+    );
+}
+
+#[test]
+fn test_instantiation_vec_pack_gen_simple() {
+    test_runner(
+        1000,
+        "vec_pack_gen_simple",
+        vec_pack_gen_simple,
+        |time, ref_time| time < ref_time * 10,
+    );
+}
+
+#[test]
+fn test_instantiation_vec_pack_gen_deep() {
+    test_runner(
+        1000,
+        "vec_pack_gen_deep",
+        vec_pack_gen_deep,
+        |time, ref_time| time < ref_time * 1000,
+    );
+    test_runner(
+        1000,
+        "vec_pack_gen_deep_50",
+        vec_pack_gen_deep_50,
+        |time, ref_time| time < ref_time * 1000,
+    );
+    test_runner(
+        1000,
+        "vec_pack_gen_deep_500",
+        vec_pack_gen_deep_500,
+        |time, ref_time| time < ref_time * 1000,
+    );
+}
+
+#[test]
+fn test_instantiation_instantiated_gen_exists() {
+    test_runner(
+        1000,
+        "instantiated_gen_exists",
+        instantiated_gen_exists,
+        |time, ref_time| time < ref_time * 10,
+    );
+}
+
+#[test]
+fn test_instantiation_simple_gen_exists() {
+    test_runner(
+        1000,
+        "simple_gen_exists",
+        simple_gen_exists,
+        |time, ref_time| time < ref_time * 10,
+    );
+}
+
+#[test]
+fn test_instantiation_deep_gen_exists() {
+    test_runner(
+        1000,
+        "deep_gen_exists",
+        deep_gen_exists,
+        |time, ref_time| time < ref_time * 10,
+    );
+    test_runner(
+        1000,
+        "deep_gen_exists_50",
+        deep_gen_exists_50,
+        |time, ref_time| time < ref_time * 10,
+    );
+    test_runner(
+        1000,
+        "deep_gen_exists_500",
+        deep_gen_exists_500,
+        |time, ref_time| time < ref_time * 10,
+    );
+}
+
+#[test]
+fn test_instantiation_instantiated_gen_call() {
+    test_runner(
+        1000,
+        "instantiated_gen_call",
+        instantiated_gen_call,
+        |time, ref_time| time < ref_time * 10,
+    );
+}
+
+#[test]
+fn test_instantiation_simple_gen_call() {
+    test_runner(
+        1000,
+        "simple_gen_call",
+        simple_gen_call,
+        |time, ref_time| time < ref_time * 10,
+    );
+}
+
+#[test]
+fn test_instantiation_deep_gen_call() {
+    test_runner(1000, "deep_gen_call", deep_gen_call, |time, ref_time| {
+        time < ref_time * 100
+    });
+    test_runner(
+        1000,
+        "deep_gen_call_50",
+        deep_gen_call_50,
+        |time, ref_time| time < ref_time * 100,
+    );
+    test_runner(
+        1000,
+        "deep_gen_call_500",
+        deep_gen_call_500,
+        |time, ref_time| time < ref_time * 100,
+    );
+}
+
+#[test]
+fn test_instantiation_simple_rec_gen_call() {
+    test_runner(
+        1000,
+        "simple_rec_gen_call",
+        simple_rec_gen_call,
+        |time, ref_time| time < ref_time * 10,
+    );
+}
+
+#[test]
+fn test_instantiation_deep_rec_gen_call() {
+    test_runner(
+        1000,
+        "deep_rec_gen_call",
+        deep_rec_gen_call,
+        |time, ref_time| time < ref_time * 1000,
+    );
+}
+
+// Generate a verifiable module with a snippet of code that can be used to test instantiations.
+// The code is a block (so balanced stack) passed via `snippet` and it's repeated
+// `snippet_rep` times. It is then completed with a `Branch(0)` to form an infinite
+// loop. That can be used with no gas charge to profile the code executed (an executable),
+// or with some gas to determine how long it takes to go OutOfGas.
+// The code has to work on a `void(void)` function (so to speak) that has
+// a number of type parameters defined via `func_type_params_count`.
+// It can define a number of locals through `locals_sig`. The locals are added
+// after the "default" `Signature` provided (look at that for the indexes that can be used).
+// A struct is defined that uses `struct_type_params_count` to define the number of
+// type parameters.
+// A set of `Signature` can be provided for the code snippet to use besides the default
+// and the locals.
+// `struct_inst_signatures` and `func_inst_signatures` can be used to generate
+// `StructDefInstantiation` and `FunctionInstantiation` that can be used by related bytecodes.
+//
+// Notice: this is not a particularly easy function to use. See example below on how to use it.
+fn make_module(
+    session: &mut Session<InMemoryStorage>,
+    addr: AccountAddress,
+    func_type_params_count: usize,
+    locals_sig: Option<Signature>,
+    snippet: Vec<Bytecode>,
+    snippet_rep: usize,
+    mut code_inst_signatures: Vec<Signature>,
+    struct_type_params_count: usize,
+    mut struct_inst_signatures: Vec<Signature>,
+    func_handle_idxs: Vec<u16>,
+    mut func_inst_signatures: Vec<Signature>,
+) -> (ModuleId, Identifier) {
+    // default signatures
+    let mut signatures = vec![
+        Signature(vec![]),
+        Signature(vec![U64]),
+        Signature(vec![TypeParameter(0)]),
+    ];
+    let locals_idx = if let Some(sig) = locals_sig {
+        signatures.push(sig);
+        signatures.len() - 1
+    } else {
+        0
+    };
+    signatures.append(&mut code_inst_signatures);
+    let struct_inst_start = signatures.len();
+    signatures.append(&mut struct_inst_signatures);
+    let func_inst_start = signatures.len();
+    signatures.append(&mut func_inst_signatures);
+
+    let func_type_params = vec![AbilitySet::VECTOR; func_type_params_count];
+    let rec_func_type_params = if func_type_params_count == 0 {
+        vec![AbilitySet::VECTOR]
+    } else {
+        func_type_params.clone()
+    };
+    let struct_type_parameters = vec![
+        StructTypeParameter {
+            constraints: AbilitySet::EMPTY,
+            is_phantom: false,
+        };
+        struct_type_params_count
+    ];
+
+    // create the code for the single entry point
+    let mut code = vec![];
+    for _ in 0..snippet_rep {
+        code.append(&mut snippet.clone())
+    }
+    code.push(Branch(0));
+
+    // struct definition instantiations
+    let mut struct_def_instantiations = vec![];
+    for idx in struct_inst_start..func_inst_start {
+        struct_def_instantiations.push(StructDefInstantiation {
+            def: StructDefinitionIndex(0),
+            type_parameters: SignatureIndex(idx as u16),
+        });
+    }
+
+    // function instantiations
+    let entry_point = Identifier::new(ENTRY_POINT_NAME).unwrap();
+    let mut function_instantiations = vec![FunctionInstantiation {
+        handle: FunctionHandleIndex(1),
+        type_parameters: SignatureIndex(2),
+    }];
+    for idx in func_inst_start..signatures.len() {
+        function_instantiations.push(FunctionInstantiation {
+            handle: FunctionHandleIndex(func_handle_idxs[idx - func_inst_start]),
+            type_parameters: SignatureIndex(idx as u16),
+        });
+    }
+
+    let module = CompiledModule {
+        version: 6,
+        // Module definition
+        self_module_handle_idx: ModuleHandleIndex(0),
+        module_handles: vec![ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex(0),
+        }],
+        // struct definition
+        struct_handles: vec![StructHandle {
+            module: ModuleHandleIndex(0),
+            name: IdentifierIndex(1),
+            abilities: AbilitySet::ALL,
+            type_parameters: struct_type_parameters,
+        }],
+        struct_defs: vec![StructDefinition {
+            struct_handle: StructHandleIndex(0),
+            field_information: StructFieldInformation::Declared(vec![FieldDefinition {
+                name: IdentifierIndex(2),
+                signature: TypeSignature(U8),
+            }]),
+        }],
+        // function definition
+        function_handles: vec![
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(3),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: func_type_params,
+            },
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(4),
+                parameters: SignatureIndex(1),
+                return_: SignatureIndex(0),
+                type_parameters: rec_func_type_params,
+            },
+            FunctionHandle {
+                module: ModuleHandleIndex(0),
+                name: IdentifierIndex(5),
+                parameters: SignatureIndex(0),
+                return_: SignatureIndex(0),
+                type_parameters: vec![AbilitySet::VECTOR],
+            },
+        ],
+        function_defs: vec![
+            FunctionDefinition {
+                function: FunctionHandleIndex(0),
+                visibility: move_binary_format::file_format::Visibility::Public,
+                is_entry: true,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(locals_idx as u16),
+                    code,
+                }),
+            },
+            FunctionDefinition {
+                function: FunctionHandleIndex(1),
+                visibility: move_binary_format::file_format::Visibility::Public,
+                is_entry: false,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(locals_idx as u16),
+                    code: vec![
+                        CopyLoc(0),
+                        LdU64(1),
+                        Add,
+                        StLoc(0),
+                        CopyLoc(0),
+                        LdU64(10),
+                        Ge,
+                        BrTrue(10),
+                        CopyLoc(0),
+                        CallGeneric(FunctionInstantiationIndex(0)),
+                        Ret,
+                    ],
+                }),
+            },
+            FunctionDefinition {
+                function: FunctionHandleIndex(2),
+                visibility: move_binary_format::file_format::Visibility::Public,
+                is_entry: false,
+                acquires_global_resources: vec![],
+                code: Some(CodeUnit {
+                    locals: SignatureIndex(locals_idx as u16),
+                    code: vec![Ret],
+                }),
+            },
+        ],
+        // addresses
+        address_identifiers: vec![addr],
+        // identifiers
+        identifiers: vec![
+            // Module name
+            Identifier::new(MODULE_NAME).unwrap(),
+            // Struct name
+            Identifier::new(STRUCT_NAME).unwrap(),
+            // Field name
+            Identifier::new(FIELD_NAME).unwrap(),
+            // Entry point
+            entry_point.clone(),
+            // recursive fun name
+            Identifier::new(RECURSIVE_NAME).unwrap(),
+            // empty fun name
+            Identifier::new(EMPTY_NAME).unwrap(),
+        ],
+        // constants
+        constant_pool: vec![Constant {
+            type_: Address,
+            data: addr.to_vec(),
+        }],
+        // signatures
+        signatures,
+        // struct instantiations
+        struct_def_instantiations,
+        // function instantiations
+        function_instantiations,
+        // unused...
+        field_handles: vec![],
+        friend_decls: vec![],
+        field_instantiations: vec![],
+        metadata: vec![],
+    };
+    // uncomment to see the module generated
+    // println!("Module: {:#?}", module);
+    move_bytecode_verifier::verify_module(&module).expect("verification failed");
+
+    let mut mod_bytes = vec![];
+    module
+        .serialize(&mut mod_bytes)
+        .expect("Module must serialize");
+    session
+        .publish_module(mod_bytes, addr, &mut GasStatus::new_unmetered())
+        .expect("Module must publish");
+    (module.self_id(), entry_point)
+}
+
+// Generic function to run some code. Take the gas to use and a closure
+// that can return an entry point to call.
+// This function creates a VM, invokes the closure, and on return it builds the call
+// for the entry point.
+// Report time spent, if it terminates (no gas it will never end; use for profiling).
+fn run_with_module(
+    gas: &mut GasStatus,
+    entry_spec: fn(
+        AccountAddress,
+        &mut Session<InMemoryStorage>,
+    ) -> (ModuleId, Identifier, Vec<TypeTag>),
+) -> (VMResult<SerializedReturnValues>, u128) {
+    let addr = AccountAddress::from_hex_literal("0xcafe").unwrap();
+
+    //
+    // Start VM
+    let vm = MoveVM::new(vec![]).unwrap();
+    let storage: InMemoryStorage = InMemoryStorage::new();
+    let mut session = vm.new_session(&storage);
+
+    let (module_id, entry_name, type_args) = entry_spec(addr, &mut session);
+
+    let now = Instant::now();
+    let res = session.execute_entry_function(
+        &module_id,
+        entry_name.as_ref(),
+        type_args,
+        Vec::<Vec<u8>>::new(),
+        gas,
+    );
+
+    let time = now.elapsed().as_millis();
+    (res, time)
+}
+
+// Call a simple load u8 and pop loop
+fn load_pop(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    //
+    // Module definition and publishing
+    let func_type_params_count = 0;
+    let locals_sig = None;
+    let snippet = get_load_pop();
+    let snippet_rep = 1;
+    let code_inst_signatures = vec![];
+    let struct_type_params_count = 1;
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![0];
+    let func_inst_signatures = vec![];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![])
+}
+
+// Code for LdU8 and Pop
+fn get_load_pop() -> Vec<Bytecode> {
+    vec![LdU8(0), Pop]
+}
+
+// Call a vector<T> pack empty and pop with full instantiation
+fn vec_pack_instantiated(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    //
+    // Module definition and publishing
+    let func_type_params_count = 0;
+    let locals_sig = None;
+    let snippet = get_vec_pack(3);
+    let snippet_rep = 1;
+    let struct_type_params_count = 1;
+    let code_inst_signatures = vec![Signature(vec![U8])];
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![0];
+    let func_inst_signatures = vec![];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![])
+}
+
+// Call a vector<T> pack empty and pop with simple generic instantiation
+fn vec_pack_gen_simple(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    //
+    // Module definition and publishing
+    let func_type_params_count = 1;
+    let locals_sig = None;
+    let snippet = get_vec_pack(3);
+    let snippet_rep = 1;
+    let struct_type_params_count = 5;
+    let code_inst_signatures = vec![Signature(vec![Vector(Box::new(TypeParameter(0)))])];
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![0];
+    let func_inst_signatures = vec![];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![TypeTag::U128])
+}
+
+// Call a vector<T> pack empty and pop with deep generic instantiation
+fn vec_pack_gen_deep(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    vec_pack_gen_deep_it(addr, session, 1)
+}
+
+fn vec_pack_gen_deep_50(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    vec_pack_gen_deep_it(addr, session, 50)
+}
+
+fn vec_pack_gen_deep_500(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    vec_pack_gen_deep_it(addr, session, 500)
+}
+
+fn vec_pack_gen_deep_it(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+    snippet_rep: usize,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    const STRUCT_TY_PARAMS: usize = 3;
+    const STRUCT_TY_ARGS_DEPTH: usize = 2;
+    const FUNC_TY_ARGS_DEPTH: usize = 3;
+
+    let mut big_ty = SignatureToken::TypeParameter(0);
+    for _ in 0..STRUCT_TY_ARGS_DEPTH {
+        let mut ty_args = vec![];
+        for _ in 0..STRUCT_TY_PARAMS {
+            ty_args.push(big_ty.clone());
+        }
+        big_ty = StructInstantiation(StructHandleIndex(0), ty_args);
+    }
+
+    //
+    // Module definition and publishing
+    let func_type_params_count = 1;
+    let locals_sig = None;
+    let snippet = get_vec_pack(3);
+    let struct_type_params_count = STRUCT_TY_PARAMS;
+    let code_inst_signatures = vec![Signature(vec![big_ty])];
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![];
+    let func_inst_signatures = vec![];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    let mut ty_arg = TypeTag::U128;
+    for _ in 0..FUNC_TY_ARGS_DEPTH {
+        ty_arg = TypeTag::Struct(Box::new(StructTag {
+            address: addr,
+            module: Identifier::new(MODULE_NAME).unwrap(),
+            name: Identifier::new(STRUCT_NAME).unwrap(),
+            type_params: vec![ty_arg; STRUCT_TY_PARAMS],
+        }));
+    }
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![ty_arg])
+}
+
+// Code for all `VecPack` and `Pop` code
+fn get_vec_pack(idx: u16) -> Vec<Bytecode> {
+    vec![VecPack(SignatureIndex(idx), 0), Pop]
+}
+
+// Call `Exists` on an instantiated generic and pop
+fn instantiated_gen_exists(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    //
+    // Module definition and publishing
+    let func_type_params_count = 0;
+    let locals_sig = None;
+    let snippet = get_generic_exists();
+    let snippet_rep = 1;
+    let code_inst_signatures = vec![];
+    let struct_type_params_count = 1;
+    let struct_inst_signatures = vec![Signature(vec![Vector(Box::new(SignatureToken::U8))])];
+    let func_handle_idxs = vec![];
+    let func_inst_signatures = vec![];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![])
+}
+
+// Call `Exists` on a simple generic and pop
+fn simple_gen_exists(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    //
+    // Module definition and publishing
+    let func_type_params_count = 1;
+    let locals_sig = None;
+    let snippet = get_generic_exists();
+    let snippet_rep = 1;
+    let code_inst_signatures = vec![];
+    let struct_type_params_count = 1;
+    let struct_inst_signatures = vec![Signature(vec![StructInstantiation(
+        StructHandleIndex(0),
+        vec![U64],
+    )])];
+    let func_handle_idxs = vec![];
+    let func_inst_signatures = vec![];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![TypeTag::U128])
+}
+
+// Call `Exists` on a deep generic and pop
+fn deep_gen_exists(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    deep_gen_exists_it(addr, session, 1)
+}
+
+fn deep_gen_exists_50(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    deep_gen_exists_it(addr, session, 50)
+}
+
+fn deep_gen_exists_500(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    deep_gen_exists_it(addr, session, 500)
+}
+
+fn deep_gen_exists_it(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+    snippet_rep: usize,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    const STRUCT_TY_PARAMS: usize = 3;
+    const STRUCT_TY_ARGS_DEPTH: usize = 2;
+    const FUNC_TY_ARGS_DEPTH: usize = 3;
+
+    let mut big_ty = SignatureToken::TypeParameter(0);
+    for _ in 0..STRUCT_TY_ARGS_DEPTH {
+        let mut ty_args = vec![];
+        for _ in 0..STRUCT_TY_PARAMS {
+            ty_args.push(big_ty.clone());
+        }
+        big_ty = StructInstantiation(StructHandleIndex(0), ty_args);
+    }
+
+    //
+    // Module definition and publishing
+    let func_type_params_count = 1;
+    let locals_sig = None;
+    let snippet = get_generic_exists();
+    let code_inst_signatures = vec![];
+    let struct_type_params_count = STRUCT_TY_PARAMS;
+    let struct_inst_signatures = vec![Signature(vec![big_ty; STRUCT_TY_PARAMS])];
+    let func_handle_idxs = vec![];
+    let func_inst_signatures = vec![];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    let mut ty_arg = TypeTag::U128;
+    for _ in 0..FUNC_TY_ARGS_DEPTH {
+        ty_arg = TypeTag::Struct(Box::new(StructTag {
+            address: addr,
+            module: Identifier::new(MODULE_NAME).unwrap(),
+            name: Identifier::new(STRUCT_NAME).unwrap(),
+            type_params: vec![ty_arg; STRUCT_TY_PARAMS],
+        }));
+    }
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![ty_arg])
+}
+
+// Code for all `ExistsGeneric` and `Pop` test
+fn get_generic_exists() -> Vec<Bytecode> {
+    vec![
+        LdConst(ConstantPoolIndex(0)),
+        ExistsGeneric(StructDefInstantiationIndex(0)),
+        Pop,
+    ]
+}
+
+// Call an instantiated generic function
+fn instantiated_gen_call(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    //
+    // Module definition and publishing
+    let func_type_params_count = 0;
+    let locals_sig = None;
+    let snippet = get_generic_call_loop();
+    let snippet_rep = 1;
+    let code_inst_signatures = vec![];
+    let struct_type_params_count = 1;
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![2];
+    let func_inst_signatures = vec![Signature(vec![Vector(Box::new(U64))])];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![])
+}
+
+// Call simple generic function
+fn simple_gen_call(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    //
+    // Module definition and publishing
+    let func_type_params_count = 1;
+    let locals_sig = None;
+    let snippet = get_generic_call_loop();
+    let snippet_rep = 1;
+    let code_inst_signatures = vec![];
+    let struct_type_params_count = 1;
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![2];
+    let func_inst_signatures = vec![Signature(vec![Vector(Box::new(TypeParameter(0)))])];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![TypeTag::U128])
+}
+
+// Call deep instantiation generic function
+fn deep_gen_call(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    deep_gen_call_it(addr, session, 1)
+}
+
+fn deep_gen_call_50(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    deep_gen_call_it(addr, session, 50)
+}
+
+fn deep_gen_call_500(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    deep_gen_call_it(addr, session, 500)
+}
+
+fn deep_gen_call_it(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+    snippet_rep: usize,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    const STRUCT_TY_PARAMS: usize = 3;
+    const STRUCT_TY_ARGS_DEPTH: usize = 2;
+    const FUNC_TY_ARGS_DEPTH: usize = 3;
+
+    let mut big_ty = SignatureToken::TypeParameter(0);
+    for _ in 0..STRUCT_TY_ARGS_DEPTH {
+        let mut ty_args = vec![];
+        for _ in 0..STRUCT_TY_PARAMS {
+            ty_args.push(big_ty.clone());
+        }
+        big_ty = StructInstantiation(StructHandleIndex(0), ty_args);
+    }
+
+    //
+    // Module definition and publishing
+    let func_type_params_count = 1;
+    let locals_sig = None;
+    let snippet = get_generic_call_loop();
+    let code_inst_signatures = vec![];
+    let struct_type_params_count = STRUCT_TY_PARAMS;
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![2];
+    let func_inst_signatures = vec![Signature(vec![big_ty])];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    let mut ty_arg = TypeTag::U128;
+    for _ in 0..FUNC_TY_ARGS_DEPTH {
+        ty_arg = TypeTag::Struct(Box::new(StructTag {
+            address: addr,
+            module: Identifier::new(MODULE_NAME).unwrap(),
+            name: Identifier::new(STRUCT_NAME).unwrap(),
+            type_params: vec![ty_arg; STRUCT_TY_PARAMS],
+        }));
+    }
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![ty_arg])
+}
+
+// Code for all `CallGeneric` tests
+fn get_generic_call_loop() -> Vec<Bytecode> {
+    vec![CallGeneric(FunctionInstantiationIndex(1))]
+}
+
+// Call an instantiated generic function
+fn instantiated_rec_gen_call(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    //
+    // Module definition and publishing
+    let func_type_params_count = 0;
+    let locals_sig = None;
+    let snippet = get_generic_call();
+    let snippet_rep = 1;
+    let code_inst_signatures = vec![];
+    let struct_type_params_count = 1;
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![1];
+    let func_inst_signatures = vec![Signature(vec![Vector(Box::new(U64))])];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![])
+}
+
+// Call simple generic function
+fn simple_rec_gen_call(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    //
+    // Module definition and publishing
+    let func_type_params_count = 1;
+    let locals_sig = None;
+    let snippet = get_generic_call();
+    let snippet_rep = 1;
+    let code_inst_signatures = vec![];
+    let struct_type_params_count = 1;
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![1];
+    let func_inst_signatures = vec![Signature(vec![Vector(Box::new(TypeParameter(0)))])];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![TypeTag::U128])
+}
+
+// Call deep instantiation generic function
+fn deep_rec_gen_call(
+    addr: AccountAddress,
+    session: &mut Session<InMemoryStorage>,
+) -> (ModuleId, Identifier, Vec<TypeTag>) {
+    const STRUCT_TY_PARAMS: usize = 3;
+    const STRUCT_TY_ARGS_DEPTH: usize = 2;
+    const FUNC_TY_ARGS_DEPTH: usize = 3;
+
+    let mut big_ty = SignatureToken::TypeParameter(0);
+    for _ in 0..STRUCT_TY_ARGS_DEPTH {
+        let mut ty_args = vec![];
+        for _ in 0..STRUCT_TY_PARAMS {
+            ty_args.push(big_ty.clone());
+        }
+        big_ty = StructInstantiation(StructHandleIndex(0), ty_args);
+    }
+
+    //
+    // Module definition and publishing
+    let func_type_params_count = 1;
+    let locals_sig = None;
+    let snippet = get_generic_call();
+    let snippet_rep = 1;
+    let code_inst_signatures = vec![];
+    let struct_type_params_count = STRUCT_TY_PARAMS;
+    let struct_inst_signatures = vec![];
+    let func_handle_idxs = vec![1];
+    let func_inst_signatures = vec![Signature(vec![big_ty])];
+
+    let (self_id, entry_name) = make_module(
+        session,
+        addr,
+        func_type_params_count,
+        locals_sig,
+        snippet,
+        snippet_rep,
+        code_inst_signatures,
+        struct_type_params_count,
+        struct_inst_signatures,
+        func_handle_idxs,
+        func_inst_signatures,
+    );
+
+    let mut ty_arg = TypeTag::U128;
+    for _ in 0..FUNC_TY_ARGS_DEPTH {
+        ty_arg = TypeTag::Struct(Box::new(StructTag {
+            address: addr,
+            module: Identifier::new(MODULE_NAME).unwrap(),
+            name: Identifier::new(STRUCT_NAME).unwrap(),
+            type_params: vec![ty_arg; STRUCT_TY_PARAMS],
+        }));
+    }
+
+    //
+    // Entry specification
+    (self_id, entry_name, vec![ty_arg])
+}
+
+// Code for all `CallGeneric` tests
+fn get_generic_call() -> Vec<Bytecode> {
+    vec![LdU64(0), CallGeneric(FunctionInstantiationIndex(1))]
+}
diff --git a/language/move-vm/integration-tests/src/tests/invariant_violation_tests.rs b/language/move-vm/integration-tests/src/tests/invariant_violation_tests.rs
new file mode 100644
index 0000000000..b91f72ac47
--- /dev/null
+++ b/language/move-vm/integration-tests/src/tests/invariant_violation_tests.rs
@@ -0,0 +1,93 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::{
+    Bytecode::*, CodeUnit, CompiledScript, Constant, ConstantPoolIndex, Signature, SignatureIndex,
+    SignatureToken::*,
+};
+use move_core_types::vm_status::StatusCode;
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::{gas_schedule::GasStatus, InMemoryStorage};
+
+#[test]
+fn merge_borrow_states_infinite_loop() {
+    let cs = CompiledScript {
+        version: 6,
+        module_handles: vec![],
+        struct_handles: vec![],
+        function_handles: vec![],
+        function_instantiations: vec![],
+        signatures: vec![
+            Signature(vec![]),
+            Signature(vec![
+                U64,
+                Vector(Box::new(U8)),
+                U64,
+                Vector(Box::new(U8)),
+                MutableReference(Box::new(Vector(Box::new(U8)))),
+                MutableReference(Box::new(U64)),
+            ]),
+        ],
+        identifiers: vec![],
+        address_identifiers: vec![],
+        constant_pool: vec![Constant {
+            type_: Vector(Box::new(U8)),
+            data: vec![0],
+        }],
+        metadata: vec![],
+        // The bytecode verifier should reject this code but it doesn't.
+        code: CodeUnit {
+            locals: SignatureIndex(1),
+            code: vec![
+                LdU64(0),
+                StLoc(0), // { 0 => 0 }
+                LdConst(ConstantPoolIndex(0)),
+                StLoc(1), // { 0 => 0, 1 => [] }
+                LdU64(0),
+                StLoc(2), // { 0 => 0, 1 => [], 2 => 0 }
+                MutBorrowLoc(2),
+                StLoc(5), // { 0 => 0, 1 => [], 2 => 0, 5 => &2 }
+                LdU64(1),
+                CopyLoc(5),
+                WriteRef, // { 0 => 0, 1 => [], 2 => 1, 5 => &2 }
+                LdConst(ConstantPoolIndex(0)),
+                StLoc(3), // { 0 => 0, 1 => [], 2 => 1, 3 => [], 5 => &2 }
+                MutBorrowLoc(3),
+                StLoc(4), // { 0 => 0, 1 => [], 2 => 1, 3 => [], 4 => &3, 5 => &2 }
+                LdConst(ConstantPoolIndex(0)),
+                CopyLoc(4),
+                WriteRef,
+                CopyLoc(5),
+                ReadRef,
+                LdU64(1),
+                Eq,
+                BrTrue(11),
+                Ret,
+            ],
+        },
+        type_parameters: vec![],
+        parameters: SignatureIndex(0),
+    };
+
+    move_bytecode_verifier::verify_script(&cs).expect("verify failed");
+    let vm = MoveVM::new(vec![]).unwrap();
+
+    let storage: InMemoryStorage = InMemoryStorage::new();
+    let mut session = vm.new_session(&storage);
+    let mut script_bytes = vec![];
+    cs.serialize(&mut script_bytes).unwrap();
+
+    let err = session
+        .execute_script(
+            script_bytes.as_slice(),
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut GasStatus::new_unmetered(),
+        )
+        .unwrap_err();
+
+    assert_eq!(
+        err.major_status(),
+        StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR
+    );
+}
diff --git a/language/move-vm/integration-tests/src/tests/leak_tests.rs b/language/move-vm/integration-tests/src/tests/leak_tests.rs
new file mode 100644
index 0000000000..83bd56d789
--- /dev/null
+++ b/language/move-vm/integration-tests/src/tests/leak_tests.rs
@@ -0,0 +1,65 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format::{
+    Bytecode::*, CodeUnit, CompiledScript, Signature, SignatureIndex, SignatureToken::*,
+};
+use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::{gas_schedule::GasStatus, InMemoryStorage};
+
+#[test]
+fn leak_with_abort() {
+    let mut locals = vec![U128, MutableReference(Box::new(U128))];
+    // Make locals bigger so each leak is bigger
+    // 128 is limit for aptos
+    for _ in 0..100 {
+        locals.push(U128);
+    }
+    let cs = CompiledScript {
+        version: 6,
+        module_handles: vec![],
+        struct_handles: vec![],
+        function_handles: vec![],
+        function_instantiations: vec![],
+        signatures: vec![Signature(vec![]), Signature(locals)],
+        identifiers: vec![],
+        address_identifiers: vec![],
+        constant_pool: vec![],
+        metadata: vec![],
+        code: CodeUnit {
+            locals: SignatureIndex(1),
+            code: vec![
+                // leak
+                LdU128(0),
+                StLoc(0),
+                MutBorrowLoc(0),
+                StLoc(1),
+                // abort
+                LdU64(0),
+                Abort,
+            ],
+        },
+        type_parameters: vec![],
+        parameters: SignatureIndex(0),
+    };
+
+    move_bytecode_verifier::verify_script(&cs).expect("verify failed");
+    let vm = MoveVM::new(vec![]).unwrap();
+
+    let storage: InMemoryStorage = InMemoryStorage::new();
+    let mut session = vm.new_session(&storage);
+    let mut script_bytes = vec![];
+    cs.serialize(&mut script_bytes).unwrap();
+
+    for _ in 0..100_000 {
+        let _ = session.execute_script(
+            script_bytes.as_slice(),
+            vec![],
+            Vec::<Vec<u8>>::new(),
+            &mut GasStatus::new_unmetered(),
+        );
+    }
+
+    let mem_stats = memory_stats::memory_stats().unwrap();
+    assert!(mem_stats.physical_mem < 200000000);
+}
diff --git a/language/move-vm/integration-tests/src/tests/loader_tests.rs b/language/move-vm/integration-tests/src/tests/loader_tests.rs
index 9b5b0a7ab6..a61b0a550e 100644
--- a/language/move-vm/integration-tests/src/tests/loader_tests.rs
+++ b/language/move-vm/integration-tests/src/tests/loader_tests.rs
@@ -3,19 +3,25 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::compiler::compile_modules_in_file;
-use move_binary_format::CompiledModule;
+use move_binary_format::{
+    file_format::{
+        empty_module, AddressIdentifierIndex, IdentifierIndex, ModuleHandle, TableIndex,
+    },
+    CompiledModule,
+};
+use move_bytecode_verifier::VerifierConfig;
 use move_core_types::{
     account_address::AccountAddress,
     identifier::{IdentStr, Identifier},
     language_storage::ModuleId,
 };
-use move_vm_runtime::move_vm::MoveVM;
+use move_vm_runtime::{config::VMConfig, move_vm::MoveVM};
 use move_vm_test_utils::InMemoryStorage;
-use move_vm_types::gas_schedule::GasStatus;
+use move_vm_types::gas::UnmeteredGasMeter;
+
 use std::{path::PathBuf, sync::Arc, thread};
 
-const WORKING_ACCOUNT: AccountAddress =
-    AccountAddress::new([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2]);
+const WORKING_ACCOUNT: AccountAddress = AccountAddress::TWO;
 
 struct Adapter {
     store: InMemoryStorage,
@@ -47,23 +53,45 @@ impl Adapter {
                 Identifier::new("just_c").unwrap(),
             ),
         ];
+        let config = VMConfig {
+            verifier: VerifierConfig {
+                max_dependency_depth: Some(100),
+                ..Default::default()
+            },
+            ..Default::default()
+        };
         Self {
             store,
-            vm: Arc::new(MoveVM::new(vec![]).unwrap()),
+            vm: Arc::new(MoveVM::new_with_config(vec![], config).unwrap()),
             functions,
         }
     }
 
+    fn fresh(self) -> Self {
+        let config = VMConfig {
+            verifier: VerifierConfig {
+                max_dependency_depth: Some(100),
+                ..Default::default()
+            },
+            ..Default::default()
+        };
+        Self {
+            store: self.store,
+            vm: Arc::new(MoveVM::new_with_config(vec![], config).unwrap()),
+            functions: self.functions,
+        }
+    }
+
     fn publish_modules(&mut self, modules: Vec<CompiledModule>) {
         let mut session = self.vm.new_session(&self.store);
-        let mut gas_status = GasStatus::new_unmetered();
+
         for module in modules {
             let mut binary = vec![];
             module
                 .serialize(&mut binary)
                 .unwrap_or_else(|_| panic!("failure in module serialization: {:#?}", module));
             session
-                .publish_module(binary, WORKING_ACCOUNT, &mut gas_status)
+                .publish_module(binary, WORKING_ACCOUNT, &mut UnmeteredGasMeter)
                 .unwrap_or_else(|_| panic!("failure publishing module: {:#?}", module));
         }
         let (changeset, _) = session.finish().expect("failure getting write set");
@@ -72,6 +100,20 @@ impl Adapter {
             .expect("failure applying write set");
     }
 
+    fn publish_modules_with_error(&mut self, modules: Vec<CompiledModule>) {
+        let mut session = self.vm.new_session(&self.store);
+
+        for module in modules {
+            let mut binary = vec![];
+            module
+                .serialize(&mut binary)
+                .unwrap_or_else(|_| panic!("failure in module serialization: {:#?}", module));
+            session
+                .publish_module(binary, WORKING_ACCOUNT, &mut UnmeteredGasMeter)
+                .expect_err("publishing must fail");
+        }
+    }
+
     fn call_functions(&self) {
         for (module_id, name) in &self.functions {
             self.call_function(module_id, name);
@@ -85,7 +127,6 @@ impl Adapter {
                 let vm = self.vm.clone();
                 let data_store = self.store.clone();
                 children.push(thread::spawn(move || {
-                    let mut gas_status = GasStatus::new_unmetered();
                     let mut session = vm.new_session(&data_store);
                     session
                         .execute_function_bypass_visibility(
@@ -93,7 +134,7 @@ impl Adapter {
                             &name,
                             vec![],
                             Vec::<Vec<u8>>::new(),
-                            &mut gas_status,
+                            &mut UnmeteredGasMeter,
                         )
                         .unwrap_or_else(|_| {
                             panic!("Failure executing {:?}::{:?}", module_id, name)
@@ -107,7 +148,6 @@ impl Adapter {
     }
 
     fn call_function(&self, module: &ModuleId, name: &IdentStr) {
-        let mut gas_status = GasStatus::new_unmetered();
         let mut session = self.vm.new_session(&self.store);
         session
             .execute_function_bypass_visibility(
@@ -115,7 +155,7 @@ impl Adapter {
                 name,
                 vec![],
                 Vec::<Vec<u8>>::new(),
-                &mut gas_status,
+                &mut UnmeteredGasMeter,
             )
             .unwrap_or_else(|_| panic!("Failure executing {:?}::{:?}", module, name));
     }
@@ -156,3 +196,337 @@ fn load_concurrent_many() {
     // makes 150 threads
     adapter.call_functions_async(30);
 }
+
+#[test]
+fn deep_dependency_list_err_0() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 350u64;
+    dependency_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules_with_error(vec![module]);
+}
+
+#[test]
+fn deep_dependency_list_err_1() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 101u64;
+    dependency_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules_with_error(vec![module]);
+}
+
+#[test]
+fn deep_dependency_list_ok_0() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 100u64;
+    dependency_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules(vec![module]);
+}
+
+#[test]
+fn deep_dependency_list_ok_1() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 30u64;
+    dependency_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules(vec![module]);
+}
+
+#[test]
+fn deep_dependency_tree_err_0() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a tree of dependencies
+    let width = 5u64;
+    let height = 101u64;
+    dependency_tree(width, height, &mut modules);
+    adapter.publish_modules(modules);
+
+    // use one of the module in the tree
+    let mut adapter = adapter.fresh();
+    let name = "ASome".to_string();
+    let dep_name = format!("A_{}_{}", height - 1, width - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules_with_error(vec![module]);
+}
+
+#[test]
+fn deep_dependency_tree_err_1() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a tree of dependencies
+    let width = 3u64;
+    let height = 350u64;
+    dependency_tree(width, height, &mut modules);
+    adapter.publish_modules(modules);
+
+    // use one of the module in the tree
+    let mut adapter = adapter.fresh();
+    let name = "ASome".to_string();
+    let dep_name = format!("A_{}_{}", height - 1, width - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules_with_error(vec![module]);
+}
+
+#[test]
+fn deep_dependency_tree_ok_0() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a tree of dependencies
+    let width = 10u64;
+    let height = 20u64;
+    dependency_tree(width, height, &mut modules);
+    adapter.publish_modules(modules);
+
+    // use one of the module in the tree
+    let mut adapter = adapter.fresh();
+    let name = "ASome".to_string();
+    let dep_name = format!("A_{}_{}", height - 1, width - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules(vec![module]);
+}
+
+#[test]
+fn deep_dependency_tree_ok_1() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a tree of dependencies
+    let width = 3u64;
+    let height = 100u64;
+    dependency_tree(width, height, &mut modules);
+    adapter.publish_modules(modules);
+
+    // use one of the module in the tree
+    let mut adapter = adapter.fresh();
+    let name = "ASome".to_string();
+    let dep_name = format!("A_{}_{}", height - 1, width - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_dependencies(name, deps);
+    adapter.publish_modules(vec![module]);
+}
+
+#[test]
+fn deep_friend_list_err_0() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 1000u64;
+    friend_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_friends(name, deps);
+    adapter.publish_modules_with_error(vec![module]);
+}
+
+#[test]
+fn deep_friend_list_err_1() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 101u64;
+    friend_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_friends(name, deps);
+    adapter.publish_modules_with_error(vec![module]);
+}
+
+#[test]
+fn deep_friend_list_ok_0() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 100u64;
+    friend_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_friends(name, deps);
+    adapter.publish_modules(vec![module]);
+}
+
+#[test]
+fn deep_friend_list_ok_1() {
+    let data_store = InMemoryStorage::new();
+    let mut adapter = Adapter::new(data_store);
+
+    let mut modules = vec![];
+
+    // create a chain of dependencies
+    let max = 30u64;
+    friend_chain(1, max, &mut modules);
+    adapter.publish_modules(modules);
+
+    let mut adapter = adapter.fresh();
+    let name = format!("A{}", max);
+    let dep_name = format!("A{}", max - 1);
+    let deps = vec![dep_name];
+    let module = empty_module_with_friends(name, deps);
+    adapter.publish_modules(vec![module]);
+}
+
+fn leaf_module(name: &str) -> CompiledModule {
+    let mut module = empty_module();
+    module.identifiers[0] = Identifier::new(name).unwrap();
+    module.address_identifiers[0] = WORKING_ACCOUNT;
+    module
+}
+
+// Create a list of dependent modules
+fn dependency_chain(start: u64, end: u64, modules: &mut Vec<CompiledModule>) {
+    let module = leaf_module("A0");
+    modules.push(module);
+
+    for i in start..end {
+        let name = format!("A{}", i);
+        let dep_name = format!("A{}", i - 1);
+        let deps = vec![dep_name];
+        let module = empty_module_with_dependencies(name, deps);
+        modules.push(module);
+    }
+}
+
+// Create a tree (well a forest or DAG really) of dependent modules
+fn dependency_tree(width: u64, height: u64, modules: &mut Vec<CompiledModule>) {
+    let mut deps = vec![];
+    for i in 0..width {
+        let name = format!("A_{}_{}", 0, i);
+        let module = leaf_module(name.as_str());
+        deps.push(name);
+        modules.push(module);
+    }
+    for i in 1..height {
+        let mut new_deps = vec![];
+        for j in 0..width {
+            let name = format!("A_{}_{}", i, j);
+            let module = empty_module_with_dependencies(name.clone(), deps.clone());
+            new_deps.push(name);
+            modules.push(module);
+        }
+        deps = new_deps;
+    }
+}
+
+// Create a module that uses (depends on) the list of given modules
+fn empty_module_with_dependencies(name: String, deps: Vec<String>) -> CompiledModule {
+    let mut module = empty_module();
+    module.address_identifiers[0] = WORKING_ACCOUNT;
+    module.identifiers[0] = Identifier::new(name).unwrap();
+    for dep in deps {
+        module.identifiers.push(Identifier::new(dep).unwrap());
+        module.module_handles.push(ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex((module.identifiers.len() - 1) as TableIndex),
+        });
+    }
+    module
+}
+
+// Create a list of friends modules
+fn friend_chain(start: u64, end: u64, modules: &mut Vec<CompiledModule>) {
+    let module = leaf_module("A0");
+    modules.push(module);
+
+    for i in start..end {
+        let name = format!("A{}", i);
+        let dep_name = format!("A{}", i - 1);
+        let deps = vec![dep_name];
+        let module = empty_module_with_friends(name, deps);
+        modules.push(module);
+    }
+}
+
+// Create a module that uses (friends on) the list of given modules
+fn empty_module_with_friends(name: String, deps: Vec<String>) -> CompiledModule {
+    let mut module = empty_module();
+    module.address_identifiers[0] = WORKING_ACCOUNT;
+    module.identifiers[0] = Identifier::new(name).unwrap();
+    for dep in deps {
+        module.identifiers.push(Identifier::new(dep).unwrap());
+        module.friend_decls.push(ModuleHandle {
+            address: AddressIdentifierIndex(0),
+            name: IdentifierIndex((module.identifiers.len() - 1) as TableIndex),
+        });
+    }
+    module
+}
diff --git a/language/move-vm/integration-tests/src/tests/loader_tests_modules.move b/language/move-vm/integration-tests/src/tests/loader_tests_modules.move
index c6753a04d9..dcdc5a4764 100644
--- a/language/move-vm/integration-tests/src/tests/loader_tests_modules.move
+++ b/language/move-vm/integration-tests/src/tests/loader_tests_modules.move
@@ -141,4 +141,33 @@ address 0x2 {
             0x2::A::entry_a();
         }
     }
+
+    module G {
+        struct S has copy, drop {
+            f1: u64,
+            f2: u128,
+            f3: u16,
+            f4: u32,
+            f5: u256
+        }
+
+        public fun new(v1: u64, v2: u128, v3: u16, v4: u32, v5: u256): S { S { f1: v1, f2: v2, f3: v3, f4: v4, f5: v5 } }
+
+        public fun destroy(v: S): (u64, u128, u16, u32, u256) {
+            let S { f1: val1, f2: val2, f3: val3, f4: val4, f5: val5 } = v;
+            (val1, val2, val3, val4, val5)
+        }
+
+        public fun b_and_c(b: &S, c: 0x2::C::S): S {
+            let _ = 0x2::C::destroy(c);
+            let another_b = S {
+                f1: 0,
+                f2: b.f2,
+                f3: b.f3 + (b.f2 as u16),
+                f4: (b.f1 as u32),
+                f5: b.f5
+            };
+            another_b
+        }
+    }
 }
diff --git a/language/move-vm/integration-tests/src/tests/mod.rs b/language/move-vm/integration-tests/src/tests/mod.rs
index 596ebe0b7c..cac687f9d2 100644
--- a/language/move-vm/integration-tests/src/tests/mod.rs
+++ b/language/move-vm/integration-tests/src/tests/mod.rs
@@ -4,8 +4,13 @@
 
 mod bad_entry_point_tests;
 mod bad_storage_tests;
+mod binary_format_version;
 mod exec_func_effects_tests;
 mod function_arg_tests;
+mod instantiation_tests;
+mod invariant_violation_tests;
+mod leak_tests;
 mod loader_tests;
 mod mutated_accounts_tests;
+mod nested_loop_tests;
 mod return_value_tests;
diff --git a/language/move-vm/integration-tests/src/tests/mutated_accounts_tests.rs b/language/move-vm/integration-tests/src/tests/mutated_accounts_tests.rs
index 661b7cab08..ad9d9188d6 100644
--- a/language/move-vm/integration-tests/src/tests/mutated_accounts_tests.rs
+++ b/language/move-vm/integration-tests/src/tests/mutated_accounts_tests.rs
@@ -11,7 +11,7 @@ use move_core_types::{
 };
 use move_vm_runtime::move_vm::MoveVM;
 use move_vm_test_utils::InMemoryStorage;
-use move_vm_types::gas_schedule::GasStatus;
+use move_vm_types::gas::UnmeteredGasMeter;
 
 const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
 
@@ -46,8 +46,6 @@ fn mutated_accounts() {
     let vm = MoveVM::new(vec![]).unwrap();
     let mut sess = vm.new_session(&storage);
 
-    let mut gas_status = GasStatus::new_unmetered();
-
     let publish = Identifier::new("publish").unwrap();
     let flip = Identifier::new("flip").unwrap();
     let get = Identifier::new("get").unwrap();
@@ -59,7 +57,7 @@ fn mutated_accounts() {
         &publish,
         vec![],
         serialize_values(&vec![MoveValue::Signer(account1)]),
-        &mut gas_status,
+        &mut UnmeteredGasMeter,
     )
     .unwrap();
 
@@ -73,7 +71,7 @@ fn mutated_accounts() {
         &get,
         vec![],
         serialize_values(&vec![MoveValue::Address(account1)]),
-        &mut gas_status,
+        &mut UnmeteredGasMeter,
     )
     .unwrap();
 
@@ -84,7 +82,7 @@ fn mutated_accounts() {
         &flip,
         vec![],
         serialize_values(&vec![MoveValue::Address(account1)]),
-        &mut gas_status,
+        &mut UnmeteredGasMeter,
     )
     .unwrap();
     assert_eq!(sess.num_mutated_accounts(&TEST_ADDR), 2);
@@ -98,7 +96,7 @@ fn mutated_accounts() {
         &get,
         vec![],
         serialize_values(&vec![MoveValue::Address(account1)]),
-        &mut gas_status,
+        &mut UnmeteredGasMeter,
     )
     .unwrap();
 
diff --git a/language/move-vm/integration-tests/src/tests/nested_loop_tests.rs b/language/move-vm/integration-tests/src/tests/nested_loop_tests.rs
new file mode 100644
index 0000000000..60f0d3a557
--- /dev/null
+++ b/language/move-vm/integration-tests/src/tests/nested_loop_tests.rs
@@ -0,0 +1,157 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::compiler::{as_module, as_script, compile_units};
+use move_bytecode_verifier::VerifierConfig;
+use move_core_types::account_address::AccountAddress;
+use move_vm_runtime::{config::VMConfig, move_vm::MoveVM};
+use move_vm_test_utils::InMemoryStorage;
+use move_vm_types::gas::UnmeteredGasMeter;
+
+const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
+
+#[test]
+fn test_publish_module_with_nested_loops() {
+    // Compile the modules and scripts.
+    // TODO: find a better way to include the Signer module.
+    let code = r#"
+        module {{ADDR}}::M {
+            fun foo() {
+                let i = 0;
+                while (i < 10) {
+                    let j = 0;
+                    while (j < 10) {
+                        j = j + 1;
+                    };
+                    i = i + 1;
+                };
+            }
+        }
+    "#;
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+    let mut units = compile_units(&code).unwrap();
+
+    let m = as_module(units.pop().unwrap());
+    let mut m_blob = vec![];
+    m.serialize(&mut m_blob).unwrap();
+
+    // Should succeed with max_loop_depth = 2
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            VMConfig {
+                verifier: VerifierConfig {
+                    max_loop_depth: Some(2),
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+        )
+        .unwrap();
+
+        let mut sess = vm.new_session(&storage);
+        sess.publish_module(m_blob.clone(), TEST_ADDR, &mut UnmeteredGasMeter)
+            .unwrap();
+    }
+
+    // Should fail with max_loop_depth = 1
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            VMConfig {
+                verifier: VerifierConfig {
+                    max_loop_depth: Some(1),
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+        )
+        .unwrap();
+
+        let mut sess = vm.new_session(&storage);
+        sess.publish_module(m_blob, TEST_ADDR, &mut UnmeteredGasMeter)
+            .unwrap_err();
+    }
+}
+
+#[test]
+fn test_run_script_with_nested_loops() {
+    // Compile the modules and scripts.
+    // TODO: find a better way to include the Signer module.
+    let code = r#"
+        script {
+            fun main() {
+                let i = 0;
+                while (i < 10) {
+                    let j = 0;
+                    while (j < 10) {
+                        j = j + 1;
+                    };
+                    i = i + 1;
+                };
+            }
+        }
+    "#;
+    let code = code.replace("{{ADDR}}", &format!("0x{}", TEST_ADDR));
+    let mut units = compile_units(&code).unwrap();
+
+    let s = as_script(units.pop().unwrap());
+    let mut s_blob: Vec<u8> = vec![];
+    s.serialize(&mut s_blob).unwrap();
+
+    // Should succeed with max_loop_depth = 2
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            VMConfig {
+                verifier: VerifierConfig {
+                    max_loop_depth: Some(2),
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+        )
+        .unwrap();
+
+        let mut sess = vm.new_session(&storage);
+        let args: Vec<Vec<u8>> = vec![];
+        sess.execute_script(s_blob.clone(), vec![], args, &mut UnmeteredGasMeter)
+            .unwrap();
+    }
+
+    // Should fail with max_loop_depth = 1
+    {
+        let storage = InMemoryStorage::new();
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            VMConfig {
+                verifier: VerifierConfig {
+                    max_loop_depth: Some(1),
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+        )
+        .unwrap();
+
+        let mut sess = vm.new_session(&storage);
+        let args: Vec<Vec<u8>> = vec![];
+        sess.execute_script(s_blob, vec![], args, &mut UnmeteredGasMeter)
+            .unwrap_err();
+    }
+}
diff --git a/language/move-vm/integration-tests/src/tests/return_value_tests.rs b/language/move-vm/integration-tests/src/tests/return_value_tests.rs
index 230541c48a..841054cb8d 100644
--- a/language/move-vm/integration-tests/src/tests/return_value_tests.rs
+++ b/language/move-vm/integration-tests/src/tests/return_value_tests.rs
@@ -12,7 +12,7 @@ use move_core_types::{
 };
 use move_vm_runtime::{move_vm::MoveVM, session::SerializedReturnValues};
 use move_vm_test_utils::InMemoryStorage;
-use move_vm_types::gas_schedule::GasStatus;
+use move_vm_types::gas::UnmeteredGasMeter;
 
 const TEST_ADDR: AccountAddress = AccountAddress::new([42; AccountAddress::LENGTH]);
 
@@ -51,7 +51,6 @@ fn run(
     let mut sess = vm.new_session(&storage);
 
     let fun_name = Identifier::new("foo").unwrap();
-    let mut gas_status = GasStatus::new_unmetered();
 
     let args: Vec<_> = args
         .into_iter()
@@ -66,7 +65,7 @@ fn run(
         &fun_name,
         ty_args,
         args,
-        &mut gas_status,
+        &mut UnmeteredGasMeter,
     )?;
 
     Ok(return_values
diff --git a/language/move-vm/paranoid-tests/Cargo.toml b/language/move-vm/paranoid-tests/Cargo.toml
new file mode 100644
index 0000000000..44f318e69a
--- /dev/null
+++ b/language/move-vm/paranoid-tests/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "move-vm-paranoid-tests"
+version = "0.1.0"
+authors = ["Diem Association <opensource@diem.com>"]
+publish = false
+edition = "2021"
+license = "Apache-2.0"
+
+[dev-dependencies]
+fail = { version = "0.4.0", features = ['failpoints'] }
+datatest-stable = "0.1.1"
+move-transactional-test-runner = { path = "../../testing-infra/transactional-test-runner", features = ['failpoints'] }
+
+[[test]]
+name = "tests"
+harness = false
diff --git a/language/tools/move-cli/src/base/commands/mod.rs b/language/move-vm/paranoid-tests/src/lib.rs
similarity index 63%
rename from language/tools/move-cli/src/base/commands/mod.rs
rename to language/move-vm/paranoid-tests/src/lib.rs
index 76a2f34147..0cd3c22c1b 100644
--- a/language/tools/move-cli/src/base/commands/mod.rs
+++ b/language/move-vm/paranoid-tests/src/lib.rs
@@ -2,8 +2,6 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-pub mod check;
-pub mod compile;
+#![forbid(unsafe_code)]
 
-pub use check::*;
-pub use compile::*;
+// Empty src/lib.rs to get rusty-tags working.
diff --git a/language/move-vm/paranoid-tests/tests/ability/copy/copy_loc.exp b/language/move-vm/paranoid-tests/tests/ability/copy/copy_loc.exp
new file mode 100644
index 0000000000..c16d1fd661
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/copy/copy_loc.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 27-33:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/copy/copy_loc.mvir b/language/move-vm/paranoid-tests/tests/ability/copy/copy_loc.mvir
new file mode 100644
index 0000000000..f2a7cde745
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/copy/copy_loc.mvir
@@ -0,0 +1,33 @@
+//# publish
+module 0x2.A {
+  struct C has store { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+        let v: A.C;
+        let v2: A.C;
+
+    label b0:
+        v = A.make();
+        v2 = copy(v);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/copy/copy_loc_2.exp b/language/move-vm/paranoid-tests/tests/ability/copy/copy_loc_2.exp
new file mode 100644
index 0000000000..fc5a4436b2
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/copy/copy_loc_2.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/language/move-vm/paranoid-tests/tests/ability/copy/copy_loc_2.mvir b/language/move-vm/paranoid-tests/tests/ability/copy/copy_loc_2.mvir
new file mode 100644
index 0000000000..a1548d00ad
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/copy/copy_loc_2.mvir
@@ -0,0 +1,33 @@
+//# publish
+module 0x2.A {
+  struct C has copy, drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+        let v: A.C;
+        let v2: A.C;
+
+    label b0:
+        v = A.make();
+        v2 = copy(v);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/copy/read_ref.exp b/language/move-vm/paranoid-tests/tests/ability/copy/read_ref.exp
new file mode 100644
index 0000000000..d9bd4b7fc2
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/copy/read_ref.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 29-35:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/copy/read_ref.mvir b/language/move-vm/paranoid-tests/tests/ability/copy/read_ref.mvir
new file mode 100644
index 0000000000..7f819a88e9
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/copy/read_ref.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x2.A {
+  struct C has store { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public test_copy() {
+        let v: A.C;
+        let v_ref: &A.C;
+        let v2: A.C;
+
+    label b0:
+        v = A.make();
+        v_ref = &v;
+        v2 = *move(v_ref);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.test_copy();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/copy/read_ref_2.exp b/language/move-vm/paranoid-tests/tests/ability/copy/read_ref_2.exp
new file mode 100644
index 0000000000..fc5a4436b2
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/copy/read_ref_2.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/language/move-vm/paranoid-tests/tests/ability/copy/read_ref_2.mvir b/language/move-vm/paranoid-tests/tests/ability/copy/read_ref_2.mvir
new file mode 100644
index 0000000000..1efd1fbb9b
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/copy/read_ref_2.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x2.A {
+  struct C has copy, drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public test_copy() {
+        let v: A.C;
+        let v_ref: &A.C;
+        let v2: A.C;
+
+    label b0:
+        v = A.make();
+        v_ref = &v;
+        v2 = *move(v_ref);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.test_copy();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/eq.exp b/language/move-vm/paranoid-tests/tests/ability/drop/eq.exp
new file mode 100644
index 0000000000..76fb2e3322
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/eq.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 29-35:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/eq.mvir b/language/move-vm/paranoid-tests/tests/ability/drop/eq.mvir
new file mode 100644
index 0000000000..4d8c4949fb
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/eq.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop_eq() {
+        let v: A.C;
+        let v2: A.C;
+        let b: bool;
+
+    label b0:
+        v = A.make();
+        v2 = A.make();
+        b = move(v) == move(v2);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop_eq();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/eq_2.exp b/language/move-vm/paranoid-tests/tests/ability/drop/eq_2.exp
new file mode 100644
index 0000000000..fc5a4436b2
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/eq_2.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/eq_2.mvir b/language/move-vm/paranoid-tests/tests/ability/drop/eq_2.mvir
new file mode 100644
index 0000000000..d1d515469d
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/eq_2.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop_eq() {
+        let v: A.C;
+        let v2: A.C;
+        let b: bool;
+
+    label b0:
+        v = A.make();
+        v2 = A.make();
+        b = move(v) == move(v2);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop_eq();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/eq_3.exp b/language/move-vm/paranoid-tests/tests/ability/drop/eq_3.exp
new file mode 100644
index 0000000000..bd9b0572d3
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/eq_3.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 17-27:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/eq_3.mvir b/language/move-vm/paranoid-tests/tests/ability/drop/eq_3.mvir
new file mode 100644
index 0000000000..0142099fa6
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/eq_3.mvir
@@ -0,0 +1,27 @@
+//# publish
+module 0x2.B {
+  struct C has drop { x: u64 }
+  struct D has drop { x: u64 }
+
+  public make_c(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x: 0 };
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+    let c: B.C;
+    let d: B.D;
+label b0:
+    c = B.make_c();
+    d = B.make_d();
+    _ = move(c) == move(d);
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/hot_potato.exp b/language/move-vm/paranoid-tests/tests/ability/drop/hot_potato.exp
new file mode 100644
index 0000000000..27eb21b11d
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/hot_potato.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 24-30:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/hot_potato.mvir b/language/move-vm/paranoid-tests/tests/ability/drop/hot_potato.mvir
new file mode 100644
index 0000000000..b53f76325f
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/hot_potato.mvir
@@ -0,0 +1,30 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+        let v: A.C;
+
+    label b0:
+        v = A.make();
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/hot_potato_2.exp b/language/move-vm/paranoid-tests/tests/ability/drop/hot_potato_2.exp
new file mode 100644
index 0000000000..fc5a4436b2
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/hot_potato_2.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/hot_potato_2.mvir b/language/move-vm/paranoid-tests/tests/ability/drop/hot_potato_2.mvir
new file mode 100644
index 0000000000..b1324c3554
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/hot_potato_2.mvir
@@ -0,0 +1,30 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+        let v: A.C;
+
+    label b0:
+        v = A.make();
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/neq.exp b/language/move-vm/paranoid-tests/tests/ability/drop/neq.exp
new file mode 100644
index 0000000000..76fb2e3322
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/neq.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 29-35:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/neq.mvir b/language/move-vm/paranoid-tests/tests/ability/drop/neq.mvir
new file mode 100644
index 0000000000..d6a1335e24
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/neq.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop_eq() {
+        let v: A.C;
+        let v2: A.C;
+        let b: bool;
+
+    label b0:
+        v = A.make();
+        v2 = A.make();
+        b = move(v) != move(v2);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop_eq();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/neq_2.exp b/language/move-vm/paranoid-tests/tests/ability/drop/neq_2.exp
new file mode 100644
index 0000000000..fc5a4436b2
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/neq_2.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/neq_2.mvir b/language/move-vm/paranoid-tests/tests/ability/drop/neq_2.mvir
new file mode 100644
index 0000000000..98825cf845
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/neq_2.mvir
@@ -0,0 +1,35 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop_eq() {
+        let v: A.C;
+        let v2: A.C;
+        let b: bool;
+
+    label b0:
+        v = A.make();
+        v2 = A.make();
+        b = move(v) != move(v2);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop_eq();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/pop.exp b/language/move-vm/paranoid-tests/tests/ability/drop/pop.exp
new file mode 100644
index 0000000000..3a254de5bc
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/pop.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 23-29:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/pop.mvir b/language/move-vm/paranoid-tests/tests/ability/drop/pop.mvir
new file mode 100644
index 0000000000..b81d2c2aec
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/pop.mvir
@@ -0,0 +1,29 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+    label b0:
+        _ = A.make();
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/pop_2.exp b/language/move-vm/paranoid-tests/tests/ability/drop/pop_2.exp
new file mode 100644
index 0000000000..fc5a4436b2
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/pop_2.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/pop_2.mvir b/language/move-vm/paranoid-tests/tests/ability/drop/pop_2.mvir
new file mode 100644
index 0000000000..b6ce3705ae
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/pop_2.mvir
@@ -0,0 +1,29 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+    label b0:
+        _ = A.make();
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/ret_vector.exp b/language/move-vm/paranoid-tests/tests/ability/drop/ret_vector.exp
new file mode 100644
index 0000000000..eb10b139a4
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/ret_vector.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 29-39:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/ret_vector.mvir b/language/move-vm/paranoid-tests/tests/ability/drop/ret_vector.mvir
new file mode 100644
index 0000000000..380d3edbcc
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/ret_vector.mvir
@@ -0,0 +1,39 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+  struct D { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x: 0};
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: vector<A.C>;
+    let a: A.C;
+
+label b0:
+    a = A.make();
+    v = vec_pack_1<A.C>(move(a));
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: vector<A.D>;
+    let a: A.D;
+
+label b0:
+    a = A.make_d();
+    v = vec_pack_1<A.D>(move(a));
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/store.exp b/language/move-vm/paranoid-tests/tests/ability/drop/store.exp
new file mode 100644
index 0000000000..dd8e2e182d
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/store.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 26-32:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/store.mvir b/language/move-vm/paranoid-tests/tests/ability/drop/store.mvir
new file mode 100644
index 0000000000..6c577c7992
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/store.mvir
@@ -0,0 +1,32 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+        let v: A.C;
+
+    label b0:
+        v = A.make();
+        v = A.make();
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/store_2.exp b/language/move-vm/paranoid-tests/tests/ability/drop/store_2.exp
new file mode 100644
index 0000000000..fc5a4436b2
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/store_2.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/store_2.mvir b/language/move-vm/paranoid-tests/tests/ability/drop/store_2.mvir
new file mode 100644
index 0000000000..c498ff8d7f
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/store_2.mvir
@@ -0,0 +1,32 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+        let v: A.C;
+
+    label b0:
+        v = A.make();
+        v = A.make();
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/write_ref.exp b/language/move-vm/paranoid-tests/tests/ability/drop/write_ref.exp
new file mode 100644
index 0000000000..e2a43afd62
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/write_ref.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 30-36:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/write_ref.mvir b/language/move-vm/paranoid-tests/tests/ability/drop/write_ref.mvir
new file mode 100644
index 0000000000..65620d8f74
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/write_ref.mvir
@@ -0,0 +1,36 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+        let v: A.C;
+        let v2: A.C;
+        let v_ref: &mut A.C;
+
+    label b0:
+        v = A.make();
+        v2 = A.make();
+        v_ref = &mut v;
+        *move(v_ref) = move(v2);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/write_ref_2.exp b/language/move-vm/paranoid-tests/tests/ability/drop/write_ref_2.exp
new file mode 100644
index 0000000000..fc5a4436b2
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/write_ref_2.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/language/move-vm/paranoid-tests/tests/ability/drop/write_ref_2.mvir b/language/move-vm/paranoid-tests/tests/ability/drop/write_ref_2.mvir
new file mode 100644
index 0000000000..20b213e8ae
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/drop/write_ref_2.mvir
@@ -0,0 +1,36 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    public drop() {
+        let v: A.C;
+        let v2: A.C;
+        let v_ref: &mut A.C;
+
+    label b0:
+        v = A.make();
+        v2 = A.make();
+        v_ref = &mut v;
+        *move(v_ref) = move(v2);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/store/hot_potato_store.exp b/language/move-vm/paranoid-tests/tests/ability/store/hot_potato_store.exp
new file mode 100644
index 0000000000..5d92c423f3
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/store/hot_potato_store.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/language/move-vm/paranoid-tests/tests/ability/store/hot_potato_store.mvir b/language/move-vm/paranoid-tests/tests/ability/store/hot_potato_store.mvir
new file mode 100644
index 0000000000..6199c52554
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/store/hot_potato_store.mvir
@@ -0,0 +1,27 @@
+//# publish
+module 0x2.A {
+    struct HotPotato has store {}
+    struct X has store { h: Self.HotPotato }
+    struct G has key { x: Self.X }
+
+    public make_g(): Self.G {
+    label b0:
+        return G { x: X { h: HotPotato {} }};
+    }
+
+    public store(account: &signer, g: Self.G) {
+    label b0:
+        move_to<G>(move(account), move(g));
+        return;
+    }
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.G;
+label b0:
+    a = A.make_g();
+    A.store(&account, move(a));
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/store/invalid_store.exp b/language/move-vm/paranoid-tests/tests/ability/store/invalid_store.exp
new file mode 100644
index 0000000000..eaa960b979
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/store/invalid_store.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 28-34:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/store/invalid_store.mvir b/language/move-vm/paranoid-tests/tests/ability/store/invalid_store.mvir
new file mode 100644
index 0000000000..c6436132b0
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/store/invalid_store.mvir
@@ -0,0 +1,34 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    struct C has key { x: A.C }
+
+    public store(s: &signer) {
+        let v: A.C;
+
+    label b0:
+        v = A.make();
+        move_to<C>(move(s), C { x: move(v) });
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.store(&account);
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/ability/store/invalid_store_2.exp b/language/move-vm/paranoid-tests/tests/ability/store/invalid_store_2.exp
new file mode 100644
index 0000000000..fc5a4436b2
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/store/invalid_store_2.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/language/move-vm/paranoid-tests/tests/ability/store/invalid_store_2.mvir b/language/move-vm/paranoid-tests/tests/ability/store/invalid_store_2.mvir
new file mode 100644
index 0000000000..464c8ce1d5
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/ability/store/invalid_store_2.mvir
@@ -0,0 +1,34 @@
+//# publish
+module 0x2.A {
+  struct C has store { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    struct C has key { x: A.C }
+
+    public store(s: &signer) {
+        let v: A.C;
+
+    label b0:
+        v = A.make();
+        move_to<C>(move(s), C { x: move(v) });
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.store(&account);
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field.exp b/language/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field.exp
new file mode 100644
index 0000000000..cf37d02f66
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 31-37:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field.mvir b/language/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field.mvir
new file mode 100644
index 0000000000..2ef0a1bc75
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field.mvir
@@ -0,0 +1,37 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+    struct C { x: u64 }
+
+    public mut_field() {
+        let v: A.C;
+        let v_ref: &A.C;
+        let x: &mut u64;
+
+    label b0:
+        v = A.make();
+        v_ref = &v;
+        x = &mut move(v_ref).C::x;
+        *move(x) = 10;
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.mut_field();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_2.exp b/language/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_2.exp
new file mode 100644
index 0000000000..5d92c423f3
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_2.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_2.mvir b/language/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_2.mvir
new file mode 100644
index 0000000000..52efe94b95
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_2.mvir
@@ -0,0 +1,43 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public mutate(c: &mut Self.C) {
+    let c_ref: &mut u64;
+  label b0:
+    c_ref = &mut move(c).C::x;
+    *move(c_ref) = 10;
+    return;
+  }
+
+  public value(c: &Self.C): u64 {
+    let c_ref: &u64;
+  label b0:
+    c_ref = &move(c).C::x;
+    return *move(c_ref);
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let c: A.C;
+    let c_ref_mut: &mut A.C;
+    let c_ref: &A.C;
+    let v: u64;
+
+label b0:
+    c = A.make();
+    c_ref_mut = &mut c;
+    A.mutate(move(c_ref_mut));
+    c_ref = &c;
+    v = A.value(move(c_ref));
+    assert(move(v) == 10, 1);
+
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_generic.exp b/language/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_generic.exp
new file mode 100644
index 0000000000..d83377a79a
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_generic.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 31-37:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_generic.mvir b/language/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_generic.mvir
new file mode 100644
index 0000000000..525fbc7cae
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/borrow_field_generic.mvir
@@ -0,0 +1,37 @@
+//# publish
+module 0x2.A {
+  struct C<T> { x: T }
+
+  public make<T>(x: T): Self.C<T> {
+  label b0:
+    return C<T> { x: move(x) };
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+    struct C { x: u64 }
+
+    public mut_field() {
+        let v: A.C<u64>;
+        let v_ref: &mut A.C<u64>;
+        let x: &mut u64;
+
+    label b0:
+        v = A.make<u64>(20u64);
+        v_ref = &mut v;
+        x = &mut move(v_ref).C::x;
+        *move(x) = 10;
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.mut_field();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/cross_function_call.exp b/language/move-vm/paranoid-tests/tests/encapsulation_safety/cross_function_call.exp
new file mode 100644
index 0000000000..2355ce3a2e
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/cross_function_call.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 24-31:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/cross_function_call.mvir b/language/move-vm/paranoid-tests/tests/encapsulation_safety/cross_function_call.mvir
new file mode 100644
index 0000000000..28c6d2a136
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/cross_function_call.mvir
@@ -0,0 +1,31 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+
+  make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x3.B {
+    import 0x2.A;
+
+    public make(): A.C {
+        let v: A.C;
+    label b0:
+        v = A.make();
+
+        return move(v);
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x3.B;
+import 0x2.A;
+main(account: signer) {
+label b0:
+    _ = B.make();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/cross_native_function_call.exp b/language/move-vm/paranoid-tests/tests/encapsulation_safety/cross_native_function_call.exp
new file mode 100644
index 0000000000..dc82e72d6e
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/cross_native_function_call.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 13-19:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [],
+}
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/cross_native_function_call.mvir b/language/move-vm/paranoid-tests/tests/encapsulation_safety/cross_native_function_call.mvir
new file mode 100644
index 0000000000..81af2b9cd3
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/cross_native_function_call.mvir
@@ -0,0 +1,19 @@
+//# publish
+module 0x2.A {
+  import 0x1.string;
+  public test() {
+    let b: vector<u8>;
+  label b0:
+    b = vec_pack_0<u8>();
+    _ = string.internal_check_utf8(&b);
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.test();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/move_to.exp b/language/move-vm/paranoid-tests/tests/encapsulation_safety/move_to.exp
new file mode 100644
index 0000000000..0e3a5396c8
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/move_to.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 26-32:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/move_to.mvir b/language/move-vm/paranoid-tests/tests/encapsulation_safety/move_to.mvir
new file mode 100644
index 0000000000..f6c90dcb21
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/move_to.mvir
@@ -0,0 +1,32 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+    struct C { x: u64 }
+
+    public store(account: &signer) {
+        let v: A.C;
+    label b0:
+        v = A.make();
+        move_to<C>(move(account), move(v));
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.store(&account);
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/move_to_generic.exp b/language/move-vm/paranoid-tests/tests/encapsulation_safety/move_to_generic.exp
new file mode 100644
index 0000000000..d9c77ee3c3
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/move_to_generic.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 26-32:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/move_to_generic.mvir b/language/move-vm/paranoid-tests/tests/encapsulation_safety/move_to_generic.mvir
new file mode 100644
index 0000000000..c90e4b92a9
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/move_to_generic.mvir
@@ -0,0 +1,32 @@
+//# publish
+module 0x2.A {
+  struct C<T> { x: T }
+
+  public make<T>(x: T): Self.C<T> {
+  label b0:
+    return C<T> { x: move(x) };
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+    struct C<T> { x: T }
+
+    public store(account: &signer) {
+        let v: A.C<u64>;
+    label b0:
+        v = A.make<u64>(10);
+        move_to<C<u64>>(move(account), move(v));
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.store(&account);
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/unpack.exp b/language/move-vm/paranoid-tests/tests/encapsulation_safety/unpack.exp
new file mode 100644
index 0000000000..c6379127bd
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/unpack.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 2 'run'. lines 36-42:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/unpack.mvir b/language/move-vm/paranoid-tests/tests/encapsulation_safety/unpack.mvir
new file mode 100644
index 0000000000..6237cc903c
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/unpack.mvir
@@ -0,0 +1,52 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public unpack(c: Self.C) {
+    let x: u64;
+  label b0:
+    C { x } = move(c);
+    return;
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    struct C { x: u64 }
+
+    public drop() {
+        let v: A.C;
+        let x: u64;
+
+    label b0:
+        v = A.make();
+        C { x } = move(v);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.drop();
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.C;
+label b0:
+    a = A.make();
+    A.unpack(move(a));
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic.exp b/language/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic.exp
new file mode 100644
index 0000000000..eaa960b979
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 28-34:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic.mvir b/language/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic.mvir
new file mode 100644
index 0000000000..0f843b239e
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic.mvir
@@ -0,0 +1,34 @@
+//# publish
+module 0x2.A {
+  struct C<T> { x: T }
+
+  public make<T>(x: T): Self.C<T> {
+  label b0:
+    return C<T> { x: move(x) };
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+    struct C { x: u64 }
+
+    public unpack() {
+        let v: A.C<u64>;
+        let x: u64;
+
+    label b0:
+        v = A.make<u64>(20u64);
+        C { x } = move(v);
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.unpack();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic_2.exp b/language/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic_2.exp
new file mode 100644
index 0000000000..5d92c423f3
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic_2.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/language/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic_2.mvir b/language/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic_2.mvir
new file mode 100644
index 0000000000..b6a8ed36e6
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/encapsulation_safety/unpack_generic_2.mvir
@@ -0,0 +1,26 @@
+//# publish
+module 0x2.A {
+  struct C<T> { x: T }
+
+  public make<T>(x: T): Self.C<T> {
+  label b0:
+    return C<T> { x: move(x) };
+  }
+
+  public unpack<T>(c: Self.C<T>) {
+    let x: T;
+  label b0:
+    C<T> { x } = move(c);
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let c: A.C<u64>;
+label b0:
+    c = A.make<u64>(10);
+    A.unpack<u64>(move(c));
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/tests.rs b/language/move-vm/paranoid-tests/tests/tests.rs
new file mode 100644
index 0000000000..c5cf1eb095
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/tests.rs
@@ -0,0 +1,21 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+pub const TEST_DIR: &str = "tests";
+use fail::FailScenario;
+use move_transactional_test_runner::vm_test_harness::run_test;
+use std::path::Path;
+
+fn run_test_(path: &Path) -> Result<(), Box<dyn std::error::Error>> {
+    let scenario = FailScenario::setup();
+    fail::cfg("verifier-failpoint-1", "100%return").unwrap();
+    fail::cfg("verifier-failpoint-2", "100%return").unwrap();
+    fail::cfg("verifier-failpoint-3", "100%return").unwrap();
+    fail::cfg("verifier-failpoint-4", "100%return").unwrap();
+    run_test(path)?;
+    scenario.teardown();
+    Ok(())
+}
+
+datatest_stable::harness!(run_test_, TEST_DIR, r".*\.(mvir|move)$");
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_generic_mismatch.exp b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_generic_mismatch.exp
new file mode 100644
index 0000000000..32d10958cb
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_generic_mismatch.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 19-28:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_generic_mismatch.mvir b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_generic_mismatch.mvir
new file mode 100644
index 0000000000..5a89699b93
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_generic_mismatch.mvir
@@ -0,0 +1,28 @@
+//# publish
+module 0x2.A {
+  struct C<T> has drop { x: T, y: u64 }
+
+  struct D has drop { x: u64 }
+
+  public make<T>(x: T): Self.C<T> {
+  label b0:
+    return C<T> { x: move(x), y: 0 };
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x : 0 };
+  }
+}
+
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let c: A.C<A.D>;
+    let d: A.D;
+label b0:
+    d = A.make_d();
+    c = A.make<A.D>(10u64);
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_mismatch.exp b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_mismatch.exp
new file mode 100644
index 0000000000..60b9c2af74
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_mismatch.exp
@@ -0,0 +1,28 @@
+processed 5 tasks
+
+task 1 'run'. lines 19-28:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 3 'run'. lines 41-50:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 4 'run'. lines 52-61:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_mismatch.mvir b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_mismatch.mvir
new file mode 100644
index 0000000000..8548f36830
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_mismatch.mvir
@@ -0,0 +1,61 @@
+//# publish
+module 0x2.A {
+  struct A has key { b: Self.B }
+  struct B has store { x: u64 }
+  struct C has store { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public store(x: Self.B, s: &signer) {
+  label b0:
+    move_to<A>(move(s), A { b: move(x)});
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: A.C;
+
+label b0:
+    v = A.make();
+    A.store(move(v), &account);
+    return;
+}
+
+//# run --signers 0x1
+import 0x2.A;
+main(account: signer) {
+    let v: A.C;
+
+label b0:
+    v = A.make();
+    A.store(move(v), &account);
+    return;
+}
+
+//# run --signers 0x2 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: u64;
+
+label b0:
+    v = 0;
+    A.store(move(v), &account);
+    return;
+}
+
+//# run --signers 0x2
+import 0x2.A;
+main(account: signer) {
+    let v: u64;
+
+label b0:
+    v = 0;
+    A.store(move(v), &account);
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_mutliple_args.exp b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_mutliple_args.exp
new file mode 100644
index 0000000000..d7cac06c3a
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_mutliple_args.exp
@@ -0,0 +1,28 @@
+processed 6 tasks
+
+task 2 'run'. lines 30-36:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 3 'run'. lines 38-44:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 5 'run'. lines 56-64:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_mutliple_args.mvir b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_mutliple_args.mvir
new file mode 100644
index 0000000000..1e7e09db2d
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_mutliple_args.mvir
@@ -0,0 +1,64 @@
+//# publish
+module 0x2.A {
+  struct A has drop { v: u64 }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { v: 10 };
+  }
+
+  public call(a: u64, b: bool, c: u8) {
+  label b0:
+    return;
+  }
+
+  public call_a(a: Self.A, b: bool, c: u8) {
+  label b0:
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.call(10, true, 8u8);
+    return;
+}
+
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.call(true, true, 8u8);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.call(10, true, true);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.call_a(move(a), true, 8u8);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.call_a(8, true, move(a));
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_reference.exp b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_reference.exp
new file mode 100644
index 0000000000..3d3d18a2ed
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_reference.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 1 'run'. lines 19-28:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_reference.mvir b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_reference.mvir
new file mode 100644
index 0000000000..9b53923e64
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_reference.mvir
@@ -0,0 +1,39 @@
+//# publish
+module 0x2.A {
+  struct A has key { x: u64 }
+  struct B has store { x: u64 }
+  struct C has store { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public store(x: &Self.B, s: &signer) {
+  label b0:
+    move_to<A>(move(s), A { x: 0 });
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: A.C;
+
+label b0:
+    v = A.make();
+    A.store(&v, &account);
+    return;
+}
+
+//# run --signers 0x1
+import 0x2.A;
+main(account: signer) {
+    let v: A.C;
+
+label b0:
+    v = A.make();
+    A.store(&v, &account);
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_vector.exp b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_vector.exp
new file mode 100644
index 0000000000..d13ec65a9e
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_vector.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 36-48:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_vector.mvir b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_vector.mvir
new file mode 100644
index 0000000000..44639e1fb1
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/invocation/call_with_vector.mvir
@@ -0,0 +1,48 @@
+//# publish
+module 0x2.A {
+  struct B has drop { x: u64 }
+  struct C has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public make_b(): Self.B {
+  label b0:
+    return B { x: 0};
+  }
+
+  public run(x: &vector<Self.C>) {
+  label b0:
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: vector<A.C>;
+    let a: A.C;
+
+label b0:
+    a = A.make();
+    v = vec_pack_1<A.C>(move(a));
+
+    A.run(&v);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: vector<A.C>;
+    let a: A.B;
+
+label b0:
+    a = A.make_b();
+    v = vec_pack_1<A.C>(move(a));
+
+    A.run(&v);
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/natives/bcs.exp b/language/move-vm/paranoid-tests/tests/type_safety/natives/bcs.exp
new file mode 100644
index 0000000000..b7c83b348a
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/natives/bcs.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 30-41:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x1::bcs,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 0)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/natives/bcs.mvir b/language/move-vm/paranoid-tests/tests/type_safety/natives/bcs.mvir
new file mode 100644
index 0000000000..7fc26783e6
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/natives/bcs.mvir
@@ -0,0 +1,41 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: u64 }
+  struct B has drop { x: u64 }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { x : 0 };
+  }
+
+  public make_b(): Self.B {
+  label b0:
+    return B { x : 0 };
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x1.bcs;
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+
+label b0:
+    a = A.make_a();
+    _ = bcs.to_bytes<A.A>(&a);
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x1.bcs;
+import 0x2.A;
+main(account: signer) {
+    let a: A.B;
+
+label b0:
+    a = A.make_b();
+    _ = bcs.to_bytes<A.A>(&a);
+
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/natives/signer.exp b/language/move-vm/paranoid-tests/tests/type_safety/natives/signer.exp
new file mode 100644
index 0000000000..125f1f52c7
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/natives/signer.exp
@@ -0,0 +1,10 @@
+processed 1 task
+
+task 0 'run'. lines 1-8:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/natives/signer.mvir b/language/move-vm/paranoid-tests/tests/type_safety/natives/signer.mvir
new file mode 100644
index 0000000000..7d249a6010
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/natives/signer.mvir
@@ -0,0 +1,8 @@
+//# run --signers 0x1  --check-runtime-types
+import 0x1.signer;
+main(account: signer) {
+    let u: &address;
+label b0:
+    u = signer.address_of(&account);
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/natives/type_info.exp b/language/move-vm/paranoid-tests/tests/type_safety/natives/type_info.exp
new file mode 100644
index 0000000000..5d92c423f3
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/natives/type_info.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/natives/type_info.mvir b/language/move-vm/paranoid-tests/tests/type_safety/natives/type_info.mvir
new file mode 100644
index 0000000000..05be2e5caf
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/natives/type_info.mvir
@@ -0,0 +1,19 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: u64 }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x1.type_name;
+import 0x1.ascii;
+import 0x2.A;
+main(account: signer) {
+    let v: type_name.TypeName;
+    let s: ascii.String;
+
+label b0:
+    v = type_name.get<A.A>();
+    s = type_name.into_string(move(v));
+
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/primitives/address.exp b/language/move-vm/paranoid-tests/tests/type_safety/primitives/address.exp
new file mode 100644
index 0000000000..aadcf424fa
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/primitives/address.exp
@@ -0,0 +1,37 @@
+processed 7 tasks
+
+task 2 'run'. lines 33-41:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 3)],
+}
+
+task 3 'run'. lines 43-53:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 4 'run'. lines 55-65:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 6 'run'. lines 78-87:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/primitives/address.mvir b/language/move-vm/paranoid-tests/tests/type_safety/primitives/address.mvir
new file mode 100644
index 0000000000..229aaa5fcd
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/primitives/address.mvir
@@ -0,0 +1,87 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: address }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { x: 0x1 };
+  }
+
+  public test(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 0x1;
+    return;
+  }
+
+  public test_invalid(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u64;
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test_invalid(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<address>;
+    let b: &mut address;
+label b0:
+    a = vec_pack_0<address>();
+    vec_push_back<address>(&mut a, true);
+    b = vec_mut_borrow<address>(&mut a, 0);
+    *move(b) = 0x1;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<address>;
+    let b: &mut address;
+label b0:
+    a = vec_pack_0<address>();
+    vec_push_back<address>(&mut a, true);
+    b = vec_mut_borrow<address>(&mut a, 0);
+    *move(b) = 5u64;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: address;
+    let b: &mut address;
+label b0:
+    a = 0x2;
+    b = &mut a;
+    *move(b) = 0x1;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: address;
+    let b: &mut address;
+label b0:
+    a = 0x2;
+    b = &mut a;
+    *move(b) = 10u64;
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/primitives/bool.exp b/language/move-vm/paranoid-tests/tests/type_safety/primitives/bool.exp
new file mode 100644
index 0000000000..11fc136fc0
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/primitives/bool.exp
@@ -0,0 +1,28 @@
+processed 7 tasks
+
+task 2 'run'. lines 33-41:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 3)],
+}
+
+task 4 'run'. lines 55-65:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 6 'run'. lines 78-87:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/primitives/bool.mvir b/language/move-vm/paranoid-tests/tests/type_safety/primitives/bool.mvir
new file mode 100644
index 0000000000..b2d41085e0
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/primitives/bool.mvir
@@ -0,0 +1,87 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: bool }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { x: true };
+  }
+
+  public test(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = true;
+    return;
+  }
+
+  public test_invalid(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u64;
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test_invalid(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<bool>;
+    let b: &mut bool;
+label b0:
+    a = vec_pack_0<bool>();
+    vec_push_back<bool>(&mut a, true);
+    b = vec_mut_borrow<bool>(&mut a, 0);
+    *move(b) = false;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<bool>;
+    let b: &mut bool;
+label b0:
+    a = vec_pack_0<bool>();
+    vec_push_back<bool>(&mut a, true);
+    b = vec_mut_borrow<bool>(&mut a, 0);
+    *move(b) = 5u64;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: bool;
+    let b: &mut bool;
+label b0:
+    a = false;
+    b = &mut a;
+    *move(b) = true;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: bool;
+    let b: &mut bool;
+label b0:
+    a = false;
+    b = &mut a;
+    *move(b) = 10u64;
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/primitives/u128.exp b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u128.exp
new file mode 100644
index 0000000000..11fc136fc0
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u128.exp
@@ -0,0 +1,28 @@
+processed 7 tasks
+
+task 2 'run'. lines 33-41:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 3)],
+}
+
+task 4 'run'. lines 55-65:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 6 'run'. lines 78-87:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/primitives/u128.mvir b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u128.mvir
new file mode 100644
index 0000000000..0ef992946c
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u128.mvir
@@ -0,0 +1,87 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: u128 }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { x: 0u128 };
+  }
+
+  public test(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u128;
+    return;
+  }
+
+  public test_invalid(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u8;
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test_invalid(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u128>;
+    let b: &mut u128;
+label b0:
+    a = vec_pack_0<u128>();
+    vec_push_back<u128>(&mut a, 1u128);
+    b = vec_mut_borrow<u128>(&mut a, 0);
+    *move(b) = 5u128;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u128>;
+    let b: &mut u128;
+label b0:
+    a = vec_pack_0<u128>();
+    vec_push_back<u128>(&mut a, 1u128);
+    b = vec_mut_borrow<u128>(&mut a, 0);
+    *move(b) = 5u8;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u128;
+    let b: &mut u128;
+label b0:
+    a = 0u128;
+    b = &mut a;
+    *move(b) = 10u128;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u128;
+    let b: &mut u128;
+label b0:
+    a = 0u128;
+    b = &mut a;
+    *move(b) = 10u64;
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/primitives/u16.exp b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u16.exp
new file mode 100644
index 0000000000..11fc136fc0
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u16.exp
@@ -0,0 +1,28 @@
+processed 7 tasks
+
+task 2 'run'. lines 33-41:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 3)],
+}
+
+task 4 'run'. lines 55-65:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 6 'run'. lines 78-87:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/primitives/u16.mvir b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u16.mvir
new file mode 100644
index 0000000000..d3a8980459
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u16.mvir
@@ -0,0 +1,87 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: u16 }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { x: 0u16 };
+  }
+
+  public test(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u16;
+    return;
+  }
+
+  public test_invalid(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u64;
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test_invalid(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u16>;
+    let b: &mut u16;
+label b0:
+    a = vec_pack_0<u16>();
+    vec_push_back<u16>(&mut a, 1u16);
+    b = vec_mut_borrow<u16>(&mut a, 0);
+    *move(b) = 5u16;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u16>;
+    let b: &mut u16;
+label b0:
+    a = vec_pack_0<u16>();
+    vec_push_back<u16>(&mut a, 1u16);
+    b = vec_mut_borrow<u16>(&mut a, 0);
+    *move(b) = 5u64;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u16;
+    let b: &mut u16;
+label b0:
+    a = 0u16;
+    b = &mut a;
+    *move(b) = 10u16;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u16;
+    let b: &mut u16;
+label b0:
+    a = 0u16;
+    b = &mut a;
+    *move(b) = 10u64;
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/primitives/u256.exp b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u256.exp
new file mode 100644
index 0000000000..11fc136fc0
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u256.exp
@@ -0,0 +1,28 @@
+processed 7 tasks
+
+task 2 'run'. lines 33-41:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 3)],
+}
+
+task 4 'run'. lines 55-65:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 6 'run'. lines 78-87:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/primitives/u256.mvir b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u256.mvir
new file mode 100644
index 0000000000..d3a770d685
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u256.mvir
@@ -0,0 +1,87 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: u256 }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { x: 0u256 };
+  }
+
+  public test(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u256;
+    return;
+  }
+
+  public test_invalid(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u8;
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test_invalid(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u256>;
+    let b: &mut u256;
+label b0:
+    a = vec_pack_0<u256>();
+    vec_push_back<u256>(&mut a, 1u256);
+    b = vec_mut_borrow<u256>(&mut a, 0);
+    *move(b) = 5u256;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u256>;
+    let b: &mut u256;
+label b0:
+    a = vec_pack_0<u256>();
+    vec_push_back<u256>(&mut a, 1u256);
+    b = vec_mut_borrow<u256>(&mut a, 0);
+    *move(b) = 5u8;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u256;
+    let b: &mut u256;
+label b0:
+    a = 0u256;
+    b = &mut a;
+    *move(b) = 10u256;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u256;
+    let b: &mut u256;
+label b0:
+    a = 0u256;
+    b = &mut a;
+    *move(b) = 10u64;
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/primitives/u32.exp b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u32.exp
new file mode 100644
index 0000000000..11fc136fc0
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u32.exp
@@ -0,0 +1,28 @@
+processed 7 tasks
+
+task 2 'run'. lines 33-41:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 3)],
+}
+
+task 4 'run'. lines 55-65:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 6 'run'. lines 78-87:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/primitives/u32.mvir b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u32.mvir
new file mode 100644
index 0000000000..92f1359967
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u32.mvir
@@ -0,0 +1,87 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: u32 }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { x: 0u32 };
+  }
+
+  public test(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u32;
+    return;
+  }
+
+  public test_invalid(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u64;
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test_invalid(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u32>;
+    let b: &mut u32;
+label b0:
+    a = vec_pack_0<u32>();
+    vec_push_back<u32>(&mut a, 1u32);
+    b = vec_mut_borrow<u32>(&mut a, 0);
+    *move(b) = 5u32;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u32>;
+    let b: &mut u32;
+label b0:
+    a = vec_pack_0<u32>();
+    vec_push_back<u32>(&mut a, 1u32);
+    b = vec_mut_borrow<u32>(&mut a, 0);
+    *move(b) = 5u64;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u32;
+    let b: &mut u32;
+label b0:
+    a = 0u32;
+    b = &mut a;
+    *move(b) = 10u32;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u32;
+    let b: &mut u32;
+label b0:
+    a = 0u32;
+    b = &mut a;
+    *move(b) = 10u64;
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/primitives/u64.exp b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u64.exp
new file mode 100644
index 0000000000..11fc136fc0
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u64.exp
@@ -0,0 +1,28 @@
+processed 7 tasks
+
+task 2 'run'. lines 33-41:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 3)],
+}
+
+task 4 'run'. lines 55-65:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 6 'run'. lines 78-87:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/primitives/u64.mvir b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u64.mvir
new file mode 100644
index 0000000000..486c8e8022
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u64.mvir
@@ -0,0 +1,87 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: u64 }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { x: 0u64 };
+  }
+
+  public test(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u64;
+    return;
+  }
+
+  public test_invalid(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u8;
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test_invalid(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u64>;
+    let b: &mut u64;
+label b0:
+    a = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut a, 1u64);
+    b = vec_mut_borrow<u64>(&mut a, 0);
+    *move(b) = 5u64;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u64>;
+    let b: &mut u64;
+label b0:
+    a = vec_pack_0<u64>();
+    vec_push_back<u64>(&mut a, 1u64);
+    b = vec_mut_borrow<u64>(&mut a, 0);
+    *move(b) = 5u8;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u64;
+    let b: &mut u64;
+label b0:
+    a = 0u64;
+    b = &mut a;
+    *move(b) = 10u64;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u64;
+    let b: &mut u64;
+label b0:
+    a = 0u64;
+    b = &mut a;
+    *move(b) = 10u8;
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/primitives/u8.exp b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u8.exp
new file mode 100644
index 0000000000..11fc136fc0
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u8.exp
@@ -0,0 +1,28 @@
+processed 7 tasks
+
+task 2 'run'. lines 33-41:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 3)],
+}
+
+task 4 'run'. lines 55-65:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 6 'run'. lines 78-87:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/primitives/u8.mvir b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u8.mvir
new file mode 100644
index 0000000000..bbff4c6de4
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/primitives/u8.mvir
@@ -0,0 +1,87 @@
+//# publish
+module 0x2.A {
+  struct A has drop { x: u8 }
+
+  public make_a(): Self.A {
+  label b0:
+    return A { x: 0u8 };
+  }
+
+  public test(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u8;
+    return;
+  }
+
+  public test_invalid(a: &mut Self.A) {
+  label b0:
+    *&mut (move(a)).A::x = 10u64;
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let a: A.A;
+label b0:
+    a = A.make_a();
+    A.test_invalid(&mut a);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u8>;
+    let b: &mut u8;
+label b0:
+    a = vec_pack_0<u8>();
+    vec_push_back<u8>(&mut a, 1u8);
+    b = vec_mut_borrow<u8>(&mut a, 0);
+    *move(b) = 5u8;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: vector<u8>;
+    let b: &mut u8;
+label b0:
+    a = vec_pack_0<u8>();
+    vec_push_back<u8>(&mut a, 1u8);
+    b = vec_mut_borrow<u8>(&mut a, 0);
+    *move(b) = 5u64;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u8;
+    let b: &mut u8;
+label b0:
+    a = 0u8;
+    b = &mut a;
+    *move(b) = 10u8;
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let a: u8;
+    let b: &mut u8;
+label b0:
+    a = 0u8;
+    b = &mut a;
+    *move(b) = 10u64;
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.exp b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.exp
new file mode 100644
index 0000000000..43df17fece
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.exp
@@ -0,0 +1,19 @@
+processed 5 tasks
+
+task 2 'run'. lines 34-45:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
+
+task 3 'run'. lines 47-58:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.mvir b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.mvir
new file mode 100644
index 0000000000..b675f91f09
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_field.mvir
@@ -0,0 +1,71 @@
+//# publish
+module 0x2.A {
+    struct G has key, drop { x: u64 }
+
+    public make_g(): Self.G {
+    label b0:
+        return G {x: 1};
+    }
+
+    public borrow(g: &Self.G): &u64 {
+    label b0:
+        return &(move(g)).G::x;
+    }
+
+    public borrow_mut(g: &mut Self.G): &mut u64 {
+    label b0:
+        return &mut (move(g)).G::x;
+    }
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let g: A.G;
+    let u_ref: &u64;
+    let x: u64;
+label b0:
+    g = A.make_g();
+    u_ref = A.borrow(&g);
+    x = *move(u_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let g: A.G;
+    let u_ref: &u64;
+    let x: u64;
+label b0:
+    g = A.make_g();
+    u_ref = A.borrow(&g);
+    *move(u_ref) = 10;
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let g: A.G;
+    let u_ref: &u64;
+    let x: u64;
+label b0:
+    g = A.make_g();
+    u_ref = A.borrow_mut(&mut g);
+    x = *move(u_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let g: A.G;
+    let u_ref: &mut u64;
+    let x: u64;
+label b0:
+    g = A.make_g();
+    u_ref = A.borrow_mut(&mut g);
+    *move(u_ref) = 10;
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.exp b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.exp
new file mode 100644
index 0000000000..43df17fece
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.exp
@@ -0,0 +1,19 @@
+processed 5 tasks
+
+task 2 'run'. lines 34-45:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
+
+task 3 'run'. lines 47-58:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.mvir b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.mvir
new file mode 100644
index 0000000000..2e26f2519c
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_field_generic.mvir
@@ -0,0 +1,71 @@
+//# publish
+module 0x2.A {
+    struct G<T> has key, drop { x: T }
+
+    public make_g(): Self.G<u64> {
+    label b0:
+        return G<u64> { x: 1 };
+    }
+
+    public borrow(g: &Self.G<u64>): &u64 {
+    label b0:
+        return &(move(g)).G<u64>::x;
+    }
+
+    public borrow_mut(g: &mut Self.G<u64>): &mut u64 {
+    label b0:
+        return &mut (move(g)).G<u64>::x;
+    }
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let g: A.G<u64>;
+    let u_ref: &u64;
+    let x: u64;
+label b0:
+    g = A.make_g();
+    u_ref = A.borrow(&g);
+    x = *move(u_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let g: A.G<u64>;
+    let u_ref: &u64;
+    let x: u64;
+label b0:
+    g = A.make_g();
+    u_ref = A.borrow(&g);
+    *move(u_ref) = 10;
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let g: A.G<u64>;
+    let u_ref: &u64;
+    let x: u64;
+label b0:
+    g = A.make_g();
+    u_ref = A.borrow_mut(&mut g);
+    x = *move(u_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let g: A.G<u64>;
+    let u_ref: &mut u64;
+    let x: u64;
+label b0:
+    g = A.make_g();
+    u_ref = A.borrow_mut(&mut g);
+    *move(u_ref) = 10;
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.exp b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.exp
new file mode 100644
index 0000000000..5af0f1360b
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.exp
@@ -0,0 +1,28 @@
+processed 8 tasks
+
+task 2 'run'. lines 59-71:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
+
+task 3 'run'. lines 73-86:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 10)],
+}
+
+task 6 'run'. lines 116-127:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.mvir b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.mvir
new file mode 100644
index 0000000000..19aa6ac5a5
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_global.mvir
@@ -0,0 +1,140 @@
+//# publish
+module 0x2.A {
+    struct G has key, drop { x: u64 }
+
+    public make_g(): Self.G {
+    label b0:
+        return G {x: 1};
+    }
+
+    public store(account: &signer) {
+    label b0:
+        move_to<G>(move(account), G { x: 10 } );
+        return;
+    }
+
+    public borrow(addr: address): &Self.G {
+    label b0:
+        return borrow_global<G>(move(addr));
+    }
+
+    public borrow_mut(addr: address): &mut u64 {
+    label b0:
+        return borrow_global_mut<G>(move(addr));
+    }
+
+    public borrow_field(addr: address): &u64 {
+        let g_ref: &Self.G;
+    label b0:
+        g_ref = borrow_global<G>(move(addr));
+        return &(move(g_ref)).G::x;
+    }
+
+    public borrow_field_2(addr: address): &u64 {
+        let g_ref: &mut Self.G;
+    label b0:
+        g_ref = borrow_global_mut<G>(move(addr));
+        return &(freeze(move(g_ref))).G::x;
+    }
+
+    public borrow_field_mut(addr: address): &mut u64 {
+        let g_ref: &mut Self.G;
+    label b0:
+        g_ref = borrow_global_mut<G>(move(addr));
+        return &mut (move(g_ref)).G::x;
+    }
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+label b0:
+    a = signer.address_of(&account);
+    A.store(&account);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &A.G;
+    let g: A.G;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow(move(a));
+    g = *move(g_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &A.G;
+    let g: A.G;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow(move(a));
+    g = A.make_g();
+    *move(g_ref) = move(g);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &u64;
+    let g: u64;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow_field(move(a));
+    g = *move(g_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &u64;
+    let g: u64;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow_field_2(move(a));
+    g = *move(g_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &u64;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow_field(move(a));
+    *move(g_ref) = 10;
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &mut u64;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow_field_mut(move(a));
+    *move(g_ref) = 10;
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.exp b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.exp
new file mode 100644
index 0000000000..5af0f1360b
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.exp
@@ -0,0 +1,28 @@
+processed 8 tasks
+
+task 2 'run'. lines 59-71:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
+
+task 3 'run'. lines 73-86:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 10)],
+}
+
+task 6 'run'. lines 116-127:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 8)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.mvir b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.mvir
new file mode 100644
index 0000000000..aaffa9cb63
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_global_generic.mvir
@@ -0,0 +1,140 @@
+//# publish
+module 0x2.A {
+    struct G<T> has key, drop { x: T }
+
+    public make_g(): Self.G<u64> {
+    label b0:
+        return G<u64> {x: 1};
+    }
+
+    public store(account: &signer) {
+    label b0:
+        move_to<G<u64>>(move(account), G<u64> { x: 10 } );
+        return;
+    }
+
+    public borrow(addr: address): &Self.G<u64> {
+    label b0:
+        return borrow_global<G<u64>>(move(addr));
+    }
+
+    public borrow_mut(addr: address): &mut u64 {
+    label b0:
+        return borrow_global_mut<G<u64>>(move(addr));
+    }
+
+    public borrow_field(addr: address): &u64 {
+        let g_ref: &Self.G<u64>;
+    label b0:
+        g_ref = borrow_global<G<u64>>(move(addr));
+        return &(move(g_ref)).G<u64>::x;
+    }
+
+    public borrow_field_2(addr: address): &u64 {
+        let g_ref: &mut Self.G<u64>;
+    label b0:
+        g_ref = borrow_global_mut<G<u64>>(move(addr));
+        return &(freeze(move(g_ref))).G<u64>::x;
+    }
+
+    public borrow_field_mut(addr: address): &mut u64 {
+        let g_ref: &mut Self.G<u64>;
+    label b0:
+        g_ref = borrow_global_mut<G<u64>>(move(addr));
+        return &mut (move(g_ref)).G<u64>::x;
+    }
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+label b0:
+    a = signer.address_of(&account);
+    A.store(&account);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &A.G<u64>;
+    let g: A.G<u64>;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow(move(a));
+    g = *move(g_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &A.G<u64>;
+    let g: A.G<u64>;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow(move(a));
+    g = A.make_g();
+    *move(g_ref) = move(g);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &u64;
+    let g: u64;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow_field(move(a));
+    g = *move(g_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &u64;
+    let g: u64;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow_field_2(move(a));
+    g = *move(g_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &u64;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow_field(move(a));
+    *move(g_ref) = 10;
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+    let g_ref: &mut u64;
+label b0:
+    a = signer.address_of(&account);
+    g_ref = A.borrow_field_mut(move(a));
+    *move(g_ref) = 10;
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_loc.exp b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_loc.exp
new file mode 100644
index 0000000000..a9e7a33b02
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_loc.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 12-21:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_loc.mvir b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_loc.mvir
new file mode 100644
index 0000000000..04ef18ab3e
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/references/borrow_loc.mvir
@@ -0,0 +1,21 @@
+//# run --signers 0x1  --check-runtime-types
+main(account: signer) {
+    let u: u64;
+    let u_ref: &mut u64;
+label b0:
+    u = 10;
+    u_ref = &mut u;
+    *move(u_ref) = 20;
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+main(account: signer) {
+    let u: u64;
+    let u_ref: &mut u64;
+label b0:
+    u = 10;
+    u_ref = &u;
+    *move(u_ref) = 20;
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.exp b/language/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.exp
new file mode 100644
index 0000000000..e34a174fa3
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.exp
@@ -0,0 +1,19 @@
+processed 3 tasks
+
+task 1 'run'. lines 13-22:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
+
+task 2 'run'. lines 24-31:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.mvir b/language/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.mvir
new file mode 100644
index 0000000000..d227f3fb1b
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/references/freeze_ref.mvir
@@ -0,0 +1,31 @@
+//# run --signers 0x1  --check-runtime-types
+main(account: signer) {
+    let u: u64;
+    let u_ref: &u64;
+label b0:
+    u = 10;
+    u_ref = freeze(&mut u);
+    _ = move(u_ref);
+    return;
+}
+
+
+//# run --signers 0x1  --check-runtime-types
+main(account: signer) {
+    let u: u64;
+    let u_ref: &u64;
+label b0:
+    u = 10;
+    u_ref = freeze(&u);
+    _ = move(u_ref);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+main(account: signer) {
+    let u: u64;
+label b0:
+    u = 10;
+    _ = freeze(move(u));
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/references/read_ref.exp b/language/move-vm/paranoid-tests/tests/type_safety/references/read_ref.exp
new file mode 100644
index 0000000000..b4d46f6ec7
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/references/read_ref.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 13-21:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/references/read_ref.mvir b/language/move-vm/paranoid-tests/tests/type_safety/references/read_ref.mvir
new file mode 100644
index 0000000000..6d1e182674
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/references/read_ref.mvir
@@ -0,0 +1,21 @@
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let c: u64;
+    let a: u64;
+label b0:
+    c = 10;
+    a = *&c;
+    return;
+}
+
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let c: u64;
+    let a: u64;
+label b0:
+    c = 10;
+    a = *move(c);
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.exp b/language/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.exp
new file mode 100644
index 0000000000..b8e60303e9
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 47-53:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(3), 10)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.mvir b/language/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.mvir
new file mode 100644
index 0000000000..508bb57535
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_struct.mvir
@@ -0,0 +1,53 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+  struct D has drop { x: u64 }
+  struct A has drop { c: Self.C }
+
+  public make_c(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x: 0 };
+  }
+
+  public test_mutate() {
+    let a: Self.A;
+    let c_ref: &mut Self.C;
+    let c: Self.C;
+  label b0:
+    a = A { c: C { x: 0 }};
+    c_ref =  &mut (&mut a).A::c;
+    *copy(c_ref) = C { x: 20u64 };
+    return;
+  }
+
+  public test_invalid_mutate() {
+    let a: Self.A;
+    let c_ref: &mut Self.C;
+  label b0:
+    a = A { c: C { x: 0 }};
+    c_ref =  &mut (&mut a).A::c;
+    *move(c_ref) = D { x: 20 };
+    return;
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.test_mutate();
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.test_invalid_mutate();
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.exp b/language/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.exp
new file mode 100644
index 0000000000..e22a99a18d
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 35-50:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 13)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.mvir b/language/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.mvir
new file mode 100644
index 0000000000..67ed0ce9b0
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/references/write_ref_with_vector.mvir
@@ -0,0 +1,50 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+  struct D has drop { x: u64 }
+  struct A has drop { c: Self.C }
+
+  public make_c(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x: 0 };
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let c: A.C;
+    let v: vector<A.C>;
+    let c_ref: &mut A.C;
+label b0:
+    c = A.make_c();
+    v = vec_pack_1<A.C>(move(c));
+    c_ref = vec_mut_borrow<A.C>(&mut v, 0);
+
+    c = A.make_c();
+    *move(c_ref) = move(c);
+    return;
+}
+
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let c: A.C;
+    let d: A.D;
+    let v: vector<A.C>;
+    let c_ref: &mut A.C;
+label b0:
+    c = A.make_c();
+    v = vec_pack_1<A.C>(move(c));
+    c_ref = vec_mut_borrow<A.C>(&mut v, 0);
+
+    d = A.make_d();
+    *move(c_ref) = move(d);
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/simple_instruction/branch.exp b/language/move-vm/paranoid-tests/tests/type_safety/simple_instruction/branch.exp
new file mode 100644
index 0000000000..5d92c423f3
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/simple_instruction/branch.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/simple_instruction/branch.mvir b/language/move-vm/paranoid-tests/tests/type_safety/simple_instruction/branch.mvir
new file mode 100644
index 0000000000..871b116a68
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/simple_instruction/branch.mvir
@@ -0,0 +1,22 @@
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let c: bool;
+label b0:
+    c = true;
+    jump_if (move(c)) b1;
+label b1:
+    jump b2;
+label b2:
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let c: bool;
+label b0:
+    c = false;
+    jump_if (move(c)) b1;
+label b1:
+label b2:
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/struct/exists.exp b/language/move-vm/paranoid-tests/tests/type_safety/struct/exists.exp
new file mode 100644
index 0000000000..d6ce3c4442
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/struct/exists.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 3 'run'. lines 41-47:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 1)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/struct/exists.mvir b/language/move-vm/paranoid-tests/tests/type_safety/struct/exists.mvir
new file mode 100644
index 0000000000..cf0a2d4064
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/struct/exists.mvir
@@ -0,0 +1,47 @@
+//# publish
+module 0x2.A {
+    struct G has key, drop { x: u64 }
+
+    public store(account: &signer) {
+    label b0:
+        move_to<G>(move(account), G { x: 10 } );
+        return;
+    }
+
+    public get(account: address): bool {
+    label b0:
+        return exists<G>(move(account));
+    }
+
+    public get_invalid(account: &signer): bool {
+    label b0:
+        return exists<G>(move(account));
+    }
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.store(&account);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+label b0:
+    a = signer.address_of(&account);
+    _ = A.get(move(a));
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    _ = A.get_invalid(&account);
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/struct/exists_generic.exp b/language/move-vm/paranoid-tests/tests/type_safety/struct/exists_generic.exp
new file mode 100644
index 0000000000..d6ce3c4442
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/struct/exists_generic.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 3 'run'. lines 41-47:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 1)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/struct/exists_generic.mvir b/language/move-vm/paranoid-tests/tests/type_safety/struct/exists_generic.mvir
new file mode 100644
index 0000000000..b7f60e4659
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/struct/exists_generic.mvir
@@ -0,0 +1,47 @@
+//# publish
+module 0x2.A {
+    struct G<T> has key, drop { x: T }
+
+    public store(account: &signer) {
+    label b0:
+        move_to<G<u64>>(move(account), G<u64> { x: 10 } );
+        return;
+    }
+
+    public get(account: address): bool {
+    label b0:
+        return exists<G<u64>>(move(account));
+    }
+
+    public get_invalid(account: &signer): bool {
+    label b0:
+        return exists<G<u64>>(move(account));
+    }
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.store(&account);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+label b0:
+    a = signer.address_of(&account);
+    _ = A.get(move(a));
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    _ = A.get_invalid(&account);
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/struct/move_from.exp b/language/move-vm/paranoid-tests/tests/type_safety/struct/move_from.exp
new file mode 100644
index 0000000000..d6ce3c4442
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/struct/move_from.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 3 'run'. lines 41-47:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 1)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/struct/move_from.mvir b/language/move-vm/paranoid-tests/tests/type_safety/struct/move_from.mvir
new file mode 100644
index 0000000000..c74f302beb
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/struct/move_from.mvir
@@ -0,0 +1,47 @@
+//# publish
+module 0x2.A {
+    struct G has key, drop { x: u64 }
+
+    public store(account: &signer) {
+    label b0:
+        move_to<G>(move(account), G { x: 10 } );
+        return;
+    }
+
+    public get(account: address): Self.G {
+    label b0:
+        return move_from<G>(move(account));
+    }
+
+    public get_invalid(account: &signer): Self.G {
+    label b0:
+        return move_from<G>(move(account));
+    }
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.store(&account);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+label b0:
+    a = signer.address_of(&account);
+    _ = A.get(move(a));
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    _ = A.get_invalid(&account);
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/struct/move_from_generic.exp b/language/move-vm/paranoid-tests/tests/type_safety/struct/move_from_generic.exp
new file mode 100644
index 0000000000..d6ce3c4442
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/struct/move_from_generic.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 3 'run'. lines 41-47:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(2), 1)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/struct/move_from_generic.mvir b/language/move-vm/paranoid-tests/tests/type_safety/struct/move_from_generic.mvir
new file mode 100644
index 0000000000..bbd2a03a57
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/struct/move_from_generic.mvir
@@ -0,0 +1,47 @@
+//# publish
+module 0x2.A {
+    struct G<T> has key, drop { x: T }
+
+    public store(account: &signer) {
+    label b0:
+        move_to<G<u64>>(move(account), G<u64> { x: 10 } );
+        return;
+    }
+
+    public get(account: address): Self.G<u64> {
+    label b0:
+        return move_from<G<u64>>(move(account));
+    }
+
+    public get_invalid(account: &signer): Self.G<u64> {
+    label b0:
+        return move_from<G<u64>>(move(account));
+    }
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    A.store(&account);
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+import 0x1.signer;
+main(account: signer) {
+    let a: address;
+label b0:
+    a = signer.address_of(&account);
+    _ = A.get(move(a));
+    return;
+}
+
+//# run --signers 0x1  --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+label b0:
+    _ = A.get_invalid(&account);
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_move.exp b/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_move.exp
new file mode 100644
index 0000000000..96a4358375
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_move.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 34-40:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_move.mvir b/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_move.mvir
new file mode 100644
index 0000000000..4bfa455087
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_move.mvir
@@ -0,0 +1,40 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+  struct D { x: u64 }
+
+  public make_c(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x: 0};
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    struct C { x: A.C }
+
+    public store(s: &signer) {
+        let v: A.D;
+
+    label b0:
+        v = A.make_d();
+        move_to<C>(move(s), C { x: move(v) });
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.store(&account);
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_unpack.exp b/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_unpack.exp
new file mode 100644
index 0000000000..18cf98edeb
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_unpack.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 45-51:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::B,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_unpack.mvir b/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_unpack.mvir
new file mode 100644
index 0000000000..e4602ff1f8
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_and_unpack.mvir
@@ -0,0 +1,51 @@
+//# publish
+module 0x2.A {
+  struct C { x: u64 }
+  struct D { x: u64 }
+
+  public make_c(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x: 0};
+  }
+
+  public take_c(c: Self.C) {
+    let x: u64;
+  label b0:
+    C { x } = move(c);
+  }
+}
+
+//# publish
+module 0x2.B {
+    import 0x2.A;
+
+    struct C { x: A.C }
+
+    public store(s: &signer) {
+        let v: A.D;
+        let c: Self.C;
+        let x: A.C;
+
+    label b0:
+        v = A.make_d();
+        c = C { x: move(v) };
+
+        C { x } = move(c);
+        A.take_c(move(x));
+
+        return;
+    }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.B;
+main(account: signer) {
+label b0:
+    B.store(&account);
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic.exp b/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic.exp
new file mode 100644
index 0000000000..5d92c423f3
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic.exp
@@ -0,0 +1 @@
+processed 2 tasks
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic.mvir b/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic.mvir
new file mode 100644
index 0000000000..1f373ced37
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic.mvir
@@ -0,0 +1,28 @@
+//# publish
+module 0x2.A {
+  struct C<T> has drop { x: T, y: u64 }
+
+  struct D has drop { x: u64 }
+
+  public make<T>(x: T): Self.C<T> {
+  label b0:
+    return C<T> { x: move(x), y: 0 };
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x : 0 };
+  }
+}
+
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let c: A.C<A.D>;
+    let d: A.D;
+label b0:
+    d = A.make_d();
+    c = A.make<A.D>(move(d));
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic_mismatch.exp b/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic_mismatch.exp
new file mode 100644
index 0000000000..1c2f5ba2f1
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic_mismatch.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 27-36:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::A,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic_mismatch.mvir b/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic_mismatch.mvir
new file mode 100644
index 0000000000..9e3777c69b
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/struct/pack_generic_mismatch.mvir
@@ -0,0 +1,36 @@
+//# publish
+module 0x2.A {
+  struct C<T> has drop { x: T, y: u64 }
+
+  struct D has drop { x: u64 }
+
+  public make<T>(x: T): Self.C<T> {
+  label b0:
+    return C<T> { x: 0, y: move(x) };
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x : 0 };
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let c: A.C<u64>;
+label b0:
+    c = A.make<u64>(10u64);
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let c: A.C<A.D>;
+    let d: A.D;
+label b0:
+    d = A.make_d();
+    c = A.make<A.D>(move(d));
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_imm_borrow.exp b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_imm_borrow.exp
new file mode 100644
index 0000000000..630ac016c8
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_imm_borrow.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'run'. lines 13-22:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_imm_borrow.mvir b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_imm_borrow.mvir
new file mode 100644
index 0000000000..0c698c712d
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_imm_borrow.mvir
@@ -0,0 +1,22 @@
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+
+label b0:
+    v = vec_pack_1<u64>(1);
+    _ = vec_imm_borrow<u64>(&v, 0);
+    _ = vec_imm_borrow<u64>(&mut v, 0);
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+
+label b0:
+    v = vec_pack_1<u64>(1);
+    _ = vec_imm_borrow<u32>(&v, 0);
+
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_len.exp b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_len.exp
new file mode 100644
index 0000000000..ae165f7c1a
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_len.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 32-44:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 6)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_len.mvir b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_len.mvir
new file mode 100644
index 0000000000..8037e4a55d
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_len.mvir
@@ -0,0 +1,44 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+  struct D has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x: 0};
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: vector<A.C>;
+    let a: A.C;
+
+label b0:
+    a = A.make();
+    v = vec_pack_1<A.C>(move(a));
+    _ = vec_len<A.C>(&v);
+    _ = vec_len<A.C>(&mut v);
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: vector<A.C>;
+    let a: A.C;
+
+label b0:
+    a = A.make();
+    v = vec_pack_1<A.C>(move(a));
+    _ = vec_len<u64>(&v);
+
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_mut_borrow.exp b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_mut_borrow.exp
new file mode 100644
index 0000000000..7181063fc6
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_mut_borrow.exp
@@ -0,0 +1,19 @@
+processed 3 tasks
+
+task 1 'run'. lines 12-21:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
+
+task 2 'run'. lines 23-32:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_mut_borrow.mvir b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_mut_borrow.mvir
new file mode 100644
index 0000000000..bb767142d1
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_mut_borrow.mvir
@@ -0,0 +1,32 @@
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+
+label b0:
+    v = vec_pack_1<u64>(1);
+    _ = vec_mut_borrow<u64>(&mut v, 0);
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+
+label b0:
+    v = vec_pack_1<u64>(1);
+    _ = vec_mut_borrow<u64>(&v, 0);
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+
+label b0:
+    v = vec_pack_1<u64>(1);
+    _ = vec_mut_borrow<u32>(&mut v, 0);
+
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pack_mismatch.exp b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pack_mismatch.exp
new file mode 100644
index 0000000000..949ad81e87
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pack_mismatch.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 2 'run'. lines 27-37:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: 0x2::Math,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pack_mismatch.mvir b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pack_mismatch.mvir
new file mode 100644
index 0000000000..e60e127e29
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pack_mismatch.mvir
@@ -0,0 +1,49 @@
+//# publish
+module 0x2.A {
+  struct Password has key { x: u64 }
+
+  public store(x: Self.Password, s: &signer) {
+  label b0:
+    move_to<Password>(move(s), move(x));
+    return;
+  }
+}
+
+//# publish
+module 0x2.Math {
+  import 0x2.A;
+
+  struct R { v: u64 }
+
+  public test(): A.Password {
+      let v1: vector<A.Password>;
+
+  label b0:
+      v1 = vec_pack_1<A.Password>(R { v: 0 });
+      return vec_unpack_1<A.Password>(move(v1));
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.Math;
+import 0x2.A;
+main(account: signer) {
+    let v: A.Password;
+
+label b0:
+    v = Math.test();
+    A.store(move(v), &account);
+    return;
+}
+
+//# run --signers 0x1
+import 0x2.Math;
+import 0x2.A;
+main(account: signer) {
+    let v: A.Password;
+
+label b0:
+    v = Math.test();
+    A.store(move(v), &account);
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pop_back.exp b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pop_back.exp
new file mode 100644
index 0000000000..8c337707ac
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pop_back.exp
@@ -0,0 +1,19 @@
+processed 3 tasks
+
+task 1 'run'. lines 13-23:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
+
+task 2 'run'. lines 25-35:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 4)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pop_back.mvir b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pop_back.mvir
new file mode 100644
index 0000000000..fa120970ed
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_pop_back.mvir
@@ -0,0 +1,35 @@
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+    let u: u64;
+
+label b0:
+    v = vec_pack_1<u64>(1);
+    u = vec_pop_back<u64>(&mut v);
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+    let u: u64;
+
+label b0:
+    v = vec_pack_1<u64>(1);
+    u = vec_pop_back<u64>(&v);
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+    let u: u32;
+
+label b0:
+    v = vec_pack_1<u64>(1);
+    u = vec_pop_back<u32>(&v);
+
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_push_back.exp b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_push_back.exp
new file mode 100644
index 0000000000..3170601e75
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_push_back.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 32-48:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_push_back.mvir b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_push_back.mvir
new file mode 100644
index 0000000000..3ea0065ad1
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_push_back.mvir
@@ -0,0 +1,48 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+  struct D has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+
+  public make_d(): Self.D {
+  label b0:
+    return D { x: 0};
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: vector<A.C>;
+    let a: A.C;
+
+label b0:
+    v = vec_pack_0<A.C>();
+    a = A.make();
+
+    vec_push_back<A.C>(&mut v, move(a));
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: vector<A.C>;
+    let a: A.C;
+    let b: A.D;
+
+label b0:
+    v = vec_pack_0<A.C>();
+    a = A.make();
+    b = A.make_d();
+
+    vec_push_back<A.C>(&mut v, move(a));
+    vec_push_back<A.C>(&mut v, move(b));
+
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_swap.exp b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_swap.exp
new file mode 100644
index 0000000000..bc961001a2
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_swap.exp
@@ -0,0 +1,19 @@
+processed 3 tasks
+
+task 1 'run'. lines 13-23:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
+
+task 2 'run'. lines 25-35:
+Error: Script execution failed with VMError: {
+    major_status: INTERNAL_TYPE_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 7)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_swap.mvir b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_swap.mvir
new file mode 100644
index 0000000000..89cff48477
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_swap.mvir
@@ -0,0 +1,35 @@
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+    let u: u64;
+
+label b0:
+    v = vec_pack_2<u64>(1, 2);
+    vec_swap<u64>(&mut v, 0, 1);
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+    let u: u64;
+
+label b0:
+    v = vec_pack_2<u64>(1, 2);
+    vec_swap<u64>(&v, 0, 1);
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+    let u: u64;
+
+label b0:
+    v = vec_pack_2<u64>(1, 2);
+    vec_swap<u64>(&v, true, 1);
+
+    return;
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_unpack.exp b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_unpack.exp
new file mode 100644
index 0000000000..1c61308681
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_unpack.exp
@@ -0,0 +1,10 @@
+processed 3 tasks
+
+task 2 'run'. lines 22-33:
+Error: Script execution failed with VMError: {
+    major_status: UNKNOWN_INVARIANT_VIOLATION_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 3)],
+}
diff --git a/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_unpack.mvir b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_unpack.mvir
new file mode 100644
index 0000000000..6d1decdd76
--- /dev/null
+++ b/language/move-vm/paranoid-tests/tests/type_safety/vectors/vec_unpack.mvir
@@ -0,0 +1,33 @@
+//# publish
+module 0x2.A {
+  struct C has drop { x: u64 }
+
+  public make(): Self.C {
+  label b0:
+    return C { x: 0};
+  }
+}
+
+//# run --signers 0x1 --check-runtime-types
+main(account: signer) {
+    let v: vector<u64>;
+
+label b0:
+    v = vec_pack_1<u64>(1);
+    _ = vec_unpack_1<u64>(move(v));
+
+    return;
+}
+
+//# run --signers 0x1 --check-runtime-types
+import 0x2.A;
+main(account: signer) {
+    let v: vector<u64>;
+    let c: A.C;
+
+label b0:
+    c = A.make();
+    _ = vec_unpack_1<u64>(move(c));
+
+    return;
+}
diff --git a/language/move-vm/runtime/Cargo.toml b/language/move-vm/runtime/Cargo.toml
index d348db4574..fb28ca5964 100644
--- a/language/move-vm/runtime/Cargo.toml
+++ b/language/move-vm/runtime/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -38,3 +38,5 @@ failpoints = ["fail/failpoints"]
 # Enable tracing and debugging also for release builds. By default, it is only enabled for debug builds.
 debugging = []
 testing = []
+stacktrace = []
+lazy_natives = []
diff --git a/language/move-vm/runtime/src/config.rs b/language/move-vm/runtime/src/config.rs
new file mode 100644
index 0000000000..1b3dec4563
--- /dev/null
+++ b/language/move-vm/runtime/src/config.rs
@@ -0,0 +1,29 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::file_format_common::VERSION_MAX;
+use move_bytecode_verifier::VerifierConfig;
+
+pub const DEFAULT_MAX_VALUE_NEST_DEPTH: u64 = 128;
+
+/// Dynamic config options for the Move VM.
+pub struct VMConfig {
+    pub verifier: VerifierConfig,
+    pub max_binary_format_version: u32,
+    // When this flag is set to true, MoveVM will perform type check at every instruction
+    // execution to ensure that type safety cannot be violated at runtime.
+    pub paranoid_type_checks: bool,
+    /// Maximum value nest depth for structs
+    pub max_value_nest_depth: Option<u64>,
+}
+
+impl Default for VMConfig {
+    fn default() -> Self {
+        Self {
+            verifier: VerifierConfig::default(),
+            max_binary_format_version: VERSION_MAX,
+            paranoid_type_checks: false,
+            max_value_nest_depth: Some(DEFAULT_MAX_VALUE_NEST_DEPTH),
+        }
+    }
+}
diff --git a/language/move-vm/runtime/src/data_cache.rs b/language/move-vm/runtime/src/data_cache.rs
index bbfcb15767..5c1cf4ddd1 100644
--- a/language/move-vm/runtime/src/data_cache.rs
+++ b/language/move-vm/runtime/src/data_cache.rs
@@ -7,7 +7,8 @@ use crate::loader::Loader;
 use move_binary_format::errors::*;
 use move_core_types::{
     account_address::AccountAddress,
-    effects::{AccountChangeSet, ChangeSet, Event},
+    effects::{AccountChangeSet, ChangeSet, Event, Op},
+    gas_algebra::NumBytes,
     identifier::Identifier,
     language_storage::{ModuleId, TypeTag},
     resolver::MoveResolver,
@@ -17,13 +18,13 @@ use move_core_types::{
 use move_vm_types::{
     data_store::DataStore,
     loaded_data::runtime_types::Type,
-    values::{GlobalValue, GlobalValueEffect, Value},
+    values::{GlobalValue, Value},
 };
 use std::collections::btree_map::BTreeMap;
 
 pub struct AccountDataCache {
     data_map: BTreeMap<Type, (MoveTypeLayout, GlobalValue)>,
-    module_map: BTreeMap<Identifier, Vec<u8>>,
+    module_map: BTreeMap<Identifier, (Vec<u8>, bool)>,
 }
 
 impl AccountDataCache {
@@ -36,7 +37,7 @@ impl AccountDataCache {
 }
 
 /// Transaction data cache. Keep updates within a transaction so they can all be published at
-/// once when the transaction succeeeds.
+/// once when the transaction succeeds.
 ///
 /// It also provides an implementation for the opcodes that refer to storage and gives the
 /// proper guarantees of reference lifetime.
@@ -75,37 +76,53 @@ impl<'r, 'l, S: MoveResolver> TransactionDataCache<'r, 'l, S> {
         let mut change_set = ChangeSet::new();
         for (addr, account_data_cache) in self.account_map.into_iter() {
             let mut modules = BTreeMap::new();
-            for (module_name, module_blob) in account_data_cache.module_map {
-                modules.insert(module_name, Some(module_blob));
+            for (module_name, (module_blob, is_republishing)) in account_data_cache.module_map {
+                let op = if is_republishing {
+                    Op::Modify(module_blob)
+                } else {
+                    Op::New(module_blob)
+                };
+                modules.insert(module_name, op);
             }
 
             let mut resources = BTreeMap::new();
             for (ty, (layout, gv)) in account_data_cache.data_map {
-                match gv.into_effect()? {
-                    GlobalValueEffect::None => (),
-                    GlobalValueEffect::Deleted => {
-                        let struct_tag = match self.loader.type_to_type_tag(&ty)? {
-                            TypeTag::Struct(struct_tag) => struct_tag,
-                            _ => return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)),
-                        };
-                        resources.insert(struct_tag, None);
+                let op = match gv.into_effect() {
+                    Some(op) => op,
+                    None => continue,
+                };
+
+                let struct_tag = match self.loader.type_to_type_tag(&ty)? {
+                    TypeTag::Struct(struct_tag) => *struct_tag,
+                    _ => return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)),
+                };
+
+                match op {
+                    Op::New(val) => {
+                        let resource_blob = val
+                            .simple_serialize(&layout)
+                            .ok_or_else(|| PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR))?;
+                        resources.insert(struct_tag, Op::New(resource_blob));
                     }
-                    GlobalValueEffect::Changed(val) => {
-                        let struct_tag = match self.loader.type_to_type_tag(&ty)? {
-                            TypeTag::Struct(struct_tag) => struct_tag,
-                            _ => return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)),
-                        };
+                    Op::Modify(val) => {
                         let resource_blob = val
                             .simple_serialize(&layout)
                             .ok_or_else(|| PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR))?;
-                        resources.insert(struct_tag, Some(resource_blob));
+                        resources.insert(struct_tag, Op::Modify(resource_blob));
+                    }
+                    Op::Delete => {
+                        resources.insert(struct_tag, Op::Delete);
                     }
                 }
             }
-            change_set.publish_or_overwrite_account_change_set(
-                addr,
-                AccountChangeSet::from_modules_resources(modules, resources),
-            );
+            if !modules.is_empty() || !resources.is_empty() {
+                change_set
+                    .add_account_changeset(
+                        addr,
+                        AccountChangeSet::from_modules_resources(modules, resources),
+                    )
+                    .expect("accounts should be unique");
+            }
         }
 
         let mut events = vec![];
@@ -153,11 +170,12 @@ impl<'r, 'l, S: MoveResolver> DataStore for TransactionDataCache<'r, 'l, S> {
         &mut self,
         addr: AccountAddress,
         ty: &Type,
-    ) -> PartialVMResult<&mut GlobalValue> {
+    ) -> PartialVMResult<(&mut GlobalValue, Option<Option<NumBytes>>)> {
         let account_cache = Self::get_mut_or_insert_with(&mut self.account_map, &addr, || {
             (addr, AccountDataCache::new())
         });
 
+        let mut load_res = None;
         if !account_cache.data_map.contains_key(ty) {
             let ty_tag = match self.loader.type_to_type_tag(ty)? {
                 TypeTag::Struct(s_tag) => s_tag,
@@ -167,10 +185,12 @@ impl<'r, 'l, S: MoveResolver> DataStore for TransactionDataCache<'r, 'l, S> {
                     return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR))
                 }
             };
+            // TODO(Gas): Shall we charge for this?
             let ty_layout = self.loader.type_to_type_layout(ty)?;
 
             let gv = match self.remote.get_resource(&addr, &ty_tag) {
                 Ok(Some(blob)) => {
+                    load_res = Some(Some(NumBytes::new(blob.len() as u64)));
                     let val = match Value::simple_deserialize(&blob, &ty_layout) {
                         Some(val) => val,
                         None => {
@@ -185,7 +205,10 @@ impl<'r, 'l, S: MoveResolver> DataStore for TransactionDataCache<'r, 'l, S> {
 
                     GlobalValue::cached(val)?
                 }
-                Ok(None) => GlobalValue::none(),
+                Ok(None) => {
+                    load_res = Some(None);
+                    GlobalValue::none()
+                }
                 Err(err) => {
                     let msg = format!("Unexpected storage error: {:?}", err);
                     return Err(
@@ -198,16 +221,19 @@ impl<'r, 'l, S: MoveResolver> DataStore for TransactionDataCache<'r, 'l, S> {
             account_cache.data_map.insert(ty.clone(), (ty_layout, gv));
         }
 
-        Ok(account_cache
-            .data_map
-            .get_mut(ty)
-            .map(|(_ty_layout, gv)| gv)
-            .expect("global value must exist"))
+        Ok((
+            account_cache
+                .data_map
+                .get_mut(ty)
+                .map(|(_ty_layout, gv)| gv)
+                .expect("global value must exist"),
+            load_res,
+        ))
     }
 
     fn load_module(&self, module_id: &ModuleId) -> VMResult<Vec<u8>> {
         if let Some(account_cache) = self.account_map.get(module_id.address()) {
-            if let Some(blob) = account_cache.module_map.get(module_id.name()) {
+            if let Some((blob, _is_republishing)) = account_cache.module_map.get(module_id.name()) {
                 return Ok(blob.clone());
             }
         }
@@ -227,7 +253,12 @@ impl<'r, 'l, S: MoveResolver> DataStore for TransactionDataCache<'r, 'l, S> {
         }
     }
 
-    fn publish_module(&mut self, module_id: &ModuleId, blob: Vec<u8>) -> VMResult<()> {
+    fn publish_module(
+        &mut self,
+        module_id: &ModuleId,
+        blob: Vec<u8>,
+        is_republishing: bool,
+    ) -> VMResult<()> {
         let account_cache =
             Self::get_mut_or_insert_with(&mut self.account_map, module_id.address(), || {
                 (*module_id.address(), AccountDataCache::new())
@@ -235,7 +266,7 @@ impl<'r, 'l, S: MoveResolver> DataStore for TransactionDataCache<'r, 'l, S> {
 
         account_cache
             .module_map
-            .insert(module_id.name().to_owned(), blob);
+            .insert(module_id.name().to_owned(), (blob, is_republishing));
 
         Ok(())
     }
diff --git a/language/move-vm/runtime/src/interpreter.rs b/language/move-vm/runtime/src/interpreter.rs
index 59d57dd932..25d4024855 100644
--- a/language/move-vm/runtime/src/interpreter.rs
+++ b/language/move-vm/runtime/src/interpreter.rs
@@ -10,26 +10,28 @@ use crate::{
 use fail::fail_point;
 use move_binary_format::{
     errors::*,
-    file_format::{Bytecode, FunctionHandleIndex, FunctionInstantiationIndex},
-    file_format_common::Opcodes,
+    file_format::{Ability, AbilitySet, Bytecode, FunctionHandleIndex, FunctionInstantiationIndex},
 };
 use move_core_types::{
     account_address::AccountAddress,
-    gas_schedule::{AbstractMemorySize, GasAlgebra, GasCarrier},
+    gas_algebra::{NumArgs, NumBytes},
+    language_storage::TypeTag,
     vm_status::{StatusCode, StatusType},
 };
 use move_vm_types::{
     data_store::DataStore,
-    gas_schedule::GasStatus,
+    gas::{GasMeter, SimpleInstruction},
     loaded_data::runtime_types::Type,
+    natives::function::NativeResult,
     values::{
         self, GlobalValue, IntegerValue, Locals, Reference, Struct, StructRef, VMValueCast, Value,
         Vector, VectorRef,
     },
+    views::TypeView,
 };
 
 use crate::native_extensions::NativeContextExtensions;
-use std::{cmp::min, collections::VecDeque, fmt::Write, mem, sync::Arc};
+use std::{cmp::min, collections::VecDeque, fmt::Write, sync::Arc};
 use tracing::error;
 
 macro_rules! debug_write {
@@ -66,6 +68,19 @@ pub(crate) struct Interpreter {
     operand_stack: Stack,
     /// The stack of active functions.
     call_stack: CallStack,
+    /// Whether to perform a paranoid type safety checks at runtime.
+    paranoid_type_checks: bool,
+}
+
+struct TypeWithLoader<'a, 'b> {
+    ty: &'a Type,
+    loader: &'b Loader,
+}
+
+impl<'a, 'b> TypeView for TypeWithLoader<'a, 'b> {
+    fn to_type_tag(&self) -> TypeTag {
+        self.loader.type_to_type_tag(self.ty).unwrap()
+    }
 }
 
 impl Interpreter {
@@ -76,42 +91,17 @@ impl Interpreter {
         ty_args: Vec<Type>,
         args: Vec<Value>,
         data_store: &mut impl DataStore,
-        gas_status: &mut GasStatus,
+        gas_meter: &mut impl GasMeter,
         extensions: &mut NativeContextExtensions,
         loader: &Loader,
     ) -> VMResult<Vec<Value>> {
-        // We count the intrinsic cost of the transaction here, since that needs to also cover the
-        // setup of the function.
-        let mut interp = Self::new();
-        interp.execute(
-            loader, data_store, gas_status, extensions, function, ty_args, args,
-        )
-    }
-
-    /// Create a new instance of an `Interpreter` in the context of a transaction with a
-    /// given module cache and gas schedule.
-    fn new() -> Self {
         Interpreter {
             operand_stack: Stack::new(),
             call_stack: CallStack::new(),
+            paranoid_type_checks: loader.vm_config().paranoid_type_checks,
         }
-    }
-
-    /// Internal execution entry point.
-    fn execute(
-        &mut self,
-        loader: &Loader,
-        data_store: &mut impl DataStore,
-        gas_status: &mut GasStatus,
-        extensions: &mut NativeContextExtensions,
-        function: Arc<Function>,
-        ty_args: Vec<Type>,
-        args: Vec<Value>,
-    ) -> VMResult<Vec<Value>> {
-        // No unwinding of the call stack and value stack need to be done here -- the context will
-        // take care of that.
-        self.execute_main(
-            loader, data_store, gas_status, extensions, function, ty_args, args,
+        .execute_main(
+            loader, data_store, gas_meter, extensions, function, ty_args, args,
         )
     }
 
@@ -121,13 +111,11 @@ impl Interpreter {
     /// function represented by the frame. Control comes back to this function on return or
     /// on call. When that happens the frame is changes to a new one (call) or to the one
     /// at the top of the stack (return). If the call stack is empty execution is completed.
-    // REVIEW: create account will be removed in favor of a native function (no opcode) and
-    // we can simplify this code quite a bit.
     fn execute_main(
-        &mut self,
+        mut self,
         loader: &Loader,
         data_store: &mut impl DataStore,
-        gas_status: &mut GasStatus,
+        gas_meter: &mut impl GasMeter,
         extensions: &mut NativeContextExtensions,
         function: Arc<Function>,
         ty_args: Vec<Type>,
@@ -140,37 +128,67 @@ impl Interpreter {
                 .map_err(|e| self.set_location(e))?;
         }
 
-        let mut current_frame = Frame::new(function, ty_args, locals);
+        let mut current_frame = self
+            .make_new_frame(loader, function, ty_args, locals)
+            .map_err(|err| self.set_location(err))?;
         loop {
             let resolver = current_frame.resolver(loader);
-            let exit_code = current_frame //self
-                .execute_code(&resolver, self, data_store, gas_status)
-                .map_err(|err| self.maybe_core_dump(err, &current_frame))?;
+            let exit_code =
+                current_frame //self
+                    .execute_code(&resolver, &mut self, data_store, gas_meter)
+                    .map_err(|err| self.maybe_core_dump(err, &current_frame))?;
             match exit_code {
                 ExitCode::Return => {
+                    let non_ref_vals = current_frame
+                        .locals
+                        .drop_all_values()
+                        .map(|(_idx, val)| val);
+
+                    // TODO: Check if the error location is set correctly.
+                    gas_meter
+                        .charge_drop_frame(non_ref_vals.into_iter())
+                        .map_err(|e| self.set_location(e))?;
+
                     if let Some(frame) = self.call_stack.pop() {
+                        // Note: the caller will find the callee's return values at the top of the shared operand stack
                         current_frame = frame;
                         current_frame.pc += 1; // advance past the Call instruction in the caller
                     } else {
-                        return Ok(mem::take(&mut self.operand_stack.0));
+                        // end of execution. `self` should no longer be used afterward
+                        return Ok(self.operand_stack.value);
                     }
                 }
                 ExitCode::Call(fh_idx) => {
-                    gas_status
-                        .charge_instr_with_size(Opcodes::CALL, AbstractMemorySize::new(1))
-                        .map_err(|e| set_err_info!(current_frame, e))?;
                     let func = resolver.function_from_handle(fh_idx);
-                    gas_status
-                        .charge_instr_with_size(
-                            Opcodes::CALL,
-                            AbstractMemorySize::new(func.arg_count() as GasCarrier),
+
+                    if self.paranoid_type_checks {
+                        self.check_friend_or_private_call(&current_frame.function, &func)?;
+                    }
+
+                    // Charge gas
+                    let module_id = func
+                        .module_id()
+                        .ok_or_else(|| {
+                            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                                .with_message("Failed to get native function module id".to_string())
+                        })
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+                    gas_meter
+                        .charge_call(
+                            module_id,
+                            func.name(),
+                            self.operand_stack
+                                .last_n(func.arg_count())
+                                .map_err(|e| set_err_info!(current_frame, e))?,
+                            (func.local_count() as u64).into(),
                         )
                         .map_err(|e| set_err_info!(current_frame, e))?;
+
                     if func.is_native() {
                         self.call_native(
                             &resolver,
                             data_store,
-                            gas_status,
+                            gas_meter,
                             extensions,
                             func,
                             vec![],
@@ -179,42 +197,58 @@ impl Interpreter {
                         continue;
                     }
                     let frame = self
-                        .make_call_frame(func, vec![])
+                        .make_call_frame(loader, func, vec![])
+                        .map_err(|e| self.set_location(e))
                         .map_err(|err| self.maybe_core_dump(err, &current_frame))?;
                     self.call_stack.push(current_frame).map_err(|frame| {
                         let err = PartialVMError::new(StatusCode::CALL_STACK_OVERFLOW);
                         let err = set_err_info!(frame, err);
                         self.maybe_core_dump(err, &frame)
                     })?;
+                    // Note: the caller will find the the callee's return values at the top of the shared operand stack
                     current_frame = frame;
                 }
                 ExitCode::CallGeneric(idx) => {
-                    let arity = resolver.type_params_count(idx);
-                    gas_status
-                        .charge_instr_with_size(
-                            Opcodes::CALL_GENERIC,
-                            AbstractMemorySize::new((arity + 1) as GasCarrier),
-                        )
-                        .map_err(|e| set_err_info!(current_frame, e))?;
+                    // TODO(Gas): We should charge gas as we do type substitution...
                     let ty_args = resolver
                         .instantiate_generic_function(idx, current_frame.ty_args())
                         .map_err(|e| set_err_info!(current_frame, e))?;
                     let func = resolver.function_from_instantiation(idx);
-                    gas_status
-                        .charge_instr_with_size(
-                            Opcodes::CALL_GENERIC,
-                            AbstractMemorySize::new(func.arg_count() as GasCarrier),
+
+                    if self.paranoid_type_checks {
+                        self.check_friend_or_private_call(&current_frame.function, &func)?;
+                    }
+
+                    // Charge gas
+                    let module_id = func
+                        .module_id()
+                        .ok_or_else(|| {
+                            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                                .with_message("Failed to get native function module id".to_string())
+                        })
+                        .map_err(|e| set_err_info!(current_frame, e))?;
+                    gas_meter
+                        .charge_call_generic(
+                            module_id,
+                            func.name(),
+                            ty_args.iter().map(|ty| TypeWithLoader { ty, loader }),
+                            self.operand_stack
+                                .last_n(func.arg_count())
+                                .map_err(|e| set_err_info!(current_frame, e))?,
+                            (func.local_count() as u64).into(),
                         )
                         .map_err(|e| set_err_info!(current_frame, e))?;
+
                     if func.is_native() {
                         self.call_native(
-                            &resolver, data_store, gas_status, extensions, func, ty_args,
+                            &resolver, data_store, gas_meter, extensions, func, ty_args,
                         )?;
                         current_frame.pc += 1; // advance past the Call instruction in the caller
                         continue;
                     }
                     let frame = self
-                        .make_call_frame(func, ty_args)
+                        .make_call_frame(loader, func, ty_args)
+                        .map_err(|e| self.set_location(e))
                         .map_err(|err| self.maybe_core_dump(err, &current_frame))?;
                     self.call_stack.push(current_frame).map_err(|frame| {
                         let err = PartialVMError::new(StatusCode::CALL_STACK_OVERFLOW);
@@ -232,18 +266,65 @@ impl Interpreter {
     ///
     /// Native functions do not push a frame at the moment and as such errors from a native
     /// function are incorrectly attributed to the caller.
-    fn make_call_frame(&mut self, func: Arc<Function>, ty_args: Vec<Type>) -> VMResult<Frame> {
+    fn make_call_frame(
+        &mut self,
+        loader: &Loader,
+        func: Arc<Function>,
+        ty_args: Vec<Type>,
+    ) -> PartialVMResult<Frame> {
         let mut locals = Locals::new(func.local_count());
         let arg_count = func.arg_count();
+        let is_generic = !ty_args.is_empty();
         for i in 0..arg_count {
-            locals
-                .store_loc(
-                    arg_count - i - 1,
-                    self.operand_stack.pop().map_err(|e| self.set_location(e))?,
-                )
-                .map_err(|e| self.set_location(e))?;
+            locals.store_loc(arg_count - i - 1, self.operand_stack.pop()?)?;
+
+            if self.paranoid_type_checks {
+                let ty = self.operand_stack.pop_ty()?;
+                let resolver = func.get_resolver(loader);
+                if is_generic {
+                    ty.check_eq(
+                        &resolver.subst(&func.local_types()[arg_count - i - 1], &ty_args)?,
+                    )?;
+                } else {
+                    // Directly check against the expected type to save a clone here.
+                    ty.check_eq(&func.local_types()[arg_count - i - 1])?;
+                }
+            }
         }
-        Ok(Frame::new(func, ty_args, locals))
+        self.make_new_frame(loader, func, ty_args, locals)
+    }
+
+    /// Create a new `Frame` given a `Function` and the function `Locals`.
+    ///
+    /// The locals must be loaded before calling this.
+    fn make_new_frame(
+        &self,
+        loader: &Loader,
+        function: Arc<Function>,
+        ty_args: Vec<Type>,
+        locals: Locals,
+    ) -> PartialVMResult<Frame> {
+        let local_tys = if self.paranoid_type_checks {
+            if ty_args.is_empty() {
+                function.local_types().to_vec()
+            } else {
+                let resolver = function.get_resolver(loader);
+                function
+                    .local_types()
+                    .iter()
+                    .map(|ty| resolver.subst(ty, &ty_args))
+                    .collect::<PartialVMResult<Vec<_>>>()?
+            }
+        } else {
+            vec![]
+        };
+        Ok(Frame {
+            pc: 0,
+            locals,
+            function,
+            ty_args,
+            local_tys,
+        })
     }
 
     /// Call a native functions.
@@ -251,7 +332,7 @@ impl Interpreter {
         &mut self,
         resolver: &Resolver,
         data_store: &mut dyn DataStore,
-        gas_status: &mut GasStatus,
+        gas_meter: &mut impl GasMeter,
         extensions: &mut NativeContextExtensions,
         function: Arc<Function>,
         ty_args: Vec<Type>,
@@ -260,7 +341,7 @@ impl Interpreter {
         self.call_native_impl(
             resolver,
             data_store,
-            gas_status,
+            gas_meter,
             extensions,
             function.clone(),
             ty_args,
@@ -281,30 +362,129 @@ impl Interpreter {
         &mut self,
         resolver: &Resolver,
         data_store: &mut dyn DataStore,
-        gas_status: &mut GasStatus,
+        gas_meter: &mut impl GasMeter,
         extensions: &mut NativeContextExtensions,
         function: Arc<Function>,
         ty_args: Vec<Type>,
     ) -> PartialVMResult<()> {
-        let mut arguments = VecDeque::new();
+        let return_type_count = function.return_type_count();
+        let mut args = VecDeque::new();
         let expected_args = function.arg_count();
         for _ in 0..expected_args {
-            arguments.push_front(self.operand_stack.pop()?);
+            args.push_front(self.operand_stack.pop()?);
         }
-        let mut native_context =
-            NativeContext::new(self, data_store, gas_status, resolver, extensions);
+
+        if self.paranoid_type_checks {
+            for i in 0..expected_args {
+                let expected_ty =
+                    resolver.subst(&function.parameter_types()[expected_args - i - 1], &ty_args)?;
+                let ty = self.operand_stack.pop_ty()?;
+                ty.check_eq(&expected_ty)?;
+            }
+        }
+
+        let mut native_context = NativeContext::new(
+            self,
+            data_store,
+            resolver,
+            extensions,
+            gas_meter.balance_internal(),
+        );
         let native_function = function.get_native()?;
-        let result = native_function(&mut native_context, ty_args, arguments)?;
-        gas_status.deduct_gas(result.cost)?;
-        let return_values = result
-            .result
-            .map_err(|code| PartialVMError::new(StatusCode::ABORTED).with_sub_status(code))?;
+
+        gas_meter.charge_native_function_before_execution(
+            ty_args.iter().map(|ty| TypeWithLoader {
+                ty,
+                loader: resolver.loader(),
+            }),
+            args.iter(),
+        )?;
+
+        let result = native_function(&mut native_context, ty_args.clone(), args)?;
+
+        // Note(Gas): The order by which gas is charged / error gets returned MUST NOT be modified
+        //            here or otherwise it becomes an incompatible change!!!
+        let return_values = match result {
+            NativeResult::Success { cost, ret_vals } => {
+                gas_meter.charge_native_function(cost, Some(ret_vals.iter()))?;
+                ret_vals
+            }
+            NativeResult::Abort { cost, abort_code } => {
+                gas_meter.charge_native_function(cost, Option::<std::iter::Empty<&Value>>::None)?;
+                return Err(PartialVMError::new(StatusCode::ABORTED).with_sub_status(abort_code));
+            }
+            NativeResult::OutOfGas { partial_cost } => {
+                let err = match gas_meter.charge_native_function(
+                    partial_cost,
+                    Option::<std::iter::Empty<&Value>>::None,
+                ) {
+                    Err(err) if err.major_status() == StatusCode::OUT_OF_GAS => err,
+                    Ok(_) | Err(_) => PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                        "The partial cost returned by the native function did not cause the gas meter to trigger an OutOfGas error, at least one of them is violating the contract".to_string()
+                    ),
+                };
+
+                return Err(err);
+            }
+        };
+
+        // Paranoid check to protect us against incorrect native function implementations. A native function that
+        // returns a different number of values than its declared types will trigger this check
+        if return_values.len() != return_type_count {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    "Arity mismatch: return value count does not match return type count"
+                        .to_string(),
+                ),
+            );
+        }
+        // Put return values on the top of the operand stack, where the caller will find them.
+        // This is one of only two times the operand stack is shared across call stack frames; the other is in handling
+        // the Return instruction for normal calls
         for value in return_values {
             self.operand_stack.push(value)?;
         }
+
+        if self.paranoid_type_checks {
+            for ty in function.return_types() {
+                self.operand_stack.push_ty(ty.subst(&ty_args)?)?;
+            }
+        }
         Ok(())
     }
 
+    /// Make sure only private/friend function can only be invoked by modules under the same address.
+    fn check_friend_or_private_call(
+        &self,
+        caller: &Arc<Function>,
+        callee: &Arc<Function>,
+    ) -> VMResult<()> {
+        if callee.is_friend_or_private() {
+            match (caller.module_id(), callee.module_id()) {
+                (Some(caller_id), Some(callee_id)) => {
+                    if caller_id.address() == callee_id.address() {
+                        Ok(())
+                    } else {
+                        Err(self.set_location(PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                                .with_message(
+                                    format!("Private/Friend function invokation error, caller: {:?}::{:?}, callee: {:?}::{:?}", caller_id, caller.name(), callee_id, callee.name()),
+                                )))
+                    }
+                }
+                _ => Err(self.set_location(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!(
+                            "Private/Friend function invokation error caller: {:?}, callee {:?}",
+                            caller.name(),
+                            callee.name()
+                        )),
+                )),
+            }
+        } else {
+            Ok(())
+        }
+    }
+
     /// Perform a binary operation to two values at the top of the stack.
     fn binop<F, T>(&mut self, f: F) -> PartialVMResult<()>
     where
@@ -325,8 +505,11 @@ impl Interpreter {
         self.binop(|lhs, rhs| {
             Ok(match f(lhs, rhs)? {
                 IntegerValue::U8(x) => Value::u8(x),
+                IntegerValue::U16(x) => Value::u16(x),
+                IntegerValue::U32(x) => Value::u32(x),
                 IntegerValue::U64(x) => Value::u64(x),
                 IntegerValue::U128(x) => Value::u128(x),
+                IntegerValue::U256(x) => Value::u256(x),
             })
         })
     }
@@ -340,14 +523,33 @@ impl Interpreter {
         self.binop(|lhs, rhs| Ok(Value::bool(f(lhs, rhs)?)))
     }
 
-    /// Load a resource from the data store.
+    /// Loads a resource from the data store and return the number of bytes read from the storage.
     fn load_resource<'b>(
+        gas_meter: &mut impl GasMeter,
         data_store: &'b mut impl DataStore,
         addr: AccountAddress,
         ty: &Type,
     ) -> PartialVMResult<&'b mut GlobalValue> {
         match data_store.load_resource(addr, ty) {
-            Ok(gv) => Ok(gv),
+            Ok((gv, load_res)) => {
+                if let Some(loaded) = load_res {
+                    let opt = match loaded {
+                        Some(num_bytes) => {
+                            let view = gv.view().ok_or_else(|| {
+                                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                                    .with_message(
+                                        "Failed to create view for global value".to_owned(),
+                                    )
+                            })?;
+
+                            Some((num_bytes, view))
+                        }
+                        None => None,
+                    };
+                    gas_meter.charge_load_resource(opt)?;
+                }
+                Ok(gv)
+            }
             Err(e) => {
                 error!(
                     "[VM] error loading resource at ({}, {:?}): {:?} from data store",
@@ -361,54 +563,105 @@ impl Interpreter {
     /// BorrowGlobal (mutable and not) opcode.
     fn borrow_global(
         &mut self,
+        is_mut: bool,
+        is_generic: bool,
+        loader: &Loader,
+        gas_meter: &mut impl GasMeter,
         data_store: &mut impl DataStore,
         addr: AccountAddress,
         ty: &Type,
-    ) -> PartialVMResult<AbstractMemorySize<GasCarrier>> {
-        let g = Self::load_resource(data_store, addr, ty)?.borrow_global()?;
-        let size = g.size();
-        self.operand_stack.push(g)?;
-        Ok(size)
+    ) -> PartialVMResult<()> {
+        let res = Self::load_resource(gas_meter, data_store, addr, ty)?.borrow_global();
+        gas_meter.charge_borrow_global(
+            is_mut,
+            is_generic,
+            TypeWithLoader { ty, loader },
+            res.is_ok(),
+        )?;
+        self.operand_stack.push(res?)?;
+        Ok(())
     }
 
     /// Exists opcode.
     fn exists(
         &mut self,
+        is_generic: bool,
+        loader: &Loader,
+        gas_meter: &mut impl GasMeter,
         data_store: &mut impl DataStore,
         addr: AccountAddress,
         ty: &Type,
-    ) -> PartialVMResult<AbstractMemorySize<GasCarrier>> {
-        let gv = Self::load_resource(data_store, addr, ty)?;
-        let mem_size = gv.size();
+    ) -> PartialVMResult<()> {
+        let gv = Self::load_resource(gas_meter, data_store, addr, ty)?;
         let exists = gv.exists()?;
+        gas_meter.charge_exists(is_generic, TypeWithLoader { ty, loader }, exists)?;
         self.operand_stack.push(Value::bool(exists))?;
-        Ok(mem_size)
+        Ok(())
     }
 
     /// MoveFrom opcode.
     fn move_from(
         &mut self,
+        is_generic: bool,
+        loader: &Loader,
+        gas_meter: &mut impl GasMeter,
         data_store: &mut impl DataStore,
         addr: AccountAddress,
         ty: &Type,
-    ) -> PartialVMResult<AbstractMemorySize<GasCarrier>> {
-        let resource = Self::load_resource(data_store, addr, ty)?.move_from()?;
-        let size = resource.size();
+    ) -> PartialVMResult<()> {
+        let resource = match Self::load_resource(gas_meter, data_store, addr, ty)?.move_from() {
+            Ok(resource) => {
+                gas_meter.charge_move_from(
+                    is_generic,
+                    TypeWithLoader { ty, loader },
+                    Some(&resource),
+                )?;
+                resource
+            }
+            Err(err) => {
+                let val: Option<&Value> = None;
+                gas_meter.charge_move_from(is_generic, TypeWithLoader { ty, loader }, val)?;
+                return Err(err);
+            }
+        };
         self.operand_stack.push(resource)?;
-        Ok(size)
+        Ok(())
     }
 
     /// MoveTo opcode.
     fn move_to(
         &mut self,
+        is_generic: bool,
+        loader: &Loader,
+        gas_meter: &mut impl GasMeter,
         data_store: &mut impl DataStore,
         addr: AccountAddress,
         ty: &Type,
         resource: Value,
-    ) -> PartialVMResult<AbstractMemorySize<GasCarrier>> {
-        let size = resource.size();
-        Self::load_resource(data_store, addr, ty)?.move_to(resource)?;
-        Ok(size)
+    ) -> PartialVMResult<()> {
+        let gv = Self::load_resource(gas_meter, data_store, addr, ty)?;
+        // NOTE(Gas): To maintain backward compatibility, we need to charge gas after attempting
+        //            the move_to operation.
+        match gv.move_to(resource) {
+            Ok(()) => {
+                gas_meter.charge_move_to(
+                    is_generic,
+                    TypeWithLoader { ty, loader },
+                    gv.view().unwrap(),
+                    true,
+                )?;
+                Ok(())
+            }
+            Err((err, resource)) => {
+                gas_meter.charge_move_to(
+                    is_generic,
+                    TypeWithLoader { ty, loader },
+                    &resource,
+                    false,
+                )?;
+                Err(err)
+            }
+        }
     }
 
     //
@@ -513,7 +766,7 @@ impl Interpreter {
             self.debug_print_frame(buf, loader, i, frame)?;
         }
         debug_writeln!(buf, "Operand Stack:")?;
-        for (idx, val) in self.operand_stack.0.iter().enumerate() {
+        for (idx, val) in self.operand_stack.value.iter().enumerate() {
             // TODO: Currently we do not know the types of the values on the operand stack.
             // Revisit.
             debug_write!(buf, "    [{}] ", idx)?;
@@ -561,9 +814,16 @@ impl Interpreter {
             }
             internal_state.push_str(format!("{}* {:?}\n", i, code[pc]).as_str());
         }
-        internal_state.push_str(format!("Locals:\n{}\n", current_frame.locals).as_str());
+        internal_state.push_str(
+            format!(
+                "Locals ({:x}):\n{}\n",
+                current_frame.locals.raw_address(),
+                current_frame.locals
+            )
+            .as_str(),
+        );
         internal_state.push_str("Operand Stack:\n");
-        for value in &self.operand_stack.0 {
+        for value in &self.operand_stack.value {
             internal_state.push_str(format!("{}\n", value).as_str());
         }
         internal_state
@@ -574,6 +834,11 @@ impl Interpreter {
     }
 
     fn get_internal_state(&self) -> ExecutionState {
+        self.get_stack_frames(usize::MAX)
+    }
+
+    /// Get count stack frames starting from the top of the stack.
+    pub(crate) fn get_stack_frames(&self, count: usize) -> ExecutionState {
         // collect frames in the reverse order as this is what is
         // normally expected from the stack trace (outermost frame
         // is the last one)
@@ -582,6 +847,7 @@ impl Interpreter {
             .0
             .iter()
             .rev()
+            .take(count)
             .map(|frame| {
                 (
                     frame.function.module_id().cloned(),
@@ -599,19 +865,25 @@ const OPERAND_STACK_SIZE_LIMIT: usize = 1024;
 const CALL_STACK_SIZE_LIMIT: usize = 1024;
 
 /// The operand stack.
-struct Stack(Vec<Value>);
+struct Stack {
+    value: Vec<Value>,
+    types: Vec<Type>,
+}
 
 impl Stack {
     /// Create a new empty operand stack.
     fn new() -> Self {
-        Stack(vec![])
+        Stack {
+            value: vec![],
+            types: vec![],
+        }
     }
 
     /// Push a `Value` on the stack if the max stack size has not been reached. Abort execution
     /// otherwise.
     fn push(&mut self, value: Value) -> PartialVMResult<()> {
-        if self.0.len() < OPERAND_STACK_SIZE_LIMIT {
-            self.0.push(value);
+        if self.value.len() < OPERAND_STACK_SIZE_LIMIT {
+            self.value.push(value);
             Ok(())
         } else {
             Err(PartialVMError::new(StatusCode::EXECUTION_STACK_OVERFLOW))
@@ -620,7 +892,7 @@ impl Stack {
 
     /// Pop a `Value` off the stack or abort execution if the stack is empty.
     fn pop(&mut self) -> PartialVMResult<Value> {
-        self.0
+        self.value
             .pop()
             .ok_or_else(|| PartialVMError::new(StatusCode::EMPTY_VALUE_STACK))
     }
@@ -637,13 +909,61 @@ impl Stack {
     /// Pop n values off the stack.
     fn popn(&mut self, n: u16) -> PartialVMResult<Vec<Value>> {
         let remaining_stack_size = self
-            .0
+            .value
             .len()
             .checked_sub(n as usize)
             .ok_or_else(|| PartialVMError::new(StatusCode::EMPTY_VALUE_STACK))?;
-        let args = self.0.split_off(remaining_stack_size);
+        let args = self.value.split_off(remaining_stack_size);
         Ok(args)
     }
+
+    fn last_n(&self, n: usize) -> PartialVMResult<impl ExactSizeIterator<Item = &Value>> {
+        if self.value.len() < n {
+            return Err(PartialVMError::new(StatusCode::EMPTY_VALUE_STACK)
+                .with_message("Failed to get last n arguments on the argument stack".to_string()));
+        }
+        Ok(self.value[(self.value.len() - n)..].iter())
+    }
+
+    /// Push a `Value` on the stack if the max stack size has not been reached. Abort execution
+    /// otherwise.
+    fn push_ty(&mut self, ty: Type) -> PartialVMResult<()> {
+        if self.types.len() < OPERAND_STACK_SIZE_LIMIT {
+            self.types.push(ty);
+            Ok(())
+        } else {
+            Err(PartialVMError::new(StatusCode::EXECUTION_STACK_OVERFLOW))
+        }
+    }
+
+    /// Pop a `Value` off the stack or abort execution if the stack is empty.
+    fn pop_ty(&mut self) -> PartialVMResult<Type> {
+        self.types
+            .pop()
+            .ok_or_else(|| PartialVMError::new(StatusCode::EMPTY_VALUE_STACK))
+    }
+
+    /// Pop n values off the stack.
+    fn popn_tys(&mut self, n: u16) -> PartialVMResult<Vec<Type>> {
+        let remaining_stack_size = self
+            .types
+            .len()
+            .checked_sub(n as usize)
+            .ok_or_else(|| PartialVMError::new(StatusCode::EMPTY_VALUE_STACK))?;
+        let args = self.types.split_off(remaining_stack_size);
+        Ok(args)
+    }
+
+    fn check_balance(&self) -> PartialVMResult<()> {
+        if self.types.len() != self.value.len() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    "Paranoid Mode: Type and value stack need to be balanced".to_string(),
+                ),
+            );
+        }
+        Ok(())
+    }
 }
 
 /// A call stack.
@@ -677,6 +997,91 @@ impl CallStack {
     }
 }
 
+fn check_depth_of_type(resolver: &Resolver, ty: &Type) -> PartialVMResult<()> {
+    // Start at 1 since we always call this right before we add a new node to the value's depth.
+    let max_depth = match resolver.loader().vm_config().max_value_nest_depth {
+        Some(max_depth) => max_depth,
+        None => return Ok(()),
+    };
+    check_depth_of_type_impl(resolver, ty, max_depth, 1)?;
+    Ok(())
+}
+
+fn check_depth_of_type_impl(
+    resolver: &Resolver,
+    ty: &Type,
+    max_depth: u64,
+    depth: u64,
+) -> PartialVMResult<u64> {
+    macro_rules! check_depth {
+        ($additional_depth:expr) => {{
+            let new_depth = depth.saturating_add($additional_depth);
+            if new_depth > max_depth {
+                return Err(PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED));
+            } else {
+                new_depth
+            }
+        }};
+    }
+
+    // Calculate depth of the type itself
+    let ty_depth = match ty {
+        Type::Bool
+        | Type::U8
+        | Type::U16
+        | Type::U32
+        | Type::U64
+        | Type::U128
+        | Type::U256
+        | Type::Address
+        | Type::Signer => check_depth!(0),
+        // Even though this is recursive this is OK since the depth of this recursion is
+        // bounded by the depth of the type arguments, which we have already checked.
+        Type::Reference(ty) | Type::MutableReference(ty) | Type::Vector(ty) => {
+            check_depth_of_type_impl(resolver, ty, max_depth, check_depth!(1))?
+        }
+        Type::Struct(si) => {
+            let struct_type = resolver.loader().get_struct_type(*si).ok_or_else(|| {
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Struct Definition not resolved".to_string())
+            })?;
+            check_depth!(struct_type
+                .depth
+                .as_ref()
+                .ok_or_else(|| { PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED) })?
+                .solve(&[]))
+        }
+        // NB: substitution must be performed before calling this function
+        Type::StructInstantiation(si, ty_args) => {
+            // Calculate depth of all type arguments, and make sure they themselves are not too deep.
+            let ty_arg_depths = ty_args
+                .iter()
+                .map(|ty| {
+                    // Ty args should be fully resolved and not need any type arguments
+                    check_depth_of_type_impl(resolver, ty, max_depth, check_depth!(0))
+                })
+                .collect::<PartialVMResult<Vec<_>>>()?;
+            let struct_type = resolver.loader().get_struct_type(*si).ok_or_else(|| {
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Struct Definition not resolved".to_string())
+            })?;
+            check_depth!(struct_type
+                .depth
+                .as_ref()
+                .ok_or_else(|| { PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED) })?
+                .solve(&ty_arg_depths))
+        }
+        Type::TyParam(_) => {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Type parameter should be fully resolved".to_string()),
+            )
+        }
+    };
+
+    Ok(ty_depth)
+}
+
 /// A `Frame` is the execution context for a function. It holds the locals of the function and
 /// the function itself.
 // #[derive(Debug)]
@@ -685,6 +1090,7 @@ struct Frame {
     locals: Locals,
     function: Arc<Function>,
     ty_args: Vec<Type>,
+    local_tys: Vec<Type>,
 }
 
 /// An `ExitCode` from `execute_code_unit`.
@@ -695,41 +1101,656 @@ enum ExitCode {
     CallGeneric(FunctionInstantiationIndex),
 }
 
-impl Frame {
-    /// Create a new `Frame` given a `Function` and the function `Locals`.
-    ///
-    /// The locals must be loaded before calling this.
-    fn new(function: Arc<Function>, ty_args: Vec<Type>, locals: Locals) -> Self {
-        Frame {
-            pc: 0,
-            locals,
-            function,
-            ty_args,
-        }
+fn check_ability(has_ability: bool) -> PartialVMResult<()> {
+    if has_ability {
+        Ok(())
+    } else {
+        Err(
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("Paranoid Mode: Expected ability mismatch".to_string()),
+        )
     }
+}
 
+impl Frame {
     /// Execute a Move function until a return or a call opcode is found.
     fn execute_code(
         &mut self,
         resolver: &Resolver,
         interpreter: &mut Interpreter,
         data_store: &mut impl DataStore,
-        gas_status: &mut GasStatus,
+        gas_meter: &mut impl GasMeter,
     ) -> VMResult<ExitCode> {
-        self.execute_code_impl(resolver, interpreter, data_store, gas_status)
+        self.execute_code_impl(resolver, interpreter, data_store, gas_meter)
             .map_err(|e| {
+                let e = if cfg!(feature = "testing") || cfg!(feature = "stacktrace") {
+                    e.with_exec_state(interpreter.get_internal_state())
+                } else {
+                    e
+                };
                 e.at_code_offset(self.function.index(), self.pc)
                     .finish(self.location())
             })
     }
 
+    /// Paranoid type checks to perform before instruction execution.
+    ///
+    /// Note that most of the checks should happen after instruction execution, because gas charging will happen during
+    /// instruction execution and we want to avoid running code without charging proper gas as much as possible.
+    fn pre_execution_type_stack_transition(
+        local_tys: &[Type],
+        locals: &Locals,
+        _ty_args: &[Type],
+        resolver: &Resolver,
+        interpreter: &mut Interpreter,
+        instruction: &Bytecode,
+    ) -> PartialVMResult<()> {
+        match instruction {
+            // Call instruction will be checked at execute_main.
+            Bytecode::Call(_) | Bytecode::CallGeneric(_) => (),
+            Bytecode::BrFalse(_) | Bytecode::BrTrue(_) => {
+                interpreter.operand_stack.pop_ty()?;
+            }
+            Bytecode::Branch(_) => (),
+            Bytecode::Ret => {
+                for (idx, ty) in local_tys.iter().enumerate() {
+                    if !locals.is_invalid(idx)? {
+                        check_ability(resolver.loader().abilities(ty)?.has_drop())?;
+                    }
+                }
+            }
+            Bytecode::Abort => {
+                interpreter.operand_stack.pop_ty()?;
+            }
+            // StLoc needs to check before execution as we need to check the drop ability of values.
+            Bytecode::StLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                let val_ty = interpreter.operand_stack.pop_ty()?;
+                ty.check_eq(&val_ty)?;
+                if !locals.is_invalid(*idx as usize)? {
+                    check_ability(resolver.loader().abilities(&ty)?.has_drop())?;
+                }
+            }
+            // We will check the rest of the instructions after execution phase.
+            Bytecode::Pop
+            | Bytecode::LdU8(_)
+            | Bytecode::LdU16(_)
+            | Bytecode::LdU32(_)
+            | Bytecode::LdU64(_)
+            | Bytecode::LdU128(_)
+            | Bytecode::LdU256(_)
+            | Bytecode::LdTrue
+            | Bytecode::LdFalse
+            | Bytecode::LdConst(_)
+            | Bytecode::CopyLoc(_)
+            | Bytecode::MoveLoc(_)
+            | Bytecode::MutBorrowLoc(_)
+            | Bytecode::ImmBorrowLoc(_)
+            | Bytecode::ImmBorrowField(_)
+            | Bytecode::MutBorrowField(_)
+            | Bytecode::ImmBorrowFieldGeneric(_)
+            | Bytecode::MutBorrowFieldGeneric(_)
+            | Bytecode::Pack(_)
+            | Bytecode::PackGeneric(_)
+            | Bytecode::Unpack(_)
+            | Bytecode::UnpackGeneric(_)
+            | Bytecode::ReadRef
+            | Bytecode::WriteRef
+            | Bytecode::CastU8
+            | Bytecode::CastU16
+            | Bytecode::CastU32
+            | Bytecode::CastU64
+            | Bytecode::CastU128
+            | Bytecode::CastU256
+            | Bytecode::Add
+            | Bytecode::Sub
+            | Bytecode::Mul
+            | Bytecode::Mod
+            | Bytecode::Div
+            | Bytecode::BitOr
+            | Bytecode::BitAnd
+            | Bytecode::Xor
+            | Bytecode::Or
+            | Bytecode::And
+            | Bytecode::Shl
+            | Bytecode::Shr
+            | Bytecode::Lt
+            | Bytecode::Le
+            | Bytecode::Gt
+            | Bytecode::Ge
+            | Bytecode::Eq
+            | Bytecode::Neq
+            | Bytecode::MutBorrowGlobal(_)
+            | Bytecode::ImmBorrowGlobal(_)
+            | Bytecode::MutBorrowGlobalGeneric(_)
+            | Bytecode::ImmBorrowGlobalGeneric(_)
+            | Bytecode::Exists(_)
+            | Bytecode::ExistsGeneric(_)
+            | Bytecode::MoveTo(_)
+            | Bytecode::MoveToGeneric(_)
+            | Bytecode::MoveFrom(_)
+            | Bytecode::MoveFromGeneric(_)
+            | Bytecode::FreezeRef
+            | Bytecode::Nop
+            | Bytecode::Not
+            | Bytecode::VecPack(_, _)
+            | Bytecode::VecLen(_)
+            | Bytecode::VecImmBorrow(_)
+            | Bytecode::VecMutBorrow(_)
+            | Bytecode::VecPushBack(_)
+            | Bytecode::VecPopBack(_)
+            | Bytecode::VecUnpack(_, _)
+            | Bytecode::VecSwap(_) => (),
+        };
+        Ok(())
+    }
+
+    /// Paranoid type checks to perform after instruction execution.
+    ///
+    /// This function and `pre_execution_type_stack_transition` should constitute the full type stack transition for the paranoid mode.
+    fn post_execution_type_stack_transition(
+        local_tys: &[Type],
+        ty_args: &[Type],
+        resolver: &Resolver,
+        interpreter: &mut Interpreter,
+        instruction: &Bytecode,
+    ) -> PartialVMResult<()> {
+        match instruction {
+            Bytecode::BrTrue(_) | Bytecode::BrFalse(_) => (),
+            Bytecode::Branch(_)
+            | Bytecode::Ret
+            | Bytecode::Call(_)
+            | Bytecode::CallGeneric(_)
+            | Bytecode::Abort => {
+                // Invariants hold because all of the instructions above will force VM to break from the interpreter loop and thus not hit this code path.
+                unreachable!("control flow instruction encountered during type check")
+            }
+            Bytecode::Pop => {
+                let ty = interpreter.operand_stack.pop_ty()?;
+                check_ability(resolver.loader().abilities(&ty)?.has_drop())?;
+            }
+            Bytecode::LdU8(_) => interpreter.operand_stack.push_ty(Type::U8)?,
+            Bytecode::LdU16(_) => interpreter.operand_stack.push_ty(Type::U16)?,
+            Bytecode::LdU32(_) => interpreter.operand_stack.push_ty(Type::U32)?,
+            Bytecode::LdU64(_) => interpreter.operand_stack.push_ty(Type::U64)?,
+            Bytecode::LdU128(_) => interpreter.operand_stack.push_ty(Type::U128)?,
+            Bytecode::LdU256(_) => interpreter.operand_stack.push_ty(Type::U256)?,
+            Bytecode::LdTrue | Bytecode::LdFalse => {
+                interpreter.operand_stack.push_ty(Type::Bool)?
+            }
+            Bytecode::LdConst(i) => {
+                let constant = resolver.constant_at(*i);
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::from_const_signature(&constant.type_)?)?;
+            }
+            Bytecode::CopyLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                check_ability(resolver.loader().abilities(&ty)?.has_copy())?;
+                interpreter.operand_stack.push_ty(ty)?;
+            }
+            Bytecode::MoveLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                interpreter.operand_stack.push_ty(ty)?;
+            }
+            Bytecode::StLoc(_) => (),
+            Bytecode::MutBorrowLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(ty)))?;
+            }
+            Bytecode::ImmBorrowLoc(idx) => {
+                let ty = local_tys[*idx as usize].clone();
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(ty)))?;
+            }
+            Bytecode::ImmBorrowField(fh_idx) => {
+                let expected_ty = resolver.field_handle_to_struct(*fh_idx);
+                let top_ty = interpreter.operand_stack.pop_ty()?;
+                top_ty.check_ref_eq(&expected_ty)?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(resolver.get_field_type(*fh_idx)?)))?;
+            }
+            Bytecode::MutBorrowField(fh_idx) => {
+                let expected_ty = resolver.field_handle_to_struct(*fh_idx);
+                let top_ty = interpreter.operand_stack.pop_ty()?;
+                top_ty.check_eq(&Type::MutableReference(Box::new(expected_ty)))?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(
+                        resolver.get_field_type(*fh_idx)?,
+                    )))?;
+            }
+            Bytecode::ImmBorrowFieldGeneric(idx) => {
+                let expected_ty = resolver.field_instantiation_to_struct(*idx, ty_args)?;
+                let top_ty = interpreter.operand_stack.pop_ty()?;
+                top_ty.check_ref_eq(&expected_ty)?;
+                interpreter.operand_stack.push_ty(Type::Reference(Box::new(
+                    resolver.instantiate_generic_field(*idx, ty_args)?,
+                )))?;
+            }
+            Bytecode::MutBorrowFieldGeneric(idx) => {
+                let expected_ty = resolver.field_instantiation_to_struct(*idx, ty_args)?;
+                let top_ty = interpreter.operand_stack.pop_ty()?;
+                top_ty.check_eq(&Type::MutableReference(Box::new(expected_ty)))?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(
+                        resolver.instantiate_generic_field(*idx, ty_args)?,
+                    )))?;
+            }
+            Bytecode::Pack(idx) => {
+                let field_count = resolver.field_count(*idx);
+                let args_ty = resolver.get_struct_fields(*idx)?;
+                let output_ty = resolver.get_struct_type(*idx);
+                let ability = resolver.loader().abilities(&output_ty)?;
+
+                // If the struct has a key ability, we expects all of its field to have store ability but not key ability.
+                let field_expected_abilities = if ability.has_key() {
+                    ability
+                        .remove(Ability::Key)
+                        .union(AbilitySet::singleton(Ability::Store))
+                } else {
+                    ability
+                };
+
+                if field_count as usize != args_ty.fields.len() {
+                    return Err(
+                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                            .with_message("Args count mismatch".to_string()),
+                    );
+                }
+
+                for (ty, expected_ty) in interpreter
+                    .operand_stack
+                    .popn_tys(field_count)?
+                    .into_iter()
+                    .zip(args_ty.fields.iter())
+                {
+                    // Fields ability should be a subset of the struct ability because abilities can be weakened but not the other direction.
+                    // For example, it is ok to have a struct that doesn't have a copy capability where its field is a struct that has copy capability but not vice versa.
+                    check_ability(
+                        field_expected_abilities.is_subset(resolver.loader().abilities(&ty)?),
+                    )?;
+                    ty.check_eq(expected_ty)?;
+                }
+
+                interpreter.operand_stack.push_ty(output_ty)?;
+            }
+            Bytecode::PackGeneric(idx) => {
+                let field_count = resolver.field_instantiation_count(*idx);
+                let args_ty = resolver.instantiate_generic_struct_fields(*idx, ty_args)?;
+                let output_ty = resolver.instantiate_generic_type(*idx, ty_args)?;
+                let ability = resolver.loader().abilities(&output_ty)?;
+
+                // If the struct has a key ability, we expects all of its field to have store ability but not key ability.
+                let field_expected_abilities = if ability.has_key() {
+                    ability
+                        .remove(Ability::Key)
+                        .union(AbilitySet::singleton(Ability::Store))
+                } else {
+                    ability
+                };
+
+                if field_count as usize != args_ty.len() {
+                    return Err(
+                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                            .with_message("Args count mismatch".to_string()),
+                    );
+                }
+
+                for (ty, expected_ty) in interpreter
+                    .operand_stack
+                    .popn_tys(field_count)?
+                    .into_iter()
+                    .zip(args_ty.iter())
+                {
+                    // Fields ability should be a subset of the struct ability because abilities can be weakened but not the other direction.
+                    // For example, it is ok to have a struct that doesn't have a copy capability where its field is a struct that has copy capability but not vice versa.
+                    check_ability(
+                        field_expected_abilities.is_subset(resolver.loader().abilities(&ty)?),
+                    )?;
+                    ty.check_eq(expected_ty)?;
+                }
+
+                interpreter.operand_stack.push_ty(output_ty)?;
+            }
+            Bytecode::Unpack(idx) => {
+                let struct_ty = interpreter.operand_stack.pop_ty()?;
+                struct_ty.check_eq(&resolver.get_struct_type(*idx))?;
+                let struct_decl = resolver.get_struct_fields(*idx)?;
+                for ty in struct_decl.fields.iter() {
+                    interpreter.operand_stack.push_ty(ty.clone())?;
+                }
+            }
+            Bytecode::UnpackGeneric(idx) => {
+                let struct_ty = interpreter.operand_stack.pop_ty()?;
+                struct_ty.check_eq(&resolver.instantiate_generic_type(*idx, ty_args)?)?;
+
+                let struct_decl = resolver.instantiate_generic_struct_fields(*idx, ty_args)?;
+                for ty in struct_decl.into_iter() {
+                    interpreter.operand_stack.push_ty(ty.clone())?;
+                }
+            }
+            Bytecode::ReadRef => {
+                let ref_ty = interpreter.operand_stack.pop_ty()?;
+                match ref_ty {
+                    Type::Reference(inner) | Type::MutableReference(inner) => {
+                        check_ability(resolver.loader().abilities(&inner)?.has_copy())?;
+                        interpreter.operand_stack.push_ty(inner.as_ref().clone())?;
+                    }
+                    _ => {
+                        return Err(PartialVMError::new(
+                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                        )
+                        .with_message("ReadRef expecting a value of reference type".to_string()))
+                    }
+                }
+            }
+            Bytecode::WriteRef => {
+                let ref_ty = interpreter.operand_stack.pop_ty()?;
+                let val_ty = interpreter.operand_stack.pop_ty()?;
+                match ref_ty {
+                    Type::MutableReference(inner) => {
+                        if *inner == val_ty {
+                            check_ability(resolver.loader().abilities(&inner)?.has_drop())?;
+                        } else {
+                            return Err(PartialVMError::new(
+                                StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                            )
+                            .with_message(
+                                "WriteRef tried to write references of different types".to_string(),
+                            ));
+                        }
+                    }
+                    _ => {
+                        return Err(PartialVMError::new(
+                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                        )
+                        .with_message(
+                            "WriteRef expecting a value of mutable reference type".to_string(),
+                        ))
+                    }
+                }
+            }
+            Bytecode::CastU8 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U8)?;
+            }
+            Bytecode::CastU16 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U16)?;
+            }
+            Bytecode::CastU32 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U32)?;
+            }
+            Bytecode::CastU64 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U64)?;
+            }
+            Bytecode::CastU128 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U128)?;
+            }
+            Bytecode::CastU256 => {
+                interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(Type::U256)?;
+            }
+            Bytecode::Add
+            | Bytecode::Sub
+            | Bytecode::Mul
+            | Bytecode::Mod
+            | Bytecode::Div
+            | Bytecode::BitOr
+            | Bytecode::BitAnd
+            | Bytecode::Xor
+            | Bytecode::Or
+            | Bytecode::And => {
+                let lhs = interpreter.operand_stack.pop_ty()?;
+                let rhs = interpreter.operand_stack.pop_ty()?;
+                lhs.check_eq(&rhs)?;
+                interpreter.operand_stack.push_ty(lhs)?;
+            }
+            Bytecode::Shl | Bytecode::Shr => {
+                interpreter.operand_stack.pop_ty()?;
+                let rhs = interpreter.operand_stack.pop_ty()?;
+                interpreter.operand_stack.push_ty(rhs)?;
+            }
+            Bytecode::Lt | Bytecode::Le | Bytecode::Gt | Bytecode::Ge => {
+                let lhs = interpreter.operand_stack.pop_ty()?;
+                let rhs = interpreter.operand_stack.pop_ty()?;
+                lhs.check_eq(&rhs)?;
+                interpreter.operand_stack.push_ty(Type::Bool)?;
+            }
+            Bytecode::Eq | Bytecode::Neq => {
+                let lhs = interpreter.operand_stack.pop_ty()?;
+                let rhs = interpreter.operand_stack.pop_ty()?;
+                if lhs != rhs {
+                    return Err(
+                        PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                            .with_message(
+                                "Integer binary operation expecting values of same type"
+                                    .to_string(),
+                            ),
+                    );
+                }
+                check_ability(resolver.loader().abilities(&lhs)?.has_drop())?;
+                interpreter.operand_stack.push_ty(Type::Bool)?;
+            }
+            Bytecode::MutBorrowGlobal(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.get_struct_type(*idx);
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(ty)))?;
+            }
+            Bytecode::ImmBorrowGlobal(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.get_struct_type(*idx);
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(ty)))?;
+            }
+            Bytecode::MutBorrowGlobalGeneric(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.instantiate_generic_type(*idx, ty_args)?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(ty)))?;
+            }
+            Bytecode::ImmBorrowGlobalGeneric(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.instantiate_generic_type(*idx, ty_args)?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(ty)))?;
+            }
+            Bytecode::Exists(_) | Bytecode::ExistsGeneric(_) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                interpreter.operand_stack.push_ty(Type::Bool)?;
+            }
+            Bytecode::MoveTo(idx) => {
+                let ty = interpreter.operand_stack.pop_ty()?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Reference(Box::new(Type::Signer)))?;
+                ty.check_eq(&resolver.get_struct_type(*idx))?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+            }
+            Bytecode::MoveToGeneric(idx) => {
+                let ty = interpreter.operand_stack.pop_ty()?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Reference(Box::new(Type::Signer)))?;
+                ty.check_eq(&resolver.instantiate_generic_type(*idx, ty_args)?)?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+            }
+            Bytecode::MoveFrom(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.get_struct_type(*idx);
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter.operand_stack.push_ty(ty)?;
+            }
+            Bytecode::MoveFromGeneric(idx) => {
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_eq(&Type::Address)?;
+                let ty = resolver.instantiate_generic_type(*idx, ty_args)?;
+                check_ability(resolver.loader().abilities(&ty)?.has_key())?;
+                interpreter.operand_stack.push_ty(ty)?;
+            }
+            Bytecode::FreezeRef => {
+                match interpreter.operand_stack.pop_ty()? {
+                    Type::MutableReference(ty) => {
+                        interpreter.operand_stack.push_ty(Type::Reference(ty))?
+                    }
+                    _ => {
+                        return Err(PartialVMError::new(
+                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                        )
+                        .with_message("FreezeRef expects a mutable reference".to_string()))
+                    }
+                };
+            }
+            Bytecode::Nop => (),
+            Bytecode::Not => {
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::Bool)?;
+                interpreter.operand_stack.push_ty(Type::Bool)?;
+            }
+            Bytecode::VecPack(si, num) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                let elem_tys = interpreter.operand_stack.popn_tys(*num as u16)?;
+                for elem_ty in elem_tys.iter() {
+                    elem_ty.check_eq(&ty)?;
+                }
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Vector(Box::new(ty)))?;
+            }
+            Bytecode::VecLen(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, false)?;
+                interpreter.operand_stack.push_ty(Type::U64)?;
+            }
+            Bytecode::VecImmBorrow(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
+                let inner_ty = interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, false)?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::Reference(Box::new(inner_ty)))?;
+            }
+            Bytecode::VecMutBorrow(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
+                let inner_ty = interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, true)?;
+                interpreter
+                    .operand_stack
+                    .push_ty(Type::MutableReference(Box::new(inner_ty)))?;
+            }
+            Bytecode::VecPushBack(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&ty)?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, true)?;
+            }
+            Bytecode::VecPopBack(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                let inner_ty = interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, true)?;
+                interpreter.operand_stack.push_ty(inner_ty)?;
+            }
+            Bytecode::VecUnpack(si, num) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                let vec_ty = interpreter.operand_stack.pop_ty()?;
+                match vec_ty {
+                    Type::Vector(v) => {
+                        v.check_eq(&ty)?;
+                        for _ in 0..*num {
+                            interpreter.operand_stack.push_ty(v.as_ref().clone())?;
+                        }
+                    }
+                    _ => {
+                        return Err(PartialVMError::new(
+                            StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                        )
+                        .with_message("VecUnpack expect a vector type".to_string()))
+                    }
+                };
+            }
+            Bytecode::VecSwap(si) => {
+                let ty = resolver.instantiate_single_type(*si, ty_args)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
+                interpreter.operand_stack.pop_ty()?.check_eq(&Type::U64)?;
+                interpreter
+                    .operand_stack
+                    .pop_ty()?
+                    .check_vec_ref(&ty, true)?;
+            }
+        }
+        Ok(())
+    }
+
     fn execute_code_impl(
         &mut self,
         resolver: &Resolver,
         interpreter: &mut Interpreter,
         data_store: &mut impl DataStore,
-        gas_status: &mut GasStatus,
+        gas_meter: &mut impl GasMeter,
     ) -> PartialVMResult<ExitCode> {
+        use SimpleInstruction as S;
+
+        macro_rules! make_ty {
+            ($ty: expr) => {
+                TypeWithLoader {
+                    ty: $ty,
+                    loader: resolver.loader(),
+                }
+            };
+        }
+
         let code = self.function.code();
         loop {
             for instruction in &code[self.pc as usize..] {
@@ -750,85 +1771,117 @@ impl Frame {
                     )
                 });
 
+                // Paranoid Mode: Perform the type stack transition check to make sure all type safety requirements has been met.
+                //
+                // We will run the checks for only the control flow instructions and StLoc here. The majority of checks will be
+                // performed after the instruction execution, i.e: the big match block below.
+                //
+                // The reason for this design is we charge gas during instruction execution and we want to perform checks only after
+                // proper gas has been charged for each instruction.
+
+                if interpreter.paranoid_type_checks {
+                    interpreter.operand_stack.check_balance()?;
+                    Self::pre_execution_type_stack_transition(
+                        &self.local_tys,
+                        &self.locals,
+                        self.ty_args(),
+                        resolver,
+                        interpreter,
+                        instruction,
+                    )?;
+                }
+
                 match instruction {
                     Bytecode::Pop => {
-                        gas_status.charge_instr(Opcodes::POP)?;
-                        interpreter.operand_stack.pop()?;
+                        let popped_val = interpreter.operand_stack.pop()?;
+                        gas_meter.charge_pop(popped_val)?;
                     }
                     Bytecode::Ret => {
-                        gas_status.charge_instr(Opcodes::RET)?;
+                        gas_meter.charge_simple_instr(S::Ret)?;
                         return Ok(ExitCode::Return);
                     }
                     Bytecode::BrTrue(offset) => {
-                        gas_status.charge_instr(Opcodes::BR_TRUE)?;
+                        gas_meter.charge_simple_instr(S::BrTrue)?;
                         if interpreter.operand_stack.pop_as::<bool>()? {
                             self.pc = *offset;
                             break;
                         }
                     }
                     Bytecode::BrFalse(offset) => {
-                        gas_status.charge_instr(Opcodes::BR_FALSE)?;
+                        gas_meter.charge_simple_instr(S::BrFalse)?;
                         if !interpreter.operand_stack.pop_as::<bool>()? {
                             self.pc = *offset;
                             break;
                         }
                     }
                     Bytecode::Branch(offset) => {
-                        gas_status.charge_instr(Opcodes::BRANCH)?;
+                        gas_meter.charge_simple_instr(S::Branch)?;
                         self.pc = *offset;
                         break;
                     }
                     Bytecode::LdU8(int_const) => {
-                        gas_status.charge_instr(Opcodes::LD_U8)?;
+                        gas_meter.charge_simple_instr(S::LdU8)?;
                         interpreter.operand_stack.push(Value::u8(*int_const))?;
                     }
+                    Bytecode::LdU16(int_const) => {
+                        gas_meter.charge_simple_instr(S::LdU16)?;
+                        interpreter.operand_stack.push(Value::u16(*int_const))?;
+                    }
+                    Bytecode::LdU32(int_const) => {
+                        gas_meter.charge_simple_instr(S::LdU32)?;
+                        interpreter.operand_stack.push(Value::u32(*int_const))?;
+                    }
                     Bytecode::LdU64(int_const) => {
-                        gas_status.charge_instr(Opcodes::LD_U64)?;
+                        gas_meter.charge_simple_instr(S::LdU64)?;
                         interpreter.operand_stack.push(Value::u64(*int_const))?;
                     }
                     Bytecode::LdU128(int_const) => {
-                        gas_status.charge_instr(Opcodes::LD_U128)?;
+                        gas_meter.charge_simple_instr(S::LdU128)?;
                         interpreter.operand_stack.push(Value::u128(*int_const))?;
                     }
+                    Bytecode::LdU256(int_const) => {
+                        gas_meter.charge_simple_instr(S::LdU256)?;
+                        interpreter.operand_stack.push(Value::u256(*int_const))?;
+                    }
                     Bytecode::LdConst(idx) => {
                         let constant = resolver.constant_at(*idx);
-                        gas_status.charge_instr_with_size(
-                            Opcodes::LD_CONST,
-                            AbstractMemorySize::new(constant.data.len() as GasCarrier),
-                        )?;
-                        interpreter.operand_stack.push(
-                            Value::deserialize_constant(constant).ok_or_else(|| {
-                                PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION)
-                                    .with_message(
+                        gas_meter.charge_ld_const(NumBytes::new(constant.data.len() as u64))?;
+
+                        let val = Value::deserialize_constant(constant).ok_or_else(|| {
+                            PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION)
+                                .with_message(
                                     "Verifier failed to verify the deserialization of constants"
                                         .to_owned(),
                                 )
-                            })?,
-                        )?
+                        })?;
+
+                        gas_meter.charge_ld_const_after_deserialization(&val)?;
+
+                        interpreter.operand_stack.push(val)?
                     }
                     Bytecode::LdTrue => {
-                        gas_status.charge_instr(Opcodes::LD_TRUE)?;
+                        gas_meter.charge_simple_instr(S::LdTrue)?;
                         interpreter.operand_stack.push(Value::bool(true))?;
                     }
                     Bytecode::LdFalse => {
-                        gas_status.charge_instr(Opcodes::LD_FALSE)?;
+                        gas_meter.charge_simple_instr(S::LdFalse)?;
                         interpreter.operand_stack.push(Value::bool(false))?;
                     }
                     Bytecode::CopyLoc(idx) => {
+                        // TODO(Gas): We should charge gas before copying the value.
                         let local = self.locals.copy_loc(*idx as usize)?;
-                        gas_status.charge_instr_with_size(Opcodes::COPY_LOC, local.size())?;
+                        gas_meter.charge_copy_loc(&local)?;
                         interpreter.operand_stack.push(local)?;
                     }
                     Bytecode::MoveLoc(idx) => {
                         let local = self.locals.move_loc(*idx as usize)?;
-                        gas_status.charge_instr_with_size(Opcodes::MOVE_LOC, local.size())?;
+                        gas_meter.charge_move_loc(&local)?;
 
                         interpreter.operand_stack.push(local)?;
                     }
                     Bytecode::StLoc(idx) => {
                         let value_to_store = interpreter.operand_stack.pop()?;
-                        gas_status
-                            .charge_instr_with_size(Opcodes::ST_LOC, value_to_store.size())?;
+                        gas_meter.charge_store_loc(&value_to_store)?;
                         self.locals.store_loc(*idx as usize, value_to_store)?;
                     }
                     Bytecode::Call(idx) => {
@@ -838,163 +1891,178 @@ impl Frame {
                         return Ok(ExitCode::CallGeneric(*idx));
                     }
                     Bytecode::MutBorrowLoc(idx) | Bytecode::ImmBorrowLoc(idx) => {
-                        let opcode = match instruction {
-                            Bytecode::MutBorrowLoc(_) => Opcodes::MUT_BORROW_LOC,
-                            _ => Opcodes::IMM_BORROW_LOC,
+                        let instr = match instruction {
+                            Bytecode::MutBorrowLoc(_) => S::MutBorrowLoc,
+                            _ => S::ImmBorrowLoc,
                         };
-                        gas_status.charge_instr(opcode)?;
+                        gas_meter.charge_simple_instr(instr)?;
                         interpreter
                             .operand_stack
                             .push(self.locals.borrow_loc(*idx as usize)?)?;
                     }
                     Bytecode::ImmBorrowField(fh_idx) | Bytecode::MutBorrowField(fh_idx) => {
-                        let opcode = match instruction {
-                            Bytecode::MutBorrowField(_) => Opcodes::MUT_BORROW_FIELD,
-                            _ => Opcodes::IMM_BORROW_FIELD,
+                        let instr = match instruction {
+                            Bytecode::MutBorrowField(_) => S::MutBorrowField,
+                            _ => S::ImmBorrowField,
                         };
-                        gas_status.charge_instr(opcode)?;
+                        gas_meter.charge_simple_instr(instr)?;
 
                         let reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+
                         let offset = resolver.field_offset(*fh_idx);
                         let field_ref = reference.borrow_field(offset)?;
                         interpreter.operand_stack.push(field_ref)?;
                     }
                     Bytecode::ImmBorrowFieldGeneric(fi_idx)
                     | Bytecode::MutBorrowFieldGeneric(fi_idx) => {
-                        let opcode = match instruction {
-                            Bytecode::MutBorrowField(_) => Opcodes::MUT_BORROW_FIELD_GENERIC,
-                            _ => Opcodes::IMM_BORROW_FIELD_GENERIC,
+                        let instr = match instruction {
+                            Bytecode::MutBorrowField(_) => S::MutBorrowFieldGeneric,
+                            _ => S::ImmBorrowFieldGeneric,
                         };
-                        gas_status.charge_instr(opcode)?;
+                        gas_meter.charge_simple_instr(instr)?;
 
                         let reference = interpreter.operand_stack.pop_as::<StructRef>()?;
+
                         let offset = resolver.field_instantiation_offset(*fi_idx);
                         let field_ref = reference.borrow_field(offset)?;
                         interpreter.operand_stack.push(field_ref)?;
                     }
                     Bytecode::Pack(sd_idx) => {
                         let field_count = resolver.field_count(*sd_idx);
+                        let struct_type = resolver.get_struct_type(*sd_idx);
+                        check_depth_of_type(resolver, &struct_type)?;
+                        gas_meter.charge_pack(
+                            false,
+                            interpreter.operand_stack.last_n(field_count as usize)?,
+                        )?;
                         let args = interpreter.operand_stack.popn(field_count)?;
-                        let size = args.iter().fold(
-                            AbstractMemorySize::new(GasCarrier::from(field_count)),
-                            |acc, v| acc.add(v.size()),
-                        );
-                        gas_status.charge_instr_with_size(Opcodes::PACK, size)?;
                         interpreter
                             .operand_stack
                             .push(Value::struct_(Struct::pack(args)))?;
                     }
                     Bytecode::PackGeneric(si_idx) => {
                         let field_count = resolver.field_instantiation_count(*si_idx);
+                        let ty = resolver.instantiate_generic_type(*si_idx, self.ty_args())?;
+                        check_depth_of_type(resolver, &ty)?;
+                        gas_meter.charge_pack(
+                            true,
+                            interpreter.operand_stack.last_n(field_count as usize)?,
+                        )?;
                         let args = interpreter.operand_stack.popn(field_count)?;
-                        let size = args.iter().fold(
-                            AbstractMemorySize::new(GasCarrier::from(field_count)),
-                            |acc, v| acc.add(v.size()),
-                        );
-                        gas_status.charge_instr_with_size(Opcodes::PACK_GENERIC, size)?;
                         interpreter
                             .operand_stack
                             .push(Value::struct_(Struct::pack(args)))?;
                     }
-                    Bytecode::Unpack(sd_idx) => {
-                        let field_count = resolver.field_count(*sd_idx);
+                    Bytecode::Unpack(_sd_idx) => {
                         let struct_ = interpreter.operand_stack.pop_as::<Struct>()?;
-                        gas_status.charge_instr_with_size(
-                            Opcodes::UNPACK,
-                            AbstractMemorySize::new(GasCarrier::from(field_count)),
-                        )?;
-                        // TODO: Whether or not we want this gas metering in the loop is
-                        // questionable.  However, if we don't have it in the loop we could wind up
-                        // doing a fair bit of work before charging for it.
+
+                        gas_meter.charge_unpack(false, struct_.field_views())?;
+
                         for value in struct_.unpack()? {
-                            gas_status.charge_instr_with_size(Opcodes::UNPACK, value.size())?;
                             interpreter.operand_stack.push(value)?;
                         }
                     }
-                    Bytecode::UnpackGeneric(si_idx) => {
-                        let field_count = resolver.field_instantiation_count(*si_idx);
+                    Bytecode::UnpackGeneric(_si_idx) => {
                         let struct_ = interpreter.operand_stack.pop_as::<Struct>()?;
-                        gas_status.charge_instr_with_size(
-                            Opcodes::UNPACK_GENERIC,
-                            AbstractMemorySize::new(GasCarrier::from(field_count)),
-                        )?;
+
+                        gas_meter.charge_unpack(true, struct_.field_views())?;
+
                         // TODO: Whether or not we want this gas metering in the loop is
                         // questionable.  However, if we don't have it in the loop we could wind up
                         // doing a fair bit of work before charging for it.
                         for value in struct_.unpack()? {
-                            gas_status
-                                .charge_instr_with_size(Opcodes::UNPACK_GENERIC, value.size())?;
                             interpreter.operand_stack.push(value)?;
                         }
                     }
                     Bytecode::ReadRef => {
                         let reference = interpreter.operand_stack.pop_as::<Reference>()?;
+                        gas_meter.charge_read_ref(reference.value_view())?;
                         let value = reference.read_ref()?;
-                        gas_status.charge_instr_with_size(Opcodes::READ_REF, value.size())?;
                         interpreter.operand_stack.push(value)?;
                     }
                     Bytecode::WriteRef => {
                         let reference = interpreter.operand_stack.pop_as::<Reference>()?;
                         let value = interpreter.operand_stack.pop()?;
-                        gas_status.charge_instr_with_size(Opcodes::WRITE_REF, value.size())?;
+                        gas_meter.charge_write_ref(&value, reference.value_view())?;
                         reference.write_ref(value)?;
                     }
                     Bytecode::CastU8 => {
-                        gas_status.charge_instr(Opcodes::CAST_U8)?;
+                        gas_meter.charge_simple_instr(S::CastU8)?;
                         let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
                         interpreter
                             .operand_stack
                             .push(Value::u8(integer_value.cast_u8()?))?;
                     }
+                    Bytecode::CastU16 => {
+                        gas_meter.charge_simple_instr(S::CastU16)?;
+                        let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                        interpreter
+                            .operand_stack
+                            .push(Value::u16(integer_value.cast_u16()?))?;
+                    }
+                    Bytecode::CastU32 => {
+                        gas_meter.charge_simple_instr(S::CastU16)?;
+                        let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                        interpreter
+                            .operand_stack
+                            .push(Value::u32(integer_value.cast_u32()?))?;
+                    }
                     Bytecode::CastU64 => {
-                        gas_status.charge_instr(Opcodes::CAST_U64)?;
+                        gas_meter.charge_simple_instr(S::CastU64)?;
                         let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
                         interpreter
                             .operand_stack
                             .push(Value::u64(integer_value.cast_u64()?))?;
                     }
                     Bytecode::CastU128 => {
-                        gas_status.charge_instr(Opcodes::CAST_U128)?;
+                        gas_meter.charge_simple_instr(S::CastU128)?;
                         let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
                         interpreter
                             .operand_stack
                             .push(Value::u128(integer_value.cast_u128()?))?;
                     }
+                    Bytecode::CastU256 => {
+                        gas_meter.charge_simple_instr(S::CastU16)?;
+                        let integer_value = interpreter.operand_stack.pop_as::<IntegerValue>()?;
+                        interpreter
+                            .operand_stack
+                            .push(Value::u256(integer_value.cast_u256()?))?;
+                    }
                     // Arithmetic Operations
                     Bytecode::Add => {
-                        gas_status.charge_instr(Opcodes::ADD)?;
+                        gas_meter.charge_simple_instr(S::Add)?;
                         interpreter.binop_int(IntegerValue::add_checked)?
                     }
                     Bytecode::Sub => {
-                        gas_status.charge_instr(Opcodes::SUB)?;
+                        gas_meter.charge_simple_instr(S::Sub)?;
                         interpreter.binop_int(IntegerValue::sub_checked)?
                     }
                     Bytecode::Mul => {
-                        gas_status.charge_instr(Opcodes::MUL)?;
+                        gas_meter.charge_simple_instr(S::Mul)?;
                         interpreter.binop_int(IntegerValue::mul_checked)?
                     }
                     Bytecode::Mod => {
-                        gas_status.charge_instr(Opcodes::MOD)?;
+                        gas_meter.charge_simple_instr(S::Mod)?;
                         interpreter.binop_int(IntegerValue::rem_checked)?
                     }
                     Bytecode::Div => {
-                        gas_status.charge_instr(Opcodes::DIV)?;
+                        gas_meter.charge_simple_instr(S::Div)?;
                         interpreter.binop_int(IntegerValue::div_checked)?
                     }
                     Bytecode::BitOr => {
-                        gas_status.charge_instr(Opcodes::BIT_OR)?;
+                        gas_meter.charge_simple_instr(S::BitOr)?;
                         interpreter.binop_int(IntegerValue::bit_or)?
                     }
                     Bytecode::BitAnd => {
-                        gas_status.charge_instr(Opcodes::BIT_AND)?;
+                        gas_meter.charge_simple_instr(S::BitAnd)?;
                         interpreter.binop_int(IntegerValue::bit_and)?
                     }
                     Bytecode::Xor => {
-                        gas_status.charge_instr(Opcodes::XOR)?;
+                        gas_meter.charge_simple_instr(S::Xor)?;
                         interpreter.binop_int(IntegerValue::bit_xor)?
                     }
                     Bytecode::Shl => {
-                        gas_status.charge_instr(Opcodes::SHL)?;
+                        gas_meter.charge_simple_instr(S::Shl)?;
                         let rhs = interpreter.operand_stack.pop_as::<u8>()?;
                         let lhs = interpreter.operand_stack.pop_as::<IntegerValue>()?;
                         interpreter
@@ -1002,7 +2070,7 @@ impl Frame {
                             .push(lhs.shl_checked(rhs)?.into_value())?;
                     }
                     Bytecode::Shr => {
-                        gas_status.charge_instr(Opcodes::SHR)?;
+                        gas_meter.charge_simple_instr(S::Shr)?;
                         let rhs = interpreter.operand_stack.pop_as::<u8>()?;
                         let lhs = interpreter.operand_stack.pop_as::<IntegerValue>()?;
                         interpreter
@@ -1010,31 +2078,31 @@ impl Frame {
                             .push(lhs.shr_checked(rhs)?.into_value())?;
                     }
                     Bytecode::Or => {
-                        gas_status.charge_instr(Opcodes::OR)?;
+                        gas_meter.charge_simple_instr(S::Or)?;
                         interpreter.binop_bool(|l, r| Ok(l || r))?
                     }
                     Bytecode::And => {
-                        gas_status.charge_instr(Opcodes::AND)?;
+                        gas_meter.charge_simple_instr(S::And)?;
                         interpreter.binop_bool(|l, r| Ok(l && r))?
                     }
                     Bytecode::Lt => {
-                        gas_status.charge_instr(Opcodes::LT)?;
+                        gas_meter.charge_simple_instr(S::Lt)?;
                         interpreter.binop_bool(IntegerValue::lt)?
                     }
                     Bytecode::Gt => {
-                        gas_status.charge_instr(Opcodes::GT)?;
+                        gas_meter.charge_simple_instr(S::Gt)?;
                         interpreter.binop_bool(IntegerValue::gt)?
                     }
                     Bytecode::Le => {
-                        gas_status.charge_instr(Opcodes::LE)?;
+                        gas_meter.charge_simple_instr(S::Le)?;
                         interpreter.binop_bool(IntegerValue::le)?
                     }
                     Bytecode::Ge => {
-                        gas_status.charge_instr(Opcodes::GE)?;
+                        gas_meter.charge_simple_instr(S::Ge)?;
                         interpreter.binop_bool(IntegerValue::ge)?
                     }
                     Bytecode::Abort => {
-                        gas_status.charge_instr(Opcodes::ABORT)?;
+                        gas_meter.charge_simple_instr(S::Abort)?;
                         let error_code = interpreter.operand_stack.pop_as::<u64>()?;
                         let error = PartialVMError::new(StatusCode::ABORTED)
                             .with_sub_status(error_code)
@@ -1043,17 +2111,12 @@ impl Frame {
                                 self.function.pretty_string(),
                                 self.pc,
                             ));
-                        if cfg!(feature = "testing") {
-                            return Err(error.with_exec_state(interpreter.get_internal_state()));
-                        } else {
-                            return Err(error);
-                        }
+                        return Err(error);
                     }
                     Bytecode::Eq => {
                         let lhs = interpreter.operand_stack.pop()?;
                         let rhs = interpreter.operand_stack.pop()?;
-                        gas_status
-                            .charge_instr_with_size(Opcodes::EQ, lhs.size().add(rhs.size()))?;
+                        gas_meter.charge_eq(&lhs, &rhs)?;
                         interpreter
                             .operand_stack
                             .push(Value::bool(lhs.equals(&rhs)?))?;
@@ -1061,53 +2124,87 @@ impl Frame {
                     Bytecode::Neq => {
                         let lhs = interpreter.operand_stack.pop()?;
                         let rhs = interpreter.operand_stack.pop()?;
-                        gas_status
-                            .charge_instr_with_size(Opcodes::NEQ, lhs.size().add(rhs.size()))?;
+                        gas_meter.charge_neq(&lhs, &rhs)?;
                         interpreter
                             .operand_stack
                             .push(Value::bool(!lhs.equals(&rhs)?))?;
                     }
                     Bytecode::MutBorrowGlobal(sd_idx) | Bytecode::ImmBorrowGlobal(sd_idx) => {
+                        let is_mut = matches!(instruction, Bytecode::MutBorrowGlobal(_));
                         let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
                         let ty = resolver.get_struct_type(*sd_idx);
-                        let size = interpreter.borrow_global(data_store, addr, &ty)?;
-                        gas_status.charge_instr_with_size(Opcodes::MUT_BORROW_GLOBAL, size)?;
+                        interpreter.borrow_global(
+                            is_mut,
+                            false,
+                            resolver.loader(),
+                            gas_meter,
+                            data_store,
+                            addr,
+                            &ty,
+                        )?;
                     }
                     Bytecode::MutBorrowGlobalGeneric(si_idx)
                     | Bytecode::ImmBorrowGlobalGeneric(si_idx) => {
+                        let is_mut = matches!(instruction, Bytecode::MutBorrowGlobalGeneric(_));
                         let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
                         let ty = resolver.instantiate_generic_type(*si_idx, self.ty_args())?;
-                        let size = interpreter.borrow_global(data_store, addr, &ty)?;
-                        gas_status
-                            .charge_instr_with_size(Opcodes::MUT_BORROW_GLOBAL_GENERIC, size)?;
+                        interpreter.borrow_global(
+                            is_mut,
+                            true,
+                            resolver.loader(),
+                            gas_meter,
+                            data_store,
+                            addr,
+                            &ty,
+                        )?;
                     }
                     Bytecode::Exists(sd_idx) => {
                         let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
                         let ty = resolver.get_struct_type(*sd_idx);
-                        let size = interpreter.exists(data_store, addr, &ty)?;
-                        gas_status.charge_instr_with_size(Opcodes::EXISTS, size)?;
+                        interpreter.exists(
+                            false,
+                            resolver.loader(),
+                            gas_meter,
+                            data_store,
+                            addr,
+                            &ty,
+                        )?;
                     }
                     Bytecode::ExistsGeneric(si_idx) => {
                         let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
                         let ty = resolver.instantiate_generic_type(*si_idx, self.ty_args())?;
-                        let size = interpreter.exists(data_store, addr, &ty)?;
-                        gas_status.charge_instr_with_size(Opcodes::EXISTS_GENERIC, size)?;
+                        interpreter.exists(
+                            true,
+                            resolver.loader(),
+                            gas_meter,
+                            data_store,
+                            addr,
+                            &ty,
+                        )?;
                     }
                     Bytecode::MoveFrom(sd_idx) => {
                         let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
                         let ty = resolver.get_struct_type(*sd_idx);
-                        let size = interpreter.move_from(data_store, addr, &ty)?;
-                        // TODO: Have this calculate before pulling in the data based upon
-                        // the size of the data that we are about to read in.
-                        gas_status.charge_instr_with_size(Opcodes::MOVE_FROM, size)?;
+                        interpreter.move_from(
+                            false,
+                            resolver.loader(),
+                            gas_meter,
+                            data_store,
+                            addr,
+                            &ty,
+                        )?;
                     }
                     Bytecode::MoveFromGeneric(si_idx) => {
                         let addr = interpreter.operand_stack.pop_as::<AccountAddress>()?;
                         let ty = resolver.instantiate_generic_type(*si_idx, self.ty_args())?;
-                        let size = interpreter.move_from(data_store, addr, &ty)?;
-                        // TODO: Have this calculate before pulling in the data based upon
-                        // the size of the data that we are about to read in.
-                        gas_status.charge_instr_with_size(Opcodes::MOVE_FROM_GENERIC, size)?;
+                        interpreter.move_from(
+                            true,
+                            resolver.loader(),
+                            gas_meter,
+                            data_store,
+                            addr,
+                            &ty,
+                        )?;
                     }
                     Bytecode::MoveTo(sd_idx) => {
                         let resource = interpreter.operand_stack.pop()?;
@@ -1119,8 +2216,15 @@ impl Frame {
                             .value_as::<AccountAddress>()?;
                         let ty = resolver.get_struct_type(*sd_idx);
                         // REVIEW: Can we simplify Interpreter::move_to?
-                        let size = interpreter.move_to(data_store, addr, &ty, resource)?;
-                        gas_status.charge_instr_with_size(Opcodes::MOVE_TO, size)?;
+                        interpreter.move_to(
+                            false,
+                            resolver.loader(),
+                            gas_meter,
+                            data_store,
+                            addr,
+                            &ty,
+                            resource,
+                        )?;
                     }
                     Bytecode::MoveToGeneric(si_idx) => {
                         let resource = interpreter.operand_stack.pop()?;
@@ -1131,75 +2235,89 @@ impl Frame {
                             .read_ref()?
                             .value_as::<AccountAddress>()?;
                         let ty = resolver.instantiate_generic_type(*si_idx, self.ty_args())?;
-                        let size = interpreter.move_to(data_store, addr, &ty, resource)?;
-                        gas_status.charge_instr_with_size(Opcodes::MOVE_TO_GENERIC, size)?;
+                        interpreter.move_to(
+                            true,
+                            resolver.loader(),
+                            gas_meter,
+                            data_store,
+                            addr,
+                            &ty,
+                            resource,
+                        )?;
                     }
                     Bytecode::FreezeRef => {
-                        gas_status.charge_instr(Opcodes::FREEZE_REF)?;
+                        gas_meter.charge_simple_instr(S::FreezeRef)?;
                         // FreezeRef should just be a null op as we don't distinguish between mut
                         // and immut ref at runtime.
                     }
                     Bytecode::Not => {
-                        gas_status.charge_instr(Opcodes::NOT)?;
+                        gas_meter.charge_simple_instr(S::Not)?;
                         let value = !interpreter.operand_stack.pop_as::<bool>()?;
                         interpreter.operand_stack.push(Value::bool(value))?;
                     }
                     Bytecode::Nop => {
-                        gas_status.charge_instr(Opcodes::NOP)?;
+                        gas_meter.charge_simple_instr(S::Nop)?;
                     }
                     Bytecode::VecPack(si, num) => {
-                        let elements = interpreter.operand_stack.popn(*num as u16)?;
-                        let size = AbstractMemorySize::new(*num);
-                        gas_status.charge_instr_with_size(Opcodes::VEC_PACK, size)?;
-                        let value = Vector::pack(
-                            &resolver.instantiate_single_type(*si, self.ty_args())?,
-                            elements,
+                        let ty = resolver.instantiate_single_type(*si, self.ty_args())?;
+                        check_depth_of_type(resolver, &ty)?;
+                        gas_meter.charge_vec_pack(
+                            make_ty!(&ty),
+                            interpreter.operand_stack.last_n(*num as usize)?,
                         )?;
+                        let elements = interpreter.operand_stack.popn(*num as u16)?;
+                        let value = Vector::pack(&ty, elements)?;
                         interpreter.operand_stack.push(value)?;
                     }
                     Bytecode::VecLen(si) => {
                         let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
-                        gas_status.charge_instr(Opcodes::VEC_LEN)?;
-                        let vec_ty_arg = &resolver.instantiate_single_type(*si, self.ty_args())?;
-                        let value = vec_ref.len(vec_ty_arg)?;
+                        let ty = &resolver.instantiate_single_type(*si, self.ty_args())?;
+                        gas_meter.charge_vec_len(TypeWithLoader {
+                            ty,
+                            loader: resolver.loader(),
+                        })?;
+                        let value = vec_ref.len(ty)?;
                         interpreter.operand_stack.push(value)?;
                     }
                     Bytecode::VecImmBorrow(si) => {
                         let idx = interpreter.operand_stack.pop_as::<u64>()? as usize;
                         let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
-                        gas_status.charge_instr(Opcodes::VEC_IMM_BORROW)?;
-                        let vec_ty_arg = &resolver.instantiate_single_type(*si, self.ty_args())?;
-                        let value = vec_ref.borrow_elem(idx, vec_ty_arg)?;
-                        interpreter.operand_stack.push(value)?;
+                        let ty = resolver.instantiate_single_type(*si, self.ty_args())?;
+                        let res = vec_ref.borrow_elem(idx, &ty);
+                        gas_meter.charge_vec_borrow(false, make_ty!(&ty), res.is_ok())?;
+                        interpreter.operand_stack.push(res?)?;
                     }
                     Bytecode::VecMutBorrow(si) => {
                         let idx = interpreter.operand_stack.pop_as::<u64>()? as usize;
                         let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
-                        gas_status.charge_instr(Opcodes::VEC_MUT_BORROW)?;
-                        let vec_ty_arg = &resolver.instantiate_single_type(*si, self.ty_args())?;
-                        let value = vec_ref.borrow_elem(idx, vec_ty_arg)?;
-                        interpreter.operand_stack.push(value)?;
+                        let ty = &resolver.instantiate_single_type(*si, self.ty_args())?;
+                        let res = vec_ref.borrow_elem(idx, ty);
+                        gas_meter.charge_vec_borrow(true, make_ty!(ty), res.is_ok())?;
+                        interpreter.operand_stack.push(res?)?;
                     }
                     Bytecode::VecPushBack(si) => {
                         let elem = interpreter.operand_stack.pop()?;
                         let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
-                        gas_status.charge_instr_with_size(Opcodes::VEC_PUSH_BACK, elem.size())?;
-                        let vec_ty_arg = &resolver.instantiate_single_type(*si, self.ty_args())?;
-                        vec_ref.push_back(elem, vec_ty_arg)?;
+                        let ty = &resolver.instantiate_single_type(*si, self.ty_args())?;
+                        gas_meter.charge_vec_push_back(make_ty!(ty), &elem)?;
+                        vec_ref.push_back(elem, ty)?;
                     }
                     Bytecode::VecPopBack(si) => {
                         let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
-                        gas_status.charge_instr(Opcodes::VEC_POP_BACK)?;
-                        let vec_ty_arg = &resolver.instantiate_single_type(*si, self.ty_args())?;
-                        let value = vec_ref.pop(vec_ty_arg)?;
-                        interpreter.operand_stack.push(value)?;
+                        let ty = &resolver.instantiate_single_type(*si, self.ty_args())?;
+                        let res = vec_ref.pop(ty);
+                        gas_meter.charge_vec_pop_back(make_ty!(ty), res.as_ref().ok())?;
+                        interpreter.operand_stack.push(res?)?;
                     }
                     Bytecode::VecUnpack(si, num) => {
                         let vec_val = interpreter.operand_stack.pop_as::<Vector>()?;
-                        let size = AbstractMemorySize::new(*num);
-                        gas_status.charge_instr_with_size(Opcodes::VEC_UNPACK, size)?;
-                        let vec_ty_arg = &resolver.instantiate_single_type(*si, self.ty_args())?;
-                        let elements = vec_val.unpack(vec_ty_arg, *num)?;
+                        let ty = &resolver.instantiate_single_type(*si, self.ty_args())?;
+                        gas_meter.charge_vec_unpack(
+                            make_ty!(ty),
+                            NumArgs::new(*num),
+                            vec_val.elem_views(),
+                        )?;
+                        let elements = vec_val.unpack(ty, *num)?;
                         for value in elements {
                             interpreter.operand_stack.push(value)?;
                         }
@@ -1208,11 +2326,23 @@ impl Frame {
                         let idx2 = interpreter.operand_stack.pop_as::<u64>()? as usize;
                         let idx1 = interpreter.operand_stack.pop_as::<u64>()? as usize;
                         let vec_ref = interpreter.operand_stack.pop_as::<VectorRef>()?;
-                        gas_status.charge_instr(Opcodes::VEC_SWAP)?;
-                        let vec_ty_arg = &resolver.instantiate_single_type(*si, self.ty_args())?;
-                        vec_ref.swap(idx1, idx2, vec_ty_arg)?;
+                        let ty = &resolver.instantiate_single_type(*si, self.ty_args())?;
+                        gas_meter.charge_vec_swap(make_ty!(ty))?;
+                        vec_ref.swap(idx1, idx2, ty)?;
                     }
                 }
+                if interpreter.paranoid_type_checks {
+                    Self::post_execution_type_stack_transition(
+                        &self.local_tys,
+                        &self.ty_args,
+                        resolver,
+                        interpreter,
+                        instruction,
+                    )?;
+
+                    interpreter.operand_stack.check_balance()?;
+                }
+
                 // invariant: advance to pc +1 is iff instruction at pc executed without aborting
                 self.pc += 1;
             }
diff --git a/language/move-vm/runtime/src/lib.rs b/language/move-vm/runtime/src/lib.rs
index 207b76752f..24558c0c51 100644
--- a/language/move-vm/runtime/src/lib.rs
+++ b/language/move-vm/runtime/src/lib.rs
@@ -21,6 +21,7 @@ mod runtime;
 pub mod session;
 #[macro_use]
 mod tracing;
+pub mod config;
 
 // Only include debugging functionality in debug builds
 #[cfg(any(debug_assertions, feature = "debugging"))]
diff --git a/language/move-vm/runtime/src/loader.rs b/language/move-vm/runtime/src/loader.rs
index e7028b0a25..ba7abd5486 100644
--- a/language/move-vm/runtime/src/loader.rs
+++ b/language/move-vm/runtime/src/loader.rs
@@ -3,8 +3,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
+    config::VMConfig,
     logging::expect_no_verification_errors,
-    native_functions::{NativeFunction, NativeFunctions},
+    native_functions::{NativeFunction, NativeFunctions, UnboxedNativeFunction},
     session::LoadedFunctionInstantiation,
 };
 use move_binary_format::{
@@ -16,7 +17,7 @@ use move_binary_format::{
         FieldHandleIndex, FieldInstantiationIndex, FunctionDefinition, FunctionDefinitionIndex,
         FunctionHandleIndex, FunctionInstantiationIndex, Signature, SignatureIndex, SignatureToken,
         StructDefInstantiationIndex, StructDefinition, StructDefinitionIndex,
-        StructFieldInformation, TableIndex,
+        StructFieldInformation, TableIndex, TypeParameterIndex, Visibility,
     },
     IndexKind,
 };
@@ -24,12 +25,13 @@ use move_bytecode_verifier::{self, cyclic_dependencies, dependencies};
 use move_core_types::{
     identifier::{IdentStr, Identifier},
     language_storage::{ModuleId, StructTag, TypeTag},
-    value::{MoveStructLayout, MoveTypeLayout},
+    metadata::Metadata,
+    value::{MoveFieldLayout, MoveStructLayout, MoveTypeLayout},
     vm_status::StatusCode,
 };
 use move_vm_types::{
     data_store::DataStore,
-    loaded_data::runtime_types::{CachedStructIndex, StructType, Type},
+    loaded_data::runtime_types::{CachedStructIndex, DepthFormula, StructType, Type},
 };
 use parking_lot::RwLock;
 use sha3::{Digest, Sha3_256};
@@ -201,9 +203,54 @@ impl ModuleCache {
             self.structs.truncate(starting_idx);
             err.finish(Location::Undefined)
         })?;
+
+        let struct_defs_len = module.struct_defs.len();
+
+        let mut depth_cache = BTreeMap::new();
+
+        for cached_idx in starting_idx..(starting_idx + struct_defs_len) {
+            self.calculate_depth_of_struct(CachedStructIndex(cached_idx), &mut depth_cache)
+                .map_err(|err| err.finish(Location::Undefined))?;
+        }
+        debug_assert!(depth_cache.len() == struct_defs_len);
+        for (cache_idx, depth) in depth_cache {
+            match Arc::get_mut(self.structs.get_mut(cache_idx.0).unwrap()) {
+                Some(struct_type) => struct_type.depth = Some(depth),
+                None => {
+                    // we have pending references to the `Arc` which is impossible,
+                    // given the code that adds the `Arc` is above and no reference to
+                    // it should exist.
+                    // So in the spirit of not crashing we just leave it as None and
+                    // log the issue.
+                    error!("Arc<StructType> cannot have any live reference while publishing");
+                }
+            }
+        }
+
         for (idx, func) in module.function_defs().iter().enumerate() {
             let findex = FunctionDefinitionIndex(idx as TableIndex);
-            let function = Function::new(natives, findex, func, module);
+            let mut function = Function::new(natives, findex, func, module);
+            function.return_types = function
+                .return_
+                .0
+                .iter()
+                .map(|tok| self.make_type_while_loading(module, tok))
+                .collect::<PartialVMResult<Vec<_>>>()
+                .map_err(|err| err.finish(Location::Undefined))?;
+            function.local_types = function
+                .locals
+                .0
+                .iter()
+                .map(|tok| self.make_type_while_loading(module, tok))
+                .collect::<PartialVMResult<Vec<_>>>()
+                .map_err(|err| err.finish(Location::Undefined))?;
+            function.parameter_types = function
+                .parameters
+                .0
+                .iter()
+                .map(|tok| self.make_type_while_loading(module, tok))
+                .collect::<PartialVMResult<Vec<_>>>()
+                .map_err(|err| err.finish(Location::Undefined))?;
             self.functions.push(Arc::new(function));
         }
         Ok(())
@@ -216,17 +263,26 @@ impl ModuleCache {
         idx: StructDefinitionIndex,
     ) -> StructType {
         let struct_handle = module.struct_handle_at(struct_def.struct_handle);
+        let field_names = match &struct_def.field_information {
+            StructFieldInformation::Native => vec![],
+            StructFieldInformation::Declared(field_info) => field_info
+                .iter()
+                .map(|f| module.identifier_at(f.name).to_owned())
+                .collect(),
+        };
         let abilities = struct_handle.abilities;
         let name = module.identifier_at(struct_handle.name).to_owned();
         let type_parameters = struct_handle.type_parameters.clone();
         let module = module.self_id();
         StructType {
             fields: vec![],
+            field_names,
             abilities,
             type_parameters,
             name,
             module,
             struct_def: idx,
+            depth: None,
         }
     }
 
@@ -274,7 +330,7 @@ impl ModuleCache {
 
     // `make_type` is the entry point to "translate" a `SignatureToken` to a `Type`
     fn make_type(&self, module: BinaryIndexedView, tok: &SignatureToken) -> PartialVMResult<Type> {
-        self.make_type_internal(module, tok, &|struct_name, module_id| {
+        Self::make_type_internal(module, tok, &|struct_name, module_id| {
             Ok(self.resolve_struct_by_name(struct_name, module_id)?.0)
         })
     }
@@ -288,7 +344,7 @@ impl ModuleCache {
         tok: &SignatureToken,
     ) -> PartialVMResult<Type> {
         let self_id = module.self_id();
-        self.make_type_internal(
+        Self::make_type_internal(
             BinaryIndexedView::Module(module),
             tok,
             &|struct_name, module_id| {
@@ -320,7 +376,6 @@ impl ModuleCache {
     // `make_type_internal` returns a `Type` given a signature and a resolver which
     // is resonsible to map a local struct index to a global one
     fn make_type_internal<F>(
-        &self,
         module: BinaryIndexedView,
         tok: &SignatureToken,
         resolver: &F,
@@ -331,21 +386,24 @@ impl ModuleCache {
         let res = match tok {
             SignatureToken::Bool => Type::Bool,
             SignatureToken::U8 => Type::U8,
+            SignatureToken::U16 => Type::U16,
+            SignatureToken::U32 => Type::U32,
             SignatureToken::U64 => Type::U64,
             SignatureToken::U128 => Type::U128,
+            SignatureToken::U256 => Type::U256,
             SignatureToken::Address => Type::Address,
             SignatureToken::Signer => Type::Signer,
-            SignatureToken::TypeParameter(idx) => Type::TyParam(*idx as usize),
+            SignatureToken::TypeParameter(idx) => Type::TyParam(*idx),
             SignatureToken::Vector(inner_tok) => {
-                let inner_type = self.make_type_internal(module, inner_tok, resolver)?;
+                let inner_type = Self::make_type_internal(module, inner_tok, resolver)?;
                 Type::Vector(Box::new(inner_type))
             }
             SignatureToken::Reference(inner_tok) => {
-                let inner_type = self.make_type_internal(module, inner_tok, resolver)?;
+                let inner_type = Self::make_type_internal(module, inner_tok, resolver)?;
                 Type::Reference(Box::new(inner_type))
             }
             SignatureToken::MutableReference(inner_tok) => {
-                let inner_type = self.make_type_internal(module, inner_tok, resolver)?;
+                let inner_type = Self::make_type_internal(module, inner_tok, resolver)?;
                 Type::MutableReference(Box::new(inner_type))
             }
             SignatureToken::Struct(sh_idx) => {
@@ -362,7 +420,7 @@ impl ModuleCache {
             SignatureToken::StructInstantiation(sh_idx, tys) => {
                 let type_parameters: Vec<_> = tys
                     .iter()
-                    .map(|tok| self.make_type_internal(module, tok, resolver))
+                    .map(|tok| Self::make_type_internal(module, tok, resolver))
                     .collect::<PartialVMResult<_>>()?;
                 let struct_handle = module.struct_handle_at(*sh_idx);
                 let struct_name = module.identifier_at(struct_handle.name);
@@ -426,6 +484,81 @@ impl ModuleCache {
             ),
         }
     }
+
+    fn calculate_depth_of_struct(
+        &self,
+        def_idx: CachedStructIndex,
+        depth_cache: &mut BTreeMap<CachedStructIndex, DepthFormula>,
+    ) -> PartialVMResult<DepthFormula> {
+        let struct_type = &self.struct_at(def_idx);
+
+        // If we've already computed this structs depth, no more work remains to be done.
+        if let Some(form) = &struct_type.depth {
+            return Ok(form.clone());
+        }
+        if let Some(form) = depth_cache.get(&def_idx) {
+            return Ok(form.clone());
+        }
+
+        let formulas = struct_type
+            .fields
+            .iter()
+            .map(|field_type| self.calculate_depth_of_type(field_type, depth_cache))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let formula = DepthFormula::normalize(formulas);
+        let prev = depth_cache.insert(def_idx, formula.clone());
+        if prev.is_some() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Recursive type?".to_owned()),
+            );
+        }
+        Ok(formula)
+    }
+
+    fn calculate_depth_of_type(
+        &self,
+        ty: &Type,
+        depth_cache: &mut BTreeMap<CachedStructIndex, DepthFormula>,
+    ) -> PartialVMResult<DepthFormula> {
+        Ok(match ty {
+            Type::Bool
+            | Type::U8
+            | Type::U64
+            | Type::U128
+            | Type::Address
+            | Type::Signer
+            | Type::U16
+            | Type::U32
+            | Type::U256 => DepthFormula::constant(1),
+            Type::Vector(ty) | Type::Reference(ty) | Type::MutableReference(ty) => {
+                let mut inner = self.calculate_depth_of_type(ty, depth_cache)?;
+                inner.scale(1);
+                inner
+            }
+            Type::TyParam(ty_idx) => DepthFormula::type_parameter(*ty_idx),
+            Type::Struct(cache_idx) => {
+                let mut struct_formula = self.calculate_depth_of_struct(*cache_idx, depth_cache)?;
+                debug_assert!(struct_formula.terms.is_empty());
+                struct_formula.scale(1);
+                struct_formula
+            }
+            Type::StructInstantiation(cache_idx, ty_args) => {
+                let ty_arg_map = ty_args
+                    .iter()
+                    .enumerate()
+                    .map(|(idx, ty)| {
+                        let var = idx as TypeParameterIndex;
+                        Ok((var, self.calculate_depth_of_type(ty, depth_cache)?))
+                    })
+                    .collect::<PartialVMResult<BTreeMap<_, _>>>()?;
+                let struct_formula = self.calculate_depth_of_struct(*cache_idx, depth_cache)?;
+                let mut subst_struct_formula = struct_formula.subst(ty_arg_map)?;
+                subst_struct_formula.scale(1);
+                subst_struct_formula
+            }
+        })
+    }
 }
 
 //
@@ -441,16 +574,117 @@ pub(crate) struct Loader {
     module_cache: RwLock<ModuleCache>,
     type_cache: RwLock<TypeCache>,
     natives: NativeFunctions,
+
+    // The below field supports a hack to workaround well-known issues with the
+    // loader cache. This cache is not designed to support module upgrade or deletion.
+    // This leads to situations where the cache does not reflect the state of storage:
+    //
+    // 1. On module upgrade, the upgraded module is in storage, but the old one still in the cache.
+    // 2. On an abandoned code publishing transaction, the cache may contain a module which was
+    //    never committed to storage by the adapter.
+    //
+    // The solution is to add a flag to Loader marking it as 'invalidated'. For scenario (1),
+    // the VM sets the flag itself. For scenario (2), a public API allows the adapter to set
+    // the flag.
+    //
+    // If the cache is invalidated, it can (and must) still be used until there are no more
+    // sessions alive which are derived from a VM with this loader. This is because there are
+    // internal data structures derived from the loader which can become inconsistent. Therefore
+    // the adapter must explicitly call a function to flush the invalidated loader.
+    //
+    // This code (the loader) needs a complete refactoring. The new loader should
+    //
+    // - support upgrade and deletion of modules, while still preserving max cache lookup
+    //   performance. This is essential for a cache like this in a multi-tenant execution
+    //   environment.
+    // - should delegate lifetime ownership to the adapter. Code loading (including verification)
+    //   is a major execution bottleneck. We should be able to reuse a cache for the lifetime of
+    //   the adapter/node, not just a VM or even session (as effectively today).
+    invalidated: RwLock<bool>,
+
+    // Collects the cache hits on module loads. This information can be read and reset by
+    // an adapter to reason about read/write conflicts of code publishing transactions and
+    // other transactions.
+    module_cache_hits: RwLock<BTreeSet<ModuleId>>,
+
+    vm_config: VMConfig,
 }
 
 impl Loader {
-    pub(crate) fn new(natives: NativeFunctions) -> Self {
+    pub(crate) fn new(natives: NativeFunctions, vm_config: VMConfig) -> Self {
         Self {
             scripts: RwLock::new(ScriptCache::new()),
             module_cache: RwLock::new(ModuleCache::new()),
             type_cache: RwLock::new(TypeCache::new()),
             natives,
+            invalidated: RwLock::new(false),
+            module_cache_hits: RwLock::new(BTreeSet::new()),
+            vm_config,
+        }
+    }
+
+    pub(crate) fn vm_config(&self) -> &VMConfig {
+        &self.vm_config
+    }
+
+    /// Gets and clears module cache hits. A cache hit may also be caused indirectly by
+    /// loading a function or a type. This not only returns the direct hit, but also
+    /// indirect ones, that is all dependencies.
+    pub(crate) fn get_and_clear_module_cache_hits(&self) -> BTreeSet<ModuleId> {
+        let mut result = BTreeSet::new();
+        let hits: BTreeSet<ModuleId> = std::mem::take(&mut self.module_cache_hits.write());
+        for id in hits {
+            self.transitive_dep_closure(&id, &mut result)
         }
+        result
+    }
+
+    fn transitive_dep_closure(&self, id: &ModuleId, visited: &mut BTreeSet<ModuleId>) {
+        if !visited.insert(id.clone()) {
+            return;
+        }
+        let deps = self
+            .module_cache
+            .read()
+            .modules
+            .get(id)
+            .unwrap()
+            .module
+            .immediate_dependencies();
+        for dep in deps {
+            self.transitive_dep_closure(&dep, visited)
+        }
+    }
+
+    /// Flush this cache if it is marked as invalidated.
+    pub(crate) fn flush_if_invalidated(&self) {
+        let mut invalidated = self.invalidated.write();
+        if *invalidated {
+            *self.scripts.write() = ScriptCache::new();
+            *self.module_cache.write() = ModuleCache::new();
+            *self.type_cache.write() = TypeCache::new();
+            *invalidated = false;
+        }
+    }
+
+    /// Mark this cache as invalidated.
+    pub(crate) fn mark_as_invalid(&self) {
+        *self.invalidated.write() = true;
+    }
+
+    /// Check whether this cache is invalidated.
+    pub(crate) fn is_invalidated(&self) -> bool {
+        *self.invalidated.read()
+    }
+
+    /// Copies metadata out of a modules bytecode if available.
+    pub(crate) fn get_metadata(&self, module: ModuleId, key: &[u8]) -> Option<Metadata> {
+        let cache = self.module_cache.read();
+        cache
+            .modules
+            .get(&module)
+            .and_then(|module| module.module.metadata.iter().find(|md| md.key == key))
+            .cloned()
     }
 
     //
@@ -510,7 +744,10 @@ impl Loader {
         script: &[u8],
         data_store: &impl DataStore,
     ) -> VMResult<CompiledScript> {
-        let script = match CompiledScript::deserialize(script) {
+        let script = match CompiledScript::deserialize_with_max_version(
+            script,
+            self.vm_config.max_binary_format_version,
+        ) {
             Ok(script) => script,
             Err(err) => {
                 error!("[VM] deserializer for script returned error: {:?}", err,);
@@ -545,7 +782,9 @@ impl Loader {
     // Script verification steps.
     // See `verify_module()` for module verification steps.
     fn verify_script(&self, script: &CompiledScript) -> VMResult<()> {
-        move_bytecode_verifier::verify_script(script)
+        fail::fail_point!("verifier-failpoint-3", |_| { Ok(()) });
+
+        move_bytecode_verifier::verify_script_with_config(&self.vm_config.verifier, script)
     }
 
     fn verify_script_dependencies(
@@ -631,6 +870,8 @@ impl Loader {
         modules: &[CompiledModule],
         data_store: &mut impl DataStore,
     ) -> VMResult<()> {
+        fail::fail_point!("verifier-failpoint-1", |_| { Ok(()) });
+
         let mut bundle_unverified: BTreeSet<_> = modules.iter().map(|m| m.self_id()).collect();
         let mut bundle_verified = BTreeMap::new();
         for module in modules {
@@ -670,7 +911,7 @@ impl Loader {
         // module will NOT show up in `module_cache`. In the module republishing case, it means
         // that the old module is still in the `module_cache`, unless a new Loader is created,
         // which means that a new MoveVM instance needs to be created.
-        move_bytecode_verifier::verify_module(module)?;
+        move_bytecode_verifier::verify_module_with_config(&self.vm_config.verifier, module)?;
         self.check_natives(module)?;
 
         let mut visited = BTreeSet::new();
@@ -688,6 +929,7 @@ impl Loader {
             &mut visited,
             &mut friends_discovered,
             /* allow_dependency_loading_failure */ true,
+            /* dependencies_depth */ 0,
         )?;
 
         // upward exploration of the modules's dependency graph. Similar to dependency loading, as
@@ -699,6 +941,7 @@ impl Loader {
             bundle_unverified,
             data_store,
             /* allow_friend_loading_failure */ true,
+            /* dependencies_depth */ 0,
         )?;
 
         // make sure there is no cyclic dependency
@@ -740,31 +983,34 @@ impl Loader {
         )
     }
 
-    // All native functions must be known to the loader
+    // All native functions must be known to the loader, unless we are compiling with feature
+    // `lazy_natives`.
     fn check_natives(&self, module: &CompiledModule) -> VMResult<()> {
         fn check_natives_impl(loader: &Loader, module: &CompiledModule) -> PartialVMResult<()> {
-            for (idx, native_function) in module
-                .function_defs()
-                .iter()
-                .filter(|fdv| fdv.is_native())
-                .enumerate()
-            {
-                let fh = module.function_handle_at(native_function.function);
-                let mh = module.module_handle_at(fh.module);
-                loader
-                    .natives
-                    .resolve(
-                        module.address_identifier_at(mh.address),
-                        module.identifier_at(mh.name).as_str(),
-                        module.identifier_at(fh.name).as_str(),
-                    )
-                    .ok_or_else(|| {
-                        verification_error(
-                            StatusCode::MISSING_DEPENDENCY,
-                            IndexKind::FunctionHandle,
-                            idx as TableIndex,
+            if !cfg!(feature = "lazy_natives") {
+                for (idx, native_function) in module
+                    .function_defs()
+                    .iter()
+                    .filter(|fdv| fdv.is_native())
+                    .enumerate()
+                {
+                    let fh = module.function_handle_at(native_function.function);
+                    let mh = module.module_handle_at(fh.module);
+                    loader
+                        .natives
+                        .resolve(
+                            module.address_identifier_at(mh.address),
+                            module.identifier_at(mh.name).as_str(),
+                            module.identifier_at(fh.name).as_str(),
                         )
-                    })?;
+                        .ok_or_else(|| {
+                            verification_error(
+                                StatusCode::MISSING_DEPENDENCY,
+                                IndexKind::FunctionHandle,
+                                idx as TableIndex,
+                            )
+                        })?;
+                }
             }
             // TODO: fix check and error code if we leave something around for native structs.
             // For now this generates the only error test cases care about...
@@ -794,8 +1040,11 @@ impl Loader {
         Ok(match type_tag {
             TypeTag::Bool => Type::Bool,
             TypeTag::U8 => Type::U8,
+            TypeTag::U16 => Type::U16,
+            TypeTag::U32 => Type::U32,
             TypeTag::U64 => Type::U64,
             TypeTag::U128 => Type::U128,
+            TypeTag::U256 => Type::U256,
             TypeTag::Address => Type::Address,
             TypeTag::Signer => Type::Signer,
             TypeTag::Vector(tt) => Type::Vector(Box::new(self.load_type(tt, data_store)?)),
@@ -844,6 +1093,7 @@ impl Loader {
     ) -> VMResult<Arc<Module>> {
         // if the module is already in the code cache, load the cached version
         if let Some(cached) = self.module_cache.read().module_at(id) {
+            self.module_cache_hits.write().insert(id.clone());
             return Ok(cached);
         }
 
@@ -854,6 +1104,7 @@ impl Loader {
             bundle_unverified,
             data_store,
             /* allow_module_loading_failure */ true,
+            /* dependencies_depth */ 0,
         )?;
 
         // verify that the transitive closure does not have cycles
@@ -885,17 +1136,31 @@ impl Loader {
 
         // for bytes obtained from the data store, they should always deserialize and verify.
         // It is an invariant violation if they don't.
-        let module = CompiledModule::deserialize(&bytes)
-            .map_err(|err| {
-                let msg = format!("Deserialization error: {:?}", err);
-                PartialVMError::new(StatusCode::CODE_DESERIALIZATION_ERROR)
-                    .with_message(msg)
-                    .finish(Location::Module(id.clone()))
-            })
-            .map_err(expect_no_verification_errors)?;
+        let module = CompiledModule::deserialize_with_max_version(
+            &bytes,
+            self.vm_config.max_binary_format_version,
+        )
+        .map_err(|err| {
+            let msg = format!("Deserialization error: {:?}", err);
+            PartialVMError::new(StatusCode::CODE_DESERIALIZATION_ERROR)
+                .with_message(msg)
+                .finish(Location::Module(id.clone()))
+        })
+        .map_err(expect_no_verification_errors)?;
+
+        fail::fail_point!("verifier-failpoint-2", |_| { Ok(module.clone()) });
+
+        if self.vm_config.paranoid_type_checks && &module.self_id() != id {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Module self id mismatch with storage".to_string())
+                    .finish(Location::Module(id.clone())),
+            );
+        }
 
         // bytecode verifier checks that can be performed with the module itself
-        move_bytecode_verifier::verify_module(&module).map_err(expect_no_verification_errors)?;
+        move_bytecode_verifier::verify_module_with_config(&self.vm_config.verifier, &module)
+            .map_err(expect_no_verification_errors)?;
         self.check_natives(&module)
             .map_err(expect_no_verification_errors)?;
         Ok(module)
@@ -911,6 +1176,7 @@ impl Loader {
         visited: &mut BTreeSet<ModuleId>,
         friends_discovered: &mut BTreeSet<ModuleId>,
         allow_module_loading_failure: bool,
+        dependencies_depth: usize,
     ) -> VMResult<Arc<Module>> {
         // dependency loading does not permit cycles
         if visited.contains(id) {
@@ -932,6 +1198,7 @@ impl Loader {
             visited,
             friends_discovered,
             /* allow_dependency_loading_failure */ false,
+            dependencies_depth,
         )?;
 
         // if linking goes well, insert the module to the code cache
@@ -951,7 +1218,16 @@ impl Loader {
         visited: &mut BTreeSet<ModuleId>,
         friends_discovered: &mut BTreeSet<ModuleId>,
         allow_dependency_loading_failure: bool,
+        dependencies_depth: usize,
     ) -> VMResult<()> {
+        if let Some(max_dependency_depth) = self.vm_config.verifier.max_dependency_depth {
+            if dependencies_depth > max_dependency_depth {
+                return Err(
+                    PartialVMError::new(StatusCode::MAX_DEPENDENCY_DEPTH_REACHED)
+                        .finish(Location::Undefined),
+                );
+            }
+        }
         // all immediate dependencies of the module being verified should be in one of the locations
         // - the verified portion of the bundle (e.g., verified before this module)
         // - the code cache (i.e., loaded already)
@@ -973,6 +1249,7 @@ impl Loader {
                             visited,
                             friends_discovered,
                             allow_dependency_loading_failure,
+                            dependencies_depth + 1,
                         )?
                     }
                     Some(cached) => cached,
@@ -985,6 +1262,9 @@ impl Loader {
         let all_imm_deps = bundle_deps
             .into_iter()
             .chain(cached_deps.iter().map(|m| m.module()));
+
+        fail::fail_point!("verifier-failpoint-4", |_| { Ok(()) });
+
         let result = dependencies::verify_module(module, all_imm_deps);
 
         // if dependencies loading is not allowed to fail, the linking should not fail as well
@@ -1005,6 +1285,7 @@ impl Loader {
         bundle_unverified: &BTreeSet<ModuleId>,
         data_store: &impl DataStore,
         allow_module_loading_failure: bool,
+        dependencies_depth: usize,
     ) -> VMResult<Arc<Module>> {
         // load the closure of the module in terms of dependency relation
         let mut visited = BTreeSet::new();
@@ -1016,6 +1297,7 @@ impl Loader {
             &mut visited,
             &mut friends_discovered,
             allow_module_loading_failure,
+            0,
         )?;
 
         // upward exploration of the module's friendship graph and expand the friendship frontier.
@@ -1027,6 +1309,7 @@ impl Loader {
             bundle_unverified,
             data_store,
             /* allow_friend_loading_failure */ false,
+            dependencies_depth,
         )?;
         Ok(module_ref)
     }
@@ -1039,7 +1322,16 @@ impl Loader {
         bundle_unverified: &BTreeSet<ModuleId>,
         data_store: &impl DataStore,
         allow_friend_loading_failure: bool,
+        dependencies_depth: usize,
     ) -> VMResult<()> {
+        if let Some(max_dependency_depth) = self.vm_config.verifier.max_dependency_depth {
+            if dependencies_depth > max_dependency_depth {
+                return Err(
+                    PartialVMError::new(StatusCode::MAX_DEPENDENCY_DEPTH_REACHED)
+                        .finish(Location::Undefined),
+                );
+            }
+        }
         // for each new module discovered in the frontier, load them fully and expand the frontier.
         // apply three filters to the new friend modules discovered
         // - `!locked_cache.has_module(mid)`
@@ -1072,11 +1364,32 @@ impl Loader {
                 bundle_unverified,
                 data_store,
                 allow_friend_loading_failure,
+                dependencies_depth + 1,
             )?;
         }
         Ok(())
     }
 
+    // Return an instantiated type given a generic and an instantiation.
+    // Stopgap to avoid a recursion that is either taking too long or using too
+    // much memory
+    fn subst(&self, ty: &Type, ty_args: &[Type]) -> PartialVMResult<Type> {
+        // Before instantiating the type, count the # of nodes of all type arguments plus
+        // existing type instantiation.
+        // If that number is larger than MAX_TYPE_INSTANTIATION_NODES, refuse to construct this type.
+        // This prevents constructing larger and lager types via struct instantiation.
+        if let Type::StructInstantiation(_, struct_inst) = ty {
+            let mut sum_nodes = 1u64;
+            for ty in ty_args.iter().chain(struct_inst.iter()) {
+                sum_nodes = sum_nodes.saturating_add(self.count_type_nodes(ty));
+                if sum_nodes > MAX_TYPE_INSTANTIATION_NODES {
+                    return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+                }
+            }
+        }
+        ty.subst(ty_args)
+    }
+
     // Verify the kind (constraints) of an instantiation.
     // Both function and script invocation use this function to verify correctness
     // of type arguments provided
@@ -1133,9 +1446,14 @@ impl Loader {
 
     pub(crate) fn abilities(&self, ty: &Type) -> PartialVMResult<AbilitySet> {
         match ty {
-            Type::Bool | Type::U8 | Type::U64 | Type::U128 | Type::Address => {
-                Ok(AbilitySet::PRIMITIVES)
-            }
+            Type::Bool
+            | Type::U8
+            | Type::U16
+            | Type::U32
+            | Type::U64
+            | Type::U128
+            | Type::U256
+            | Type::Address => Ok(AbilitySet::PRIMITIVES),
 
             // Technically unreachable but, no point in erroring if we don't have to
             Type::Reference(_) | Type::MutableReference(_) => Ok(AbilitySet::REFERENCES),
@@ -1245,11 +1563,21 @@ impl<'a> Resolver<'a> {
         };
         let mut instantiation = vec![];
         for ty in &func_inst.instantiation {
-            instantiation.push(ty.subst(type_params)?);
+            instantiation.push(self.subst(ty, type_params)?);
+        }
+        // Check if the function instantiation over all generics is larger
+        // than MAX_TYPE_INSTANTIATION_NODES.
+        let mut sum_nodes = 1u64;
+        for ty in type_params.iter().chain(instantiation.iter()) {
+            sum_nodes = sum_nodes.saturating_add(self.loader.count_type_nodes(ty));
+            if sum_nodes > MAX_TYPE_INSTANTIATION_NODES {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+            }
         }
         Ok(instantiation)
     }
 
+    #[allow(unused)]
     pub(crate) fn type_params_count(&self, idx: FunctionInstantiationIndex) -> usize {
         let func_inst = match &self.binary {
             BinaryType::Module(module) => module.function_instantiation_at(idx.0),
@@ -1279,16 +1607,113 @@ impl<'a> Resolver<'a> {
             BinaryType::Module(module) => module.struct_instantiation_at(idx.0),
             BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
         };
+
+        // Before instantiating the type, count the # of nodes of all type arguments plus
+        // existing type instantiation.
+        // If that number is larger than MAX_TYPE_INSTANTIATION_NODES, refuse to construct this type.
+        // This prevents constructing larger and larger types via struct instantiation.
+        let mut sum_nodes = 1u64;
+        for ty in ty_args.iter().chain(struct_inst.instantiation.iter()) {
+            sum_nodes = sum_nodes.saturating_add(self.loader.count_type_nodes(ty));
+            if sum_nodes > MAX_TYPE_INSTANTIATION_NODES {
+                return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+            }
+        }
+
         Ok(Type::StructInstantiation(
             struct_inst.def,
             struct_inst
                 .instantiation
                 .iter()
-                .map(|ty| ty.subst(ty_args))
+                .map(|ty| self.subst(ty, ty_args))
                 .collect::<PartialVMResult<_>>()?,
         ))
     }
 
+    pub(crate) fn get_field_type(&self, idx: FieldHandleIndex) -> PartialVMResult<Type> {
+        let handle = match &self.binary {
+            BinaryType::Module(module) => &module.field_handles[idx.0 as usize],
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        Ok(self
+            .loader
+            .get_struct_type(handle.owner)
+            .ok_or_else(|| {
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Struct Definition not resolved".to_string())
+            })?
+            .fields[handle.offset]
+            .clone())
+    }
+
+    pub(crate) fn instantiate_generic_field(
+        &self,
+        idx: FieldInstantiationIndex,
+        ty_args: &[Type],
+    ) -> PartialVMResult<Type> {
+        let field_instantiation = match &self.binary {
+            BinaryType::Module(module) => &module.field_instantiations[idx.0 as usize],
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        let struct_type = self
+            .loader
+            .get_struct_type(field_instantiation.owner)
+            .ok_or_else(|| {
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Struct Definition not resolved".to_string())
+            })?;
+
+        let instantiation_types = field_instantiation
+            .instantiation
+            .iter()
+            .map(|inst_ty| inst_ty.subst(ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        struct_type.fields[field_instantiation.offset].subst(&instantiation_types)
+    }
+
+    pub(crate) fn get_struct_fields(
+        &self,
+        idx: StructDefinitionIndex,
+    ) -> PartialVMResult<Arc<StructType>> {
+        let idx = match &self.binary {
+            BinaryType::Module(module) => module.struct_at(idx),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        self.loader.get_struct_type(idx).ok_or_else(|| {
+            PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                .with_message("Struct Definition not resolved".to_string())
+        })
+    }
+
+    pub(crate) fn instantiate_generic_struct_fields(
+        &self,
+        idx: StructDefInstantiationIndex,
+        ty_args: &[Type],
+    ) -> PartialVMResult<Vec<Type>> {
+        let struct_inst = match &self.binary {
+            BinaryType::Module(module) => module.struct_instantiation_at(idx.0),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have type instructions"),
+        };
+        let struct_type = self
+            .loader
+            .get_struct_type(struct_inst.def)
+            .ok_or_else(|| {
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("Struct Definition not resolved".to_string())
+            })?;
+
+        let instantiation_types = struct_inst
+            .instantiation
+            .iter()
+            .map(|inst_ty| inst_ty.subst(ty_args))
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        struct_type
+            .fields
+            .iter()
+            .map(|ty| ty.subst(&instantiation_types))
+            .collect::<PartialVMResult<Vec<_>>>()
+    }
+
     fn single_type_at(&self, idx: SignatureIndex) -> &Type {
         match &self.binary {
             BinaryType::Module(module) => module.single_type_at(idx),
@@ -1302,7 +1727,15 @@ impl<'a> Resolver<'a> {
         ty_args: &[Type],
     ) -> PartialVMResult<Type> {
         let ty = self.single_type_at(idx);
-        ty.subst(ty_args)
+        if !ty_args.is_empty() {
+            self.subst(ty, ty_args)
+        } else {
+            Ok(ty.clone())
+        }
+    }
+
+    pub(crate) fn subst(&self, ty: &Type, ty_args: &[Type]) -> PartialVMResult<Type> {
+        self.loader.subst(ty, ty_args)
     }
 
     //
@@ -1337,10 +1770,42 @@ impl<'a> Resolver<'a> {
         }
     }
 
+    pub(crate) fn field_handle_to_struct(&self, idx: FieldHandleIndex) -> Type {
+        match &self.binary {
+            BinaryType::Module(module) => Type::Struct(module.field_handles[idx.0 as usize].owner),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have field instructions"),
+        }
+    }
+
+    pub(crate) fn field_instantiation_to_struct(
+        &self,
+        idx: FieldInstantiationIndex,
+        args: &[Type],
+    ) -> PartialVMResult<Type> {
+        match &self.binary {
+            BinaryType::Module(module) => Ok(Type::StructInstantiation(
+                module.field_instantiations[idx.0 as usize].owner,
+                module.field_instantiations[idx.0 as usize]
+                    .instantiation
+                    .iter()
+                    .map(|ty| ty.subst(args))
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            )),
+            BinaryType::Script(_) => unreachable!("Scripts cannot have field instructions"),
+        }
+    }
+
     pub(crate) fn type_to_type_layout(&self, ty: &Type) -> PartialVMResult<MoveTypeLayout> {
         self.loader.type_to_type_layout(ty)
     }
 
+    pub(crate) fn type_to_fully_annotated_layout(
+        &self,
+        ty: &Type,
+    ) -> PartialVMResult<MoveTypeLayout> {
+        self.loader.type_to_fully_annotated_layout(ty)
+    }
+
     // get the loader
     pub(crate) fn loader(&self) -> &Loader {
         self.loader
@@ -1560,7 +2025,15 @@ impl Module {
                 let fh_idx = f_inst.handle;
                 let owner = field_handles[fh_idx.0 as usize].owner;
                 let offset = field_handles[fh_idx.0 as usize].offset;
-                field_instantiations.push(FieldInstantiation { offset, owner });
+                let mut instantiation = vec![];
+                for ty in &module.signature_at(f_inst.type_parameters).0 {
+                    instantiation.push(cache.make_type_while_loading(&module, ty)?);
+                }
+                field_instantiations.push(FieldInstantiation {
+                    offset,
+                    owner,
+                    instantiation,
+                });
             }
 
             Ok(())
@@ -1734,6 +2207,12 @@ impl Script {
                 .cloned()
                 .collect(),
         );
+        let local_tys = locals
+            .0
+            .iter()
+            .map(|tok| cache.make_type(BinaryIndexedView::Script(&script), tok))
+            .collect::<PartialVMResult<Vec<_>>>()
+            .map_err(|err| err.finish(Location::Undefined))?;
         let return_ = Signature(vec![]);
         let return_tys = return_
             .0
@@ -1744,7 +2223,7 @@ impl Script {
         let type_parameters = script.type_parameters.clone();
         // TODO: main does not have a name. Revisit.
         let name = Identifier::new("main").unwrap();
-        let native = None; // Script entries cannot be native
+        let (native, def_is_native) = (None, false); // Script entries cannot be native
         let main: Arc<Function> = Arc::new(Function {
             file_format_version: script.version(),
             index: FunctionDefinitionIndex(0),
@@ -1754,8 +2233,13 @@ impl Script {
             locals,
             type_parameters,
             native,
+            def_is_native,
+            def_is_friend_or_private: false,
             scope,
             name,
+            return_types: return_tys.clone(),
+            local_types: local_tys,
+            parameter_types: parameter_tys.clone(),
         });
 
         let mut single_signature_token_map = BTreeMap::new();
@@ -1845,8 +2329,13 @@ pub(crate) struct Function {
     locals: Signature,
     type_parameters: Vec<AbilitySet>,
     native: Option<NativeFunction>,
+    def_is_native: bool,
+    def_is_friend_or_private: bool,
     scope: Scope,
     name: Identifier,
+    return_types: Vec<Type>,
+    local_types: Vec<Type>,
+    parameter_types: Vec<Type>,
 }
 
 impl Function {
@@ -1859,14 +2348,21 @@ impl Function {
         let handle = module.function_handle_at(def.function);
         let name = module.identifier_at(handle.name).to_owned();
         let module_id = module.self_id();
-        let native = if def.is_native() {
-            natives.resolve(
-                module_id.address(),
-                module_id.name().as_str(),
-                name.as_str(),
+        let def_is_friend_or_private = match def.visibility {
+            Visibility::Friend | Visibility::Private => true,
+            Visibility::Public => false,
+        };
+        let (native, def_is_native) = if def.is_native() {
+            (
+                natives.resolve(
+                    module_id.address(),
+                    module_id.name().as_str(),
+                    name.as_str(),
+                ),
+                true,
             )
         } else {
-            None
+            (None, false)
         };
         let scope = Scope::Module(module_id);
         let parameters = module.signature_at(handle.parameters).clone();
@@ -1896,8 +2392,13 @@ impl Function {
             locals,
             type_parameters,
             native,
+            def_is_native,
+            def_is_friend_or_private,
             scope,
             name,
+            local_types: vec![],
+            return_types: vec![],
+            parameter_types: vec![],
         }
     }
 
@@ -1938,6 +2439,10 @@ impl Function {
         self.parameters.len()
     }
 
+    pub(crate) fn return_type_count(&self) -> usize {
+        self.return_.len()
+    }
+
     pub(crate) fn name(&self) -> &str {
         self.name.as_str()
     }
@@ -1950,9 +2455,16 @@ impl Function {
         &self.type_parameters
     }
 
-    #[allow(dead_code)]
-    pub(crate) fn parameters(&self) -> &Signature {
-        &self.parameters
+    pub(crate) fn local_types(&self) -> &[Type] {
+        &self.local_types
+    }
+
+    pub(crate) fn return_types(&self) -> &[Type] {
+        &self.return_types
+    }
+
+    pub(crate) fn parameter_types(&self) -> &[Type] {
+        &self.parameter_types
     }
 
     pub(crate) fn pretty_string(&self) -> String {
@@ -1968,14 +2480,28 @@ impl Function {
     }
 
     pub(crate) fn is_native(&self) -> bool {
-        self.native.is_some()
+        self.def_is_native
     }
 
-    pub(crate) fn get_native(&self) -> PartialVMResult<NativeFunction> {
-        self.native.ok_or_else(|| {
-            PartialVMError::new(StatusCode::UNREACHABLE)
-                .with_message("Missing Native Function".to_string())
-        })
+    pub(crate) fn is_friend_or_private(&self) -> bool {
+        self.def_is_friend_or_private
+    }
+
+    pub(crate) fn get_native(&self) -> PartialVMResult<&UnboxedNativeFunction> {
+        if cfg!(feature = "lazy_natives") {
+            // If lazy_natives is configured, this is a MISSING_DEPENDENCY error, as we skip
+            // checking those at module loading time.
+            self.native.as_deref().ok_or_else(|| {
+                PartialVMError::new(StatusCode::MISSING_DEPENDENCY)
+                    .with_message(format!("Missing Native Function `{}`", self.name))
+            })
+        } else {
+            // Otherwise this error should not happen, hence UNREACHABLE
+            self.native.as_deref().ok_or_else(|| {
+                PartialVMError::new(StatusCode::UNREACHABLE)
+                    .with_message("Missing Native Function".to_string())
+            })
+        }
     }
 }
 
@@ -2027,6 +2553,7 @@ struct FieldInstantiation {
     // `ModuelCache::structs` global table index. It is the generic type.
     #[allow(unused)]
     owner: CachedStructIndex,
+    instantiation: Vec<Type>,
 }
 
 //
@@ -2036,6 +2563,9 @@ struct FieldInstantiation {
 struct StructInfo {
     struct_tag: Option<StructTag>,
     struct_layout: Option<MoveStructLayout>,
+    annotated_struct_layout: Option<MoveStructLayout>,
+    node_count: Option<u64>,
+    annotated_node_count: Option<u64>,
 }
 
 impl StructInfo {
@@ -2043,6 +2573,9 @@ impl StructInfo {
         Self {
             struct_tag: None,
             struct_layout: None,
+            annotated_struct_layout: None,
+            node_count: None,
+            annotated_node_count: None,
         }
     }
 }
@@ -2059,7 +2592,16 @@ impl TypeCache {
     }
 }
 
-const VALUE_DEPTH_MAX: usize = 128;
+/// Maximal depth of a value in terms of type depth.
+pub const VALUE_DEPTH_MAX: u64 = 128;
+
+/// Maximal nodes which are allowed when converting to layout. This includes the the types of
+/// fields for struct types.
+const MAX_TYPE_TO_LAYOUT_NODES: u64 = 256;
+
+/// Maximal nodes which are all allowed when instantiating a generic type. This does not include
+/// field types of structs.
+const MAX_TYPE_INSTANTIATION_NODES: u64 = 128;
 
 impl Loader {
     fn struct_gidx_to_type_tag(
@@ -2103,87 +2645,263 @@ impl Loader {
         Ok(match ty {
             Type::Bool => TypeTag::Bool,
             Type::U8 => TypeTag::U8,
+            Type::U16 => TypeTag::U16,
+            Type::U32 => TypeTag::U32,
             Type::U64 => TypeTag::U64,
             Type::U128 => TypeTag::U128,
+            Type::U256 => TypeTag::U256,
             Type::Address => TypeTag::Address,
             Type::Signer => TypeTag::Signer,
             Type::Vector(ty) => TypeTag::Vector(Box::new(self.type_to_type_tag(ty)?)),
-            Type::Struct(gidx) => TypeTag::Struct(self.struct_gidx_to_type_tag(*gidx, &[])?),
+            Type::Struct(gidx) => {
+                TypeTag::Struct(Box::new(self.struct_gidx_to_type_tag(*gidx, &[])?))
+            }
             Type::StructInstantiation(gidx, ty_args) => {
-                TypeTag::Struct(self.struct_gidx_to_type_tag(*gidx, ty_args)?)
+                TypeTag::Struct(Box::new(self.struct_gidx_to_type_tag(*gidx, ty_args)?))
             }
             Type::Reference(_) | Type::MutableReference(_) | Type::TyParam(_) => {
                 return Err(
                     PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
                         .with_message(format!("no type tag for {:?}", ty)),
-                )
+                );
             }
         })
     }
 
+    fn count_type_nodes(&self, ty: &Type) -> u64 {
+        let mut todo = vec![ty];
+        let mut result = 0;
+        while let Some(ty) = todo.pop() {
+            match ty {
+                Type::Vector(ty) | Type::Reference(ty) | Type::MutableReference(ty) => {
+                    result += 1;
+                    todo.push(ty);
+                }
+                Type::StructInstantiation(_, ty_args) => {
+                    result += 1;
+                    todo.extend(ty_args.iter())
+                }
+                _ => {
+                    result += 1;
+                }
+            }
+        }
+        result
+    }
+
     fn struct_gidx_to_type_layout(
         &self,
         gidx: CachedStructIndex,
         ty_args: &[Type],
-        depth: usize,
+        count: &mut u64,
+        depth: u64,
     ) -> PartialVMResult<MoveStructLayout> {
         if let Some(struct_map) = self.type_cache.read().structs.get(&gidx) {
             if let Some(struct_info) = struct_map.get(ty_args) {
+                if let Some(node_count) = &struct_info.node_count {
+                    *count += *node_count
+                }
                 if let Some(layout) = &struct_info.struct_layout {
                     return Ok(layout.clone());
                 }
             }
         }
 
+        let count_before = *count;
         let struct_type = self.module_cache.read().struct_at(gidx);
         let field_tys = struct_type
             .fields
             .iter()
-            .map(|ty| ty.subst(ty_args))
+            .map(|ty| self.subst(ty, ty_args))
             .collect::<PartialVMResult<Vec<_>>>()?;
         let field_layouts = field_tys
             .iter()
-            .map(|ty| self.type_to_type_layout_impl(ty, depth + 1))
+            .map(|ty| self.type_to_type_layout_impl(ty, count, depth + 1))
             .collect::<PartialVMResult<Vec<_>>>()?;
+        let field_node_count = *count - count_before;
+
         let struct_layout = MoveStructLayout::new(field_layouts);
 
-        self.type_cache
-            .write()
+        let mut cache = self.type_cache.write();
+        let info = cache
             .structs
             .entry(gidx)
             .or_insert_with(HashMap::new)
             .entry(ty_args.to_vec())
-            .or_insert_with(StructInfo::new)
-            .struct_layout = Some(struct_layout.clone());
+            .or_insert_with(StructInfo::new);
+        info.struct_layout = Some(struct_layout.clone());
+        info.node_count = Some(field_node_count);
 
         Ok(struct_layout)
     }
 
-    fn type_to_type_layout_impl(&self, ty: &Type, depth: usize) -> PartialVMResult<MoveTypeLayout> {
+    fn type_to_type_layout_impl(
+        &self,
+        ty: &Type,
+        count: &mut u64,
+        depth: u64,
+    ) -> PartialVMResult<MoveTypeLayout> {
+        if *count > MAX_TYPE_TO_LAYOUT_NODES {
+            return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+        }
         if depth > VALUE_DEPTH_MAX {
             return Err(PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED));
         }
         Ok(match ty {
-            Type::Bool => MoveTypeLayout::Bool,
-            Type::U8 => MoveTypeLayout::U8,
-            Type::U64 => MoveTypeLayout::U64,
-            Type::U128 => MoveTypeLayout::U128,
-            Type::Address => MoveTypeLayout::Address,
-            Type::Signer => MoveTypeLayout::Signer,
+            Type::Bool => {
+                *count += 1;
+                MoveTypeLayout::Bool
+            }
+            Type::U8 => {
+                *count += 1;
+                MoveTypeLayout::U8
+            }
+            Type::U16 => {
+                *count += 1;
+                MoveTypeLayout::U16
+            }
+            Type::U32 => {
+                *count += 1;
+                MoveTypeLayout::U32
+            }
+            Type::U64 => {
+                *count += 1;
+                MoveTypeLayout::U64
+            }
+            Type::U128 => {
+                *count += 1;
+                MoveTypeLayout::U128
+            }
+            Type::U256 => {
+                *count += 1;
+                MoveTypeLayout::U256
+            }
+            Type::Address => {
+                *count += 1;
+                MoveTypeLayout::Address
+            }
+            Type::Signer => {
+                *count += 1;
+                MoveTypeLayout::Signer
+            }
             Type::Vector(ty) => {
-                MoveTypeLayout::Vector(Box::new(self.type_to_type_layout_impl(ty, depth + 1)?))
+                *count += 1;
+                MoveTypeLayout::Vector(Box::new(self.type_to_type_layout_impl(
+                    ty,
+                    count,
+                    depth + 1,
+                )?))
             }
             Type::Struct(gidx) => {
-                MoveTypeLayout::Struct(self.struct_gidx_to_type_layout(*gidx, &[], depth)?)
+                *count += 1;
+                MoveTypeLayout::Struct(self.struct_gidx_to_type_layout(*gidx, &[], count, depth)?)
             }
             Type::StructInstantiation(gidx, ty_args) => {
-                MoveTypeLayout::Struct(self.struct_gidx_to_type_layout(*gidx, ty_args, depth)?)
+                *count += 1;
+                MoveTypeLayout::Struct(
+                    self.struct_gidx_to_type_layout(*gidx, ty_args, count, depth)?,
+                )
             }
             Type::Reference(_) | Type::MutableReference(_) | Type::TyParam(_) => {
                 return Err(
                     PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
                         .with_message(format!("no type layout for {:?}", ty)),
-                )
+                );
+            }
+        })
+    }
+
+    fn struct_gidx_to_fully_annotated_layout(
+        &self,
+        gidx: CachedStructIndex,
+        ty_args: &[Type],
+        count: &mut u64,
+        depth: u64,
+    ) -> PartialVMResult<MoveStructLayout> {
+        if let Some(struct_map) = self.type_cache.read().structs.get(&gidx) {
+            if let Some(struct_info) = struct_map.get(ty_args) {
+                if let Some(annotated_node_count) = &struct_info.annotated_node_count {
+                    *count += *annotated_node_count
+                }
+                if let Some(layout) = &struct_info.annotated_struct_layout {
+                    return Ok(layout.clone());
+                }
+            }
+        }
+
+        let struct_type = self.module_cache.read().struct_at(gidx);
+        if struct_type.fields.len() != struct_type.field_names.len() {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    "Field types did not match the length of field names in loaded struct"
+                        .to_owned(),
+                ),
+            );
+        }
+        let count_before = *count;
+        let struct_tag = self.struct_gidx_to_type_tag(gidx, ty_args)?;
+        let field_layouts = struct_type
+            .field_names
+            .iter()
+            .zip(&struct_type.fields)
+            .map(|(n, ty)| {
+                let ty = self.subst(ty, ty_args)?;
+                let l = self.type_to_fully_annotated_layout_impl(&ty, count, depth + 1)?;
+                Ok(MoveFieldLayout::new(n.clone(), l))
+            })
+            .collect::<PartialVMResult<Vec<_>>>()?;
+        let struct_layout = MoveStructLayout::with_types(struct_tag, field_layouts);
+        let field_node_count = *count - count_before;
+
+        let mut cache = self.type_cache.write();
+        let info = cache
+            .structs
+            .entry(gidx)
+            .or_insert_with(HashMap::new)
+            .entry(ty_args.to_vec())
+            .or_insert_with(StructInfo::new);
+        info.annotated_struct_layout = Some(struct_layout.clone());
+        info.annotated_node_count = Some(field_node_count);
+
+        Ok(struct_layout)
+    }
+
+    fn type_to_fully_annotated_layout_impl(
+        &self,
+        ty: &Type,
+        count: &mut u64,
+        depth: u64,
+    ) -> PartialVMResult<MoveTypeLayout> {
+        if *count > MAX_TYPE_TO_LAYOUT_NODES {
+            return Err(PartialVMError::new(StatusCode::TOO_MANY_TYPE_NODES));
+        }
+        if depth > VALUE_DEPTH_MAX {
+            return Err(PartialVMError::new(StatusCode::VM_MAX_VALUE_DEPTH_REACHED));
+        }
+        Ok(match ty {
+            Type::Bool => MoveTypeLayout::Bool,
+            Type::U8 => MoveTypeLayout::U8,
+            Type::U16 => MoveTypeLayout::U16,
+            Type::U32 => MoveTypeLayout::U32,
+            Type::U64 => MoveTypeLayout::U64,
+            Type::U128 => MoveTypeLayout::U128,
+            Type::U256 => MoveTypeLayout::U256,
+            Type::Address => MoveTypeLayout::Address,
+            Type::Signer => MoveTypeLayout::Signer,
+            Type::Vector(ty) => MoveTypeLayout::Vector(Box::new(
+                self.type_to_fully_annotated_layout_impl(ty, count, depth + 1)?,
+            )),
+            Type::Struct(gidx) => MoveTypeLayout::Struct(
+                self.struct_gidx_to_fully_annotated_layout(*gidx, &[], count, depth)?,
+            ),
+            Type::StructInstantiation(gidx, ty_args) => MoveTypeLayout::Struct(
+                self.struct_gidx_to_fully_annotated_layout(*gidx, ty_args, count, depth)?,
+            ),
+            Type::Reference(_) | Type::MutableReference(_) | Type::TyParam(_) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message(format!("no type layout for {:?}", ty)),
+                );
             }
         })
     }
@@ -2191,8 +2909,18 @@ impl Loader {
     pub(crate) fn type_to_type_tag(&self, ty: &Type) -> PartialVMResult<TypeTag> {
         self.type_to_type_tag_impl(ty)
     }
+
     pub(crate) fn type_to_type_layout(&self, ty: &Type) -> PartialVMResult<MoveTypeLayout> {
-        self.type_to_type_layout_impl(ty, 1)
+        let mut count = 0;
+        self.type_to_type_layout_impl(ty, &mut count, 1)
+    }
+
+    pub(crate) fn type_to_fully_annotated_layout(
+        &self,
+        ty: &Type,
+    ) -> PartialVMResult<MoveTypeLayout> {
+        let mut count = 0;
+        self.type_to_fully_annotated_layout_impl(ty, &mut count, 1)
     }
 }
 
@@ -2207,4 +2935,14 @@ impl Loader {
         self.type_to_type_layout(&ty)
             .map_err(|e| e.finish(Location::Undefined))
     }
+
+    pub(crate) fn get_fully_annotated_type_layout(
+        &self,
+        type_tag: &TypeTag,
+        move_storage: &impl DataStore,
+    ) -> VMResult<MoveTypeLayout> {
+        let ty = self.load_type(type_tag, move_storage)?;
+        self.type_to_fully_annotated_layout(&ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
 }
diff --git a/language/move-vm/runtime/src/move_vm.rs b/language/move-vm/runtime/src/move_vm.rs
index 4127164a48..428e1109d0 100644
--- a/language/move-vm/runtime/src/move_vm.rs
+++ b/language/move-vm/runtime/src/move_vm.rs
@@ -2,10 +2,10 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use std::sync::Arc;
+use std::{collections::BTreeSet, sync::Arc};
 
 use crate::{
-    data_cache::TransactionDataCache, native_extensions::NativeContextExtensions,
+    config::VMConfig, data_cache::TransactionDataCache, native_extensions::NativeContextExtensions,
     native_functions::NativeFunction, runtime::VMRuntime, session::Session,
 };
 use move_binary_format::{
@@ -14,7 +14,7 @@ use move_binary_format::{
 };
 use move_core_types::{
     account_address::AccountAddress, identifier::Identifier, language_storage::ModuleId,
-    resolver::MoveResolver,
+    metadata::Metadata, resolver::MoveResolver,
 };
 
 pub struct MoveVM {
@@ -24,9 +24,17 @@ pub struct MoveVM {
 impl MoveVM {
     pub fn new(
         natives: impl IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+    ) -> VMResult<Self> {
+        Self::new_with_config(natives, VMConfig::default())
+    }
+
+    pub fn new_with_config(
+        natives: impl IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+        vm_config: VMConfig,
     ) -> VMResult<Self> {
         Ok(Self {
-            runtime: VMRuntime::new(natives).map_err(|err| err.finish(Location::Undefined))?,
+            runtime: VMRuntime::new(natives, vm_config)
+                .map_err(|err| err.finish(Location::Undefined))?,
         })
     }
 
@@ -71,4 +79,52 @@ impl MoveVM {
             )
             .map(|arc_module| arc_module.arc_module())
     }
+
+    /// Allows the adapter to announce to the VM that the code loading cache should be considered
+    /// outdated. This can happen if the adapter executed a particular code publishing transaction
+    /// but decided to not commit the result to the data store. Because the code cache currently
+    /// does not support deletion, the cache will, incorrectly, still contain this module.
+    /// TODO: new loader architecture
+    pub fn mark_loader_cache_as_invalid(&self) {
+        self.runtime.loader().mark_as_invalid()
+    }
+
+    /// Returns true if the loader cache has been invalidated (either by explicit call above
+    /// or by the runtime)
+    pub fn is_loader_cache_invalidated(&self) -> bool {
+        self.runtime.loader().is_invalidated()
+    }
+
+    /// If the loader cache has been invalidated (either by the above call or by internal logic)
+    /// flush it so it is valid again. Notice that should only be called if there are no
+    /// outstanding sessions created from this VM.
+    /// TODO: new loader architecture
+    pub fn flush_loader_cache_if_invalidated(&self) {
+        self.runtime.loader().flush_if_invalidated()
+    }
+
+    /// Gets and clears module cache hits. This is hack which allows the adapter to see module
+    /// reads if executing multiple transactions in a VM. Without this, the adapter only sees
+    /// the first load of a module.
+    /// TODO: new loader architecture
+    pub fn get_and_clear_module_cache_hits(&self) -> BTreeSet<ModuleId> {
+        self.runtime.loader().get_and_clear_module_cache_hits()
+    }
+
+    /// Attempts to discover metadata in a given module with given key. Availability
+    /// of this data may depend on multiple aspects. In general, no hard assumptions of
+    /// availability should be made, but typically, one can expect that
+    /// the modules which have been involved in the execution of the last session are available.
+    ///
+    /// This is called by an adapter to extract, for example, debug information out of
+    /// the metadata section of the code for post mortem analysis. Notice that because
+    /// of ownership of the underlying binary representation of modules hidden behind an rwlock,
+    /// this actually has to hand back a copy of the associated metadata, so metadata should
+    /// be organized keeping this in mind.
+    ///
+    /// TODO: in the new loader architecture, as the loader is visible to the adapter, one would
+    ///   call this directly via the loader instead of the VM.
+    pub fn get_module_metadata(&self, module: ModuleId, key: &[u8]) -> Option<Metadata> {
+        self.runtime.loader().get_metadata(module, key)
+    }
 }
diff --git a/language/move-vm/runtime/src/native_functions.rs b/language/move-vm/runtime/src/native_functions.rs
index a0b89b3377..42f7c41437 100644
--- a/language/move-vm/runtime/src/native_functions.rs
+++ b/language/move-vm/runtime/src/native_functions.rs
@@ -5,26 +5,31 @@
 use crate::{
     interpreter::Interpreter, loader::Resolver, native_extensions::NativeContextExtensions,
 };
-use move_binary_format::errors::{PartialVMError, PartialVMResult};
+use move_binary_format::errors::{ExecutionState, PartialVMError, PartialVMResult};
 use move_core_types::{
     account_address::AccountAddress,
-    gas_schedule::CostTable,
+    gas_algebra::InternalGas,
     identifier::Identifier,
     language_storage::TypeTag,
     value::MoveTypeLayout,
     vm_status::{StatusCode, StatusType},
 };
 use move_vm_types::{
-    data_store::DataStore, gas_schedule::GasStatus, loaded_data::runtime_types::Type,
-    natives::function::NativeResult, values::Value,
+    data_store::DataStore, loaded_data::runtime_types::Type, natives::function::NativeResult,
+    values::Value,
 };
 use std::{
     collections::{HashMap, VecDeque},
     fmt::Write,
+    sync::Arc,
 };
 
-pub type NativeFunction =
-    fn(&mut NativeContext, Vec<Type>, VecDeque<Value>) -> PartialVMResult<NativeResult>;
+pub type UnboxedNativeFunction = dyn Fn(&mut NativeContext, Vec<Type>, VecDeque<Value>) -> PartialVMResult<NativeResult>
+    + Send
+    + Sync
+    + 'static;
+
+pub type NativeFunction = Arc<UnboxedNativeFunction>;
 
 pub type NativeFunctionTable = Vec<(AccountAddress, Identifier, Identifier, NativeFunction)>;
 
@@ -88,25 +93,25 @@ impl NativeFunctions {
 pub struct NativeContext<'a, 'b> {
     interpreter: &'a mut Interpreter,
     data_store: &'a mut dyn DataStore,
-    gas_status: &'a GasStatus<'a>,
     resolver: &'a Resolver<'a>,
     extensions: &'a mut NativeContextExtensions<'b>,
+    gas_balance: InternalGas,
 }
 
 impl<'a, 'b> NativeContext<'a, 'b> {
     pub(crate) fn new(
         interpreter: &'a mut Interpreter,
         data_store: &'a mut dyn DataStore,
-        gas_status: &'a mut GasStatus,
         resolver: &'a Resolver<'a>,
         extensions: &'a mut NativeContextExtensions<'b>,
+        gas_balance: InternalGas,
     ) -> Self {
         Self {
             interpreter,
             data_store,
-            gas_status,
             resolver,
             extensions,
+            gas_balance,
         }
     }
 }
@@ -117,10 +122,6 @@ impl<'a, 'b> NativeContext<'a, 'b> {
             .debug_print_stack_trace(buf, self.resolver.loader())
     }
 
-    pub fn cost_table(&self) -> &CostTable {
-        self.gas_status.cost_table()
-    }
-
     pub fn save_event(
         &mut self,
         guid: Vec<u8>,
@@ -151,6 +152,17 @@ impl<'a, 'b> NativeContext<'a, 'b> {
         }
     }
 
+    pub fn type_to_fully_annotated_layout(
+        &self,
+        ty: &Type,
+    ) -> PartialVMResult<Option<MoveTypeLayout>> {
+        match self.resolver.type_to_fully_annotated_layout(ty) {
+            Ok(ty_layout) => Ok(Some(ty_layout)),
+            Err(e) if e.major_status().status_type() == StatusType::InvariantViolation => Err(e),
+            Err(_) => Ok(None),
+        }
+    }
+
     pub fn extensions(&self) -> &NativeContextExtensions<'b> {
         self.extensions
     }
@@ -158,4 +170,14 @@ impl<'a, 'b> NativeContext<'a, 'b> {
     pub fn extensions_mut(&mut self) -> &mut NativeContextExtensions<'b> {
         self.extensions
     }
+
+    /// Get count stack frames, including the one of the called native function. This
+    /// allows a native function to reflect about its caller.
+    pub fn stack_frames(&self, count: usize) -> ExecutionState {
+        self.interpreter.get_stack_frames(count)
+    }
+
+    pub fn gas_balance(&self) -> InternalGas {
+        self.gas_balance
+    }
 }
diff --git a/language/move-vm/runtime/src/runtime.rs b/language/move-vm/runtime/src/runtime.rs
index af4c2aa0c7..fe83c6f483 100644
--- a/language/move-vm/runtime/src/runtime.rs
+++ b/language/move-vm/runtime/src/runtime.rs
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
+    config::VMConfig,
     data_cache::TransactionDataCache,
     interpreter::Interpreter,
     loader::{Function, Loader},
@@ -28,7 +29,7 @@ use move_core_types::{
 };
 use move_vm_types::{
     data_store::DataStore,
-    gas_schedule::GasStatus,
+    gas::GasMeter,
     loaded_data::runtime_types::Type,
     values::{Locals, Reference, VMValueCast, Value},
 };
@@ -43,18 +44,15 @@ pub(crate) struct VMRuntime {
 impl VMRuntime {
     pub(crate) fn new(
         natives: impl IntoIterator<Item = (AccountAddress, Identifier, Identifier, NativeFunction)>,
+        vm_config: VMConfig,
     ) -> PartialVMResult<Self> {
         Ok(VMRuntime {
-            loader: Loader::new(NativeFunctions::new(natives)?),
+            loader: Loader::new(NativeFunctions::new(natives)?, vm_config),
         })
     }
 
     pub fn new_session<'r, S: MoveResolver>(&self, remote: &'r S) -> Session<'r, '_, S> {
-        Session {
-            runtime: self,
-            data_cache: TransactionDataCache::new(remote, &self.loader),
-            native_extensions: NativeContextExtensions::default(),
-        }
+        self.new_session_with_extensions(remote, NativeContextExtensions::default())
     }
 
     pub fn new_session_with_extensions<'r, S: MoveResolver>(
@@ -74,13 +72,19 @@ impl VMRuntime {
         modules: Vec<Vec<u8>>,
         sender: AccountAddress,
         data_store: &mut impl DataStore,
-        _gas_status: &mut GasStatus,
+        _gas_meter: &mut impl GasMeter,
+        compat: Compatibility,
     ) -> VMResult<()> {
         // deserialize the modules. Perform bounds check. After this indexes can be
         // used with the `[]` operator
         let compiled_modules = match modules
             .iter()
-            .map(|blob| CompiledModule::deserialize(blob))
+            .map(|blob| {
+                CompiledModule::deserialize_with_max_version(
+                    blob,
+                    self.loader.vm_config().max_binary_format_version,
+                )
+            })
             .collect::<PartialVMResult<Vec<_>>>()
         {
             Ok(modules) => modules,
@@ -114,18 +118,15 @@ impl VMRuntime {
         // changing the bytecode format to include an `is_upgradable` flag in the CompiledModule.
         for module in &compiled_modules {
             let module_id = module.self_id();
-            if data_store.exists_module(&module_id)? {
+
+            if data_store.exists_module(&module_id)? && compat.need_check_compat() {
                 let old_module_ref = self.loader.load_module(&module_id, data_store)?;
                 let old_module = old_module_ref.module();
                 let old_m = normalized::Module::new(old_module);
                 let new_m = normalized::Module::new(module);
-                let compat = Compatibility::check(&old_m, &new_m);
-                if !compat.is_fully_compatible() {
-                    return Err(PartialVMError::new(
-                        StatusCode::BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
-                    )
-                    .finish(Location::Undefined));
-                }
+                compat
+                    .check(&old_m, &new_m)
+                    .map_err(|e| e.finish(Location::Undefined))?;
             }
             if !bundle_unverified.insert(module_id) {
                 return Err(PartialVMError::new(StatusCode::DUPLICATE_MODULE_NAME)
@@ -192,7 +193,13 @@ impl VMRuntime {
 
         // All modules verified, publish them to data cache
         for (module, blob) in compiled_modules.into_iter().zip(modules.into_iter()) {
-            data_store.publish_module(&module.self_id(), blob)?;
+            let is_republishing = data_store.exists_module(&module.self_id())?;
+            if is_republishing {
+                // This is an upgrade, so invalidate the loader cache, which still contains the
+                // old module.
+                self.loader.mark_as_invalid();
+            }
+            data_store.publish_module(&module.self_id(), blob, is_republishing)?;
         }
         Ok(())
     }
@@ -317,7 +324,7 @@ impl VMRuntime {
         return_types: Vec<Type>,
         serialized_args: Vec<impl Borrow<[u8]>>,
         data_store: &mut impl DataStore,
-        gas_status: &mut GasStatus,
+        gas_meter: &mut impl GasMeter,
         extensions: &mut NativeContextExtensions,
     ) -> VMResult<SerializedReturnValues> {
         let arg_types = param_types
@@ -347,7 +354,7 @@ impl VMRuntime {
             ty_args,
             deserialized_args,
             data_store,
-            gas_status,
+            gas_meter,
             extensions,
             &self.loader,
         )?;
@@ -382,7 +389,7 @@ impl VMRuntime {
         ty_args: Vec<TypeTag>,
         serialized_args: Vec<impl Borrow<[u8]>>,
         data_store: &mut impl DataStore,
-        gas_status: &mut GasStatus,
+        gas_meter: &mut impl GasMeter,
         extensions: &mut NativeContextExtensions,
         bypass_declared_entry_check: bool,
     ) -> VMResult<SerializedReturnValues> {
@@ -434,7 +441,7 @@ impl VMRuntime {
             return_,
             serialized_args,
             data_store,
-            gas_status,
+            gas_meter,
             extensions,
         )
     }
@@ -446,7 +453,7 @@ impl VMRuntime {
         ty_args: Vec<TypeTag>,
         serialized_args: Vec<impl Borrow<[u8]>>,
         data_store: &mut impl DataStore,
-        gas_status: &mut GasStatus,
+        gas_meter: &mut impl GasMeter,
         extensions: &mut NativeContextExtensions,
     ) -> VMResult<SerializedReturnValues> {
         // load the script, perform verification
@@ -468,7 +475,7 @@ impl VMRuntime {
             return_,
             serialized_args,
             data_store,
-            gas_status,
+            gas_meter,
             extensions,
         )
     }
diff --git a/language/move-vm/runtime/src/session.rs b/language/move-vm/runtime/src/session.rs
index 4619c8a89f..7addfdb51b 100644
--- a/language/move-vm/runtime/src/session.rs
+++ b/language/move-vm/runtime/src/session.rs
@@ -7,6 +7,7 @@ use crate::{
     runtime::VMRuntime,
 };
 use move_binary_format::{
+    compatibility::Compatibility,
     errors::*,
     file_format::{AbilitySet, LocalIndex},
 };
@@ -20,7 +21,7 @@ use move_core_types::{
 };
 use move_vm_types::{
     data_store::DataStore,
-    gas_schedule::GasStatus,
+    gas::GasMeter,
     loaded_data::runtime_types::{CachedStructIndex, StructType, Type},
 };
 use std::{borrow::Borrow, sync::Arc};
@@ -74,7 +75,7 @@ impl<'r, 'l, S: MoveResolver> Session<'r, 'l, S> {
         function_name: &IdentStr,
         ty_args: Vec<TypeTag>,
         args: Vec<impl Borrow<[u8]>>,
-        gas_status: &mut GasStatus,
+        gas_meter: &mut impl GasMeter,
     ) -> VMResult<SerializedReturnValues> {
         let bypass_declared_entry_check = false;
         self.runtime.execute_function(
@@ -83,7 +84,7 @@ impl<'r, 'l, S: MoveResolver> Session<'r, 'l, S> {
             ty_args,
             args,
             &mut self.data_cache,
-            gas_status,
+            gas_meter,
             &mut self.native_extensions,
             bypass_declared_entry_check,
         )
@@ -96,7 +97,7 @@ impl<'r, 'l, S: MoveResolver> Session<'r, 'l, S> {
         function_name: &IdentStr,
         ty_args: Vec<TypeTag>,
         args: Vec<impl Borrow<[u8]>>,
-        gas_status: &mut GasStatus,
+        gas_meter: &mut impl GasMeter,
     ) -> VMResult<SerializedReturnValues> {
         let bypass_declared_entry_check = true;
         self.runtime.execute_function(
@@ -105,7 +106,7 @@ impl<'r, 'l, S: MoveResolver> Session<'r, 'l, S> {
             ty_args,
             args,
             &mut self.data_cache,
-            gas_status,
+            gas_meter,
             &mut self.native_extensions,
             bypass_declared_entry_check,
         )
@@ -132,14 +133,14 @@ impl<'r, 'l, S: MoveResolver> Session<'r, 'l, S> {
         script: impl Borrow<[u8]>,
         ty_args: Vec<TypeTag>,
         args: Vec<impl Borrow<[u8]>>,
-        gas_status: &mut GasStatus,
+        gas_meter: &mut impl GasMeter,
     ) -> VMResult<SerializedReturnValues> {
         self.runtime.execute_script(
             script,
             ty_args,
             args,
             &mut self.data_cache,
-            gas_status,
+            gas_meter,
             &mut self.native_extensions,
         )
     }
@@ -161,9 +162,9 @@ impl<'r, 'l, S: MoveResolver> Session<'r, 'l, S> {
         &mut self,
         module: Vec<u8>,
         sender: AccountAddress,
-        gas_status: &mut GasStatus,
+        gas_meter: &mut impl GasMeter,
     ) -> VMResult<()> {
-        self.publish_module_bundle(vec![module], sender, gas_status)
+        self.publish_module_bundle(vec![module], sender, gas_meter)
     }
 
     /// Publish a series of modules.
@@ -178,14 +179,54 @@ impl<'r, 'l, S: MoveResolver> Session<'r, 'l, S> {
     ///
     /// In case an invariant violation occurs, the whole Session should be considered corrupted and
     /// one shall not proceed with effect generation.
+    ///
+    /// This operation performs compatibility checks if a module is replaced. See also
+    /// `move_binary_format::compatibility`.
     pub fn publish_module_bundle(
         &mut self,
         modules: Vec<Vec<u8>>,
         sender: AccountAddress,
-        gas_status: &mut GasStatus,
+        gas_meter: &mut impl GasMeter,
     ) -> VMResult<()> {
-        self.runtime
-            .publish_module_bundle(modules, sender, &mut self.data_cache, gas_status)
+        self.runtime.publish_module_bundle(
+            modules,
+            sender,
+            &mut self.data_cache,
+            gas_meter,
+            Compatibility::full_check(),
+        )
+    }
+
+    /// Same like `publish_module_bundle` but with a custom compatibility check.
+    pub fn publish_module_bundle_with_compat_config(
+        &mut self,
+        modules: Vec<Vec<u8>>,
+        sender: AccountAddress,
+        gas_meter: &mut impl GasMeter,
+        compat_config: Compatibility,
+    ) -> VMResult<()> {
+        self.runtime.publish_module_bundle(
+            modules,
+            sender,
+            &mut self.data_cache,
+            gas_meter,
+            compat_config,
+        )
+    }
+
+    pub fn publish_module_bundle_relax_compatibility(
+        &mut self,
+        modules: Vec<Vec<u8>>,
+        sender: AccountAddress,
+        gas_meter: &mut impl GasMeter,
+    ) -> VMResult<()> {
+        self.runtime.publish_module_bundle(
+            modules,
+            sender,
+            &mut self.data_cache,
+            gas_meter,
+            Compatibility::no_check(),
+        )
     }
 
     pub fn num_mutated_accounts(&self, sender: &AccountAddress) -> u64 {
@@ -257,13 +298,26 @@ impl<'r, 'l, S: MoveResolver> Session<'r, 'l, S> {
             .get_type_layout(type_tag, &self.data_cache)
     }
 
+    pub fn get_fully_annotated_type_layout(&self, type_tag: &TypeTag) -> VMResult<MoveTypeLayout> {
+        self.runtime
+            .loader()
+            .get_fully_annotated_type_layout(type_tag, &self.data_cache)
+    }
+
+    pub fn get_type_tag(&self, ty: &Type) -> VMResult<TypeTag> {
+        self.runtime
+            .loader()
+            .type_to_type_tag(ty)
+            .map_err(|e| e.finish(Location::Undefined))
+    }
+
     /// Fetch a struct type from cache, if the index is in bounds
     /// Helpful when paired with load_type, or any other API that returns 'Type'
     pub fn get_struct_type(&self, index: CachedStructIndex) -> Option<Arc<StructType>> {
         self.runtime.loader().get_struct_type(index)
     }
 
-    // Get the abilities for this type, at it's particular instantiation
+    /// Gets the abilities for this type, at it's particular instantiation
     pub fn get_type_abilities(&self, ty: &Type) -> VMResult<AbilitySet> {
         self.runtime
             .loader()
@@ -271,9 +325,15 @@ impl<'r, 'l, S: MoveResolver> Session<'r, 'l, S> {
             .map_err(|e| e.finish(Location::Undefined))
     }
 
+    /// Gets the underlying data store
     pub fn get_data_store(&mut self) -> &mut dyn DataStore {
         &mut self.data_cache
     }
+
+    /// Gets the underlying native extensions.
+    pub fn get_native_extensions(&mut self) -> &mut NativeContextExtensions<'r> {
+        &mut self.native_extensions
+    }
 }
 
 pub struct LoadedFunctionInstantiation {
diff --git a/language/move-vm/runtime/src/tracing.rs b/language/move-vm/runtime/src/tracing.rs
index 0a0c6abc03..b016879c9b 100644
--- a/language/move-vm/runtime/src/tracing.rs
+++ b/language/move-vm/runtime/src/tracing.rs
@@ -95,7 +95,7 @@ macro_rules! trace {
     ($function_desc:expr, $locals:expr, $pc:expr, $instr:tt, $resolver:expr, $interp:expr) => {
         // Only include this code in debug releases
         #[cfg(any(debug_assertions, feature = "debugging"))]
-        crate::tracing::trace(
+        $crate::tracing::trace(
             &$function_desc,
             $locals,
             $pc,
diff --git a/language/move-vm/runtime/src/unit_tests/vm_arguments_tests.rs b/language/move-vm/runtime/src/unit_tests/vm_arguments_tests.rs
index 60f2064fdc..690e3e2a7a 100644
--- a/language/move-vm/runtime/src/unit_tests/vm_arguments_tests.rs
+++ b/language/move-vm/runtime/src/unit_tests/vm_arguments_tests.rs
@@ -20,10 +20,11 @@ use move_core_types::{
     identifier::{IdentStr, Identifier},
     language_storage::{ModuleId, StructTag, TypeTag},
     resolver::{ModuleResolver, ResourceResolver},
+    u256::U256,
     value::{serialize_values, MoveValue},
     vm_status::{StatusCode, StatusType},
 };
-use move_vm_types::gas_schedule::GasStatus;
+use move_vm_types::gas::UnmeteredGasMeter;
 
 // make a script with a given signature for main.
 fn make_script(parameters: Signature) -> Vec<u8> {
@@ -286,13 +287,12 @@ fn call_script_with_args_ty_args_signers(
     let move_vm = MoveVM::new(vec![]).unwrap();
     let remote_view = RemoteStore::new();
     let mut session = move_vm.new_session(&remote_view);
-    let mut gas_status = GasStatus::new_unmetered();
     session
         .execute_script(
             script,
             ty_args,
             combine_signers_and_args(signers, non_signer_args),
-            &mut gas_status,
+            &mut UnmeteredGasMeter,
         )
         .map(|_| ())
 }
@@ -313,13 +313,12 @@ fn call_script_function_with_args_ty_args_signers(
     let id = module.self_id();
     remote_view.add_module(module);
     let mut session = move_vm.new_session(&remote_view);
-    let mut gas_status = GasStatus::new_unmetered();
     session.execute_function_bypass_visibility(
         &id,
         function_name.as_ident_str(),
         ty_args,
         combine_signers_and_args(signers, non_signer_args),
-        &mut gas_status,
+        &mut UnmeteredGasMeter,
     )?;
     Ok(())
 }
@@ -392,6 +391,23 @@ fn good_signatures_and_arguments() -> Vec<(Signature, Vec<MoveValue>)> {
             Signature(vec![SignatureToken::U128]),
             vec![MoveValue::U128(0)],
         ),
+        // U8 arg
+        (Signature(vec![SignatureToken::U8]), vec![MoveValue::U8(0)]),
+        // U16 arg
+        (
+            Signature(vec![SignatureToken::U16]),
+            vec![MoveValue::U16(0)],
+        ),
+        // U32 arg
+        (
+            Signature(vec![SignatureToken::U32]),
+            vec![MoveValue::U32(0)],
+        ),
+        // U256 arg
+        (
+            Signature(vec![SignatureToken::U256]),
+            vec![MoveValue::U256(U256::zero())],
+        ),
         // All constants
         (
             Signature(vec![SignatureToken::Vector(Box::new(SignatureToken::Bool))]),
@@ -786,7 +802,6 @@ fn call_missing_item() {
     let function_name = IdentStr::new("foo").unwrap();
     // mising module
     let move_vm = MoveVM::new(vec![]).unwrap();
-    let mut gas_status = GasStatus::new_unmetered();
     let mut remote_view = RemoteStore::new();
     let mut session = move_vm.new_session(&remote_view);
     let error = session
@@ -795,7 +810,7 @@ fn call_missing_item() {
             function_name,
             vec![],
             Vec::<Vec<u8>>::new(),
-            &mut gas_status,
+            &mut UnmeteredGasMeter,
         )
         .err()
         .unwrap();
@@ -812,7 +827,7 @@ fn call_missing_item() {
             function_name,
             vec![],
             Vec::<Vec<u8>>::new(),
-            &mut gas_status,
+            &mut UnmeteredGasMeter,
         )
         .err()
         .unwrap();
diff --git a/language/move-vm/test-utils/Cargo.toml b/language/move-vm/test-utils/Cargo.toml
index 4d391dadc6..23426b6f56 100644
--- a/language/move-vm/test-utils/Cargo.toml
+++ b/language/move-vm/test-utils/Cargo.toml
@@ -7,14 +7,18 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 anyhow = "1.0.52"
+once_cell = "1.7.2"
+serde = { version = "1.0.124", features = ["derive", "rc"] }
 
+move-binary-format = { path = "../../move-binary-format" }
 move-core-types = {path = "../../move-core/types" }
+move-vm-types = { path = "../types" }
 move-table-extension = { path = "../../extensions/move-table-extension", optional = true }
 
 [features]
diff --git a/language/move-vm/test-utils/src/gas_schedule.rs b/language/move-vm/test-utils/src/gas_schedule.rs
new file mode 100644
index 0000000000..9050f19788
--- /dev/null
+++ b/language/move-vm/test-utils/src/gas_schedule.rs
@@ -0,0 +1,840 @@
+// Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This module lays out the basic abstract costing schedule for bytecode instructions.
+//!
+//! It is important to note that the cost schedule defined in this file does not track hashing
+//! operations or other native operations; the cost of each native operation will be returned by the
+//! native function itself.
+use move_binary_format::{
+    errors::{PartialVMError, PartialVMResult},
+    file_format::{
+        Bytecode, ConstantPoolIndex, FieldHandleIndex, FieldInstantiationIndex,
+        FunctionHandleIndex, FunctionInstantiationIndex, SignatureIndex,
+        StructDefInstantiationIndex, StructDefinitionIndex,
+    },
+    file_format_common::{instruction_key, Opcodes},
+};
+use move_core_types::{
+    gas_algebra::{
+        AbstractMemorySize, GasQuantity, InternalGas, InternalGasPerAbstractMemoryUnit,
+        InternalGasUnit, NumArgs, NumBytes, ToUnit, ToUnitFractional,
+    },
+    language_storage::ModuleId,
+    u256,
+    vm_status::StatusCode,
+};
+use move_vm_types::{
+    gas::{GasMeter, SimpleInstruction},
+    views::{TypeView, ValueView},
+};
+use once_cell::sync::Lazy;
+use serde::{Deserialize, Serialize};
+use std::{
+    ops::{Add, Mul},
+    u64,
+};
+
+pub enum GasUnit {}
+
+pub type Gas = GasQuantity<GasUnit>;
+
+impl ToUnit<InternalGasUnit> for GasUnit {
+    const MULTIPLIER: u64 = 1000;
+}
+
+impl ToUnitFractional<GasUnit> for InternalGasUnit {
+    const NOMINATOR: u64 = 1;
+    const DENOMINATOR: u64 = 1000;
+}
+
+/// The size in bytes for a non-string or address constant on the stack
+pub const CONST_SIZE: AbstractMemorySize = AbstractMemorySize::new(16);
+
+/// The size in bytes for a reference on the stack
+pub const REFERENCE_SIZE: AbstractMemorySize = AbstractMemorySize::new(8);
+
+/// The size of a struct in bytes
+pub const STRUCT_SIZE: AbstractMemorySize = AbstractMemorySize::new(2);
+
+/// For exists checks on data that doesn't exists this is the multiplier that is used.
+pub const MIN_EXISTS_DATA_SIZE: AbstractMemorySize = AbstractMemorySize::new(100);
+
+/// The cost tables, keyed by the serialized form of the bytecode instruction.  We use the
+/// serialized form as opposed to the instruction enum itself as the key since this will be the
+/// on-chain representation of bytecode instructions in the future.
+#[derive(Clone, Debug, Serialize, PartialEq, Eq, Deserialize)]
+pub struct CostTable {
+    pub instruction_table: Vec<GasCost>,
+}
+
+impl CostTable {
+    #[inline]
+    pub fn instruction_cost(&self, instr_index: u8) -> &GasCost {
+        debug_assert!(instr_index > 0 && instr_index <= (self.instruction_table.len() as u8));
+        &self.instruction_table[(instr_index - 1) as usize]
+    }
+}
+
+/// The  `GasCost` tracks:
+/// - instruction cost: how much time/computational power is needed to perform the instruction
+/// - memory cost: how much memory is required for the instruction, and storage overhead
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+pub struct GasCost {
+    pub instruction_gas: u64,
+    pub memory_gas: u64,
+}
+
+impl GasCost {
+    pub fn new(instruction_gas: u64, memory_gas: u64) -> Self {
+        Self {
+            instruction_gas,
+            memory_gas,
+        }
+    }
+
+    /// Convert a GasCost to a total gas charge in `InternalGas`.
+    #[inline]
+    pub fn total(&self) -> u64 {
+        self.instruction_gas.add(self.memory_gas)
+    }
+}
+
+static ZERO_COST_SCHEDULE: Lazy<CostTable> = Lazy::new(zero_cost_schedule);
+
+/// The Move VM implementation of state for gas metering.
+///
+/// Initialize with a `CostTable` and the gas provided to the transaction.
+/// Provide all the proper guarantees about gas metering in the Move VM.
+///
+/// Every client must use an instance of this type to interact with the Move VM.
+pub struct GasStatus<'a> {
+    cost_table: &'a CostTable,
+    gas_left: InternalGas,
+    charge: bool,
+}
+
+impl<'a> GasStatus<'a> {
+    /// Initialize the gas state with metering enabled.
+    ///
+    /// Charge for every operation and fail when there is no more gas to pay for operations.
+    /// This is the instantiation that must be used when executing a user script.
+    pub fn new(cost_table: &'a CostTable, gas_left: Gas) -> Self {
+        Self {
+            gas_left: gas_left.to_unit(),
+            cost_table,
+            charge: true,
+        }
+    }
+
+    /// Initialize the gas state with metering disabled.
+    ///
+    /// It should be used by clients in very specific cases and when executing system
+    /// code that does not have to charge the user.
+    pub fn new_unmetered() -> Self {
+        Self {
+            gas_left: InternalGas::new(0),
+            cost_table: &ZERO_COST_SCHEDULE,
+            charge: false,
+        }
+    }
+
+    /// Return the `CostTable` behind this `GasStatus`.
+    pub fn cost_table(&self) -> &CostTable {
+        self.cost_table
+    }
+
+    /// Return the gas left.
+    pub fn remaining_gas(&self) -> Gas {
+        self.gas_left.to_unit_round_down()
+    }
+
+    /// Charge a given amount of gas and fail if not enough gas units are left.
+    pub fn deduct_gas(&mut self, amount: InternalGas) -> PartialVMResult<()> {
+        if !self.charge {
+            return Ok(());
+        }
+
+        match self.gas_left.checked_sub(amount) {
+            Some(gas_left) => {
+                self.gas_left = gas_left;
+                Ok(())
+            }
+            None => {
+                self.gas_left = InternalGas::new(0);
+                Err(PartialVMError::new(StatusCode::OUT_OF_GAS))
+            }
+        }
+    }
+
+    fn charge_instr(&mut self, opcode: Opcodes) -> PartialVMResult<()> {
+        self.deduct_gas(
+            self.cost_table
+                .instruction_cost(opcode as u8)
+                .total()
+                .into(),
+        )
+    }
+
+    /// Charge an instruction over data with a given size and fail if not enough gas units are left.
+    fn charge_instr_with_size(
+        &mut self,
+        opcode: Opcodes,
+        size: AbstractMemorySize,
+    ) -> PartialVMResult<()> {
+        // Make sure that the size is always non-zero
+        let size = std::cmp::max(1.into(), size);
+        debug_assert!(size > 0.into());
+        self.deduct_gas(
+            InternalGasPerAbstractMemoryUnit::new(
+                self.cost_table.instruction_cost(opcode as u8).total(),
+            )
+            .mul(size),
+        )
+    }
+
+    pub fn set_metering(&mut self, enabled: bool) {
+        self.charge = enabled
+    }
+}
+
+fn get_simple_instruction_opcode(instr: SimpleInstruction) -> Opcodes {
+    use Opcodes::*;
+    use SimpleInstruction::*;
+
+    match instr {
+        Nop => NOP,
+        Ret => RET,
+
+        BrTrue => BR_TRUE,
+        BrFalse => BR_FALSE,
+        Branch => BRANCH,
+
+        LdU8 => LD_U8,
+        LdU64 => LD_U64,
+        LdU128 => LD_U128,
+        LdTrue => LD_TRUE,
+        LdFalse => LD_FALSE,
+
+        FreezeRef => FREEZE_REF,
+        MutBorrowLoc => MUT_BORROW_LOC,
+        ImmBorrowLoc => IMM_BORROW_LOC,
+        ImmBorrowField => IMM_BORROW_FIELD,
+        MutBorrowField => MUT_BORROW_FIELD,
+        ImmBorrowFieldGeneric => IMM_BORROW_FIELD_GENERIC,
+        MutBorrowFieldGeneric => MUT_BORROW_FIELD_GENERIC,
+
+        CastU8 => CAST_U8,
+        CastU64 => CAST_U64,
+        CastU128 => CAST_U128,
+
+        Add => ADD,
+        Sub => SUB,
+        Mul => MUL,
+        Mod => MOD,
+        Div => DIV,
+
+        BitOr => BIT_OR,
+        BitAnd => BIT_AND,
+        Xor => XOR,
+        Shl => SHL,
+        Shr => SHR,
+
+        Or => OR,
+        And => AND,
+        Not => NOT,
+
+        Lt => LT,
+        Gt => GT,
+        Le => LE,
+        Ge => GE,
+
+        Abort => ABORT,
+        LdU16 => LD_U16,
+        LdU32 => LD_U32,
+        LdU256 => LD_U256,
+        CastU16 => CAST_U16,
+        CastU32 => CAST_U32,
+        CastU256 => CAST_U256,
+    }
+}
+
+impl<'b> GasMeter for GasStatus<'b> {
+    fn balance_internal(&self) -> InternalGas {
+        self.gas_left
+    }
+
+    /// Charge an instruction and fail if not enough gas units are left.
+    fn charge_simple_instr(&mut self, instr: SimpleInstruction) -> PartialVMResult<()> {
+        self.charge_instr(get_simple_instruction_opcode(instr))
+    }
+
+    fn charge_pop(&mut self, _popped_val: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr(Opcodes::POP)
+    }
+
+    fn charge_native_function(
+        &mut self,
+        amount: InternalGas,
+        _ret_vals: Option<impl ExactSizeIterator<Item = impl ValueView>>,
+    ) -> PartialVMResult<()> {
+        self.deduct_gas(amount)
+    }
+
+    fn charge_native_function_before_execution(
+        &mut self,
+        _ty_args: impl ExactSizeIterator<Item = impl TypeView>,
+        _args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_call(
+        &mut self,
+        _module_id: &ModuleId,
+        _func_name: &str,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+        _num_locals: NumArgs,
+    ) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::CALL, (args.len() as u64 + 1).into())
+    }
+
+    fn charge_call_generic(
+        &mut self,
+        _module_id: &ModuleId,
+        _func_name: &str,
+        ty_args: impl ExactSizeIterator<Item = impl TypeView>,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+        _num_locals: NumArgs,
+    ) -> PartialVMResult<()> {
+        self.charge_instr_with_size(
+            Opcodes::CALL_GENERIC,
+            ((ty_args.len() + args.len() + 1) as u64).into(),
+        )
+    }
+
+    fn charge_ld_const(&mut self, size: NumBytes) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::LD_CONST, u64::from(size).into())
+    }
+
+    fn charge_ld_const_after_deserialization(
+        &mut self,
+        _val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_copy_loc(&mut self, val: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::COPY_LOC, val.legacy_abstract_memory_size())
+    }
+
+    fn charge_move_loc(&mut self, val: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::MOVE_LOC, val.legacy_abstract_memory_size())
+    }
+
+    fn charge_store_loc(&mut self, val: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::ST_LOC, val.legacy_abstract_memory_size())
+    }
+
+    fn charge_pack(
+        &mut self,
+        is_generic: bool,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        let field_count = AbstractMemorySize::new(args.len() as u64);
+        self.charge_instr_with_size(
+            if is_generic {
+                Opcodes::PACK_GENERIC
+            } else {
+                Opcodes::PACK
+            },
+            args.fold(field_count, |acc, val| {
+                acc + val.legacy_abstract_memory_size()
+            }),
+        )
+    }
+
+    fn charge_unpack(
+        &mut self,
+        is_generic: bool,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        let field_count = AbstractMemorySize::new(args.len() as u64);
+        self.charge_instr_with_size(
+            if is_generic {
+                Opcodes::UNPACK_GENERIC
+            } else {
+                Opcodes::UNPACK
+            },
+            args.fold(field_count, |acc, val| {
+                acc + val.legacy_abstract_memory_size()
+            }),
+        )
+    }
+
+    fn charge_read_ref(&mut self, ref_val: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::READ_REF, ref_val.legacy_abstract_memory_size())
+    }
+
+    fn charge_write_ref(
+        &mut self,
+        new_val: impl ValueView,
+        _old_val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::WRITE_REF, new_val.legacy_abstract_memory_size())
+    }
+
+    fn charge_eq(&mut self, lhs: impl ValueView, rhs: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr_with_size(
+            Opcodes::EQ,
+            lhs.legacy_abstract_memory_size() + rhs.legacy_abstract_memory_size(),
+        )
+    }
+
+    fn charge_neq(&mut self, lhs: impl ValueView, rhs: impl ValueView) -> PartialVMResult<()> {
+        self.charge_instr_with_size(
+            Opcodes::NEQ,
+            lhs.legacy_abstract_memory_size() + rhs.legacy_abstract_memory_size(),
+        )
+    }
+
+    fn charge_load_resource(
+        &mut self,
+        _loaded: Option<(NumBytes, impl ValueView)>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_borrow_global(
+        &mut self,
+        is_mut: bool,
+        is_generic: bool,
+        _ty: impl TypeView,
+        is_success: bool,
+    ) -> PartialVMResult<()> {
+        use Opcodes::*;
+
+        if is_success {
+            let op = match (is_mut, is_generic) {
+                (false, false) => IMM_BORROW_GLOBAL,
+                (false, true) => IMM_BORROW_GLOBAL_GENERIC,
+                (true, false) => MUT_BORROW_GLOBAL,
+                (true, true) => MUT_BORROW_GLOBAL_GENERIC,
+            };
+
+            self.charge_instr_with_size(op, REFERENCE_SIZE)?;
+        }
+
+        Ok(())
+    }
+
+    fn charge_exists(
+        &mut self,
+        is_generic: bool,
+        _ty: impl TypeView,
+        // TODO(Gas): see if we can get rid of this param
+        exists: bool,
+    ) -> PartialVMResult<()> {
+        use Opcodes::*;
+
+        let op = if is_generic { EXISTS_GENERIC } else { EXISTS };
+        self.charge_instr_with_size(
+            op,
+            if exists {
+                REFERENCE_SIZE
+            } else {
+                MIN_EXISTS_DATA_SIZE
+            },
+        )
+    }
+
+    fn charge_move_from(
+        &mut self,
+        is_generic: bool,
+        _ty: impl TypeView,
+        val: Option<impl ValueView>,
+    ) -> PartialVMResult<()> {
+        use Opcodes::*;
+
+        if let Some(val) = val {
+            let op = if is_generic {
+                MOVE_FROM_GENERIC
+            } else {
+                MOVE_FROM
+            };
+
+            self.charge_instr_with_size(op, val.legacy_abstract_memory_size())?;
+        }
+
+        Ok(())
+    }
+
+    fn charge_move_to(
+        &mut self,
+        is_generic: bool,
+        _ty: impl TypeView,
+        val: impl ValueView,
+        is_success: bool,
+    ) -> PartialVMResult<()> {
+        use Opcodes::*;
+
+        let op = if is_generic { MOVE_TO_GENERIC } else { MOVE_TO };
+
+        if is_success {
+            self.charge_instr_with_size(op, val.legacy_abstract_memory_size())?;
+        }
+
+        Ok(())
+    }
+
+    fn charge_vec_pack<'a>(
+        &mut self,
+        _ty: impl TypeView + 'a,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::VEC_PACK, (args.len() as u64).into())
+    }
+
+    fn charge_vec_len(&mut self, _ty: impl TypeView) -> PartialVMResult<()> {
+        self.charge_instr(Opcodes::VEC_LEN)
+    }
+
+    fn charge_vec_borrow(
+        &mut self,
+        is_mut: bool,
+        _ty: impl TypeView,
+        _is_success: bool,
+    ) -> PartialVMResult<()> {
+        use Opcodes::*;
+
+        self.charge_instr(if is_mut {
+            VEC_MUT_BORROW
+        } else {
+            VEC_IMM_BORROW
+        })
+    }
+
+    fn charge_vec_push_back(
+        &mut self,
+        _ty: impl TypeView,
+        val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        self.charge_instr_with_size(Opcodes::VEC_PUSH_BACK, val.legacy_abstract_memory_size())
+    }
+
+    fn charge_vec_pop_back(
+        &mut self,
+        _ty: impl TypeView,
+        _val: Option<impl ValueView>,
+    ) -> PartialVMResult<()> {
+        self.charge_instr(Opcodes::VEC_POP_BACK)
+    }
+
+    fn charge_vec_unpack(
+        &mut self,
+        _ty: impl TypeView,
+        expect_num_elements: NumArgs,
+        _elems: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        self.charge_instr_with_size(
+            Opcodes::VEC_PUSH_BACK,
+            u64::from(expect_num_elements).into(),
+        )
+    }
+
+    fn charge_vec_swap(&mut self, _ty: impl TypeView) -> PartialVMResult<()> {
+        self.charge_instr(Opcodes::VEC_SWAP)
+    }
+
+    fn charge_drop_frame(
+        &mut self,
+        _locals: impl Iterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+}
+
+pub fn new_from_instructions(mut instrs: Vec<(Bytecode, GasCost)>) -> CostTable {
+    instrs.sort_by_key(|cost| instruction_key(&cost.0));
+
+    if cfg!(debug_assertions) {
+        let mut instructions_covered = 0;
+        for (index, (instr, _)) in instrs.iter().enumerate() {
+            let key = instruction_key(instr);
+            if index == (key - 1) as usize {
+                instructions_covered += 1;
+            }
+        }
+        debug_assert!(
+            instructions_covered == Bytecode::VARIANT_COUNT,
+            "all instructions must be in the cost table"
+        );
+    }
+    let instruction_table = instrs
+        .into_iter()
+        .map(|(_, cost)| cost)
+        .collect::<Vec<GasCost>>();
+    CostTable { instruction_table }
+}
+
+pub fn zero_cost_instruction_table() -> Vec<(Bytecode, GasCost)> {
+    use Bytecode::*;
+
+    vec![
+        (MoveTo(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
+        (
+            MoveToGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (MoveFrom(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
+        (
+            MoveFromGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (BrTrue(0), GasCost::new(0, 0)),
+        (WriteRef, GasCost::new(0, 0)),
+        (Mul, GasCost::new(0, 0)),
+        (MoveLoc(0), GasCost::new(0, 0)),
+        (And, GasCost::new(0, 0)),
+        (Pop, GasCost::new(0, 0)),
+        (BitAnd, GasCost::new(0, 0)),
+        (ReadRef, GasCost::new(0, 0)),
+        (Sub, GasCost::new(0, 0)),
+        (MutBorrowField(FieldHandleIndex::new(0)), GasCost::new(0, 0)),
+        (
+            MutBorrowFieldGeneric(FieldInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (ImmBorrowField(FieldHandleIndex::new(0)), GasCost::new(0, 0)),
+        (
+            ImmBorrowFieldGeneric(FieldInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (Add, GasCost::new(0, 0)),
+        (CopyLoc(0), GasCost::new(0, 0)),
+        (StLoc(0), GasCost::new(0, 0)),
+        (Ret, GasCost::new(0, 0)),
+        (Lt, GasCost::new(0, 0)),
+        (LdU8(0), GasCost::new(0, 0)),
+        (LdU64(0), GasCost::new(0, 0)),
+        (LdU128(0), GasCost::new(0, 0)),
+        (CastU8, GasCost::new(0, 0)),
+        (CastU64, GasCost::new(0, 0)),
+        (CastU128, GasCost::new(0, 0)),
+        (Abort, GasCost::new(0, 0)),
+        (MutBorrowLoc(0), GasCost::new(0, 0)),
+        (ImmBorrowLoc(0), GasCost::new(0, 0)),
+        (LdConst(ConstantPoolIndex::new(0)), GasCost::new(0, 0)),
+        (Ge, GasCost::new(0, 0)),
+        (Xor, GasCost::new(0, 0)),
+        (Shl, GasCost::new(0, 0)),
+        (Shr, GasCost::new(0, 0)),
+        (Neq, GasCost::new(0, 0)),
+        (Not, GasCost::new(0, 0)),
+        (Call(FunctionHandleIndex::new(0)), GasCost::new(0, 0)),
+        (
+            CallGeneric(FunctionInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (Le, GasCost::new(0, 0)),
+        (Branch(0), GasCost::new(0, 0)),
+        (Unpack(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
+        (
+            UnpackGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (Or, GasCost::new(0, 0)),
+        (LdFalse, GasCost::new(0, 0)),
+        (LdTrue, GasCost::new(0, 0)),
+        (Mod, GasCost::new(0, 0)),
+        (BrFalse(0), GasCost::new(0, 0)),
+        (Exists(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
+        (
+            ExistsGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (BitOr, GasCost::new(0, 0)),
+        (FreezeRef, GasCost::new(0, 0)),
+        (
+            MutBorrowGlobal(StructDefinitionIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (
+            MutBorrowGlobalGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (
+            ImmBorrowGlobal(StructDefinitionIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (
+            ImmBorrowGlobalGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (Div, GasCost::new(0, 0)),
+        (Eq, GasCost::new(0, 0)),
+        (Gt, GasCost::new(0, 0)),
+        (Pack(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
+        (
+            PackGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(0, 0),
+        ),
+        (Nop, GasCost::new(0, 0)),
+        (VecPack(SignatureIndex::new(0), 0), GasCost::new(0, 0)),
+        (VecLen(SignatureIndex::new(0)), GasCost::new(0, 0)),
+        (VecImmBorrow(SignatureIndex::new(0)), GasCost::new(0, 0)),
+        (VecMutBorrow(SignatureIndex::new(0)), GasCost::new(0, 0)),
+        (VecPushBack(SignatureIndex::new(0)), GasCost::new(0, 0)),
+        (VecPopBack(SignatureIndex::new(0)), GasCost::new(0, 0)),
+        (VecUnpack(SignatureIndex::new(0), 0), GasCost::new(0, 0)),
+        (VecSwap(SignatureIndex::new(0)), GasCost::new(0, 0)),
+        (LdU16(0), GasCost::new(0, 0)),
+        (LdU32(0), GasCost::new(0, 0)),
+        (LdU256(u256::U256::zero()), GasCost::new(0, 0)),
+        (CastU16, GasCost::new(0, 0)),
+        (CastU32, GasCost::new(0, 0)),
+        (CastU256, GasCost::new(0, 0)),
+    ]
+}
+
+// Only used for genesis and for tests where we need a cost table and
+// don't have a genesis storage state.
+pub fn zero_cost_schedule() -> CostTable {
+    // The actual costs for the instructions in this table _DO NOT MATTER_. This is only used
+    // for genesis and testing, and for these cases we don't need to worry
+    // about the actual gas for instructions.  The only thing we care about is having an entry
+    // in the gas schedule for each instruction.
+    let instrs = zero_cost_instruction_table();
+    new_from_instructions(instrs)
+}
+
+pub fn bytecode_instruction_costs() -> Vec<(Bytecode, GasCost)> {
+    use Bytecode::*;
+    vec![
+        (MoveTo(StructDefinitionIndex::new(0)), GasCost::new(13, 1)),
+        (
+            MoveToGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(27, 1),
+        ),
+        (
+            MoveFrom(StructDefinitionIndex::new(0)),
+            GasCost::new(459, 1),
+        ),
+        (
+            MoveFromGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(13, 1),
+        ),
+        (BrTrue(0), GasCost::new(1, 1)),
+        (WriteRef, GasCost::new(1, 1)),
+        (Mul, GasCost::new(1, 1)),
+        (MoveLoc(0), GasCost::new(1, 1)),
+        (And, GasCost::new(1, 1)),
+        (Pop, GasCost::new(1, 1)),
+        (BitAnd, GasCost::new(2, 1)),
+        (ReadRef, GasCost::new(1, 1)),
+        (Sub, GasCost::new(1, 1)),
+        (MutBorrowField(FieldHandleIndex::new(0)), GasCost::new(1, 1)),
+        (
+            MutBorrowFieldGeneric(FieldInstantiationIndex::new(0)),
+            GasCost::new(1, 1),
+        ),
+        (ImmBorrowField(FieldHandleIndex::new(0)), GasCost::new(1, 1)),
+        (
+            ImmBorrowFieldGeneric(FieldInstantiationIndex::new(0)),
+            GasCost::new(1, 1),
+        ),
+        (Add, GasCost::new(1, 1)),
+        (CopyLoc(0), GasCost::new(1, 1)),
+        (StLoc(0), GasCost::new(1, 1)),
+        (Ret, GasCost::new(638, 1)),
+        (Lt, GasCost::new(1, 1)),
+        (LdU8(0), GasCost::new(1, 1)),
+        (LdU64(0), GasCost::new(1, 1)),
+        (LdU128(0), GasCost::new(1, 1)),
+        (CastU8, GasCost::new(2, 1)),
+        (CastU64, GasCost::new(1, 1)),
+        (CastU128, GasCost::new(1, 1)),
+        (Abort, GasCost::new(1, 1)),
+        (MutBorrowLoc(0), GasCost::new(2, 1)),
+        (ImmBorrowLoc(0), GasCost::new(1, 1)),
+        (LdConst(ConstantPoolIndex::new(0)), GasCost::new(1, 1)),
+        (Ge, GasCost::new(1, 1)),
+        (Xor, GasCost::new(1, 1)),
+        (Shl, GasCost::new(2, 1)),
+        (Shr, GasCost::new(1, 1)),
+        (Neq, GasCost::new(1, 1)),
+        (Not, GasCost::new(1, 1)),
+        (Call(FunctionHandleIndex::new(0)), GasCost::new(1132, 1)),
+        (
+            CallGeneric(FunctionInstantiationIndex::new(0)),
+            GasCost::new(582, 1),
+        ),
+        (Le, GasCost::new(2, 1)),
+        (Branch(0), GasCost::new(1, 1)),
+        (Unpack(StructDefinitionIndex::new(0)), GasCost::new(2, 1)),
+        (
+            UnpackGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(2, 1),
+        ),
+        (Or, GasCost::new(2, 1)),
+        (LdFalse, GasCost::new(1, 1)),
+        (LdTrue, GasCost::new(1, 1)),
+        (Mod, GasCost::new(1, 1)),
+        (BrFalse(0), GasCost::new(1, 1)),
+        (Exists(StructDefinitionIndex::new(0)), GasCost::new(41, 1)),
+        (
+            ExistsGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(34, 1),
+        ),
+        (BitOr, GasCost::new(2, 1)),
+        (FreezeRef, GasCost::new(1, 1)),
+        (
+            MutBorrowGlobal(StructDefinitionIndex::new(0)),
+            GasCost::new(21, 1),
+        ),
+        (
+            MutBorrowGlobalGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(15, 1),
+        ),
+        (
+            ImmBorrowGlobal(StructDefinitionIndex::new(0)),
+            GasCost::new(23, 1),
+        ),
+        (
+            ImmBorrowGlobalGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(14, 1),
+        ),
+        (Div, GasCost::new(3, 1)),
+        (Eq, GasCost::new(1, 1)),
+        (Gt, GasCost::new(1, 1)),
+        (Pack(StructDefinitionIndex::new(0)), GasCost::new(2, 1)),
+        (
+            PackGeneric(StructDefInstantiationIndex::new(0)),
+            GasCost::new(2, 1),
+        ),
+        (Nop, GasCost::new(1, 1)),
+        (VecPack(SignatureIndex::new(0), 0), GasCost::new(84, 1)),
+        (VecLen(SignatureIndex::new(0)), GasCost::new(98, 1)),
+        (VecImmBorrow(SignatureIndex::new(0)), GasCost::new(1334, 1)),
+        (VecMutBorrow(SignatureIndex::new(0)), GasCost::new(1902, 1)),
+        (VecPushBack(SignatureIndex::new(0)), GasCost::new(53, 1)),
+        (VecPopBack(SignatureIndex::new(0)), GasCost::new(227, 1)),
+        (VecUnpack(SignatureIndex::new(0), 0), GasCost::new(572, 1)),
+        (VecSwap(SignatureIndex::new(0)), GasCost::new(1436, 1)),
+        (LdU16(0), GasCost::new(1, 1)),
+        (LdU32(0), GasCost::new(1, 1)),
+        (LdU256(u256::U256::zero()), GasCost::new(1, 1)),
+        (CastU16, GasCost::new(2, 1)),
+        (CastU32, GasCost::new(2, 1)),
+        (CastU256, GasCost::new(2, 1)),
+    ]
+}
+
+pub static INITIAL_COST_SCHEDULE: Lazy<CostTable> = Lazy::new(|| {
+    let mut instrs = bytecode_instruction_costs();
+    // Note that the DiemVM is expecting the table sorted by instruction order.
+    instrs.sort_by_key(|cost| instruction_key(&cost.0));
+
+    new_from_instructions(instrs)
+});
diff --git a/language/move-vm/test-utils/src/lib.rs b/language/move-vm/test-utils/src/lib.rs
index 6b65217408..a56aba81a8 100644
--- a/language/move-vm/test-utils/src/lib.rs
+++ b/language/move-vm/test-utils/src/lib.rs
@@ -6,4 +6,5 @@
 
 mod storage;
 
+pub mod gas_schedule;
 pub use storage::{BlankStorage, DeltaStorage, InMemoryStorage};
diff --git a/language/move-vm/test-utils/src/storage.rs b/language/move-vm/test-utils/src/storage.rs
index b0ff1e693d..103cf2cc42 100644
--- a/language/move-vm/test-utils/src/storage.rs
+++ b/language/move-vm/test-utils/src/storage.rs
@@ -2,21 +2,24 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-#[allow(unused)]
-use anyhow::{anyhow, format_err, Error, Result};
-#[allow(unused)]
-use move_core_types::gas_schedule::{GasAlgebra, GasCarrier, InternalGasUnits};
+use anyhow::{bail, Result};
 use move_core_types::{
     account_address::AccountAddress,
-    effects::{AccountChangeSet, ChangeSet},
+    effects::{AccountChangeSet, ChangeSet, Op},
     identifier::Identifier,
     language_storage::{ModuleId, StructTag},
     resolver::{ModuleResolver, MoveResolver, ResourceResolver},
 };
-use std::collections::{btree_map, BTreeMap};
+use std::{
+    collections::{btree_map, BTreeMap},
+    fmt::Debug,
+};
 
 #[cfg(feature = "table-extension")]
-use move_table_extension::{TableChangeSet, TableHandle, TableOperation, TableResolver};
+use {
+    anyhow::Error,
+    move_table_extension::{TableChangeSet, TableHandle, TableResolver},
+};
 
 /// A dummy storage containing no modules or resources.
 #[derive(Debug, Clone)]
@@ -57,19 +60,10 @@ impl TableResolver for BlankStorage {
     ) -> Result<Option<Vec<u8>>, Error> {
         Ok(None)
     }
-
-    fn operation_cost(
-        &self,
-        _op: TableOperation,
-        _key_size: usize,
-        _val_size: usize,
-    ) -> InternalGasUnits<GasCarrier> {
-        InternalGasUnits::new(1)
-    }
 }
 
-// A storage adapter created by stacking a change set on top of an existing storage backend.
-/// The new storage can be used for additional computations without modifying the base.
+/// A storage adapter created by stacking a change set on top of an existing storage backend.
+/// This can be used for additional computations without modifying the base.
 #[derive(Debug, Clone)]
 pub struct DeltaStorage<'a, 'b, S> {
     base: &'a S,
@@ -82,7 +76,7 @@ impl<'a, 'b, S: ModuleResolver> ModuleResolver for DeltaStorage<'a, 'b, S> {
     fn get_module(&self, module_id: &ModuleId) -> Result<Option<Vec<u8>>, Self::Error> {
         if let Some(account_storage) = self.delta.accounts().get(module_id.address()) {
             if let Some(blob_opt) = account_storage.modules().get(module_id.name()) {
-                return Ok(blob_opt.clone());
+                return Ok(blob_opt.clone().ok());
             }
         }
 
@@ -100,7 +94,7 @@ impl<'a, 'b, S: ResourceResolver> ResourceResolver for DeltaStorage<'a, 'b, S> {
     ) -> Result<Option<Vec<u8>>, S::Error> {
         if let Some(account_storage) = self.delta.accounts().get(address) {
             if let Some(blob_opt) = account_storage.resources().get(tag) {
-                return Ok(blob_opt.clone());
+                return Ok(blob_opt.clone().ok());
             }
         }
 
@@ -118,16 +112,6 @@ impl<'a, 'b, S: TableResolver> TableResolver for DeltaStorage<'a, 'b, S> {
         // TODO: No support for table deltas
         self.base.resolve_table_entry(handle, key)
     }
-
-    fn operation_cost(
-        &self,
-        op: TableOperation,
-        key_size: usize,
-        val_size: usize,
-    ) -> InternalGasUnits<GasCarrier> {
-        // TODO: No support for table deltas
-        self.base.operation_cost(op, key_size, val_size)
-    }
 }
 
 impl<'a, 'b, S: MoveResolver> DeltaStorage<'a, 'b, S> {
@@ -151,49 +135,60 @@ pub struct InMemoryStorage {
     tables: BTreeMap<TableHandle, BTreeMap<Vec<u8>, Vec<u8>>>,
 }
 
-fn apply_changes<K, V, F, E>(
-    tree: &mut BTreeMap<K, V>,
-    changes: impl IntoIterator<Item = (K, Option<V>)>,
-    make_err: F,
-) -> std::result::Result<(), E>
+fn apply_changes<K, V>(
+    map: &mut BTreeMap<K, V>,
+    changes: impl IntoIterator<Item = (K, Op<V>)>,
+) -> Result<()>
 where
-    K: Ord,
-    F: FnOnce(K) -> E,
+    K: Ord + Debug,
 {
-    for (k, v_opt) in changes.into_iter() {
-        match (tree.entry(k), v_opt) {
-            (btree_map::Entry::Vacant(entry), None) => return Err(make_err(entry.into_key())),
-            (btree_map::Entry::Vacant(entry), Some(v)) => {
-                entry.insert(v);
+    use btree_map::Entry::*;
+    use Op::*;
+
+    for (k, op) in changes.into_iter() {
+        match (map.entry(k), op) {
+            (Occupied(entry), New(_)) => {
+                bail!(
+                    "Failed to apply changes -- key {:?} already exists",
+                    entry.key()
+                )
             }
-            (btree_map::Entry::Occupied(entry), None) => {
+            (Occupied(entry), Delete) => {
                 entry.remove();
             }
-            (btree_map::Entry::Occupied(entry), Some(v)) => {
-                *entry.into_mut() = v;
+            (Occupied(entry), Modify(val)) => {
+                *entry.into_mut() = val;
+            }
+            (Vacant(entry), New(val)) => {
+                entry.insert(val);
             }
+            (Vacant(entry), Delete | Modify(_)) => bail!(
+                "Failed to apply changes -- key {:?} does not exist",
+                entry.key()
+            ),
         }
     }
     Ok(())
 }
 
+fn get_or_insert<K, V, F>(map: &mut BTreeMap<K, V>, key: K, make_val: F) -> &mut V
+where
+    K: Ord,
+    F: FnOnce() -> V,
+{
+    use btree_map::Entry::*;
+
+    match map.entry(key) {
+        Occupied(entry) => entry.into_mut(),
+        Vacant(entry) => entry.insert(make_val()),
+    }
+}
+
 impl InMemoryAccountStorage {
     fn apply(&mut self, account_changeset: AccountChangeSet) -> Result<()> {
         let (modules, resources) = account_changeset.into_inner();
-        apply_changes(&mut self.modules, modules, |module_name| {
-            format_err!(
-                "Failed to delete module {}: module does not exist.",
-                module_name
-            )
-        })?;
-
-        apply_changes(&mut self.resources, resources, |struct_tag| {
-            format_err!(
-                "Failed to delete resource {}: resource does not exist.",
-                struct_tag
-            )
-        })?;
-
+        apply_changes(&mut self.modules, modules)?;
+        apply_changes(&mut self.resources, resources)?;
         Ok(())
     }
 
@@ -225,7 +220,7 @@ impl InMemoryStorage {
         }
 
         #[cfg(feature = "table-extension")]
-        self.apply_table(table_changes);
+        self.apply_table(table_changes)?;
 
         Ok(())
     }
@@ -239,29 +234,28 @@ impl InMemoryStorage {
     }
 
     #[cfg(feature = "table-extension")]
-    fn apply_table(&mut self, changes: TableChangeSet) {
+    fn apply_table(&mut self, changes: TableChangeSet) -> Result<()> {
         let TableChangeSet {
             new_tables,
             removed_tables,
             changes,
         } = changes;
         self.tables.retain(|h, _| !removed_tables.contains(h));
-        self.tables
-            .extend(new_tables.into_iter().map(|h| (h, BTreeMap::default())));
+        self.tables.extend(
+            new_tables
+                .keys()
+                .into_iter()
+                .map(|h| (*h, BTreeMap::default())),
+        );
         for (h, c) in changes {
             assert!(
                 self.tables.contains_key(&h),
                 "inconsistent table change set: stale table handle"
             );
             let table = self.tables.get_mut(&h).unwrap();
-            for (key, val) in c.entries {
-                if let Some(v) = val {
-                    table.insert(key, v);
-                } else {
-                    table.remove(&key);
-                }
-            }
+            apply_changes(table, c.entries)?;
         }
+        Ok(())
     }
 
     pub fn new() -> Self {
@@ -273,14 +267,10 @@ impl InMemoryStorage {
     }
 
     pub fn publish_or_overwrite_module(&mut self, module_id: ModuleId, blob: Vec<u8>) {
-        let mut delta = ChangeSet::new();
-        delta.publish_module(module_id, blob).unwrap();
-        self.apply_extended(
-            delta,
-            #[cfg(feature = "table-extension")]
-            TableChangeSet::default(),
-        )
-        .unwrap();
+        let account = get_or_insert(&mut self.accounts, *module_id.address(), || {
+            InMemoryAccountStorage::new()
+        });
+        account.modules.insert(module_id.name().to_owned(), blob);
     }
 
     pub fn publish_or_overwrite_resource(
@@ -289,14 +279,8 @@ impl InMemoryStorage {
         struct_tag: StructTag,
         blob: Vec<u8>,
     ) {
-        let mut delta = ChangeSet::new();
-        delta.publish_resource(addr, struct_tag, blob).unwrap();
-        self.apply_extended(
-            delta,
-            #[cfg(feature = "table-extension")]
-            TableChangeSet::default(),
-        )
-        .unwrap();
+        let account = get_or_insert(&mut self.accounts, addr, InMemoryAccountStorage::new);
+        account.resources.insert(struct_tag, blob);
     }
 }
 
@@ -335,13 +319,4 @@ impl TableResolver for InMemoryStorage {
     ) -> std::result::Result<Option<Vec<u8>>, Error> {
         Ok(self.tables.get(handle).and_then(|t| t.get(key).cloned()))
     }
-
-    fn operation_cost(
-        &self,
-        _op: TableOperation,
-        _key_size: usize,
-        _val_size: usize,
-    ) -> InternalGasUnits<GasCarrier> {
-        InternalGasUnits::new(1)
-    }
 }
diff --git a/language/move-vm/transactional-tests/Cargo.toml b/language/move-vm/transactional-tests/Cargo.toml
index 03777ae5d3..d29d297039 100644
--- a/language/move-vm/transactional-tests/Cargo.toml
+++ b/language/move-vm/transactional-tests/Cargo.toml
@@ -3,7 +3,7 @@ name = "move-vm-transactional-tests"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dev-dependencies]
diff --git a/language/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_primitive_fields.exp b/language/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_primitive_fields.exp
new file mode 100644
index 0000000000..fc5a4436b2
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_primitive_fields.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/language/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_primitive_fields.move b/language/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_primitive_fields.move
new file mode 100644
index 0000000000..4ee5206957
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/builtins/move_to_and_from_resource_with_primitive_fields.move
@@ -0,0 +1,93 @@
+//# publish
+module 0x42::m {
+
+struct Foo has key {
+    f1: bool,
+    f2: address,
+    f3: u8,
+    f4: u16,
+    f5: u32,
+    f6: u64,
+    f7: u128,
+    f8: u256,
+    v1: vector<bool>,
+    v2: vector<address>,
+    v3: vector<u8>,
+    v4: vector<u16>,
+    v5: vector<u32>,
+    v6: vector<u64>,
+    v7: vector<u128>,
+    v8: vector<u256>,
+}
+
+entry fun mt(s: signer) {
+    move_to(&s, Foo {
+        f1: false,
+        f2: @0,
+        f3: 10,
+        f4: 100,
+        f5: 1000,
+        f6: 10000,
+        f7: 100000,
+        f8: 1000000,
+        v1: vector[false],
+        v2: vector[@0],
+        v3: vector[10],
+        v4: vector[100],
+        v5: vector[1000],
+        v6: vector[10000],
+        v7: vector[100000],
+        v8: vector[1000000],
+    })
+}
+
+entry fun mf(a: address) acquires Foo {
+    let Foo {
+        f1,
+        f2,
+        f3,
+        f4,
+        f5,
+        f6,
+        f7,
+        f8,
+        v1,
+        v2,
+        v3,
+        v4,
+        v5,
+        v6,
+        v7,
+        v8,
+    } = move_from(a);
+    assert!(f1 == f1, 0);
+    assert!(f2 == f2, 0);
+    assert!(f3 == f3, 0);
+    assert!(f4 == f4, 0);
+    assert!(f5 == f5, 0);
+    assert!(f6 == f6, 0);
+    assert!(f7 == f7, 0);
+    assert!(f8 == f8, 0);
+    assert!(v1 == v1, 0);
+    assert!(v2 == v2, 0);
+    assert!(v3 == v3, 0);
+    assert!(v4 == v4, 0);
+    assert!(v5 == v5, 0);
+    assert!(v6 == v6, 0);
+    assert!(v7 == v7, 0);
+    assert!(v8 == v8, 0);
+    assert!(f1 == *std::vector::borrow(&v1, 0), 0);
+    assert!(f2 == *std::vector::borrow(&v2, 0), 0);
+    assert!(f3 == *std::vector::borrow(&v3, 0), 0);
+    assert!(f4 == *std::vector::borrow(&v4, 0), 0);
+    assert!(f5 == *std::vector::borrow(&v5, 0), 0);
+    assert!(f6 == *std::vector::borrow(&v6, 0), 0);
+    assert!(f7 == *std::vector::borrow(&v7, 0), 0);
+    assert!(f8 == *std::vector::borrow(&v8, 0), 0);
+}
+
+}
+
+//# run 0x42::m::mt --signers 0x1
+
+//# run 0x42::m::mf --args @0x1
diff --git a/language/move-vm/transactional-tests/tests/entry_points/all_possible_param_types.move b/language/move-vm/transactional-tests/tests/entry_points/all_possible_param_types.move
index 14f4391f49..2f600306a5 100644
--- a/language/move-vm/transactional-tests/tests/entry_points/all_possible_param_types.move
+++ b/language/move-vm/transactional-tests/tests/entry_points/all_possible_param_types.move
@@ -1,5 +1,5 @@
-//# run --args 10u8 10 10u64 10u128 true false @0x123 b"deadbeef"
+//# run --args 10u8 10 10u64 10u128 true false @0x123 b"deadbeef" 340u16 3456789u32 1234567890123456789123456723456u256
 script {
-fun main(_a: u8, _b: u64, _c: u64, _d: u128, _e: bool, _f: bool, _g: address, _h: vector<u8>) {
+fun main(_a: u8, _b: u64, _c: u64, _d: u128, _e: bool, _f: bool, _g: address, _h: vector<u8>, _i: u16, _j: u32, _k: u256) {
 }
 }
diff --git a/language/move-vm/transactional-tests/tests/entry_points/serializer_deserializer.exp b/language/move-vm/transactional-tests/tests/entry_points/serializer_deserializer.exp
new file mode 100644
index 0000000000..9e6ada76f3
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/entry_points/serializer_deserializer.exp
@@ -0,0 +1,11 @@
+processed 4 tasks
+
+task 2 'view'. lines 42-42:
+drop key 0x42::t::Ints {
+    f8: 128u8
+    f16: 32768u16
+    f32: 2147483648u32
+    f64: 9223372036854775808
+    f128: 170141183460469231731687303715884105728u128
+    f256: 57896044618658097711785492504343953926634992332820282019728792003956564819968u256
+}
diff --git a/language/move-vm/transactional-tests/tests/entry_points/serializer_deserializer.move b/language/move-vm/transactional-tests/tests/entry_points/serializer_deserializer.move
new file mode 100644
index 0000000000..85e996fad4
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/entry_points/serializer_deserializer.move
@@ -0,0 +1,44 @@
+//# publish
+module 0x42::t {
+
+    struct Ints has key, drop {
+        f8: u8,
+        f16: u16,
+        f32: u32,
+        f64: u64,
+        f128: u128,
+        f256: u256,
+    }
+
+    public entry fun add(s: signer) {
+        move_to<Ints>(
+            &s,
+            Ints {
+                f8:   0x80,
+                f16:  0x8000,
+                f32:  0x80000000,
+                f64:  0x8000000000000000,
+                f128: 0x80000000000000000000000000000000,
+                f256: 0x8000000000000000000000000000000000000000000000000000000000000000,
+            }
+        )
+    }
+
+    public entry fun remove(a: address) acquires Ints {
+        let Ints { f8, f16, f32, f64, f128, f256} = move_from<Ints>(a);
+        assert!(f8   == 0x80u8, 0);
+        assert!(f16  == 0x8000u16, 0);
+        assert!(f32  == 0x80000000u32, 0);
+        assert!(f64  == 0x8000000000000000u64, 0);
+        assert!(f128 == 0x80000000000000000000000000000000u128, 0);
+        assert!(f256 == 0x8000000000000000000000000000000000000000000000000000000000000000u256, 0);
+
+    }
+
+}
+
+//# run 0x42::t::add --args @0x42
+
+//# view --address 0x42 --resource 0x42::t::Ints
+
+//# run 0x42::t::remove --args @0x42
diff --git a/language/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u16.exp b/language/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u16.exp
new file mode 100644
index 0000000000..1ee584a384
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u16.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-22:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 24-29:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-53:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 55-60:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 77-82:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 84-89:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 108-113:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 115-120:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 122-127:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 145-150:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 152-157:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 159-164:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/language/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u16.mvir b/language/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u16.mvir
new file mode 100644
index 0000000000..5be851bc63
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u16.mvir
@@ -0,0 +1,164 @@
+//# run
+main() {
+label b0:
+    assert(0u16 + 0u16 == 0u16, 1000);
+    assert(0u16 + 1u16 == 1u16, 1001);
+    assert(1u16 + 1u16 == 2u16, 1002);
+
+    assert(13u16 + 67u16 == 80u16, 1100);
+    assert(100u16 + 10u16 == 110u16, 1101);
+
+    assert(0u16 + 65535u16 == 65535u16, 1200);
+    assert(1u16 + 65534u16 == 65535u16, 1201);
+    assert(5u16 + 65530u16 == 65535u16, 1202);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u16 + 65535u16;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 65500u16 + 65500u16;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u16 - 0u16 == 0u16, 2000);
+    assert(1u16 - 0u16 == 1u16, 2001);
+    assert(1u16 - 1u16 == 0u16, 2002);
+
+    assert(52u16 - 13u16 == 39u16, 2100);
+    assert(100u16 - 10u16 == 90u16, 2101);
+
+    assert(65535u16 - 65535u16 == 0u16, 2200);
+    assert(5u16 - 1u16 - 4u16 == 0u16, 2201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u16 - 1u16;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 54u16 - 100u16;
+    return;
+}
+
+
+//# run
+main() {
+label b0:
+    assert(0u16 * 0u16 == 0u16, 3000);
+    assert(1u16 * 0u16 == 0u16, 3001);
+    assert(1u16 * 1u16 == 1u16, 3002);
+
+    assert(6u16 * 7u16 == 42u16, 3100);
+    assert(10u16 * 10u16 == 100u16, 3101);
+
+    assert(32767u16 * 2u16 == 65534u16, 3200);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 256u16 * 256u16;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 32768u16 * 2u16;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u16 / 1u16 == 0u16, 4000);
+    assert(1u16 / 1u16 == 1u16, 4001);
+    assert(1u16 / 2u16 == 0u16, 4002);
+
+    assert(6u16 / 3u16 == 2u16, 4100);
+    assert(65535u16 / 121u16 == 541u16, 4101);
+
+    assert(65534u16 / 65535u16 == 0u16, 4200);
+    assert(65535u16 / 65535u16 == 1u16, 4201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u16 / 0u16;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u16 / 0u16;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 65535u16 / 0u16;
+    return;
+}
+
+
+//# run
+main() {
+label b0:
+    assert(0u16 % 1u16 == 0u16, 5000);
+    assert(1u16 % 1u16 == 0u16, 5001);
+    assert(1u16 % 2u16 == 1u16, 5002);
+
+    assert(8u16 % 3u16 == 2u16, 5100);
+    assert(65535u16 % 131u16 == 35u16, 5101);
+
+    assert(65534u16 % 65535u16 == 65534u16, 5200);
+    assert(65535u16 % 65535u16 == 0u16, 5201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u16 % 0u16;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u16 % 0u16;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 65535u16 % 0u16;
+    return;
+}
diff --git a/language/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u256.exp b/language/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u256.exp
new file mode 100644
index 0000000000..894e253710
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u256.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-22:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 24-29:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-53:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 55-60:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 78-83:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 85-90:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 109-114:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 116-121:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 125-130:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 148-153:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 155-160:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 162-167:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/language/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u256.mvir b/language/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u256.mvir
new file mode 100644
index 0000000000..3365a7cc85
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u256.mvir
@@ -0,0 +1,167 @@
+//# run
+main() {
+label b0:
+    assert(0u256 + 0u256 == 0u256, 1000);
+    assert(0u256 + 1u256 == 1u256, 1001);
+    assert(1u256 + 1u256 == 2u256, 1002);
+
+    assert(13u256 + 67u256 == 80u256, 1100);
+    assert(100u256 + 10u256 == 110u256, 1101);
+
+    assert(0u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 1200);
+    assert(1u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639934u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 1201);
+    assert(5u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639930u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 1202);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639935u256;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 115792089237316195423570985008687907853269984665640564039457584007913129639932u256 + 115792089237316195423570985008687907853269984665640564039457584007913129639931u256;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u256 - 0u256 == 0u256, 2000);
+    assert(1u256 - 0u256 == 1u256, 2001);
+    assert(1u256 - 1u256 == 0u256, 2002);
+
+    assert(52u256 - 13u256 == 39u256, 2100);
+    assert(100u256 - 10u256 == 90u256, 2101);
+
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 - 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 0u256, 2200);
+    assert(5u256 - 1u256 - 4u256 == 0u256, 2201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u256 - 1u256;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 54u256 - 100u256;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u256 * 0u256 == 0u256, 3000);
+    assert(1u256 * 0u256 == 0u256, 3001);
+    assert(1u256 * 1u256 == 1u256, 3002);
+
+    assert(6u256 * 7u256 == 42u256, 3100);
+    assert(10u256 * 10u256 == 100u256, 3101);
+
+    assert(57896044618658097711785492504343953926634992332820282019728792003956564819967u256 * 2u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639934u256, 3200);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 57896044618658097711785492504343953926634992332820282019728792003956564819967u256 * 57896044618658097711785492504343953926634992332820282019728792003956564819967u256;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 57896044618658097711785492504343953926634992332820282019728792003956564819968u256 * 2u256;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u256 / 1u256 == 0u256, 4000);
+    assert(1u256 / 1u256 == 1u256, 4001);
+    assert(1u256 / 2u256 == 0u256, 4002);
+
+    assert(6u256 / 3u256 == 2u256, 4100);
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 / 4315342637539806u256 == 26832652459627105301847093122056309129973091557185267691720404u256, 4101);
+
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639934u256 / 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 0u256, 4200);
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 / 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 1u256, 4201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u256 / 0u256;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u256 / 0u256;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    _ = 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 / 0u256;
+    return;
+}
+
+
+//# run
+main() {
+label b0:
+    assert(0u256 % 1u256 == 0u256, 5000);
+    assert(1u256 % 1u256 == 0u256, 5001);
+    assert(1u256 % 2u256 == 1u256, 5002);
+
+    assert(8u256 % 3u256 == 2u256, 5100);
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 % 4315342637539806u256 == 2132250957238311u256, 5101);
+
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639934u256 % 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 115792089237316195423570985008687907853269984665640564039457584007913129639934u256, 5200);
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 % 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 == 0u256, 5201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u256 % 0u256;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u256 % 0u256;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 115792089237316195423570985008687907853269984665640564039457584007913129639935u256 % 0u256;
+    return;
+}
diff --git a/language/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u32.exp b/language/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u32.exp
new file mode 100644
index 0000000000..1ee584a384
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u32.exp
@@ -0,0 +1,109 @@
+processed 17 tasks
+
+task 1 'run'. lines 17-22:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 2 'run'. lines 24-29:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 4 'run'. lines 48-53:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 5 'run'. lines 55-60:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 77-82:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 84-89:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 10 'run'. lines 108-113:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 11 'run'. lines 115-120:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 12 'run'. lines 122-127:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 14 'run'. lines 145-150:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 15 'run'. lines 152-157:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 16 'run'. lines 159-164:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
diff --git a/language/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u32.mvir b/language/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u32.mvir
new file mode 100644
index 0000000000..dc54ffd2b1
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/instructions/arithmetic_operators_u32.mvir
@@ -0,0 +1,164 @@
+//# run
+main() {
+label b0:
+    assert(0u32 + 0u32 == 0u32, 1000);
+    assert(0u32 + 1u32 == 1u32, 1001);
+    assert(1u32 + 1u32 == 2u32, 1002);
+
+    assert(13u32 + 67u32 == 80u32, 1100);
+    assert(100u32 + 10u32 == 110u32, 1101);
+
+    assert(0u32 + 4294967295u32 == 4294967295u32, 1200);
+    assert(1u32 + 4294967294u32 == 4294967295u32, 1201);
+    assert(5u32 + 4294967290u32 == 4294967295u32, 1202);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u32 + 4294967295u32;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 4294000000u32 + 4294000000u32;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u32 - 0u32 == 0u32, 2000);
+    assert(1u32 - 0u32 == 1u32, 2001);
+    assert(1u32 - 1u32 == 0u32, 2002);
+
+    assert(52u32 - 13u32 == 39u32, 2100);
+    assert(100u32 - 10u32 == 90u32, 2101);
+
+    assert(4294967295u32 - 4294967295u32 == 0u32, 2200);
+    assert(5u32 - 1u32 - 4u32 == 0u32, 2201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u32 - 1u32;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 54u32 - 100u32;
+    return;
+}
+
+
+//# run
+main() {
+label b0:
+    assert(0u32 * 0u32 == 0u32, 3000);
+    assert(1u32 * 0u32 == 0u32, 3001);
+    assert(1u32 * 1u32 == 1u32, 3002);
+
+    assert(6u32 * 7u32 == 42u32, 3100);
+    assert(10u32 * 10u32 == 100u32, 3101);
+
+    assert(2147483647u32 * 2u32 == 4294967294u32, 3200);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 429496u32 * 429496u32;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 2147483648u32 * 2u32;
+    return;
+}
+
+
+
+//# run
+main() {
+label b0:
+    assert(0u32 / 1u32 == 0u32, 4000);
+    assert(1u32 / 1u32 == 1u32, 4001);
+    assert(1u32 / 2u32 == 0u32, 4002);
+
+    assert(6u32 / 3u32 == 2u32, 4100);
+    assert(4294967295u32 / 131u32 == 32786009u32, 4101);
+
+    assert(4294967294u32 / 4294967295u32 == 0u32, 4200);
+    assert(4294967295u32 / 4294967295u32 == 1u32, 4201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u32 / 0u32;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u32 / 0u32;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 4294967295u32 / 0u32;
+    return;
+}
+
+
+//# run
+main() {
+label b0:
+    assert(0u32 % 1u32 == 0u32, 5000);
+    assert(1u32 % 1u32 == 0u32, 5001);
+    assert(1u32 % 2u32 == 1u32, 5002);
+
+    assert(8u32 % 3u32 == 2u32, 5100);
+    assert(4294967295u32 % 131u32 == 116u32, 5101);
+
+    assert(4294967294u32 % 4294967295u32 == 4294967294u32, 5200);
+    assert(4294967295u32 % 4294967295u32 == 0u32, 5201);
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u32 % 0u32;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 1u32 % 0u32;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 4294967295u32 % 0u32;
+    return;
+}
diff --git a/language/move-vm/transactional-tests/tests/instructions/bitwise_operators.mvir b/language/move-vm/transactional-tests/tests/instructions/bitwise_operators.mvir
index 07e356b1bd..995db30c9a 100644
--- a/language/move-vm/transactional-tests/tests/instructions/bitwise_operators.mvir
+++ b/language/move-vm/transactional-tests/tests/instructions/bitwise_operators.mvir
@@ -7,10 +7,20 @@ label b0:
     assert(0u8 & 42u8 == 0u8, 1003);
     assert(0u64 & 42u64 == 0u64, 1004);
     assert(0u128 & 42u128 == 0u128, 1005);
+    assert(0u16 & 0u16 == 0u16, 1000);
+    assert(0u32 & 0u32 == 0u32, 1001);
+    assert(0u256 & 0u256 == 0u256, 1002);
+    assert(0u16 & 42u16 == 0u16, 1003);
+    assert(0u32 & 42u32 == 0u32, 1004);
+    assert(0u256 & 42u256 == 0u256, 1005);
 
     assert(43u8 & 43u8 == 43u8, 1100);
     assert(856776467654u64 & 856776467654u64 == 856776467654u64, 1101);
     assert(4125423653474658754976595u128 & 4125423653474658754976595u128 == 4125423653474658754976595u128, 1102);
+    assert(43u16 & 43u16 == 43u16, 1100);
+    assert(42967295u32 & 42967295u32 == 42967295u32, 1101);
+    assert(4125423653474658754976595u256 & 4125423653474658754976595u256 == 4125423653474658754976595u256, 1102);
+
 
     assert(255u8 & 255u8 == 255u8, 1200);
     assert(18446744073709551615u64 & 18446744073709551615u64 == 18446744073709551615u64, 1201);
@@ -20,10 +30,21 @@ label b0:
         340282366920938463463374607431768211455u128,
         1202
     );
+    assert(65535u16 & 65535u16 == 65535u16, 1200);
+    assert(4294967295u32 & 4294967295u32 == 4294967295u32, 1201);
+    assert(
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 &
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ==
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256,
+        1202
+    );
 
     assert(101u8 & 77u8 == 69u8, 1300);
     assert(675437u64 & 14235u64 == 1545u64, 1301);
     assert(534263574563786485434889u128 & 3141524387653489576893u128 == 632665710869872675337u128, 1302);
+    assert(101u16 & 77u16 == 69u16, 1300);
+    assert(65437u32 & 14235u32 == 14233u32, 1301);
+    assert(534263574563786485434889u256 & 3141524387653489576893u256 == 632665710869872675337u256, 1302);
     return;
 }
 
@@ -37,10 +58,19 @@ label b0:
     assert(42u8 | 0u8 == 42u8, 2003);
     assert(42u64 | 0u64 == 42u64, 2004);
     assert(42u128 | 0u128 == 42u128, 2005);
+    assert(0u16 | 0u16 == 0u16, 2000);
+    assert(0u32 | 0u32 == 0u32, 2001);
+    assert(0u256 | 0u256 == 0u256, 2002);
+    assert(42u16 | 0u16 == 42u16, 2003);
+    assert(42u32 | 0u32 == 42u32, 2004);
+    assert(42u256 | 0u256 == 42u256, 2005);
 
     assert(43u8 | 43u8 == 43u8, 2100);
     assert(856776467654u64 | 856776467654u64 == 856776467654u64, 2101);
     assert(4125423653474658754976595u128 | 4125423653474658754976595u128 == 4125423653474658754976595u128, 2102);
+    assert(43u16 | 43u16 == 43u16, 2100);
+    assert(85677646u32 | 85677646u32 == 85677646u32, 2101);
+    assert(4125423653474658754976595u256 | 4125423653474658754976595u256 == 4125423653474658754976595u256, 2102);
 
     assert(255u8 | 255u8 == 255u8, 2200);
     assert(18446744073709551615u64 | 18446744073709551615u64 == 18446744073709551615u64, 2201);
@@ -50,10 +80,21 @@ label b0:
         340282366920938463463374607431768211455u128,
         2202
     );
+    assert(65535u16 | 65535u16 == 65535u16, 2200);
+    assert(4294967295u32 | 4294967295u32 == 4294967295u32, 2201);
+    assert(
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 |
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ==
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256,
+        2202
+    );
 
     assert(101u8 | 77u8 == 109u8, 2300);
     assert(675437u64 | 14235u64 == 688127u64, 2301);
     assert(534263574563786485434889u128 | 3141524387653489576893u128 == 536772433240570102336445u128, 2302);
+    assert(101u16 | 77u16 == 109u16, 2300);
+    assert(65437u32 | 14235u32 == 65439u32, 2301);
+    assert(534263574563786485434889u256 | 3141524387653489576893u256 == 536772433240570102336445u256, 2302);
     return;
 }
 
@@ -67,10 +108,19 @@ label b0:
     assert(13u8 ^ 0u8 == 13u8, 3003);
     assert(13u64 ^ 0u64 == 13u64, 3004);
     assert(13u128 ^ 0u128 == 13u128, 3005);
+    assert(0u16 ^ 0u16 == 0u16, 3000);
+    assert(0u32 ^ 0u32 == 0u32, 3001);
+    assert(0u256 ^ 0u256 == 0u256, 3002);
+    assert(13u16 ^ 0u16 == 13u16, 3003);
+    assert(13u32 ^ 0u32 == 13u32, 3004);
+    assert(13u256 ^ 0u256 == 13u256, 3005);
 
     assert(43u8 ^ 43u8 == 0u8, 3100);
     assert(856776467654u64 ^ 856776467654u64 == 0u64, 3101);
     assert(4125423653474658754976595u128 ^ 4125423653474658754976595u128 == 0u128, 3102);
+    assert(43u16 ^ 43u16 == 0u16, 3100);
+    assert(85677646u32 ^ 85677646u32 == 0u32, 3101);
+    assert(4125423653474658754976595u256 ^ 4125423653474658754976595u256 == 0u256, 3102);
 
     assert(255u8 ^ 255u8 == 0u8, 3200);
     assert(18446744073709551615u64 ^ 18446744073709551615u64 == 0u64, 3201);
@@ -80,13 +130,27 @@ label b0:
         0u128,
         3202
     );
+    assert(65535u16 ^ 65535u16 == 0u16, 3200);
+    assert(4294967295u32 ^ 4294967295u32 == 0u32, 3201);
+    assert(
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ^
+        115792089237316195423570985008687907853269984665640564039457584007913129639935u256 ==
+        0u256,
+        3202
+    );
 
     assert(101u8 ^ 77u8 == 40u8, 3300);
     assert(675437u64 ^ 14235u64 == 686582u64, 3301);
     assert(534263574563786485434889u128 ^ 3141524387653489576893u128 == 536139767529700229661108u128, 3302);
+    assert(101u16 ^ 77u16 == 40u16, 3300);
+    assert(675437u32 ^ 14235u32 == 686582u32, 3301);
+    assert(534263574563786485434889u256 ^ 3141524387653489576893u256 == 536139767529700229661108u256, 3302);
 
     assert(13u8 ^ 1u8 == 12u8, 3400);
     assert(13u64 ^ 1u64 == 12u64, 3401);
     assert(13u128 ^ 1u128 == 12u128, 3402);
+    assert(13u16 ^ 1u16 == 12u16, 3400);
+    assert(13u32 ^ 1u32 == 12u32, 3401);
+    assert(13u256 ^ 1u256 == 12u256, 3402);
     return;
 }
diff --git a/language/move-vm/transactional-tests/tests/instructions/casting_operators.exp b/language/move-vm/transactional-tests/tests/instructions/casting_operators.exp
index ea3c5d3bb4..2f4f39f7ed 100644
--- a/language/move-vm/transactional-tests/tests/instructions/casting_operators.exp
+++ b/language/move-vm/transactional-tests/tests/instructions/casting_operators.exp
@@ -1,6 +1,6 @@
-processed 12 tasks
+processed 38 tasks
 
-task 3 'run'. lines 70-76:
+task 6 'run'. lines 175-181:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
@@ -9,7 +9,7 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 4 'run'. lines 78-84:
+task 7 'run'. lines 183-189:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
@@ -18,7 +18,7 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 5 'run'. lines 86-92:
+task 8 'run'. lines 191-197:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
@@ -27,7 +27,7 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 6 'run'. lines 94-100:
+task 9 'run'. lines 199-205:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
@@ -36,7 +36,7 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 7 'run'. lines 102-108:
+task 10 'run'. lines 207-213:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
@@ -45,7 +45,7 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 8 'run'. lines 110-119:
+task 11 'run'. lines 215-221:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
@@ -54,7 +54,7 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 9 'run'. lines 120-126:
+task 12 'run'. lines 223-229:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
@@ -63,7 +63,7 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 10 'run'. lines 128-134:
+task 13 'run'. lines 231-237:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
@@ -72,7 +72,214 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 11 'run'. lines 136-142:
+task 14 'run'. lines 239-245:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 15 'run'. lines 247-253:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 16 'run'. lines 255-261:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 17 'run'. lines 263-271:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 18 'run'. lines 272-278:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 19 'run'. lines 280-286:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 20 'run'. lines 288-294:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 21 'run'. lines 296-302:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 22 'run'. lines 304-310:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 23 'run'. lines 312-320:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 24 'run'. lines 321-327:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 25 'run'. lines 329-335:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 26 'run'. lines 337-343:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 27 'run'. lines 345-351:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 28 'run'. lines 353-359:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 29 'run'. lines 361-367:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 30 'run'. lines 369-375:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 31 'run'. lines 377-385:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 32 'run'. lines 386-392:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 33 'run'. lines 394-400:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 34 'run'. lines 402-408:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 35 'run'. lines 410-416:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 36 'run'. lines 418-424:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
+}
+
+task 37 'run'. lines 426-432:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
diff --git a/language/move-vm/transactional-tests/tests/instructions/casting_operators.mvir b/language/move-vm/transactional-tests/tests/instructions/casting_operators.mvir
index 899eff6e77..414f563fd7 100644
--- a/language/move-vm/transactional-tests/tests/instructions/casting_operators.mvir
+++ b/language/move-vm/transactional-tests/tests/instructions/casting_operators.mvir
@@ -6,16 +6,89 @@ label b0:
     assert(to_u8(0u8) == 0u8, 1000);
     assert(to_u8(0u64) == 0u8, 1001);
     assert(to_u8(0u128) == 0u8, 1002);
+    assert(to_u8(0u16) == 0u8, 1000);
+    assert(to_u8(0u32) == 0u8, 1001);
+    assert(to_u8(0u256) == 0u8, 1002);
 
     // Random small number unchanged.
     assert(to_u8(21u8) == 21u8, 1100);
     assert(to_u8(21u64) == 21u8, 1101);
     assert(to_u8(21u128) == 21u8, 1102);
+    assert(to_u8(21u16) == 21u8, 1100);
+    assert(to_u8(21u32) == 21u8, 1101);
+    assert(to_u8(21u256) == 21u8, 1102);
 
     // Max representable values remain unchanged.
     assert(to_u8(255u8) == 255u8, 1200);
     assert(to_u8(255u64) == 255u8, 1201);
     assert(to_u8(255u128) == 255u8, 1202);
+    assert(to_u8(255u16) == 255u8, 1200);
+    assert(to_u8(255u32) == 255u8, 1201);
+    assert(to_u8(255u256) == 255u8, 1202);
+
+    return;
+}
+// check: "Keep(EXECUTED)"
+
+// Casting to u16.
+//# run
+main() {
+label b0:
+    // 0 remains unchanged.
+    assert(to_u16(0u8) == 0u16, 1000);
+    assert(to_u16(0u64) == 0u16, 1001);
+    assert(to_u16(0u128) == 0u16, 1002);
+    assert(to_u16(0u16) == 0u16, 1000);
+    assert(to_u16(0u32) == 0u16, 1001);
+    assert(to_u16(0u256) == 0u16, 1002);
+
+    // Random small number unchanged.
+    assert(to_u16(21u8) == 21u16, 1100);
+    assert(to_u16(21u64) == 21u16, 1101);
+    assert(to_u16(21u128) == 21u16, 1102);
+    assert(to_u16(21u16) == 21u16, 1100);
+    assert(to_u16(21u32) == 21u16, 1101);
+    assert(to_u16(21u256) == 21u16, 1102);
+
+    // Max representable values remain unchanged.
+    assert(to_u16(255u8) == 255u16, 1200);
+    assert(to_u16(65535u64) == 65535u16, 1201);
+    assert(to_u16(65535u128) == 65535u16, 1202);
+    assert(to_u16(65535u16) == 65535u16, 1200);
+    assert(to_u16(65535u32) == 65535u16, 1201);
+    assert(to_u16(65535u256) == 65535u16, 1202);
+
+    return;
+}
+// check: "Keep(EXECUTED)"
+
+// Casting to u32.
+//# run
+main() {
+label b0:
+    // 0 remains unchanged.
+    assert(to_u32(0u8) == 0u32, 1000);
+    assert(to_u32(0u64) == 0u32, 1001);
+    assert(to_u32(0u128) == 0u32, 1002);
+    assert(to_u32(0u16) == 0u32, 1000);
+    assert(to_u32(0u32) == 0u32, 1001);
+    assert(to_u32(0u256) == 0u32, 1002);
+
+    // Random small number unchanged.
+    assert(to_u32(21u8) == 21u32, 1100);
+    assert(to_u32(21u64) == 21u32, 1101);
+    assert(to_u32(21u128) == 21u32, 1102);
+    assert(to_u32(21u16) == 21u32, 1100);
+    assert(to_u32(21u32) == 21u32, 1101);
+    assert(to_u32(21u256) == 21u32, 1102);
+
+    // Max representable values remain unchanged.
+    assert(to_u32(255u8) == 255u32, 1200);
+    assert(to_u32(4294967295u64) == 4294967295u32, 1201);
+    assert(to_u32(4294967295u128) == 4294967295u32, 1202);
+    assert(to_u32(65535u16) == 65535u32, 1200);
+    assert(to_u32(4294967295u32) == 4294967295u32, 1201);
+    assert(to_u32(4294967295u256) == 4294967295u32, 1202);
 
     return;
 }
@@ -66,6 +139,38 @@ label b0:
 // check: "Keep(EXECUTED)"
 
 
+// Casting to u256.
+//# run
+main() {
+label b0:
+    // 0 remains unchanged.
+    assert(to_u256(0u8) == 0u256, 1000);
+    assert(to_u256(0u64) == 0u256, 1001);
+    assert(to_u256(0u128) == 0u256, 1002);
+    assert(to_u256(0u16) == 0u256, 1000);
+    assert(to_u256(0u32) == 0u256, 1001);
+    assert(to_u256(0u256) == 0u256, 1002);
+
+    // Random small number unchanged.
+    assert(to_u256(21u8) == 21u256, 1100);
+    assert(to_u256(21u64) == 21u256, 1101);
+    assert(to_u256(21u128) == 21u256, 1102);
+    assert(to_u256(21u16) == 21u256, 1100);
+    assert(to_u256(21u32) == 21u256, 1101);
+    assert(to_u256(21u256) == 21u256, 1102);
+
+    // Max representable values remain unchanged.
+    assert(to_u256(255u8) == 255u256, 1200);
+    assert(to_u256(18446744073709551615u64) == 18446744073709551615u256, 1201);
+    assert(to_u256(340282366920938463463374607431768211455u128) == 340282366920938463463374607431768211455u256, 1202);
+    assert(to_u256(65535u16) == 65535u256, 1200);
+    assert(to_u256(4294967295u32) == 4294967295u256, 1201);
+    assert(to_u256(115792089237316195423570985008687907853269984665640564039457584007913129639935u256) == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 1202);
+
+    return;
+}
+// check: "Keep(EXECUTED)"
+
 // Casting to u8, overflowing.
 //# run
 main() {
@@ -99,6 +204,38 @@ label b0:
 }
 // check: ARITHMETIC_ERROR
 
+//# run
+main() {
+label b0:
+    _ = to_u8(256u16);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u8(303u16);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u8(256u32);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u8(303u32);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
 //# run
 main() {
 label b0:
@@ -115,6 +252,21 @@ label b0:
 }
 // check: ARITHMETIC_ERROR
 
+//# run
+main() {
+label b0:
+    _ = to_u8(65535u16);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u8(4294967295u32);
+    return;
+}
+// check: ARITHMETIC_ERROR
 
 // Casting to u64, overflowing.
 //# run
@@ -140,3 +292,141 @@ label b0:
     return;
 }
 // check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u64(18446744073709551647u256);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u64(18446744073709551647u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u64(57896044618658097711785492504343953926634992332820282019728792003956564819967u256);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+// Casting to u16, overflowing.
+//# run
+main() {
+label b0:
+    _ = to_u16(18446744073709551616u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u16(18446744073709551647u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u16(340282366920938463463374607431768211455u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u16(18446744073709551647u256);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u16(18446744073709551647u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u16(57896044618658097711785492504343953926634992332820282019728792003956564819967u256);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u16(2561233u32);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u16(4294967295u32);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+// Casting to u32, overflowing.
+//# run
+main() {
+label b0:
+    _ = to_u32(18446744073709551616u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u32(18446744073709551647u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u32(340282366920938463463374607431768211455u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u32(18446744073709551647u256);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u32(18446744073709551647u128);
+    return;
+}
+// check: ARITHMETIC_ERROR
+
+//# run
+main() {
+label b0:
+    _ = to_u32(57896044618658097711785492504343953926634992332820282019728792003956564819967u256);
+    return;
+}
+// check: ARITHMETIC_ERROR
diff --git a/language/move-vm/transactional-tests/tests/instructions/shift_operators.exp b/language/move-vm/transactional-tests/tests/instructions/shift_operators.exp
index 56974ad32a..6736be6c17 100644
--- a/language/move-vm/transactional-tests/tests/instructions/shift_operators.exp
+++ b/language/move-vm/transactional-tests/tests/instructions/shift_operators.exp
@@ -1,4 +1,4 @@
-processed 12 tasks
+processed 16 tasks
 
 task 0 'run'. lines 1-7:
 Error: Script execution failed with VMError: {
@@ -45,7 +45,43 @@ Error: Script execution failed with VMError: {
     offsets: [(FunctionDefinitionIndex(0), 2)],
 }
 
-task 5 'run'. lines 37-45:
+task 5 'run'. lines 37-42:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 6 'run'. lines 44-49:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 7 'run'. lines 51-56:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 8 'run'. lines 58-63:
+Error: Script execution failed with VMError: {
+    major_status: ARITHMETIC_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 2)],
+}
+
+task 9 'run'. lines 65-73:
 Error: Script execution failed with VMError: {
     major_status: ARITHMETIC_ERROR,
     sub_status: None,
diff --git a/language/move-vm/transactional-tests/tests/instructions/shift_operators.mvir b/language/move-vm/transactional-tests/tests/instructions/shift_operators.mvir
index cd1970eb41..6efa002ea5 100644
--- a/language/move-vm/transactional-tests/tests/instructions/shift_operators.mvir
+++ b/language/move-vm/transactional-tests/tests/instructions/shift_operators.mvir
@@ -20,6 +20,20 @@ label b0:
     return;
 }
 
+//# run
+main() {
+label b0:
+    _ = 0u16 << 16u8;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u32 << 32u8;
+    return;
+}
+
 //# run
 main() {
 label b0:
@@ -41,6 +55,20 @@ label b0:
     return;
 }
 
+//# run
+main() {
+label b0:
+    _ = 0u16 >> 16u8;
+    return;
+}
+
+//# run
+main() {
+label b0:
+    _ = 0u32 >> 32u8;
+    return;
+}
+
 
 // Shifting 0 results in 0.
 //# run
@@ -49,10 +77,16 @@ label b0:
     assert(0u8 << 4u8 == 0u8, 1000);
     assert(0u64 << 1u8 == 0u64, 1001);
     assert(0u128 << 127u8 == 0u128, 1002);
+    assert(0u16 << 14u8 == 0u16, 1003);
+    assert(0u32 << 31u8 == 0u32, 1004);
+    assert(0u256 << 249u8 == 0u256, 1005);
 
     assert(0u8 >> 4u8 == 0u8, 1100);
     assert(0u64 >> 1u8 == 0u64, 1101);
     assert(0u128 >> 127u8 == 0u128, 1102);
+    assert(0u16 >> 14u8 == 0u16, 1103);
+    assert(0u32 >> 31u8 == 0u32, 1104);
+    assert(0u256 >> 249u8 == 0u256, 1105);
     return;
 }
 
@@ -65,10 +99,16 @@ label b0:
     assert(100u8 << 0u8 == 100u8, 2000);
     assert(43u64 << 0u8 == 43u64, 2001);
     assert(57348765484584586725315342563424u128 << 0u8 == 57348765484584586725315342563424u128, 2002);
+    assert(1000u16 << 0u8 == 1000u16, 2003);
+    assert(10000u32 << 0u8 == 10000u32, 2004);
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 << 0u8 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 2005);
 
     assert(100u8 >> 0u8 == 100u8, 2100);
     assert(43u64 >> 0u8 == 43u64, 2101);
     assert(57348765484584586725315342563424u128 >> 0u8 == 57348765484584586725315342563424u128, 2102);
+    assert(1000u16 >> 0u8 == 1000u16, 2103);
+    assert(10000u32 >> 0u8 == 10000u32, 2104);
+    assert(115792089237316195423570985008687907853269984665640564039457584007913129639935u256 >> 0u8 == 115792089237316195423570985008687907853269984665640564039457584007913129639935u256, 2105);
     return;
 }
 
@@ -81,10 +121,16 @@ label b0:
     assert(1u8 << 1u8 == 2u8, 3000);
     assert(7u64 << 1u8 == 14u64, 3001);
     assert(1000u128 << 1u8 == 2000u128, 3002);
+    assert(3u16 << 1u8 == 6u16, 3003);
+    assert(7u32 << 1u8 == 14u32, 3004);
+    assert(1000u256 << 1u8 == 2000u256, 3005);
 
     assert(1u8 >>1u8 == 0u8, 3100);
     assert(7u64 >> 1u8 == 3u64, 3101);
     assert(1000u128 >> 1u8 == 500u128, 3102);
+    assert(3u16 >> 1u8 == 1u16, 3103);
+    assert(7u32 >> 1u8 == 3u32, 3104);
+    assert(1000u256 >> 1u8 == 500u256, 3105);
     return;
 }
 
@@ -97,6 +143,9 @@ label b0:
     assert(1234u64 >> 63u8 == 0u64, 4000);
     assert(3u8 >> 5u8 == 0u8, 4001);
     assert(43152365326753472145312542634526753u128 >> 127u8 == 0u128, 4002);
+    assert(1234u16 >> 15u8 == 0u16, 4003);
+    assert(123456u32 >> 31u8 == 0u32, 4004);
+    assert(11579208923731619542357098500868790785326998466564056403945758400791312963993u256 >> 255u8 == 0u256, 4005);
     return;
 }
 
@@ -109,6 +158,9 @@ label b0:
     assert(7u8 << 7u8 == 128u8, 5000);
     assert(7u64 << 62u8 == 13835058055282163712u64, 5001);
     assert(2u128 << 127u8 == 0u128, 5002);
+    assert(7u16 << 15u8 == 32768u16, 5003);
+    assert(17u32 << 30u8 == 1073741824u32, 5004);
+    assert(7u256 << 254u8 == 86844066927987146567678238756515930889952488499230423029593188005934847229952u256, 5005);
     return;
 }
 
@@ -130,5 +182,19 @@ label b0:
     assert(8629035907847368941279654523567912314u128 << 77u8 == 317056859699765342273530379836650946560u128, 6201);
     assert(5742389768935678297185789157531u128 << 10u8 == 5880207123390134576318248097311744u128, 6202);
     assert(295429678238907658936718926478967892769u128 << 83u8 == 78660438169199498567214234129963941888u128, 6203);
+
+    assert(12u16 << 4u8 == 192u16, 6300);
+    assert(1234u16 << 12u8 == 8192u16, 6301);
+    assert(6553u16 << 15u8 == 32768u16, 6302);
+
+    assert(1234567u32 << 12u8 == 761819136u32, 6400);
+    assert(1234567u32 << 17u8 == 2903375872u32, 6401);
+    assert(12345671u32 << 27u8 == 939524096u32, 6402);
+
+    assert(123u256 << 1u8 == 246u256, 6500);
+    assert(123453u256 << 13u8 == 1011326976u256, 6501);
+    assert(123453678909u256 << 76u8 == 9327896247469005265829994770202624u256, 6502);
+    assert(1234536789093546757803u256 << 168u8 == 461895049882996264654333091841553462264195467433049741837793730775482368u256, 6503);
+    assert(1234536789093546757803786604381691994985672142341299639418u256 << 202u8 == 33658913632735705985908889087832028406806276615240336691180752852867975479296u256, 6504);
     return;
 }
diff --git a/language/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_fn.exp b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_fn.exp
new file mode 100644
index 0000000000..544ac1fda8
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_fn.exp
@@ -0,0 +1,10 @@
+processed 5 tasks
+
+task 4 'publish'. lines 39-46:
+Error: Unable to publish module '00000000000000000000000000000042::A'. Got VMError: {
+    major_status: CYCLIC_MODULE_DEPENDENCY,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [],
+    offsets: [],
+}
diff --git a/language/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_fn.mvir b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_fn.mvir
new file mode 100644
index 0000000000..c8e1d23410
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_fn.mvir
@@ -0,0 +1,46 @@
+//# publish
+module 0x42.A {
+    public foo(): u64 {
+    label b0:
+        return 5;
+    }
+}
+
+//# publish
+module 0x43.B {
+    import 0x42.A;
+    public foo(): u64 {
+    label b0:
+        return A.foo();
+    }
+}
+
+//# publish
+module 0x44.C {
+    import 0x43.B;
+    public foo(): u64 {
+    label b0:
+        return B.foo();
+    }
+}
+
+//# run
+import 0x44.C;
+
+main() {
+    let f: u64;
+label b0:
+    f = C.foo();
+    assert(move(f) == 5, 42);
+    return;
+}
+
+
+//# publish
+module 0x42.A {
+    import 0x44.C;
+    public foo(): u64 {
+    label b0:
+        return C.foo();
+    }
+}
diff --git a/language/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_friend.exp b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_friend.exp
new file mode 100644
index 0000000000..9e20a832f5
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_friend.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 3 'publish'. lines 15-18:
+Error: Unable to publish module '00000000000000000000000000000042::A'. Got VMError: {
+    major_status: CYCLIC_MODULE_FRIENDSHIP,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [],
+    offsets: [],
+}
diff --git a/language/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_friend.mvir b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_friend.mvir
new file mode 100644
index 0000000000..f007fe9ce5
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_friend.mvir
@@ -0,0 +1,18 @@
+//# publish
+module 0x42.A {
+}
+
+//# publish
+module 0x42.B {
+   friend 0x42.A;
+}
+
+//# publish
+module 0x42.C {
+    friend 0x42.B;
+}
+
+//# publish
+module 0x42.A {
+    friend 0x42.C;
+}
diff --git a/language/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_struct.exp b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_struct.exp
new file mode 100644
index 0000000000..e74030f976
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_struct.exp
@@ -0,0 +1,10 @@
+processed 4 tasks
+
+task 3 'publish'. lines 24-33:
+Error: Unable to publish module '00000000000000000000000000000042::A'. Got VMError: {
+    major_status: CYCLIC_MODULE_DEPENDENCY,
+    sub_status: None,
+    location: 0x42::A,
+    indices: [],
+    offsets: [],
+}
diff --git a/language/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_struct.mvir b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_struct.mvir
new file mode 100644
index 0000000000..18b9bc1071
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_cyclic_dependencies_struct.mvir
@@ -0,0 +1,33 @@
+//# publish
+module 0x42.A {
+    struct A has store{
+        f: u64,
+    }
+}
+
+//# publish
+module 0x43.B {
+    import 0x42.A;
+    struct B has store{
+        a: A.A,
+    }
+}
+
+//# publish
+module 0x44.C {
+    import 0x43.B;
+    struct C has store{
+        b: B.B,
+    }
+}
+
+//# publish
+module 0x42.A {
+    import 0x44.C;
+    struct A has store{
+        f: u64,
+    }
+    struct A2 has store{
+        c: C.C,
+    }
+}
diff --git a/language/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking.exp b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking.exp
new file mode 100644
index 0000000000..256b0148cf
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking.exp
@@ -0,0 +1,10 @@
+processed 5 tasks
+
+task 4 'run'. lines 39-39:
+Error: Function execution failed with VMError: {
+    major_status: UNEXPECTED_VERIFIER_ERROR,
+    sub_status: None,
+    location: 0x42::N,
+    indices: [(FunctionHandle, 1)],
+    offsets: [],
+}
diff --git a/language/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking.mvir b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking.mvir
new file mode 100644
index 0000000000..88af6c2f07
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking.mvir
@@ -0,0 +1,39 @@
+//# publish
+module 0x42.N {
+    public foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.N;
+    public(friend) foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.N {
+    import 0x42.M;
+    public foo() {
+    label b0:
+        M.foo();
+        return;
+    }
+}
+
+//# publish --skip-check-friend-linking
+module 0x42.M {
+    friend 0x42.N;
+    // `--skip-check-friend-linking` allow make `friend` visibility more restrictive
+    foo() {
+    label b0:
+        return;
+    }
+}
+
+/// `--skip-check-friend-linking` upgrade will break the caller.
+//# run 0x42::N::foo
diff --git a/language/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking_remove.exp b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking_remove.exp
new file mode 100644
index 0000000000..5453beaf0d
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking_remove.exp
@@ -0,0 +1,10 @@
+processed 5 tasks
+
+task 4 'run'. lines 34-34:
+Error: Function execution failed with VMError: {
+    major_status: UNEXPECTED_VERIFIER_ERROR,
+    sub_status: None,
+    location: 0x42::N,
+    indices: [(FunctionHandle, 1)],
+    offsets: [],
+}
diff --git a/language/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking_remove.mvir b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking_remove.mvir
new file mode 100644
index 0000000000..047f1e94ce
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_friend_fn_skip_check_friend_linking_remove.mvir
@@ -0,0 +1,34 @@
+//# publish
+module 0x42.N {
+    public foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.M {
+    friend 0x42.N;
+    public(friend) foo() {
+    label b0:
+        return;
+    }
+}
+
+//# publish
+module 0x42.N {
+    import 0x42.M;
+    public foo() {
+    label b0:
+        M.foo();
+        return;
+    }
+}
+
+//# publish --skip-check-friend-linking
+module 0x42.M {
+    // `--skip-check-friend-linking` allow remove `friend` function
+}
+
+/// `--skip-check-friend-linking` upgrade will break the caller.
+//# run 0x42::N::foo
diff --git a/language/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout_struct.exp b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout_struct.exp
new file mode 100644
index 0000000000..9d0cee140f
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout_struct.exp
@@ -0,0 +1,10 @@
+processed 2 tasks
+
+task 1 'publish'. lines 7-13:
+Error: Unable to publish module '00000000000000000000000000000042::Duplicate'. Got VMError: {
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/language/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout_struct.mvir b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout_struct.mvir
new file mode 100644
index 0000000000..96b26cc629
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_incompatible_layout_struct.mvir
@@ -0,0 +1,13 @@
+//# publish
+module 0x42.Duplicate {
+  struct U { f: u64 }
+  struct T { f: Self.U }
+}
+
+//# publish
+module 0x42.Duplicate {
+  struct U { f: u64 }
+  struct U2 { f: u64 }
+  struct T { f: Self.U2 }
+  // cannot change fields type
+}
diff --git a/language/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking.exp b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking.exp
new file mode 100644
index 0000000000..ddb83526e7
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking.exp
@@ -0,0 +1,10 @@
+processed 6 tasks
+
+task 5 'run'. lines 69-69:
+Error: Function execution failed with VMError: {
+    major_status: UNEXPECTED_VERIFIER_ERROR,
+    sub_status: None,
+    location: 0x43::B,
+    indices: [(FunctionHandle, 2)],
+    offsets: [],
+}
diff --git a/language/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking.mvir b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking.mvir
new file mode 100644
index 0000000000..94756f3a91
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking.mvir
@@ -0,0 +1,69 @@
+//# publish
+module 0x42.A {
+  struct A has store,drop {
+        f: u64,
+  }
+  public new(f: u64): Self.A {
+  label b0:
+    return A { f: move(f) };
+  }
+  public f(a: &Self.A) :u64 {
+  label b0:
+      return *&move(a).A::f;
+  }
+}
+
+//# publish
+module 0x43.B {
+  import 0x42.A;
+  public f(a: &A.A) :u64 {
+  label b0:
+    return A.f(move(a));
+  }
+
+  public m(){
+    let a: A.A;
+    let f: u64;
+  label b0:
+    a = A.new(1);
+    f = Self.f(&a);
+    assert(move(f) == 1, 42);
+    return;
+  }
+}
+
+//# publish
+module 0x44.C {
+  import 0x43.B;
+
+  public entry m(){
+  label b0:
+    B.m();
+    return;
+  }
+}
+
+//# run 0x44::C::m
+
+
+//# publish --skip-check-struct-and-pub-function-linking
+module 0x42.A {
+  struct A has store,drop {
+        f: u64,
+  }
+  struct A1 has store,drop {
+        f: u64,
+  }
+  public new(f: u64): Self.A {
+  label b0:
+    return A { f: move(f) };
+  }
+  // change the origin function signature
+  public f(a: &Self.A1) :u64 {
+  label b0:
+      return *&move(a).A1::f;
+  }
+}
+
+
+//# run 0x44::C::m
diff --git a/language/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking_hack_struct.exp b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking_hack_struct.exp
new file mode 100644
index 0000000000..f390bbc348
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking_hack_struct.exp
@@ -0,0 +1,28 @@
+processed 5 tasks
+
+task 2 'publish'. lines 18-23:
+Error: Unable to publish module '00000000000000000000000000000042::A'. Got VMError: {
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 3 'publish'. lines 25-45:
+Error: Unable to publish module '00000000000000000000000000000042::A'. Got VMError: {
+    major_status: BACKWARD_INCOMPATIBLE_MODULE_UPDATE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 4 'run'. lines 47-47:
+Error: Function execution failed with VMError: {
+    major_status: FUNCTION_RESOLUTION_FAILURE,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/language/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking_hack_struct.mvir b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking_hack_struct.mvir
new file mode 100644
index 0000000000..00f2d8f21a
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/module_publishing/republish_module_skip_compatible_linking_hack_struct.mvir
@@ -0,0 +1,47 @@
+//# publish
+module 0x42.A {
+  struct A has store,drop {
+        f: u64,
+  }
+  struct K has key, store,drop {
+        a: Self.A,
+  }
+  public entry make_save_k(sender: signer){
+  label b0:
+    move_to<K>(&sender, K { a: A { f: 100 } });
+    return;
+  }
+}
+
+//# run 0x42::A::make_save_k --signers 0x42
+
+//# publish --skip-check-struct-and-pub-function-linking
+module 0x42.A {
+  struct A has store,drop {
+        f: u64,
+  }
+}
+
+//# publish
+module 0x42.A {
+  struct A has store,drop {
+        f: u64,
+  }
+  struct B has store,drop {
+        f: u64,
+  }
+  struct K has key, store,drop {
+        a: Self.B,
+  }
+  public entry take_check_k() acquires K {
+    let a: Self.B;
+    let f: u64;
+  label b0:
+    K { a } = move_from<K>(0x42);
+    B { f } = move(a);
+    assert(move(f) == 100, 42);
+    return;
+  }
+}
+
+//# run 0x42::A::take_check_k
diff --git a/language/move-vm/transactional-tests/tests/recursion/runtime_layout_deeply_nested.exp b/language/move-vm/transactional-tests/tests/recursion/runtime_layout_deeply_nested.exp
index a7ad267396..ff2cde123e 100644
--- a/language/move-vm/transactional-tests/tests/recursion/runtime_layout_deeply_nested.exp
+++ b/language/move-vm/transactional-tests/tests/recursion/runtime_layout_deeply_nested.exp
@@ -6,14 +6,14 @@ Error: Script execution failed with VMError: {
     sub_status: None,
     location: 0x42::M,
     indices: [],
-    offsets: [(FunctionDefinitionIndex(8), 3)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
 }
 
-task 3 'run'. lines 89-97:
+task 3 'run'. lines 89-96:
 Error: Script execution failed with VMError: {
     major_status: VM_MAX_VALUE_DEPTH_REACHED,
     sub_status: None,
     location: 0x42::M,
     indices: [],
-    offsets: [(FunctionDefinitionIndex(9), 4)],
+    offsets: [(FunctionDefinitionIndex(0), 1)],
 }
diff --git a/language/move-vm/transactional-tests/tests/recursion/runtime_layout_deeply_nested.mvir b/language/move-vm/transactional-tests/tests/recursion/runtime_layout_deeply_nested.mvir
index 7f2bc48e6b..9044139ecd 100644
--- a/language/move-vm/transactional-tests/tests/recursion/runtime_layout_deeply_nested.mvir
+++ b/language/move-vm/transactional-tests/tests/recursion/runtime_layout_deeply_nested.mvir
@@ -71,11 +71,11 @@ import 0x42.M;
 
 main(account: signer) {
 label b0:
+    // hits VM_MAX_VALUE_DEPTH_REACHED
     M.publish_128(&account);
     return;
 }
 
-
 //# run --args @0x2
 import 0x42.M;
 
@@ -91,7 +91,6 @@ import 0x42.M;
 
 main(account: signer) {
 label b0:
-    // hits VM_MAX_VALUE_DEPTH_REACHED
     M.publish_257(&account);
     return;
 }
diff --git a/language/move-vm/transactional-tests/tests/recursion/runtime_type_deeply_nested.exp b/language/move-vm/transactional-tests/tests/recursion/runtime_type_deeply_nested.exp
index 66d5120e78..b37da7a441 100644
--- a/language/move-vm/transactional-tests/tests/recursion/runtime_type_deeply_nested.exp
+++ b/language/move-vm/transactional-tests/tests/recursion/runtime_type_deeply_nested.exp
@@ -1,10 +1,19 @@
 processed 3 tasks
 
+task 1 'run'. lines 72-79:
+Error: Script execution failed with VMError: {
+    major_status: TOO_MANY_TYPE_NODES,
+    sub_status: None,
+    location: 0x42::M,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(48), 0)],
+}
+
 task 2 'run'. lines 81-89:
 Error: Script execution failed with VMError: {
-    major_status: VM_MAX_TYPE_DEPTH_REACHED,
+    major_status: TOO_MANY_TYPE_NODES,
     sub_status: None,
     location: 0x42::M,
     indices: [],
-    offsets: [(FunctionDefinitionIndex(1), 0)],
+    offsets: [(FunctionDefinitionIndex(49), 0)],
 }
diff --git a/language/move-vm/transactional-tests/tests/references/borrow_in_loop.exp b/language/move-vm/transactional-tests/tests/references/borrow_in_loop.exp
new file mode 100644
index 0000000000..190ad98daa
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/references/borrow_in_loop.exp
@@ -0,0 +1,28 @@
+processed 3 tasks
+
+task 0 'publish'. lines 1-23:
+Error: Unable to publish module '00000000000000000000000000000042::m'. Got VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: 0x42::m,
+    indices: [(FunctionDefinition, 0)],
+    offsets: [(FunctionDefinitionIndex(0), 11)],
+}
+
+task 1 'run'. lines 25-25:
+Error: Function execution failed with VMError: {
+    major_status: LINKER_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
+
+task 2 'run'. lines 27-41:
+Error: Script execution failed with VMError: {
+    major_status: STLOC_UNSAFE_TO_DESTROY_ERROR,
+    sub_status: None,
+    location: script,
+    indices: [],
+    offsets: [(FunctionDefinitionIndex(0), 5)],
+}
diff --git a/language/move-vm/transactional-tests/tests/references/borrow_in_loop.mvir b/language/move-vm/transactional-tests/tests/references/borrow_in_loop.mvir
new file mode 100644
index 0000000000..286b6d4cfb
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/references/borrow_in_loop.mvir
@@ -0,0 +1,41 @@
+//# publish
+module 0x42.m {
+
+struct S has copy, drop { f: u64 }
+public foo() {
+    let x: Self.S;
+    let y: Self.S;
+    let z: u64;
+    let r: &Self.S;
+    let f: &u64;
+    label l0:
+        x = S { f: 0 };
+        z = 0;
+        r = &x;
+        f = &z;
+    label l1:
+        y = S { f: 1 };
+        _ = *copy(r);
+        r = &y;
+        f = &copy(r).S::f;
+        jump l1;
+}
+}
+
+//# run 0x42::m::foo --gas-budget 100000
+
+//# run --gas-budget 100000
+main() {
+    let x: u64;
+    let y: u64;
+    let z: u64;
+    let r: &u64;
+    label l0:
+        x = 0;
+        r = &x;
+    label l1:
+        y = 0;
+        z = *copy(r);
+        r = &y;
+        jump l1;
+}
diff --git a/language/move-vm/transactional-tests/tests/references/drop_ref.exp b/language/move-vm/transactional-tests/tests/references/drop_ref.exp
new file mode 100644
index 0000000000..6cd67db3f6
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/references/drop_ref.exp
@@ -0,0 +1 @@
+processed 1 task
diff --git a/language/move-vm/transactional-tests/tests/references/drop_ref.mvir b/language/move-vm/transactional-tests/tests/references/drop_ref.mvir
new file mode 100644
index 0000000000..8f855d8a63
--- /dev/null
+++ b/language/move-vm/transactional-tests/tests/references/drop_ref.mvir
@@ -0,0 +1,9 @@
+//# run --signers 0x1
+main(account: signer) {
+    let u: u64;
+    let u_ref: &u64;
+label b0:
+    u = 10;
+    u_ref = freeze(&mut u);
+    return;
+}
diff --git a/language/move-vm/types/Cargo.toml b/language/move-vm/types/Cargo.toml
index 1ac48f4893..8a89a92feb 100644
--- a/language/move-vm/types/Cargo.toml
+++ b/language/move-vm/types/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 once_cell = "1.7.2"
@@ -15,7 +15,8 @@ proptest = { version = "1.0.0", optional = true }
 serde = { version = "1.0.124", features = ["derive", "rc"] }
 smallvec = "1.6.1"
 
-bcs = "0.1.2"
+bcs.workspace = true
+
 move-core-types = { path = "../../move-core/types" }
 move-binary-format = { path = "../../move-binary-format" }
 
diff --git a/language/move-vm/types/src/data_store.rs b/language/move-vm/types/src/data_store.rs
index 7f0b6d4035..06992e8adb 100644
--- a/language/move-vm/types/src/data_store.rs
+++ b/language/move-vm/types/src/data_store.rs
@@ -8,7 +8,8 @@ use crate::{
 };
 use move_binary_format::errors::{PartialVMResult, VMResult};
 use move_core_types::{
-    account_address::AccountAddress, language_storage::ModuleId, value::MoveTypeLayout,
+    account_address::AccountAddress, gas_algebra::NumBytes, language_storage::ModuleId,
+    value::MoveTypeLayout,
 };
 
 /// Provide an implementation for bytecodes related to data with a given data store.
@@ -28,13 +29,18 @@ pub trait DataStore {
         &mut self,
         addr: AccountAddress,
         ty: &Type,
-    ) -> PartialVMResult<&mut GlobalValue>;
+    ) -> PartialVMResult<(&mut GlobalValue, Option<Option<NumBytes>>)>;
 
     /// Get the serialized format of a `CompiledModule` given a `ModuleId`.
     fn load_module(&self, module_id: &ModuleId) -> VMResult<Vec<u8>>;
 
     /// Publish a module.
-    fn publish_module(&mut self, module_id: &ModuleId, blob: Vec<u8>) -> VMResult<()>;
+    fn publish_module(
+        &mut self,
+        module_id: &ModuleId,
+        blob: Vec<u8>,
+        is_republishing: bool,
+    ) -> VMResult<()>;
 
     /// Check if this module exists.
     fn exists_module(&self, module_id: &ModuleId) -> VMResult<bool>;
diff --git a/language/move-vm/types/src/gas.rs b/language/move-vm/types/src/gas.rs
new file mode 100644
index 0000000000..6a96a9dfeb
--- /dev/null
+++ b/language/move-vm/types/src/gas.rs
@@ -0,0 +1,451 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::views::{TypeView, ValueView};
+use move_binary_format::errors::PartialVMResult;
+use move_core_types::{
+    gas_algebra::{InternalGas, NumArgs, NumBytes},
+    language_storage::ModuleId,
+};
+
+/// Enum of instructions that do not need extra information for gas metering.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum SimpleInstruction {
+    Nop,
+    Ret,
+
+    BrTrue,
+    BrFalse,
+    Branch,
+
+    LdU8,
+    LdU64,
+    LdU128,
+    LdTrue,
+    LdFalse,
+
+    FreezeRef,
+    MutBorrowLoc,
+    ImmBorrowLoc,
+    ImmBorrowField,
+    MutBorrowField,
+    ImmBorrowFieldGeneric,
+    MutBorrowFieldGeneric,
+
+    CastU8,
+    CastU64,
+    CastU128,
+
+    Add,
+    Sub,
+    Mul,
+    Mod,
+    Div,
+
+    BitOr,
+    BitAnd,
+    Xor,
+    Shl,
+    Shr,
+
+    Or,
+    And,
+    Not,
+
+    Lt,
+    Gt,
+    Le,
+    Ge,
+
+    Abort,
+
+    LdU16,
+    LdU32,
+    LdU256,
+    CastU16,
+    CastU32,
+    CastU256,
+}
+
+/// Trait that defines a generic gas meter interface, allowing clients of the Move VM to implement
+/// their own metering scheme.
+pub trait GasMeter {
+    fn balance_internal(&self) -> InternalGas;
+
+    /// Charge an instruction and fail if not enough gas units are left.
+    fn charge_simple_instr(&mut self, instr: SimpleInstruction) -> PartialVMResult<()>;
+
+    fn charge_pop(&mut self, popped_val: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_call(
+        &mut self,
+        module_id: &ModuleId,
+        func_name: &str,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+        num_locals: NumArgs,
+    ) -> PartialVMResult<()>;
+
+    fn charge_call_generic(
+        &mut self,
+        module_id: &ModuleId,
+        func_name: &str,
+        ty_args: impl ExactSizeIterator<Item = impl TypeView>,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+        num_locals: NumArgs,
+    ) -> PartialVMResult<()>;
+
+    fn charge_ld_const(&mut self, size: NumBytes) -> PartialVMResult<()>;
+
+    fn charge_ld_const_after_deserialization(&mut self, val: impl ValueView)
+        -> PartialVMResult<()>;
+
+    fn charge_copy_loc(&mut self, val: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_move_loc(&mut self, val: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_store_loc(&mut self, val: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_pack(
+        &mut self,
+        is_generic: bool,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()>;
+
+    fn charge_unpack(
+        &mut self,
+        is_generic: bool,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()>;
+
+    fn charge_read_ref(&mut self, val: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_write_ref(
+        &mut self,
+        new_val: impl ValueView,
+        old_val: impl ValueView,
+    ) -> PartialVMResult<()>;
+
+    fn charge_eq(&mut self, lhs: impl ValueView, rhs: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_neq(&mut self, lhs: impl ValueView, rhs: impl ValueView) -> PartialVMResult<()>;
+
+    fn charge_borrow_global(
+        &mut self,
+        is_mut: bool,
+        is_generic: bool,
+        ty: impl TypeView,
+        is_success: bool,
+    ) -> PartialVMResult<()>;
+
+    fn charge_exists(
+        &mut self,
+        is_generic: bool,
+        ty: impl TypeView,
+        // TODO(Gas): see if we can get rid of this param
+        exists: bool,
+    ) -> PartialVMResult<()>;
+
+    fn charge_move_from(
+        &mut self,
+        is_generic: bool,
+        ty: impl TypeView,
+        val: Option<impl ValueView>,
+    ) -> PartialVMResult<()>;
+
+    fn charge_move_to(
+        &mut self,
+        is_generic: bool,
+        ty: impl TypeView,
+        val: impl ValueView,
+        is_success: bool,
+    ) -> PartialVMResult<()>;
+
+    fn charge_vec_pack<'a>(
+        &mut self,
+        ty: impl TypeView + 'a,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()>;
+
+    fn charge_vec_len(&mut self, ty: impl TypeView) -> PartialVMResult<()>;
+
+    fn charge_vec_borrow(
+        &mut self,
+        is_mut: bool,
+        ty: impl TypeView,
+        is_success: bool,
+    ) -> PartialVMResult<()>;
+
+    fn charge_vec_push_back(
+        &mut self,
+        ty: impl TypeView,
+        val: impl ValueView,
+    ) -> PartialVMResult<()>;
+
+    fn charge_vec_pop_back(
+        &mut self,
+        ty: impl TypeView,
+        val: Option<impl ValueView>,
+    ) -> PartialVMResult<()>;
+
+    // TODO(Gas): Expose the elements
+    fn charge_vec_unpack(
+        &mut self,
+        ty: impl TypeView,
+        expect_num_elements: NumArgs,
+        elems: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()>;
+
+    // TODO(Gas): Expose the two elements
+    fn charge_vec_swap(&mut self, ty: impl TypeView) -> PartialVMResult<()>;
+
+    /// Charges for loading a resource from storage. This is only called when the resource is not
+    /// cached.
+    /// - `Some(n)` means `n` bytes are loaded.
+    /// - `None` means a load operation is performed but the resource does not exist.
+    ///
+    /// WARNING: This can be dangerous if you execute multiple user transactions in the same
+    /// session -- identical transactions can have different gas costs. Use at your own risk.
+    fn charge_load_resource(
+        &mut self,
+        loaded: Option<(NumBytes, impl ValueView)>,
+    ) -> PartialVMResult<()>;
+
+    /// Charge for executing a native function.
+    /// The cost is calculated returned by the native function implementation.
+    /// Should fail if not enough gas units are left.
+    ///
+    /// In the future, we may want to remove this and directly pass a reference to the GasMeter
+    /// instance to the native functions to allow gas to be deducted during computation.
+    fn charge_native_function(
+        &mut self,
+        amount: InternalGas,
+        ret_vals: Option<impl ExactSizeIterator<Item = impl ValueView>>,
+    ) -> PartialVMResult<()>;
+
+    fn charge_native_function_before_execution(
+        &mut self,
+        ty_args: impl ExactSizeIterator<Item = impl TypeView>,
+        args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()>;
+
+    fn charge_drop_frame(
+        &mut self,
+        locals: impl Iterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()>;
+}
+
+/// A dummy gas meter that does not meter anything.
+/// Charge operations will always succeed.
+pub struct UnmeteredGasMeter;
+
+impl GasMeter for UnmeteredGasMeter {
+    fn balance_internal(&self) -> InternalGas {
+        u64::MAX.into()
+    }
+
+    fn charge_simple_instr(&mut self, _instr: SimpleInstruction) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_pop(&mut self, _popped_val: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_call(
+        &mut self,
+        _module_id: &ModuleId,
+        _func_name: &str,
+        _args: impl IntoIterator<Item = impl ValueView>,
+        _num_locals: NumArgs,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_call_generic(
+        &mut self,
+        _module_id: &ModuleId,
+        _func_name: &str,
+        _ty_args: impl ExactSizeIterator<Item = impl TypeView>,
+        _args: impl ExactSizeIterator<Item = impl ValueView>,
+        _num_locals: NumArgs,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_ld_const(&mut self, _size: NumBytes) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_ld_const_after_deserialization(
+        &mut self,
+        _val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_copy_loc(&mut self, _val: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_move_loc(&mut self, _val: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_store_loc(&mut self, _val: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_pack(
+        &mut self,
+        _is_generic: bool,
+        _args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_unpack(
+        &mut self,
+        _is_generic: bool,
+        _args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_read_ref(&mut self, _val: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_write_ref(
+        &mut self,
+        _new_val: impl ValueView,
+        _old_val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_eq(&mut self, _lhs: impl ValueView, _rhs: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_neq(&mut self, _lhs: impl ValueView, _rhs: impl ValueView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_borrow_global(
+        &mut self,
+        _is_mut: bool,
+        _is_generic: bool,
+        _ty: impl TypeView,
+        _is_success: bool,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_exists(
+        &mut self,
+        _is_generic: bool,
+        _ty: impl TypeView,
+        _exists: bool,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_move_from(
+        &mut self,
+        _is_generic: bool,
+        _ty: impl TypeView,
+        _val: Option<impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_move_to(
+        &mut self,
+        _is_generic: bool,
+        _ty: impl TypeView,
+        _val: impl ValueView,
+        _is_success: bool,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_pack<'a>(
+        &mut self,
+        _ty: impl TypeView + 'a,
+        _args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_len(&mut self, _ty: impl TypeView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_borrow(
+        &mut self,
+        _is_mut: bool,
+        _ty: impl TypeView,
+        _is_success: bool,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_push_back(
+        &mut self,
+        _ty: impl TypeView,
+        _val: impl ValueView,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_pop_back(
+        &mut self,
+        _ty: impl TypeView,
+        _val: Option<impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_unpack(
+        &mut self,
+        _ty: impl TypeView,
+        _expect_num_elements: NumArgs,
+        _elems: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_vec_swap(&mut self, _ty: impl TypeView) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_load_resource(
+        &mut self,
+        _loaded: Option<(NumBytes, impl ValueView)>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_native_function(
+        &mut self,
+        _amount: InternalGas,
+        _ret_vals: Option<impl ExactSizeIterator<Item = impl ValueView>>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_native_function_before_execution(
+        &mut self,
+        _ty_args: impl ExactSizeIterator<Item = impl TypeView>,
+        _args: impl ExactSizeIterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+
+    fn charge_drop_frame(
+        &mut self,
+        _locals: impl Iterator<Item = impl ValueView>,
+    ) -> PartialVMResult<()> {
+        Ok(())
+    }
+}
diff --git a/language/move-vm/types/src/gas_schedule.rs b/language/move-vm/types/src/gas_schedule.rs
deleted file mode 100644
index 030304e6cd..0000000000
--- a/language/move-vm/types/src/gas_schedule.rs
+++ /dev/null
@@ -1,494 +0,0 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-//! This module lays out the basic abstract costing schedule for bytecode instructions.
-//!
-//! It is important to note that the cost schedule defined in this file does not track hashing
-//! operations or other native operations; the cost of each native operation will be returned by the
-//! native function itself.
-use move_binary_format::{
-    errors::{Location, PartialVMError, PartialVMResult, VMResult},
-    file_format::{
-        Bytecode, ConstantPoolIndex, FieldHandleIndex, FieldInstantiationIndex,
-        FunctionHandleIndex, FunctionInstantiationIndex, SignatureIndex,
-        StructDefInstantiationIndex, StructDefinitionIndex, NUMBER_OF_NATIVE_FUNCTIONS,
-    },
-    file_format_common::{instruction_key, Opcodes},
-};
-use move_core_types::{
-    gas_schedule::{
-        AbstractMemorySize, CostTable, GasAlgebra, GasCarrier, GasConstants, GasCost, GasUnits,
-        InternalGasUnits,
-    },
-    vm_status::StatusCode,
-};
-use once_cell::sync::Lazy;
-use std::cmp::max;
-
-static ZERO_COST_SCHEDULE: Lazy<CostTable> =
-    Lazy::new(|| zero_cost_schedule(NUMBER_OF_NATIVE_FUNCTIONS));
-
-/// The Move VM implementation of state for gas metering.
-///
-/// Initialize with a `CostTable` and the gas provided to the transaction.
-/// Provide all the proper guarantees about gas metering in the Move VM.
-///
-/// Every client must use an instance of this type to interact with the Move VM.
-pub struct GasStatus<'a> {
-    cost_table: &'a CostTable,
-    gas_left: InternalGasUnits<GasCarrier>,
-    charge: bool,
-}
-
-impl<'a> GasStatus<'a> {
-    /// Initialize the gas state with metering enabled.
-    ///
-    /// Charge for every operation and fail when there is no more gas to pay for operations.
-    /// This is the instantiation that must be used when executing a user script.
-    pub fn new(cost_table: &'a CostTable, gas_left: GasUnits<GasCarrier>) -> Self {
-        Self {
-            gas_left: cost_table.gas_constants.to_internal_units(gas_left),
-            cost_table,
-            charge: true,
-        }
-    }
-
-    /// Initialize the gas state with metering disabled.
-    ///
-    /// It should be used by clients in very specific cases and when executing system
-    /// code that does not have to charge the user.
-    pub fn new_unmetered() -> Self {
-        Self {
-            gas_left: InternalGasUnits::new(0),
-            cost_table: &ZERO_COST_SCHEDULE,
-            charge: false,
-        }
-    }
-
-    /// Return the `CostTable` behind this `GasStatus`.
-    pub fn cost_table(&self) -> &CostTable {
-        self.cost_table
-    }
-
-    /// Return the gas left.
-    pub fn remaining_gas(&self) -> GasUnits<GasCarrier> {
-        self.cost_table
-            .gas_constants
-            .to_external_units(self.gas_left)
-    }
-
-    /// Charge a given amount of gas and fail if not enough gas units are left.
-    pub fn deduct_gas(&mut self, amount: InternalGasUnits<GasCarrier>) -> PartialVMResult<()> {
-        if !self.charge {
-            return Ok(());
-        }
-        if self
-            .gas_left
-            .app(&amount, |curr_gas, gas_amt| curr_gas >= gas_amt)
-        {
-            self.gas_left = self.gas_left.sub(amount);
-            Ok(())
-        } else {
-            // Zero out the internal gas state
-            self.gas_left = InternalGasUnits::new(0);
-            Err(PartialVMError::new(StatusCode::OUT_OF_GAS))
-        }
-    }
-
-    /// Charge an instruction over data with a given size and fail if not enough gas units are left.
-    pub fn charge_instr_with_size(
-        &mut self,
-        opcode: Opcodes,
-        size: AbstractMemorySize<GasCarrier>,
-    ) -> PartialVMResult<()> {
-        // Make sure that the size is always non-zero
-        let size = size.map(|x| std::cmp::max(1, x));
-        debug_assert!(size.get() > 0);
-        self.deduct_gas(
-            self.cost_table
-                .instruction_cost(opcode as u8)
-                .total()
-                .mul(size),
-        )
-    }
-
-    /// Charge an instruction and fail if not enough gas units are left.
-    pub fn charge_instr(&mut self, opcode: Opcodes) -> PartialVMResult<()> {
-        self.deduct_gas(self.cost_table.instruction_cost(opcode as u8).total())
-    }
-
-    /// Charge gas related to the overall size of a transaction and fail if not enough
-    /// gas units are left.
-    pub fn charge_intrinsic_gas(
-        &mut self,
-        intrinsic_cost: AbstractMemorySize<GasCarrier>,
-    ) -> VMResult<()> {
-        let cost = calculate_intrinsic_gas(intrinsic_cost, &self.cost_table.gas_constants);
-        self.deduct_gas(cost)
-            .map_err(|e| e.finish(Location::Undefined))
-    }
-
-    pub fn set_metering(&mut self, enabled: bool) {
-        self.charge = enabled
-    }
-}
-
-pub fn new_from_instructions(
-    mut instrs: Vec<(Bytecode, GasCost)>,
-    native_table: Vec<GasCost>,
-) -> CostTable {
-    instrs.sort_by_key(|cost| instruction_key(&cost.0));
-
-    if cfg!(debug_assertions) {
-        let mut instructions_covered = 0;
-        for (index, (instr, _)) in instrs.iter().enumerate() {
-            let key = instruction_key(instr);
-            if index == (key - 1) as usize {
-                instructions_covered += 1;
-            }
-        }
-        debug_assert!(
-            instructions_covered == Bytecode::VARIANT_COUNT,
-            "all instructions must be in the cost table"
-        );
-    }
-    let instruction_table = instrs
-        .into_iter()
-        .map(|(_, cost)| cost)
-        .collect::<Vec<GasCost>>();
-    CostTable {
-        instruction_table,
-        native_table,
-        gas_constants: GasConstants::default(),
-    }
-}
-
-pub fn zero_cost_instruction_table() -> Vec<(Bytecode, GasCost)> {
-    use Bytecode::*;
-
-    vec![
-        (MoveTo(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
-        (
-            MoveToGeneric(StructDefInstantiationIndex::new(0)),
-            GasCost::new(0, 0),
-        ),
-        (MoveFrom(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
-        (
-            MoveFromGeneric(StructDefInstantiationIndex::new(0)),
-            GasCost::new(0, 0),
-        ),
-        (BrTrue(0), GasCost::new(0, 0)),
-        (WriteRef, GasCost::new(0, 0)),
-        (Mul, GasCost::new(0, 0)),
-        (MoveLoc(0), GasCost::new(0, 0)),
-        (And, GasCost::new(0, 0)),
-        (Pop, GasCost::new(0, 0)),
-        (BitAnd, GasCost::new(0, 0)),
-        (ReadRef, GasCost::new(0, 0)),
-        (Sub, GasCost::new(0, 0)),
-        (MutBorrowField(FieldHandleIndex::new(0)), GasCost::new(0, 0)),
-        (
-            MutBorrowFieldGeneric(FieldInstantiationIndex::new(0)),
-            GasCost::new(0, 0),
-        ),
-        (ImmBorrowField(FieldHandleIndex::new(0)), GasCost::new(0, 0)),
-        (
-            ImmBorrowFieldGeneric(FieldInstantiationIndex::new(0)),
-            GasCost::new(0, 0),
-        ),
-        (Add, GasCost::new(0, 0)),
-        (CopyLoc(0), GasCost::new(0, 0)),
-        (StLoc(0), GasCost::new(0, 0)),
-        (Ret, GasCost::new(0, 0)),
-        (Lt, GasCost::new(0, 0)),
-        (LdU8(0), GasCost::new(0, 0)),
-        (LdU64(0), GasCost::new(0, 0)),
-        (LdU128(0), GasCost::new(0, 0)),
-        (CastU8, GasCost::new(0, 0)),
-        (CastU64, GasCost::new(0, 0)),
-        (CastU128, GasCost::new(0, 0)),
-        (Abort, GasCost::new(0, 0)),
-        (MutBorrowLoc(0), GasCost::new(0, 0)),
-        (ImmBorrowLoc(0), GasCost::new(0, 0)),
-        (LdConst(ConstantPoolIndex::new(0)), GasCost::new(0, 0)),
-        (Ge, GasCost::new(0, 0)),
-        (Xor, GasCost::new(0, 0)),
-        (Shl, GasCost::new(0, 0)),
-        (Shr, GasCost::new(0, 0)),
-        (Neq, GasCost::new(0, 0)),
-        (Not, GasCost::new(0, 0)),
-        (Call(FunctionHandleIndex::new(0)), GasCost::new(0, 0)),
-        (
-            CallGeneric(FunctionInstantiationIndex::new(0)),
-            GasCost::new(0, 0),
-        ),
-        (Le, GasCost::new(0, 0)),
-        (Branch(0), GasCost::new(0, 0)),
-        (Unpack(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
-        (
-            UnpackGeneric(StructDefInstantiationIndex::new(0)),
-            GasCost::new(0, 0),
-        ),
-        (Or, GasCost::new(0, 0)),
-        (LdFalse, GasCost::new(0, 0)),
-        (LdTrue, GasCost::new(0, 0)),
-        (Mod, GasCost::new(0, 0)),
-        (BrFalse(0), GasCost::new(0, 0)),
-        (Exists(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
-        (
-            ExistsGeneric(StructDefInstantiationIndex::new(0)),
-            GasCost::new(0, 0),
-        ),
-        (BitOr, GasCost::new(0, 0)),
-        (FreezeRef, GasCost::new(0, 0)),
-        (
-            MutBorrowGlobal(StructDefinitionIndex::new(0)),
-            GasCost::new(0, 0),
-        ),
-        (
-            MutBorrowGlobalGeneric(StructDefInstantiationIndex::new(0)),
-            GasCost::new(0, 0),
-        ),
-        (
-            ImmBorrowGlobal(StructDefinitionIndex::new(0)),
-            GasCost::new(0, 0),
-        ),
-        (
-            ImmBorrowGlobalGeneric(StructDefInstantiationIndex::new(0)),
-            GasCost::new(0, 0),
-        ),
-        (Div, GasCost::new(0, 0)),
-        (Eq, GasCost::new(0, 0)),
-        (Gt, GasCost::new(0, 0)),
-        (Pack(StructDefinitionIndex::new(0)), GasCost::new(0, 0)),
-        (
-            PackGeneric(StructDefInstantiationIndex::new(0)),
-            GasCost::new(0, 0),
-        ),
-        (Nop, GasCost::new(0, 0)),
-        (VecPack(SignatureIndex::new(0), 0), GasCost::new(0, 0)),
-        (VecLen(SignatureIndex::new(0)), GasCost::new(0, 0)),
-        (VecImmBorrow(SignatureIndex::new(0)), GasCost::new(0, 0)),
-        (VecMutBorrow(SignatureIndex::new(0)), GasCost::new(0, 0)),
-        (VecPushBack(SignatureIndex::new(0)), GasCost::new(0, 0)),
-        (VecPopBack(SignatureIndex::new(0)), GasCost::new(0, 0)),
-        (VecUnpack(SignatureIndex::new(0), 0), GasCost::new(0, 0)),
-        (VecSwap(SignatureIndex::new(0)), GasCost::new(0, 0)),
-    ]
-}
-
-// Only used for genesis and for tests where we need a cost table and
-// don't have a genesis storage state.
-pub fn zero_cost_schedule(num_of_native_funcs: usize) -> CostTable {
-    // The actual costs for the instructions in this table _DO NOT MATTER_. This is only used
-    // for genesis and testing, and for these cases we don't need to worry
-    // about the actual gas for instructions.  The only thing we care about is having an entry
-    // in the gas schedule for each instruction.
-    let instrs = zero_cost_instruction_table();
-    // length of native_table vector should be at least 18 due to the fact that there's a
-    // builtin native function cost EMIT_EVENT which indexed 17 in the vector
-    let num_of_native_funcs = max(num_of_native_funcs, 18);
-    let native_table = (0..num_of_native_funcs)
-        .map(|_| GasCost::new(0, 0))
-        .collect::<Vec<GasCost>>();
-    new_from_instructions(instrs, native_table)
-}
-
-pub fn bytecode_instruction_costs() -> Vec<(Bytecode, GasCost)> {
-    use Bytecode::*;
-    return vec![
-        (MoveTo(StructDefinitionIndex::new(0)), GasCost::new(13, 1)),
-        (
-            MoveToGeneric(StructDefInstantiationIndex::new(0)),
-            GasCost::new(27, 1),
-        ),
-        (
-            MoveFrom(StructDefinitionIndex::new(0)),
-            GasCost::new(459, 1),
-        ),
-        (
-            MoveFromGeneric(StructDefInstantiationIndex::new(0)),
-            GasCost::new(13, 1),
-        ),
-        (BrTrue(0), GasCost::new(1, 1)),
-        (WriteRef, GasCost::new(1, 1)),
-        (Mul, GasCost::new(1, 1)),
-        (MoveLoc(0), GasCost::new(1, 1)),
-        (And, GasCost::new(1, 1)),
-        (Pop, GasCost::new(1, 1)),
-        (BitAnd, GasCost::new(2, 1)),
-        (ReadRef, GasCost::new(1, 1)),
-        (Sub, GasCost::new(1, 1)),
-        (MutBorrowField(FieldHandleIndex::new(0)), GasCost::new(1, 1)),
-        (
-            MutBorrowFieldGeneric(FieldInstantiationIndex::new(0)),
-            GasCost::new(1, 1),
-        ),
-        (ImmBorrowField(FieldHandleIndex::new(0)), GasCost::new(1, 1)),
-        (
-            ImmBorrowFieldGeneric(FieldInstantiationIndex::new(0)),
-            GasCost::new(1, 1),
-        ),
-        (Add, GasCost::new(1, 1)),
-        (CopyLoc(0), GasCost::new(1, 1)),
-        (StLoc(0), GasCost::new(1, 1)),
-        (Ret, GasCost::new(638, 1)),
-        (Lt, GasCost::new(1, 1)),
-        (LdU8(0), GasCost::new(1, 1)),
-        (LdU64(0), GasCost::new(1, 1)),
-        (LdU128(0), GasCost::new(1, 1)),
-        (CastU8, GasCost::new(2, 1)),
-        (CastU64, GasCost::new(1, 1)),
-        (CastU128, GasCost::new(1, 1)),
-        (Abort, GasCost::new(1, 1)),
-        (MutBorrowLoc(0), GasCost::new(2, 1)),
-        (ImmBorrowLoc(0), GasCost::new(1, 1)),
-        (LdConst(ConstantPoolIndex::new(0)), GasCost::new(1, 1)),
-        (Ge, GasCost::new(1, 1)),
-        (Xor, GasCost::new(1, 1)),
-        (Shl, GasCost::new(2, 1)),
-        (Shr, GasCost::new(1, 1)),
-        (Neq, GasCost::new(1, 1)),
-        (Not, GasCost::new(1, 1)),
-        (Call(FunctionHandleIndex::new(0)), GasCost::new(1132, 1)),
-        (
-            CallGeneric(FunctionInstantiationIndex::new(0)),
-            GasCost::new(582, 1),
-        ),
-        (Le, GasCost::new(2, 1)),
-        (Branch(0), GasCost::new(1, 1)),
-        (Unpack(StructDefinitionIndex::new(0)), GasCost::new(2, 1)),
-        (
-            UnpackGeneric(StructDefInstantiationIndex::new(0)),
-            GasCost::new(2, 1),
-        ),
-        (Or, GasCost::new(2, 1)),
-        (LdFalse, GasCost::new(1, 1)),
-        (LdTrue, GasCost::new(1, 1)),
-        (Mod, GasCost::new(1, 1)),
-        (BrFalse(0), GasCost::new(1, 1)),
-        (Exists(StructDefinitionIndex::new(0)), GasCost::new(41, 1)),
-        (
-            ExistsGeneric(StructDefInstantiationIndex::new(0)),
-            GasCost::new(34, 1),
-        ),
-        (BitOr, GasCost::new(2, 1)),
-        (FreezeRef, GasCost::new(1, 1)),
-        (
-            MutBorrowGlobal(StructDefinitionIndex::new(0)),
-            GasCost::new(21, 1),
-        ),
-        (
-            MutBorrowGlobalGeneric(StructDefInstantiationIndex::new(0)),
-            GasCost::new(15, 1),
-        ),
-        (
-            ImmBorrowGlobal(StructDefinitionIndex::new(0)),
-            GasCost::new(23, 1),
-        ),
-        (
-            ImmBorrowGlobalGeneric(StructDefInstantiationIndex::new(0)),
-            GasCost::new(14, 1),
-        ),
-        (Div, GasCost::new(3, 1)),
-        (Eq, GasCost::new(1, 1)),
-        (Gt, GasCost::new(1, 1)),
-        (Pack(StructDefinitionIndex::new(0)), GasCost::new(2, 1)),
-        (
-            PackGeneric(StructDefInstantiationIndex::new(0)),
-            GasCost::new(2, 1),
-        ),
-        (Nop, GasCost::new(1, 1)),
-        (VecPack(SignatureIndex::new(0), 0), GasCost::new(84, 1)),
-        (VecLen(SignatureIndex::new(0)), GasCost::new(98, 1)),
-        (VecImmBorrow(SignatureIndex::new(0)), GasCost::new(1334, 1)),
-        (VecMutBorrow(SignatureIndex::new(0)), GasCost::new(1902, 1)),
-        (VecPushBack(SignatureIndex::new(0)), GasCost::new(53, 1)),
-        (VecPopBack(SignatureIndex::new(0)), GasCost::new(227, 1)),
-        (VecUnpack(SignatureIndex::new(0), 0), GasCost::new(572, 1)),
-        (VecSwap(SignatureIndex::new(0)), GasCost::new(1436, 1)),
-    ];
-}
-
-pub static INITIAL_COST_SCHEDULE: Lazy<CostTable> = Lazy::new(|| {
-    let mut instrs = bytecode_instruction_costs();
-    // Note that the DiemVM is expecting the table sorted by instruction order.
-    instrs.sort_by_key(|cost| instruction_key(&cost.0));
-
-    use NativeCostIndex as N;
-
-    let mut native_table = vec![
-        (N::SHA2_256, GasCost::new(21, 1)),
-        (N::SHA3_256, GasCost::new(64, 1)),
-        (N::ED25519_VERIFY, GasCost::new(61, 1)),
-        (N::ED25519_THRESHOLD_VERIFY, GasCost::new(3351, 1)),
-        (N::BCS_TO_BYTES, GasCost::new(181, 1)),
-        (N::LENGTH, GasCost::new(98, 1)),
-        (N::EMPTY, GasCost::new(84, 1)),
-        (N::BORROW, GasCost::new(1334, 1)),
-        (N::BORROW_MUT, GasCost::new(1902, 1)),
-        (N::PUSH_BACK, GasCost::new(53, 1)),
-        (N::POP_BACK, GasCost::new(227, 1)),
-        (N::DESTROY_EMPTY, GasCost::new(572, 1)),
-        (N::SWAP, GasCost::new(1436, 1)),
-        (N::ED25519_VALIDATE_KEY, GasCost::new(26, 1)),
-        (N::SIGNER_BORROW, GasCost::new(353, 1)),
-        (N::CREATE_SIGNER, GasCost::new(24, 1)),
-        (N::DESTROY_SIGNER, GasCost::new(212, 1)),
-        (N::EMIT_EVENT, GasCost::new(52, 1)),
-    ];
-    native_table.sort_by_key(|cost| cost.0 as u64);
-    let raw_native_table = native_table
-        .into_iter()
-        .map(|(_, cost)| cost)
-        .collect::<Vec<_>>();
-    new_from_instructions(instrs, raw_native_table)
-});
-
-/// Calculate the intrinsic gas for the transaction based upon its size in bytes/words.
-pub fn calculate_intrinsic_gas(
-    transaction_size: AbstractMemorySize<GasCarrier>,
-    gas_constants: &GasConstants,
-) -> InternalGasUnits<GasCarrier> {
-    let min_transaction_fee = gas_constants.min_transaction_gas_units;
-
-    if transaction_size.get() > gas_constants.large_transaction_cutoff.get() {
-        let excess = transaction_size.sub(gas_constants.large_transaction_cutoff);
-        min_transaction_fee.add(gas_constants.intrinsic_gas_per_byte.mul(excess))
-    } else {
-        min_transaction_fee.unitary_cast()
-    }
-}
-
-// TODO: need to refactor native gas calculation so it is extensible. Currently we
-// have hardcoded here the stdlib natives.
-#[allow(non_camel_case_types)]
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
-#[repr(u8)]
-pub enum NativeCostIndex {
-    SHA2_256 = 0,
-    SHA3_256 = 1,
-    ED25519_VERIFY = 2,
-    ED25519_THRESHOLD_VERIFY = 3,
-    BCS_TO_BYTES = 4,
-    LENGTH = 5,
-    EMPTY = 6,
-    BORROW = 7,
-    BORROW_MUT = 8,
-    PUSH_BACK = 9,
-    POP_BACK = 10,
-    DESTROY_EMPTY = 11,
-    SWAP = 12,
-    ED25519_VALIDATE_KEY = 13,
-    SIGNER_BORROW = 14,
-    CREATE_SIGNER = 15,
-    DESTROY_SIGNER = 16,
-    EMIT_EVENT = 17,
-}
-
-impl From<NativeCostIndex> for u8 {
-    fn from(index: NativeCostIndex) -> Self {
-        index as u8
-    }
-}
diff --git a/language/move-vm/types/src/lib.rs b/language/move-vm/types/src/lib.rs
index e857e9335d..e90386c0dd 100644
--- a/language/move-vm/types/src/lib.rs
+++ b/language/move-vm/types/src/lib.rs
@@ -23,10 +23,11 @@ macro_rules! debug_writeln {
 }
 
 pub mod data_store;
-pub mod gas_schedule;
+pub mod gas;
 pub mod loaded_data;
 pub mod natives;
 pub mod values;
+pub mod views;
 
 #[cfg(test)]
 mod unit_tests;
diff --git a/language/move-vm/types/src/loaded_data/runtime_types.rs b/language/move-vm/types/src/loaded_data/runtime_types.rs
index fcbb050ebe..7079e2e2d9 100644
--- a/language/move-vm/types/src/loaded_data/runtime_types.rs
+++ b/language/move-vm/types/src/loaded_data/runtime_types.rs
@@ -4,20 +4,118 @@
 
 use move_binary_format::{
     errors::{PartialVMError, PartialVMResult},
-    file_format::{AbilitySet, StructDefinitionIndex, StructTypeParameter},
+    file_format::{
+        AbilitySet, SignatureToken, StructDefinitionIndex, StructTypeParameter, TypeParameterIndex,
+    },
 };
-use move_core_types::{identifier::Identifier, language_storage::ModuleId, vm_status::StatusCode};
+use move_core_types::{
+    gas_algebra::AbstractMemorySize, identifier::Identifier, language_storage::ModuleId,
+    vm_status::StatusCode,
+};
+use std::{cmp::max, collections::BTreeMap, fmt::Debug};
 
 pub const TYPE_DEPTH_MAX: usize = 256;
 
+#[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Debug)]
+/// A formula describing the value depth of a type, using (the depths of) the type parameters as inputs.
+///
+/// It has the form of `max(CBase, T1 + C1, T2 + C2, ..)` where `Ti` is the depth of the ith type parameter
+/// and `Ci` is just some constant.
+///
+/// This form has a special property: when you compute the max of multiple formulae, you can normalize
+/// them into a single formula.
+pub struct DepthFormula {
+    pub terms: Vec<(TypeParameterIndex, u64)>, // Ti + Ci
+    pub constant: Option<u64>,                 // Cbase
+}
+
+impl DepthFormula {
+    pub fn constant(constant: u64) -> Self {
+        Self {
+            terms: vec![],
+            constant: Some(constant),
+        }
+    }
+
+    pub fn type_parameter(tparam: TypeParameterIndex) -> Self {
+        Self {
+            terms: vec![(tparam, 0)],
+            constant: None,
+        }
+    }
+
+    pub fn normalize(formulas: Vec<Self>) -> Self {
+        let mut var_map = BTreeMap::new();
+        let mut constant_acc = None;
+        for formula in formulas {
+            let Self { terms, constant } = formula;
+            for (var, cur_factor) in terms {
+                var_map
+                    .entry(var)
+                    .and_modify(|prev_factor| *prev_factor = max(cur_factor, *prev_factor))
+                    .or_insert(cur_factor);
+            }
+            match (constant_acc, constant) {
+                (_, None) => (),
+                (None, Some(_)) => constant_acc = constant,
+                (Some(c1), Some(c2)) => constant_acc = Some(max(c1, c2)),
+            }
+        }
+        Self {
+            terms: var_map.into_iter().collect(),
+            constant: constant_acc,
+        }
+    }
+
+    pub fn subst(
+        &self,
+        mut map: BTreeMap<TypeParameterIndex, DepthFormula>,
+    ) -> PartialVMResult<DepthFormula> {
+        let Self { terms, constant } = self;
+        let mut formulas = vec![];
+        if let Some(constant) = constant {
+            formulas.push(DepthFormula::constant(*constant))
+        }
+        for (t_i, c_i) in terms {
+            let Some(mut u_form) = map.remove(t_i) else {
+                return Err(PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(format!("{t_i:?} missing mapping")))
+            };
+            u_form.scale(*c_i);
+            formulas.push(u_form)
+        }
+        Ok(DepthFormula::normalize(formulas))
+    }
+
+    pub fn solve(&self, tparam_depths: &[u64]) -> u64 {
+        let Self { terms, constant } = self;
+        let mut depth = constant.as_ref().copied().unwrap_or(0);
+        for (t_i, c_i) in terms {
+            depth = max(depth, tparam_depths[*t_i as usize].saturating_add(*c_i))
+        }
+        depth
+    }
+
+    pub fn scale(&mut self, c: u64) {
+        let Self { terms, constant } = self;
+        for (_t_i, c_i) in terms {
+            *c_i = (*c_i).saturating_add(c);
+        }
+        if let Some(cbase) = constant.as_mut() {
+            *cbase = (*cbase).saturating_add(c);
+        }
+    }
+}
+
 #[derive(Debug, Clone, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct StructType {
     pub fields: Vec<Type>,
+    pub field_names: Vec<Identifier>,
     pub abilities: AbilitySet,
     pub type_parameters: Vec<StructTypeParameter>,
     pub name: Identifier,
     pub module: ModuleId,
     pub struct_def: StructDefinitionIndex,
+    pub depth: Option<DepthFormula>,
 }
 
 impl StructType {
@@ -42,7 +140,10 @@ pub enum Type {
     StructInstantiation(CachedStructIndex, Vec<Type>),
     Reference(Box<Type>),
     MutableReference(Box<Type>),
-    TyParam(usize),
+    TyParam(u16),
+    U16,
+    U32,
+    U256,
 }
 
 impl Type {
@@ -52,7 +153,7 @@ impl Type {
 
     fn apply_subst<F>(&self, subst: F, depth: usize) -> PartialVMResult<Type>
     where
-        F: Fn(usize, usize) -> PartialVMResult<Type> + Copy,
+        F: Fn(u16, usize) -> PartialVMResult<Type> + Copy,
     {
         if depth > TYPE_DEPTH_MAX {
             return Err(PartialVMError::new(StatusCode::VM_MAX_TYPE_DEPTH_REACHED));
@@ -61,8 +162,11 @@ impl Type {
             Type::TyParam(idx) => subst(*idx, depth)?,
             Type::Bool => Type::Bool,
             Type::U8 => Type::U8,
+            Type::U16 => Type::U16,
+            Type::U32 => Type::U32,
             Type::U64 => Type::U64,
             Type::U128 => Type::U128,
+            Type::U256 => Type::U256,
             Type::Address => Type::Address,
             Type::Signer => Type::Signer,
             Type::Vector(ty) => Type::Vector(Box::new(ty.apply_subst(subst, depth + 1)?)),
@@ -84,7 +188,7 @@ impl Type {
 
     pub fn subst(&self, ty_args: &[Type]) -> PartialVMResult<Type> {
         self.apply_subst(
-            |idx, depth| match ty_args.get(idx) {
+            |idx, depth| match ty_args.get(idx as usize) {
                 Some(ty) => ty.clone_impl(depth),
                 None => Err(
                     PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
@@ -98,4 +202,111 @@ impl Type {
             1,
         )
     }
+
+    #[allow(deprecated)]
+    const LEGACY_BASE_MEMORY_SIZE: AbstractMemorySize = AbstractMemorySize::new(1);
+
+    /// Returns the abstract memory size the data structure occupies.
+    ///
+    /// This kept only for legacy reasons.
+    /// New applications should not use this.
+    pub fn size(&self) -> AbstractMemorySize {
+        use Type::*;
+
+        match self {
+            TyParam(_) | Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address | Signer => {
+                Self::LEGACY_BASE_MEMORY_SIZE
+            }
+            Vector(ty) | Reference(ty) | MutableReference(ty) => {
+                Self::LEGACY_BASE_MEMORY_SIZE + ty.size()
+            }
+            Struct(_) => Self::LEGACY_BASE_MEMORY_SIZE,
+            StructInstantiation(_, tys) => tys
+                .iter()
+                .fold(Self::LEGACY_BASE_MEMORY_SIZE, |acc, ty| acc + ty.size()),
+        }
+    }
+
+    pub fn from_const_signature(constant_signature: &SignatureToken) -> PartialVMResult<Self> {
+        use SignatureToken as S;
+        use Type as L;
+
+        Ok(match constant_signature {
+            S::Bool => L::Bool,
+            S::U8 => L::U8,
+            S::U16 => L::U16,
+            S::U32 => L::U32,
+            S::U64 => L::U64,
+            S::U128 => L::U128,
+            S::U256 => L::U256,
+            S::Address => L::Address,
+            S::Vector(inner) => L::Vector(Box::new(Self::from_const_signature(inner)?)),
+            // Not yet supported
+            S::Struct(_) | S::StructInstantiation(_, _) => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("Unable to load const type signature".to_string()),
+                )
+            }
+            // Not allowed/Not meaningful
+            S::TypeParameter(_) | S::Reference(_) | S::MutableReference(_) | S::Signer => {
+                return Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("Unable to load const type signature".to_string()),
+                )
+            }
+        })
+    }
+
+    pub fn check_vec_ref(&self, inner_ty: &Type, is_mut: bool) -> PartialVMResult<Type> {
+        match self {
+            Type::MutableReference(inner) => match &**inner {
+                Type::Vector(inner) => {
+                    inner.check_eq(inner_ty)?;
+                    Ok(inner.as_ref().clone())
+                }
+                _ => Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("VecMutBorrow expects a vector reference".to_string()),
+                ),
+            },
+            Type::Reference(inner) if !is_mut => match &**inner {
+                Type::Vector(inner) => {
+                    inner.check_eq(inner_ty)?;
+                    Ok(inner.as_ref().clone())
+                }
+                _ => Err(
+                    PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                        .with_message("VecMutBorrow expects a vector reference".to_string()),
+                ),
+            },
+            _ => Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("VecMutBorrow expects a vector reference".to_string()),
+            ),
+        }
+    }
+
+    pub fn check_eq(&self, other: &Self) -> PartialVMResult<()> {
+        if self != other {
+            return Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR).with_message(
+                    format!("Type mismatch: expected {:?}, got {:?}", self, other),
+                ),
+            );
+        }
+        Ok(())
+    }
+
+    pub fn check_ref_eq(&self, expected_inner: &Self) -> PartialVMResult<()> {
+        match self {
+            Type::MutableReference(inner) | Type::Reference(inner) => {
+                inner.check_eq(expected_inner)
+            }
+            _ => Err(
+                PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
+                    .with_message("VecMutBorrow expects a vector reference".to_string()),
+            ),
+        }
+    }
 }
diff --git a/language/move-vm/types/src/natives/function.rs b/language/move-vm/types/src/natives/function.rs
index f7ea55c88e..e143b01d54 100644
--- a/language/move-vm/types/src/natives/function.rs
+++ b/language/move-vm/types/src/natives/function.rs
@@ -18,13 +18,10 @@
 //! function.
 
 use crate::values::Value;
-use move_core_types::gas_schedule::{
-    AbstractMemorySize, CostTable, GasAlgebra, GasCarrier, InternalGasUnits,
-};
 use smallvec::{smallvec, SmallVec};
 
 pub use move_binary_format::errors::{PartialVMError, PartialVMResult};
-pub use move_core_types::vm_status::StatusCode;
+pub use move_core_types::{gas_algebra::InternalGas, vm_status::StatusCode};
 
 /// Result of a native function execution requires charges for execution cost.
 ///
@@ -35,19 +32,26 @@ pub use move_core_types::vm_status::StatusCode;
 /// is a VM invariant violation which should have been forbidden by the verifier.
 /// Errors (typically user errors and aborts) that are logically part of the function execution
 /// must be expressed in a `NativeResult` with a cost and a VMStatus.
-pub struct NativeResult {
-    /// The cost for running that function, whether successfully or not.
-    pub cost: InternalGasUnits<GasCarrier>,
-    /// Result of execution. This is either the return values or the error to report.
-    pub result: Result<SmallVec<[Value; 1]>, u64>,
+pub enum NativeResult {
+    Success {
+        cost: InternalGas,
+        ret_vals: SmallVec<[Value; 1]>,
+    },
+    Abort {
+        cost: InternalGas,
+        abort_code: u64,
+    },
+    OutOfGas {
+        partial_cost: InternalGas,
+    },
 }
 
 impl NativeResult {
     /// Return values of a successful execution.
-    pub fn ok(cost: InternalGasUnits<GasCarrier>, values: SmallVec<[Value; 1]>) -> Self {
-        NativeResult {
+    pub fn ok(cost: InternalGas, values: SmallVec<[Value; 1]>) -> Self {
+        NativeResult::Success {
             cost,
-            result: Ok(values),
+            ret_vals: values,
         }
     }
 
@@ -55,16 +59,26 @@ impl NativeResult {
     /// failure of the VM which would raise a `PartialVMError` error directly.
     /// The only thing the funciton can specify is its abort code, as if it had invoked the `Abort`
     /// bytecode instruction
-    pub fn err(cost: InternalGasUnits<GasCarrier>, abort_code: u64) -> Self {
-        NativeResult {
-            cost,
-            result: Err(abort_code),
-        }
+    pub fn err(cost: InternalGas, abort_code: u64) -> Self {
+        NativeResult::Abort { cost, abort_code }
+    }
+
+    /// A special variant indicating that the native has determined there is not enough
+    /// balance to cover the full cost to get all the work done.
+    ///
+    /// Along with the ability to get the gas balance from the native context, this offers
+    /// natives a way to emulate incremental gas metering, avoiding doing expensive operations
+    /// before charging for gas.
+    ///
+    /// The natives are still required to return a partial cost, which the VM will pass
+    /// to the gas meter for proper bookkeeping.
+    pub fn out_of_gas(partial_cost: InternalGas) -> Self {
+        NativeResult::OutOfGas { partial_cost }
     }
 
     /// Convert a PartialVMResult<()> into a PartialVMResult<NativeResult>
     pub fn map_partial_vm_result_empty(
-        cost: InternalGasUnits<GasCarrier>,
+        cost: InternalGas,
         res: PartialVMResult<()>,
     ) -> PartialVMResult<Self> {
         let result = match res {
@@ -85,7 +99,7 @@ impl NativeResult {
 
     /// Convert a PartialVMResult<Value> into a PartialVMResult<NativeResult>
     pub fn map_partial_vm_result_one(
-        cost: InternalGasUnits<GasCarrier>,
+        cost: InternalGas,
         res: PartialVMResult<Value>,
     ) -> PartialVMResult<Self> {
         let result = match res {
@@ -105,19 +119,6 @@ impl NativeResult {
     }
 }
 
-/// Return the native gas entry in `CostTable` for the given key.
-/// The key is the specific native function index known to `CostTable`.
-pub fn native_gas(
-    table: &CostTable,
-    native_table_idx: impl Into<u8>,
-    size: usize,
-) -> InternalGasUnits<GasCarrier> {
-    let gas_amt = table.native_cost(native_table_idx.into());
-    let memory_size = AbstractMemorySize::new(std::cmp::max(1, size) as GasCarrier);
-    debug_assert!(memory_size.get() > 0);
-    gas_amt.total().mul(memory_size)
-}
-
 /// Return the argument at the top of the stack.
 ///
 /// Arguments are passed to a native as a stack with first arg at the bottom of the stack.
diff --git a/language/move-vm/types/src/values/value_tests.rs b/language/move-vm/types/src/values/value_tests.rs
index a1a32db309..eb0e625845 100644
--- a/language/move-vm/types/src/values/value_tests.rs
+++ b/language/move-vm/types/src/values/value_tests.rs
@@ -2,8 +2,9 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::values::*;
+use crate::{loaded_data::runtime_types::Type, values::*, views::*};
 use move_binary_format::errors::*;
+use move_core_types::{account_address::AccountAddress, u256::U256};
 
 #[test]
 fn locals() -> PartialVMResult<()> {
@@ -34,8 +35,22 @@ fn locals() -> PartialVMResult<()> {
 
 #[test]
 fn struct_pack_and_unpack() -> PartialVMResult<()> {
-    let vals = vec![Value::u8(10), Value::u64(20), Value::u128(30)];
-    let s = Struct::pack(vec![Value::u8(10), Value::u64(20), Value::u128(30)]);
+    let vals = vec![
+        Value::u8(10),
+        Value::u16(12),
+        Value::u32(15),
+        Value::u64(20),
+        Value::u128(30),
+        Value::u256(U256::max_value()),
+    ];
+    let s = Struct::pack(vec![
+        Value::u8(10),
+        Value::u16(12),
+        Value::u32(15),
+        Value::u64(20),
+        Value::u128(30),
+        Value::u256(U256::max_value()),
+    ]);
     let unpacked: Vec<_> = s.unpack()?.collect();
 
     assert!(vals.len() == unpacked.len());
@@ -121,3 +136,92 @@ fn global_value_non_struct() -> PartialVMResult<()> {
 
     Ok(())
 }
+
+#[test]
+fn leagacy_ref_abstract_memory_size_consistency() -> PartialVMResult<()> {
+    let mut locals = Locals::new(10);
+
+    locals.store_loc(0, Value::u128(0))?;
+    let r = locals.borrow_loc(0)?;
+    assert_eq!(r.legacy_abstract_memory_size(), r.legacy_size());
+
+    locals.store_loc(1, Value::vector_u8([1, 2, 3]))?;
+    let r = locals.borrow_loc(1)?;
+    assert_eq!(r.legacy_abstract_memory_size(), r.legacy_size());
+
+    let r: VectorRef = r.value_as()?;
+    let r = r.borrow_elem(0, &Type::U8)?;
+    assert_eq!(r.legacy_abstract_memory_size(), r.legacy_size());
+
+    locals.store_loc(2, Value::struct_(Struct::pack([])))?;
+    let r: Reference = locals.borrow_loc(2)?.value_as()?;
+    assert_eq!(r.legacy_abstract_memory_size(), r.legacy_size());
+
+    Ok(())
+}
+
+#[test]
+fn legacy_struct_abstract_memory_size_consistenty() -> PartialVMResult<()> {
+    let structs = [
+        Struct::pack([]),
+        Struct::pack([Value::struct_(Struct::pack([Value::u8(0), Value::u64(0)]))]),
+    ];
+
+    for s in &structs {
+        assert_eq!(s.legacy_abstract_memory_size(), s.legacy_size());
+    }
+
+    Ok(())
+}
+
+#[test]
+fn legacy_val_abstract_memory_size_consistency() -> PartialVMResult<()> {
+    let vals = [
+        Value::u8(0),
+        Value::u16(0),
+        Value::u32(0),
+        Value::u64(0),
+        Value::u128(0),
+        Value::u256(U256::zero()),
+        Value::bool(true),
+        Value::address(AccountAddress::ZERO),
+        Value::vector_u8([0, 1, 2]),
+        Value::vector_u16([0, 1, 2]),
+        Value::vector_u32([0, 1, 2]),
+        Value::vector_u64([]),
+        Value::vector_u128([1, 2, 3, 4]),
+        Value::vector_u256([1, 2, 3, 4].iter().map(|q| U256::from(*q as u64))),
+        Value::struct_(Struct::pack([])),
+        Value::struct_(Struct::pack([Value::u8(0), Value::bool(false)])),
+        Value::vector_for_testing_only([]),
+        Value::vector_for_testing_only([Value::u8(0), Value::u8(1)]),
+    ];
+
+    let mut locals = Locals::new(vals.len());
+    for (idx, val) in vals.iter().enumerate() {
+        locals.store_loc(idx, val.copy_value()?)?;
+
+        let val_size_new = val.legacy_abstract_memory_size();
+        let val_size_old = val.legacy_size();
+
+        assert_eq!(val_size_new, val_size_old);
+
+        let val_size_through_ref = locals
+            .borrow_loc(idx)?
+            .value_as::<Reference>()?
+            .value_view()
+            .legacy_abstract_memory_size();
+
+        assert_eq!(val_size_through_ref, val_size_old)
+    }
+
+    Ok(())
+}
+
+#[test]
+fn test_vm_value_vector_u64_casting() {
+    assert_eq!(
+        vec![1, 2, 3],
+        Value::vector_u64([1, 2, 3]).value_as::<Vec<u64>>().unwrap()
+    );
+}
diff --git a/language/move-vm/types/src/values/values_impl.rs b/language/move-vm/types/src/values/values_impl.rs
index 6366920121..412c1848bd 100644
--- a/language/move-vm/types/src/values/values_impl.rs
+++ b/language/move-vm/types/src/values/values_impl.rs
@@ -2,17 +2,19 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::loaded_data::runtime_types::Type;
+use crate::{
+    loaded_data::runtime_types::Type,
+    views::{ValueView, ValueVisitor},
+};
 use move_binary_format::{
     errors::*,
     file_format::{Constant, SignatureToken},
 };
 use move_core_types::{
     account_address::AccountAddress,
-    gas_schedule::{
-        AbstractMemorySize, GasAlgebra, GasCarrier, CONST_SIZE, MIN_EXISTS_DATA_SIZE,
-        REFERENCE_SIZE, STRUCT_SIZE,
-    },
+    effects::Op,
+    gas_algebra::AbstractMemorySize,
+    u256,
     value::{MoveStructLayout, MoveTypeLayout},
     vm_status::{sub_status::NFE_VECTOR_ERROR_BASE, StatusCode},
 };
@@ -20,8 +22,6 @@ use std::{
     cell::RefCell,
     fmt::{self, Debug, Display},
     iter,
-    mem::size_of,
-    ops::Add,
     rc::Rc,
 };
 
@@ -30,7 +30,7 @@ use std::{
  * Internal Types
  *
  *   Internal representation of the Move value calculus. These types are abstractions
- *   over the concrete Move concepts and may carry additonal information that is not
+ *   over the concrete Move concepts and may carry additional information that is not
  *   defined by the language, but required by the implementation.
  *
  **************************************************************************************/
@@ -41,8 +41,11 @@ enum ValueImpl {
     Invalid,
 
     U8(u8),
+    U16(u16),
+    U32(u32),
     U64(u64),
     U128(u128),
+    U256(u256::U256),
     Bool(bool),
     Address(AccountAddress),
 
@@ -71,6 +74,9 @@ enum Container {
     VecU128(Rc<RefCell<Vec<u128>>>),
     VecBool(Rc<RefCell<Vec<bool>>>),
     VecAddress(Rc<RefCell<Vec<AccountAddress>>>),
+    VecU16(Rc<RefCell<Vec<u16>>>),
+    VecU32(Rc<RefCell<Vec<u32>>>),
+    VecU256(Rc<RefCell<Vec<u256::U256>>>),
 }
 
 /// A ContainerRef is a direct reference to a container, which could live either in the frame
@@ -109,25 +115,6 @@ enum ReferenceImpl {
     ContainerRef(ContainerRef),
 }
 
-// A reference to a signer. Clients can attempt a cast to this struct if they are
-// expecting a Signer on the stack or as an argument.
-#[derive(Debug)]
-pub struct SignerRef(ContainerRef);
-
-// A reference to a vector. This is an alias for a ContainerRef for now but we may change
-// it once Containers are restructured.
-// It's used from vector native functions to get a reference to a vector and operate on that.
-// There is an impl for VectorRef which implements the API private to this module.
-#[derive(Debug)]
-pub struct VectorRef(ContainerRef);
-
-// A vector. This is an alias for a Container for now but we may change
-// it once Containers are restructured.
-// It's used from vector native functions to get a vector and operate on that.
-// There is an impl for Vector which implements the API private to this module.
-#[derive(Debug)]
-pub struct Vector(Container);
-
 /***************************************************************************************
  *
  * Public Types
@@ -143,31 +130,20 @@ pub struct Vector(Container);
  *   internal invariants are violated.
  *
  **************************************************************************************/
-
-/// A reference to a Move struct that allows you to take a reference to one of its fields.
-#[derive(Debug)]
-pub struct StructRef(ContainerRef);
-
-/// A generic Move reference that offers two functionalities: read_ref & write_ref.
-#[derive(Debug)]
-pub struct Reference(ReferenceImpl);
-
 /// A Move value -- a wrapper around `ValueImpl` which can be created only through valid
 /// means.
 #[derive(Debug)]
 pub struct Value(ValueImpl);
 
-/// The locals for a function frame. It allows values to be read, written or taken
-/// reference from.
-#[derive(Debug)]
-pub struct Locals(Rc<RefCell<Vec<ValueImpl>>>);
-
 /// An integer value in Move.
 #[derive(Debug)]
 pub enum IntegerValue {
     U8(u8),
+    U16(u16),
+    U32(u32),
     U64(u64),
     U128(u128),
+    U256(u256::U256),
 }
 
 /// A Move struct.
@@ -176,6 +152,33 @@ pub struct Struct {
     fields: Vec<ValueImpl>,
 }
 
+// A vector. This is an alias for a Container for now but we may change
+// it once Containers are restructured.
+// It's used from vector native functions to get a vector and operate on that.
+// There is an impl for Vector which implements the API private to this module.
+#[derive(Debug)]
+pub struct Vector(Container);
+
+/// A reference to a Move struct that allows you to take a reference to one of its fields.
+#[derive(Debug)]
+pub struct StructRef(ContainerRef);
+
+/// A generic Move reference that offers two functionalities: read_ref & write_ref.
+#[derive(Debug)]
+pub struct Reference(ReferenceImpl);
+
+// A reference to a signer. Clients can attempt a cast to this struct if they are
+// expecting a Signer on the stack or as an argument.
+#[derive(Debug)]
+pub struct SignerRef(ContainerRef);
+
+// A reference to a vector. This is an alias for a ContainerRef for now but we may change
+// it once Containers are restructured.
+// It's used from vector native functions to get a reference to a vector and operate on that.
+// There is an impl for VectorRef which implements the API private to this module.
+#[derive(Debug)]
+pub struct VectorRef(ContainerRef);
+
 /// A special "slot" in global storage that can hold a resource. It also keeps track of the status
 /// of the resource relative to the global state, which is necessary to compute the effects to emit
 /// at the end of transaction execution.
@@ -200,15 +203,10 @@ enum GlobalValueImpl {
 #[derive(Debug)]
 pub struct GlobalValue(GlobalValueImpl);
 
-/// Simple enum for the change state of a GlobalValue, used by `into_effect`.
-pub enum GlobalValueEffect<T> {
-    /// There was no value, or the value was not changed
-    None,
-    /// The value was removed
-    Deleted,
-    /// Updated with a new value
-    Changed(T),
-}
+/// The locals for a function frame. It allows values to be read, written or taken
+/// reference from.
+#[derive(Debug)]
+pub struct Locals(Rc<RefCell<Vec<ValueImpl>>>);
 
 /***************************************************************************************
  *
@@ -223,8 +221,11 @@ impl Container {
         match self {
             Self::Locals(r) | Self::Struct(r) | Self::Vec(r) => r.borrow().len(),
             Self::VecU8(r) => r.borrow().len(),
+            Self::VecU16(r) => r.borrow().len(),
+            Self::VecU32(r) => r.borrow().len(),
             Self::VecU64(r) => r.borrow().len(),
             Self::VecU128(r) => r.borrow().len(),
+            Self::VecU256(r) => r.borrow().len(),
             Self::VecBool(r) => r.borrow().len(),
             Self::VecAddress(r) => r.borrow().len(),
         }
@@ -234,8 +235,11 @@ impl Container {
         match self {
             Self::Locals(r) | Self::Struct(r) | Self::Vec(r) => Rc::strong_count(r),
             Self::VecU8(r) => Rc::strong_count(r),
+            Self::VecU16(r) => Rc::strong_count(r),
+            Self::VecU32(r) => Rc::strong_count(r),
             Self::VecU64(r) => Rc::strong_count(r),
             Self::VecU128(r) => Rc::strong_count(r),
+            Self::VecU256(r) => Rc::strong_count(r),
             Self::VecBool(r) => Rc::strong_count(r),
             Self::VecAddress(r) => Rc::strong_count(r),
         }
@@ -306,8 +310,11 @@ macro_rules! impl_vm_value_ref {
 }
 
 impl_vm_value_ref!(u8, U8);
+impl_vm_value_ref!(u16, U16);
+impl_vm_value_ref!(u32, U32);
 impl_vm_value_ref!(u64, U64);
 impl_vm_value_ref!(u128, U128);
+impl_vm_value_ref!(u256::U256, U256);
 impl_vm_value_ref!(bool, Bool);
 impl_vm_value_ref!(AccountAddress, Address);
 
@@ -337,8 +344,11 @@ impl ValueImpl {
             Invalid => Invalid,
 
             U8(x) => U8(*x),
+            U16(x) => U16(*x),
+            U32(x) => U32(*x),
             U64(x) => U64(*x),
             U128(x) => U128(*x),
+            U256(x) => U256(*x),
             Bool(x) => Bool(*x),
             Address(x) => Address(*x),
 
@@ -368,8 +378,11 @@ impl Container {
             Self::Struct(r) => Self::Struct(copy_rc_ref_vec_val(r)?),
 
             Self::VecU8(r) => Self::VecU8(Rc::new(RefCell::new(r.borrow().clone()))),
+            Self::VecU16(r) => Self::VecU16(Rc::new(RefCell::new(r.borrow().clone()))),
+            Self::VecU32(r) => Self::VecU32(Rc::new(RefCell::new(r.borrow().clone()))),
             Self::VecU64(r) => Self::VecU64(Rc::new(RefCell::new(r.borrow().clone()))),
             Self::VecU128(r) => Self::VecU128(Rc::new(RefCell::new(r.borrow().clone()))),
+            Self::VecU256(r) => Self::VecU256(Rc::new(RefCell::new(r.borrow().clone()))),
             Self::VecBool(r) => Self::VecBool(Rc::new(RefCell::new(r.borrow().clone()))),
             Self::VecAddress(r) => Self::VecAddress(Rc::new(RefCell::new(r.borrow().clone()))),
 
@@ -387,8 +400,11 @@ impl Container {
             Self::Vec(r) => Self::Vec(Rc::clone(r)),
             Self::Struct(r) => Self::Struct(Rc::clone(r)),
             Self::VecU8(r) => Self::VecU8(Rc::clone(r)),
+            Self::VecU16(r) => Self::VecU16(Rc::clone(r)),
+            Self::VecU32(r) => Self::VecU32(Rc::clone(r)),
             Self::VecU64(r) => Self::VecU64(Rc::clone(r)),
             Self::VecU128(r) => Self::VecU128(Rc::clone(r)),
+            Self::VecU256(r) => Self::VecU256(Rc::clone(r)),
             Self::VecBool(r) => Self::VecBool(Rc::clone(r)),
             Self::VecAddress(r) => Self::VecAddress(Rc::clone(r)),
             Self::Locals(r) => Self::Locals(Rc::clone(r)),
@@ -429,7 +445,7 @@ impl Value {
  *
  *   Equality tests of Move values. Errors are raised when types mismatch.
  *
- *   It is intented to NOT use or even implement the standard library traits Eq and
+ *   It is intended to NOT use or even implement the standard library traits Eq and
  *   Partial Eq due to:
  *     1. They do not allow errors to be returned.
  *     2. They can be invoked without the user being noticed thanks to operator
@@ -446,8 +462,11 @@ impl ValueImpl {
 
         let res = match (self, other) {
             (U8(l), U8(r)) => l == r,
+            (U16(l), U16(r)) => l == r,
+            (U32(l), U32(r)) => l == r,
             (U64(l), U64(r)) => l == r,
             (U128(l), U128(r)) => l == r,
+            (U256(l), U256(r)) => l == r,
             (Bool(l), Bool(r)) => l == r,
             (Address(l), Address(r)) => l == r,
 
@@ -455,8 +474,18 @@ impl ValueImpl {
 
             (ContainerRef(l), ContainerRef(r)) => l.equals(r)?,
             (IndexedRef(l), IndexedRef(r)) => l.equals(r)?,
-
-            _ => {
+            (Invalid, _)
+            | (U8(_), _)
+            | (U16(_), _)
+            | (U32(_), _)
+            | (U64(_), _)
+            | (U128(_), _)
+            | (U256(_), _)
+            | (Bool(_), _)
+            | (Address(_), _)
+            | (Container(_), _)
+            | (ContainerRef(_), _)
+            | (IndexedRef(_), _) => {
                 return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
                     .with_message(format!("cannot compare values: {:?}, {:?}", self, other)))
             }
@@ -472,8 +501,8 @@ impl Container {
 
         let res = match (self, other) {
             (Vec(l), Vec(r)) | (Struct(l), Struct(r)) => {
-                let l = &*l.borrow();
-                let r = &*r.borrow();
+                let l = &l.borrow();
+                let r = &r.borrow();
 
                 if l.len() != r.len() {
                     return Ok(false);
@@ -486,8 +515,11 @@ impl Container {
                 true
             }
             (VecU8(l), VecU8(r)) => l.borrow().eq(&*r.borrow()),
+            (VecU16(l), VecU16(r)) => l.borrow().eq(&*r.borrow()),
+            (VecU32(l), VecU32(r)) => l.borrow().eq(&*r.borrow()),
             (VecU64(l), VecU64(r)) => l.borrow().eq(&*r.borrow()),
             (VecU128(l), VecU128(r)) => l.borrow().eq(&*r.borrow()),
+            (VecU256(l), VecU256(r)) => l.borrow().eq(&*r.borrow()),
             (VecBool(l), VecBool(r)) => l.borrow().eq(&*r.borrow()),
             (VecAddress(l), VecAddress(r)) => l.borrow().eq(&*r.borrow()),
 
@@ -495,8 +527,11 @@ impl Container {
             | (Vec(_), _)
             | (Struct(_), _)
             | (VecU8(_), _)
+            | (VecU16(_), _)
+            | (VecU32(_), _)
             | (VecU64(_), _)
             | (VecU128(_), _)
+            | (VecU256(_), _)
             | (VecBool(_), _)
             | (VecAddress(_), _) => {
                 return Err(
@@ -538,8 +573,11 @@ impl IndexedRef {
             | (Locals(r1), Locals(r2)) => r1.borrow()[self.idx].equals(&r2.borrow()[other.idx])?,
 
             (VecU8(r1), VecU8(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
+            (VecU16(r1), VecU16(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
+            (VecU32(r1), VecU32(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
             (VecU64(r1), VecU64(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
             (VecU128(r1), VecU128(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
+            (VecU256(r1), VecU256(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
             (VecBool(r1), VecBool(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
             (VecAddress(r1), VecAddress(r2)) => r1.borrow()[self.idx] == r2.borrow()[other.idx],
 
@@ -551,6 +589,20 @@ impl IndexedRef {
                 r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<u8>()?
             }
 
+            (Locals(r1), VecU16(r2)) | (Struct(r1), VecU16(r2)) => {
+                *r1.borrow()[self.idx].as_value_ref::<u16>()? == r2.borrow()[other.idx]
+            }
+            (VecU16(r1), Locals(r2)) | (VecU16(r1), Struct(r2)) => {
+                r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<u16>()?
+            }
+
+            (Locals(r1), VecU32(r2)) | (Struct(r1), VecU32(r2)) => {
+                *r1.borrow()[self.idx].as_value_ref::<u32>()? == r2.borrow()[other.idx]
+            }
+            (VecU32(r1), Locals(r2)) | (VecU32(r1), Struct(r2)) => {
+                r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<u32>()?
+            }
+
             (Locals(r1), VecU64(r2)) | (Struct(r1), VecU64(r2)) => {
                 *r1.borrow()[self.idx].as_value_ref::<u64>()? == r2.borrow()[other.idx]
             }
@@ -565,6 +617,13 @@ impl IndexedRef {
                 r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<u128>()?
             }
 
+            (Locals(r1), VecU256(r2)) | (Struct(r1), VecU256(r2)) => {
+                *r1.borrow()[self.idx].as_value_ref::<u256::U256>()? == r2.borrow()[other.idx]
+            }
+            (VecU256(r1), Locals(r2)) | (VecU256(r1), Struct(r2)) => {
+                r1.borrow()[self.idx] == *r2.borrow()[other.idx].as_value_ref::<u256::U256>()?
+            }
+
             (Locals(r1), VecBool(r2)) | (Struct(r1), VecBool(r2)) => {
                 *r1.borrow()[self.idx].as_value_ref::<bool>()? == r2.borrow()[other.idx]
             }
@@ -582,8 +641,11 @@ impl IndexedRef {
             // All other combinations are illegal.
             (Vec(_), _)
             | (VecU8(_), _)
+            | (VecU16(_), _)
+            | (VecU32(_), _)
             | (VecU64(_), _)
             | (VecU128(_), _)
+            | (VecU256(_), _)
             | (VecBool(_), _)
             | (VecAddress(_), _) => {
                 return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
@@ -618,11 +680,14 @@ impl IndexedRef {
     fn read_ref(self) -> PartialVMResult<Value> {
         use Container::*;
 
-        let res = match &*self.container_ref.container() {
+        let res = match self.container_ref.container() {
             Locals(r) | Vec(r) | Struct(r) => r.borrow()[self.idx].copy_value()?,
             VecU8(r) => ValueImpl::U8(r.borrow()[self.idx]),
+            VecU16(r) => ValueImpl::U16(r.borrow()[self.idx]),
+            VecU32(r) => ValueImpl::U32(r.borrow()[self.idx]),
             VecU64(r) => ValueImpl::U64(r.borrow()[self.idx]),
             VecU128(r) => ValueImpl::U128(r.borrow()[self.idx]),
+            VecU256(r) => ValueImpl::U256(r.borrow()[self.idx]),
             VecBool(r) => ValueImpl::Bool(r.borrow()[self.idx]),
             VecAddress(r) => ValueImpl::Address(r.borrow()[self.idx]),
         };
@@ -685,8 +750,11 @@ impl ContainerRef {
                     Container::Struct(r) => assign!(r, Struct),
                     Container::Vec(r) => assign!(r, Vec),
                     Container::VecU8(r) => assign!(r, VecU8),
+                    Container::VecU16(r) => assign!(r, VecU16),
+                    Container::VecU32(r) => assign!(r, VecU32),
                     Container::VecU64(r) => assign!(r, VecU64),
                     Container::VecU128(r) => assign!(r, VecU128),
+                    Container::VecU256(r) => assign!(r, VecU256),
                     Container::VecBool(r) => assign!(r, VecBool),
                     Container::VecAddress(r) => assign!(r, VecAddress),
                     Container::Locals(_) => {
@@ -736,14 +804,20 @@ impl IndexedRef {
                 v[self.idx] = x.0;
             }
             (Container::VecU8(r), ValueImpl::U8(x)) => r.borrow_mut()[self.idx] = *x,
+            (Container::VecU16(r), ValueImpl::U16(x)) => r.borrow_mut()[self.idx] = *x,
+            (Container::VecU32(r), ValueImpl::U32(x)) => r.borrow_mut()[self.idx] = *x,
             (Container::VecU64(r), ValueImpl::U64(x)) => r.borrow_mut()[self.idx] = *x,
             (Container::VecU128(r), ValueImpl::U128(x)) => r.borrow_mut()[self.idx] = *x,
+            (Container::VecU256(r), ValueImpl::U256(x)) => r.borrow_mut()[self.idx] = *x,
             (Container::VecBool(r), ValueImpl::Bool(x)) => r.borrow_mut()[self.idx] = *x,
             (Container::VecAddress(r), ValueImpl::Address(x)) => r.borrow_mut()[self.idx] = *x,
 
             (Container::VecU8(_), _)
+            | (Container::VecU16(_), _)
+            | (Container::VecU32(_), _)
             | (Container::VecU64(_), _)
             | (Container::VecU128(_), _)
+            | (Container::VecU256(_), _)
             | (Container::VecBool(_), _)
             | (Container::VecAddress(_), _) => {
                 return Err(
@@ -820,8 +894,11 @@ impl ContainerRef {
             }
 
             Container::VecU8(_)
+            | Container::VecU16(_)
+            | Container::VecU32(_)
             | Container::VecU64(_)
             | Container::VecU128(_)
+            | Container::VecU256(_)
             | Container::VecAddress(_)
             | Container::VecBool(_) => ValueImpl::IndexedRef(IndexedRef {
                 idx,
@@ -863,8 +940,11 @@ impl Locals {
             )))),
 
             ValueImpl::U8(_)
+            | ValueImpl::U16(_)
+            | ValueImpl::U32(_)
             | ValueImpl::U64(_)
             | ValueImpl::U128(_)
+            | ValueImpl::U256(_)
             | ValueImpl::Bool(_)
             | ValueImpl::Address(_) => Ok(Value(ValueImpl::IndexedRef(IndexedRef {
                 container_ref: ContainerRef::Local(Container::Locals(Rc::clone(&self.0))),
@@ -951,6 +1031,41 @@ impl Locals {
         self.swap_loc(idx, x)?;
         Ok(())
     }
+
+    /// Drop all Move values onto a different Vec to avoid leaking memory.
+    /// References are excluded since they may point to invalid data.
+    pub fn drop_all_values(&mut self) -> impl Iterator<Item = (usize, Value)> {
+        let mut locals = self.0.borrow_mut();
+        let mut res = vec![];
+
+        for idx in 0..locals.len() {
+            match &locals[idx] {
+                ValueImpl::Invalid => (),
+                ValueImpl::ContainerRef(_) | ValueImpl::IndexedRef(_) => {
+                    locals[idx] = ValueImpl::Invalid;
+                }
+                _ => res.push((
+                    idx,
+                    Value(std::mem::replace(&mut locals[idx], ValueImpl::Invalid)),
+                )),
+            }
+        }
+
+        res.into_iter()
+    }
+
+    pub fn is_invalid(&self, idx: usize) -> PartialVMResult<bool> {
+        let v = self.0.borrow();
+        match v.get(idx) {
+            Some(ValueImpl::Invalid) => Ok(true),
+            Some(_) => Ok(false),
+            None => Err(
+                PartialVMError::new(StatusCode::VERIFIER_INVARIANT_VIOLATION).with_message(
+                    format!("local index out of bounds: got {}, len: {}", idx, v.len()),
+                ),
+            ),
+        }
+    }
 }
 
 /***************************************************************************************
@@ -965,6 +1080,14 @@ impl Value {
         Self(ValueImpl::U8(x))
     }
 
+    pub fn u16(x: u16) -> Self {
+        Self(ValueImpl::U16(x))
+    }
+
+    pub fn u32(x: u32) -> Self {
+        Self(ValueImpl::U32(x))
+    }
+
     pub fn u64(x: u64) -> Self {
         Self(ValueImpl::U64(x))
     }
@@ -973,6 +1096,10 @@ impl Value {
         Self(ValueImpl::U128(x))
     }
 
+    pub fn u256(x: u256::U256) -> Self {
+        Self(ValueImpl::U256(x))
+    }
+
     pub fn bool(x: bool) -> Self {
         Self(ValueImpl::Bool(x))
     }
@@ -1006,6 +1133,18 @@ impl Value {
         ))))
     }
 
+    pub fn vector_u16(it: impl IntoIterator<Item = u16>) -> Self {
+        Self(ValueImpl::Container(Container::VecU16(Rc::new(
+            RefCell::new(it.into_iter().collect()),
+        ))))
+    }
+
+    pub fn vector_u32(it: impl IntoIterator<Item = u32>) -> Self {
+        Self(ValueImpl::Container(Container::VecU32(Rc::new(
+            RefCell::new(it.into_iter().collect()),
+        ))))
+    }
+
     pub fn vector_u64(it: impl IntoIterator<Item = u64>) -> Self {
         Self(ValueImpl::Container(Container::VecU64(Rc::new(
             RefCell::new(it.into_iter().collect()),
@@ -1018,6 +1157,12 @@ impl Value {
         ))))
     }
 
+    pub fn vector_u256(it: impl IntoIterator<Item = u256::U256>) -> Self {
+        Self(ValueImpl::Container(Container::VecU256(Rc::new(
+            RefCell::new(it.into_iter().collect()),
+        ))))
+    }
+
     pub fn vector_bool(it: impl IntoIterator<Item = bool>) -> Self {
         Self(ValueImpl::Container(Container::VecBool(Rc::new(
             RefCell::new(it.into_iter().collect()),
@@ -1070,8 +1215,11 @@ macro_rules! impl_vm_value_cast {
 }
 
 impl_vm_value_cast!(u8, U8);
+impl_vm_value_cast!(u16, U16);
+impl_vm_value_cast!(u32, U32);
 impl_vm_value_cast!(u64, U64);
 impl_vm_value_cast!(u128, U128);
+impl_vm_value_cast!(u256::U256, U256);
 impl_vm_value_cast!(bool, Bool);
 impl_vm_value_cast!(AccountAddress, Address);
 impl_vm_value_cast!(ContainerRef, ContainerRef);
@@ -1081,8 +1229,11 @@ impl VMValueCast<IntegerValue> for Value {
     fn cast(self) -> PartialVMResult<IntegerValue> {
         match self.0 {
             ValueImpl::U8(x) => Ok(IntegerValue::U8(x)),
+            ValueImpl::U16(x) => Ok(IntegerValue::U16(x)),
+            ValueImpl::U32(x) => Ok(IntegerValue::U32(x)),
             ValueImpl::U64(x) => Ok(IntegerValue::U64(x)),
             ValueImpl::U128(x) => Ok(IntegerValue::U128(x)),
+            ValueImpl::U256(x) => Ok(IntegerValue::U256(x)),
             v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
                 .with_message(format!("cannot cast {:?} to integer", v,))),
         }
@@ -1138,6 +1289,43 @@ impl VMValueCast<Vec<u8>> for Value {
     }
 }
 
+impl VMValueCast<Vec<u64>> for Value {
+    fn cast(self) -> PartialVMResult<Vec<u64>> {
+        match self.0 {
+            ValueImpl::Container(Container::VecU64(r)) => take_unique_ownership(r),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to vector<u64>", v,))),
+        }
+    }
+}
+
+impl VMValueCast<Vec<Value>> for Value {
+    fn cast(self) -> PartialVMResult<Vec<Value>> {
+        match self.0 {
+            ValueImpl::Container(Container::Vec(c)) => {
+                Ok(take_unique_ownership(c)?.into_iter().map(Value).collect())
+            }
+            ValueImpl::Address(_)
+            | ValueImpl::Bool(_)
+            | ValueImpl::U8(_)
+            | ValueImpl::U16(_)
+            | ValueImpl::U32(_)
+            | ValueImpl::U64(_)
+            | ValueImpl::U128(_)
+            | ValueImpl::U256(_) => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(
+                    "cannot cast a specialized vector into a non-specialized one".to_string(),
+                )),
+            v => Err(
+                PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(format!(
+                    "cannot cast {:?} to vector<non-specialized-type>",
+                    v,
+                )),
+            ),
+        }
+    }
+}
+
 impl VMValueCast<SignerRef> for Value {
     fn cast(self) -> PartialVMResult<SignerRef> {
         match self.0 {
@@ -1187,6 +1375,26 @@ impl VMValueCast<u8> for IntegerValue {
     }
 }
 
+impl VMValueCast<u16> for IntegerValue {
+    fn cast(self) -> PartialVMResult<u16> {
+        match self {
+            Self::U16(x) => Ok(x),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to u16", v,))),
+        }
+    }
+}
+
+impl VMValueCast<u32> for IntegerValue {
+    fn cast(self) -> PartialVMResult<u32> {
+        match self {
+            Self::U32(x) => Ok(x),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to u32", v,))),
+        }
+    }
+}
+
 impl VMValueCast<u64> for IntegerValue {
     fn cast(self) -> PartialVMResult<u64> {
         match self {
@@ -1207,6 +1415,16 @@ impl VMValueCast<u128> for IntegerValue {
     }
 }
 
+impl VMValueCast<u256::U256> for IntegerValue {
+    fn cast(self) -> PartialVMResult<u256::U256> {
+        match self {
+            Self::U256(x) => Ok(x),
+            v => Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR)
+                .with_message(format!("cannot cast {:?} to u256", v,))),
+        }
+    }
+}
+
 impl IntegerValue {
     pub fn value_as<T>(self) -> PartialVMResult<T>
     where
@@ -1228,8 +1446,11 @@ impl IntegerValue {
         use IntegerValue::*;
         let res = match (self, other) {
             (U8(l), U8(r)) => u8::checked_add(l, r).map(IntegerValue::U8),
+            (U16(l), U16(r)) => u16::checked_add(l, r).map(IntegerValue::U16),
+            (U32(l), U32(r)) => u32::checked_add(l, r).map(IntegerValue::U32),
             (U64(l), U64(r)) => u64::checked_add(l, r).map(IntegerValue::U64),
             (U128(l), U128(r)) => u128::checked_add(l, r).map(IntegerValue::U128),
+            (U256(l), U256(r)) => u256::U256::checked_add(l, r).map(IntegerValue::U256),
             (l, r) => {
                 let msg = format!("Cannot add {:?} and {:?}", l, r);
                 return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
@@ -1242,8 +1463,11 @@ impl IntegerValue {
         use IntegerValue::*;
         let res = match (self, other) {
             (U8(l), U8(r)) => u8::checked_sub(l, r).map(IntegerValue::U8),
+            (U16(l), U16(r)) => u16::checked_sub(l, r).map(IntegerValue::U16),
+            (U32(l), U32(r)) => u32::checked_sub(l, r).map(IntegerValue::U32),
             (U64(l), U64(r)) => u64::checked_sub(l, r).map(IntegerValue::U64),
             (U128(l), U128(r)) => u128::checked_sub(l, r).map(IntegerValue::U128),
+            (U256(l), U256(r)) => u256::U256::checked_sub(l, r).map(IntegerValue::U256),
             (l, r) => {
                 let msg = format!("Cannot sub {:?} from {:?}", r, l);
                 return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
@@ -1256,8 +1480,11 @@ impl IntegerValue {
         use IntegerValue::*;
         let res = match (self, other) {
             (U8(l), U8(r)) => u8::checked_mul(l, r).map(IntegerValue::U8),
+            (U16(l), U16(r)) => u16::checked_mul(l, r).map(IntegerValue::U16),
+            (U32(l), U32(r)) => u32::checked_mul(l, r).map(IntegerValue::U32),
             (U64(l), U64(r)) => u64::checked_mul(l, r).map(IntegerValue::U64),
             (U128(l), U128(r)) => u128::checked_mul(l, r).map(IntegerValue::U128),
+            (U256(l), U256(r)) => u256::U256::checked_mul(l, r).map(IntegerValue::U256),
             (l, r) => {
                 let msg = format!("Cannot mul {:?} and {:?}", l, r);
                 return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
@@ -1270,8 +1497,11 @@ impl IntegerValue {
         use IntegerValue::*;
         let res = match (self, other) {
             (U8(l), U8(r)) => u8::checked_div(l, r).map(IntegerValue::U8),
+            (U16(l), U16(r)) => u16::checked_div(l, r).map(IntegerValue::U16),
+            (U32(l), U32(r)) => u32::checked_div(l, r).map(IntegerValue::U32),
             (U64(l), U64(r)) => u64::checked_div(l, r).map(IntegerValue::U64),
             (U128(l), U128(r)) => u128::checked_div(l, r).map(IntegerValue::U128),
+            (U256(l), U256(r)) => u256::U256::checked_div(l, r).map(IntegerValue::U256),
             (l, r) => {
                 let msg = format!("Cannot div {:?} by {:?}", l, r);
                 return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
@@ -1284,8 +1514,11 @@ impl IntegerValue {
         use IntegerValue::*;
         let res = match (self, other) {
             (U8(l), U8(r)) => u8::checked_rem(l, r).map(IntegerValue::U8),
+            (U16(l), U16(r)) => u16::checked_rem(l, r).map(IntegerValue::U16),
+            (U32(l), U32(r)) => u32::checked_rem(l, r).map(IntegerValue::U32),
             (U64(l), U64(r)) => u64::checked_rem(l, r).map(IntegerValue::U64),
             (U128(l), U128(r)) => u128::checked_rem(l, r).map(IntegerValue::U128),
+            (U256(l), U256(r)) => u256::U256::checked_rem(l, r).map(IntegerValue::U256),
             (l, r) => {
                 let msg = format!("Cannot rem {:?} by {:?}", l, r);
                 return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
@@ -1298,8 +1531,11 @@ impl IntegerValue {
         use IntegerValue::*;
         Ok(match (self, other) {
             (U8(l), U8(r)) => IntegerValue::U8(l | r),
+            (U16(l), U16(r)) => IntegerValue::U16(l | r),
+            (U32(l), U32(r)) => IntegerValue::U32(l | r),
             (U64(l), U64(r)) => IntegerValue::U64(l | r),
             (U128(l), U128(r)) => IntegerValue::U128(l | r),
+            (U256(l), U256(r)) => IntegerValue::U256(l | r),
             (l, r) => {
                 let msg = format!("Cannot bit_or {:?} and {:?}", l, r);
                 return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
@@ -1311,8 +1547,11 @@ impl IntegerValue {
         use IntegerValue::*;
         Ok(match (self, other) {
             (U8(l), U8(r)) => IntegerValue::U8(l & r),
+            (U16(l), U16(r)) => IntegerValue::U16(l & r),
+            (U32(l), U32(r)) => IntegerValue::U32(l & r),
             (U64(l), U64(r)) => IntegerValue::U64(l & r),
             (U128(l), U128(r)) => IntegerValue::U128(l & r),
+            (U256(l), U256(r)) => IntegerValue::U256(l & r),
             (l, r) => {
                 let msg = format!("Cannot bit_and {:?} and {:?}", l, r);
                 return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
@@ -1324,8 +1563,11 @@ impl IntegerValue {
         use IntegerValue::*;
         Ok(match (self, other) {
             (U8(l), U8(r)) => IntegerValue::U8(l ^ r),
+            (U16(l), U16(r)) => IntegerValue::U16(l ^ r),
+            (U32(l), U32(r)) => IntegerValue::U32(l ^ r),
             (U64(l), U64(r)) => IntegerValue::U64(l ^ r),
             (U128(l), U128(r)) => IntegerValue::U128(l ^ r),
+            (U256(l), U256(r)) => IntegerValue::U256(l ^ r),
             (l, r) => {
                 let msg = format!("Cannot bit_xor {:?} and {:?}", l, r);
                 return Err(PartialVMError::new(StatusCode::INTERNAL_TYPE_ERROR).with_message(msg));
@@ -1343,6 +1585,18 @@ impl IntegerValue {
                 }
                 IntegerValue::U8(x << n_bits)
             }
+            U16(x) => {
+                if n_bits >= 16 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U16(x << n_bits)
+            }
+            U32(x) => {
+                if n_bits >= 32 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U32(x << n_bits)
+            }
             U64(x) => {
                 if n_bits >= 64 {
                     return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
@@ -1355,6 +1609,7 @@ impl IntegerValue {
                 }
                 IntegerValue::U128(x << n_bits)
             }
+            U256(x) => IntegerValue::U256(x << n_bits),
         })
     }
 
@@ -1368,6 +1623,18 @@ impl IntegerValue {
                 }
                 IntegerValue::U8(x >> n_bits)
             }
+            U16(x) => {
+                if n_bits >= 16 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U16(x >> n_bits)
+            }
+            U32(x) => {
+                if n_bits >= 32 {
+                    return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
+                }
+                IntegerValue::U32(x >> n_bits)
+            }
             U64(x) => {
                 if n_bits >= 64 {
                     return Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR));
@@ -1380,6 +1647,7 @@ impl IntegerValue {
                 }
                 IntegerValue::U128(x >> n_bits)
             }
+            U256(x) => IntegerValue::U256(x >> n_bits),
         })
     }
 
@@ -1388,8 +1656,11 @@ impl IntegerValue {
 
         Ok(match (self, other) {
             (U8(l), U8(r)) => l < r,
+            (U16(l), U16(r)) => l < r,
+            (U32(l), U32(r)) => l < r,
             (U64(l), U64(r)) => l < r,
             (U128(l), U128(r)) => l < r,
+            (U256(l), U256(r)) => l < r,
             (l, r) => {
                 let msg = format!(
                     "Cannot compare {:?} and {:?}: incompatible integer types",
@@ -1405,8 +1676,11 @@ impl IntegerValue {
 
         Ok(match (self, other) {
             (U8(l), U8(r)) => l <= r,
+            (U16(l), U16(r)) => l <= r,
+            (U32(l), U32(r)) => l <= r,
             (U64(l), U64(r)) => l <= r,
             (U128(l), U128(r)) => l <= r,
+            (U256(l), U256(r)) => l <= r,
             (l, r) => {
                 let msg = format!(
                     "Cannot compare {:?} and {:?}: incompatible integer types",
@@ -1422,8 +1696,11 @@ impl IntegerValue {
 
         Ok(match (self, other) {
             (U8(l), U8(r)) => l > r,
+            (U16(l), U16(r)) => l > r,
+            (U32(l), U32(r)) => l > r,
             (U64(l), U64(r)) => l > r,
             (U128(l), U128(r)) => l > r,
+            (U256(l), U256(r)) => l > r,
             (l, r) => {
                 let msg = format!(
                     "Cannot compare {:?} and {:?}: incompatible integer types",
@@ -1439,8 +1716,11 @@ impl IntegerValue {
 
         Ok(match (self, other) {
             (U8(l), U8(r)) => l >= r,
+            (U16(l), U16(r)) => l >= r,
+            (U32(l), U32(r)) => l >= r,
             (U64(l), U64(r)) => l >= r,
             (U128(l), U128(r)) => l >= r,
+            (U256(l), U256(r)) => l >= r,
             (l, r) => {
                 let msg = format!(
                     "Cannot compare {:?} and {:?}: incompatible integer types",
@@ -1456,8 +1736,11 @@ impl IntegerValue {
 
         match self {
             U8(x) => Value::u8(x),
+            U16(x) => Value::u16(x),
+            U32(x) => Value::u32(x),
             U64(x) => Value::u64(x),
             U128(x) => Value::u128(x),
+            U256(x) => Value::u256(x),
         }
     }
 }
@@ -1468,6 +1751,22 @@ impl IntegerValue {
 
         match self {
             U8(x) => Ok(x),
+            U16(x) => {
+                if x > (std::u8::MAX as u16) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u16({}) to u8", x)))
+                } else {
+                    Ok(x as u8)
+                }
+            }
+            U32(x) => {
+                if x > (std::u8::MAX as u32) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u32({}) to u8", x)))
+                } else {
+                    Ok(x as u8)
+                }
+            }
             U64(x) => {
                 if x > (std::u8::MAX as u64) {
                     Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
@@ -1484,6 +1783,89 @@ impl IntegerValue {
                     Ok(x as u8)
                 }
             }
+            U256(x) => {
+                if x > (u256::U256::from(std::u8::MAX)) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u256({}) to u8", x)))
+                } else {
+                    Ok(x.unchecked_as_u8())
+                }
+            }
+        }
+    }
+
+    pub fn cast_u16(self) -> PartialVMResult<u16> {
+        use IntegerValue::*;
+
+        match self {
+            U8(x) => Ok(x as u16),
+            U16(x) => Ok(x),
+            U32(x) => {
+                if x > (std::u16::MAX as u32) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u32({}) to u16", x)))
+                } else {
+                    Ok(x as u16)
+                }
+            }
+            U64(x) => {
+                if x > (std::u16::MAX as u64) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u64({}) to u16", x)))
+                } else {
+                    Ok(x as u16)
+                }
+            }
+            U128(x) => {
+                if x > (std::u16::MAX as u128) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u128({}) to u16", x)))
+                } else {
+                    Ok(x as u16)
+                }
+            }
+            U256(x) => {
+                if x > (u256::U256::from(std::u16::MAX)) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u256({}) to u16", x)))
+                } else {
+                    Ok(x.unchecked_as_u16())
+                }
+            }
+        }
+    }
+
+    pub fn cast_u32(self) -> PartialVMResult<u32> {
+        use IntegerValue::*;
+
+        match self {
+            U8(x) => Ok(x as u32),
+            U16(x) => Ok(x as u32),
+            U32(x) => Ok(x),
+            U64(x) => {
+                if x > (std::u32::MAX as u64) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u64({}) to u32", x)))
+                } else {
+                    Ok(x as u32)
+                }
+            }
+            U128(x) => {
+                if x > (std::u32::MAX as u128) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u128({}) to u32", x)))
+                } else {
+                    Ok(x as u32)
+                }
+            }
+            U256(x) => {
+                if x > (u256::U256::from(std::u32::MAX)) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u128({}) to u32", x)))
+                } else {
+                    Ok(x.unchecked_as_u32())
+                }
+            }
         }
     }
 
@@ -1492,6 +1874,8 @@ impl IntegerValue {
 
         match self {
             U8(x) => Ok(x as u64),
+            U16(x) => Ok(x as u64),
+            U32(x) => Ok(x as u64),
             U64(x) => Ok(x),
             U128(x) => {
                 if x > (std::u64::MAX as u128) {
@@ -1501,16 +1885,47 @@ impl IntegerValue {
                     Ok(x as u64)
                 }
             }
+            U256(x) => {
+                if x > (u256::U256::from(std::u64::MAX)) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u256({}) to u64", x)))
+                } else {
+                    Ok(x.unchecked_as_u64())
+                }
+            }
         }
     }
 
     pub fn cast_u128(self) -> PartialVMResult<u128> {
         use IntegerValue::*;
 
+        match self {
+            U8(x) => Ok(x as u128),
+            U16(x) => Ok(x as u128),
+            U32(x) => Ok(x as u128),
+            U64(x) => Ok(x as u128),
+            U128(x) => Ok(x),
+            U256(x) => {
+                if x > (u256::U256::from(std::u128::MAX)) {
+                    Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
+                        .with_message(format!("Cannot cast u256({}) to u128", x)))
+                } else {
+                    Ok(x.unchecked_as_u128())
+                }
+            }
+        }
+    }
+
+    pub fn cast_u256(self) -> PartialVMResult<u256::U256> {
+        use IntegerValue::*;
+
         Ok(match self {
-            U8(x) => x as u128,
-            U64(x) => x as u128,
-            U128(x) => x,
+            U8(x) => u256::U256::from(x),
+            U16(x) => u256::U256::from(x),
+            U32(x) => u256::U256::from(x),
+            U64(x) => u256::U256::from(x),
+            U128(x) => u256::U256::from(x),
+            U256(x) => x,
         })
     }
 }
@@ -1531,7 +1946,10 @@ fn check_elem_layout(ty: &Type, v: &Container) -> PartialVMResult<()> {
     match (ty, v) {
         (Type::U8, Container::VecU8(_))
         | (Type::U64, Container::VecU64(_))
+        | (Type::U16, Container::VecU16(_))
+        | (Type::U32, Container::VecU32(_))
         | (Type::U128, Container::VecU128(_))
+        | (Type::U256, Container::VecU256(_))
         | (Type::Bool, Container::VecBool(_))
         | (Type::Address, Container::VecAddress(_))
         | (Type::Signer, Container::Struct(_)) => Ok(()),
@@ -1549,7 +1967,10 @@ fn check_elem_layout(ty: &Type, v: &Container) -> PartialVMResult<()> {
 
         (Type::U8, _)
         | (Type::U64, _)
+        | (Type::U16, _)
+        | (Type::U32, _)
         | (Type::U128, _)
+        | (Type::U256, _)
         | (Type::Bool, _)
         | (Type::Address, _)
         | (Type::Signer, _)
@@ -1572,8 +1993,11 @@ impl VectorRef {
 
         let len = match c {
             Container::VecU8(r) => r.borrow().len(),
+            Container::VecU16(r) => r.borrow().len(),
+            Container::VecU32(r) => r.borrow().len(),
             Container::VecU64(r) => r.borrow().len(),
             Container::VecU128(r) => r.borrow().len(),
+            Container::VecU256(r) => r.borrow().len(),
             Container::VecBool(r) => r.borrow().len(),
             Container::VecAddress(r) => r.borrow().len(),
             Container::Vec(r) => r.borrow().len(),
@@ -1588,8 +2012,11 @@ impl VectorRef {
 
         match c {
             Container::VecU8(r) => r.borrow_mut().push(e.value_as()?),
+            Container::VecU16(r) => r.borrow_mut().push(e.value_as()?),
+            Container::VecU32(r) => r.borrow_mut().push(e.value_as()?),
             Container::VecU64(r) => r.borrow_mut().push(e.value_as()?),
             Container::VecU128(r) => r.borrow_mut().push(e.value_as()?),
+            Container::VecU256(r) => r.borrow_mut().push(e.value_as()?),
             Container::VecBool(r) => r.borrow_mut().push(e.value_as()?),
             Container::VecAddress(r) => r.borrow_mut().push(e.value_as()?),
             Container::Vec(r) => r.borrow_mut().push(e.0),
@@ -1610,6 +2037,15 @@ impl VectorRef {
         Ok(Value(self.0.borrow_elem(idx)?))
     }
 
+    /// Returns a RefCell reference to the underlying vector of a `&vector<u8>` value.
+    pub fn as_bytes_ref(&self) -> std::cell::Ref<'_, Vec<u8>> {
+        let c = self.0.container();
+        match c {
+            Container::VecU8(r) => r.borrow(),
+            _ => panic!("can only be called on vector<u8>"),
+        }
+    }
+
     pub fn pop(&self, type_param: &Type) -> PartialVMResult<Value> {
         let c = self.0.container();
         check_elem_layout(type_param, c)?;
@@ -1626,6 +2062,14 @@ impl VectorRef {
                 Some(x) => Value::u8(x),
                 None => err_pop_empty_vec!(),
             },
+            Container::VecU16(r) => match r.borrow_mut().pop() {
+                Some(x) => Value::u16(x),
+                None => err_pop_empty_vec!(),
+            },
+            Container::VecU32(r) => match r.borrow_mut().pop() {
+                Some(x) => Value::u32(x),
+                None => err_pop_empty_vec!(),
+            },
             Container::VecU64(r) => match r.borrow_mut().pop() {
                 Some(x) => Value::u64(x),
                 None => err_pop_empty_vec!(),
@@ -1634,6 +2078,10 @@ impl VectorRef {
                 Some(x) => Value::u128(x),
                 None => err_pop_empty_vec!(),
             },
+            Container::VecU256(r) => match r.borrow_mut().pop() {
+                Some(x) => Value::u256(x),
+                None => err_pop_empty_vec!(),
+            },
             Container::VecBool(r) => match r.borrow_mut().pop() {
                 Some(x) => Value::bool(x),
                 None => err_pop_empty_vec!(),
@@ -1670,8 +2118,11 @@ impl VectorRef {
 
         match c {
             Container::VecU8(r) => swap!(r),
+            Container::VecU16(r) => swap!(r),
+            Container::VecU32(r) => swap!(r),
             Container::VecU64(r) => swap!(r),
             Container::VecU128(r) => swap!(r),
+            Container::VecU256(r) => swap!(r),
             Container::VecBool(r) => swap!(r),
             Container::VecAddress(r) => swap!(r),
             Container::Vec(r) => swap!(r),
@@ -1692,6 +2143,18 @@ impl Vector {
                     .map(|v| v.value_as())
                     .collect::<PartialVMResult<Vec<_>>>()?,
             ),
+            Type::U16 => Value::vector_u16(
+                elements
+                    .into_iter()
+                    .map(|v| v.value_as())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            ),
+            Type::U32 => Value::vector_u32(
+                elements
+                    .into_iter()
+                    .map(|v| v.value_as())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            ),
             Type::U64 => Value::vector_u64(
                 elements
                     .into_iter()
@@ -1704,6 +2167,12 @@ impl Vector {
                     .map(|v| v.value_as())
                     .collect::<PartialVMResult<Vec<_>>>()?,
             ),
+            Type::U256 => Value::vector_u256(
+                elements
+                    .into_iter()
+                    .map(|v| v.value_as())
+                    .collect::<PartialVMResult<Vec<_>>>()?,
+            ),
             Type::Bool => Value::vector_bool(
                 elements
                     .into_iter()
@@ -1745,6 +2214,14 @@ impl Vector {
                 .into_iter()
                 .map(Value::u8)
                 .collect(),
+            Container::VecU16(r) => take_unique_ownership(r)?
+                .into_iter()
+                .map(Value::u16)
+                .collect(),
+            Container::VecU32(r) => take_unique_ownership(r)?
+                .into_iter()
+                .map(Value::u32)
+                .collect(),
             Container::VecU64(r) => take_unique_ownership(r)?
                 .into_iter()
                 .map(Value::u64)
@@ -1753,6 +2230,10 @@ impl Vector {
                 .into_iter()
                 .map(Value::u128)
                 .collect(),
+            Container::VecU256(r) => take_unique_ownership(r)?
+                .into_iter()
+                .map(Value::u256)
+                .collect(),
             Container::VecBool(r) => take_unique_ownership(r)?
                 .into_iter()
                 .map(Value::bool)
@@ -1792,101 +2273,127 @@ impl Vector {
 
 /***************************************************************************************
  *
- * Gas
+ * Abstract Memory Size
  *
- *   Abstract memory sizes of the VM values.
+ *   TODO(Gas): This is the oldest implementation of abstract memory size.
+ *              It is now kept only as a reference impl, which is used to ensure
+ *              the new implementation is fully backward compatible.
+ *              We should be able to get this removed after we use the new impl
+ *              for a while and gain enough confidence in that.
  *
  **************************************************************************************/
 
+/// The size in bytes for a non-string or address constant on the stack
+pub(crate) const LEGACY_CONST_SIZE: AbstractMemorySize = AbstractMemorySize::new(16);
+
+/// The size in bytes for a reference on the stack
+pub(crate) const LEGACY_REFERENCE_SIZE: AbstractMemorySize = AbstractMemorySize::new(8);
+
+/// The size of a struct in bytes
+pub(crate) const LEGACY_STRUCT_SIZE: AbstractMemorySize = AbstractMemorySize::new(2);
+
 impl Container {
-    fn size(&self) -> AbstractMemorySize<GasCarrier> {
+    #[cfg(test)]
+    fn legacy_size(&self) -> AbstractMemorySize {
         match self {
-            Self::Locals(r) | Self::Vec(r) | Self::Struct(r) => Struct::size_impl(&*r.borrow()),
-            Self::VecU8(r) => AbstractMemorySize::new((r.borrow().len() * size_of::<u8>()) as u64),
+            Self::Locals(r) | Self::Vec(r) | Self::Struct(r) => {
+                Struct::legacy_size_impl(&r.borrow())
+            }
+            Self::VecU8(r) => {
+                AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::<u8>()) as u64)
+            }
+            Self::VecU16(r) => {
+                AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::<u16>()) as u64)
+            }
+            Self::VecU32(r) => {
+                AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::<u32>()) as u64)
+            }
             Self::VecU64(r) => {
-                AbstractMemorySize::new((r.borrow().len() * size_of::<u64>()) as u64)
+                AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::<u64>()) as u64)
             }
             Self::VecU128(r) => {
-                AbstractMemorySize::new((r.borrow().len() * size_of::<u128>()) as u64)
+                AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::<u128>()) as u64)
             }
+            Self::VecU256(r) => AbstractMemorySize::new(
+                (r.borrow().len() * std::mem::size_of::<u256::U256>()) as u64,
+            ),
             Self::VecBool(r) => {
-                AbstractMemorySize::new((r.borrow().len() * size_of::<bool>()) as u64)
-            }
-            Self::VecAddress(r) => {
-                AbstractMemorySize::new((r.borrow().len() * size_of::<AccountAddress>()) as u64)
+                AbstractMemorySize::new((r.borrow().len() * std::mem::size_of::<bool>()) as u64)
             }
+            Self::VecAddress(r) => AbstractMemorySize::new(
+                (r.borrow().len() * std::mem::size_of::<AccountAddress>()) as u64,
+            ),
         }
     }
 }
 
 impl ContainerRef {
-    fn size(&self) -> AbstractMemorySize<GasCarrier> {
-        REFERENCE_SIZE
+    #[cfg(test)]
+    fn legacy_size(&self) -> AbstractMemorySize {
+        LEGACY_REFERENCE_SIZE
     }
 }
 
 impl IndexedRef {
-    fn size(&self) -> AbstractMemorySize<GasCarrier> {
-        REFERENCE_SIZE
+    #[cfg(test)]
+    fn legacy_size(&self) -> AbstractMemorySize {
+        LEGACY_REFERENCE_SIZE
     }
 }
 
 impl ValueImpl {
-    fn size(&self) -> AbstractMemorySize<GasCarrier> {
+    #[cfg(test)]
+    fn legacy_size(&self) -> AbstractMemorySize {
         use ValueImpl::*;
 
         match self {
-            Invalid | U8(_) | U64(_) | U128(_) | Bool(_) => CONST_SIZE,
+            Invalid | U8(_) | U16(_) | U32(_) | U64(_) | U128(_) | U256(_) | Bool(_) => {
+                LEGACY_CONST_SIZE
+            }
             Address(_) => AbstractMemorySize::new(AccountAddress::LENGTH as u64),
-            ContainerRef(r) => r.size(),
-            IndexedRef(r) => r.size(),
+            ContainerRef(r) => r.legacy_size(),
+            IndexedRef(r) => r.legacy_size(),
             // TODO: in case the borrow fails the VM will panic.
-            Container(c) => c.size(),
+            Container(c) => c.legacy_size(),
         }
     }
 }
 
 impl Struct {
-    fn size_impl(fields: &[ValueImpl]) -> AbstractMemorySize<GasCarrier> {
+    #[cfg(test)]
+    fn legacy_size_impl(fields: &[ValueImpl]) -> AbstractMemorySize {
         fields
             .iter()
-            .fold(STRUCT_SIZE, |acc, v| acc.map2(v.size(), Add::add))
+            .fold(LEGACY_STRUCT_SIZE, |acc, v| acc + v.legacy_size())
     }
 
-    pub fn size(&self) -> AbstractMemorySize<GasCarrier> {
-        Self::size_impl(&self.fields)
+    #[cfg(test)]
+    pub(crate) fn legacy_size(&self) -> AbstractMemorySize {
+        Self::legacy_size_impl(&self.fields)
     }
 }
 
 impl Value {
-    pub fn size(&self) -> AbstractMemorySize<GasCarrier> {
-        self.0.size()
+    #[cfg(test)]
+    pub(crate) fn legacy_size(&self) -> AbstractMemorySize {
+        self.0.legacy_size()
     }
 }
 
 impl ReferenceImpl {
-    fn size(&self) -> AbstractMemorySize<GasCarrier> {
+    #[cfg(test)]
+    fn legacy_size(&self) -> AbstractMemorySize {
         match self {
-            Self::ContainerRef(r) => r.size(),
-            Self::IndexedRef(r) => r.size(),
+            Self::ContainerRef(r) => r.legacy_size(),
+            Self::IndexedRef(r) => r.legacy_size(),
         }
     }
 }
 
 impl Reference {
-    pub fn size(&self) -> AbstractMemorySize<GasCarrier> {
-        self.0.size()
-    }
-}
-
-impl GlobalValue {
-    pub fn size(&self) -> AbstractMemorySize<GasCarrier> {
-        // REVIEW: this doesn't seem quite right. Consider changing it to
-        // a constant positive size or better, something proportional to the size of the value.
-        match &self.0 {
-            GlobalValueImpl::Fresh { .. } | GlobalValueImpl::Cached { .. } => REFERENCE_SIZE,
-            GlobalValueImpl::Deleted | GlobalValueImpl::None => MIN_EXISTS_DATA_SIZE,
-        }
+    #[cfg(test)]
+    pub(crate) fn legacy_size(&self) -> AbstractMemorySize {
+        self.0.legacy_size()
     }
 }
 
@@ -1920,26 +2427,31 @@ impl Struct {
  **************************************************************************************/
 #[allow(clippy::unnecessary_wraps)]
 impl GlobalValueImpl {
-    fn cached(val: ValueImpl, status: GlobalDataStatus) -> PartialVMResult<Self> {
+    fn cached(
+        val: ValueImpl,
+        status: GlobalDataStatus,
+    ) -> Result<Self, (PartialVMError, ValueImpl)> {
         match val {
             ValueImpl::Container(Container::Struct(fields)) => {
                 let status = Rc::new(RefCell::new(status));
                 Ok(Self::Cached { fields, status })
             }
-            _ => Err(
+            val => Err((
                 PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
                     .with_message("failed to publish cached: not a resource".to_string()),
-            ),
+                val,
+            )),
         }
     }
 
-    fn fresh(val: ValueImpl) -> PartialVMResult<Self> {
+    fn fresh(val: ValueImpl) -> Result<Self, (PartialVMError, ValueImpl)> {
         match val {
             ValueImpl::Container(Container::Struct(fields)) => Ok(Self::Fresh { fields }),
-            _ => Err(
+            val => Err((
                 PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
                     .with_message("failed to publish fresh: not a resource".to_string()),
-            ),
+                val,
+            )),
         }
     }
 
@@ -1966,10 +2478,13 @@ impl GlobalValueImpl {
         Ok(ValueImpl::Container(Container::Struct(fields)))
     }
 
-    fn move_to(&mut self, val: ValueImpl) -> PartialVMResult<()> {
+    fn move_to(&mut self, val: ValueImpl) -> Result<(), (PartialVMError, ValueImpl)> {
         match self {
             Self::Fresh { .. } | Self::Cached { .. } => {
-                return Err(PartialVMError::new(StatusCode::RESOURCE_ALREADY_EXISTS))
+                return Err((
+                    PartialVMError::new(StatusCode::RESOURCE_ALREADY_EXISTS),
+                    val,
+                ))
             }
             Self::None => *self = Self::fresh(val)?,
             Self::Deleted => *self = Self::cached(val, GlobalDataStatus::Dirty)?,
@@ -1997,20 +2512,20 @@ impl GlobalValueImpl {
         }
     }
 
-    fn into_effect(self) -> PartialVMResult<GlobalValueEffect<ValueImpl>> {
-        Ok(match self {
-            Self::None => GlobalValueEffect::None,
-            Self::Deleted => GlobalValueEffect::Deleted,
+    fn into_effect(self) -> Option<Op<ValueImpl>> {
+        match self {
+            Self::None => None,
+            Self::Deleted => Some(Op::Delete),
             Self::Fresh { fields } => {
-                GlobalValueEffect::Changed(ValueImpl::Container(Container::Struct(fields)))
+                Some(Op::New(ValueImpl::Container(Container::Struct(fields))))
             }
             Self::Cached { fields, status } => match &*status.borrow() {
                 GlobalDataStatus::Dirty => {
-                    GlobalValueEffect::Changed(ValueImpl::Container(Container::Struct(fields)))
+                    Some(Op::Modify(ValueImpl::Container(Container::Struct(fields))))
                 }
-                GlobalDataStatus::Clean => GlobalValueEffect::None,
+                GlobalDataStatus::Clean => None,
             },
-        })
+        }
     }
 
     fn is_mutated(&self) -> bool {
@@ -2032,18 +2547,19 @@ impl GlobalValue {
     }
 
     pub fn cached(val: Value) -> PartialVMResult<Self> {
-        Ok(Self(GlobalValueImpl::cached(
-            val.0,
-            GlobalDataStatus::Clean,
-        )?))
+        Ok(Self(
+            GlobalValueImpl::cached(val.0, GlobalDataStatus::Clean).map_err(|(err, _val)| err)?,
+        ))
     }
 
     pub fn move_from(&mut self) -> PartialVMResult<Value> {
         Ok(Value(self.0.move_from()?))
     }
 
-    pub fn move_to(&mut self, val: Value) -> PartialVMResult<()> {
-        self.0.move_to(val.0)
+    pub fn move_to(&mut self, val: Value) -> Result<(), (PartialVMError, Value)> {
+        self.0
+            .move_to(val.0)
+            .map_err(|(err, val)| (err, Value(val)))
     }
 
     pub fn borrow_global(&self) -> PartialVMResult<Value> {
@@ -2054,12 +2570,8 @@ impl GlobalValue {
         self.0.exists()
     }
 
-    pub fn into_effect(self) -> PartialVMResult<GlobalValueEffect<Value>> {
-        Ok(match self.0.into_effect()? {
-            GlobalValueEffect::None => GlobalValueEffect::None,
-            GlobalValueEffect::Deleted => GlobalValueEffect::Deleted,
-            GlobalValueEffect::Changed(v) => GlobalValueEffect::Changed(Value(v)),
-        })
+    pub fn into_effect(self) -> Option<Op<Value>> {
+        self.0.into_effect().map(|op| op.map(Value))
     }
 
     pub fn is_mutated(&self) -> bool {
@@ -2082,8 +2594,11 @@ impl Display for ValueImpl {
             Self::Invalid => write!(f, "Invalid"),
 
             Self::U8(x) => write!(f, "U8({})", x),
+            Self::U16(x) => write!(f, "U16({})", x),
+            Self::U32(x) => write!(f, "U32({})", x),
             Self::U64(x) => write!(f, "U64({})", x),
             Self::U128(x) => write!(f, "U128({})", x),
+            Self::U256(x) => write!(f, "U256({})", x),
             Self::Bool(x) => write!(f, "{}", x),
             Self::Address(addr) => write!(f, "Address({})", addr.short_str_lossless()),
 
@@ -2111,16 +2626,41 @@ where
     write!(f, "]")
 }
 
+impl Container {
+    fn raw_address(&self) -> usize {
+        use Container::*;
+
+        match self {
+            Locals(r) => r.as_ptr() as usize,
+            Vec(r) => r.as_ptr() as usize,
+            Struct(r) => r.as_ptr() as usize,
+            VecU8(r) => r.as_ptr() as usize,
+            VecU16(r) => r.as_ptr() as usize,
+            VecU32(r) => r.as_ptr() as usize,
+            VecU64(r) => r.as_ptr() as usize,
+            VecU128(r) => r.as_ptr() as usize,
+            VecU256(r) => r.as_ptr() as usize,
+            VecBool(r) => r.as_ptr() as usize,
+            VecAddress(r) => r.as_ptr() as usize,
+        }
+    }
+}
+
+impl Locals {
+    pub fn raw_address(&self) -> usize {
+        self.0.as_ptr() as usize
+    }
+}
+
 impl Display for ContainerRef {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            Self::Local(c) => write!(f, "({}, {})", c.rc_count(), c),
+            Self::Local(c) => write!(f, "(&container {:x})", c.raw_address()),
             Self::Global { status, container } => write!(
                 f,
-                "({:?}, {}, {})",
+                "(&container {:x} -- {:?})",
+                container.raw_address(),
                 &*status.borrow(),
-                container.rc_count(),
-                container
             ),
         }
     }
@@ -2128,22 +2668,29 @@ impl Display for ContainerRef {
 
 impl Display for IndexedRef {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}<{}>", self.container_ref, self.idx)
+        write!(f, "{}[{}]", self.container_ref, self.idx)
     }
 }
 
 impl Display for Container {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "(container {:x}: ", self.raw_address())?;
+
         match self {
             Self::Locals(r) | Self::Vec(r) | Self::Struct(r) => {
                 display_list_of_items(r.borrow().iter(), f)
             }
             Self::VecU8(r) => display_list_of_items(r.borrow().iter(), f),
+            Self::VecU16(r) => display_list_of_items(r.borrow().iter(), f),
+            Self::VecU32(r) => display_list_of_items(r.borrow().iter(), f),
             Self::VecU64(r) => display_list_of_items(r.borrow().iter(), f),
             Self::VecU128(r) => display_list_of_items(r.borrow().iter(), f),
+            Self::VecU256(r) => display_list_of_items(r.borrow().iter(), f),
             Self::VecBool(r) => display_list_of_items(r.borrow().iter(), f),
             Self::VecAddress(r) => display_list_of_items(r.borrow().iter(), f),
-        }
+        }?;
+
+        write!(f, ")")
     }
 }
 
@@ -2182,6 +2729,14 @@ pub mod debug {
         debug_write!(buf, "{}", x)
     }
 
+    fn print_u16<B: Write>(buf: &mut B, x: &u16) -> PartialVMResult<()> {
+        debug_write!(buf, "{}", x)
+    }
+
+    fn print_u32<B: Write>(buf: &mut B, x: &u32) -> PartialVMResult<()> {
+        debug_write!(buf, "{}", x)
+    }
+
     fn print_u64<B: Write>(buf: &mut B, x: &u64) -> PartialVMResult<()> {
         debug_write!(buf, "{}", x)
     }
@@ -2190,6 +2745,10 @@ pub mod debug {
         debug_write!(buf, "{}", x)
     }
 
+    fn print_u256<B: Write>(buf: &mut B, x: &u256::U256) -> PartialVMResult<()> {
+        debug_write!(buf, "{}", x)
+    }
+
     fn print_bool<B: Write>(buf: &mut B, x: &bool) -> PartialVMResult<()> {
         debug_write!(buf, "{}", x)
     }
@@ -2203,8 +2762,11 @@ pub mod debug {
             ValueImpl::Invalid => print_invalid(buf),
 
             ValueImpl::U8(x) => print_u8(buf, x),
+            ValueImpl::U16(x) => print_u16(buf, x),
+            ValueImpl::U32(x) => print_u32(buf, x),
             ValueImpl::U64(x) => print_u64(buf, x),
             ValueImpl::U128(x) => print_u128(buf, x),
+            ValueImpl::U256(x) => print_u256(buf, x),
             ValueImpl::Bool(x) => print_bool(buf, x),
             ValueImpl::Address(x) => print_address(buf, x),
 
@@ -2250,8 +2812,11 @@ pub mod debug {
             }
 
             Container::VecU8(r) => print_list(buf, "[", r.borrow().iter(), print_u8, "]"),
+            Container::VecU16(r) => print_list(buf, "[", r.borrow().iter(), print_u16, "]"),
+            Container::VecU32(r) => print_list(buf, "[", r.borrow().iter(), print_u32, "]"),
             Container::VecU64(r) => print_list(buf, "[", r.borrow().iter(), print_u64, "]"),
             Container::VecU128(r) => print_list(buf, "[", r.borrow().iter(), print_u128, "]"),
+            Container::VecU256(r) => print_list(buf, "[", r.borrow().iter(), print_u256, "]"),
             Container::VecBool(r) => print_list(buf, "[", r.borrow().iter(), print_bool, "]"),
             Container::VecAddress(r) => print_list(buf, "[", r.borrow().iter(), print_address, "]"),
 
@@ -2285,17 +2850,21 @@ pub mod debug {
         let idx = r.idx;
         match r.container_ref.container() {
             Container::Locals(r) | Container::Vec(r) | Container::Struct(r) => {
-                print_slice_elem(buf, &*r.borrow(), idx, print_value_impl)
+                print_slice_elem(buf, &r.borrow(), idx, print_value_impl)
             }
 
-            Container::VecU8(r) => print_slice_elem(buf, &*r.borrow(), idx, print_u8),
-            Container::VecU64(r) => print_slice_elem(buf, &*r.borrow(), idx, print_u64),
-            Container::VecU128(r) => print_slice_elem(buf, &*r.borrow(), idx, print_u128),
-            Container::VecBool(r) => print_slice_elem(buf, &*r.borrow(), idx, print_bool),
-            Container::VecAddress(r) => print_slice_elem(buf, &*r.borrow(), idx, print_address),
+            Container::VecU8(r) => print_slice_elem(buf, &r.borrow(), idx, print_u8),
+            Container::VecU16(r) => print_slice_elem(buf, &r.borrow(), idx, print_u16),
+            Container::VecU32(r) => print_slice_elem(buf, &r.borrow(), idx, print_u32),
+            Container::VecU64(r) => print_slice_elem(buf, &r.borrow(), idx, print_u64),
+            Container::VecU128(r) => print_slice_elem(buf, &r.borrow(), idx, print_u128),
+            Container::VecU256(r) => print_slice_elem(buf, &r.borrow(), idx, print_u256),
+            Container::VecBool(r) => print_slice_elem(buf, &r.borrow(), idx, print_bool),
+            Container::VecAddress(r) => print_slice_elem(buf, &r.borrow(), idx, print_address),
         }
     }
 
+    // TODO: This function was used in an old implementation of std::debug::print, and can probably be removed.
     pub fn print_reference<B: Write>(buf: &mut B, r: &Reference) -> PartialVMResult<()> {
         match &r.0 {
             ReferenceImpl::ContainerRef(r) => print_container_ref(buf, r),
@@ -2386,8 +2955,11 @@ impl<'a, 'b> serde::Serialize for AnnotatedValue<'a, 'b, MoveTypeLayout, ValueIm
     fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
         match (self.layout, self.val) {
             (MoveTypeLayout::U8, ValueImpl::U8(x)) => serializer.serialize_u8(*x),
+            (MoveTypeLayout::U16, ValueImpl::U16(x)) => serializer.serialize_u16(*x),
+            (MoveTypeLayout::U32, ValueImpl::U32(x)) => serializer.serialize_u32(*x),
             (MoveTypeLayout::U64, ValueImpl::U64(x)) => serializer.serialize_u64(*x),
             (MoveTypeLayout::U128, ValueImpl::U128(x)) => serializer.serialize_u128(*x),
+            (MoveTypeLayout::U256, ValueImpl::U256(x)) => x.serialize(serializer),
             (MoveTypeLayout::Bool, ValueImpl::Bool(x)) => serializer.serialize_bool(*x),
             (MoveTypeLayout::Address, ValueImpl::Address(x)) => x.serialize(serializer),
 
@@ -2403,10 +2975,15 @@ impl<'a, 'b> serde::Serialize for AnnotatedValue<'a, 'b, MoveTypeLayout, ValueIm
                 let layout = &**layout;
                 match (layout, c) {
                     (MoveTypeLayout::U8, Container::VecU8(r)) => r.borrow().serialize(serializer),
+                    (MoveTypeLayout::U16, Container::VecU16(r)) => r.borrow().serialize(serializer),
+                    (MoveTypeLayout::U32, Container::VecU32(r)) => r.borrow().serialize(serializer),
                     (MoveTypeLayout::U64, Container::VecU64(r)) => r.borrow().serialize(serializer),
                     (MoveTypeLayout::U128, Container::VecU128(r)) => {
                         r.borrow().serialize(serializer)
                     }
+                    (MoveTypeLayout::U256, Container::VecU256(r)) => {
+                        r.borrow().serialize(serializer)
+                    }
                     (MoveTypeLayout::Bool, Container::VecBool(r)) => {
                         r.borrow().serialize(serializer)
                     }
@@ -2491,8 +3068,11 @@ impl<'d> serde::de::DeserializeSeed<'d> for SeedWrapper<&MoveTypeLayout> {
         match self.layout {
             L::Bool => bool::deserialize(deserializer).map(Value::bool),
             L::U8 => u8::deserialize(deserializer).map(Value::u8),
+            L::U16 => u16::deserialize(deserializer).map(Value::u16),
+            L::U32 => u32::deserialize(deserializer).map(Value::u32),
             L::U64 => u64::deserialize(deserializer).map(Value::u64),
             L::U128 => u128::deserialize(deserializer).map(Value::u128),
+            L::U256 => u256::U256::deserialize(deserializer).map(Value::u256),
             L::Address => AccountAddress::deserialize(deserializer).map(Value::address),
             L::Signer => AccountAddress::deserialize(deserializer).map(Value::signer),
 
@@ -2508,12 +3088,21 @@ impl<'d> serde::de::DeserializeSeed<'d> for SeedWrapper<&MoveTypeLayout> {
                     L::U8 => {
                         Container::VecU8(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
                     }
+                    L::U16 => {
+                        Container::VecU16(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
+                    }
+                    L::U32 => {
+                        Container::VecU32(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
+                    }
                     L::U64 => {
                         Container::VecU64(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
                     }
                     L::U128 => {
                         Container::VecU128(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
                     }
+                    L::U256 => {
+                        Container::VecU256(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
+                    }
                     L::Bool => {
                         Container::VecBool(Rc::new(RefCell::new(Vec::deserialize(deserializer)?)))
                     }
@@ -2598,7 +3187,7 @@ impl<'d, 'a> serde::de::Visitor<'d> for StructFieldVisitor<'a> {
 *
 * Constants
 *
-*   Implementation of deseserialization of constant data into a runtime value
+*   Implementation of deserialization of constant data into a runtime value
 *
 **************************************************************************************/
 
@@ -2610,8 +3199,11 @@ impl Value {
         Some(match constant_signature {
             S::Bool => L::Bool,
             S::U8 => L::U8,
+            S::U16 => L::U16,
+            S::U32 => L::U32,
             S::U64 => L::U64,
             S::U128 => L::U128,
+            S::U256 => L::U256,
             S::Address => L::Address,
             S::Signer => return None,
             S::Vector(inner) => L::Vector(Box::new(Self::constant_sig_token_to_layout(inner)?)),
@@ -2628,6 +3220,277 @@ impl Value {
     }
 }
 
+/***************************************************************************************
+*
+* Destructors
+*
+**************************************************************************************/
+// Locals may contain reference values that points to the same cotnainer through Rc, hencing forming
+// a cycle. Therefore values need to be manually taken out of the Locals in order to not leak memory.
+impl Drop for Locals {
+    fn drop(&mut self) {
+        _ = self.drop_all_values();
+    }
+}
+
+/***************************************************************************************
+*
+* Views
+*
+**************************************************************************************/
+impl Container {
+    fn visit_impl(&self, visitor: &mut impl ValueVisitor, depth: usize) {
+        use Container::*;
+
+        match self {
+            Locals(_) => unreachable!("Should not ba able to visit a Locals container directly"),
+            Vec(r) => {
+                let r = r.borrow();
+                if visitor.visit_vec(depth, r.len()) {
+                    for val in r.iter() {
+                        val.visit_impl(visitor, depth + 1);
+                    }
+                }
+            }
+            Struct(r) => {
+                let r = r.borrow();
+                if visitor.visit_struct(depth, r.len()) {
+                    for val in r.iter() {
+                        val.visit_impl(visitor, depth + 1);
+                    }
+                }
+            }
+            VecU8(r) => visitor.visit_vec_u8(depth, &r.borrow()),
+            VecU16(r) => visitor.visit_vec_u16(depth, &r.borrow()),
+            VecU32(r) => visitor.visit_vec_u32(depth, &r.borrow()),
+            VecU64(r) => visitor.visit_vec_u64(depth, &r.borrow()),
+            VecU128(r) => visitor.visit_vec_u128(depth, &r.borrow()),
+            VecU256(r) => visitor.visit_vec_u256(depth, &r.borrow()),
+            VecBool(r) => visitor.visit_vec_bool(depth, &r.borrow()),
+            VecAddress(r) => visitor.visit_vec_address(depth, &r.borrow()),
+        }
+    }
+
+    fn visit_indexed(&self, visitor: &mut impl ValueVisitor, depth: usize, idx: usize) {
+        use Container::*;
+
+        match self {
+            Locals(r) | Vec(r) | Struct(r) => r.borrow()[idx].visit_impl(visitor, depth + 1),
+            VecU8(vals) => visitor.visit_u8(depth + 1, vals.borrow()[idx]),
+            VecU16(vals) => visitor.visit_u16(depth + 1, vals.borrow()[idx]),
+            VecU32(vals) => visitor.visit_u32(depth + 1, vals.borrow()[idx]),
+            VecU64(vals) => visitor.visit_u64(depth + 1, vals.borrow()[idx]),
+            VecU128(vals) => visitor.visit_u128(depth + 1, vals.borrow()[idx]),
+            VecU256(vals) => visitor.visit_u256(depth + 1, vals.borrow()[idx]),
+            VecBool(vals) => visitor.visit_bool(depth + 1, vals.borrow()[idx]),
+            VecAddress(vals) => visitor.visit_address(depth + 1, vals.borrow()[idx]),
+        }
+    }
+}
+
+impl ContainerRef {
+    fn visit_impl(&self, visitor: &mut impl ValueVisitor, depth: usize) {
+        use ContainerRef::*;
+
+        let (container, is_global) = match self {
+            Local(container) => (container, false),
+            Global { container, .. } => (container, false),
+        };
+
+        if visitor.visit_ref(depth, is_global) {
+            container.visit_impl(visitor, depth + 1);
+        }
+    }
+}
+
+impl IndexedRef {
+    fn visit_impl(&self, visitor: &mut impl ValueVisitor, depth: usize) {
+        use ContainerRef::*;
+
+        let (container, is_global) = match &self.container_ref {
+            Local(container) => (container, false),
+            Global { container, .. } => (container, false),
+        };
+
+        if visitor.visit_ref(depth, is_global) {
+            container.visit_indexed(visitor, depth, self.idx)
+        }
+    }
+}
+
+impl ValueImpl {
+    fn visit_impl(&self, visitor: &mut impl ValueVisitor, depth: usize) {
+        use ValueImpl::*;
+
+        match self {
+            Invalid => unreachable!("Should not be able to visit an invalid value"),
+
+            U8(val) => visitor.visit_u8(depth, *val),
+            U16(val) => visitor.visit_u16(depth, *val),
+            U32(val) => visitor.visit_u32(depth, *val),
+            U64(val) => visitor.visit_u64(depth, *val),
+            U128(val) => visitor.visit_u128(depth, *val),
+            U256(val) => visitor.visit_u256(depth, *val),
+            Bool(val) => visitor.visit_bool(depth, *val),
+            Address(val) => visitor.visit_address(depth, *val),
+
+            Container(c) => c.visit_impl(visitor, depth),
+
+            ContainerRef(r) => r.visit_impl(visitor, depth),
+            IndexedRef(r) => r.visit_impl(visitor, depth),
+        }
+    }
+}
+
+impl ValueView for ValueImpl {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        self.visit_impl(visitor, 0)
+    }
+}
+
+impl ValueView for Value {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        self.0.visit(visitor)
+    }
+}
+
+impl ValueView for Struct {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        if visitor.visit_struct(0, self.fields.len()) {
+            for val in self.fields.iter() {
+                val.visit_impl(visitor, 1);
+            }
+        }
+    }
+}
+
+impl ValueView for Vector {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        self.0.visit_impl(visitor, 0)
+    }
+}
+
+impl ValueView for IntegerValue {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        use IntegerValue::*;
+
+        match self {
+            U8(val) => visitor.visit_u8(0, *val),
+            U16(val) => visitor.visit_u16(0, *val),
+            U32(val) => visitor.visit_u32(0, *val),
+            U64(val) => visitor.visit_u64(0, *val),
+            U128(val) => visitor.visit_u128(0, *val),
+            U256(val) => visitor.visit_u256(0, *val),
+        }
+    }
+}
+
+impl ValueView for Reference {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        use ReferenceImpl::*;
+
+        match &self.0 {
+            ContainerRef(r) => r.visit_impl(visitor, 0),
+            IndexedRef(r) => r.visit_impl(visitor, 0),
+        }
+    }
+}
+
+impl ValueView for VectorRef {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        self.0.visit_impl(visitor, 0)
+    }
+}
+
+impl ValueView for StructRef {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        self.0.visit_impl(visitor, 0)
+    }
+}
+
+impl ValueView for SignerRef {
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        self.0.visit_impl(visitor, 0)
+    }
+}
+
+// Note: We may want to add more helpers to retrieve value views behind references here.
+
+impl Struct {
+    #[allow(clippy::needless_lifetimes)]
+    pub fn field_views<'a>(&'a self) -> impl ExactSizeIterator<Item = impl ValueView + 'a> {
+        self.fields.iter()
+    }
+}
+
+impl Vector {
+    #[allow(clippy::needless_lifetimes)]
+    pub fn elem_views<'a>(&'a self) -> impl ExactSizeIterator<Item = impl ValueView + 'a> {
+        struct ElemView<'b> {
+            container: &'b Container,
+            idx: usize,
+        }
+
+        impl<'b> ValueView for ElemView<'b> {
+            fn visit(&self, visitor: &mut impl ValueVisitor) {
+                self.container.visit_indexed(visitor, 0, self.idx)
+            }
+        }
+
+        let len = self.0.len();
+
+        (0..len).map(|idx| ElemView {
+            container: &self.0,
+            idx,
+        })
+    }
+}
+
+impl Reference {
+    #[allow(clippy::needless_lifetimes)]
+    pub fn value_view<'a>(&'a self) -> impl ValueView + 'a {
+        struct ValueBehindRef<'b>(&'b ReferenceImpl);
+
+        impl<'b> ValueView for ValueBehindRef<'b> {
+            fn visit(&self, visitor: &mut impl ValueVisitor) {
+                use ReferenceImpl::*;
+
+                match self.0 {
+                    ContainerRef(r) => r.container().visit_impl(visitor, 0),
+                    IndexedRef(r) => r.container_ref.container().visit_indexed(visitor, 0, r.idx),
+                }
+            }
+        }
+
+        ValueBehindRef(&self.0)
+    }
+}
+
+impl GlobalValue {
+    #[allow(clippy::needless_lifetimes)]
+    pub fn view<'a>(&'a self) -> Option<impl ValueView + 'a> {
+        use GlobalValueImpl as G;
+
+        struct Wrapper<'b>(&'b Rc<RefCell<Vec<ValueImpl>>>);
+
+        impl<'b> ValueView for Wrapper<'b> {
+            fn visit(&self, visitor: &mut impl ValueVisitor) {
+                let r = self.0.borrow();
+                if visitor.visit_struct(0, r.len()) {
+                    for val in r.iter() {
+                        val.visit_impl(visitor, 1);
+                    }
+                }
+            }
+        }
+
+        match &self.0 {
+            G::None | G::Deleted => None,
+            G::Cached { fields, .. } | G::Fresh { fields } => Some(Wrapper(fields)),
+        }
+    }
+}
+
 /***************************************************************************************
  *
  * Prop Testing
@@ -2646,8 +3509,11 @@ pub mod prop {
 
         match layout {
             L::U8 => any::<u8>().prop_map(Value::u8).boxed(),
+            L::U16 => any::<u16>().prop_map(Value::u16).boxed(),
+            L::U32 => any::<u32>().prop_map(Value::u32).boxed(),
             L::U64 => any::<u64>().prop_map(Value::u64).boxed(),
             L::U128 => any::<u128>().prop_map(Value::u128).boxed(),
+            L::U256 => any::<u256::U256>().prop_map(Value::u256).boxed(),
             L::Bool => any::<bool>().prop_map(Value::bool).boxed(),
             L::Address => any::<AccountAddress>().prop_map(Value::address).boxed(),
             L::Signer => any::<AccountAddress>().prop_map(Value::signer).boxed(),
@@ -2660,6 +3526,20 @@ pub mod prop {
                         ))))
                     })
                     .boxed(),
+                L::U16 => vec(any::<u16>(), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::VecU16(Rc::new(
+                            RefCell::new(vals),
+                        ))))
+                    })
+                    .boxed(),
+                L::U32 => vec(any::<u32>(), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::VecU32(Rc::new(
+                            RefCell::new(vals),
+                        ))))
+                    })
+                    .boxed(),
                 L::U64 => vec(any::<u64>(), 0..10)
                     .prop_map(|vals| {
                         Value(ValueImpl::Container(Container::VecU64(Rc::new(
@@ -2674,6 +3554,13 @@ pub mod prop {
                         ))))
                     })
                     .boxed(),
+                L::U256 => vec(any::<u256::U256>(), 0..10)
+                    .prop_map(|vals| {
+                        Value(ValueImpl::Container(Container::VecU256(Rc::new(
+                            RefCell::new(vals),
+                        ))))
+                    })
+                    .boxed(),
                 L::Bool => vec(any::<bool>(), 0..10)
                     .prop_map(|vals| {
                         Value(ValueImpl::Container(Container::VecBool(Rc::new(
@@ -2712,8 +3599,11 @@ pub mod prop {
 
         let leaf = prop_oneof![
             1 => Just(L::U8),
+            1 => Just(L::U16),
+            1 => Just(L::U32),
             1 => Just(L::U64),
             1 => Just(L::U128),
+            1 => Just(L::U256),
             1 => Just(L::Bool),
             1 => Just(L::Address),
             1 => Just(L::Signer),
@@ -2734,68 +3624,72 @@ pub mod prop {
             (Just(layout), value_strategy)
         })
     }
+}
 
-    impl ValueImpl {
-        pub fn as_move_value(&self, layout: &MoveTypeLayout) -> MoveValue {
-            use MoveTypeLayout as L;
+use move_core_types::value::{MoveStruct, MoveValue};
 
-            match (layout, &self) {
-                (L::U8, ValueImpl::U8(x)) => MoveValue::U8(*x),
-                (L::U64, ValueImpl::U64(x)) => MoveValue::U64(*x),
-                (L::U128, ValueImpl::U128(x)) => MoveValue::U128(*x),
-                (L::Bool, ValueImpl::Bool(x)) => MoveValue::Bool(*x),
-                (L::Address, ValueImpl::Address(x)) => MoveValue::Address(*x),
+impl ValueImpl {
+    pub fn as_move_value(&self, layout: &MoveTypeLayout) -> MoveValue {
+        use MoveTypeLayout as L;
 
-                (L::Struct(struct_layout), ValueImpl::Container(Container::Struct(r))) => {
-                    let mut fields = vec![];
-                    for (v, field_layout) in r.borrow().iter().zip(struct_layout.fields().iter()) {
-                        fields.push(v.as_move_value(field_layout));
-                    }
-                    MoveValue::Struct(MoveStruct::new(fields))
+        match (layout, &self) {
+            (L::U8, ValueImpl::U8(x)) => MoveValue::U8(*x),
+            (L::U16, ValueImpl::U16(x)) => MoveValue::U16(*x),
+            (L::U32, ValueImpl::U32(x)) => MoveValue::U32(*x),
+            (L::U64, ValueImpl::U64(x)) => MoveValue::U64(*x),
+            (L::U128, ValueImpl::U128(x)) => MoveValue::U128(*x),
+            (L::U256, ValueImpl::U256(x)) => MoveValue::U256(*x),
+            (L::Bool, ValueImpl::Bool(x)) => MoveValue::Bool(*x),
+            (L::Address, ValueImpl::Address(x)) => MoveValue::Address(*x),
+
+            (L::Struct(struct_layout), ValueImpl::Container(Container::Struct(r))) => {
+                let mut fields = vec![];
+                for (v, field_layout) in r.borrow().iter().zip(struct_layout.fields().iter()) {
+                    fields.push(v.as_move_value(field_layout));
                 }
-
-                (L::Vector(inner_layout), ValueImpl::Container(c)) => MoveValue::Vector(match c {
-                    Container::VecU8(r) => r.borrow().iter().map(|u| MoveValue::U8(*u)).collect(),
-                    Container::VecU64(r) => r.borrow().iter().map(|u| MoveValue::U64(*u)).collect(),
-                    Container::VecU128(r) => {
-                        r.borrow().iter().map(|u| MoveValue::U128(*u)).collect()
-                    }
-                    Container::VecBool(r) => {
-                        r.borrow().iter().map(|u| MoveValue::Bool(*u)).collect()
-                    }
-                    Container::VecAddress(r) => {
-                        r.borrow().iter().map(|u| MoveValue::Address(*u)).collect()
-                    }
-                    Container::Vec(r) => r
-                        .borrow()
-                        .iter()
-                        .map(|v| v.as_move_value(inner_layout.as_ref()))
-                        .collect(),
-                    Container::Struct(_) => {
-                        panic!("got struct container when converting vec")
-                    }
-                    Container::Locals(_) => panic!("got locals container when converting vec"),
-                }),
-
-                (L::Signer, ValueImpl::Container(Container::Struct(r))) => {
-                    let v = r.borrow();
-                    if v.len() != 1 {
-                        panic!("Unexpected signer layout: {:?}", v);
-                    }
-                    match &v[0] {
-                        ValueImpl::Address(a) => MoveValue::Signer(*a),
-                        v => panic!("Unexpected non-address while converting signer: {:?}", v),
-                    }
+                MoveValue::Struct(MoveStruct::new(fields))
+            }
+
+            (L::Vector(inner_layout), ValueImpl::Container(c)) => MoveValue::Vector(match c {
+                Container::VecU8(r) => r.borrow().iter().map(|u| MoveValue::U8(*u)).collect(),
+                Container::VecU16(r) => r.borrow().iter().map(|u| MoveValue::U16(*u)).collect(),
+                Container::VecU32(r) => r.borrow().iter().map(|u| MoveValue::U32(*u)).collect(),
+                Container::VecU64(r) => r.borrow().iter().map(|u| MoveValue::U64(*u)).collect(),
+                Container::VecU128(r) => r.borrow().iter().map(|u| MoveValue::U128(*u)).collect(),
+                Container::VecU256(r) => r.borrow().iter().map(|u| MoveValue::U256(*u)).collect(),
+                Container::VecBool(r) => r.borrow().iter().map(|u| MoveValue::Bool(*u)).collect(),
+                Container::VecAddress(r) => {
+                    r.borrow().iter().map(|u| MoveValue::Address(*u)).collect()
                 }
+                Container::Vec(r) => r
+                    .borrow()
+                    .iter()
+                    .map(|v| v.as_move_value(inner_layout.as_ref()))
+                    .collect(),
+                Container::Struct(_) => {
+                    panic!("got struct container when converting vec")
+                }
+                Container::Locals(_) => panic!("got locals container when converting vec"),
+            }),
 
-                (layout, val) => panic!("Cannot convert value {:?} as {:?}", val, layout),
+            (L::Signer, ValueImpl::Container(Container::Struct(r))) => {
+                let v = r.borrow();
+                if v.len() != 1 {
+                    panic!("Unexpected signer layout: {:?}", v);
+                }
+                match &v[0] {
+                    ValueImpl::Address(a) => MoveValue::Signer(*a),
+                    v => panic!("Unexpected non-address while converting signer: {:?}", v),
+                }
             }
+
+            (layout, val) => panic!("Cannot convert value {:?} as {:?}", val, layout),
         }
     }
+}
 
-    impl Value {
-        pub fn as_move_value(&self, layout: &MoveTypeLayout) -> MoveValue {
-            self.0.as_move_value(layout)
-        }
+impl Value {
+    pub fn as_move_value(&self, layout: &MoveTypeLayout) -> MoveValue {
+        self.0.as_move_value(layout)
     }
 }
diff --git a/language/move-vm/types/src/views.rs b/language/move-vm/types/src/views.rs
new file mode 100644
index 0000000000..29a87e3261
--- /dev/null
+++ b/language/move-vm/types/src/views.rs
@@ -0,0 +1,218 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_core_types::{
+    account_address::AccountAddress, gas_algebra::AbstractMemorySize, language_storage::TypeTag,
+};
+use std::mem::size_of;
+
+/// Trait that provides an abstract view into a Move type.
+///
+/// This is used to expose certain info to clients (e.g. the gas meter),
+/// usually in a lazily evaluated fashion.
+pub trait TypeView {
+    /// Returns the `TypeTag` (fully qualified name) of the type.
+    fn to_type_tag(&self) -> TypeTag;
+}
+
+/// Trait that provides an abstract view into a Move Value.
+///
+/// This is used to expose certain info to clients (e.g. the gas meter),
+/// usually in a lazily evaluated fashion.
+pub trait ValueView {
+    fn visit(&self, visitor: &mut impl ValueVisitor);
+
+    /// Returns the abstract memory size of the value.
+    ///
+    /// The concept of abstract memory size is not well-defined and is only kept for backward compatibility.
+    /// New applications should avoid using this.
+    ///
+    /// TODO(Gas): Encourage clients to replicate this in their own repo and get this removed once
+    ///            they are done.
+    fn legacy_abstract_memory_size(&self) -> AbstractMemorySize {
+        use crate::values::{LEGACY_CONST_SIZE, LEGACY_REFERENCE_SIZE, LEGACY_STRUCT_SIZE};
+
+        struct Acc(AbstractMemorySize);
+
+        impl ValueVisitor for Acc {
+            fn visit_u8(&mut self, _depth: usize, _val: u8) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u16(&mut self, _depth: usize, _val: u16) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u32(&mut self, _depth: usize, _val: u32) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u64(&mut self, _depth: usize, _val: u64) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u128(&mut self, _depth: usize, _val: u128) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_u256(&mut self, _depth: usize, _val: move_core_types::u256::U256) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_bool(&mut self, _depth: usize, _val: bool) {
+                self.0 += LEGACY_CONST_SIZE;
+            }
+
+            fn visit_address(&mut self, _depth: usize, _val: AccountAddress) {
+                self.0 += AbstractMemorySize::new(AccountAddress::LENGTH as u64);
+            }
+
+            fn visit_struct(&mut self, _depth: usize, _len: usize) -> bool {
+                self.0 += LEGACY_STRUCT_SIZE;
+                true
+            }
+
+            fn visit_vec(&mut self, _depth: usize, _len: usize) -> bool {
+                self.0 += LEGACY_STRUCT_SIZE;
+                true
+            }
+
+            fn visit_vec_u8(&mut self, _depth: usize, vals: &[u8]) {
+                self.0 += ((size_of::<u8>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u16(&mut self, _depth: usize, vals: &[u16]) {
+                self.0 += ((size_of::<u16>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u32(&mut self, _depth: usize, vals: &[u32]) {
+                self.0 += ((size_of::<u32>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u64(&mut self, _depth: usize, vals: &[u64]) {
+                self.0 += ((size_of::<u64>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u128(&mut self, _depth: usize, vals: &[u128]) {
+                self.0 += ((size_of::<u128>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_u256(&mut self, _depth: usize, vals: &[move_core_types::u256::U256]) {
+                self.0 += ((size_of::<move_core_types::u256::U256>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_bool(&mut self, _depth: usize, vals: &[bool]) {
+                self.0 += ((size_of::<bool>() * vals.len()) as u64).into();
+            }
+
+            fn visit_vec_address(&mut self, _depth: usize, vals: &[AccountAddress]) {
+                self.0 += ((size_of::<AccountAddress>() * vals.len()) as u64).into();
+            }
+
+            fn visit_ref(&mut self, _depth: usize, _is_global: bool) -> bool {
+                self.0 += LEGACY_REFERENCE_SIZE;
+                false
+            }
+        }
+
+        let mut acc = Acc(0.into());
+        self.visit(&mut acc);
+
+        acc.0
+    }
+}
+
+/// Trait that defines a visitor that could be used to traverse a value recursively.
+pub trait ValueVisitor {
+    fn visit_u8(&mut self, depth: usize, val: u8);
+    fn visit_u16(&mut self, depth: usize, val: u16);
+    fn visit_u32(&mut self, depth: usize, val: u32);
+    fn visit_u64(&mut self, depth: usize, val: u64);
+    fn visit_u128(&mut self, depth: usize, val: u128);
+    fn visit_u256(&mut self, depth: usize, val: move_core_types::u256::U256);
+    fn visit_bool(&mut self, depth: usize, val: bool);
+    fn visit_address(&mut self, depth: usize, val: AccountAddress);
+
+    fn visit_struct(&mut self, depth: usize, len: usize) -> bool;
+    fn visit_vec(&mut self, depth: usize, len: usize) -> bool;
+
+    fn visit_ref(&mut self, depth: usize, is_global: bool) -> bool;
+
+    fn visit_vec_u8(&mut self, depth: usize, vals: &[u8]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_u8(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_u16(&mut self, depth: usize, vals: &[u16]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_u16(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_u32(&mut self, depth: usize, vals: &[u32]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_u32(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_u64(&mut self, depth: usize, vals: &[u64]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_u64(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_u128(&mut self, depth: usize, vals: &[u128]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_u128(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_u256(&mut self, depth: usize, vals: &[move_core_types::u256::U256]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_u256(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_bool(&mut self, depth: usize, vals: &[bool]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_bool(depth + 1, *val);
+        }
+    }
+
+    fn visit_vec_address(&mut self, depth: usize, vals: &[AccountAddress]) {
+        self.visit_vec(depth, vals.len());
+        for val in vals {
+            self.visit_address(depth + 1, *val);
+        }
+    }
+}
+
+impl<T> ValueView for &T
+where
+    T: ValueView,
+{
+    fn legacy_abstract_memory_size(&self) -> AbstractMemorySize {
+        <T as ValueView>::legacy_abstract_memory_size(*self)
+    }
+
+    fn visit(&self, visitor: &mut impl ValueVisitor) {
+        <T as ValueView>::visit(*self, visitor)
+    }
+}
+
+impl<T> TypeView for &T
+where
+    T: TypeView,
+{
+    fn to_type_tag(&self) -> TypeTag {
+        <T as TypeView>::to_type_tag(*self)
+    }
+}
diff --git a/language/testing-infra/module-generation/Cargo.toml b/language/testing-infra/module-generation/Cargo.toml
index 3b4e4611c8..c3b1cb5459 100644
--- a/language/testing-infra/module-generation/Cargo.toml
+++ b/language/testing-infra/module-generation/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 rand = "0.8.3"
diff --git a/language/testing-infra/module-generation/src/generator.rs b/language/testing-infra/module-generation/src/generator.rs
index d98a17a630..90d9b0fc28 100644
--- a/language/testing-infra/module-generation/src/generator.rs
+++ b/language/testing-infra/module-generation/src/generator.rs
@@ -135,6 +135,9 @@ impl<'a> ModuleGenerator<'a> {
                 };
                 Type::Struct(struct_ident, ty_instants)
             }
+            6 => Type::U16,
+            7 => Type::U32,
+            8 => Type::U256,
             _ => {
                 let index = self.index(ty_param_context.len());
                 let ty_var = ty_param_context[index].value.clone();
diff --git a/language/testing-infra/test-generation/Cargo.toml b/language/testing-infra/test-generation/Cargo.toml
index 83ac8f35ff..7e1366721c 100644
--- a/language/testing-infra/test-generation/Cargo.toml
+++ b/language/testing-infra/test-generation/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 rand = "0.8.3"
@@ -18,7 +18,7 @@ hex = "0.4.3"
 getrandom = "0.2.2"
 crossbeam-channel = "0.5.0"
 tracing = "0.1.26"
-tracing-subscriber = { version = "0.3.3", features = ["env-filter"] }
+tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
 once_cell = "1.7.2"
 
 move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
diff --git a/language/testing-infra/test-generation/src/abstract_state.rs b/language/testing-infra/test-generation/src/abstract_state.rs
index 2f374971b7..6a53b4b3b8 100644
--- a/language/testing-infra/test-generation/src/abstract_state.rs
+++ b/language/testing-infra/test-generation/src/abstract_state.rs
@@ -19,14 +19,14 @@ use std::{
 
 /// The BorrowState denotes whether a local is `Available` or
 /// has been moved and is `Unavailable`.
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum BorrowState {
     Available,
     Unavailable,
 }
 
 /// This models a value on the stack or in the locals
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct AbstractValue {
     /// Represents the type of the value
     pub token: SignatureToken,
@@ -36,7 +36,7 @@ pub struct AbstractValue {
 }
 
 /// This models the mutability of a reference
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Mutability {
     /// Represents a mutable reference
     Mutable,
@@ -64,8 +64,11 @@ impl AbstractValue {
                 SignatureToken::Bool
                 | SignatureToken::Address
                 | SignatureToken::U8
+                | SignatureToken::U16
+                | SignatureToken::U32
                 | SignatureToken::U64
-                | SignatureToken::U128 => true,
+                | SignatureToken::U128
+                | SignatureToken::U256 => true,
             },
             "AbstractValue::new_primitive must be applied with primitive type"
         );
@@ -118,7 +121,7 @@ impl AbstractValue {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct CallGraph {
     calls: HashMap<FunctionHandleIndex, HashSet<FunctionHandleIndex>>,
     max_function_handle_index: usize,
diff --git a/language/testing-infra/test-generation/src/borrow_graph.rs b/language/testing-infra/test-generation/src/borrow_graph.rs
index 1684efde3b..df1ea3fde6 100644
--- a/language/testing-infra/test-generation/src/borrow_graph.rs
+++ b/language/testing-infra/test-generation/src/borrow_graph.rs
@@ -23,7 +23,7 @@ type Edge = (PartitionID, PartitionID, Path, EdgeType);
 
 /// The `EdgeType` is either weak or strong. A weak edge represents imprecise information
 /// on the path along which the borrow takes place. A strong edge is precise.
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum EdgeType {
     Weak,
     Strong,
@@ -31,7 +31,7 @@ pub enum EdgeType {
 
 /// The `BorrowGraph` stores information sufficient to determine whether the instruction
 /// of a bytecode instruction that interacts with references is memory safe.
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct BorrowGraph {
     /// All of the partitions that make up the graph
     partitions: Vec<PartitionID>,
diff --git a/language/testing-infra/test-generation/src/bytecode_generator.rs b/language/testing-infra/test-generation/src/bytecode_generator.rs
index d28f4765f0..ec9baa6f75 100644
--- a/language/testing-infra/test-generation/src/bytecode_generator.rs
+++ b/language/testing-infra/test-generation/src/bytecode_generator.rs
@@ -20,6 +20,7 @@ use move_binary_format::{
         StructDefInstantiationIndex, StructDefinitionIndex, StructFieldInformation, TableIndex,
     },
 };
+use move_core_types::u256::U256;
 use rand::{rngs::StdRng, Rng};
 use tracing::{debug, error, warn};
 
@@ -32,12 +33,21 @@ type CodeOffsetToBytecode = fn(CodeOffset) -> Bytecode;
 /// This type represents bytecode instructions that take a `u8`
 type U8ToBytecode = fn(u8) -> Bytecode;
 
+/// This type represents bytecode instructions that take a `u16`
+type U16ToBytecode = fn(u16) -> Bytecode;
+
+/// This type represents bytecode instructions that take a `u32`
+type U32ToBytecode = fn(u32) -> Bytecode;
+
 /// This type represents bytecode instructions that take a `u64`
 type U64ToBytecode = fn(u64) -> Bytecode;
 
 /// This type represents bytecode instructions that take a `u128`
 type U128ToBytecode = fn(u128) -> Bytecode;
 
+/// This type represents bytecode instructions that take a `u256`
+type U256ToBytecode = fn(U256) -> Bytecode;
+
 /// This type represents bytecode instructions that take a `AddressPoolIndex`
 type ConstantPoolIndexToBytecode = fn(ConstantPoolIndex) -> Bytecode;
 
@@ -74,12 +84,21 @@ enum BytecodeType {
     /// Instructions that take a `u8`
     U8(U8ToBytecode),
 
+    /// Instructions that take a `u16`
+    U16(U16ToBytecode),
+
+    /// Instructions that take a `u32`
+    U32(U32ToBytecode),
+
     /// Instructions that take a `u64`
     U64(U64ToBytecode),
 
     /// Instructions that take a `u128`
     U128(U128ToBytecode),
 
+    /// Instructions that take a `u256`
+    U256(U256ToBytecode),
+
     /// Instructions that take an `ConstantPoolIndex`
     ConstantPoolIndex(ConstantPoolIndexToBytecode),
 
@@ -116,7 +135,7 @@ enum StackEffect {
 }
 
 /// Context containing information about a function
-#[derive(Debug, Copy, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub struct FunctionGenerationContext {
     pub function_handle_index: FunctionHandleIndex,
     pub starting_call_height: usize,
@@ -165,11 +184,17 @@ impl<'a> BytecodeGenerator<'a> {
         let instructions: Vec<(StackEffect, BytecodeType)> = vec![
             (StackEffect::Sub, BytecodeType::NoArg(Bytecode::Pop)),
             (StackEffect::Add, BytecodeType::U8(Bytecode::LdU8)),
+            (StackEffect::Add, BytecodeType::U16(Bytecode::LdU16)),
+            (StackEffect::Add, BytecodeType::U32(Bytecode::LdU32)),
             (StackEffect::Add, BytecodeType::U64(Bytecode::LdU64)),
             (StackEffect::Add, BytecodeType::U128(Bytecode::LdU128)),
+            (StackEffect::Add, BytecodeType::U256(Bytecode::LdU256)),
             (StackEffect::Nop, BytecodeType::NoArg(Bytecode::CastU8)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::CastU16)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::CastU32)),
             (StackEffect::Nop, BytecodeType::NoArg(Bytecode::CastU64)),
             (StackEffect::Nop, BytecodeType::NoArg(Bytecode::CastU128)),
+            (StackEffect::Nop, BytecodeType::NoArg(Bytecode::CastU256)),
             (
                 StackEffect::Add,
                 BytecodeType::ConstantPoolIndex(Bytecode::LdConst),
@@ -377,6 +402,14 @@ impl<'a> BytecodeGenerator<'a> {
                     // Generate a random u8 constant to load
                     Some(instruction(self.rng.gen_range(0..u8::max_value())))
                 }
+                BytecodeType::U16(instruction) => {
+                    // Generate a random u16 constant to load
+                    Some(instruction(self.rng.gen_range(0..u16::max_value())))
+                }
+                BytecodeType::U32(instruction) => {
+                    // Generate a random u32 constant to load
+                    Some(instruction(self.rng.gen_range(0..u32::max_value())))
+                }
                 BytecodeType::U64(instruction) => {
                     // Generate a random u64 constant to load
                     Some(instruction(self.rng.gen_range(0..u64::max_value())))
@@ -385,25 +418,31 @@ impl<'a> BytecodeGenerator<'a> {
                     // Generate a random u128 constant to load
                     Some(instruction(self.rng.gen_range(0..u128::max_value())))
                 }
+                BytecodeType::U256(instruction) => {
+                    // Generate a random u256 constant to load
+                    Some(instruction(
+                        self.rng.gen_range(U256::zero()..U256::max_value()),
+                    ))
+                }
                 BytecodeType::ConstantPoolIndex(instruction) => {
                     // Select a random address from the module's address pool
-                    Self::index_or_none(&module.constant_pool, &mut self.rng)
+                    Self::index_or_none(&module.constant_pool, self.rng)
                         .map(|x| instruction(ConstantPoolIndex::new(x)))
                 }
                 BytecodeType::StructIndex(instruction) => {
                     // Select a random struct definition and local signature
-                    Self::index_or_none(&module.struct_defs, &mut self.rng)
+                    Self::index_or_none(&module.struct_defs, self.rng)
                         .map(|x| instruction(StructDefinitionIndex::new(x)))
                 }
                 BytecodeType::FieldHandleIndex(instruction) => {
                     // Select a field definition from the module's field definitions
-                    Self::index_or_none(&module.field_handles, &mut self.rng)
+                    Self::index_or_none(&module.field_handles, self.rng)
                         .map(|x| instruction(FieldHandleIndex::new(x)))
                 }
                 BytecodeType::FunctionIndex(instruction) => {
                     // Select a random function handle and local signature
                     let callable_fns = &state.call_graph.can_call(fn_context.function_handle_index);
-                    Self::index_or_none(callable_fns, &mut self.rng)
+                    Self::index_or_none(callable_fns, self.rng)
                         .and_then(|handle_idx| {
                             Self::call_stack_backpressure(
                                 &state,
@@ -415,17 +454,17 @@ impl<'a> BytecodeGenerator<'a> {
                 }
                 BytecodeType::StructInstantiationIndex(instruction) => {
                     // Select a field definition from the module's field definitions
-                    Self::index_or_none(&module.struct_def_instantiations, &mut self.rng)
+                    Self::index_or_none(&module.struct_def_instantiations, self.rng)
                         .map(|x| instruction(StructDefInstantiationIndex::new(x)))
                 }
                 BytecodeType::FunctionInstantiationIndex(instruction) => {
                     // Select a field definition from the module's field definitions
-                    Self::index_or_none(&module.function_instantiations, &mut self.rng)
+                    Self::index_or_none(&module.function_instantiations, self.rng)
                         .map(|x| instruction(FunctionInstantiationIndex::new(x)))
                 }
                 BytecodeType::FieldInstantiationIndex(instruction) => {
                     // Select a field definition from the module's field definitions
-                    Self::index_or_none(&module.field_instantiations, &mut self.rng)
+                    Self::index_or_none(&module.field_instantiations, self.rng)
                         .map(|x| instruction(FieldInstantiationIndex::new(x)))
                 }
             };
@@ -729,7 +768,7 @@ impl<'a> BytecodeGenerator<'a> {
         // generation range.
         debug_assert!(number_of_blocks > 0);
         let mut cfg = CFG::new(
-            &mut self.rng,
+            self.rng,
             locals,
             &module.signatures[fh.parameters.0 as usize],
             number_of_blocks,
@@ -871,6 +910,9 @@ impl<'a> BytecodeGenerator<'a> {
             SignatureToken::U64 => vec![Bytecode::LdU64(0)],
             SignatureToken::U8 => vec![Bytecode::LdU8(0)],
             SignatureToken::U128 => vec![Bytecode::LdU128(0)],
+            SignatureToken::U16 => vec![Bytecode::LdU16(0)],
+            SignatureToken::U32 => vec![Bytecode::LdU32(0)],
+            SignatureToken::U256 => vec![Bytecode::LdU256(U256::zero())],
             SignatureToken::Bool => vec![Bytecode::LdFalse],
             SignatureToken::Struct(handle_idx) => {
                 let struct_def_idx = module
@@ -935,7 +977,13 @@ impl<'a> BytecodeGenerator<'a> {
                 )));
                 bytecodes
             }
-            _ => unimplemented!("Unsupported inhabitation. Type: {:#?}", token),
+            SignatureToken::Signer
+            | SignatureToken::Vector(_)
+            | SignatureToken::Reference(_)
+            | SignatureToken::MutableReference(_)
+            | SignatureToken::TypeParameter(_) => {
+                unimplemented!("Unsupported inhabitation. Type: {:#?}", token)
+            }
         }
     }
 }
diff --git a/language/testing-infra/test-generation/src/lib.rs b/language/testing-infra/test-generation/src/lib.rs
index 49958e432c..05e2bfbf83 100644
--- a/language/testing-infra/test-generation/src/lib.rs
+++ b/language/testing-infra/test-generation/src/lib.rs
@@ -28,7 +28,7 @@ use move_bytecode_verifier::verify_module;
 use move_compiler::{compiled_unit::AnnotatedCompiledUnit, Compiler};
 use move_core_types::{
     account_address::AccountAddress,
-    effects::ChangeSet,
+    effects::{ChangeSet, Op},
     language_storage::TypeTag,
     resolver::MoveResolver,
     value::MoveValue,
@@ -36,7 +36,7 @@ use move_core_types::{
 };
 use move_vm_runtime::move_vm::MoveVM;
 use move_vm_test_utils::{DeltaStorage, InMemoryStorage};
-use move_vm_types::gas_schedule::GasStatus;
+use move_vm_types::gas::UnmeteredGasMeter;
 use once_cell::sync::Lazy;
 use rand::{rngs::StdRng, Rng, SeedableRng};
 use std::{fs, io::Write, panic, thread};
@@ -96,7 +96,18 @@ fn run_vm(module: CompiledModule) -> Result<(), VMStatus> {
             SignatureToken::Vector(inner_tok) if **inner_tok == SignatureToken::U8 => {
                 MoveValue::Vector(vec![]).simple_serialize().unwrap()
             }
-            _ => unimplemented!("Unsupported argument type: {:#?}", sig_tok),
+            SignatureToken::Vector(_)
+            | SignatureToken::U8
+            | SignatureToken::U128
+            | SignatureToken::Signer
+            | SignatureToken::Struct(_)
+            | SignatureToken::StructInstantiation(_, _)
+            | SignatureToken::Reference(_)
+            | SignatureToken::MutableReference(_)
+            | SignatureToken::TypeParameter(_)
+            | SignatureToken::U16
+            | SignatureToken::U32
+            | SignatureToken::U256 => unimplemented!("Unsupported argument type: {:#?}", sig_tok),
         })
         .collect();
 
@@ -126,23 +137,25 @@ fn execute_function_in_module(
     {
         let vm = MoveVM::new(move_stdlib::natives::all_natives(
             AccountAddress::from_hex_literal("0x1").unwrap(),
+            move_stdlib::natives::GasParameters::zeros(),
         ))
         .unwrap();
 
         let mut changeset = ChangeSet::new();
         let mut blob = vec![];
         module.serialize(&mut blob).unwrap();
-        changeset.publish_or_overwrite_module(module_id.clone(), blob);
+        changeset
+            .add_module_op(module_id.clone(), Op::New(blob))
+            .unwrap();
         let delta_storage = DeltaStorage::new(storage, &changeset);
         let mut sess = vm.new_session(&delta_storage);
 
-        let mut gas_status = GasStatus::new_unmetered();
         sess.execute_function_bypass_visibility(
             &module_id,
             entry_name,
             ty_args,
             args,
-            &mut gas_status,
+            &mut UnmeteredGasMeter,
         )?;
 
         Ok(())
@@ -189,7 +202,7 @@ fn seed(seed: Option<String>) -> [u8; 32] {
     array
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Status {
     VerificationFailure,
     ExecutionFailure,
@@ -380,8 +393,11 @@ pub(crate) fn substitute(token: &SignatureToken, tys: &[SignatureToken]) -> Sign
     match token {
         Bool => Bool,
         U8 => U8,
+        U16 => U16,
+        U32 => U32,
         U64 => U64,
         U128 => U128,
+        U256 => U256,
         Address => Address,
         Signer => Signer,
         Vector(ty) => Vector(Box::new(substitute(ty, tys))),
@@ -409,7 +425,7 @@ pub fn abilities(
     use SignatureToken::*;
 
     match ty {
-        Bool | U8 | U64 | U128 | Address => AbilitySet::PRIMITIVES,
+        Bool | U8 | U16 | U32 | U64 | U128 | U256 | Address => AbilitySet::PRIMITIVES,
 
         Reference(_) | MutableReference(_) => AbilitySet::REFERENCES,
         Signer => AbilitySet::SIGNER,
@@ -469,6 +485,18 @@ pub(crate) fn get_type_actuals_from_reference(
             Struct(_) => Some(vec![]),
             _ => None,
         },
-        _ => None,
+        Bool
+        | U8
+        | U64
+        | U128
+        | Address
+        | Signer
+        | Vector(_)
+        | Struct(_)
+        | StructInstantiation(_, _)
+        | TypeParameter(_)
+        | U16
+        | U32
+        | U256 => None,
     }
 }
diff --git a/language/testing-infra/test-generation/src/summaries.rs b/language/testing-infra/test-generation/src/summaries.rs
index 443f748483..2376e65764 100644
--- a/language/testing-infra/test-generation/src/summaries.rs
+++ b/language/testing-infra/test-generation/src/summaries.rs
@@ -82,6 +82,18 @@ pub fn instruction_summary(instruction: Bytecode, exact: bool) -> Summary {
                 SignatureToken::U8
             ))]),
         },
+        Bytecode::LdU16(_) => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::U16
+            ))]),
+        },
+        Bytecode::LdU32(_) => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::U32
+            ))]),
+        },
         Bytecode::LdU64(_) => Summary {
             preconditions: vec![],
             effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
@@ -94,6 +106,12 @@ pub fn instruction_summary(instruction: Bytecode, exact: bool) -> Summary {
                 SignatureToken::U128
             ))]),
         },
+        Bytecode::LdU256(_) => Summary {
+            preconditions: vec![],
+            effects: Effects::NoTyParams(vec![state_stack_push!(AbstractValue::new_primitive(
+                SignatureToken::U256
+            ))]),
+        },
         Bytecode::CastU8 => Summary {
             preconditions: vec![state_stack_is_castable!(SignatureToken::U8)],
             effects: Effects::NoTyParams(vec![
@@ -101,6 +119,20 @@ pub fn instruction_summary(instruction: Bytecode, exact: bool) -> Summary {
                 state_stack_push!(AbstractValue::new_primitive(SignatureToken::U8)),
             ]),
         },
+        Bytecode::CastU16 => Summary {
+            preconditions: vec![state_stack_is_castable!(SignatureToken::U16)],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::U16)),
+            ]),
+        },
+        Bytecode::CastU32 => Summary {
+            preconditions: vec![state_stack_is_castable!(SignatureToken::U32)],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::U32)),
+            ]),
+        },
         Bytecode::CastU64 => Summary {
             preconditions: vec![state_stack_is_castable!(SignatureToken::U64)],
             effects: Effects::NoTyParams(vec![
@@ -115,6 +147,13 @@ pub fn instruction_summary(instruction: Bytecode, exact: bool) -> Summary {
                 state_stack_push!(AbstractValue::new_primitive(SignatureToken::U128)),
             ]),
         },
+        Bytecode::CastU256 => Summary {
+            preconditions: vec![state_stack_is_castable!(SignatureToken::U256)],
+            effects: Effects::NoTyParams(vec![
+                state_stack_pop!(),
+                state_stack_push!(AbstractValue::new_primitive(SignatureToken::U256)),
+            ]),
+        },
         // TODO actual constant generation
         Bytecode::LdConst(_) => Summary {
             preconditions: vec![],
diff --git a/language/testing-infra/test-generation/src/transitions.rs b/language/testing-infra/test-generation/src/transitions.rs
index cd969fefca..4b35fdcc51 100644
--- a/language/testing-infra/test-generation/src/transitions.rs
+++ b/language/testing-infra/test-generation/src/transitions.rs
@@ -42,12 +42,7 @@ impl Subst {
     /// is a type parameter, and the `stack_sig` is a concrete type. But, if the instruction signature is a
     /// concrete type, but the stack signature is a type parameter, they cannot unify and no
     /// substitution is created.
-    pub fn check_and_add(
-        &mut self,
-        state: &AbstractState,
-        stack_sig: SignatureToken,
-        instr_sig: SignatureToken,
-    ) -> bool {
+    pub fn check_and_add(&mut self, stack_sig: SignatureToken, instr_sig: SignatureToken) -> bool {
         match (stack_sig, instr_sig) {
             (tok, SignatureToken::TypeParameter(idx)) => {
                 if let Some(other_type) = self.subst.get(&(idx as usize)).cloned() {
@@ -75,7 +70,7 @@ impl Subst {
                 }
                 assert!(params1.len() == params2.len());
                 for (s1, s2) in params1.into_iter().zip(params2.into_iter()) {
-                    if !self.check_and_add(state, s1, s2) {
+                    if !self.check_and_add(s1, s2) {
                         return false;
                     }
                 }
@@ -142,14 +137,105 @@ pub fn stack_top_is_castable_to(state: &AbstractState, typ: SignatureToken) -> b
                     state,
                     0,
                     Some(AbstractValue::new_primitive(SignatureToken::U8)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U16)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U32)),
                 ) || stack_has(
                     state,
                     0,
                     Some(AbstractValue::new_primitive(SignatureToken::U64)),
                 )
             }
-            SignatureToken::U128 => true,
-            _ => false,
+            SignatureToken::U16 => {
+                stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U8)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U16)),
+                )
+            }
+            SignatureToken::U32 => {
+                stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U8)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U16)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U32)),
+                )
+            }
+            SignatureToken::U128 => {
+                stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U8)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U16)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U32)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U64)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U128)),
+                )
+            }
+            SignatureToken::U256 => {
+                stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U8)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U16)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U32)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U64)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U128)),
+                ) || stack_has(
+                    state,
+                    0,
+                    Some(AbstractValue::new_primitive(SignatureToken::U256)),
+                )
+            }
+            SignatureToken::Bool
+            | SignatureToken::Address
+            | SignatureToken::Signer
+            | SignatureToken::Vector(_)
+            | SignatureToken::Struct(_)
+            | SignatureToken::StructInstantiation(_, _)
+            | SignatureToken::Reference(_)
+            | SignatureToken::MutableReference(_)
+            | SignatureToken::TypeParameter(_) => false,
         }
 }
 
@@ -243,11 +329,23 @@ pub fn stack_ref_polymorphic_eq(state: &AbstractState, index1: usize, index2: us
                 SignatureToken::MutableReference(token) | SignatureToken::Reference(token) => {
                     let abstract_value_inner = AbstractValue {
                         token: (*token).clone(),
-                        abilities: abilities_for_token(state, &*token, &state.instantiation[..]),
+                        abilities: abilities_for_token(state, &token, &state.instantiation[..]),
                     };
                     return Some(abstract_value_inner) == state.stack_peek(index2);
                 }
-                _ => return false,
+                SignatureToken::Bool
+                | SignatureToken::U8
+                | SignatureToken::U64
+                | SignatureToken::U128
+                | SignatureToken::Address
+                | SignatureToken::Signer
+                | SignatureToken::Vector(_)
+                | SignatureToken::Struct(_)
+                | SignatureToken::StructInstantiation(_, _)
+                | SignatureToken::TypeParameter(_)
+                | SignatureToken::U16
+                | SignatureToken::U32
+                | SignatureToken::U256 => return false,
             }
         }
     }
@@ -393,7 +491,7 @@ pub fn stack_satisfies_struct_signature(
         let has = if let SignatureToken::TypeParameter(idx) = &ty {
             if stack_has_all_abilities(state, i, type_parameters[*idx as usize].constraints) {
                 let stack_tok = state.stack_peek(i).unwrap();
-                substitution.check_and_add(state, stack_tok.token, ty)
+                substitution.check_and_add(stack_tok.token, ty)
             } else {
                 false
             }
@@ -463,7 +561,19 @@ pub fn stack_has_struct(state: &AbstractState, struct_index: StructDefinitionInd
                     let struct_def = state.module.module.struct_def_at(struct_index);
                     return struct_handle == struct_def.struct_handle;
                 }
-                _ => return false,
+                SignatureToken::Bool
+                | SignatureToken::U8
+                | SignatureToken::U64
+                | SignatureToken::U128
+                | SignatureToken::Address
+                | SignatureToken::Signer
+                | SignatureToken::Vector(_)
+                | SignatureToken::Reference(_)
+                | SignatureToken::MutableReference(_)
+                | SignatureToken::TypeParameter(_)
+                | SignatureToken::U16
+                | SignatureToken::U32
+                | SignatureToken::U256 => return false,
             }
         }
     }
@@ -550,7 +660,19 @@ pub fn stack_has_reference(state: &AbstractState, index: usize, mutability: Muta
                         return true;
                     }
                 }
-                _ => return false,
+                SignatureToken::Bool
+                | SignatureToken::U8
+                | SignatureToken::U64
+                | SignatureToken::U128
+                | SignatureToken::Address
+                | SignatureToken::Signer
+                | SignatureToken::Vector(_)
+                | SignatureToken::Struct(_)
+                | SignatureToken::StructInstantiation(_, _)
+                | SignatureToken::TypeParameter(_)
+                | SignatureToken::U16
+                | SignatureToken::U32
+                | SignatureToken::U256 => return false,
             }
         }
     }
@@ -634,7 +756,22 @@ pub fn stack_unpack_struct_instantiation(
                     None => panic!("Invalid unpack -- non-struct def value found at top of stack"),
                 }
             }
-            _ => panic!("Invalid unpack -- non-struct value found at top of stack"),
+            SignatureToken::Bool
+            | SignatureToken::U8
+            | SignatureToken::U64
+            | SignatureToken::U128
+            | SignatureToken::Address
+            | SignatureToken::Signer
+            | SignatureToken::Vector(_)
+            | SignatureToken::Struct(_)
+            | SignatureToken::Reference(_)
+            | SignatureToken::MutableReference(_)
+            | SignatureToken::TypeParameter(_)
+            | SignatureToken::U16
+            | SignatureToken::U32
+            | SignatureToken::U256 => {
+                panic!("Invalid unpack -- non-struct value found at top of stack")
+            }
         }
     } else {
         panic!("Invalid unpack -- precondition not satisfied");
@@ -748,7 +885,19 @@ pub fn register_dereference(state: &AbstractState) -> Result<AbstractState, VMEr
                 });
                 Ok(state)
             }
-            _ => Err(VMError::new(
+            SignatureToken::Bool
+            | SignatureToken::U8
+            | SignatureToken::U64
+            | SignatureToken::U128
+            | SignatureToken::Address
+            | SignatureToken::Signer
+            | SignatureToken::Vector(_)
+            | SignatureToken::Struct(_)
+            | SignatureToken::StructInstantiation(_, _)
+            | SignatureToken::TypeParameter(_)
+            | SignatureToken::U16
+            | SignatureToken::U32
+            | SignatureToken::U256 => Err(VMError::new(
                 "Register does not contain a reference".to_string(),
             )),
         }
@@ -807,7 +956,7 @@ pub fn stack_satisfies_function_signature(
         let has = if let SignatureToken::TypeParameter(idx) = parameter {
             if stack_has_all_abilities(state, i, type_parameters[*idx as usize]) {
                 let stack_tok = state.stack_peek(i).unwrap();
-                substitution.check_and_add(state, stack_tok.token, parameter.clone())
+                substitution.check_and_add(stack_tok.token, parameter.clone())
             } else {
                 false
             }
@@ -1350,16 +1499,16 @@ macro_rules! state_never {
 #[macro_export]
 macro_rules! state_stack_bin_op {
     (#left) => {
-        Box::new(move |state| stack_bin_op(state, crate::transitions::StackBinOpResult::Left))
+        Box::new(move |state| stack_bin_op(state, $crate::transitions::StackBinOpResult::Left))
     };
     (#right) => {
-        Box::new(move |state| stack_bin_op(state, crate::transitions::StackBinOpResult::Right))
+        Box::new(move |state| stack_bin_op(state, $crate::transitions::StackBinOpResult::Right))
     };
     () => {
         state_stack_bin_op!(#left)
     };
     ($e: expr) => {
-        Box::new(move |state| stack_bin_op(state, crate::transitions::StackBinOpResult::Other($e)))
+        Box::new(move |state| stack_bin_op(state, $crate::transitions::StackBinOpResult::Other($e)))
     }
 }
 
diff --git a/language/testing-infra/test-generation/tests/comparison_instructions.rs b/language/testing-infra/test-generation/tests/comparison_instructions.rs
index d11b71e68c..fe32abb2d5 100644
--- a/language/testing-infra/test-generation/tests/comparison_instructions.rs
+++ b/language/testing-infra/test-generation/tests/comparison_instructions.rs
@@ -11,8 +11,11 @@ mod common;
 
 const INTEGER_TYPES: &[SignatureToken] = &[
     SignatureToken::U8,
+    SignatureToken::U16,
+    SignatureToken::U32,
     SignatureToken::U64,
     SignatureToken::U128,
+    SignatureToken::U256,
 ];
 
 #[test]
diff --git a/language/testing-infra/test-generation/tests/generic_instructions.rs b/language/testing-infra/test-generation/tests/generic_instructions.rs
index 9e2760a343..66eb17078d 100644
--- a/language/testing-infra/test-generation/tests/generic_instructions.rs
+++ b/language/testing-infra/test-generation/tests/generic_instructions.rs
@@ -4,7 +4,7 @@
 
 extern crate test_generation;
 use move_binary_format::file_format::SignatureToken;
-use test_generation::{abstract_state::AbstractState, transitions::Subst};
+use test_generation::transitions::Subst;
 
 //---------------------------------------------------------------------------
 // Substitution tests
@@ -13,13 +13,12 @@ use test_generation::{abstract_state::AbstractState, transitions::Subst};
 #[test]
 fn unify_no_subst() {
     use SignatureToken::*;
-    let state = AbstractState::new();
     let tys = vec![Bool, U64, Vector(Box::new(U8)), Address];
     for tok1 in tys.iter() {
         for tok2 in tys.iter() {
             let should_unify = tok1.clone() == tok2.clone();
             let mut s = Subst::new();
-            assert!(s.check_and_add(&state, tok1.clone(), tok2.clone()) == should_unify);
+            assert!(s.check_and_add(tok1.clone(), tok2.clone()) == should_unify);
             assert!(s.instantiation().is_empty());
         }
     }
@@ -28,74 +27,69 @@ fn unify_no_subst() {
 #[test]
 fn unify_ty_param_empty_subst1() {
     use SignatureToken::*;
-    let state = AbstractState::new();
     let mut subst = Subst::new();
-    assert!(subst.check_and_add(&state, Bool, TypeParameter(0)));
-    assert!(!subst.check_and_add(&state, U64, TypeParameter(0)));
-    assert!(!subst.check_and_add(&state, TypeParameter(0), U64));
-    assert!(!subst.check_and_add(&state, TypeParameter(1), U64));
-    assert!(subst.check_and_add(&state, U64, TypeParameter(1)));
+    assert!(subst.check_and_add(Bool, TypeParameter(0)));
+    assert!(!subst.check_and_add(U64, TypeParameter(0)));
+    assert!(!subst.check_and_add(TypeParameter(0), U64));
+    assert!(!subst.check_and_add(TypeParameter(1), U64));
+    assert!(subst.check_and_add(U64, TypeParameter(1)));
     // Even if a type parameter can map to an instantiantion (due to a ground type on the stack) a
     // non-grounded type on the stack cannot be unified with a particular instantiation.
-    assert!(!subst.check_and_add(&state, TypeParameter(1), U64));
+    assert!(!subst.check_and_add(TypeParameter(1), U64));
     assert!(subst.instantiation().len() == 2);
 }
 
 #[test]
 fn unify_ty_param_empty_subst2() {
     use SignatureToken::*;
-    let state = AbstractState::new();
     let mut subst = Subst::new();
-    assert!(subst.check_and_add(&state, U64, TypeParameter(0)));
-    assert!(subst.check_and_add(&state, U64, TypeParameter(1)));
-    assert!(subst.check_and_add(&state, Bool, TypeParameter(2)));
+    assert!(subst.check_and_add(U64, TypeParameter(0)));
+    assert!(subst.check_and_add(U64, TypeParameter(1)));
+    assert!(subst.check_and_add(Bool, TypeParameter(2)));
 
-    assert!(!subst.check_and_add(&state, TypeParameter(0), U64));
-    assert!(!subst.check_and_add(&state, TypeParameter(1), U64));
-    assert!(!subst.check_and_add(&state, TypeParameter(2), Bool));
+    assert!(!subst.check_and_add(TypeParameter(0), U64));
+    assert!(!subst.check_and_add(TypeParameter(1), U64));
+    assert!(!subst.check_and_add(TypeParameter(2), Bool));
 
-    assert!(subst.check_and_add(&state, U64, TypeParameter(0)));
-    assert!(subst.check_and_add(&state, U64, TypeParameter(1)));
-    assert!(subst.check_and_add(&state, Bool, TypeParameter(2)));
+    assert!(subst.check_and_add(U64, TypeParameter(0)));
+    assert!(subst.check_and_add(U64, TypeParameter(1)));
+    assert!(subst.check_and_add(Bool, TypeParameter(2)));
 
-    assert!(!subst.check_and_add(&state, TypeParameter(0), TypeParameter(1)));
+    assert!(!subst.check_and_add(TypeParameter(0), TypeParameter(1)));
 
-    assert!(!subst.check_and_add(&state, TypeParameter(0), TypeParameter(2)));
-    assert!(!subst.check_and_add(&state, TypeParameter(1), TypeParameter(2)));
+    assert!(!subst.check_and_add(TypeParameter(0), TypeParameter(2)));
+    assert!(!subst.check_and_add(TypeParameter(1), TypeParameter(2)));
 
-    assert!(!subst.check_and_add(&state, TypeParameter(2), TypeParameter(0)));
-    assert!(!subst.check_and_add(&state, TypeParameter(2), TypeParameter(1)));
+    assert!(!subst.check_and_add(TypeParameter(2), TypeParameter(0)));
+    assert!(!subst.check_and_add(TypeParameter(2), TypeParameter(1)));
     assert!(subst.instantiation().len() == 3);
 }
 
 #[test]
 fn unify_ty_params_infinite() {
     use SignatureToken::*;
-    let state = AbstractState::new();
     let mut subst = Subst::new();
-    assert!(subst.check_and_add(&state, TypeParameter(0), TypeParameter(1)));
-    assert!(subst.check_and_add(&state, TypeParameter(1), TypeParameter(0)));
+    assert!(subst.check_and_add(TypeParameter(0), TypeParameter(1)));
+    assert!(subst.check_and_add(TypeParameter(1), TypeParameter(0)));
     // These should both return false.
-    assert!(!subst.check_and_add(&state, Bool, TypeParameter(0)));
-    assert!(!subst.check_and_add(&state, TypeParameter(0), Bool));
+    assert!(!subst.check_and_add(Bool, TypeParameter(0)));
+    assert!(!subst.check_and_add(TypeParameter(0), Bool));
 }
 
 #[test]
 fn unify_ty_param_empty_subst3() {
     use SignatureToken::*;
-    let state = AbstractState::new();
     let mut subst = Subst::new();
-    assert!(subst.check_and_add(&state, TypeParameter(1), TypeParameter(0)));
+    assert!(subst.check_and_add(TypeParameter(1), TypeParameter(0)));
     assert!(subst.instantiation().len() == 1);
 }
 
 #[test]
 fn unify_ty_param_empty_subst4() {
     use SignatureToken::*;
-    let state = AbstractState::new();
     let mut subst = Subst::new();
-    assert!(subst.check_and_add(&state, Bool, TypeParameter(0)));
-    assert!(!subst.check_and_add(&state, U64, TypeParameter(0)));
-    assert!(subst.check_and_add(&state, U64, TypeParameter(1)));
-    assert!(subst.check_and_add(&state, U64, TypeParameter(2)));
+    assert!(subst.check_and_add(Bool, TypeParameter(0)));
+    assert!(!subst.check_and_add(U64, TypeParameter(0)));
+    assert!(subst.check_and_add(U64, TypeParameter(1)));
+    assert!(subst.check_and_add(U64, TypeParameter(2)));
 }
diff --git a/language/testing-infra/test-generation/tests/integer_instructions.rs b/language/testing-infra/test-generation/tests/integer_instructions.rs
index b5b4d7aced..0e4bda13fe 100644
--- a/language/testing-infra/test-generation/tests/integer_instructions.rs
+++ b/language/testing-infra/test-generation/tests/integer_instructions.rs
@@ -11,8 +11,11 @@ mod common;
 
 const INTEGER_TYPES: &[SignatureToken] = &[
     SignatureToken::U8,
+    SignatureToken::U16,
+    SignatureToken::U32,
     SignatureToken::U64,
     SignatureToken::U128,
+    SignatureToken::U256,
 ];
 
 #[test]
@@ -64,9 +67,26 @@ fn bytecode_shl_shr() {
 fn bytecode_casting_ops() {
     for (op, ty1, ty2) in [
         (Bytecode::CastU8, SignatureToken::U8, SignatureToken::U8),
+        (Bytecode::CastU16, SignatureToken::U16, SignatureToken::U16),
+        (Bytecode::CastU16, SignatureToken::U16, SignatureToken::U8),
+        (Bytecode::CastU32, SignatureToken::U32, SignatureToken::U32),
+        (Bytecode::CastU32, SignatureToken::U32, SignatureToken::U8),
+        (Bytecode::CastU32, SignatureToken::U32, SignatureToken::U16),
         (Bytecode::CastU64, SignatureToken::U64, SignatureToken::U8),
+        (Bytecode::CastU64, SignatureToken::U64, SignatureToken::U16),
+        (Bytecode::CastU64, SignatureToken::U64, SignatureToken::U32),
         (Bytecode::CastU64, SignatureToken::U64, SignatureToken::U64),
         (Bytecode::CastU128, SignatureToken::U128, SignatureToken::U8),
+        (
+            Bytecode::CastU128,
+            SignatureToken::U128,
+            SignatureToken::U16,
+        ),
+        (
+            Bytecode::CastU128,
+            SignatureToken::U128,
+            SignatureToken::U32,
+        ),
         (
             Bytecode::CastU128,
             SignatureToken::U128,
@@ -77,6 +97,32 @@ fn bytecode_casting_ops() {
             SignatureToken::U128,
             SignatureToken::U128,
         ),
+        (Bytecode::CastU256, SignatureToken::U256, SignatureToken::U8),
+        (
+            Bytecode::CastU256,
+            SignatureToken::U256,
+            SignatureToken::U16,
+        ),
+        (
+            Bytecode::CastU256,
+            SignatureToken::U256,
+            SignatureToken::U32,
+        ),
+        (
+            Bytecode::CastU256,
+            SignatureToken::U256,
+            SignatureToken::U64,
+        ),
+        (
+            Bytecode::CastU256,
+            SignatureToken::U256,
+            SignatureToken::U128,
+        ),
+        (
+            Bytecode::CastU256,
+            SignatureToken::U256,
+            SignatureToken::U256,
+        ),
     ]
     .iter()
     {
diff --git a/language/testing-infra/transactional-test-runner/Cargo.toml b/language/testing-infra/transactional-test-runner/Cargo.toml
index 798ecae63d..0a0ca41390 100644
--- a/language/testing-infra/transactional-test-runner/Cargo.toml
+++ b/language/testing-infra/transactional-test-runner/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
@@ -20,6 +20,7 @@ tempfile = "3.2.0"
 
 
 move-stackless-bytecode-interpreter = { path = "../../move-prover/interpreter" }
+move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
 move-bytecode-source-map = { path = "../../move-ir-compiler/move-bytecode-source-map" }
 move-disassembler = { path = "../../tools/move-disassembler" }
 move-binary-format = { path = "../../move-binary-format" }
@@ -44,3 +45,6 @@ difference = "2.0.0"
 [[test]]
 name = "tests"
 harness = false
+
+[features]
+failpoints = ['move-vm-runtime/failpoints']
diff --git a/language/testing-infra/transactional-test-runner/src/framework.rs b/language/testing-infra/transactional-test-runner/src/framework.rs
index 7ed6121700..5f8a2d5d4d 100644
--- a/language/testing-infra/transactional-test-runner/src/framework.rs
+++ b/language/testing-infra/transactional-test-runner/src/framework.rs
@@ -41,7 +41,7 @@ use move_vm_runtime::session::SerializedReturnValues;
 use rayon::iter::Either;
 use std::{
     collections::{BTreeMap, BTreeSet, VecDeque},
-    fmt::Debug,
+    fmt::{Debug, Write as FmtWrite},
     io::Write,
     path::Path,
 };
@@ -661,17 +661,18 @@ where
             Adapter::ExtraRunArgs,
             Adapter::Subcommand,
         >,
-    >(path)
-    .unwrap()
+    >(path)?
     .into_iter()
     .collect::<VecDeque<_>>();
     assert!(!tasks.is_empty());
     let num_tasks = tasks.len();
-    output.push_str(&format!(
-        "processed {} task{}\n",
+    writeln!(
+        &mut output,
+        "processed {} task{}",
         num_tasks,
         if num_tasks > 1 { "s" } else { "" }
-    ));
+    )
+    .unwrap();
 
     let first_task = tasks.pop_front().unwrap();
     let init_opt = match &first_task.command {
@@ -687,7 +688,7 @@ where
     let (mut adapter, result_opt) =
         Adapter::init(default_syntax, fully_compiled_program_opt, init_opt);
     if let Some(result) = result_opt {
-        output.push_str(&format!("\ninit:\n{}\n", result))
+        writeln!(output, "\ninit:\n{}", result)?;
     }
     for task in tasks {
         handle_known_task(&mut output, &mut adapter, task);
@@ -720,10 +721,13 @@ fn handle_known_task<'a, Adapter: MoveTestAdapter<'a>>(
         Err(e) => format!("Error: {}", e),
     };
     assert!(!result_string.is_empty());
-    output.push_str(&format!(
-        "\ntask {} '{}'. lines {}-{}:\n{}\n",
+
+    writeln!(
+        output,
+        "\ntask {} '{}'. lines {}-{}:\n{}",
         task_number, task_name, start_line, stop_line, result_string
-    ));
+    )
+    .unwrap();
 }
 
 fn handle_expected_output(test_path: &Path, output: impl AsRef<str>) -> Result<()> {
@@ -742,7 +746,7 @@ fn handle_expected_output(test_path: &Path, output: impl AsRef<str>) -> Result<(
     let expected_output = std::fs::read_to_string(&exp_path)
         .unwrap()
         .replace("\r\n", "\n")
-        .replace("\r", "\n");
+        .replace('\r', "\n");
     if output != expected_output {
         let msg = format!(
             "Expected errors differ from actual errors:\n{}",
diff --git a/language/testing-infra/transactional-test-runner/src/vm_test_harness.rs b/language/testing-infra/transactional-test-runner/src/vm_test_harness.rs
index 1e1fcfd7cd..e8e2180a4a 100644
--- a/language/testing-infra/transactional-test-runner/src/vm_test_harness.rs
+++ b/language/testing-infra/transactional-test-runner/src/vm_test_harness.rs
@@ -9,7 +9,9 @@ use crate::{
     tasks::{EmptyCommand, InitCommand, SyntaxChoice, TaskInput},
 };
 use anyhow::{anyhow, Result};
+use clap::Parser;
 use move_binary_format::{
+    compatibility::Compatibility,
     errors::{Location, VMError, VMResult},
     file_format::CompiledScript,
     CompiledModule,
@@ -31,11 +33,11 @@ use move_resource_viewer::MoveValueAnnotator;
 use move_stdlib::move_stdlib_named_addresses;
 use move_symbol_pool::Symbol;
 use move_vm_runtime::{
+    config::VMConfig,
     move_vm::MoveVM,
     session::{SerializedReturnValues, Session},
 };
-use move_vm_test_utils::InMemoryStorage;
-use move_vm_types::gas_schedule::GasStatus;
+use move_vm_test_utils::{gas_schedule::GasStatus, InMemoryStorage};
 use once_cell::sync::Lazy;
 
 const STD_ADDR: AccountAddress = AccountAddress::ONE;
@@ -68,11 +70,30 @@ pub fn view_resource_in_move_storage(
     }
 }
 
+#[derive(Debug, Parser)]
+pub struct AdapterPublishArgs {
+    #[clap(long)]
+    /// is skip the struct_and_pub_function_linking compatibility check
+    pub skip_check_struct_and_pub_function_linking: bool,
+    #[clap(long)]
+    /// is skip the struct_layout compatibility check
+    pub skip_check_struct_layout: bool,
+    #[clap(long)]
+    /// is skip the check friend link, if true, treat `friend` as `private`
+    pub skip_check_friend_linking: bool,
+}
+
+#[derive(Debug, Parser)]
+pub struct AdapterExecuteArgs {
+    #[clap(long)]
+    pub check_runtime_types: bool,
+}
+
 impl<'a> MoveTestAdapter<'a> for SimpleVMTestAdapter<'a> {
     type ExtraInitArgs = EmptyCommand;
-    type ExtraPublishArgs = EmptyCommand;
+    type ExtraPublishArgs = AdapterPublishArgs;
     type ExtraValueArgs = ();
-    type ExtraRunArgs = EmptyCommand;
+    type ExtraRunArgs = AdapterExecuteArgs;
     type Subcommand = EmptyCommand;
 
     fn compiled_state(&mut self) -> &mut CompiledState<'a> {
@@ -112,19 +133,23 @@ impl<'a> MoveTestAdapter<'a> for SimpleVMTestAdapter<'a> {
         };
 
         adapter
-            .perform_session_action(None, |session, gas_status| {
-                for module in &*MOVE_STDLIB_COMPILED {
-                    let mut module_bytes = vec![];
-                    module.serialize(&mut module_bytes).unwrap();
-
-                    let id = module.self_id();
-                    let sender = *id.address();
-                    session
-                        .publish_module(module_bytes, sender, gas_status)
-                        .unwrap();
-                }
-                Ok(())
-            })
+            .perform_session_action(
+                None,
+                |session, gas_status| {
+                    for module in &*MOVE_STDLIB_COMPILED {
+                        let mut module_bytes = vec![];
+                        module.serialize(&mut module_bytes).unwrap();
+
+                        let id = module.self_id();
+                        let sender = *id.address();
+                        session
+                            .publish_module(module_bytes, sender, gas_status)
+                            .unwrap();
+                    }
+                    Ok(())
+                },
+                VMConfig::default(),
+            )
             .unwrap();
         let mut addr_to_name_mapping = BTreeMap::new();
         for (name, addr) in move_stdlib_named_addresses() {
@@ -148,16 +173,31 @@ impl<'a> MoveTestAdapter<'a> for SimpleVMTestAdapter<'a> {
         module: CompiledModule,
         _named_addr_opt: Option<Identifier>,
         gas_budget: Option<u64>,
-        _extra_args: Self::ExtraPublishArgs,
+        extra_args: Self::ExtraPublishArgs,
     ) -> Result<(Option<String>, CompiledModule)> {
         let mut module_bytes = vec![];
         module.serialize(&mut module_bytes)?;
 
         let id = module.self_id();
         let sender = *id.address();
-        match self.perform_session_action(gas_budget, |session, gas_status| {
-            session.publish_module(module_bytes, sender, gas_status)
-        }) {
+        match self.perform_session_action(
+            gas_budget,
+            |session, gas_status| {
+                let compat = Compatibility::new(
+                    !extra_args.skip_check_struct_and_pub_function_linking,
+                    !extra_args.skip_check_struct_layout,
+                    !extra_args.skip_check_friend_linking,
+                );
+
+                session.publish_module_bundle_with_compat_config(
+                    vec![module_bytes],
+                    sender,
+                    gas_status,
+                    compat,
+                )
+            },
+            VMConfig::default(),
+        ) {
             Ok(()) => Ok((None, module)),
             Err(e) => Err(anyhow!(
                 "Unable to publish module '{}'. Got VMError: {}",
@@ -174,7 +214,7 @@ impl<'a> MoveTestAdapter<'a> for SimpleVMTestAdapter<'a> {
         signers: Vec<ParsedAddress>,
         txn_args: Vec<MoveValue>,
         gas_budget: Option<u64>,
-        _extra_args: Self::ExtraRunArgs,
+        extra_args: Self::ExtraRunArgs,
     ) -> Result<(Option<String>, SerializedReturnValues)> {
         let signers: Vec<_> = signers
             .into_iter()
@@ -195,9 +235,13 @@ impl<'a> MoveTestAdapter<'a> for SimpleVMTestAdapter<'a> {
             .chain(args)
             .collect();
         let serialized_return_values = self
-            .perform_session_action(gas_budget, |session, gas_status| {
-                session.execute_script(script_bytes, type_args, args, gas_status)
-            })
+            .perform_session_action(
+                gas_budget,
+                |session, gas_status| {
+                    session.execute_script(script_bytes, type_args, args, gas_status)
+                },
+                VMConfig::from(extra_args),
+            )
             .map_err(|e| {
                 anyhow!(
                     "Script execution failed with VMError: {}",
@@ -215,7 +259,7 @@ impl<'a> MoveTestAdapter<'a> for SimpleVMTestAdapter<'a> {
         signers: Vec<ParsedAddress>,
         txn_args: Vec<MoveValue>,
         gas_budget: Option<u64>,
-        _extra_args: Self::ExtraRunArgs,
+        extra_args: Self::ExtraRunArgs,
     ) -> Result<(Option<String>, SerializedReturnValues)> {
         let signers: Vec<_> = signers
             .into_iter()
@@ -233,11 +277,15 @@ impl<'a> MoveTestAdapter<'a> for SimpleVMTestAdapter<'a> {
             .chain(args)
             .collect();
         let serialized_return_values = self
-            .perform_session_action(gas_budget, |session, gas_status| {
-                session.execute_function_bypass_visibility(
-                    module, function, type_args, args, gas_status,
-                )
-            })
+            .perform_session_action(
+                gas_budget,
+                |session, gas_status| {
+                    session.execute_function_bypass_visibility(
+                        module, function, type_args, args, gas_status,
+                    )
+                },
+                VMConfig::from(extra_args),
+            )
             .map_err(|e| {
                 anyhow!(
                     "Function execution failed with VMError: {}",
@@ -290,12 +338,21 @@ impl<'a> SimpleVMTestAdapter<'a> {
         &mut self,
         gas_budget: Option<u64>,
         f: impl FnOnce(&mut Session<InMemoryStorage>, &mut GasStatus) -> VMResult<Ret>,
+        vm_config: VMConfig,
     ) -> VMResult<Ret> {
         // start session
-        let vm = MoveVM::new(move_stdlib::natives::all_natives(STD_ADDR)).unwrap();
+        let vm = MoveVM::new_with_config(
+            move_stdlib::natives::all_natives(
+                STD_ADDR,
+                // TODO: come up with a suitable gas schedule
+                move_stdlib::natives::GasParameters::zeros(),
+            ),
+            vm_config,
+        )
+        .unwrap();
         let (mut session, mut gas_status) = {
             let gas_status = move_cli::sandbox::utils::get_gas_status(
-                &move_vm_types::gas_schedule::INITIAL_COST_SCHEDULE,
+                &move_vm_test_utils::gas_schedule::INITIAL_COST_SCHEDULE,
                 gas_budget,
             )
             .unwrap();
@@ -366,3 +423,12 @@ static MOVE_STDLIB_COMPILED: Lazy<Vec<CompiledModule>> = Lazy::new(|| {
 pub fn run_test(path: &Path) -> Result<(), Box<dyn std::error::Error>> {
     run_test_impl::<SimpleVMTestAdapter>(path, Some(&*PRECOMPILED_MOVE_STDLIB))
 }
+
+impl From<AdapterExecuteArgs> for VMConfig {
+    fn from(arg: AdapterExecuteArgs) -> VMConfig {
+        VMConfig {
+            paranoid_type_checks: arg.check_runtime_types,
+            ..Default::default()
+        }
+    }
+}
diff --git a/language/testing-infra/transactional-test-runner/tests/vm_test_harness/print_bytecode.exp b/language/testing-infra/transactional-test-runner/tests/vm_test_harness/print_bytecode.exp
index 064d865d2e..63913468d5 100644
--- a/language/testing-infra/transactional-test-runner/tests/vm_test_harness/print_bytecode.exp
+++ b/language/testing-infra/transactional-test-runner/tests/vm_test_harness/print_bytecode.exp
@@ -1,7 +1,7 @@
 processed 2 tasks
 
 task 0 'print-bytecode'. lines 1-5:
-// Move bytecode v5
+// Move bytecode v6
 script {
 
 
@@ -12,7 +12,7 @@ B0:
 }
 
 task 1 'print-bytecode'. lines 7-13:
-// Move bytecode v5
+// Move bytecode v6
 module 42.M {
 
 
diff --git a/language/tools/move-bytecode-utils/Cargo.toml b/language/tools/move-bytecode-utils/Cargo.toml
index f42c6d15ec..fbf52faf22 100644
--- a/language/tools/move-bytecode-utils/Cargo.toml
+++ b/language/tools/move-bytecode-utils/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
diff --git a/language/tools/move-bytecode-utils/src/layout.rs b/language/tools/move-bytecode-utils/src/layout.rs
index 2d58401753..c054adff1e 100644
--- a/language/tools/move-bytecode-utils/src/layout.rs
+++ b/language/tools/move-bytecode-utils/src/layout.rs
@@ -17,7 +17,12 @@ use move_core_types::{
     value::{MoveFieldLayout, MoveStructLayout, MoveTypeLayout},
 };
 use serde_reflection::{ContainerFormat, Format, Named, Registry};
-use std::{borrow::Borrow, collections::BTreeMap, convert::TryInto, fmt::Debug};
+use std::{
+    borrow::Borrow,
+    collections::BTreeMap,
+    convert::TryInto,
+    fmt::{Debug, Write},
+};
 
 /// Name of the Move `address` type in the serde registry
 const ADDRESS: &str = "AccountAddress";
@@ -25,38 +30,57 @@ const ADDRESS: &str = "AccountAddress";
 /// Name of the Move `signer` type in the serde registry
 const SIGNER: &str = "Signer";
 
+/// Name of the Move `u256` type in the serde registry
+const U256_SERDE_NAME: &str = "u256";
+
 /// Type for building a registry of serde-reflection friendly struct layouts for Move types.
 /// The layouts created by this type are intended to be passed to the serde-generate tool to create
 /// struct bindings for Move types in source languages that use Move-based services.
-/// The LayoutBuilder can operate in two modes: "deep" and "shallow".
-/// In shallow mode, it will generate a single layout for the struct or type passed in by the user
-/// (under the assumption that layouts for dependencies have been generated previously).
-/// In deep mode, it will generate layouts for all of the (transitive) dependencies of the type passed
-/// in, as well as layouts for the Move ground types like `address` and `signer`. The result is a
-/// self-contained registry with no unbound typenames
-pub struct SerdeLayoutBuilder<T> {
+pub struct SerdeLayoutBuilder<'a, T> {
     registry: Registry,
-    module_resolver: T,
-    /// If true, operate in shallow mode; else, operate in deep mode
-    shallow: bool,
+    module_resolver: &'a T,
+    config: SerdeLayoutConfig,
 }
 
-impl<T: GetModule> SerdeLayoutBuilder<T> {
+#[derive(Default)]
+pub struct SerdeLayoutConfig {
+    /// If separator is Some, replace all Move source syntax separators ("::" for address/struct/module name
+    /// separation, "<", ">", and "," for generics separation) with this string.
+    /// If separator is None, use the same syntax as Move source
+    pub separator: Option<String>,
+    /// If true, do not include addresses in fully qualified type names.
+    /// If there is a name conflict (e.g., the registry we're building has both
+    /// 0x1::M::T and 0x2::M::T), layout generation will fail when this option is true.
+    pub omit_addresses: bool,
+    /// If true, do not include phantom types in fully qualified type names, since they do not contribute to the layout
+    /// E.g., if we have `struct S<phantom T> { u: 64 }` and try to generate bindings for this struct with `T = u8`,
+    /// the name for `S` in the registry will be `S<u64>` when this option is false, and `S` when this option is true
+    pub ignore_phantom_types: bool,
+    /// The LayoutBuilder can operate in two modes: "deep" and "shallow".
+    /// In shallow mode, generate a single layout for the struct or type passed in by the user
+    /// (under the assumption that layouts for dependencies have been generated previously).
+    /// In deep mode, it generate layouts for all of the (transitive) dependencies of the type passed
+    /// in, as well as layouts for the Move ground types like `address` and `signer`. The result is a
+    /// self-contained registry with no unbound typenames
+    pub shallow: bool,
+}
+
+impl<'a, T: GetModule> SerdeLayoutBuilder<'a, T> {
     /// Create a `LayoutBuilder` with an empty registry and deep layout resolution
-    pub fn new(module_resolver: T) -> Self {
+    pub fn new(module_resolver: &'a T) -> Self {
         Self {
             registry: Self::default_registry(),
             module_resolver,
-            shallow: false,
+            config: SerdeLayoutConfig::default(),
         }
     }
 
     /// Create a `LayoutBuilder` with an empty registry and shallow layout resolution
-    pub fn new_shallow(module_resolver: T) -> Self {
+    pub fn new_with_config(module_resolver: &'a T, config: SerdeLayoutConfig) -> Self {
         Self {
-            registry: BTreeMap::new(),
+            registry: Self::default_registry(),
             module_resolver,
-            shallow: true,
+            config,
         }
     }
 
@@ -102,8 +126,7 @@ impl<T: GetModule> SerdeLayoutBuilder<T> {
             .iter()
             .map(|t| self.build_type_layout(t.clone()))
             .collect::<Result<Vec<Format>, T::Error>>()?;
-        let shallow = false;
-        self.build_struct_layout_(&s.module_id(), &s.name, &serde_type_args, shallow)
+        self.build_struct_layout_(&s.module_id(), &s.name, &serde_type_args)
     }
 
     fn build_normalized_type_layout(
@@ -115,8 +138,11 @@ impl<T: GetModule> SerdeLayoutBuilder<T> {
         Ok(match t {
             Bool => Format::Bool,
             U8 => Format::U8,
+            U16 => Format::U16,
+            U32 => Format::U32,
             U64 => Format::U64,
             U128 => Format::U128,
+            U256 => Format::TypeName(U256_SERDE_NAME.to_string()),
             Address => Format::TypeName(ADDRESS.to_string()),
             Signer => Format::TypeName(SIGNER.to_string()),
             Struct {
@@ -130,7 +156,7 @@ impl<T: GetModule> SerdeLayoutBuilder<T> {
                     .map(|t| self.build_normalized_type_layout(t, input_type_args))
                     .collect::<Result<Vec<Format>, T::Error>>()?;
                 let declaring_module = ModuleId::new(*address, module.clone());
-                self.build_struct_layout_(&declaring_module, name, &serde_type_args, self.shallow)?
+                self.build_struct_layout_(&declaring_module, name, &serde_type_args)?
             }
             Vector(inner_t) => {
                 if matches!(inner_t.as_ref(), U8) {
@@ -152,66 +178,129 @@ impl<T: GetModule> SerdeLayoutBuilder<T> {
         module_id: &ModuleId,
         name: &Identifier,
         type_arguments: &[Format],
-        shallow: bool,
     ) -> Result<Format, T::Error> {
         // build a human-readable name for the struct type. this should do the same thing as
         // StructTag::display(), but it's not easy to use that code here
+
+        let declaring_module = self
+            .module_resolver
+            .get_module_by_id(module_id)?
+            .expect("Failed to resolve module");
+        let def = declaring_module
+            .borrow()
+            .find_struct_def_by_name(name)
+            .unwrap_or_else(|| {
+                panic!(
+                    "Could not find struct named {} in module {}",
+                    name,
+                    declaring_module.borrow().name()
+                )
+            });
+        let normalized_struct = Struct::new(declaring_module.borrow(), def).1;
+        assert_eq!(
+            normalized_struct.type_parameters.len(),
+            type_arguments.len(),
+            "Wrong number of type arguments for struct"
+        );
+
         let generics: Vec<String> = type_arguments
             .iter()
-            .map(|t| Self::print_format_type(t))
+            .zip(normalized_struct.type_parameters.iter())
+            .filter_map(|(type_arg, type_param)| {
+                if self.config.ignore_phantom_types && type_param.is_phantom {
+                    // do not include phantom type arguments in the struct key, since they do not affect the struct layout
+                    None
+                } else {
+                    Some(print_format_type(type_arg))
+                }
+            })
             .collect();
-        let struct_key = format!("{}::{}<{}>", module_id, name, generics.join(","));
-        if !shallow && !self.registry.contains_key(&struct_key) {
-            let declaring_module = self
-                .module_resolver
-                .get_module_by_id(module_id)?
-                .expect("Failed to resolve module");
-            let def = declaring_module
-                .borrow()
-                .find_struct_def_by_name(name)
-                .unwrap_or_else(|| {
+        let mut struct_key = String::new();
+        if !self.config.omit_addresses {
+            write!(
+                struct_key,
+                "{}{}",
+                module_id.address(),
+                self.config.separator.as_deref().unwrap_or("::")
+            )
+            .unwrap();
+        }
+        write!(
+            struct_key,
+            "{}{}{}",
+            module_id.name(),
+            self.config.separator.as_deref().unwrap_or("::"),
+            name
+        )
+        .unwrap();
+        if !generics.is_empty() {
+            write!(
+                struct_key,
+                "{}{}{}",
+                self.config.separator.as_deref().unwrap_or("<"),
+                generics.join(self.config.separator.as_deref().unwrap_or(",")),
+                self.config.separator.as_deref().unwrap_or(">")
+            )
+            .unwrap()
+        }
+        if self.config.shallow {
+            return Ok(Format::TypeName(struct_key));
+        }
+
+        if let Some(old_struct) = self.registry.get(&struct_key) {
+            if self.config.omit_addresses || self.config.separator.is_some() {
+                // check for conflicts (e.g., 0x1::M::T and 0x2::M::T that both get stripped to M::T because
+                // omit_addresses is on)
+                if old_struct.clone()
+                    != self.generate_serde_struct(normalized_struct, type_arguments)?
+                {
                     panic!(
-                        "Could not find struct named {} in module {}",
-                        name,
-                        declaring_module.borrow().name()
+                        "Name conflict: multiple structs with name {}, but different addresses",
+                        struct_key
                     )
-                });
-            let normalized_struct = Struct::new(declaring_module.borrow(), def).1;
-            assert_eq!(
-                normalized_struct.type_parameters.len(),
-                type_arguments.len(),
-                "Wrong number of type arguments for struct"
-            );
-            let fields = normalized_struct
-                .fields
-                .iter()
-                .map(|f| {
-                    self.build_normalized_type_layout(&f.type_, type_arguments)
-                        .map(|value| Named {
-                            name: f.name.to_string(),
-                            value,
-                        })
-                })
-                .collect::<Result<Vec<Named<Format>>, T::Error>>()?;
-
-            let serde_struct = ContainerFormat::Struct(fields);
-            // update cache
+                }
+            }
+        } else {
+            // not found--generate and update registry
+            let serde_struct = self.generate_serde_struct(normalized_struct, type_arguments)?;
             self.registry.insert(struct_key.clone(), serde_struct);
-        } // else, it's shallow mode or we already generated a layout for the type
+        }
+
         Ok(Format::TypeName(struct_key))
     }
 
-    fn print_format_type(t: &Format) -> String {
-        match t {
-            Format::TypeName(s) => s.to_string(),
-            Format::Bool => "bool".to_string(),
-            Format::U8 => "u8".to_string(),
-            Format::U64 => "u64".to_string(),
-            Format::U128 => "u128".to_string(),
-            Format::Bytes => "vector<u8>".to_string(),
-            Format::Seq(inner) => format!("vector<{}>", Self::print_format_type(inner)),
-            v => unimplemented!("Printing format value {:?}", v),
-        }
+    fn generate_serde_struct(
+        &mut self,
+        normalized_struct: Struct,
+        type_arguments: &[Format],
+    ) -> Result<ContainerFormat, T::Error> {
+        let fields = normalized_struct
+            .fields
+            .iter()
+            .map(|f| {
+                self.build_normalized_type_layout(&f.type_, type_arguments)
+                    .map(|value| Named {
+                        name: f.name.to_string(),
+                        value,
+                    })
+            })
+            .collect::<Result<Vec<Named<Format>>, T::Error>>()?;
+        Ok(ContainerFormat::Struct(fields))
+    }
+}
+
+fn print_format_type(t: &Format) -> String {
+    match t {
+        Format::TypeName(s) => s.to_string(),
+        Format::Bool => "bool".to_string(),
+        Format::U8 => "u8".to_string(),
+        Format::U16 => "u16".to_string(),
+        Format::U32 => "u32".to_string(),
+        Format::U64 => "u64".to_string(),
+        Format::U128 => "u128".to_string(),
+        Format::Bytes => "vector<u8>".to_string(),
+        Format::Seq(inner) => format!("vector<{}>", print_format_type(inner)),
+        v => unimplemented!("Printing format value {:?}", v),
     }
 }
 
@@ -256,8 +345,11 @@ impl TypeLayoutBuilder {
         Ok(match t {
             Bool => MoveTypeLayout::Bool,
             U8 => MoveTypeLayout::U8,
+            U16 => MoveTypeLayout::U16,
+            U32 => MoveTypeLayout::U32,
             U64 => MoveTypeLayout::U64,
             U128 => MoveTypeLayout::U128,
+            U256 => MoveTypeLayout::U256,
             Address => MoveTypeLayout::Address,
             Signer => bail!("Type layouts cannot contain signer"),
             Vector(elem_t) => {
@@ -316,8 +408,11 @@ impl TypeLayoutBuilder {
             TypeParameter(i) => type_arguments[*i as usize].clone(),
             Bool => MoveTypeLayout::Bool,
             U8 => MoveTypeLayout::U8,
+            U16 => MoveTypeLayout::U16,
+            U32 => MoveTypeLayout::U32,
             U64 => MoveTypeLayout::U64,
             U128 => MoveTypeLayout::U128,
+            U256 => MoveTypeLayout::U256,
             Address => MoveTypeLayout::Address,
             Signer => bail!("Type layouts cannot contain signer"),
             Reference(_) | MutableReference(_) => bail!("Type layouts cannot contain references"),
diff --git a/language/tools/move-bytecode-utils/src/lib.rs b/language/tools/move-bytecode-utils/src/lib.rs
index 891a40429e..f946b3b84c 100644
--- a/language/tools/move-bytecode-utils/src/lib.rs
+++ b/language/tools/move-bytecode-utils/src/lib.rs
@@ -72,13 +72,12 @@ impl<'a> Modules<'a> {
         &'a self,
         all_deps: &mut Vec<&'a CompiledModule>,
         module: &'a CompiledModule,
-        loader: &'a Modules,
     ) -> Result<()> {
         let next_deps = module.immediate_dependencies();
         all_deps.push(module);
         for next in next_deps {
             let next_module = self.get_module(&next)?;
-            self.get_transitive_dependencies_(all_deps, next_module, loader)?;
+            self.get_transitive_dependencies_(all_deps, next_module)?;
         }
         Ok(())
     }
@@ -90,7 +89,7 @@ impl<'a> Modules<'a> {
     ) -> Result<Vec<&CompiledModule>> {
         let mut all_deps = vec![];
         for dep in self.get_immediate_dependencies(module_id)? {
-            self.get_transitive_dependencies_(&mut all_deps, dep, self)?;
+            self.get_transitive_dependencies_(&mut all_deps, dep)?;
         }
         Ok(all_deps)
     }
diff --git a/language/tools/move-bytecode-utils/src/module_cache.rs b/language/tools/move-bytecode-utils/src/module_cache.rs
index d3ebb32c06..e2b62a9a09 100644
--- a/language/tools/move-bytecode-utils/src/module_cache.rs
+++ b/language/tools/move-bytecode-utils/src/module_cache.rs
@@ -39,6 +39,10 @@ impl<R: ModuleResolver> ModuleCache<R> {
     pub fn add(&self, id: ModuleId, m: CompiledModule) {
         self.cache.borrow_mut().insert(id, m);
     }
+
+    pub fn len(&self) -> usize {
+        self.cache.borrow().len()
+    }
 }
 
 impl<R: ModuleResolver> GetModule for ModuleCache<R> {
@@ -80,6 +84,10 @@ impl<R: ModuleResolver> SyncModuleCache<R> {
     pub fn add(&self, id: ModuleId, m: CompiledModule) {
         self.cache.write().unwrap().insert(id, Arc::new(m));
     }
+
+    pub fn len(&self) -> usize {
+        self.cache.read().unwrap().len()
+    }
 }
 
 impl<R: ModuleResolver> GetModule for SyncModuleCache<R> {
diff --git a/language/tools/move-bytecode-viewer/Cargo.toml b/language/tools/move-bytecode-viewer/Cargo.toml
index 82e2ab8d68..43b921483c 100644
--- a/language/tools/move-bytecode-viewer/Cargo.toml
+++ b/language/tools/move-bytecode-viewer/Cargo.toml
@@ -5,12 +5,12 @@ authors = ["Diem Association <opensource@diem.com>"]
 description = "Explore Move bytecode and how the source code compiles to it"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 clap = { version = "3.1.8", features = ["derive"] }
 anyhow = "1.0.52"
-regex = "1.1.9"
+regex = "1.5.5"
 tui = "0.17.0"
 crossterm = "0.21"
 
diff --git a/language/tools/move-bytecode-viewer/src/bytecode_viewer.rs b/language/tools/move-bytecode-viewer/src/bytecode_viewer.rs
index 7279cab34d..4abbcabfdb 100644
--- a/language/tools/move-bytecode-viewer/src/bytecode_viewer.rs
+++ b/language/tools/move-bytecode-viewer/src/bytecode_viewer.rs
@@ -107,6 +107,6 @@ impl LeftScreen for BytecodeViewer<'_> {
     }
 
     fn backing_string(&self) -> String {
-        self.lines.join("\n").replace("\t", "    ")
+        self.lines.join("\n").replace('\t', "    ")
     }
 }
diff --git a/language/tools/move-cli/Cargo.toml b/language/tools/move-cli/Cargo.toml
index feb3bad0df..7802ba99b7 100644
--- a/language/tools/move-cli/Cargo.toml
+++ b/language/tools/move-cli/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
@@ -21,9 +21,15 @@ tempfile = "3.2.0"
 walkdir = "2.3.1"
 codespan-reporting = "0.11.1"
 itertools = "0.10.0"
-bcs = "0.1.2"
+serde_json = "1.0"
+toml_edit =  { version = "0.14.3", features = ["easy"] }
+reqwest = { version = "0.11.1", features = ["blocking", "json"] }
+
+bcs.workspace = true
+
 move-bytecode-verifier = { path = "../../move-bytecode-verifier" }
 move-disassembler = { path = "../move-disassembler" }
+move-docgen = { path = "../../move-prover/move-docgen" }
 move-command-line-common = { path = "../../move-command-line-common" }
 move-bytecode-utils = { path = "../move-bytecode-utils" }
 move-coverage = { path = "../move-coverage" }
@@ -35,6 +41,7 @@ move-table-extension = { path = "../../extensions/move-table-extension", optiona
 move-symbol-pool = { path = "../../move-symbol-pool" }
 move-vm-types = { path = "../../move-vm/types" }
 move-vm-runtime = { path = "../../move-vm/runtime", features = ["debugging"] }
+move-vm-test-utils = { path = "../../move-vm/test-utils" }
 read-write-set = { path = "../read-write-set" }
 read-write-set-dynamic = { path = "../read-write-set/dynamic" }
 move-resource-viewer = { path = "../move-resource-viewer" }
@@ -48,6 +55,7 @@ move-bytecode-viewer = { path = "../move-bytecode-viewer" }
 
 [dev-dependencies]
 datatest-stable = "0.1.1"
+httpmock = "0.6.6"
 
 [[bin]]
 name = "move"
diff --git a/language/tools/move-cli/README.md b/language/tools/move-cli/README.md
index d8ffdb590b..7dae2bdb45 100644
--- a/language/tools/move-cli/README.md
+++ b/language/tools/move-cli/README.md
@@ -46,30 +46,30 @@ i.e., `move <command> --help`.
 Package commands provide wrappers with sane defaults around other commands
 that are provided either by various Move tools, compiler, or prover.
 
-The `move package new` command will create a new empty Move package:
+The `move new` command will create a new empty Move package:
 ```shell
-$ move package new <package_name> # Create a Move package <package_name> under the current dir
-$ move package new <package_name> -p <path> # Create a Move package <package_name> under path <path>
+$ move new <package_name> # Create a Move package <package_name> under the current dir
+$ move new <package_name> -p <path> # Create a Move package <package_name> under path <path>
 ```
 
 From within a package's root directory, you can build the modules and/or scripts that you have written in the package with:
 ```shell
-$ move package build # Builds the Move package you are currently in
-$ move package build -p <path> # Builds the Move package at <path>
+$ move build # Builds the Move package you are currently in
+$ move build -p <path> # Builds the Move package at <path>
 ```
 
 The compiled artifacts will by default be stored in the `build` directory. You
 can change where the build artifacts are saved by passing the optional `--build-dir` flag:
 
 ```shell
-$ move package build --build-dir <path_to_save_to> # Build current Move package and save artifacts under <path_to_save_to>
+$ move build --build-dir <path_to_save_to> # Build current Move package and save artifacts under <path_to_save_to>
 ```
 
 You can verify the specifications in a Move package using the Move Prover with the `prove` command:
 
 ```shell
-$ move package prove # Verify the specifications in the current package
-$ move package prove -p <path> # Verify the specifications in the package at <path>
+$ move prove # Verify the specifications in the current package
+$ move prove -p <path> # Verify the specifications in the package at <path>
 ```
 
 In order to run the Move Prover [additional tools need to be
@@ -82,8 +82,8 @@ and
 You can also run unit tests in a package using the `test` command
 
 ```shell
-$ move package test # Run Move unit tests in the current package
-$ move package test -p <path> # Run Move unit tests in the package at <path>
+$ move test # Run Move unit tests in the current package
+$ move test -p <path> # Run Move unit tests in the package at <path>
 ```
 ## Sandbox Commands
 
@@ -97,7 +97,7 @@ Each sandbox command is run in the context of a Move package. So let's create a
 Move package that we'll use for the code in this README and `cd` into it:
 
 ```shell
-$ move package new readme
+$ move new readme
 $ cd readme
 ```
 
@@ -125,11 +125,11 @@ directory:
 
 ```toml
 [addresses]
-Std = "0x1" # Specify and assign 0x1 to the named address "Std"
+std = "0x1" # Specify and assign 0x1 to the named address "std"
 
 [dependencies]
-MoveNursery = { git = "https://github.com/move-language/move.git", subdir = "language/move-stdlib/nursery", rev = "d45f20a" }
-#                ^                    ^                     ^                                       ^
+MoveNursery = { git = "https://github.com/move-language/move.git", subdir = "language/move-stdlib/nursery", rev = "main" }
+#                ^                    ^                              ^                                       ^
 #            Git dependency       Git clone URL       Subdir under git repo (optional)           Git revision to use
 ```
 
@@ -137,7 +137,7 @@ Now let's try running the script -- the very first time may take some time since
 
 ```shell
 $ move sandbox run sources/debug_script.move --signers 0xf
-[debug] (&) { 0000000000000000000000000000000F }
+[debug] (&) { 0000000000000000000000000000000f }
 ```
 
 The `--signers 0xf` argument indicates which account address(es) have signed
@@ -189,7 +189,7 @@ module 0x2::Test {
 Now, try
 
 ```shell
-$ move package build
+$ move build
 ```
 
 This will cause the CLI to compile and typecheck the modules under
@@ -250,13 +250,13 @@ public write() {
 ```
 
 You can also look at the compiled bytecode before publishing to `storage` by
-running either `move package disassemble --name <module_name>` or `move package
+running either `move disassemble --name <module_name>` or `move
 disassemble --name <module_name> --interactive` to interactively inspect the
 bytecode and how it relates to the Move source code:
 
 ```shell
-$ move package disassemble --name Test --interactive # You can quit by pressing "q"
-$ move package disassemble --name Test
+$ move disassemble --name Test --interactive # You can quit by pressing "q"
+$ move disassemble --name Test
 // Move bytecode v4
 module 2.Test {
 struct Resource has key {
@@ -316,7 +316,7 @@ changes first. We can do this by passing the `--dry-run` flag:
 $ move sandbox run sources/test_script.move --signers 0xf -v --dry-run
 Compiling transaction script...
 Changed resource(s) under 1 address(es):
-  Changed 1 resource(s) under address 0000000000000000000000000000000F:
+  Changed 1 resource(s) under address 0000000000000000000000000000000f:
     Added type 0x2::Test::Resource: [10, 0, 0, 0, 0, 0, 0, 0] (wrote 40 bytes)
 Wrote 40 bytes of resource ID's and data
       key 0x2::Test::Resource {
@@ -332,7 +332,7 @@ changes by removing the `--dry-run` flag:
 $ move sandbox run sources/test_script.move --signers 0xf -v
 Compiling transaction script...
 Changed resource(s) under 1 address(es):
-  Changed 1 resource(s) under address 0000000000000000000000000000000F:
+  Changed 1 resource(s) under address 0000000000000000000000000000000f:
     Added type 0x2::Test::Resource: [10, 0, 0, 0, 0, 0, 0, 0] (wrote 40 bytes)
 Wrote 40 bytes of resource ID's and data
       key 0x2::Test::Resource {
@@ -346,7 +346,7 @@ We can inspect the newly published resource using `move sandbox view` since
 the change has been committed:
 
 ```shell
-$ move sandbox view storage/0x0000000000000000000000000000000F/resources/0x00000000000000000000000000000002::Test::Resource.bcs
+$ move sandbox view storage/0x0000000000000000000000000000000f/resources/0x00000000000000000000000000000002::Test::Resource.bcs
 key 0x2::Test::Resource {
     i: 10
 }
@@ -360,12 +360,12 @@ can be done using the `move sandbox clean` command which will remove the
 `storage` and `build` directories:
 
 ```shell
-$ move sandbox view storage/0x0000000000000000000000000000000F/resources/0x00000000000000000000000000000002::Test::Resource.bcs
+$ move sandbox view storage/0x0000000000000000000000000000000f/resources/0x00000000000000000000000000000002::Test::Resource.bcs
 resource 0x2::Test::Resource {
         i: 10
 }
 $ move sandbox clean
-$ move sandbox view storage/0x0000000000000000000000000000000F/resources/0x00000000000000000000000000000002::Test::Resource.bcs
+$ move sandbox view storage/0x0000000000000000000000000000000f/resources/0x00000000000000000000000000000002::Test::Resource.bcs
 Error: `move sandbox view <file>` must point to a valid file under storage
 ```
 
@@ -408,11 +408,11 @@ $ cat readme/args.txt
 ## Arg files can have comments!
 sandbox run sources/debug_script.move --signers 0xf
 sandbox run sources/debug_script.move --signers 0xf
-package build
+build
 sandbox publish
 sandbox view storage/0x00000000000000000000000000000002/modules/Test.mv
 sandbox run sources/test_script.move --signers 0xf -v
-sandbox view storage/0x0000000000000000000000000000000F/resources/0x00000000000000000000000000000002::Test::Resource.bcs
+sandbox view storage/0x0000000000000000000000000000000f/resources/0x00000000000000000000000000000002::Test::Resource.bcs
 ```
 
 We can then use the `move sandbox test` command and point it at the `readme` directory to run each of these
@@ -441,7 +441,7 @@ in the `args.txt` file:
 ```shell
 $ cat readme/args.exp
 Command `sandbox run sources/debug_script.move --signers 0xf`:
-[debug] (&) { 0000000000000000000000000000000F }
+[debug] (&) { 0000000000000000000000000000000f }
 Command `sandbox run sources/debug_script.move --signers 0xf --mode bare`:
 ...
 ```
diff --git a/language/tools/move-cli/src/base/build.rs b/language/tools/move-cli/src/base/build.rs
new file mode 100644
index 0000000000..fcee531758
--- /dev/null
+++ b/language/tools/move-cli/src/base/build.rs
@@ -0,0 +1,42 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use clap::*;
+use move_package::{Architecture, BuildConfig};
+use std::path::PathBuf;
+
+/// Build the package at `path`. If no path is provided defaults to current directory.
+#[derive(Parser)]
+#[clap(name = "build")]
+pub struct Build;
+
+impl Build {
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let rerooted_path = reroot_path(path)?;
+        if config.fetch_deps_only {
+            let mut config = config;
+            if config.test_mode {
+                config.dev_mode = true;
+            }
+            config.download_deps_for_package(&rerooted_path, &mut std::io::stdout())?;
+            return Ok(());
+        }
+        let architecture = config.architecture.unwrap_or(Architecture::Move);
+
+        match architecture {
+            Architecture::Move | Architecture::AsyncMove => {
+                config.compile_package(&rerooted_path, &mut std::io::stdout())?;
+            }
+
+            Architecture::Ethereum => {
+                #[cfg(feature = "evm-backend")]
+                config.compile_package_evm(&rerooted_path, &mut std::io::stderr())?;
+
+                #[cfg(not(feature = "evm-backend"))]
+                anyhow::bail!("The Ethereum architecture is not supported because move-cli was not compiled with feature flag `evm-backend`.");
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/language/tools/move-cli/src/base/commands/check.rs b/language/tools/move-cli/src/base/commands/check.rs
deleted file mode 100644
index ff1af16544..0000000000
--- a/language/tools/move-cli/src/base/commands/check.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-use std::collections::BTreeMap;
-
-use anyhow::Result;
-use move_compiler::{self, shared::NumericalAddress, Compiler, Flags};
-
-/// Type-check the user modules in `files` and the dependencies in `interface_files`
-pub fn check(
-    interface_files: Vec<String>,
-    sources_shadow_deps: bool,
-    files: Vec<String>,
-    named_addresses: BTreeMap<String, NumericalAddress>,
-    verbose: bool,
-) -> Result<()> {
-    if verbose {
-        println!("Checking Move files...");
-    }
-    Compiler::from_files(files, interface_files, named_addresses)
-        .set_flags(Flags::empty().set_sources_shadow_deps(sources_shadow_deps))
-        .check_and_report()?;
-    Ok(())
-}
diff --git a/language/tools/move-cli/src/base/commands/compile.rs b/language/tools/move-cli/src/base/commands/compile.rs
deleted file mode 100644
index 3416925b68..0000000000
--- a/language/tools/move-cli/src/base/commands/compile.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-use anyhow::Result;
-use move_command_line_common::env::get_bytecode_version_from_env;
-use move_compiler::{self, shared::NumericalAddress, Compiler, Flags};
-use std::collections::BTreeMap;
-
-/// Compile the user modules in `sources` against the dependencies in `interface_files`, placing
-/// the resulting binaries in `output_dir`.
-pub fn compile(
-    interface_files: Vec<String>,
-    output_dir: &str,
-    sources_shadow_deps: bool,
-    sources: Vec<String>,
-    named_address_mapping: BTreeMap<String, NumericalAddress>,
-    emit_source_map: bool,
-    verbose: bool,
-) -> Result<()> {
-    if verbose {
-        println!("Compiling Move files...");
-    }
-    let (files, compiled_units) =
-        Compiler::from_files(sources, interface_files, named_address_mapping)
-            .set_flags(Flags::empty().set_sources_shadow_deps(sources_shadow_deps))
-            .build_and_report()?;
-    move_compiler::output_compiled_units(
-        get_bytecode_version_from_env(),
-        emit_source_map,
-        files,
-        compiled_units,
-        output_dir,
-    )
-}
diff --git a/language/tools/move-cli/src/base/coverage.rs b/language/tools/move-cli/src/base/coverage.rs
new file mode 100644
index 0000000000..04afb45c88
--- /dev/null
+++ b/language/tools/move-cli/src/base/coverage.rs
@@ -0,0 +1,110 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use clap::*;
+use move_compiler::compiled_unit::{CompiledUnit, NamedCompiledModule};
+use move_coverage::{
+    coverage_map::CoverageMap, format_csv_summary, format_human_summary,
+    source_coverage::SourceCoverageBuilder, summary::summarize_inst_cov,
+};
+use move_disassembler::disassembler::Disassembler;
+use move_package::BuildConfig;
+use std::path::PathBuf;
+
+#[derive(Parser)]
+pub enum CoverageSummaryOptions {
+    /// Display a coverage summary for all modules in this package
+    #[clap(name = "summary")]
+    Summary {
+        /// Whether function coverage summaries should be displayed
+        #[clap(long = "summarize-functions")]
+        functions: bool,
+        /// Output CSV data of coverage
+        #[clap(long = "csv")]
+        output_csv: bool,
+    },
+    /// Display coverage information about the module against source code
+    #[clap(name = "source")]
+    Source {
+        #[clap(long = "module")]
+        module_name: String,
+    },
+    /// Display coverage information about the module against disassembled bytecode
+    #[clap(name = "bytecode")]
+    Bytecode {
+        #[clap(long = "module")]
+        module_name: String,
+    },
+}
+
+/// Inspect test coverage for this package. A previous test run with the `--coverage` flag must
+/// have previously been run.
+#[derive(Parser)]
+#[clap(name = "coverage")]
+pub struct Coverage {
+    #[clap(subcommand)]
+    pub options: CoverageSummaryOptions,
+}
+
+impl Coverage {
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let path = reroot_path(path)?;
+        let coverage_map = CoverageMap::from_binary_file(path.join(".coverage_map.mvcov"))?;
+        let package = config.compile_package(&path, &mut Vec::new())?;
+        let modules: Vec<_> = package
+            .root_modules()
+            .filter_map(|unit| match &unit.unit {
+                CompiledUnit::Module(NamedCompiledModule { module, .. }) => Some(module.clone()),
+                _ => None,
+            })
+            .collect();
+        match self.options {
+            CoverageSummaryOptions::Source { module_name } => {
+                let unit = package.get_module_by_name_from_root(&module_name)?;
+                let source_path = &unit.source_path;
+                let (module, source_map) = match &unit.unit {
+                    CompiledUnit::Module(NamedCompiledModule {
+                        module, source_map, ..
+                    }) => (module, source_map),
+                    _ => panic!("Should all be modules"),
+                };
+                let source_coverage = SourceCoverageBuilder::new(module, &coverage_map, source_map);
+                source_coverage
+                    .compute_source_coverage(source_path)
+                    .output_source_coverage(&mut std::io::stdout())
+                    .unwrap();
+            }
+            CoverageSummaryOptions::Summary {
+                functions,
+                output_csv,
+                ..
+            } => {
+                let coverage_map = coverage_map.to_unified_exec_map();
+                if output_csv {
+                    format_csv_summary(
+                        modules.as_slice(),
+                        &coverage_map,
+                        summarize_inst_cov,
+                        &mut std::io::stdout(),
+                    )
+                } else {
+                    format_human_summary(
+                        modules.as_slice(),
+                        &coverage_map,
+                        summarize_inst_cov,
+                        &mut std::io::stdout(),
+                        functions,
+                    )
+                }
+            }
+            CoverageSummaryOptions::Bytecode { module_name } => {
+                let unit = package.get_module_by_name_from_root(&module_name)?;
+                let mut disassembler = Disassembler::from_unit(&unit.unit);
+                disassembler.add_coverage_map(coverage_map.to_unified_exec_map());
+                println!("{}", disassembler.disassemble()?);
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/language/tools/move-cli/src/base/disassemble.rs b/language/tools/move-cli/src/base/disassemble.rs
new file mode 100644
index 0000000000..db7f4eadf5
--- /dev/null
+++ b/language/tools/move-cli/src/base/disassemble.rs
@@ -0,0 +1,75 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use clap::*;
+use move_compiler::compiled_unit::{CompiledUnit, NamedCompiledModule};
+use move_disassembler::disassembler::Disassembler;
+use move_package::{compilation::compiled_package::CompiledUnitWithSource, BuildConfig};
+use std::path::PathBuf;
+
+/// Disassemble the Move bytecode pointed to
+#[derive(Parser)]
+#[clap(name = "disassemble")]
+pub struct Disassemble {
+    /// Start a disassembled bytecode-to-source explorer
+    #[clap(long = "interactive")]
+    pub interactive: bool,
+    /// The package name. If not provided defaults to current package modules only
+    #[clap(long = "package")]
+    pub package_name: Option<String>,
+    /// The name of the module or script in the package to disassemble
+    #[clap(long = "name")]
+    pub module_or_script_name: String,
+}
+
+impl Disassemble {
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let rerooted_path = reroot_path(path)?;
+        let Self {
+            interactive,
+            package_name,
+            module_or_script_name,
+        } = self;
+        // Make sure the package is built
+        let package = config.compile_package(&rerooted_path, &mut Vec::new())?;
+        let needle_package = package_name
+            .as_deref()
+            .unwrap_or(package.compiled_package_info.package_name.as_str());
+        match package
+            .get_module_by_name(needle_package, &module_or_script_name)
+            .or_else(|_| package.get_script_by_name(needle_package, &module_or_script_name))
+            .ok()
+        {
+            None => anyhow::bail!(
+                "Unable to find module or script with name '{}' in package '{}'",
+                module_or_script_name,
+                needle_package,
+            ),
+            Some(unit) => {
+                // Once we find the compiled bytecode we're interested in, startup the bytecode
+                // viewer, or run the disassembler depending on if we need to run interactively
+                // or not.
+                if interactive {
+                    match unit {
+                        CompiledUnitWithSource {
+                            unit:
+                                CompiledUnit::Module(NamedCompiledModule {
+                                    module, source_map, ..
+                                }),
+                            source_path,
+                        } => move_bytecode_viewer::start_viewer_in_memory(
+                            module.clone(),
+                            source_map.clone(),
+                            source_path,
+                        ),
+                        _ => anyhow::bail!("Interactive disassembler not supported for scripts"),
+                    }
+                } else {
+                    println!("{}", Disassembler::from_unit(&unit.unit).disassemble()?);
+                }
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/language/tools/move-cli/src/base/docgen.rs b/language/tools/move-cli/src/base/docgen.rs
new file mode 100644
index 0000000000..a458cb9c3a
--- /dev/null
+++ b/language/tools/move-cli/src/base/docgen.rs
@@ -0,0 +1,125 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use clap::*;
+use move_docgen::DocgenOptions;
+use move_package::{BuildConfig, ModelConfig};
+use std::{fs, path::PathBuf};
+
+/// Generate javadoc style documentation for Move packages
+#[derive(Parser)]
+#[clap(name = "docgen")]
+pub struct Docgen {
+    /// The level where we start sectioning. Often markdown sections are rendered with
+    /// unnecessary large section fonts, setting this value high reduces the size
+    #[clap(long = "section-level-start", value_name = "HEADER_LEVEL")]
+    pub section_level_start: Option<usize>,
+    /// Whether to exclude private functions in the generated docs
+    #[clap(long = "exclude-private-fun")]
+    pub exclude_private_fun: bool,
+    /// Whether to exclude specifications in the generated docs
+    #[clap(long = "exclude-specs")]
+    pub exclude_specs: bool,
+    /// Whether to put specifications in the same section as a declaration or put them all
+    /// into an independent section
+    #[clap(long = "independent-specs")]
+    pub independent_specs: bool,
+    /// Whether to exclude Move implementations
+    #[clap(long = "exclude-impl")]
+    pub exclude_impl: bool,
+    /// Max depth to which sections are displayed in table-of-contents
+    #[clap(long = "toc-depth", value_name = "DEPTH")]
+    pub toc_depth: Option<usize>,
+    /// Do not use collapsed sections (<details>) for impl and specs
+    #[clap(long = "no-collapsed-sections")]
+    pub no_collapsed_sections: bool,
+    /// In which directory to store output
+    #[clap(long = "output-directory", value_name = "PATH")]
+    pub output_directory: Option<String>,
+    /// A template for documentation generation. Can be multiple
+    #[clap(long = "template", short = 't', value_name = "FILE")]
+    pub template: Vec<String>,
+    /// An optional file containing reference definitions. The content of this file will
+    /// be added to each generated markdown doc
+    #[clap(long = "references-file", value_name = "FILE")]
+    pub references_file: Option<String>,
+    /// Whether to include dependency diagrams in the generated docs
+    #[clap(long = "include-dep-diagrams")]
+    pub include_dep_diagrams: bool,
+    /// Whether to include call diagrams in the generated docs
+    #[clap(long = "include-call-diagrams")]
+    pub include_call_diagrams: bool,
+    /// If this is being compiled relative to a different place where it will be stored (output directory)
+    #[clap(long = "compile-relative-to-output-dir")]
+    pub compile_relative_to_output_dir: bool,
+}
+
+impl Docgen {
+    /// Calling the Docgen
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let model = config.move_model_for_package(
+            &reroot_path(path).unwrap(),
+            ModelConfig {
+                all_files_as_targets: false,
+                target_filter: None,
+            },
+        )?;
+
+        let mut options = DocgenOptions::default();
+
+        if !self.template.is_empty() {
+            options.root_doc_templates = self.template;
+        }
+        if self.section_level_start.is_some() {
+            options.section_level_start = self.section_level_start.unwrap();
+        }
+        if self.exclude_private_fun {
+            options.include_private_fun = false;
+        }
+        if self.exclude_specs {
+            options.include_specs = false;
+        }
+        if self.independent_specs {
+            options.specs_inlined = false;
+        }
+        if self.exclude_impl {
+            options.include_impl = false;
+        }
+        if self.toc_depth.is_some() {
+            options.toc_depth = self.toc_depth.unwrap();
+        }
+        if self.no_collapsed_sections {
+            options.collapsed_sections = false;
+        }
+        if self.output_directory.is_some() {
+            options.output_directory = self.output_directory.unwrap();
+        }
+        if self.references_file.is_some() {
+            options.references_file = self.references_file;
+        }
+        if self.compile_relative_to_output_dir {
+            options.compile_relative_to_output_dir = true;
+        }
+
+        // We are using the full namespace, since we already use `Docgen` here.
+        // Docgen is the most suitable name for both: this Docgen subcommand,
+        // and the actual move_docgen::Docgen.
+        let generator = move_docgen::Docgen::new(&model, &options);
+
+        for (file, content) in generator.gen() {
+            let path = PathBuf::from(&file);
+            fs::create_dir_all(path.parent().unwrap())?;
+            fs::write(path.as_path(), content)?;
+            println!("Generated {:?}", path);
+        }
+
+        anyhow::ensure!(
+            !model.has_errors(),
+            "Errors encountered while generating documentation!"
+        );
+
+        println!("\nDocumentation generation successful!");
+        Ok(())
+    }
+}
diff --git a/language/tools/move-cli/src/base/errmap.rs b/language/tools/move-cli/src/base/errmap.rs
new file mode 100644
index 0000000000..fff76ebb84
--- /dev/null
+++ b/language/tools/move-cli/src/base/errmap.rs
@@ -0,0 +1,50 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use clap::*;
+use move_package::{BuildConfig, ModelConfig};
+use std::path::PathBuf;
+
+/// Generate error map for the package and its dependencies at `path` for use by the Move
+/// explanation tool.
+#[derive(Parser)]
+#[clap(name = "errmap")]
+pub struct Errmap {
+    /// The prefix that all error reasons within modules will be prefixed with, e.g., "E" if
+    /// all error reasons are "E_CANNOT_PERFORM_OPERATION", "E_CANNOT_ACCESS", etc.
+    #[clap(long)]
+    pub error_prefix: Option<String>,
+    /// The file to serialize the generated error map to.
+    #[clap(long, default_value = "error_map", parse(from_os_str))]
+    pub output_file: PathBuf,
+}
+
+impl Errmap {
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let rerooted_path = reroot_path(path)?;
+        let Self {
+            error_prefix,
+            output_file,
+        } = self;
+        let mut errmap_options = move_errmapgen::ErrmapOptions::default();
+        if let Some(err_prefix) = error_prefix {
+            errmap_options.error_prefix = err_prefix;
+        }
+        errmap_options.output_file = output_file
+            .with_extension(move_command_line_common::files::MOVE_ERROR_DESC_EXTENSION)
+            .to_string_lossy()
+            .to_string();
+        let model = config.move_model_for_package(
+            &rerooted_path,
+            ModelConfig {
+                all_files_as_targets: true,
+                target_filter: None,
+            },
+        )?;
+        let mut errmap_gen = move_errmapgen::ErrmapGen::new(&model, &errmap_options);
+        errmap_gen.gen();
+        errmap_gen.save_result();
+        Ok(())
+    }
+}
diff --git a/language/tools/move-cli/src/base/info.rs b/language/tools/move-cli/src/base/info.rs
new file mode 100644
index 0000000000..0811f39860
--- /dev/null
+++ b/language/tools/move-cli/src/base/info.rs
@@ -0,0 +1,21 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use clap::*;
+use move_package::BuildConfig;
+use std::path::PathBuf;
+
+/// Print address information.
+#[derive(Parser)]
+#[clap(name = "info")]
+pub struct Info;
+
+impl Info {
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let rerooted_path = reroot_path(path)?;
+        config
+            .resolution_graph_for_package(&rerooted_path, &mut std::io::stdout())?
+            .print_info()
+    }
+}
diff --git a/language/tools/move-cli/src/base/mod.rs b/language/tools/move-cli/src/base/mod.rs
index b5c92db601..0633fcc2dd 100644
--- a/language/tools/move-cli/src/base/mod.rs
+++ b/language/tools/move-cli/src/base/mod.rs
@@ -1,5 +1,24 @@
-// Copyright (c) The Diem Core Contributors
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-pub mod commands;
+pub mod build;
+pub mod coverage;
+pub mod disassemble;
+pub mod docgen;
+pub mod errmap;
+pub mod info;
+pub mod new;
+pub mod prove;
+pub mod test;
+
+use move_package::source_package::layout::SourcePackageLayout;
+use std::path::PathBuf;
+
+pub fn reroot_path(path: Option<PathBuf>) -> anyhow::Result<PathBuf> {
+    let path = path.unwrap_or_else(|| PathBuf::from("."));
+    // Always root ourselves to the package root, and then compile relative to that.
+    let rooted_path = SourcePackageLayout::try_find_root(&path.canonicalize()?)?;
+    std::env::set_current_dir(&rooted_path).unwrap();
+
+    Ok(PathBuf::from("."))
+}
diff --git a/language/tools/move-cli/src/base/new.rs b/language/tools/move-cli/src/base/new.rs
new file mode 100644
index 0000000000..6dbfbeaf1d
--- /dev/null
+++ b/language/tools/move-cli/src/base/new.rs
@@ -0,0 +1,86 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use clap::*;
+use move_package::source_package::layout::SourcePackageLayout;
+use std::{
+    fmt::Display,
+    fs::create_dir_all,
+    io::Write,
+    path::{Path, PathBuf},
+};
+
+pub const MOVE_STDLIB_PACKAGE_NAME: &str = "MoveStdlib";
+pub const MOVE_STDLIB_PACKAGE_PATH: &str = "{ \
+    git = \"https://github.com/move-language/move.git\", \
+    subdir = \"language/move-stdlib\", rev = \"main\" \
+}";
+pub const MOVE_STDLIB_ADDR_NAME: &str = "std";
+pub const MOVE_STDLIB_ADDR_VALUE: &str = "0x1";
+
+/// Create a new Move package with name `name` at `path`. If `path` is not provided the package
+/// will be created in the directory `name`.
+#[derive(Parser)]
+#[clap(name = "new")]
+pub struct New {
+    /// The name of the package to be created.
+    pub name: String,
+}
+
+impl New {
+    pub fn execute_with_defaults(self, path: Option<PathBuf>) -> anyhow::Result<()> {
+        self.execute(
+            path,
+            "0.0.0",
+            [(MOVE_STDLIB_PACKAGE_NAME, MOVE_STDLIB_PACKAGE_PATH)],
+            [(MOVE_STDLIB_ADDR_NAME, MOVE_STDLIB_ADDR_VALUE)],
+            "",
+        )
+    }
+
+    pub fn execute(
+        self,
+        path: Option<PathBuf>,
+        version: &str,
+        deps: impl IntoIterator<Item = (impl Display, impl Display)>,
+        addrs: impl IntoIterator<Item = (impl Display, impl Display)>,
+        custom: &str, // anything else that needs to end up being in Move.toml (or empty string)
+    ) -> anyhow::Result<()> {
+        // TODO warn on build config flags
+        let Self { name } = self;
+        let p: PathBuf;
+        let path: &Path = match path {
+            Some(path) => {
+                p = path;
+                &p
+            }
+            None => Path::new(&name),
+        };
+        create_dir_all(path.join(SourcePackageLayout::Sources.path()))?;
+        let mut w = std::fs::File::create(path.join(SourcePackageLayout::Manifest.path()))?;
+        writeln!(
+            &mut w,
+            "[package]
+name = \"{name}\"
+version = \"{version}\"
+
+[dependencies]"
+        )?;
+        for (dep_name, dep_val) in deps {
+            writeln!(w, "{dep_name} = {dep_val}")?;
+        }
+
+        writeln!(
+            w,
+            "
+[addresses]"
+        )?;
+        for (addr_name, addr_val) in addrs {
+            writeln!(w, "{addr_name} =  \"{addr_val}\"")?;
+        }
+        if !custom.is_empty() {
+            writeln!(w, "{}", custom)?;
+        }
+        Ok(())
+    }
+}
diff --git a/language/tools/move-cli/src/package/prover.rs b/language/tools/move-cli/src/base/prove.rs
similarity index 70%
rename from language/tools/move-cli/src/package/prover.rs
rename to language/tools/move-cli/src/base/prove.rs
index e6a37aae79..ad0de8b859 100644
--- a/language/tools/move-cli/src/package/prover.rs
+++ b/language/tools/move-cli/src/base/prove.rs
@@ -1,11 +1,9 @@
-// Copyright (c) The Diem Core Contributors
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-//! Support for the prover in the package system.
-
-use crate::package::cli;
+use super::reroot_path;
 use anyhow::bail;
+use clap::Parser;
 use codespan_reporting::term::termcolor::{ColorChoice, StandardStream};
 use colored::Colorize;
 use move_package::{BuildConfig, ModelConfig};
@@ -17,6 +15,64 @@ use std::{
 };
 use tempfile::TempDir;
 
+#[derive(Parser, Debug)]
+pub enum ProverOptions {
+    // Pass through unknown commands to the prover Clap parser
+    #[clap(
+        external_subcommand,
+        takes_value(true),
+        multiple_values(true),
+        multiple_occurrences(true)
+    )]
+    Options(Vec<String>),
+}
+
+/// Run the Move Prover on the package at `path`. If no path is provided defaults to current
+/// directory. Use `.. prove .. -- <options>` to pass on options to the prover.
+#[derive(Parser)]
+#[clap(name = "prove")]
+pub struct Prove {
+    /// The target filter used to prune the modules to verify. Modules with a name that contains
+    /// this string will be part of verification.
+    #[clap(short = 't', long = "target")]
+    pub target_filter: Option<String>,
+    /// Internal field indicating that this prover run is for a test.
+    #[clap(skip)]
+    pub for_test: bool,
+    /// Any options passed to the prover.
+    #[clap(subcommand)]
+    pub options: Option<ProverOptions>,
+}
+
+impl Prove {
+    pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
+        let rerooted_path = reroot_path(path)?;
+        let Self {
+            target_filter,
+            for_test,
+            options,
+        } = self;
+        let opts = match options {
+            Some(ProverOptions::Options(opts)) => opts,
+            _ => vec![],
+        };
+        let mut args = vec!["package".to_string()];
+        let prover_toml = Path::new(&rerooted_path).join("Prover.toml");
+        if prover_toml.exists() {
+            args.push(format!("--config={}", prover_toml.to_string_lossy()));
+        }
+        args.extend(opts.iter().cloned());
+        let options = move_prover::cli::Options::create_from_args(&args)?;
+        if for_test {
+            options.setup_logging_for_test();
+        } else {
+            options.setup_logging();
+        }
+
+        run_move_prover(config, &rerooted_path, &target_filter, for_test, options)
+    }
+}
+
 // =================================================================================================
 // API for Rust unit tests
 
@@ -66,18 +122,12 @@ impl ProverTest {
         //   parallelize package based tests.
         let saved_cd = std::env::current_dir().expect("current directory");
         let pkg_path = path_in_crate(std::mem::take(&mut self.path));
-        let res = cli::handle_package_commands(
-            &pkg_path,
-            move_package::BuildConfig::default(),
-            &cli::PackageCommand::Prove {
-                target_filter: None,
-                for_test: true,
-                options: Some(cli::ProverOptions::Options(std::mem::take(
-                    &mut self.options,
-                ))),
-            },
-            vec![], // prover does not need natives
-        );
+        let cmd = Prove {
+            target_filter: None,
+            for_test: true,
+            options: Some(ProverOptions::Options(std::mem::take(&mut self.options))),
+        };
+        let res = cmd.execute(Some(pkg_path), move_package::BuildConfig::default());
         std::env::set_current_dir(saved_cd).expect("restore current directory");
         res.unwrap()
     }
@@ -109,18 +159,11 @@ pub fn run_move_prover(
     path: &Path,
     target_filter: &Option<String>,
     for_test: bool,
-    options: &[String],
+    mut options: move_prover::cli::Options,
 ) -> anyhow::Result<()> {
     // Always run the prover in dev mode, so addresses get default assignments
     config.dev_mode = true;
 
-    let mut args = vec!["package".to_string()];
-    let prover_toml = Path::new(&path).join("Prover.toml");
-    if prover_toml.exists() {
-        args.push(format!("--config={}", prover_toml.to_string_lossy()));
-    }
-    args.extend(options.iter().cloned());
-    let mut options = move_prover::cli::Options::create_from_args(&args)?;
     if !options.move_sources.is_empty() {
         bail!(
             "move prover options must not specify sources as those are given \
@@ -145,9 +188,6 @@ pub fn run_move_prover(
     let mut error_writer = StandardStream::stderr(ColorChoice::Auto);
     if for_test {
         options.set_quiet();
-        options.setup_logging_for_test();
-    } else {
-        options.setup_logging();
     }
     let now = Instant::now();
     let model = config.move_model_for_package(
diff --git a/language/tools/move-cli/src/base/test.rs b/language/tools/move-cli/src/base/test.rs
new file mode 100644
index 0000000000..04a694f14f
--- /dev/null
+++ b/language/tools/move-cli/src/base/test.rs
@@ -0,0 +1,276 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use super::reroot_path;
+use crate::NativeFunctionRecord;
+use anyhow::Result;
+use clap::*;
+use move_command_line_common::files::{FileHash, MOVE_COVERAGE_MAP_EXTENSION};
+use move_compiler::{
+    diagnostics::{self, codes::Severity},
+    shared::{NumberFormat, NumericalAddress},
+    unit_test::{plan_builder::construct_test_plan, TestPlan},
+    PASS_CFGIR,
+};
+use move_coverage::coverage_map::{output_map_to_file, CoverageMap};
+use move_package::{compilation::build_plan::BuildPlan, BuildConfig};
+use move_unit_test::UnitTestingConfig;
+use move_vm_test_utils::gas_schedule::CostTable;
+use std::{
+    collections::HashMap,
+    fs,
+    io::Write,
+    path::{Path, PathBuf},
+    process::ExitStatus,
+};
+// if windows
+#[cfg(target_family = "windows")]
+use std::os::windows::process::ExitStatusExt;
+// if unix
+#[cfg(any(target_family = "unix"))]
+use std::os::unix::prelude::ExitStatusExt;
+// if not windows nor unix
+#[cfg(not(any(target_family = "windows", target_family = "unix")))]
+compile_error!("Unsupported OS, currently we only support windows and unix family");
+
+/// Run Move unit tests in this package.
+#[derive(Parser)]
+#[clap(name = "test")]
+pub struct Test {
+    /// Bound the amount of gas used by any one test.
+    #[clap(name = "gas_limit", short = 'i', long = "gas_limit")]
+    pub gas_limit: Option<u64>,
+    /// An optional filter string to determine which unit tests to run. A unit test will be run only if it
+    /// contains this string in its fully qualified (<addr>::<module_name>::<fn_name>) name.
+    #[clap(name = "filter")]
+    pub filter: Option<String>,
+    /// List all tests
+    #[clap(name = "list", short = 'l', long = "list")]
+    pub list: bool,
+    /// Number of threads to use for running tests.
+    #[clap(
+        name = "num_threads",
+        default_value = "8",
+        short = 't',
+        long = "threads"
+    )]
+    pub num_threads: usize,
+    /// Report test statistics at the end of testing
+    #[clap(name = "report_statistics", short = 's', long = "statistics")]
+    pub report_statistics: bool,
+    /// Show the storage state at the end of execution of a failing test
+    #[clap(name = "global_state_on_error", short = 'g', long = "state_on_error")]
+    pub report_storage_on_error: bool,
+
+    /// Ignore compiler's warning, and continue run tests
+    #[clap(name = "ignore_compile_warnings", long = "ignore_compile_warnings")]
+    pub ignore_compile_warnings: bool,
+
+    /// Use the stackless bytecode interpreter to run the tests and cross check its results with
+    /// the execution result from Move VM.
+    #[clap(long = "stackless")]
+    pub check_stackless_vm: bool,
+    /// Verbose mode
+    #[clap(long = "verbose")]
+    pub verbose_mode: bool,
+    /// Collect coverage information for later use with the various `move coverage` subcommands
+    #[clap(long = "coverage")]
+    pub compute_coverage: bool,
+
+    /// Use the EVM-based execution backend.
+    /// Does not work with --stackless.
+    #[cfg(feature = "evm-backend")]
+    #[structopt(long = "evm")]
+    pub evm: bool,
+}
+
+impl Test {
+    pub fn execute(
+        self,
+        path: Option<PathBuf>,
+        config: BuildConfig,
+        natives: Vec<NativeFunctionRecord>,
+        cost_table: Option<CostTable>,
+    ) -> anyhow::Result<()> {
+        let rerooted_path = reroot_path(path)?;
+        let Self {
+            gas_limit,
+            filter,
+            list,
+            num_threads,
+            report_statistics,
+            report_storage_on_error,
+            ignore_compile_warnings,
+            check_stackless_vm,
+            verbose_mode,
+            compute_coverage,
+            #[cfg(feature = "evm-backend")]
+            evm,
+        } = self;
+        let unit_test_config = UnitTestingConfig {
+            gas_limit,
+            filter,
+            list,
+            num_threads,
+            report_statistics,
+            report_storage_on_error,
+            check_stackless_vm,
+            verbose: verbose_mode,
+            ignore_compile_warnings,
+            #[cfg(feature = "evm-backend")]
+            evm,
+
+            ..UnitTestingConfig::default_with_bound(None)
+        };
+        let result = run_move_unit_tests(
+            &rerooted_path,
+            config,
+            unit_test_config,
+            natives,
+            cost_table,
+            compute_coverage,
+            &mut std::io::stdout(),
+        )?;
+
+        // Return a non-zero exit code if any test failed
+        if let UnitTestResult::Failure = result {
+            std::process::exit(1)
+        }
+        Ok(())
+    }
+}
+
+/// Encapsulates the possible returned states when running unit tests on a move package.
+#[derive(PartialEq, Eq, Debug)]
+pub enum UnitTestResult {
+    Success,
+    Failure,
+}
+
+pub fn run_move_unit_tests<W: Write + Send>(
+    pkg_path: &Path,
+    mut build_config: move_package::BuildConfig,
+    mut unit_test_config: UnitTestingConfig,
+    natives: Vec<NativeFunctionRecord>,
+    cost_table: Option<CostTable>,
+    compute_coverage: bool,
+    writer: &mut W,
+) -> Result<UnitTestResult> {
+    let mut test_plan = None;
+    build_config.test_mode = true;
+    build_config.dev_mode = true;
+
+    // Build the resolution graph (resolution graph diagnostics are only needed for CLI commands so
+    // ignore them by passing a vector as the writer)
+    let resolution_graph = build_config.resolution_graph_for_package(pkg_path, &mut Vec::new())?;
+
+    // Note: unit_test_config.named_address_values is always set to vec![] (the default value) before
+    // being passed in.
+    unit_test_config.named_address_values = resolution_graph
+        .extract_named_address_mapping()
+        .map(|(name, addr)| {
+            (
+                name.to_string(),
+                NumericalAddress::new(addr.into_bytes(), NumberFormat::Hex),
+            )
+        })
+        .collect();
+
+    // Get the source files for all modules. We need this in order to report source-mapped error
+    // messages.
+    let dep_file_map: HashMap<_, _> = resolution_graph
+        .package_table
+        .iter()
+        .flat_map(|(_, rpkg)| {
+            rpkg.get_sources(&resolution_graph.build_options)
+                .unwrap()
+                .iter()
+                .map(|fname| {
+                    let contents = fs::read_to_string(Path::new(fname.as_str())).unwrap();
+                    let fhash = FileHash::new(&contents);
+                    (fhash, (*fname, contents))
+                })
+                .collect::<HashMap<_, _>>()
+        })
+        .collect();
+    let root_package = resolution_graph.root_package.package.name;
+    let build_plan = BuildPlan::create(resolution_graph)?;
+    // Compile the package. We need to intercede in the compilation, process being performed by the
+    // Move package system, to first grab the compilation env, construct the test plan from it, and
+    // then save it, before resuming the rest of the compilation and returning the results and
+    // control back to the Move package system.
+    build_plan.compile_with_driver(writer, None, |compiler| {
+        let (files, comments_and_compiler_res) = compiler.run::<PASS_CFGIR>().unwrap();
+        let (_, compiler) =
+            diagnostics::unwrap_or_report_diagnostics(&files, comments_and_compiler_res);
+        let (mut compiler, cfgir) = compiler.into_ast();
+        let compilation_env = compiler.compilation_env();
+        let built_test_plan = construct_test_plan(compilation_env, Some(root_package), &cfgir);
+        if let Err(diags) = compilation_env.check_diags_at_or_above_severity(
+            if unit_test_config.ignore_compile_warnings {
+                Severity::NonblockingError
+            } else {
+                Severity::Warning
+            },
+        ) {
+            diagnostics::report_diagnostics(&files, diags);
+        }
+
+        let compilation_result = compiler.at_cfgir(cfgir).build();
+
+        let (units, _) = diagnostics::unwrap_or_report_diagnostics(&files, compilation_result);
+        test_plan = Some((built_test_plan, files.clone(), units.clone()));
+        Ok((files, units))
+    })?;
+
+    let (test_plan, mut files, units) = test_plan.unwrap();
+    files.extend(dep_file_map);
+    let test_plan = test_plan.unwrap();
+    let no_tests = test_plan.is_empty();
+    let test_plan = TestPlan::new(test_plan, files, units);
+
+    let trace_path = pkg_path.join(".trace");
+    let coverage_map_path = pkg_path
+        .join(".coverage_map")
+        .with_extension(MOVE_COVERAGE_MAP_EXTENSION);
+    let cleanup_trace = || {
+        if compute_coverage && trace_path.exists() {
+            std::fs::remove_file(&trace_path).unwrap();
+        }
+    };
+
+    cleanup_trace();
+
+    // If we need to compute test coverage set the VM tracking environment variable since we will
+    // need this trace to construct the coverage information.
+    if compute_coverage {
+        std::env::set_var("MOVE_VM_TRACE", &trace_path);
+    }
+
+    // Run the tests. If any of the tests fail, then we don't produce a coverage report, so cleanup
+    // the trace files.
+    if !unit_test_config
+        .run_and_report_unit_tests(test_plan, Some(natives), cost_table, writer)
+        .unwrap()
+        .1
+    {
+        cleanup_trace();
+        return Ok(UnitTestResult::Failure);
+    }
+
+    // Compute the coverage map. This will be used by other commands after this.
+    if compute_coverage && !no_tests {
+        let coverage_map = CoverageMap::from_trace_file(trace_path);
+        output_map_to_file(&coverage_map_path, &coverage_map).unwrap();
+    }
+    Ok(UnitTestResult::Success)
+}
+
+impl From<UnitTestResult> for ExitStatus {
+    fn from(result: UnitTestResult) -> Self {
+        match result {
+            UnitTestResult::Success => ExitStatus::from_raw(0),
+            UnitTestResult::Failure => ExitStatus::from_raw(1),
+        }
+    }
+}
diff --git a/language/tools/move-cli/src/experimental/cli.rs b/language/tools/move-cli/src/experimental/cli.rs
index f5a3864108..2cfd0ffa10 100644
--- a/language/tools/move-cli/src/experimental/cli.rs
+++ b/language/tools/move-cli/src/experimental/cli.rs
@@ -100,7 +100,7 @@ impl ExperimentalCommand {
                 concretize,
             } => {
                 let state = PackageContext::new(&move_args.package_path, &move_args.build_config)?
-                    .prepare_state(storage_dir)?;
+                    .prepare_state(None, storage_dir)?;
                 experimental::commands::analyze_read_write_set(
                     &state,
                     module_file,
diff --git a/language/tools/move-cli/src/lib.rs b/language/tools/move-cli/src/lib.rs
index aa7e3ae45d..d539bfae09 100644
--- a/language/tools/move-cli/src/lib.rs
+++ b/language/tools/move-cli/src/lib.rs
@@ -2,11 +2,14 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use base::{
+    build::Build, coverage::Coverage, disassemble::Disassemble, docgen::Docgen, errmap::Errmap,
+    info::Info, new::New, prove::Prove, test::Test,
+};
 use move_package::BuildConfig;
 
 pub mod base;
 pub mod experimental;
-pub mod package;
 pub mod sandbox;
 
 /// Default directory where saved Move resources live
@@ -21,10 +24,10 @@ const BCS_EXTENSION: &str = "bcs";
 use anyhow::Result;
 use clap::Parser;
 use move_core_types::{
-    account_address::AccountAddress, errmap::ErrorMapping, gas_schedule::CostTable,
-    identifier::Identifier,
+    account_address::AccountAddress, errmap::ErrorMapping, identifier::Identifier,
 };
 use move_vm_runtime::native_functions::NativeFunction;
+use move_vm_test_utils::gas_schedule::CostTable;
 use std::path::PathBuf;
 
 type NativeFunctionRecord = (AccountAddress, Identifier, Identifier, NativeFunction);
@@ -33,22 +36,16 @@ type NativeFunctionRecord = (AccountAddress, Identifier, Identifier, NativeFunct
 #[clap(author, version, about)]
 pub struct Move {
     /// Path to a package which the command should be run with respect to.
-    #[clap(
-        long = "path",
-        short = 'p',
-        global = true,
-        parse(from_os_str),
-        default_value = "."
-    )]
-    package_path: PathBuf,
+    #[clap(long = "path", short = 'p', global = true, parse(from_os_str))]
+    pub package_path: Option<PathBuf>,
 
     /// Print additional diagnostics if available.
     #[clap(short = 'v', global = true)]
-    verbose: bool,
+    pub verbose: bool,
 
     /// Package build options
     #[clap(flatten)]
-    build_config: BuildConfig,
+    pub build_config: BuildConfig,
 }
 
 /// MoveCLI is the CLI that will be executed by the `move-cli` command
@@ -57,21 +54,23 @@ pub struct Move {
 #[derive(Parser)]
 pub struct MoveCLI {
     #[clap(flatten)]
-    move_args: Move,
+    pub move_args: Move,
 
     #[clap(subcommand)]
-    cmd: Command,
+    pub cmd: Command,
 }
 
 #[derive(Parser)]
 pub enum Command {
-    /// Execute a package command. Executed in the current directory or the closest containing Move
-    /// package.
-    #[clap(name = "package")]
-    Package {
-        #[clap(subcommand)]
-        cmd: package::cli::PackageCommand,
-    },
+    Build(Build),
+    Coverage(Coverage),
+    Disassemble(Disassemble),
+    Docgen(Docgen),
+    Errmap(Errmap),
+    Info(Info),
+    New(New),
+    Prove(Prove),
+    Test(Test),
     /// Execute a sandbox command.
     #[clap(name = "sandbox")]
     Sandbox {
@@ -98,24 +97,35 @@ pub fn run_cli(
     natives: Vec<NativeFunctionRecord>,
     cost_table: &CostTable,
     error_descriptions: &ErrorMapping,
-    move_args: &Move,
-    cmd: &Command,
+    move_args: Move,
+    cmd: Command,
 ) -> Result<()> {
+    // TODO: right now, the gas metering story for move-cli (as a library) is a bit of a mess.
+    //         1. It's still using the old CostTable.
+    //         2. The CostTable only affects sandbox runs, but not unit tests, which use a unit cost table.
     match cmd {
+        Command::Build(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::Coverage(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::Disassemble(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::Docgen(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::Errmap(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::Info(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::New(c) => c.execute_with_defaults(move_args.package_path),
+        Command::Prove(c) => c.execute(move_args.package_path, move_args.build_config),
+        Command::Test(c) => c.execute(
+            move_args.package_path,
+            move_args.build_config,
+            natives,
+            Some(cost_table.clone()),
+        ),
         Command::Sandbox { storage_dir, cmd } => cmd.handle_command(
             natives,
             cost_table,
             error_descriptions,
-            move_args,
-            storage_dir,
-        ),
-        Command::Experimental { storage_dir, cmd } => cmd.handle_command(move_args, storage_dir),
-        Command::Package { cmd } => package::cli::handle_package_commands(
-            &move_args.package_path,
-            move_args.build_config.clone(),
-            cmd,
-            natives,
+            &move_args,
+            &storage_dir,
         ),
+        Command::Experimental { storage_dir, cmd } => cmd.handle_command(&move_args, &storage_dir),
     }
 }
 
@@ -129,7 +139,7 @@ pub fn move_cli(
         natives,
         cost_table,
         error_descriptions,
-        &args.move_args,
-        &args.cmd,
+        args.move_args,
+        args.cmd,
     )
 }
diff --git a/language/tools/move-cli/src/main.rs b/language/tools/move-cli/src/main.rs
index 1bef3d6190..f2f29cc402 100644
--- a/language/tools/move-cli/src/main.rs
+++ b/language/tools/move-cli/src/main.rs
@@ -4,13 +4,16 @@
 
 use anyhow::Result;
 use move_core_types::{account_address::AccountAddress, errmap::ErrorMapping};
+use move_stdlib::natives::{all_natives, nursery_natives, GasParameters, NurseryGasParameters};
 
 fn main() -> Result<()> {
     let error_descriptions: ErrorMapping = bcs::from_bytes(move_stdlib::error_descriptions())?;
-    let cost_table = &move_vm_types::gas_schedule::INITIAL_COST_SCHEDULE;
-    move_cli::move_cli(
-        move_stdlib::natives::all_natives(AccountAddress::from_hex_literal("0x1").unwrap()),
-        cost_table,
-        &error_descriptions,
-    )
+    let cost_table = &move_vm_test_utils::gas_schedule::INITIAL_COST_SCHEDULE;
+    let addr = AccountAddress::from_hex_literal("0x1").unwrap();
+    let natives = all_natives(addr, GasParameters::zeros())
+        .into_iter()
+        .chain(nursery_natives(addr, NurseryGasParameters::zeros()))
+        .collect();
+
+    move_cli::move_cli(natives, cost_table, &error_descriptions)
 }
diff --git a/language/tools/move-cli/src/package/cli.rs b/language/tools/move-cli/src/package/cli.rs
deleted file mode 100644
index c93ebd1db2..0000000000
--- a/language/tools/move-cli/src/package/cli.rs
+++ /dev/null
@@ -1,582 +0,0 @@
-// Copyright (c) The Diem Core Contributors
-// Copyright (c) The Move Contributors
-// SPDX-License-Identifier: Apache-2.0
-
-use std::{
-    collections::HashMap,
-    fmt,
-    fs::{create_dir_all, read_to_string},
-    io::Write,
-    path::{Path, PathBuf},
-    process::ExitStatus,
-};
-
-// if windows
-#[cfg(target_family = "windows")]
-use std::os::windows::process::ExitStatusExt;
-// if unix
-#[cfg(any(target_family = "unix"))]
-use std::os::unix::prelude::ExitStatusExt;
-// if not windows nor unix
-#[cfg(not(any(target_family = "windows", target_family = "unix")))]
-compile_error!("Unsupported OS, currently we only support windows and unix family");
-
-use anyhow::{bail, Result};
-
-use clap::Parser;
-use move_command_line_common::files::{FileHash, MOVE_COVERAGE_MAP_EXTENSION};
-use move_compiler::{
-    compiled_unit::{CompiledUnit, NamedCompiledModule},
-    diagnostics::{self, codes::Severity},
-    shared::{NumberFormat, NumericalAddress},
-    unit_test::{plan_builder::construct_test_plan, TestPlan},
-    PASS_CFGIR,
-};
-use move_coverage::{
-    coverage_map::{output_map_to_file, CoverageMap},
-    format_csv_summary, format_human_summary,
-    source_coverage::SourceCoverageBuilder,
-    summary::summarize_inst_cov,
-};
-use move_disassembler::disassembler::Disassembler;
-use move_package::{
-    compilation::{build_plan::BuildPlan, compiled_package::CompiledUnitWithSource},
-    source_package::layout::SourcePackageLayout,
-    Architecture, ModelConfig,
-};
-use move_unit_test::UnitTestingConfig;
-
-use crate::{package::prover::run_move_prover, NativeFunctionRecord};
-
-#[derive(Parser)]
-pub enum CoverageSummaryOptions {
-    /// Display a coverage summary for all modules in this package
-    #[clap(name = "summary")]
-    Summary {
-        /// Whether function coverage summaries should be displayed
-        #[clap(long = "summarize-functions")]
-        functions: bool,
-        /// Output CSV data of coverage
-        #[clap(long = "csv")]
-        output_csv: bool,
-    },
-    /// Display coverage information about the module against source code
-    #[clap(name = "source")]
-    Source {
-        #[clap(long = "module")]
-        module_name: String,
-    },
-    /// Display coverage information about the module against disassembled bytecode
-    #[clap(name = "bytecode")]
-    Bytecode {
-        #[clap(long = "module")]
-        module_name: String,
-    },
-}
-
-#[derive(Parser)]
-pub enum PackageCommand {
-    /// Create a new Move package with name `name` at `path`. If `path` is not provided the package
-    /// will be created in the directory `name`.
-    #[clap(name = "new")]
-    New {
-        /// The name of the package to be created.
-        name: String,
-    },
-    /// Build the package at `path`. If no path is provided defaults to current directory.
-    #[clap(name = "build")]
-    Build,
-    /// Print address information.
-    #[clap(name = "info")]
-    Info,
-    /// Generate error map for the package and its dependencies at `path` for use by the Move
-    /// explanation tool.
-    #[clap(name = "errmap")]
-    ErrMapGen {
-        /// The prefix that all error reasons within modules will be prefixed with, e.g., "E" if
-        /// all error reasons are "E_CANNOT_PERFORM_OPERATION", "E_CANNOT_ACCESS", etc.
-        #[clap(long)]
-        error_prefix: Option<String>,
-        /// The file to serialize the generated error map to.
-        #[clap(long, default_value = "error_map", parse(from_os_str))]
-        output_file: PathBuf,
-    },
-    /// Run the Move Prover on the package at `path`. If no path is provided defaults to current
-    /// directory. Use `.. prove .. -- <options>` to pass on options to the prover.
-    #[clap(name = "prove")]
-    Prove {
-        /// The target filter used to prune the modules to verify. Modules with a name that contains
-        /// this string will be part of verification.
-        #[clap(short = 't', long = "target")]
-        target_filter: Option<String>,
-        /// Internal field indicating that this prover run is for a test.
-        #[clap(skip)]
-        for_test: bool,
-        /// Any options passed to the prover.
-        #[clap(subcommand)]
-        options: Option<ProverOptions>,
-    },
-    /// Inspect test coverage for this package. A previous test run with the `--coverage` flag must
-    /// have previously been run.
-    #[clap(name = "coverage")]
-    CoverageReport {
-        #[clap(subcommand)]
-        options: CoverageSummaryOptions,
-    },
-    /// Run Move unit tests in this package.
-    #[clap(name = "test")]
-    UnitTest {
-        /// Bound the number of instructions that can be executed by any one test.
-        #[clap(
-            name = "instructions",
-            default_value = "5000",
-            short = 'i',
-            long = "instructions"
-        )]
-        instruction_execution_bound: u64,
-        /// A filter string to determine which unit tests to run. A unit test will be run only if it
-        /// contains this string in its fully qualified (<addr>::<module_name>::<fn_name>) name.
-        #[clap(name = "filter", short = 'f', long = "filter")]
-        filter: Option<String>,
-        /// List all tests
-        #[clap(name = "list", short = 'l', long = "list")]
-        list: bool,
-        /// Number of threads to use for running tests.
-        #[clap(
-            name = "num_threads",
-            default_value = "8",
-            short = 't',
-            long = "threads"
-        )]
-        num_threads: usize,
-        /// Report test statistics at the end of testing
-        #[clap(name = "report_statistics", short = 's', long = "statistics")]
-        report_statistics: bool,
-        /// Show the storage state at the end of execution of a failing test
-        #[clap(name = "global_state_on_error", short = 'g', long = "state_on_error")]
-        report_storage_on_error: bool,
-        /// Use the stackless bytecode interpreter to run the tests and cross check its results with
-        /// the execution result from Move VM.
-        #[clap(long = "stackless")]
-        check_stackless_vm: bool,
-        /// Verbose mode
-        #[clap(long = "verbose")]
-        verbose_mode: bool,
-        /// Collect coverage information for later use with the various `package coverage` subcommands
-        #[clap(long = "coverage")]
-        compute_coverage: bool,
-
-        /// Use the EVM-based execution backend.
-        /// Does not work with --stackless.
-        #[cfg(feature = "evm-backend")]
-        #[structopt(long = "evm")]
-        evm: bool,
-    },
-    /// Disassemble the Move bytecode pointed to
-    #[clap(name = "disassemble")]
-    BytecodeView {
-        /// Start a disassembled bytecode-to-source explorer
-        #[clap(long = "interactive")]
-        interactive: bool,
-        /// The package name. If not provided defaults to current package modules only
-        #[clap(long = "package")]
-        package_name: Option<String>,
-        /// The name of the module or script in the package to disassemble
-        #[clap(long = "name")]
-        module_or_script_name: String,
-    },
-}
-
-#[derive(Parser, Debug)]
-pub enum ProverOptions {
-    // Pass through unknown commands to the prover Clap parser
-    #[clap(
-        external_subcommand,
-        takes_value(true),
-        multiple_values(true),
-        multiple_occurrences(true)
-    )]
-    Options(Vec<String>),
-}
-
-/// Encapsulates the possible returned states when running unit tests on a move package.
-#[derive(PartialEq, Debug)]
-pub enum UnitTestResult {
-    Success,
-    Failure,
-}
-
-impl From<UnitTestResult> for ExitStatus {
-    fn from(result: UnitTestResult) -> Self {
-        match result {
-            UnitTestResult::Success => ExitStatus::from_raw(0),
-            UnitTestResult::Failure => ExitStatus::from_raw(1),
-        }
-    }
-}
-
-impl CoverageSummaryOptions {
-    pub fn handle_command(&self, config: move_package::BuildConfig, path: &Path) -> Result<()> {
-        let coverage_map = CoverageMap::from_binary_file(path.join(".coverage_map.mvcov"))?;
-        let package = config.compile_package(path, &mut Vec::new())?;
-        let modules: Vec<_> = package
-            .root_modules()
-            .filter_map(|unit| match &unit.unit {
-                CompiledUnit::Module(NamedCompiledModule { module, .. }) => Some(module.clone()),
-                _ => None,
-            })
-            .collect();
-        match self {
-            CoverageSummaryOptions::Source { module_name } => {
-                let unit = package.get_module_by_name_from_root(module_name)?;
-                let source_path = &unit.source_path;
-                let (module, source_map) = match &unit.unit {
-                    CompiledUnit::Module(NamedCompiledModule {
-                        module, source_map, ..
-                    }) => (module, source_map),
-                    _ => panic!("Should all be modules"),
-                };
-                let source_coverage = SourceCoverageBuilder::new(module, &coverage_map, source_map);
-                source_coverage
-                    .compute_source_coverage(source_path)
-                    .output_source_coverage(&mut std::io::stdout())
-                    .unwrap();
-            }
-            CoverageSummaryOptions::Summary {
-                functions,
-                output_csv,
-                ..
-            } => {
-                let coverage_map = coverage_map.to_unified_exec_map();
-                if *output_csv {
-                    format_csv_summary(
-                        modules.as_slice(),
-                        &coverage_map,
-                        summarize_inst_cov,
-                        &mut std::io::stdout(),
-                    )
-                } else {
-                    format_human_summary(
-                        modules.as_slice(),
-                        &coverage_map,
-                        summarize_inst_cov,
-                        &mut std::io::stdout(),
-                        *functions,
-                    )
-                }
-            }
-            CoverageSummaryOptions::Bytecode { module_name } => {
-                let unit = package.get_module_by_name_from_root(module_name)?;
-                let mut disassembler = Disassembler::from_unit(&unit.unit);
-                disassembler.add_coverage_map(coverage_map.to_unified_exec_map());
-                println!("{}", disassembler.disassemble()?);
-            }
-        }
-        Ok(())
-    }
-}
-
-pub fn handle_package_commands(
-    path: &Path,
-    config: move_package::BuildConfig,
-    cmd: &PackageCommand,
-    natives: Vec<NativeFunctionRecord>,
-) -> Result<()> {
-    // This is the exceptional command as it doesn't need a package to run, so we can't count on
-    // being able to root ourselves.
-    if let PackageCommand::New { name } = cmd {
-        let creation_path = Path::new(&path).join(name);
-        create_move_package(name, &creation_path)?;
-        return Ok(());
-    }
-
-    // Always root ourselves to the package root, and then compile relative to that.
-    let rooted_path = SourcePackageLayout::try_find_root(&path.canonicalize()?)?;
-    std::env::set_current_dir(&rooted_path).unwrap();
-
-    let rerooted_path = PathBuf::from(".");
-
-    match cmd {
-        PackageCommand::Build => {
-            let architecture = config.architecture.unwrap_or(Architecture::Move);
-
-            match architecture {
-                Architecture::Move | Architecture::AsyncMove => {
-                    config.compile_package(&rerooted_path, &mut std::io::stderr())?;
-                }
-
-                Architecture::Ethereum => {
-                    #[cfg(feature = "evm-backend")]
-                    config.compile_package_evm(&rerooted_path, &mut std::io::stderr())?;
-
-                    #[cfg(not(feature = "evm-backend"))]
-                    bail!("The Ethereum architecture is not supported because move-cli was not compiled with feature flag `evm-backend`.");
-                }
-            }
-        }
-        PackageCommand::Info => {
-            config
-                .resolution_graph_for_package(&rerooted_path)?
-                .print_info()?;
-        }
-        PackageCommand::BytecodeView {
-            interactive,
-            package_name,
-            module_or_script_name,
-        } => {
-            // Make sure the package is built
-            let package = config.compile_package(&rerooted_path, &mut Vec::new())?;
-            let needle_package = package_name
-                .as_ref()
-                .map(|s| s.as_str())
-                .unwrap_or(package.compiled_package_info.package_name.as_str());
-            match package
-                .get_module_by_name(needle_package, module_or_script_name)
-                .ok()
-            {
-                None => bail!(
-                    "Unable to find module or script with name '{}' in package '{}'",
-                    module_or_script_name,
-                    needle_package,
-                ),
-                Some(unit) => {
-                    // Once we find the compiled bytecode we're interested in, startup the bytecode
-                    // viewer, or run the disassembler depending on if we need to run interactively
-                    // or not.
-                    if *interactive {
-                        match unit {
-                            CompiledUnitWithSource {
-                                unit:
-                                    CompiledUnit::Module(NamedCompiledModule {
-                                        module, source_map, ..
-                                    }),
-                                source_path,
-                            } => move_bytecode_viewer::start_viewer_in_memory(
-                                module.clone(),
-                                source_map.clone(),
-                                source_path,
-                            ),
-                            _ => bail!("Interactive disassembler not supported for scripts"),
-                        }
-                    } else {
-                        println!("{}", Disassembler::from_unit(&unit.unit).disassemble()?);
-                    }
-                }
-            }
-        }
-        PackageCommand::Prove {
-            target_filter,
-            for_test,
-            options,
-        } => {
-            if let Some(ProverOptions::Options(opts)) = options {
-                run_move_prover(config, &rerooted_path, target_filter, *for_test, opts)?
-            } else {
-                run_move_prover(config, &rerooted_path, target_filter, *for_test, &[])?
-            }
-        }
-        PackageCommand::ErrMapGen {
-            error_prefix,
-            output_file,
-        } => {
-            let mut errmap_options = move_errmapgen::ErrmapOptions::default();
-            if let Some(err_prefix) = error_prefix {
-                errmap_options.error_prefix = err_prefix.to_string();
-            }
-            errmap_options.output_file = output_file
-                .with_extension(move_command_line_common::files::MOVE_ERROR_DESC_EXTENSION)
-                .to_string_lossy()
-                .to_string();
-            let model = config.move_model_for_package(
-                &rerooted_path,
-                ModelConfig {
-                    all_files_as_targets: true,
-                    target_filter: None,
-                },
-            )?;
-            let mut errmap_gen = move_errmapgen::ErrmapGen::new(&model, &errmap_options);
-            errmap_gen.gen();
-            errmap_gen.save_result();
-        }
-        PackageCommand::UnitTest {
-            instruction_execution_bound,
-            filter,
-            list,
-            num_threads,
-            report_statistics,
-            report_storage_on_error,
-            check_stackless_vm,
-            verbose_mode,
-            compute_coverage,
-
-            #[cfg(feature = "evm-backend")]
-            evm,
-        } => {
-            let unit_test_config = UnitTestingConfig {
-                instruction_execution_bound: *instruction_execution_bound,
-                filter: filter.clone(),
-                list: *list,
-                num_threads: *num_threads,
-                report_statistics: *report_statistics,
-                report_storage_on_error: *report_storage_on_error,
-                check_stackless_vm: *check_stackless_vm,
-                verbose: *verbose_mode,
-
-                #[cfg(feature = "evm-backend")]
-                evm: *evm,
-
-                ..UnitTestingConfig::default_with_bound(None)
-            };
-            let result = run_move_unit_tests(
-                &rerooted_path,
-                config,
-                unit_test_config,
-                natives,
-                *compute_coverage,
-            )?;
-
-            // Return a non-zero exit code if any test failed
-            if let UnitTestResult::Failure = result {
-                std::process::exit(1)
-            }
-        }
-        PackageCommand::CoverageReport { options } => {
-            options.handle_command(config, &rerooted_path)?;
-        }
-        PackageCommand::New { .. } => {
-            panic!("Hit a package new command after it should have been handled -- this should never happen")
-        }
-    };
-    Ok(())
-}
-
-pub fn run_move_unit_tests(
-    pkg_path: &Path,
-    mut build_config: move_package::BuildConfig,
-    mut unit_test_config: UnitTestingConfig,
-    natives: Vec<NativeFunctionRecord>,
-    compute_coverage: bool,
-) -> Result<UnitTestResult> {
-    let mut test_plan = None;
-    build_config.test_mode = true;
-    build_config.dev_mode = true;
-
-    // Build the resolution graph
-    let resolution_graph = build_config.resolution_graph_for_package(pkg_path)?;
-
-    // Note: unit_test_config.named_address_values is always set to vec![] (the default value) before
-    // being passed in.
-    unit_test_config.named_address_values = resolution_graph
-        .extract_named_address_mapping()
-        .map(|(name, addr)| {
-            (
-                name.to_string(),
-                NumericalAddress::new(addr.into_bytes(), NumberFormat::Hex),
-            )
-        })
-        .collect();
-
-    // Get the source files for all modules. We need this in order to report source-mapped error
-    // messages.
-    let dep_file_map: HashMap<_, _> = resolution_graph
-        .package_table
-        .iter()
-        .flat_map(|(_, rpkg)| {
-            rpkg.get_sources(&resolution_graph.build_options)
-                .unwrap()
-                .iter()
-                .map(|fname| {
-                    let contents = read_to_string(Path::new(fname.as_str())).unwrap();
-                    let fhash = FileHash::new(&contents);
-                    (fhash, (*fname, contents))
-                })
-                .collect::<HashMap<_, _>>()
-        })
-        .collect();
-    let root_package = resolution_graph.root_package.package.name;
-    let build_plan = BuildPlan::create(resolution_graph)?;
-    // Compile the package. We need to intercede in the compilation, process being performed by the
-    // Move package system, to first grab the compilation env, construct the test plan from it, and
-    // then save it, before resuming the rest of the compilation and returning the results and
-    // control back to the Move package system.
-    build_plan.compile_with_driver(&mut std::io::stdout(), |compiler| {
-        let (files, comments_and_compiler_res) = compiler.run::<PASS_CFGIR>().unwrap();
-        let (_, compiler) =
-            diagnostics::unwrap_or_report_diagnostics(&files, comments_and_compiler_res);
-        let (mut compiler, cfgir) = compiler.into_ast();
-        let compilation_env = compiler.compilation_env();
-        let built_test_plan = construct_test_plan(compilation_env, Some(root_package), &cfgir);
-        if let Err(diags) = compilation_env.check_diags_at_or_above_severity(Severity::Warning) {
-            diagnostics::report_diagnostics(&files, diags);
-        }
-
-        let compilation_result = compiler.at_cfgir(cfgir).build();
-
-        let (units, _) = diagnostics::unwrap_or_report_diagnostics(&files, compilation_result);
-        test_plan = Some((built_test_plan, files.clone(), units.clone()));
-        Ok((files, units))
-    })?;
-
-    let (test_plan, mut files, units) = test_plan.unwrap();
-    files.extend(dep_file_map);
-    let test_plan = test_plan.unwrap();
-    let no_tests = test_plan.is_empty();
-    let test_plan = TestPlan::new(test_plan, files, units);
-
-    let trace_path = pkg_path.join(".trace");
-    let coverage_map_path = pkg_path
-        .join(".coverage_map")
-        .with_extension(MOVE_COVERAGE_MAP_EXTENSION);
-    let cleanup_trace = || {
-        if compute_coverage && trace_path.exists() {
-            std::fs::remove_file(&trace_path).unwrap();
-        }
-    };
-
-    cleanup_trace();
-
-    // If we need to compute test coverage set the VM tracking environment variable since we will
-    // need this trace to construct the coverage information.
-    if compute_coverage {
-        std::env::set_var("MOVE_VM_TRACE", &trace_path);
-    }
-
-    // Run the tests. If any of the tests fail, then we don't produce a coverage report, so cleanup
-    // the trace files.
-    if !unit_test_config
-        .run_and_report_unit_tests(test_plan, Some(natives), std::io::stdout())
-        .unwrap()
-        .1
-    {
-        cleanup_trace();
-        return Ok(UnitTestResult::Failure);
-    }
-
-    // Compute the coverage map. This will be used by other commands after this.
-    if compute_coverage && !no_tests {
-        let coverage_map = CoverageMap::from_trace_file(trace_path);
-        output_map_to_file(&coverage_map_path, &coverage_map).unwrap();
-    }
-    Ok(UnitTestResult::Success)
-}
-
-pub fn create_move_package<S: AsRef<str> + fmt::Display>(
-    name: S,
-    creation_path: &Path,
-) -> Result<()> {
-    create_dir_all(creation_path.join(SourcePackageLayout::Sources.path()))?;
-    let mut w = std::fs::File::create(creation_path.join(SourcePackageLayout::Manifest.path()))?;
-    writeln!(
-        &mut w,
-        "[package]
-name = \"{}\"
-version = \"0.0.0\"
-
-[dependencies]
-MoveStdlib = {{ git = \"https://github.com/move-language/move.git\", subdir = \"language/move-stdlib\", rev = \"main\" }}
-
-[addresses]
-std = \"0x1\"
-", name)?;
-    Ok(())
-}
diff --git a/language/tools/move-cli/src/sandbox/cli.rs b/language/tools/move-cli/src/sandbox/cli.rs
index 09b131639a..2ceea12c88 100644
--- a/language/tools/move-cli/src/sandbox/cli.rs
+++ b/language/tools/move-cli/src/sandbox/cli.rs
@@ -12,10 +12,11 @@ use crate::{
 use anyhow::Result;
 use clap::Parser;
 use move_core_types::{
-    errmap::ErrorMapping, gas_schedule::CostTable, language_storage::TypeTag, parser,
+    errmap::ErrorMapping, language_storage::TypeTag, parser,
     transaction_argument::TransactionArgument,
 };
 use move_package::compilation::package_layout::CompiledPackageLayout;
+use move_vm_test_utils::gas_schedule::CostTable;
 use std::{
     fs,
     path::{Path, PathBuf},
@@ -35,6 +36,14 @@ pub enum SandboxCommand {
         /// Set this flag to ignore breaking changes checks and publish anyway.
         #[clap(long = "ignore-breaking-changes")]
         ignore_breaking_changes: bool,
+        /// If set, publish not only the modules in this package but also
+        /// modules in all its dependencies.
+        #[clap(long = "with-deps")]
+        with_deps: bool,
+        /// If set, all modules at once as a bundle. The default is to publish
+        /// modules sequentially.
+        #[clap(long = "bundle")]
+        bundle: bool,
         /// Manually specify the publishing order of modules.
         #[clap(
             long = "override-ordering",
@@ -164,6 +173,21 @@ pub struct StructLayoutOptions {
         multiple_occurrences(true)
     )]
     type_args: Option<Vec<TypeTag>>,
+    /// If set, replace all Move source syntax separators ("::" for address/struct/module name
+    /// separation, "<", ">", and "," for generics separation) with this string.
+    /// If unset, use the same syntax as Move source
+    #[clap(long = "separator")]
+    separator: Option<String>,
+    /// If true, do not include addresses in fully qualified type names.
+    /// If there is a name conflict (e.g., the registry we're building has both
+    /// 0x1::M::T and 0x2::M::T), layout generation will fail when this option is true.
+    #[clap(long = "omit-addresses")]
+    omit_addresses: bool,
+    /// If true, do not include phantom types in fully qualified type names, since they do not contribute to the layout
+    /// E.g., if we have `struct S<phantom T> { u: 64 }` and try to generate bindings for this struct with `T = u8`,
+    /// the name for `S` in the registry will be `S<u64>` when this option is false, and `S` when this option is true
+    #[clap(long = "ignore-phantom-types")]
+    ignore_phantom_types: bool,
     /// If set, generate bindings only for the struct passed in.
     /// When unset, generates bindings for the struct and all of its transitive dependencies.
     #[clap(long = "shallow")]
@@ -179,22 +203,28 @@ impl SandboxCommand {
         move_args: &Move,
         storage_dir: &Path,
     ) -> Result<()> {
+        let bytecode_version = None;
         match self {
             SandboxCommand::Publish {
                 no_republish,
                 ignore_breaking_changes,
+                with_deps,
+                bundle,
                 override_ordering,
             } => {
                 let context =
                     PackageContext::new(&move_args.package_path, &move_args.build_config)?;
-                let state = context.prepare_state(storage_dir)?;
+                let state = context.prepare_state(bytecode_version, storage_dir)?;
                 sandbox::commands::publish(
                     natives,
                     cost_table,
                     &state,
                     context.package(),
+                    bytecode_version,
                     *no_republish,
                     *ignore_breaking_changes,
+                    *with_deps,
+                    *bundle,
                     override_ordering.as_ref().map(|o| o.as_slice()),
                     move_args.verbose,
                 )
@@ -210,7 +240,7 @@ impl SandboxCommand {
             } => {
                 let context =
                     PackageContext::new(&move_args.package_path, &move_args.build_config)?;
-                let state = context.prepare_state(storage_dir)?;
+                let state = context.prepare_state(bytecode_version, storage_dir)?;
                 sandbox::commands::run(
                     natives,
                     cost_table,
@@ -223,6 +253,7 @@ impl SandboxCommand {
                     args,
                     type_args.to_vec(),
                     *gas_budget,
+                    bytecode_version,
                     *dry_run,
                     move_args.verbose,
                 )
@@ -231,21 +262,24 @@ impl SandboxCommand {
                 use_temp_dir,
                 track_cov,
             } => sandbox::commands::run_all(
-                &move_args.package_path,
+                move_args
+                    .package_path
+                    .as_deref()
+                    .unwrap_or_else(|| Path::new(".")),
                 &std::env::current_exe()?,
                 *use_temp_dir,
                 *track_cov,
             ),
             SandboxCommand::View { file } => {
                 let state = PackageContext::new(&move_args.package_path, &move_args.build_config)?
-                    .prepare_state(storage_dir)?;
+                    .prepare_state(bytecode_version, storage_dir)?;
                 sandbox::commands::view(&state, file)
             }
             SandboxCommand::Clean {} => {
                 // delete storage
                 let storage_dir = Path::new(storage_dir);
                 if storage_dir.exists() {
-                    fs::remove_dir_all(&storage_dir)?;
+                    fs::remove_dir_all(storage_dir)?;
                 }
 
                 // delete build
@@ -264,12 +298,12 @@ impl SandboxCommand {
             }
             SandboxCommand::Doctor {} => {
                 let state = PackageContext::new(&move_args.package_path, &move_args.build_config)?
-                    .prepare_state(storage_dir)?;
+                    .prepare_state(bytecode_version, storage_dir)?;
                 sandbox::commands::doctor(&state)
             }
             SandboxCommand::Generate { cmd } => {
                 let state = PackageContext::new(&move_args.package_path, &move_args.build_config)?
-                    .prepare_state(storage_dir)?;
+                    .prepare_state(bytecode_version, storage_dir)?;
                 handle_generate_commands(cmd, &state)
             }
         }
@@ -283,6 +317,9 @@ fn handle_generate_commands(cmd: &GenerateCommand, state: &OnDiskStateView) -> R
                 module,
                 &options.struct_,
                 &options.type_args,
+                options.separator.clone(),
+                options.omit_addresses,
+                options.ignore_phantom_types,
                 options.shallow,
                 state,
             )
diff --git a/language/tools/move-cli/src/sandbox/commands/generate.rs b/language/tools/move-cli/src/sandbox/commands/generate.rs
index fd367ad4ee..567a46ef47 100644
--- a/language/tools/move-cli/src/sandbox/commands/generate.rs
+++ b/language/tools/move-cli/src/sandbox/commands/generate.rs
@@ -4,7 +4,7 @@
 
 use crate::sandbox::utils::on_disk_state_view::OnDiskStateView;
 use anyhow::{bail, Result};
-use move_bytecode_utils::layout::SerdeLayoutBuilder;
+use move_bytecode_utils::layout::{SerdeLayoutBuilder, SerdeLayoutConfig};
 use move_core_types::{
     identifier::Identifier,
     language_storage::{StructTag, TypeTag},
@@ -15,6 +15,9 @@ pub fn generate_struct_layouts(
     path: &Path,
     struct_opt: &Option<String>,
     type_params_opt: &Option<Vec<TypeTag>>,
+    separator: Option<String>,
+    omit_addresses: bool,
+    ignore_phantom_types: bool,
     shallow: bool,
     state: &OnDiskStateView,
 ) -> Result<()> {
@@ -29,11 +32,15 @@ pub fn generate_struct_layouts(
                 name,
                 type_params,
             };
-            let mut layout_builder = if shallow {
-                SerdeLayoutBuilder::new_shallow(state)
-            } else {
-                SerdeLayoutBuilder::new(state)
-            };
+            let mut layout_builder = SerdeLayoutBuilder::new_with_config(
+                &state,
+                SerdeLayoutConfig {
+                    separator,
+                    omit_addresses,
+                    ignore_phantom_types,
+                    shallow,
+                },
+            );
             layout_builder.build_struct_layout(&struct_tag)?;
             let layout = serde_yaml::to_string(layout_builder.registry())?;
             state.save_struct_layouts(&layout)?;
diff --git a/language/tools/move-cli/src/sandbox/commands/publish.rs b/language/tools/move-cli/src/sandbox/commands/publish.rs
index 5bbcabc151..63d1a35c08 100644
--- a/language/tools/move-cli/src/sandbox/commands/publish.rs
+++ b/language/tools/move-cli/src/sandbox/commands/publish.rs
@@ -10,10 +10,11 @@ use crate::{
     NativeFunctionRecord,
 };
 use anyhow::{bail, Result};
+use move_binary_format::errors::Location;
 use move_command_line_common::env::get_bytecode_version_from_env;
-use move_core_types::gas_schedule::CostTable;
 use move_package::compilation::compiled_package::CompiledPackage;
 use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::gas_schedule::CostTable;
 use std::collections::BTreeMap;
 
 pub fn publish(
@@ -21,21 +22,49 @@ pub fn publish(
     cost_table: &CostTable,
     state: &OnDiskStateView,
     package: &CompiledPackage,
+    bytecode_version: Option<u32>,
     no_republish: bool,
     ignore_breaking_changes: bool,
+    with_deps: bool,
+    bundle: bool,
     override_ordering: Option<&[String]>,
     verbose: bool,
 ) -> Result<()> {
+    // collect all modules compiled
+    let compiled_modules = if with_deps {
+        package.all_modules().collect::<Vec<_>>()
+    } else {
+        package.root_modules().collect::<Vec<_>>()
+    };
     if verbose {
-        println!(
-            "Found {} modules",
-            package.root_modules().collect::<Vec<_>>().len()
-        );
+        println!("Found {} modules", compiled_modules.len());
     }
 
+    // order the modules for publishing
+    let modules_to_publish = match override_ordering {
+        Some(ordering) => {
+            let module_map: BTreeMap<_, _> = compiled_modules
+                .into_iter()
+                .map(|unit| (unit.unit.name().to_string(), unit))
+                .collect();
+
+            let mut ordered_modules = vec![];
+            for name in ordering {
+                match module_map.get(name) {
+                    None => bail!("Invalid module name in publish ordering: {}", name),
+                    Some(unit) => {
+                        ordered_modules.push(*unit);
+                    }
+                }
+            }
+            ordered_modules
+        }
+        None => compiled_modules,
+    };
+
     if no_republish {
-        let republished = package
-            .root_modules()
+        let republished = modules_to_publish
+            .iter()
             .filter_map(|unit| {
                 let id = module(&unit.unit).ok()?.self_id();
                 if state.has_module(&id) {
@@ -53,66 +82,69 @@ pub fn publish(
         }
     }
 
-    let bytecode_version = get_bytecode_version_from_env();
+    let bytecode_version = get_bytecode_version_from_env(bytecode_version);
 
     // use the the publish_module API from the VM if we do not allow breaking changes
     if !ignore_breaking_changes {
         let vm = MoveVM::new(natives).unwrap();
         let mut gas_status = get_gas_status(cost_table, None)?;
         let mut session = vm.new_session(state);
-
         let mut has_error = false;
-        match override_ordering {
-            None => {
-                for unit in package.root_modules() {
-                    let module_bytes = unit.unit.serialize(bytecode_version);
-                    let id = module(&unit.unit)?.self_id();
-                    let sender = *id.address();
 
-                    let res = session.publish_module(module_bytes, sender, &mut gas_status);
-                    if let Err(err) = res {
-                        explain_publish_error(err, state, unit)?;
-                        has_error = true;
-                        break;
+        if bundle {
+            // publish all modules together as a bundle
+            let mut sender_opt = None;
+            let mut module_bytes_vec = vec![];
+            for unit in &modules_to_publish {
+                let module_bytes = unit.unit.serialize(bytecode_version);
+                module_bytes_vec.push(module_bytes);
+
+                let module_address = *module(&unit.unit)?.self_id().address();
+                match &sender_opt {
+                    None => {
+                        sender_opt = Some(module_address);
+                    }
+                    Some(val) => {
+                        if val != &module_address {
+                            bail!("All modules in the bundle must share the same address");
+                        }
                     }
                 }
             }
-            Some(ordering) => {
-                let module_map: BTreeMap<_, _> = package
-                    .root_modules()
-                    .into_iter()
-                    .map(|unit| (unit.unit.name().to_string(), unit))
-                    .collect();
-
-                let mut sender_opt = None;
-                let mut module_bytes_vec = vec![];
-                for name in ordering {
-                    match module_map.get(name) {
-                        None => bail!("Invalid module name in publish ordering: {}", name),
-                        Some(unit) => {
-                            let module_bytes = unit.unit.serialize(bytecode_version);
-                            module_bytes_vec.push(module_bytes);
-                            if sender_opt.is_none() {
-                                sender_opt = Some(*module(&unit.unit)?.self_id().address());
+            match sender_opt {
+                None => bail!("No modules to publish"),
+                Some(sender) => {
+                    let res =
+                        session.publish_module_bundle(module_bytes_vec, sender, &mut gas_status);
+                    if let Err(err) = res {
+                        println!("Invalid multi-module publishing: {}", err);
+                        if let Location::Module(module_id) = err.location() {
+                            // find the module where error occures and explain
+                            if let Some(unit) = modules_to_publish
+                                .into_iter()
+                                .find(|&x| x.unit.name().as_str() == module_id.name().as_str())
+                            {
+                                explain_publish_error(err, state, unit)?
+                            } else {
+                                println!("Unable to locate the module in the multi-module publishing error");
                             }
                         }
+                        has_error = true;
                     }
                 }
+            }
+        } else {
+            // publish modules sequentially, one module at a time
+            for unit in &modules_to_publish {
+                let module_bytes = unit.unit.serialize(bytecode_version);
+                let id = module(&unit.unit)?.self_id();
+                let sender = *id.address();
 
-                match sender_opt {
-                    None => bail!("No modules to publish"),
-                    Some(sender) => {
-                        let res = session.publish_module_bundle(
-                            module_bytes_vec,
-                            sender,
-                            &mut gas_status,
-                        );
-                        if let Err(err) = res {
-                            // TODO (mengxu): explain publish errors in multi-module publishing
-                            println!("Invalid multi-module publishing: {}", err);
-                            has_error = true;
-                        }
-                    }
+                let res = session.publish_module(module_bytes, sender, &mut gas_status);
+                if let Err(err) = res {
+                    explain_publish_error(err, state, unit)?;
+                    has_error = true;
+                    break;
                 }
             }
         }
@@ -121,11 +153,13 @@ pub fn publish(
             let (changeset, events) = session.finish().map_err(|e| e.into_vm_status())?;
             assert!(events.is_empty());
             if verbose {
-                explain_publish_changeset(&changeset, state);
+                explain_publish_changeset(&changeset);
             }
             let modules: Vec<_> = changeset
                 .into_modules()
-                .map(|(module_id, blob_opt)| (module_id, blob_opt.expect("must be non-deletion")))
+                .map(|(module_id, blob_opt)| {
+                    (module_id, blob_opt.ok().expect("must be non-deletion"))
+                })
                 .collect();
             state.save_modules(&modules)?;
         }
@@ -134,7 +168,7 @@ pub fn publish(
         // backward incompatible changes, as as result, if this flag is set, we skip the VM process
         // and force the CLI to override the on-disk state directly
         let mut serialized_modules = vec![];
-        for unit in package.all_modules() {
+        for unit in modules_to_publish {
             let id = module(&unit.unit)?.self_id();
             let module_bytes = unit.unit.serialize(bytecode_version);
             serialized_modules.push((id, module_bytes));
diff --git a/language/tools/move-cli/src/sandbox/commands/run.rs b/language/tools/move-cli/src/sandbox/commands/run.rs
index 8b4077c2c8..1df48da348 100644
--- a/language/tools/move-cli/src/sandbox/commands/run.rs
+++ b/language/tools/move-cli/src/sandbox/commands/run.rs
@@ -15,7 +15,6 @@ use move_command_line_common::env::get_bytecode_version_from_env;
 use move_core_types::{
     account_address::AccountAddress,
     errmap::ErrorMapping,
-    gas_schedule::CostTable,
     identifier::IdentStr,
     language_storage::TypeTag,
     transaction_argument::{convert_txn_args, TransactionArgument},
@@ -23,8 +22,10 @@ use move_core_types::{
 };
 use move_package::compilation::compiled_package::CompiledPackage;
 use move_vm_runtime::move_vm::MoveVM;
+use move_vm_test_utils::gas_schedule::CostTable;
 use std::{fs, path::Path};
 
+#[allow(clippy::too_many_arguments)]
 pub fn run(
     natives: impl IntoIterator<Item = NativeFunctionRecord>,
     cost_table: &CostTable,
@@ -37,13 +38,14 @@ pub fn run(
     txn_args: &[TransactionArgument],
     vm_type_args: Vec<TypeTag>,
     gas_budget: Option<u64>,
+    bytecode_version: Option<u32>,
     dry_run: bool,
     verbose: bool,
 ) -> Result<()> {
     if !script_path.exists() {
         bail!("Script file {:?} does not exist", script_path)
     };
-    let bytecode_version = get_bytecode_version_from_env();
+    let bytecode_version = get_bytecode_version_from_env(bytecode_version);
 
     let bytecode = if is_bytecode_file(script_path) {
         assert!(
diff --git a/language/tools/move-cli/src/sandbox/commands/test.rs b/language/tools/move-cli/src/sandbox/commands/test.rs
index 897a8f8f82..be9d7ba5c5 100644
--- a/language/tools/move-cli/src/sandbox/commands/test.rs
+++ b/language/tools/move-cli/src/sandbox/commands/test.rs
@@ -20,6 +20,7 @@ use move_package::{
 use std::{
     collections::{BTreeMap, HashMap},
     env,
+    fmt::Write as FmtWrite,
     fs::{self, File},
     io::{self, BufRead, Write},
     path::{Path, PathBuf},
@@ -125,12 +126,13 @@ fn pad_tmp_path(tmp_dir: &Path, pad_amount: usize) -> anyhow::Result<PathBuf> {
 // package manifest.
 fn copy_deps(tmp_dir: &Path, pkg_dir: &Path) -> anyhow::Result<PathBuf> {
     // Sometimes we run a test that isn't a package for metatests so if there isn't a package we
-    // don't need to nest at all.
+    // don't need to nest at all. Resolution graph diagnostics are only needed for CLI commands so
+    // ignore them by passing a vector as the writer.
     let package_resolution = match (BuildConfig {
         dev_mode: true,
         ..Default::default()
     })
-    .resolution_graph_for_package(pkg_dir)
+    .resolution_graph_for_package(pkg_dir, &mut Vec::new())
     {
         Ok(pkg) => pkg,
         Err(_) => return Ok(tmp_dir.to_path_buf()),
@@ -139,7 +141,7 @@ fn copy_deps(tmp_dir: &Path, pkg_dir: &Path) -> anyhow::Result<PathBuf> {
     let tmp_dir = pad_tmp_path(tmp_dir, package_nest_depth)?;
     for (_, dep) in package_resolution.package_table.iter() {
         let source_dep_path = &dep.package_path;
-        let dest_dep_path = tmp_dir.join(&dep.package_path.strip_prefix(pkg_dir).unwrap());
+        let dest_dep_path = tmp_dir.join(dep.package_path.strip_prefix(pkg_dir).unwrap());
         if !dest_dep_path.exists() {
             fs::create_dir_all(&dest_dep_path)?;
         }
@@ -223,7 +225,7 @@ pub fn run_one(
     for args_line in args_file {
         let args_line = args_line?;
 
-        if let Some(external_cmd) = args_line.strip_prefix(">") {
+        if let Some(external_cmd) = args_line.strip_prefix('>') {
             let external_cmd = external_cmd.trim_start();
             let mut cmd_iter = external_cmd.split_ascii_whitespace();
 
@@ -238,7 +240,7 @@ pub fn run_one(
             }
             let cmd_output = command.output()?;
 
-            output += &format!("External Command `{}`:\n", external_cmd);
+            writeln!(&mut output, "External Command `{}`:", external_cmd)?;
             output += std::str::from_utf8(&cmd_output.stdout)?;
             output += std::str::from_utf8(&cmd_output.stderr)?;
 
@@ -269,7 +271,7 @@ pub fn run_one(
         }
 
         let cmd_output = cli_command_template().args(args_iter).output()?;
-        output += &format!("Command `{}`:\n", args_line);
+        writeln!(&mut output, "Command `{}`:", args_line)?;
         output += std::str::from_utf8(&cmd_output.stdout)?;
         output += std::str::from_utf8(&cmd_output.stderr)?;
     }
diff --git a/language/tools/move-cli/src/sandbox/utils/mod.rs b/language/tools/move-cli/src/sandbox/utils/mod.rs
index 38b582bc01..aa9003119d 100644
--- a/language/tools/move-cli/src/sandbox/utils/mod.rs
+++ b/language/tools/move-cli/src/sandbox/utils/mod.rs
@@ -21,9 +21,8 @@ use move_compiler::{
 };
 use move_core_types::{
     account_address::AccountAddress,
-    effects::{ChangeSet, Event},
+    effects::{ChangeSet, Event, Op},
     errmap::ErrorMapping,
-    gas_schedule::{GasAlgebra, GasUnits},
     language_storage::{ModuleId, TypeTag},
     transaction_argument::TransactionArgument,
     vm_status::{AbortLocation, StatusCode, VMStatus},
@@ -31,7 +30,7 @@ use move_core_types::{
 use move_ir_types::location::Loc;
 use move_package::compilation::compiled_package::CompiledUnitWithSource;
 use move_resource_viewer::{AnnotatedMoveStruct, MoveValueAnnotator};
-use move_vm_types::gas_schedule::GasStatus;
+use move_vm_test_utils::gas_schedule::Gas;
 use std::{
     collections::{BTreeMap, HashMap},
     fs,
@@ -42,19 +41,18 @@ pub mod on_disk_state_view;
 pub mod package_context;
 
 use move_bytecode_utils::module_cache::GetModule;
-use move_core_types::gas_schedule::CostTable;
+use move_vm_test_utils::gas_schedule::{CostTable, GasStatus};
 pub use on_disk_state_view::*;
 pub use package_context::*;
 
 pub fn get_gas_status(cost_table: &CostTable, gas_budget: Option<u64>) -> Result<GasStatus> {
     let gas_status = if let Some(gas_budget) = gas_budget {
-        let max_gas_budget = u64::MAX
-            .checked_div(cost_table.gas_constants.gas_unit_scaling_factor)
-            .unwrap();
+        // TODO(Gas): This should not be hardcoded.
+        let max_gas_budget = u64::MAX.checked_div(1000).unwrap();
         if gas_budget >= max_gas_budget {
             bail!("Gas budget set too high; maximum is {}", max_gas_budget)
         }
-        GasStatus::new(cost_table, GasUnits::new(gas_budget))
+        GasStatus::new(cost_table, Gas::new(gas_budget))
     } else {
         // no budget specified. Disable gas metering
         GasStatus::new_unmetered()
@@ -69,29 +67,34 @@ pub(crate) fn module(unit: &CompiledUnit) -> Result<&CompiledModule> {
     }
 }
 
-pub(crate) fn explain_publish_changeset(changeset: &ChangeSet, state: &OnDiskStateView) {
+pub(crate) fn explain_publish_changeset(changeset: &ChangeSet) {
     // publish effects should contain no resources
     assert!(changeset.resources().next().is_none());
     // total bytes written across all accounts
     let mut total_bytes_written = 0;
-    for (addr, name, blob_opt) in changeset.modules() {
-        if let Some(module_bytes) = blob_opt {
-            let bytes_written = addr.len() + name.len() + module_bytes.len();
-            total_bytes_written += bytes_written;
-            let module_id = ModuleId::new(addr, name.clone());
-            if state.has_module(&module_id) {
+    for (addr, name, blob_op) in changeset.modules() {
+        match blob_op {
+            Op::New(module_bytes) => {
+                let bytes_written = addr.len() + name.len() + module_bytes.len();
+                total_bytes_written += bytes_written;
+                let module_id = ModuleId::new(addr, name.clone());
                 println!(
-                    "Updating an existing module {} (wrote {:?} bytes)",
+                    "Publishing a new module {} (wrote {:?} bytes)",
                     module_id, bytes_written
                 );
-            } else {
+            }
+            Op::Modify(module_bytes) => {
+                let bytes_written = addr.len() + name.len() + module_bytes.len();
+                total_bytes_written += bytes_written;
+                let module_id = ModuleId::new(addr, name.clone());
                 println!(
-                    "Publishing a new module {} (wrote {:?} bytes)",
+                    "Updating an existing module {} (wrote {:?} bytes)",
                     module_id, bytes_written
                 );
             }
-        } else {
-            panic!("Deleting a module is not supported")
+            Op::Delete => {
+                panic!("Deleting a module is not supported")
+            }
         }
     }
     println!(
@@ -181,42 +184,39 @@ pub(crate) fn explain_execution_effects(
             account.resources().len(),
             addr
         );
-        for (struct_tag, write_opt) in account.resources() {
+        for (struct_tag, write_op) in account.resources() {
             print!("    ");
             let mut bytes_to_write = struct_tag.access_vector().len();
-            match write_opt {
-                Some(blob) => {
+            match write_op {
+                Op::New(blob) => {
+                    bytes_to_write += blob.len();
+                    println!(
+                        "Added type {}: {:?} (wrote {:?} bytes)",
+                        struct_tag, blob, bytes_to_write
+                    );
+                    // Print new resource
+                    let resource =
+                        MoveValueAnnotator::new(state).view_resource(struct_tag, blob)?;
+                    print_struct_with_indent(&resource, 6)
+                }
+                Op::Modify(blob) => {
                     bytes_to_write += blob.len();
-                    if state
+                    println!(
+                        "Changed type {}: {:?} (wrote {:?} bytes)",
+                        struct_tag, blob, bytes_to_write
+                    );
+                    // Print resource diff
+                    let resource_data = state
                         .get_resource_bytes(*addr, struct_tag.clone())?
-                        .is_some()
-                    {
-                        println!(
-                            "Changed type {}: {:?} (wrote {:?} bytes)",
-                            struct_tag, blob, bytes_to_write
-                        );
-                        // Print resource diff
-                        let resource_data = state
-                            .get_resource_bytes(*addr, struct_tag.clone())?
-                            .unwrap();
-                        let resource_old = MoveValueAnnotator::new(state)
-                            .view_resource(struct_tag, &resource_data)?;
-                        let resource_new =
-                            MoveValueAnnotator::new(state).view_resource(struct_tag, blob)?;
+                        .unwrap();
+                    let resource_old =
+                        MoveValueAnnotator::new(state).view_resource(struct_tag, &resource_data)?;
+                    let resource_new =
+                        MoveValueAnnotator::new(state).view_resource(struct_tag, blob)?;
 
-                        print_struct_diff_with_indent(&resource_old, &resource_new, 8)
-                    } else {
-                        println!(
-                            "Added type {}: {:?} (wrote {:?} bytes)",
-                            struct_tag, blob, bytes_to_write
-                        );
-                        // Print new resource
-                        let resource =
-                            MoveValueAnnotator::new(state).view_resource(struct_tag, blob)?;
-                        print_struct_with_indent(&resource, 6)
-                    }
+                    print_struct_diff_with_indent(&resource_old, &resource_new, 8)
                 }
-                None => {
+                Op::Delete => {
                     println!(
                         "Deleted type {} (wrote {:?} bytes)",
                         struct_tag, bytes_to_write
@@ -254,10 +254,12 @@ pub(crate) fn maybe_commit_effects(
     // shouldn't contain modules
     if commit {
         for (addr, account) in changeset.into_inner() {
-            for (struct_tag, blob_opt) in account.into_resources() {
-                match blob_opt {
-                    Some(blob) => state.save_resource(addr, struct_tag, &blob)?,
-                    None => state.delete_resource(addr, struct_tag)?,
+            for (struct_tag, blob_op) in account.into_resources() {
+                match blob_op {
+                    Op::New(blob) | Op::Modify(blob) => {
+                        state.save_resource(addr, struct_tag, &blob)?
+                    }
+                    Op::Delete => state.delete_resource(addr, struct_tag)?,
                 }
             }
         }
@@ -345,15 +347,18 @@ pub(crate) fn explain_publish_error(
             let old_module = state.get_module_by_id(&module_id)?.unwrap();
             let old_api = normalized::Module::new(&old_module);
             let new_api = normalized::Module::new(module);
-            let compat = Compatibility::check(&old_api, &new_api);
-            // the only way we get this error code is compatibility checking failed, so assert here
-            assert!(!compat.is_fully_compatible());
 
-            if !compat.struct_layout {
+            if Compatibility::new(false, true, false)
+                .check(&old_api, &new_api)
+                .is_err()
+            {
                 // TODO: we could choose to make this more precise by walking the global state and looking for published
                 // structs of this type. but probably a bad idea
                 println!("Layout API for structs of module {} has changed. Need to do a data migration of published structs", module_id)
-            } else if !compat.struct_and_function_linking {
+            } else if Compatibility::new(true, false, false)
+                .check(&old_api, &new_api)
+                .is_err()
+            {
                 // TODO: this will report false positives if we *are* simultaneously redeploying all dependent modules.
                 // but this is not easy to check without walking the global state and looking for everything
                 println!("Linking API for structs/functions of module {} has changed. Need to redeploy all dependent modules.", module_id)
diff --git a/language/tools/move-cli/src/sandbox/utils/on_disk_state_view.rs b/language/tools/move-cli/src/sandbox/utils/on_disk_state_view.rs
index bb3cb5d4db..fe8b1916ba 100644
--- a/language/tools/move-cli/src/sandbox/utils/on_disk_state_view.rs
+++ b/language/tools/move-cli/src/sandbox/utils/on_disk_state_view.rs
@@ -138,7 +138,7 @@ impl OnDiskStateView {
             return None;
         }
         let name = Identifier::new(p.file_stem().unwrap().to_str().unwrap()).unwrap();
-        match p.parent().map(|parent| parent.parent()).flatten() {
+        match p.parent().and_then(|parent| parent.parent()) {
             Some(parent) => {
                 let addr =
                     AccountAddress::from_hex_literal(parent.file_stem().unwrap().to_str().unwrap())
@@ -329,7 +329,7 @@ impl OnDiskStateView {
         if !path.exists() {
             fs::create_dir_all(path.parent().unwrap())?
         }
-        Ok(fs::write(path, &module_bytes)?)
+        Ok(fs::write(path, module_bytes)?)
     }
 
     /// Save the YAML encoding `layout` on disk under `build_dir/layouts/id`.
@@ -452,7 +452,7 @@ struct Generics(Vec<TypeTag>);
 impl ToString for TypeID {
     fn to_string(&self) -> String {
         match &self.0 {
-            TypeTag::Struct(s) => StructID(s.clone()).to_string(),
+            TypeTag::Struct(s) => StructID(*s.clone()).to_string(),
             TypeTag::Vector(t) => format!("vector<{}>", TypeID(*t.clone()).to_string()),
             t => t.to_string(),
         }
diff --git a/language/tools/move-cli/src/sandbox/utils/package_context.rs b/language/tools/move-cli/src/sandbox/utils/package_context.rs
index 3c9de98a6e..98e0c72c1b 100644
--- a/language/tools/move-cli/src/sandbox/utils/package_context.rs
+++ b/language/tools/move-cli/src/sandbox/utils/package_context.rs
@@ -15,7 +15,8 @@ pub struct PackageContext {
 }
 
 impl PackageContext {
-    pub fn new(path: &Path, build_config: &BuildConfig) -> Result<Self> {
+    pub fn new(path: &Option<PathBuf>, build_config: &BuildConfig) -> Result<Self> {
+        let path = path.as_deref().unwrap_or_else(|| Path::new("."));
         let build_dir = build_config
             .install_dir
             .as_ref()
@@ -33,8 +34,12 @@ impl PackageContext {
     /// NOTE: this is the only way to get a state view in Move CLI, and thus, this function needs
     /// to be run before every command that needs a state view, i.e., `publish`, `run`,
     /// `view`, and `doctor`.
-    pub fn prepare_state(&self, storage_dir: &Path) -> Result<OnDiskStateView> {
-        let bytecode_version = get_bytecode_version_from_env();
+    pub fn prepare_state(
+        &self,
+        bytecode_version: Option<u32>,
+        storage_dir: &Path,
+    ) -> Result<OnDiskStateView> {
+        let bytecode_version = get_bytecode_version_from_env(bytecode_version);
         let state = OnDiskStateView::create(self.build_dir.as_path(), storage_dir)?;
 
         // preload the storage with library modules (if such modules do not exist yet)
@@ -67,6 +72,6 @@ impl PackageContext {
 
 impl Default for PackageContext {
     fn default() -> Self {
-        Self::new(&std::env::current_dir().unwrap(), &BuildConfig::default()).unwrap()
+        Self::new(&None, &BuildConfig::default()).unwrap()
     }
 }
diff --git a/language/tools/move-cli/tests/build_tests/build_with_bytecode/B/Move.toml b/language/tools/move-cli/tests/build_tests/build_with_bytecode/B/Move.toml
new file mode 100644
index 0000000000..0e2ebaca6b
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/build_with_bytecode/B/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Bar"
+version = "0.0.0"
+
+[addresses]
+B = "0x2"
+
+[dependencies]
+Foo = { local = "../C" }
diff --git a/language/tools/move-cli/tests/build_tests/build_with_bytecode/B/sources/Bar.move b/language/tools/move-cli/tests/build_tests/build_with_bytecode/B/sources/Bar.move
new file mode 100644
index 0000000000..e12c66353a
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/build_with_bytecode/B/sources/Bar.move
@@ -0,0 +1,7 @@
+module B::Bar {
+    use C::Foo;
+
+    public fun foo(): u64 {
+        Foo::bar()
+    }
+}
diff --git a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/deps_only/C/Move.toml b/language/tools/move-cli/tests/build_tests/build_with_bytecode/C/Move.toml
similarity index 64%
rename from language/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/deps_only/C/Move.toml
rename to language/tools/move-cli/tests/build_tests/build_with_bytecode/C/Move.toml
index d7f129c716..e84e2fcfa3 100644
--- a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/deps_only/C/Move.toml
+++ b/language/tools/move-cli/tests/build_tests/build_with_bytecode/C/Move.toml
@@ -1,6 +1,6 @@
 [package]
-name = "C"
+name = "Foo"
 version = "0.0.0"
 
 [addresses]
-A = "_"
+C = "0x3"
diff --git a/language/tools/move-cli/tests/build_tests/build_with_bytecode/C/sources/Foo.move b/language/tools/move-cli/tests/build_tests/build_with_bytecode/C/sources/Foo.move
new file mode 100644
index 0000000000..4313b3ed6a
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/build_with_bytecode/C/sources/Foo.move
@@ -0,0 +1,5 @@
+module C::Foo {
+    public fun bar(): u64 {
+        1
+    }
+}
diff --git a/language/tools/move-cli/tests/build_tests/build_with_bytecode/Move.toml b/language/tools/move-cli/tests/build_tests/build_with_bytecode/Move.toml
new file mode 100644
index 0000000000..a309dafc0f
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/build_with_bytecode/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[addresses]
+A = "0x2"
+
+[dependencies]
+Bar = { local = "./B" }
+Foo = { local = "./C" }
diff --git a/language/tools/move-cli/tests/build_tests/build_with_bytecode/args.exp b/language/tools/move-cli/tests/build_tests/build_with_bytecode/args.exp
new file mode 100644
index 0000000000..1c885dfad1
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/build_with_bytecode/args.exp
@@ -0,0 +1,13 @@
+Command `build -v -p ./C`:
+BUILDING Foo
+External Command `mv ./C/sources/Foo.move ./C/sources/Foo.move_old`:
+External Command `rm -rf ./C/build/Foo/sources`:
+Command `build -v -p ./B`:
+INCLUDING DEPENDENCY Foo
+BUILDING Bar
+External Command `mv ./B/sources/Bar.move ./C/sources/Bar.move_old`:
+External Command `rm -rf ./B/build/Bar/sources`:
+Command `build -v`:
+INCLUDING DEPENDENCY Bar
+INCLUDING DEPENDENCY Foo
+BUILDING A
diff --git a/language/tools/move-cli/tests/build_tests/build_with_bytecode/args.txt b/language/tools/move-cli/tests/build_tests/build_with_bytecode/args.txt
new file mode 100644
index 0000000000..ee28926ab3
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/build_with_bytecode/args.txt
@@ -0,0 +1,7 @@
+build -v -p ./C
+> mv ./C/sources/Foo.move ./C/sources/Foo.move_old
+> rm -rf ./C/build/Foo/sources
+build -v -p ./B
+> mv ./B/sources/Bar.move ./C/sources/Bar.move_old
+> rm -rf ./B/build/Bar/sources
+build -v
diff --git a/language/tools/move-cli/tests/build_tests/build_with_bytecode/sources/A.move b/language/tools/move-cli/tests/build_tests/build_with_bytecode/sources/A.move
new file mode 100644
index 0000000000..62c396ec08
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/build_with_bytecode/sources/A.move
@@ -0,0 +1,8 @@
+module A::A {
+    use B::Bar;
+    use C::Foo;
+
+    public fun foo(): u64 {
+        Bar::foo() + Foo::bar()
+    }
+}
diff --git a/language/tools/move-package/tests/test_sources/model/basic_no_deps/Move.toml b/language/tools/move-cli/tests/build_tests/build_with_warnings/Move.toml
similarity index 66%
rename from language/tools/move-package/tests/test_sources/model/basic_no_deps/Move.toml
rename to language/tools/move-cli/tests/build_tests/build_with_warnings/Move.toml
index b5b93588f8..db3f9fb558 100644
--- a/language/tools/move-package/tests/test_sources/model/basic_no_deps/Move.toml
+++ b/language/tools/move-cli/tests/build_tests/build_with_warnings/Move.toml
@@ -1,3 +1,3 @@
 [package]
-name = "test"
+name = "Test"
 version = "0.0.0"
diff --git a/language/tools/move-cli/tests/build_tests/build_with_warnings/args.exp b/language/tools/move-cli/tests/build_tests/build_with_warnings/args.exp
new file mode 100644
index 0000000000..05ecd0b308
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/build_with_warnings/args.exp
@@ -0,0 +1,25 @@
+Command `build`:
+BUILDING Test
+warning[W09002]: unused variable
+  ┌─ ./sources/m.move:2:16
+  │
+2 │ public fun foo(x: u64): u64 {
+  │                ^ Unused parameter 'x'. Consider removing or prefixing with an underscore: '_x'
+
+Command `disassemble --package Test --name m`:
+// Move bytecode v6
+module 42.m {
+
+
+public foo(x: u64): u64 {
+B0:
+	0: LdU64(2)
+	1: Ret
+}
+}
+warning[W09002]: unused variable
+  ┌─ ./sources/m.move:2:16
+  │
+2 │ public fun foo(x: u64): u64 {
+  │                ^ Unused parameter 'x'. Consider removing or prefixing with an underscore: '_x'
+
diff --git a/language/tools/move-cli/tests/build_tests/build_with_warnings/args.txt b/language/tools/move-cli/tests/build_tests/build_with_warnings/args.txt
new file mode 100644
index 0000000000..aacafa1ba2
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/build_with_warnings/args.txt
@@ -0,0 +1,2 @@
+build
+disassemble --package Test --name m
diff --git a/language/tools/move-cli/tests/build_tests/build_with_warnings/modules/m.move b/language/tools/move-cli/tests/build_tests/build_with_warnings/modules/m.move
new file mode 100644
index 0000000000..c892ad41ec
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/build_with_warnings/modules/m.move
@@ -0,0 +1,5 @@
+module 0x42::m {
+public fun foo(x: u64): u64 {
+    1 + 1
+}
+}
diff --git a/language/tools/move-cli/tests/build_tests/build_with_warnings/sources/m.move b/language/tools/move-cli/tests/build_tests/build_with_warnings/sources/m.move
new file mode 100644
index 0000000000..c892ad41ec
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/build_with_warnings/sources/m.move
@@ -0,0 +1,5 @@
+module 0x42::m {
+public fun foo(x: u64): u64 {
+    1 + 1
+}
+}
diff --git a/language/tools/move-cli/tests/build_tests/circular_dependencies/args.evm.exp b/language/tools/move-cli/tests/build_tests/circular_dependencies/args.evm.exp
index e54c5429a1..f96593a2bf 100644
--- a/language/tools/move-cli/tests/build_tests/circular_dependencies/args.evm.exp
+++ b/language/tools/move-cli/tests/build_tests/circular_dependencies/args.evm.exp
@@ -1,9 +1,2 @@
-Command `package build -v --arch ethereum`:
-Error: Unable to resolve packages for package 'Foo'
-
-Caused by:
-    0: While resolving dependency 'Bar' in package 'Foo'
-    1: Unable to resolve package dependency 'Bar'
-    2: While resolving dependency 'Foo' in package 'Bar'
-    3: Unable to resolve package dependency 'Foo'
-    4: Found cycle between packages: Foo -> Bar -> Foo
+Command `build -v --arch ethereum`:
+Error: Found cycle between packages: Foo -> Bar -> Foo
diff --git a/language/tools/move-cli/tests/build_tests/circular_dependencies/args.evm.txt b/language/tools/move-cli/tests/build_tests/circular_dependencies/args.evm.txt
index a57b42cc66..a8c353d3ef 100644
--- a/language/tools/move-cli/tests/build_tests/circular_dependencies/args.evm.txt
+++ b/language/tools/move-cli/tests/build_tests/circular_dependencies/args.evm.txt
@@ -1 +1 @@
-package build -v --arch ethereum
+build -v --arch ethereum
diff --git a/language/tools/move-cli/tests/build_tests/circular_dependencies/args.exp b/language/tools/move-cli/tests/build_tests/circular_dependencies/args.exp
index 284d22c11b..789358432e 100644
--- a/language/tools/move-cli/tests/build_tests/circular_dependencies/args.exp
+++ b/language/tools/move-cli/tests/build_tests/circular_dependencies/args.exp
@@ -1,9 +1,2 @@
-Command `package build -v`:
-Error: Unable to resolve packages for package 'Foo'
-
-Caused by:
-    0: While resolving dependency 'Bar' in package 'Foo'
-    1: Unable to resolve package dependency 'Bar'
-    2: While resolving dependency 'Foo' in package 'Bar'
-    3: Unable to resolve package dependency 'Foo'
-    4: Found cycle between packages: Foo -> Bar -> Foo
+Command `build -v`:
+Error: Found cycle between packages: Foo -> Bar -> Foo
diff --git a/language/tools/move-cli/tests/build_tests/circular_dependencies/args.txt b/language/tools/move-cli/tests/build_tests/circular_dependencies/args.txt
index 8e772362b2..cc4865c0fe 100644
--- a/language/tools/move-cli/tests/build_tests/circular_dependencies/args.txt
+++ b/language/tools/move-cli/tests/build_tests/circular_dependencies/args.txt
@@ -1 +1 @@
-package build -v
+build -v
diff --git a/language/tools/move-cli/tests/build_tests/dependency_chain/args.evm.exp b/language/tools/move-cli/tests/build_tests/dependency_chain/args.evm.exp
index ae4f762254..65c4757ca0 100644
--- a/language/tools/move-cli/tests/build_tests/dependency_chain/args.evm.exp
+++ b/language/tools/move-cli/tests/build_tests/dependency_chain/args.evm.exp
@@ -1,3 +1,3 @@
-Command `package build -v --arch ethereum`:
+Command `build -v --arch ethereum`:
 COMPILING A, Bar, Foo to Yul
 GENERATING EVM bytecote from Yul
diff --git a/language/tools/move-cli/tests/build_tests/dependency_chain/args.evm.txt b/language/tools/move-cli/tests/build_tests/dependency_chain/args.evm.txt
index a57b42cc66..a8c353d3ef 100644
--- a/language/tools/move-cli/tests/build_tests/dependency_chain/args.evm.txt
+++ b/language/tools/move-cli/tests/build_tests/dependency_chain/args.evm.txt
@@ -1 +1 @@
-package build -v --arch ethereum
+build -v --arch ethereum
diff --git a/language/tools/move-cli/tests/build_tests/dependency_chain/args.exp b/language/tools/move-cli/tests/build_tests/dependency_chain/args.exp
index d39eeea57a..ea1be9b5e0 100644
--- a/language/tools/move-cli/tests/build_tests/dependency_chain/args.exp
+++ b/language/tools/move-cli/tests/build_tests/dependency_chain/args.exp
@@ -1,4 +1,4 @@
-Command `package build -v`:
+Command `build -v`:
 INCLUDING DEPENDENCY Bar
 INCLUDING DEPENDENCY Foo
 BUILDING A
diff --git a/language/tools/move-cli/tests/build_tests/dependency_chain/args.txt b/language/tools/move-cli/tests/build_tests/dependency_chain/args.txt
index 8e772362b2..cc4865c0fe 100644
--- a/language/tools/move-cli/tests/build_tests/dependency_chain/args.txt
+++ b/language/tools/move-cli/tests/build_tests/dependency_chain/args.txt
@@ -1 +1 @@
-package build -v
+build -v
diff --git a/language/tools/move-cli/tests/build_tests/dev_address/args.evm.exp b/language/tools/move-cli/tests/build_tests/dev_address/args.evm.exp
index 251232f06b..0c3b17550a 100644
--- a/language/tools/move-cli/tests/build_tests/dev_address/args.evm.exp
+++ b/language/tools/move-cli/tests/build_tests/dev_address/args.evm.exp
@@ -1,3 +1,3 @@
-Command `package build -v -d --arch ethereum`:
+Command `build -v -d --arch ethereum`:
 COMPILING A to Yul
 GENERATING EVM bytecote from Yul
diff --git a/language/tools/move-cli/tests/build_tests/dev_address/args.evm.txt b/language/tools/move-cli/tests/build_tests/dev_address/args.evm.txt
index dd7a870450..15f5301cac 100644
--- a/language/tools/move-cli/tests/build_tests/dev_address/args.evm.txt
+++ b/language/tools/move-cli/tests/build_tests/dev_address/args.evm.txt
@@ -1 +1 @@
-package build -v -d --arch ethereum
+build -v -d --arch ethereum
diff --git a/language/tools/move-cli/tests/build_tests/dev_address/args.exp b/language/tools/move-cli/tests/build_tests/dev_address/args.exp
index 55c9a73c8c..fa89fc39cc 100644
--- a/language/tools/move-cli/tests/build_tests/dev_address/args.exp
+++ b/language/tools/move-cli/tests/build_tests/dev_address/args.exp
@@ -1,2 +1,2 @@
-Command `package build -v -d`:
+Command `build -v -d`:
 BUILDING A
diff --git a/language/tools/move-cli/tests/build_tests/dev_address/args.txt b/language/tools/move-cli/tests/build_tests/dev_address/args.txt
index 9cceaa5fc1..d3d916f197 100644
--- a/language/tools/move-cli/tests/build_tests/dev_address/args.txt
+++ b/language/tools/move-cli/tests/build_tests/dev_address/args.txt
@@ -1 +1 @@
-package build -v -d
+build -v -d
diff --git a/language/tools/move-cli/tests/build_tests/disassemble_script/Move.toml b/language/tools/move-cli/tests/build_tests/disassemble_script/Move.toml
new file mode 100644
index 0000000000..241b837f1b
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/disassemble_script/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "disassemble_script"
+version = "0.0.0"
diff --git a/language/tools/move-cli/tests/build_tests/disassemble_script/args.exp b/language/tools/move-cli/tests/build_tests/disassemble_script/args.exp
new file mode 100644
index 0000000000..bb0bf4639c
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/disassemble_script/args.exp
@@ -0,0 +1,10 @@
+Command `disassemble --name main`:
+// Move bytecode v6
+script {
+
+
+main() {
+B0:
+	0: Ret
+}
+}
diff --git a/language/tools/move-cli/tests/build_tests/disassemble_script/args.txt b/language/tools/move-cli/tests/build_tests/disassemble_script/args.txt
new file mode 100644
index 0000000000..87f6ca1466
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/disassemble_script/args.txt
@@ -0,0 +1 @@
+disassemble --name main
diff --git a/language/tools/move-cli/tests/build_tests/disassemble_script/sources/me.move b/language/tools/move-cli/tests/build_tests/disassemble_script/sources/me.move
new file mode 100644
index 0000000000..6aa5426fd2
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/disassemble_script/sources/me.move
@@ -0,0 +1,7 @@
+//# run
+script {
+    fun main() {
+        let x = 420;
+        assert!(x == 420, 0);
+    }
+}
diff --git a/language/tools/move-cli/tests/build_tests/empty_module_no_deps/args.evm.exp b/language/tools/move-cli/tests/build_tests/empty_module_no_deps/args.evm.exp
index d6dfd1ce94..532110eb8d 100644
--- a/language/tools/move-cli/tests/build_tests/empty_module_no_deps/args.evm.exp
+++ b/language/tools/move-cli/tests/build_tests/empty_module_no_deps/args.evm.exp
@@ -1,3 +1,3 @@
-Command `package build -v --arch ethereum`:
+Command `build -v --arch ethereum`:
 COMPILING A to Yul
 GENERATING EVM bytecote from Yul
diff --git a/language/tools/move-cli/tests/build_tests/empty_module_no_deps/args.evm.txt b/language/tools/move-cli/tests/build_tests/empty_module_no_deps/args.evm.txt
index a57b42cc66..a8c353d3ef 100644
--- a/language/tools/move-cli/tests/build_tests/empty_module_no_deps/args.evm.txt
+++ b/language/tools/move-cli/tests/build_tests/empty_module_no_deps/args.evm.txt
@@ -1 +1 @@
-package build -v --arch ethereum
+build -v --arch ethereum
diff --git a/language/tools/move-cli/tests/build_tests/empty_module_no_deps/args.exp b/language/tools/move-cli/tests/build_tests/empty_module_no_deps/args.exp
index f7b66b6afa..dffc3c3b34 100644
--- a/language/tools/move-cli/tests/build_tests/empty_module_no_deps/args.exp
+++ b/language/tools/move-cli/tests/build_tests/empty_module_no_deps/args.exp
@@ -1,2 +1,2 @@
-Command `package build -v`:
+Command `build -v`:
 BUILDING A
diff --git a/language/tools/move-cli/tests/build_tests/empty_module_no_deps/args.txt b/language/tools/move-cli/tests/build_tests/empty_module_no_deps/args.txt
index 8e772362b2..cc4865c0fe 100644
--- a/language/tools/move-cli/tests/build_tests/empty_module_no_deps/args.txt
+++ b/language/tools/move-cli/tests/build_tests/empty_module_no_deps/args.txt
@@ -1 +1 @@
-package build -v
+build -v
diff --git a/language/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.evm.exp b/language/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.evm.exp
index 0b5db14168..d261504544 100644
--- a/language/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.evm.exp
+++ b/language/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.evm.exp
@@ -1,4 +1,4 @@
-Command `package build -v --arch ethereum`:
+Command `build -v --arch ethereum`:
 COMPILING build_include_exclude_stdlib to Yul
 exiting with Move build errors Failed to compile Move into Yul ERROR
 error: unbound module
@@ -15,6 +15,6 @@ exiting with Move build errors Failed to compile Move into Yul ERROR
 
 
 Error: exiting with Move build errors
-Command `-d -v package build --arch ethereum`:
+Command `-d -v build --arch ethereum`:
 COMPILING MoveStdlib, build_include_exclude_stdlib to Yul
 GENERATING EVM bytecote from Yul
diff --git a/language/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.evm.txt b/language/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.evm.txt
index be9dd03e7e..962de6465e 100644
--- a/language/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.evm.txt
+++ b/language/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.evm.txt
@@ -1,2 +1,2 @@
-package build -v --arch ethereum
--d -v package build --arch ethereum
+build -v --arch ethereum
+-d -v build --arch ethereum
diff --git a/language/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.exp b/language/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.exp
index e463cb2cf8..ce37b1cf91 100644
--- a/language/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.exp
+++ b/language/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.exp
@@ -1,4 +1,4 @@
-Command `package build -v`:
+Command `build -v`:
 BUILDING build_include_exclude_stdlib
 error[E03002]: unbound module
   ┌─ ./sources/UseSigner.move:3:7
@@ -12,6 +12,6 @@ error[E03002]: unbound module
 6 │     signer::address_of(account)
   │     ^^^^^^ Unbound module alias 'signer'
 
-Command `-d -v package build`:
+Command `-d -v build`:
 INCLUDING DEPENDENCY MoveStdlib
 BUILDING build_include_exclude_stdlib
diff --git a/language/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.txt b/language/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.txt
index 67a15c4cde..f604f2da26 100644
--- a/language/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.txt
+++ b/language/tools/move-cli/tests/build_tests/include_exclude_stdlib/args.txt
@@ -1,2 +1,2 @@
-package build -v
--d -v package build
+build -v
+-d -v build
diff --git a/language/tools/move-cli/tests/build_tests/only_deps/args.exp b/language/tools/move-cli/tests/build_tests/only_deps/args.exp
deleted file mode 100644
index 0b60ac75b4..0000000000
--- a/language/tools/move-cli/tests/build_tests/only_deps/args.exp
+++ /dev/null
@@ -1,7 +0,0 @@
-Command `package build -v --only-deps`:
-INCLUDING DEPENDENCY MoveStdlib
-BUILDING OnlyDeps
-External Command `cat build/OnlyDeps/sources/A.move`:
-cat: build/OnlyDeps/sources/A.move: No such file or directory
-External Command `ls build/OnlyDeps/sources/dependencies`:
-MoveStdlib
diff --git a/language/tools/move-cli/tests/build_tests/only_deps/args.txt b/language/tools/move-cli/tests/build_tests/only_deps/args.txt
deleted file mode 100644
index 6495a99be4..0000000000
--- a/language/tools/move-cli/tests/build_tests/only_deps/args.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-package build -v --only-deps
-> cat build/OnlyDeps/sources/A.move
-> ls build/OnlyDeps/sources/dependencies
diff --git a/language/tools/move-cli/tests/build_tests/only_deps/sources/A.move b/language/tools/move-cli/tests/build_tests/only_deps/sources/A.move
deleted file mode 100644
index c9d98827f5..0000000000
--- a/language/tools/move-cli/tests/build_tests/only_deps/sources/A.move
+++ /dev/null
@@ -1,2 +0,0 @@
-A specially made mistake
-module 0x1::A {}
diff --git a/language/tools/move-cli/tests/build_tests/rebuild_after_adding_new_source/args.evm.exp b/language/tools/move-cli/tests/build_tests/rebuild_after_adding_new_source/args.evm.exp
index 8eb37d42e3..0f9d29a140 100644
--- a/language/tools/move-cli/tests/build_tests/rebuild_after_adding_new_source/args.evm.exp
+++ b/language/tools/move-cli/tests/build_tests/rebuild_after_adding_new_source/args.evm.exp
@@ -1,7 +1,7 @@
-Command `package build -v --arch ethereum`:
+Command `build -v --arch ethereum`:
 COMPILING Foo to Yul
 GENERATING EVM bytecote from Yul
 External Command `touch sources/Bar.move`:
-Command `package build -v --arch ethereum`:
+Command `build -v --arch ethereum`:
 COMPILING Foo to Yul
 GENERATING EVM bytecote from Yul
diff --git a/language/tools/move-cli/tests/build_tests/rebuild_after_adding_new_source/args.evm.txt b/language/tools/move-cli/tests/build_tests/rebuild_after_adding_new_source/args.evm.txt
index e031ec7d7f..d8c9efb2a1 100644
--- a/language/tools/move-cli/tests/build_tests/rebuild_after_adding_new_source/args.evm.txt
+++ b/language/tools/move-cli/tests/build_tests/rebuild_after_adding_new_source/args.evm.txt
@@ -1,3 +1,3 @@
-package build -v --arch ethereum
+build -v --arch ethereum
 > touch sources/Bar.move
-package build -v --arch ethereum
+build -v --arch ethereum
diff --git a/language/tools/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/args.evm.exp b/language/tools/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/args.evm.exp
index aa3c74ec7e..ebc203025a 100644
--- a/language/tools/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/args.evm.exp
+++ b/language/tools/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/args.evm.exp
@@ -1,17 +1,17 @@
-Command `package build -v --arch ethereum`:
+Command `build -v --arch ethereum`:
 COMPILING Foo to Yul
 GENERATING EVM bytecote from Yul
-Command `package build -v --arch ethereum`:
+Command `build -v --arch ethereum`:
 CACHED Foo
 External Command `rm build/evm/Foo.yul`:
-Command `package build -v --arch ethereum`:
+Command `build -v --arch ethereum`:
 COMPILING Foo to Yul
 GENERATING EVM bytecote from Yul
 External Command `rm build/evm/Foo.bin`:
-Command `package build -v --arch ethereum`:
+Command `build -v --arch ethereum`:
 COMPILING Foo to Yul
 GENERATING EVM bytecote from Yul
 External Command `rm build/evm/Foo.abi.json`:
-Command `package build -v --arch ethereum`:
+Command `build -v --arch ethereum`:
 COMPILING Foo to Yul
 GENERATING EVM bytecote from Yul
diff --git a/language/tools/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/args.evm.txt b/language/tools/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/args.evm.txt
index 9daa7a79ee..d6a71a7511 100644
--- a/language/tools/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/args.evm.txt
+++ b/language/tools/move-cli/tests/build_tests/rebuild_after_deleting_output_artifact/args.evm.txt
@@ -1,8 +1,8 @@
-package build -v --arch ethereum
-package build -v --arch ethereum
+build -v --arch ethereum
+build -v --arch ethereum
 > rm build/evm/Foo.yul
-package build -v --arch ethereum
+build -v --arch ethereum
 > rm build/evm/Foo.bin
-package build -v --arch ethereum
+build -v --arch ethereum
 > rm build/evm/Foo.abi.json
-package build -v --arch ethereum
+build -v --arch ethereum
diff --git a/language/tools/move-cli/tests/build_tests/rebuild_after_touching_manifest/args.evm.exp b/language/tools/move-cli/tests/build_tests/rebuild_after_touching_manifest/args.evm.exp
index b7caf1b8f8..fc8d8cecf4 100644
--- a/language/tools/move-cli/tests/build_tests/rebuild_after_touching_manifest/args.evm.exp
+++ b/language/tools/move-cli/tests/build_tests/rebuild_after_touching_manifest/args.evm.exp
@@ -1,7 +1,7 @@
-Command `package build -v --arch ethereum`:
+Command `build -v --arch ethereum`:
 COMPILING Foo to Yul
 GENERATING EVM bytecote from Yul
 External Command `touch Move.toml`:
-Command `package build -v --arch ethereum`:
+Command `build -v --arch ethereum`:
 COMPILING Foo to Yul
 GENERATING EVM bytecote from Yul
diff --git a/language/tools/move-cli/tests/build_tests/rebuild_after_touching_manifest/args.evm.txt b/language/tools/move-cli/tests/build_tests/rebuild_after_touching_manifest/args.evm.txt
index acd1f051ce..bccd3f6d6a 100644
--- a/language/tools/move-cli/tests/build_tests/rebuild_after_touching_manifest/args.evm.txt
+++ b/language/tools/move-cli/tests/build_tests/rebuild_after_touching_manifest/args.evm.txt
@@ -1,3 +1,3 @@
-package build -v --arch ethereum
+build -v --arch ethereum
 > touch Move.toml
-package build -v --arch ethereum
+build -v --arch ethereum
diff --git a/language/tools/move-cli/tests/build_tests/rebuild_after_touching_source/args.evm.exp b/language/tools/move-cli/tests/build_tests/rebuild_after_touching_source/args.evm.exp
index dd9b19307b..792c93d58f 100644
--- a/language/tools/move-cli/tests/build_tests/rebuild_after_touching_source/args.evm.exp
+++ b/language/tools/move-cli/tests/build_tests/rebuild_after_touching_source/args.evm.exp
@@ -1,7 +1,7 @@
-Command `package build -v --arch ethereum`:
+Command `build -v --arch ethereum`:
 COMPILING Foo to Yul
 GENERATING EVM bytecote from Yul
 External Command `touch sources/Foo.move`:
-Command `package build -v --arch ethereum`:
+Command `build -v --arch ethereum`:
 COMPILING Foo to Yul
 GENERATING EVM bytecote from Yul
diff --git a/language/tools/move-cli/tests/build_tests/rebuild_after_touching_source/args.evm.txt b/language/tools/move-cli/tests/build_tests/rebuild_after_touching_source/args.evm.txt
index b606bb3de1..e9b9bcbf7e 100644
--- a/language/tools/move-cli/tests/build_tests/rebuild_after_touching_source/args.evm.txt
+++ b/language/tools/move-cli/tests/build_tests/rebuild_after_touching_source/args.evm.txt
@@ -1,3 +1,3 @@
-package build -v --arch ethereum
+build -v --arch ethereum
 > touch sources/Foo.move
-package build -v --arch ethereum
+build -v --arch ethereum
diff --git a/language/tools/move-cli/tests/build_tests/rebuild_no_modification/args.evm.exp b/language/tools/move-cli/tests/build_tests/rebuild_no_modification/args.evm.exp
index 88aa651a80..2e418bb829 100644
--- a/language/tools/move-cli/tests/build_tests/rebuild_no_modification/args.evm.exp
+++ b/language/tools/move-cli/tests/build_tests/rebuild_no_modification/args.evm.exp
@@ -1,5 +1,5 @@
-Command `package build -v --arch ethereum`:
+Command `build -v --arch ethereum`:
 COMPILING Foo to Yul
 GENERATING EVM bytecote from Yul
-Command `package build -v --arch ethereum`:
+Command `build -v --arch ethereum`:
 CACHED Foo
diff --git a/language/tools/move-cli/tests/build_tests/rebuild_no_modification/args.evm.txt b/language/tools/move-cli/tests/build_tests/rebuild_no_modification/args.evm.txt
index e627a34e03..ed83bebe22 100644
--- a/language/tools/move-cli/tests/build_tests/rebuild_no_modification/args.evm.txt
+++ b/language/tools/move-cli/tests/build_tests/rebuild_no_modification/args.evm.txt
@@ -1,2 +1,2 @@
-package build -v --arch ethereum
-package build -v --arch ethereum
+build -v --arch ethereum
+build -v --arch ethereum
diff --git a/language/tools/move-cli/tests/build_tests/simple_build_with_docs/args.exp b/language/tools/move-cli/tests/build_tests/simple_build_with_docs/args.exp
new file mode 100644
index 0000000000..85b896215f
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/simple_build_with_docs/args.exp
@@ -0,0 +1,18 @@
+Command `new --path . Foo`:
+Command `build`:
+FETCHING GIT DEPENDENCY https://github.com/move-language/move.git
+UPDATING GIT DEPENDENCY https://github.com/move-language/move.git
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING Foo
+Command `docgen --template template.md --exclude-impl --exclude-private-fun --exclude-specs --include-call-diagrams --include-dep-diagrams --independent-specs --no-collapsed-sections --output-directory doc --references-file template.md --section-level-start 3 --toc-depth 3`:
+Generated "doc/template.md"
+Generated "doc/Foo.md"
+
+Documentation generation successful!
+External Command `grep documentation doc/Foo.md`:
+Test documentation comment
+External Command `cat doc/template.md`:
+This is a test template
+
+
+This is a test template
diff --git a/language/tools/move-cli/tests/build_tests/simple_build_with_docs/args.txt b/language/tools/move-cli/tests/build_tests/simple_build_with_docs/args.txt
new file mode 100644
index 0000000000..549f96d661
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/simple_build_with_docs/args.txt
@@ -0,0 +1,5 @@
+new --path . Foo
+build
+docgen --template template.md --exclude-impl --exclude-private-fun --exclude-specs --include-call-diagrams --include-dep-diagrams --independent-specs --no-collapsed-sections --output-directory doc --references-file template.md --section-level-start 3 --toc-depth 3
+> grep documentation doc/Foo.md
+> cat doc/template.md
diff --git a/language/tools/move-cli/tests/build_tests/simple_build_with_docs/sources/Foo.move b/language/tools/move-cli/tests/build_tests/simple_build_with_docs/sources/Foo.move
new file mode 100644
index 0000000000..6af3654843
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/simple_build_with_docs/sources/Foo.move
@@ -0,0 +1,5 @@
+module 0x1::Foo {
+    /// Test documentation comment
+    public fun foo() {
+    }
+}
diff --git a/language/tools/move-cli/tests/build_tests/simple_build_with_docs/template.md b/language/tools/move-cli/tests/build_tests/simple_build_with_docs/template.md
new file mode 100644
index 0000000000..a9130f91a8
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/simple_build_with_docs/template.md
@@ -0,0 +1 @@
+This is a test template
diff --git a/language/tools/move-cli/tests/build_tests/simple_new/args.exp b/language/tools/move-cli/tests/build_tests/simple_new/args.exp
new file mode 100644
index 0000000000..fde16f52e6
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/simple_new/args.exp
@@ -0,0 +1,22 @@
+Command `new P1`:
+External Command `cat P1/Move.toml`:
+[package]
+name = "P1"
+version = "0.0.0"
+
+[dependencies]
+MoveStdlib = { git = "https://github.com/move-language/move.git", subdir = "language/move-stdlib", rev = "main" }
+
+[addresses]
+std =  "0x1"
+Command `new P2 -p other_dir`:
+External Command `cat other_dir/Move.toml`:
+[package]
+name = "P2"
+version = "0.0.0"
+
+[dependencies]
+MoveStdlib = { git = "https://github.com/move-language/move.git", subdir = "language/move-stdlib", rev = "main" }
+
+[addresses]
+std =  "0x1"
diff --git a/language/tools/move-cli/tests/build_tests/simple_new/args.txt b/language/tools/move-cli/tests/build_tests/simple_new/args.txt
new file mode 100644
index 0000000000..f7b7ec18ae
--- /dev/null
+++ b/language/tools/move-cli/tests/build_tests/simple_new/args.txt
@@ -0,0 +1,5 @@
+new P1
+> cat P1/Move.toml
+
+new P2 -p other_dir
+> cat other_dir/Move.toml
diff --git a/language/tools/move-cli/tests/build_tests/unbound_address/args.evm.exp b/language/tools/move-cli/tests/build_tests/unbound_address/args.evm.exp
index 0f7dc987dd..d3c437535e 100644
--- a/language/tools/move-cli/tests/build_tests/unbound_address/args.evm.exp
+++ b/language/tools/move-cli/tests/build_tests/unbound_address/args.evm.exp
@@ -1,4 +1,4 @@
-Command `package build -v --arch ethereum`:
+Command `build -v --arch ethereum`:
 Error: Unresolved addresses found: [
 Named address 'A' in package 'A'
 ]
diff --git a/language/tools/move-cli/tests/build_tests/unbound_address/args.evm.txt b/language/tools/move-cli/tests/build_tests/unbound_address/args.evm.txt
index a57b42cc66..a8c353d3ef 100644
--- a/language/tools/move-cli/tests/build_tests/unbound_address/args.evm.txt
+++ b/language/tools/move-cli/tests/build_tests/unbound_address/args.evm.txt
@@ -1 +1 @@
-package build -v --arch ethereum
+build -v --arch ethereum
diff --git a/language/tools/move-cli/tests/build_tests/unbound_address/args.exp b/language/tools/move-cli/tests/build_tests/unbound_address/args.exp
index d96825b8db..a89305d076 100644
--- a/language/tools/move-cli/tests/build_tests/unbound_address/args.exp
+++ b/language/tools/move-cli/tests/build_tests/unbound_address/args.exp
@@ -1,4 +1,4 @@
-Command `package build -v`:
+Command `build -v`:
 Error: Unresolved addresses found: [
 Named address 'A' in package 'A'
 ]
diff --git a/language/tools/move-cli/tests/build_tests/unbound_address/args.txt b/language/tools/move-cli/tests/build_tests/unbound_address/args.txt
index 8e772362b2..cc4865c0fe 100644
--- a/language/tools/move-cli/tests/build_tests/unbound_address/args.txt
+++ b/language/tools/move-cli/tests/build_tests/unbound_address/args.txt
@@ -1 +1 @@
-package build -v
+build -v
diff --git a/language/tools/move-cli/tests/build_tests/unbound_dependency/args.evm.exp b/language/tools/move-cli/tests/build_tests/unbound_dependency/args.evm.exp
index d9c18152b3..e0349dc654 100644
--- a/language/tools/move-cli/tests/build_tests/unbound_dependency/args.evm.exp
+++ b/language/tools/move-cli/tests/build_tests/unbound_dependency/args.evm.exp
@@ -1,7 +1,7 @@
-Command `package build -v --arch ethereum`:
-Error: Unable to resolve packages for package 'A'
+Command `build -v --arch ethereum`:
+Error: Failed to resolve dependencies for package 'A'
 
 Caused by:
-    0: While resolving dependency 'Foo' in package 'A'
-    1: While processing dependency 'Foo'
-    2: Unable to find package manifest for 'Foo' at "Move.toml/./foo"
+    0: Parsing manifest for 'Foo'
+    1: Unable to find package manifest for 'Foo' at "./foo/Move.toml"
+    2: No such file or directory (os error 2)
diff --git a/language/tools/move-cli/tests/build_tests/unbound_dependency/args.evm.txt b/language/tools/move-cli/tests/build_tests/unbound_dependency/args.evm.txt
index a57b42cc66..a8c353d3ef 100644
--- a/language/tools/move-cli/tests/build_tests/unbound_dependency/args.evm.txt
+++ b/language/tools/move-cli/tests/build_tests/unbound_dependency/args.evm.txt
@@ -1 +1 @@
-package build -v --arch ethereum
+build -v --arch ethereum
diff --git a/language/tools/move-cli/tests/build_tests/unbound_dependency/args.exp b/language/tools/move-cli/tests/build_tests/unbound_dependency/args.exp
index 572e1becdd..383b5affe7 100644
--- a/language/tools/move-cli/tests/build_tests/unbound_dependency/args.exp
+++ b/language/tools/move-cli/tests/build_tests/unbound_dependency/args.exp
@@ -1,7 +1,7 @@
-Command `package build -v`:
-Error: Unable to resolve packages for package 'A'
+Command `build -v`:
+Error: Failed to resolve dependencies for package 'A'
 
 Caused by:
-    0: While resolving dependency 'Foo' in package 'A'
-    1: While processing dependency 'Foo'
-    2: Unable to find package manifest for 'Foo' at "Move.toml/./foo"
+    0: Parsing manifest for 'Foo'
+    1: Unable to find package manifest for 'Foo' at "./foo/Move.toml"
+    2: No such file or directory (os error 2)
diff --git a/language/tools/move-cli/tests/build_tests/unbound_dependency/args.txt b/language/tools/move-cli/tests/build_tests/unbound_dependency/args.txt
index 8e772362b2..cc4865c0fe 100644
--- a/language/tools/move-cli/tests/build_tests/unbound_dependency/args.txt
+++ b/language/tools/move-cli/tests/build_tests/unbound_dependency/args.txt
@@ -1 +1 @@
-package build -v
+build -v
diff --git a/language/tools/move-cli/tests/cli_tests.rs b/language/tools/move-cli/tests/cli_tests.rs
index b77954862b..f4cc16e11d 100644
--- a/language/tools/move-cli/tests/cli_tests.rs
+++ b/language/tools/move-cli/tests/cli_tests.rs
@@ -3,8 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use move_cli::sandbox::commands::test;
-
-use std::path::PathBuf;
+use std::{env, path::PathBuf, process::Command};
 
 pub const CLI_METATEST_PATH: [&str; 3] = ["tests", "metatests", "args.txt"];
 
@@ -39,14 +38,14 @@ fn run_metatest() {
 fn cross_process_locking_git_deps() {
     let cli_exe = env!("CARGO_BIN_EXE_move");
     let handle = std::thread::spawn(move || {
-        std::process::Command::new(cli_exe)
+        Command::new(cli_exe)
             .current_dir("./tests/cross_process_tests/Package1")
             .args(["package", "build"])
             .output()
             .expect("Package1 failed");
     });
     let cli_exe = env!("CARGO_BIN_EXE_move").to_string();
-    std::process::Command::new(cli_exe)
+    Command::new(cli_exe)
         .current_dir("./tests/cross_process_tests/Package2")
         .args(["package", "build"])
         .output()
diff --git a/language/tools/move-cli/tests/metatests/args.exp b/language/tools/move-cli/tests/metatests/args.exp
index 107be68b93..0f3bff6a2e 100644
--- a/language/tools/move-cli/tests/metatests/args.exp
+++ b/language/tools/move-cli/tests/metatests/args.exp
@@ -16,8 +16,8 @@ Command `sandbox exp-test -p cov/two-runs-same-module --track-cov`:
 1 / 1 test(s) passed.
 Module 00000000000000000000000000000042::M
 	fun test
-		total: 7
-		covered: 7
+		total: 6
+		covered: 6
 		% coverage: 100.00
 >>> % Module coverage: 100.00
 Command `sandbox exp-test -p cov/two-runs-diff-module --track-cov`:
diff --git a/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.evm.exp b/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.evm.exp
index 23447b2104..74e5bcd7ea 100644
--- a/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.evm.exp
+++ b/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.evm.exp
@@ -1,4 +1,4 @@
-Command `package test --evm`:
+Command `test --evm`:
 INCLUDING DEPENDENCY Bar
 INCLUDING DEPENDENCY MoveStdlib
 BUILDING Foo
diff --git a/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.evm.txt b/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.evm.txt
index 80307ce85a..403aa26b9b 100644
--- a/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.evm.txt
+++ b/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.evm.txt
@@ -1 +1 @@
-package test --evm
+test --evm
diff --git a/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.exp b/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.exp
index b76eceb154..1a336b71f5 100644
--- a/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.exp
+++ b/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.exp
@@ -1,4 +1,4 @@
-Command `package test`:
+Command `test`:
 INCLUDING DEPENDENCY Bar
 INCLUDING DEPENDENCY MoveStdlib
 BUILDING Foo
diff --git a/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.stackless.exp b/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.stackless.exp
index 1bc8f5cfbf..f3f295152e 100644
--- a/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.stackless.exp
+++ b/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.stackless.exp
@@ -1,4 +1,4 @@
-Command `package test --stackless`:
+Command `test --stackless`:
 INCLUDING DEPENDENCY Bar
 INCLUDING DEPENDENCY MoveStdlib
 BUILDING Foo
diff --git a/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.stackless.txt b/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.stackless.txt
index b8530d9e6c..5909d654c2 100644
--- a/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.stackless.txt
+++ b/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.stackless.txt
@@ -1 +1 @@
-package test --stackless
+test --stackless
diff --git a/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.txt b/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.txt
index 56e5404079..9daeafb986 100644
--- a/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.txt
+++ b/language/tools/move-cli/tests/move_unit_tests/assign_dev_addr_for_dep/args.txt
@@ -1 +1 @@
-package test
+test
diff --git a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.evm.exp b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.evm.exp
index 13db3cd4f0..fd030cbf88 100644
--- a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.evm.exp
+++ b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.evm.exp
@@ -1,4 +1,4 @@
-Command `package test --evm`:
+Command `test --evm`:
 INCLUDING DEPENDENCY MoveStdlib
 BUILDING StandaloneModule
 Running Move unit tests
diff --git a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.evm.txt b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.evm.txt
index 80307ce85a..403aa26b9b 100644
--- a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.evm.txt
+++ b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.evm.txt
@@ -1 +1 @@
-package test --evm
+test --evm
diff --git a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.exp b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.exp
index 4d574b8ab4..3b23eb8ca5 100644
--- a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.exp
+++ b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.exp
@@ -1,4 +1,4 @@
-Command `package test`:
+Command `test`:
 INCLUDING DEPENDENCY MoveStdlib
 BUILDING StandaloneModule
 Running Move unit tests
diff --git a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.stackless.exp b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.stackless.exp
index 4555855a2a..ae0c6469e1 100644
--- a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.stackless.exp
+++ b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.stackless.exp
@@ -1,4 +1,4 @@
-Command `package test --stackless`:
+Command `test --stackless`:
 INCLUDING DEPENDENCY MoveStdlib
 BUILDING StandaloneModule
 Running Move unit tests
diff --git a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.stackless.txt b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.stackless.txt
index b8530d9e6c..5909d654c2 100644
--- a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.stackless.txt
+++ b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.stackless.txt
@@ -1 +1 @@
-package test --stackless
+test --stackless
diff --git a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.txt b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.txt
index 56e5404079..9daeafb986 100644
--- a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.txt
+++ b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_dev_addr_assignment/args.txt
@@ -1 +1 @@
-package test
+test
diff --git a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.evm.exp b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.evm.exp
index 13db3cd4f0..fd030cbf88 100644
--- a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.evm.exp
+++ b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.evm.exp
@@ -1,4 +1,4 @@
-Command `package test --evm`:
+Command `test --evm`:
 INCLUDING DEPENDENCY MoveStdlib
 BUILDING StandaloneModule
 Running Move unit tests
diff --git a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.evm.txt b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.evm.txt
index 80307ce85a..403aa26b9b 100644
--- a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.evm.txt
+++ b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.evm.txt
@@ -1 +1 @@
-package test --evm
+test --evm
diff --git a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.exp b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.exp
index 4d574b8ab4..3b23eb8ca5 100644
--- a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.exp
+++ b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.exp
@@ -1,4 +1,4 @@
-Command `package test`:
+Command `test`:
 INCLUDING DEPENDENCY MoveStdlib
 BUILDING StandaloneModule
 Running Move unit tests
diff --git a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.stackless.exp b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.stackless.exp
index 4555855a2a..ae0c6469e1 100644
--- a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.stackless.exp
+++ b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.stackless.exp
@@ -1,4 +1,4 @@
-Command `package test --stackless`:
+Command `test --stackless`:
 INCLUDING DEPENDENCY MoveStdlib
 BUILDING StandaloneModule
 Running Move unit tests
diff --git a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.stackless.txt b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.stackless.txt
index b8530d9e6c..5909d654c2 100644
--- a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.stackless.txt
+++ b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.stackless.txt
@@ -1 +1 @@
-package test --stackless
+test --stackless
diff --git a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.txt b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.txt
index 56e5404079..9daeafb986 100644
--- a/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.txt
+++ b/language/tools/move-cli/tests/move_unit_tests/standalone_module_with_regular_addr_assignment/args.txt
@@ -1 +1 @@
-package test
+test
diff --git a/language/tools/move-cli/tests/sandbox_tests/concretize_read_write_set/args.exp b/language/tools/move-cli/tests/sandbox_tests/concretize_read_write_set/args.exp
index 10b378b365..5eb735104c 100644
--- a/language/tools/move-cli/tests/sandbox_tests/concretize_read_write_set/args.exp
+++ b/language/tools/move-cli/tests/sandbox_tests/concretize_read_write_set/args.exp
@@ -33,7 +33,6 @@ Command `experimental read-write-set storage/0x00000000000000000000000000000001/
 Command `experimental read-write-set storage/0x00000000000000000000000000000001/modules/ConcretizeVector.mv read_vec`:
 Accesses:
 Formal(0): Read
-Formal(0)/0x1::ConcretizeVector::S/v: Read
 Formal(0)/0x1::ConcretizeVector::S/v/[_]: Read
 Formal(0)/0x1::ConcretizeVector::S/v/[_]/0x1::ConcretizeVector::T/f: Read
 
@@ -45,7 +44,6 @@ Command `experimental read-write-set storage/0x00000000000000000000000000000001/
 
 Command `sandbox run storage/0x00000000000000000000000000000001/modules/ConcretizeVector.mv publish --signers 0x1 0x2`:
 Command `experimental read-write-set storage/0x00000000000000000000000000000001/modules/ConcretizeVector.mv read_vec --concretize paths --args 0x1`:
-0x1/0x1::ConcretizeVector::S/0: Read
 0x1/0x1::ConcretizeVector::S/0/[_]: Read
 0x1/0x1::ConcretizeVector::T/0: Read
 0x2/0x1::ConcretizeVector::T/0: Read
@@ -53,7 +51,6 @@ Command `experimental read-write-set storage/0x00000000000000000000000000000001/
 
 
 Command `experimental read-write-set storage/0x00000000000000000000000000000001/modules/ConcretizeVector.mv write_vec --concretize paths --args 0x1 2`:
-0x1/0x1::ConcretizeVector::S/0: Read
 0x1/0x1::ConcretizeVector::S/0/[_]: Read
 0x1/0x1::ConcretizeVector::T/0: Write
 0x2/0x1::ConcretizeVector::T/0: Write
diff --git a/language/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.exp b/language/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.exp
index c959c1c1cf..f56f36ddf7 100644
--- a/language/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.exp
+++ b/language/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.exp
@@ -1,8 +1,9 @@
-Command `-p p1 sandbox publish --override-ordering A --override-ordering B -v`:
+Command `-p p1 sandbox publish --bundle --override-ordering A --override-ordering B -v`:
 Found 2 modules
 Publishing a new module 00000000000000000000000000000003::A (wrote 82 bytes)
 Publishing a new module 00000000000000000000000000000003::B (wrote 93 bytes)
 Wrote 175 bytes of module ID's and code
-Command `-p p2 sandbox publish --override-ordering A --override-ordering C -v`:
+Command `-p p2 sandbox publish --bundle --override-ordering A --override-ordering C -v`:
 Found 3 modules
 Invalid multi-module publishing: VMError with status INVALID_FRIEND_DECL_WITH_MODULES_IN_DEPENDENCIES at location Module ModuleId { address: 00000000000000000000000000000003, name: Identifier("C") } and message At least one module, 00000000000000000000000000000003::A, appears in both the dependency set and the friend set
+Publishing failed with unexpected error INVALID_FRIEND_DECL_WITH_MODULES_IN_DEPENDENCIES
diff --git a/language/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.txt b/language/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.txt
index bf15d01fb4..eaea2a2570 100644
--- a/language/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.txt
+++ b/language/tools/move-cli/tests/sandbox_tests/cyclic_multi_module_publish/args.txt
@@ -1,2 +1,2 @@
--p p1 sandbox publish --override-ordering A --override-ordering B -v
--p p2 sandbox publish --override-ordering A --override-ordering C -v
+-p p1 sandbox publish --bundle --override-ordering A --override-ordering B -v
+-p p2 sandbox publish --bundle --override-ordering A --override-ordering C -v
diff --git a/language/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.exp b/language/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.exp
index ac1053b5a4..8e3ee5dd9c 100644
--- a/language/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.exp
+++ b/language/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.exp
@@ -77,13 +77,16 @@ Signer:
 
 Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct B --type-args bool --shallow`:
 ---
-"00000000000000000000000000000001::M1::B<bool>":
-  STRUCT:
-    - a:
-        TYPENAME: AccountAddress
-    - c:
-        TYPENAME: "00000000000000000000000000000001::M2::C<bool>"
-    - t: BOOL
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
 
 Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct A --type-args 0x1::M1::S<u64>`:
 ---
@@ -159,21 +162,29 @@ Signer:
 
 Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct A --type-args 0x1::M1::S<u64> --shallow`:
 ---
-"00000000000000000000000000000001::M1::A<00000000000000000000000000000001::M1::S<u64>>":
-  STRUCT:
-    - f: U64
-    - v: BYTES
-    - b:
-        TYPENAME: "00000000000000000000000000000001::M1::B<00000000000000000000000000000001::M1::S<u64>>"
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
 
 Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct A --type-args vector<0x1::M1::S<u64>> --shallow`:
 ---
-"00000000000000000000000000000001::M1::A<vector<00000000000000000000000000000001::M1::S<u64>>>":
-  STRUCT:
-    - f: U64
-    - v: BYTES
-    - b:
-        TYPENAME: "00000000000000000000000000000001::M1::B<vector<00000000000000000000000000000001::M1::S<u64>>>"
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
 
 Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M2.mv --struct C --type-args 0x1::M2::C<u64>`:
 ---
@@ -199,7 +210,7 @@ Signer:
 
 Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct G`:
 ---
-"00000000000000000000000000000001::M1::G<>":
+"00000000000000000000000000000001::M1::G":
   STRUCT:
     - x: U64
     - s:
@@ -218,3 +229,169 @@ Signer:
       CONTENT: U8
       SIZE: 16
 
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct A --type-args bool --ignore-phantom-types`:
+---
+"00000000000000000000000000000001::phantoms::A":
+  STRUCT:
+    - dummy_field: BOOL
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct A --type-args u64 --ignore-phantom-types`:
+---
+"00000000000000000000000000000001::phantoms::A":
+  STRUCT:
+    - dummy_field: BOOL
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct B --type-args bool u8 --ignore-phantom-types`:
+---
+"00000000000000000000000000000001::phantoms::B":
+  STRUCT:
+    - dummy_field: BOOL
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct C --type-args u8 u64 u128 --ignore-phantom-types`:
+---
+"00000000000000000000000000000001::phantoms::A":
+  STRUCT:
+    - dummy_field: BOOL
+"00000000000000000000000000000001::phantoms::B":
+  STRUCT:
+    - dummy_field: BOOL
+"00000000000000000000000000000001::phantoms::C":
+  STRUCT:
+    - a:
+        TYPENAME: "00000000000000000000000000000001::phantoms::A"
+    - b:
+        TYPENAME: "00000000000000000000000000000001::phantoms::B"
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct D --type-args bool u64 --ignore-phantom-types`:
+---
+"00000000000000000000000000000001::phantoms::D<u64>":
+  STRUCT:
+    - v:
+        SEQ: U64
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --ignore-phantom-types`:
+---
+"00000000000000000000000000000001::phantoms::E<bool,u128>":
+  STRUCT:
+    - v1:
+        SEQ: BOOL
+    - v2:
+        SEQ: U128
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --omit-addresses`:
+---
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+"phantoms::E<bool,u64,u128>":
+  STRUCT:
+    - v1:
+        SEQ: BOOL
+    - v2:
+        SEQ: U128
+
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --separator __`:
+---
+00000000000000000000000000000001__phantoms__E__bool__u64__u128__:
+  STRUCT:
+    - v1:
+        SEQ: BOOL
+    - v2:
+        SEQ: U128
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+
+Command `sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --omit-addresses --separator __`:
+---
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+Signer:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+phantoms__E__bool__u64__u128__:
+  STRUCT:
+    - v1:
+        SEQ: BOOL
+    - v2:
+        SEQ: U128
+
diff --git a/language/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.txt b/language/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.txt
index 457e8fc04e..48e05d1b0d 100644
--- a/language/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.txt
+++ b/language/tools/move-cli/tests/sandbox_tests/generate_struct_layout/args.txt
@@ -22,3 +22,18 @@ sandbox generate struct-layouts --module storage/0x00000000000000000000000000000
 
 # without --type-args
 sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/M1.mv --struct G
+
+# phantom type arguments should not appear in struct keys when --ignore-phantom-types is set
+sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct A --type-args bool --ignore-phantom-types
+sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct A --type-args u64 --ignore-phantom-types
+sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct B --type-args bool u8 --ignore-phantom-types
+sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct C --type-args u8 u64 u128 --ignore-phantom-types
+sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct D --type-args bool u64 --ignore-phantom-types
+sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --ignore-phantom-types
+
+# test config options: address omission + separators
+sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --omit-addresses
+
+sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --separator __
+
+sandbox generate struct-layouts --module storage/0x00000000000000000000000000000001/modules/phantoms.mv --struct E --type-args bool u64 u128 --omit-addresses --separator __
diff --git a/language/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/phantoms.move b/language/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/phantoms.move
new file mode 100644
index 0000000000..592b8eeb99
--- /dev/null
+++ b/language/tools/move-cli/tests/sandbox_tests/generate_struct_layout/sources/phantoms.move
@@ -0,0 +1,19 @@
+module 0x1::phantoms {
+    struct A<phantom T> {}
+
+    struct B<phantom T1, phantom T2> {}
+
+    struct C<phantom T1, phantom T2, phantom T3> {
+        a: A<T1>,
+        b: B<T2, T3>
+    }
+
+    struct D<phantom T1, T2: store> {
+        v: vector<T2>
+    }
+
+    struct E<T1, phantom T2: store, T3> {
+        v1: vector<T1>,
+        v2: vector<T3>
+    }
+}
diff --git a/language/tools/move-cli/tests/build_tests/only_deps/Move.toml b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/Move.toml
similarity index 59%
rename from language/tools/move-cli/tests/build_tests/only_deps/Move.toml
rename to language/tools/move-cli/tests/sandbox_tests/module_disassemble/Move.toml
index f3494d1cfd..3540e09a07 100644
--- a/language/tools/move-cli/tests/build_tests/only_deps/Move.toml
+++ b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/Move.toml
@@ -1,10 +1,11 @@
 [package]
-name = "OnlyDeps"
+name = "module_publish_view"
 version = "0.0.0"
 
-
 [addresses]
 std = "0x1"
 
 [dependencies]
 MoveStdlib = { local = "../../../../../move-stdlib" }
+Deps1 = { local = "deps1" }
+Deps2 = { local = "deps2" }
diff --git a/language/tools/move-cli/tests/sandbox_tests/module_disassemble/args.exp b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/args.exp
new file mode 100644
index 0000000000..a9e1b7cc72
--- /dev/null
+++ b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/args.exp
@@ -0,0 +1,71 @@
+Command `sandbox publish -v`:
+Found 2 modules
+Publishing a new module 0000000000000000000000000000000a::M1 (wrote 197 bytes)
+Publishing a new module 0000000000000000000000000000000c::M (wrote 232 bytes)
+Wrote 429 bytes of module ID's and code
+Command `sandbox view storage/0x0000000000000000000000000000000a/modules/M1.mv`:
+// Move bytecode v6
+module a.M1 {
+use 00000000000000000000000000000001::vector;
+
+
+struct S {
+	i: u64
+}
+
+public bar(): u64 {
+B0:
+	0: LdU64(7)
+	1: Ret
+}
+public foo(Arg0: u64): vector<u64> {
+B0:
+	0: Call bar(): u64
+	1: StLoc[1](loc0: u64)
+	2: MoveLoc[0](Arg0: u64)
+	3: MoveLoc[1](loc0: u64)
+	4: Add
+	5: Call vector::singleton<u64>(u64): vector<u64>
+	6: Ret
+}
+}
+Command `sandbox view storage/0x0000000000000000000000000000000c/modules/M.mv`:
+// Move bytecode v6
+module c.M {
+use 0000000000000000000000000000000a::A;
+use 0000000000000000000000000000000a::M as 1M;
+use 0000000000000000000000000000000b::B;
+use 0000000000000000000000000000000b::M as 2M;
+
+
+
+
+public call_f(): u64 {
+B0:
+	0: Call f(): u64
+	1: Call 1M::f(): u64
+	2: Add
+	3: Call 2M::f(): u64
+	4: Add
+	5: Ret
+}
+public call_g(): u64 {
+B0:
+	0: Call g(): u64
+	1: Call A::g(): u64
+	2: Add
+	3: Call B::g(): u64
+	4: Add
+	5: Ret
+}
+public f(): u64 {
+B0:
+	0: LdU64(7)
+	1: Ret
+}
+public g(): u64 {
+B0:
+	0: LdU64(12)
+	1: Ret
+}
+}
diff --git a/language/tools/move-cli/tests/sandbox_tests/module_disassemble/args.txt b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/args.txt
new file mode 100644
index 0000000000..6952aaf916
--- /dev/null
+++ b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/args.txt
@@ -0,0 +1,4 @@
+sandbox publish -v
+
+sandbox view storage/0x0000000000000000000000000000000a/modules/M1.mv
+sandbox view storage/0x0000000000000000000000000000000c/modules/M.mv
diff --git a/language/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/Move.toml b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/Move.toml
new file mode 100644
index 0000000000..1ef5af7255
--- /dev/null
+++ b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Deps1"
+version = "0.0.0"
diff --git a/language/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NameConflict.move b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NameConflict.move
new file mode 100644
index 0000000000..fb8f12e6c0
--- /dev/null
+++ b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NameConflict.move
@@ -0,0 +1,5 @@
+module 0xa::M {
+    public fun f(): u64 {
+        7
+    }
+}
diff --git a/language/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NotAConflict.move b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NotAConflict.move
new file mode 100644
index 0000000000..6884c72abd
--- /dev/null
+++ b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/deps1/sources/NotAConflict.move
@@ -0,0 +1,5 @@
+module 0xA::A {
+    public fun g(): u64 {
+        7
+    }
+}
diff --git a/language/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/Move.toml b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/Move.toml
new file mode 100644
index 0000000000..73b27bc132
--- /dev/null
+++ b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "Deps2"
+version = "0.0.0"
diff --git a/language/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NameConflict.move b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NameConflict.move
new file mode 100644
index 0000000000..3b0ef36d22
--- /dev/null
+++ b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NameConflict.move
@@ -0,0 +1,5 @@
+module 0xb::M {
+    public fun f(): u64 {
+        7
+    }
+}
diff --git a/language/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NotAConflict.move b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NotAConflict.move
new file mode 100644
index 0000000000..25170afebc
--- /dev/null
+++ b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/deps2/sources/NotAConflict.move
@@ -0,0 +1,5 @@
+module 0xB::B {
+    public fun g(): u64 {
+        7
+    }
+}
diff --git a/language/tools/move-cli/tests/sandbox_tests/module_disassemble/sources/M1.move b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/sources/M1.move
new file mode 100644
index 0000000000..c62537c599
--- /dev/null
+++ b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/sources/M1.move
@@ -0,0 +1,14 @@
+module 0xa::M1 {
+    use std::vector;
+
+    struct S { i: u64 }
+
+    public fun foo(x: u64): vector<u64> {
+        let y = bar();
+        vector::singleton(x + y)
+    }
+
+    public fun bar(): u64 {
+        7
+    }
+}
diff --git a/language/tools/move-cli/tests/sandbox_tests/module_disassemble/sources/NameConflict.move b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/sources/NameConflict.move
new file mode 100644
index 0000000000..658fca02bb
--- /dev/null
+++ b/language/tools/move-cli/tests/sandbox_tests/module_disassemble/sources/NameConflict.move
@@ -0,0 +1,18 @@
+module 0xc::M {
+
+    public fun f(): u64 {
+        7
+    }
+
+    public fun g(): u64 {
+        12
+    }
+
+    public fun call_f(): u64 {
+        f() + 0xa::M::f() + 0xb::M::f()
+    }
+
+    public fun call_g(): u64 {
+        g() + 0xa::A::g() + 0xb::B::g()
+    }
+}
diff --git a/language/tools/move-cli/tests/sandbox_tests/module_publish_view/args.exp b/language/tools/move-cli/tests/sandbox_tests/module_publish_view/args.exp
index 49ae83f99c..6942a60819 100644
--- a/language/tools/move-cli/tests/sandbox_tests/module_publish_view/args.exp
+++ b/language/tools/move-cli/tests/sandbox_tests/module_publish_view/args.exp
@@ -3,7 +3,7 @@ Found 1 modules
 Publishing a new module 00000000000000000000000000000042::Module (wrote 120 bytes)
 Wrote 120 bytes of module ID's and code
 Command `sandbox view storage/0x00000000000000000000000000000042/modules/Module.mv`:
-// Move bytecode v5
+// Move bytecode v6
 module 42.Module {
 struct S {
 	i: u64
diff --git a/language/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.exp b/language/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.exp
index be3c39e376..409141af80 100644
--- a/language/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.exp
+++ b/language/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.exp
@@ -1,19 +1,19 @@
-Command `sandbox publish --override-ordering A -v`:
+Command `sandbox publish --bundle --override-ordering A -v`:
 Found 2 modules
 Invalid multi-module publishing: VMError with status LINKER_ERROR at location UNDEFINED and message Cannot find ModuleId { address: 00000000000000000000000000000002, name: Identifier("B") } in data cache
-Command `sandbox publish --override-ordering B -v`:
+Command `sandbox publish --bundle --override-ordering B -v`:
 Found 2 modules
 Invalid multi-module publishing: VMError with status LINKER_ERROR at location UNDEFINED and message Cannot find ModuleId { address: 00000000000000000000000000000002, name: Identifier("A") } in data cache
-Command `sandbox publish --override-ordering B --override-ordering A -v`:
+Command `sandbox publish --bundle --override-ordering B --override-ordering A -v`:
 Found 2 modules
 Invalid multi-module publishing: VMError with status LINKER_ERROR at location UNDEFINED and message Cannot find ModuleId { address: 00000000000000000000000000000002, name: Identifier("A") } in data cache
-Command `sandbox publish --override-ordering A --override-ordering B -v`:
+Command `sandbox publish --bundle --override-ordering A --override-ordering B -v`:
 Found 2 modules
 Publishing a new module 00000000000000000000000000000002::A (wrote 89 bytes)
 Publishing a new module 00000000000000000000000000000002::B (wrote 97 bytes)
 Wrote 186 bytes of module ID's and code
 Command `sandbox view storage/0x00000000000000000000000000000002/modules/A.mv`:
-// Move bytecode v5
+// Move bytecode v6
 module 2.A {
 
 
@@ -23,13 +23,16 @@ B0:
 }
 }
 Command `sandbox view storage/0x00000000000000000000000000000002/modules/B.mv`:
-// Move bytecode v5
+// Move bytecode v6
 module 2.B {
+use 00000000000000000000000000000002::A;
+
+
 
 
 bar() {
 B0:
-	0: Call[1](foo())
+	0: Call A::foo()
 	1: Ret
 }
 }
diff --git a/language/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.txt b/language/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.txt
index ea1c704733..704e4ab799 100644
--- a/language/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.txt
+++ b/language/tools/move-cli/tests/sandbox_tests/multi_module_publish/args.txt
@@ -1,14 +1,14 @@
 # expect failure as A friends B and B is missing in the bundle
-sandbox publish --override-ordering A -v
+sandbox publish --bundle --override-ordering A -v
 
 # expect failure as B depends on A and A is missing in the bundle
-sandbox publish --override-ordering B -v
+sandbox publish --bundle --override-ordering B -v
 
 # expect failure as B depends on A but A appears after B in the bundle
-sandbox publish --override-ordering B --override-ordering A -v
+sandbox publish --bundle --override-ordering B --override-ordering A -v
 
 # expect success: this is the correct order of publishing A and B
 # with friend relationship
-sandbox publish --override-ordering A --override-ordering B -v
+sandbox publish --bundle --override-ordering A --override-ordering B -v
 sandbox view storage/0x00000000000000000000000000000002/modules/A.mv
 sandbox view storage/0x00000000000000000000000000000002/modules/B.mv
diff --git a/language/tools/move-cli/tests/sandbox_tests/offer_smoke/args.exp b/language/tools/move-cli/tests/sandbox_tests/offer_smoke/args.exp
index deca039694..1a40d5f929 100644
--- a/language/tools/move-cli/tests/sandbox_tests/offer_smoke/args.exp
+++ b/language/tools/move-cli/tests/sandbox_tests/offer_smoke/args.exp
@@ -1,14 +1,14 @@
 Command `sandbox publish`:
 Command `sandbox run scripts/create_offer.move --signers 0xA11CE`:
 Command `sandbox run scripts/redeem_offer.move --signers 0xCA21`:
-Execution aborted with code 7 in module 00000000000000000000000000000001::offer.
+Execution aborted with code 65536 in module 00000000000000000000000000000001::offer.
 Command `sandbox run scripts/redeem_offer_bob.move --signers 0xB0B`:
 Command `sandbox run scripts/reclaim_offer.move --signers 0xB0B`:
 Command `sandbox clean`:
 Command `sandbox run scripts/self_offer_create.move --signers 0xA11CE`:
 Command `sandbox clean`:
 Command `sandbox run scripts/multi_offer.move --signers 0xA11CE`:
-Execution aborted with code 262 in module 00000000000000000000000000000001::offer.
+Execution aborted with code 524289 in module 00000000000000000000000000000001::offer.
 Command `sandbox clean`:
 Command `sandbox run scripts/non_existent_offer.move --signers 0xA11CE`:
-Execution aborted with code 517 in module 00000000000000000000000000000001::offer.
+Execution aborted with code 393218 in module 00000000000000000000000000000001::offer.
diff --git a/language/tools/move-cli/tests/sandbox_tests/package_basics/args.exp b/language/tools/move-cli/tests/sandbox_tests/package_basics/args.exp
index 779a536e1a..a83d27982b 100644
--- a/language/tools/move-cli/tests/sandbox_tests/package_basics/args.exp
+++ b/language/tools/move-cli/tests/sandbox_tests/package_basics/args.exp
@@ -1,7 +1,7 @@
-Command `package build`:
+Command `build`:
 INCLUDING DEPENDENCY MoveStdlib
 BUILDING PackageBasics
-Command `package test --coverage --threads 1`:
+Command `test --coverage --threads 1`:
 INCLUDING DEPENDENCY MoveStdlib
 BUILDING PackageBasics
 Running Move unit tests
@@ -12,20 +12,20 @@ Running Move unit tests
 [ PASS    ] 0x1::AModuleTests::double_zero_zero
 [ PASS    ] 0x1::AModuleTests::double_zero_zero_wrong
 Test result: OK. Total tests: 6; passed: 6; failed: 0
-Command `package coverage summary --summarize-functions`:
+Command `coverage summary --summarize-functions`:
 +-------------------------+
 | Move Coverage Summary   |
 +-------------------------+
 Module 00000000000000000000000000000001::AModule
 	fun double_except_three
-		total: 10
-		covered: 10
+		total: 11
+		covered: 11
 		% coverage: 100.00
 >>> % Module coverage: 100.00
 +-------------------------+
 | % Move Coverage: 100.00  |
 +-------------------------+
-Command `package coverage source --module AModule`:
+Command `coverage source --module AModule`:
 module std::AModule {
 
     /// x was three
@@ -47,8 +47,8 @@ module std::AModule {
         double_except_three(3);
     }
 }
-Command `package coverage bytecode --module AModule`:
-// Move bytecode v5
+Command `coverage bytecode --module AModule`:
+// Move bytecode v6
 module 1.AModule {
 
 
@@ -57,34 +57,48 @@ B0:
 [6]	0: CopyLoc[0](x: u64)
 [6]	1: LdU64(3)
 [6]	2: Neq
-[6]	3: BrTrue(6)
+[6]	3: BrFalse(5)
 B1:
-[2]	4: LdAddr[0](U64: [0, 0, 0, 0, 0, 0, 0, 0])
-[2]	5: Abort
+[4]	4: Branch(7)
 B2:
-[4]	6: CopyLoc[0](x: u64)
-[4]	7: MoveLoc[0](x: u64)
-[4]	8: Mul
-[4]	9: Ret
+[2]	5: LdConst[0](U64: [0, 0, 0, 0, 0, 0, 0, 0])
+[2]	6: Abort
+B3:
+[4]	7: CopyLoc[0](x: u64)
+[4]	8: MoveLoc[0](x: u64)
+[4]	9: Mul
+[4]	10: Ret
 }
 }
-Command `package disassemble --package MoveStdlib --name signer`:
-// Move bytecode v5
+Command `disassemble --package MoveStdlib --name signer`:
+// Move bytecode v6
 module 1.signer {
 
 
 public address_of(s: &signer): address {
 B0:
 	0: MoveLoc[0](s: &signer)
-	1: Call[1](borrow_address(&signer): &address)
+	1: Call borrow_address(&signer): &address
 	2: ReadRef
 	3: Ret
 }
 native public borrow_address(s: &signer): &address
 }
-Command `package errmap`:
-Command `package info`:
+Command `errmap`:
+Command `info`:
 PackageBasics
 ├─ std:0x1
 └─ MoveStdlib
    └─ std:0x1
+Command `test double_two`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING PackageBasics
+Running Move unit tests
+[ PASS    ] 0x1::AModule::double_two
+Test result: OK. Total tests: 1; passed: 1; failed: 0
+Command `test one_one`:
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING PackageBasics
+Running Move unit tests
+[ PASS    ] 0x1::AModuleTests::double_one_one
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/language/tools/move-cli/tests/sandbox_tests/package_basics/args.txt b/language/tools/move-cli/tests/sandbox_tests/package_basics/args.txt
index 32ce8e9aba..64ea070e28 100644
--- a/language/tools/move-cli/tests/sandbox_tests/package_basics/args.txt
+++ b/language/tools/move-cli/tests/sandbox_tests/package_basics/args.txt
@@ -1,8 +1,10 @@
-package build
-package test --coverage --threads 1
-package coverage summary --summarize-functions
-package coverage source --module AModule
-package coverage bytecode --module AModule
-package disassemble --package MoveStdlib --name signer
-package errmap
-package info
+build
+test --coverage --threads 1
+coverage summary --summarize-functions
+coverage source --module AModule
+coverage bytecode --module AModule
+disassemble --package MoveStdlib --name signer
+errmap
+info
+test double_two
+test one_one
diff --git a/language/tools/move-cli/tests/sandbox_tests/package_basics/error_map.errmap b/language/tools/move-cli/tests/sandbox_tests/package_basics/error_map.errmap
index 34b4e07111..9aee442b1a 100644
Binary files a/language/tools/move-cli/tests/sandbox_tests/package_basics/error_map.errmap and b/language/tools/move-cli/tests/sandbox_tests/package_basics/error_map.errmap differ
diff --git a/language/tools/move-cli/tests/sandbox_tests/package_basics/tests/AModuleTests.move b/language/tools/move-cli/tests/sandbox_tests/package_basics/tests/AModuleTests.move
index a2bf2ad354..a1bebfeee0 100644
--- a/language/tools/move-cli/tests/sandbox_tests/package_basics/tests/AModuleTests.move
+++ b/language/tools/move-cli/tests/sandbox_tests/package_basics/tests/AModuleTests.move
@@ -8,13 +8,13 @@ module std::AModuleTests {
     }
 
     #[test]
-    #[expected_failure(abort_code = 0)]
+    #[expected_failure(abort_code = 0, location = std::AModule)]
     fun double_three() {
         AModule::double_except_three(3);
     }
 
     #[test]
-    #[expected_failure(abort_code = 0)]
+    #[expected_failure(abort_code = 0, location = Self)]
     fun double_zero_zero_wrong() {
         assert!(AModule::double_except_three(0) == 1, 0)
     }
diff --git a/language/tools/move-cli/tests/sandbox_tests/print_stack_trace/args.exp b/language/tools/move-cli/tests/sandbox_tests/print_stack_trace/args.exp
index d129435c79..4a61f582b5 100644
--- a/language/tools/move-cli/tests/sandbox_tests/print_stack_trace/args.exp
+++ b/language/tools/move-cli/tests/sandbox_tests/print_stack_trace/args.exp
@@ -4,20 +4,18 @@ Call Stack:
     [0] main
 
         Code:
-            [12] LdU64(1)
-            [13] VecImmBorrow(2)
+            [10] LdU64(1)
+            [11] VecImmBorrow(2)
+            [12] StLoc(0)
+          > [13] CallGeneric(0)
             [14] StLoc(2)
-          > [15] CallGeneric(0)
-            [16] StLoc(4)
-            [17] ImmBorrowLoc(4)
-            [18] CallGeneric(1)
+            [15] ImmBorrowLoc(2)
+            [16] CallGeneric(1)
 
         Locals:
-            [0] -
-            [1] -
-            [2] false
-            [3] [true, false]
-            [4] -
+            [0] false
+            [1] [true, false]
+            [2] -
 
 
     [1] 00000000000000000000000000000002::N::foo<bool, u64>
@@ -40,13 +38,13 @@ Call Stack:
     [2] 00000000000000000000000000000002::M::sum
 
         Code:
-            [10] MoveLoc(0)
-            [11] LdU64(1)
-            [12] Sub
-          > [13] Call(0)
-            [14] Add
-            [15] StLoc(1)
-            [16] MoveLoc(1)
+            [9] MoveLoc(0)
+            [10] LdU64(1)
+            [11] Sub
+          > [12] Call(0)
+            [13] Add
+            [14] StLoc(1)
+            [15] MoveLoc(1)
 
         Locals:
             [0] -
@@ -56,13 +54,13 @@ Call Stack:
     [3] 00000000000000000000000000000002::M::sum
 
         Code:
-            [10] MoveLoc(0)
-            [11] LdU64(1)
-            [12] Sub
-          > [13] Call(0)
-            [14] Add
-            [15] StLoc(1)
-            [16] MoveLoc(1)
+            [9] MoveLoc(0)
+            [10] LdU64(1)
+            [11] Sub
+          > [12] Call(0)
+            [13] Add
+            [14] StLoc(1)
+            [15] MoveLoc(1)
 
         Locals:
             [0] -
@@ -72,13 +70,13 @@ Call Stack:
     [4] 00000000000000000000000000000002::M::sum
 
         Code:
-            [10] MoveLoc(0)
-            [11] LdU64(1)
-            [12] Sub
-          > [13] Call(0)
-            [14] Add
-            [15] StLoc(1)
-            [16] MoveLoc(1)
+            [9] MoveLoc(0)
+            [10] LdU64(1)
+            [11] Sub
+          > [12] Call(0)
+            [13] Add
+            [14] StLoc(1)
+            [15] MoveLoc(1)
 
         Locals:
             [0] -
@@ -95,19 +93,17 @@ Call Stack:
     [0] main
 
         Code:
-            [18] CallGeneric(1)
-            [19] MoveLoc(2)
+            [16] CallGeneric(1)
+            [17] MoveLoc(0)
+            [18] Pop
+          > [19] CallGeneric(2)
             [20] Pop
-          > [21] CallGeneric(2)
-            [22] Pop
-            [23] Ret
+            [21] Ret
 
         Locals:
             [0] -
-            [1] -
-            [2] -
-            [3] [true, false]
-            [4] 10
+            [1] [true, false]
+            [2] 10
 
 
     [1] 00000000000000000000000000000002::N::foo<u8, bool>
@@ -130,13 +126,13 @@ Call Stack:
     [2] 00000000000000000000000000000002::M::sum
 
         Code:
-            [10] MoveLoc(0)
-            [11] LdU64(1)
-            [12] Sub
-          > [13] Call(0)
-            [14] Add
-            [15] StLoc(1)
-            [16] MoveLoc(1)
+            [9] MoveLoc(0)
+            [10] LdU64(1)
+            [11] Sub
+          > [12] Call(0)
+            [13] Add
+            [14] StLoc(1)
+            [15] MoveLoc(1)
 
         Locals:
             [0] -
@@ -146,13 +142,13 @@ Call Stack:
     [3] 00000000000000000000000000000002::M::sum
 
         Code:
-            [10] MoveLoc(0)
-            [11] LdU64(1)
-            [12] Sub
-          > [13] Call(0)
-            [14] Add
-            [15] StLoc(1)
-            [16] MoveLoc(1)
+            [9] MoveLoc(0)
+            [10] LdU64(1)
+            [11] Sub
+          > [12] Call(0)
+            [13] Add
+            [14] StLoc(1)
+            [15] MoveLoc(1)
 
         Locals:
             [0] -
@@ -162,13 +158,13 @@ Call Stack:
     [4] 00000000000000000000000000000002::M::sum
 
         Code:
-            [10] MoveLoc(0)
-            [11] LdU64(1)
-            [12] Sub
-          > [13] Call(0)
-            [14] Add
-            [15] StLoc(1)
-            [16] MoveLoc(1)
+            [9] MoveLoc(0)
+            [10] LdU64(1)
+            [11] Sub
+          > [12] Call(0)
+            [13] Add
+            [14] StLoc(1)
+            [15] MoveLoc(1)
 
         Locals:
             [0] -
diff --git a/language/tools/move-cli/tests/sandbox_tests/print_values/args.exp b/language/tools/move-cli/tests/sandbox_tests/print_values/args.exp
index 9611d7f664..acd242f2e1 100644
--- a/language/tools/move-cli/tests/sandbox_tests/print_values/args.exp
+++ b/language/tools/move-cli/tests/sandbox_tests/print_values/args.exp
@@ -1,7 +1,170 @@
 Command `sandbox publish`:
-Command `sandbox run scripts/print_values.move --dry-run`:
+Command `test`:
+INCLUDING DEPENDENCY MoveNursery
+INCLUDING DEPENDENCY MoveStdlib
+BUILDING print_values
+Running Move unit tests
 [debug] 42
-[debug] (&) [100, 200, 300]
-[debug] (&) { false }
-[debug] (&) { 404, { false }, true }
-[debug] (&) { { false } }
+[debug] [ 100, 200, 300 ]
+[debug] 0x2::M::Foo {
+  dummy_field: false
+}
+[debug] 0x2::M::Bar {
+  x: 404,
+  y: 0x2::M::Foo {
+    dummy_field: false
+  },
+  z: true
+}
+[debug] 0x2::M::Box<0x2::M::Foo> {
+  x: 0x2::M::Foo {
+    dummy_field: false
+  }
+}
+[debug] "test_print_quoted_string"
+[debug] "Can you say \"Hel\\lo\"?"
+[debug] "test_print_string"
+[debug] 0x48656c6c6f2c2073616e65204d6f766520646562756767696e6721
+[debug] "Hello, sane Move debugging!"
+[debug] "test_print_ascii_string"
+[debug] "Hello, sane Move debugging!"
+[debug] "test_print_primitive_types"
+[debug] 255
+[debug] 65535
+[debug] 4294967295
+[debug] 18446744073709551615
+[debug] 340282366920938463463374607431768211455
+[debug] 115792089237316195423570985008687907853269984665640564039457584007913129639935
+[debug] false
+[debug] true
+[debug] @0x1234c0ffee
+[debug] signer(0x0)
+[debug] "test_print_struct"
+[debug] 0x2::M::TestInner {
+  val: 100,
+  vec: [ 200, 400 ],
+  msgs: [
+    0x616263646566,
+    0x313233343536
+  ]
+}
+[debug] 0x2::M::TestInner {
+  val: 10,
+  vec: [],
+  msgs: []
+}
+[debug] "test_print_vectors"
+[debug] 0xffabcdef
+[debug] [ 16, 17, 18, 19 ]
+[debug] [ 32, 33, 34, 35 ]
+[debug] [ 64, 65, 66, 67 ]
+[debug] [ 128, 129, 130, 131 ]
+[debug] [ 256, 257, 258, 259 ]
+[debug] [ true, false ]
+[debug] [ @0x1234, @0x5678, @0xabcdef ]
+[debug] [ signer(0x0), signer(0x1000000000000000000000000000000), signer(0x2000000000000000000000000000000), signer(0x3000000000000000000000000000000) ]
+[debug] [
+  0x2::M::TestInner {
+    val: 4,
+    vec: [ 127, 128 ],
+    msgs: [
+      0x00ff,
+      0xabcd
+    ]
+  },
+  0x2::M::TestInner {
+    val: 8,
+    vec: [ 128, 129 ],
+    msgs: [
+      0x0000
+    ]
+  }
+]
+[debug] "test_print_vector_of_vectors"
+[debug] [
+  0xffab,
+  0xcdef
+]
+[debug] [
+  [ 16, 17 ],
+  [ 18, 19 ]
+]
+[debug] [
+  [ 32, 33 ],
+  [ 34, 35 ]
+]
+[debug] [
+  [ 64, 65 ],
+  [ 66, 67 ]
+]
+[debug] [
+  [ 128, 129 ],
+  [ 130, 131 ]
+]
+[debug] [
+  [ 256, 257 ],
+  [ 258, 259 ]
+]
+[debug] [
+  [ true, false ],
+  [ false, true ]
+]
+[debug] [
+  [ @0x1234, @0x5678 ],
+  [ @0xabcdef, @0x9999 ]
+]
+[debug] [
+  [ signer(0x0), signer(0x1000000000000000000000000000000) ],
+  [ signer(0x0), signer(0x1000000000000000000000000000000) ]
+]
+[debug] [
+  [
+    0x2::M::TestInner {
+      val: 4,
+      vec: [ 127, 128 ],
+      msgs: []
+    },
+    0x2::M::TestInner {
+      val: 8,
+      vec: [ 128, 129 ],
+      msgs: []
+    }
+  ],
+  [
+    0x2::M::TestInner {
+      val: 4,
+      vec: [ 127, 128 ],
+      msgs: []
+    },
+    0x2::M::TestInner {
+      val: 8,
+      vec: [ 128, 129 ],
+      msgs: []
+    }
+  ]
+]
+[debug] "test_print_nested_struct"
+[debug] 0x2::M::TestStruct {
+  addr: @0x1,
+  number: 255,
+  bytes: 0xc0ffee,
+  name: "He\"llo",
+  vec: [
+    0x2::M::TestInner {
+      val: 1,
+      vec: [ 130, 131 ],
+      msgs: []
+    },
+    0x2::M::TestInner {
+      val: 2,
+      vec: [ 132, 133 ],
+      msgs: []
+    }
+  ]
+}
+[debug] "test_print_generic_struct"
+[debug] 0x2::M::GenericStruct<0x2::M::Foo> {
+  val: 60
+}
+[ PASS    ] 0x2::M::test
+Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/language/tools/move-cli/tests/sandbox_tests/print_values/args.txt b/language/tools/move-cli/tests/sandbox_tests/print_values/args.txt
index 907c26acc2..7bbe6d2f5d 100644
--- a/language/tools/move-cli/tests/sandbox_tests/print_values/args.txt
+++ b/language/tools/move-cli/tests/sandbox_tests/print_values/args.txt
@@ -1,2 +1,2 @@
 sandbox publish
-sandbox run scripts/print_values.move --dry-run
+test
diff --git a/language/tools/move-cli/tests/sandbox_tests/print_values/scripts/print_values.move b/language/tools/move-cli/tests/sandbox_tests/print_values/scripts/print_values.move
deleted file mode 100644
index 851771cd48..0000000000
--- a/language/tools/move-cli/tests/sandbox_tests/print_values/scripts/print_values.move
+++ /dev/null
@@ -1,7 +0,0 @@
-script {
-use 0x2::M;
-
-fun print_values() {
-    M::test();
-}
-}
diff --git a/language/tools/move-cli/tests/sandbox_tests/print_values/sources/M.move b/language/tools/move-cli/tests/sandbox_tests/print_values/sources/M.move
index aee27eb583..3b65890acc 100644
--- a/language/tools/move-cli/tests/sandbox_tests/print_values/sources/M.move
+++ b/language/tools/move-cli/tests/sandbox_tests/print_values/sources/M.move
@@ -1,30 +1,276 @@
 address 0x2 {
 module M {
-    use std::debug;
+    #[test_only]
+    use std::ascii;
+    #[test_only]
+    use std::debug::print;
+    #[test_only]
+    use std::debug::print_string;
+    use std::string;
+    #[test_only]
+    use std::unit_test::create_signers_for_testing;
+    #[test_only]
     use std::vector;
 
     struct Foo has drop {}
     struct Bar has drop { x: u128, y: Foo, z: bool }
     struct Box<T> has drop { x: T }
 
+    struct GenericStruct<phantom T> has drop {
+        val: u64,
+    }
+
+    struct TestInner has drop {
+        val: u128,
+        vec: vector<u128>,
+        msgs: vector<vector<u8>>
+    }
+
+    struct TestStruct has drop {
+        addr: address,
+        number: u8,
+        bytes: vector<u8>,
+        name: string::String,
+        vec: vector<TestInner>,
+    }
+
+    #[test]
     public fun test()  {
         let x = 42;
-        debug::print(&x);
+        print(&x);
 
         let v = vector::empty();
         vector::push_back(&mut v, 100);
         vector::push_back(&mut v, 200);
         vector::push_back(&mut v, 300);
-        debug::print(&v);
+        print(&v);
 
         let foo = Foo {};
-        debug::print(&foo);
+        print(&foo);
 
         let bar = Bar { x: 404, y: Foo {}, z: true };
-        debug::print(&bar);
+        print(&bar);
 
         let box = Box { x: Foo {} };
-        debug::print(&box);
+        print(&box);
+
+        test_print_quoted_string();
+        test_print_string();
+        test_print_ascii_string();
+        test_print_primitive_types();
+        test_print_struct();
+        test_print_vectors();
+        test_print_vector_of_vectors();
+        test_print_nested_struct();
+        test_print_generic_struct();
+    }
+
+    #[test_only]
+    fun test_print_string() {
+        print_string(b"test_print_string");
+
+        let str_bytes = b"Hello, sane Move debugging!";
+
+        print(&str_bytes);
+
+        let str = string::utf8(str_bytes);
+        print<string::String>(&str);
+    }
+
+    #[test_only]
+    fun test_print_ascii_string() {
+        print_string(b"test_print_ascii_string");
+        print(&ascii::string(b"Hello, sane Move debugging!"));
+    }
+
+    #[test_only]
+    fun test_print_quoted_string() {
+        print_string(b"test_print_quoted_string");
+
+        let str_bytes = b"Can you say \"Hel\\lo\"?";
+
+        let str = string::utf8(str_bytes);
+        print<string::String>(&str);
+    }
+
+    #[test_only]
+    fun test_print_primitive_types() {
+        print_string(b"test_print_primitive_types");
+
+        let u8 = 255u8;
+        print(&u8);
+
+        let u16 = 65535u16;
+        print(&u16);
+
+        let u32 = 4294967295u32;
+        print(&u32);
+
+        let u64 = 18446744073709551615u64;
+        print(&u64);
+
+        let u128 = 340282366920938463463374607431768211455u128;
+        print(&u128);
+
+        let u256 = 115792089237316195423570985008687907853269984665640564039457584007913129639935u256;
+        print(&u256);
+
+        let bool = false;
+        print(&bool);
+
+        let bool = true;
+        print(&bool);
+
+        let a = @0x1234c0ffee;
+        print(&a);
+
+        // print a signer
+        let senders = create_signers_for_testing(1);
+        let sender = vector::pop_back(&mut senders);
+        print(&sender);
+    }
+
+    const MSG_1 : vector<u8> = b"abcdef";
+    const MSG_2 : vector<u8> = b"123456";
+
+    #[test_only]
+    fun test_print_struct() {
+        print_string(b"test_print_struct");
+
+        let obj = TestInner {
+            val: 100,
+            vec: vector[200u128, 400u128],
+            msgs: vector[MSG_1, MSG_2],
+        };
+
+        print(&obj);
+
+        let obj = TestInner {
+            val: 10,
+            vec: vector[],
+            msgs: vector[],
+        };
+
+        print(&obj);
+    }
+
+    #[test_only]
+    fun test_print_vectors() {
+        print_string(b"test_print_vectors");
+
+        let v_u8 = x"ffabcdef";
+        print(&v_u8);
+
+        let v_u16 = vector[16u16, 17u16, 18u16, 19u16];
+        print(&v_u16);
+
+        let v_u32 = vector[32u32, 33u32, 34u32, 35u32];
+        print(&v_u32);
+
+        let v_u64 = vector[64u64, 65u64, 66u64, 67u64];
+        print(&v_u64);
+
+        let v_u128 = vector[128u128, 129u128, 130u128, 131u128];
+        print(&v_u128);
+
+        let v_u256 = vector[256u256, 257u256, 258u256, 259u256];
+        print(&v_u256);
+
+        let v_bool = vector[true, false];
+        print(&v_bool);
+
+        let v_addr = vector[@0x1234, @0x5678, @0xabcdef];
+        print(&v_addr);
+
+        let v_signer = create_signers_for_testing(4);
+        print(&v_signer);
+
+        let v = vector[
+            TestInner {
+                val: 4u128,
+                vec: vector[127u128, 128u128],
+                msgs: vector[x"00ff", x"abcd"],
+            },
+            TestInner {
+                val: 8u128 ,
+                vec: vector[128u128, 129u128],
+                msgs: vector[x"0000"],
+            }
+        ];
+        print(&v);
+    }
+
+    #[test_only]
+    fun test_print_vector_of_vectors() {
+        print_string(b"test_print_vector_of_vectors");
+
+        let v_u8 = vector[x"ffab", x"cdef"];
+        print(&v_u8);
+
+        let v_u16 = vector[vector[16u16, 17u16], vector[18u16, 19u16]];
+        print(&v_u16);
+
+        let v_u32 = vector[vector[32u32, 33u32], vector[34u32, 35u32]];
+        print(&v_u32);
+
+        let v_u64 = vector[vector[64u64, 65u64], vector[66u64, 67u64]];
+        print(&v_u64);
+
+        let v_u128 = vector[vector[128u128, 129u128], vector[130u128, 131u128]];
+        print(&v_u128);
+
+        let v_u256 = vector[vector[256u256, 257u256], vector[258u256, 259u256]];
+        print(&v_u256);
+
+        let v_bool = vector[vector[true, false], vector[false, true]];
+        print(&v_bool);
+
+        let v_addr = vector[vector[@0x1234, @0x5678], vector[@0xabcdef, @0x9999]];
+        print(&v_addr);
+
+        let v_signer = vector[create_signers_for_testing(2), create_signers_for_testing(2)];
+        print(&v_signer);
+
+        let v = vector[
+            vector[
+                TestInner { val: 4u128, vec: vector[127u128, 128u128], msgs: vector[] },
+                TestInner { val: 8u128 , vec: vector[128u128, 129u128], msgs: vector[] }
+            ],
+            vector[
+                TestInner { val: 4u128, vec: vector[127u128, 128u128], msgs: vector[] },
+                TestInner { val: 8u128 , vec: vector[128u128, 129u128], msgs: vector[] }
+            ]
+        ];
+        print(&v);
+    }
+
+    #[test_only]
+    fun test_print_nested_struct() {
+        print_string(b"test_print_nested_struct");
+
+        let obj = TestStruct {
+            addr: @0x1,
+            number: 255u8,
+            bytes: x"c0ffee",
+            name: string::utf8(b"He\"llo"),
+            vec: vector[
+                TestInner { val: 1, vec: vector[130u128, 131u128], msgs: vector[] },
+                TestInner { val: 2, vec: vector[132u128, 133u128], msgs: vector[] }
+            ],
+        };
+
+        print(&obj);
+    }
+
+    #[test_only]
+    fun test_print_generic_struct() {
+        print_string(b"test_print_generic_struct");
+
+        let obj = GenericStruct<Foo> {
+        val: 60u64,
+        };
+
+        print(&obj);
     }
 }
 }
diff --git a/language/tools/move-cli/tests/sandbox_tests/republish/args.exp b/language/tools/move-cli/tests/sandbox_tests/republish/args.exp
index 3bed2c1707..6f1419b803 100644
--- a/language/tools/move-cli/tests/sandbox_tests/republish/args.exp
+++ b/language/tools/move-cli/tests/sandbox_tests/republish/args.exp
@@ -4,14 +4,14 @@ Publishing a new module 00000000000000000000000000000042::M (wrote 56 bytes)
 Publishing a new module 00000000000000000000000000000043::N (wrote 56 bytes)
 Wrote 112 bytes of module ID's and code
 Command `sandbox view storage/0x00000000000000000000000000000042/modules/M.mv`:
-// Move bytecode v5
+// Move bytecode v6
 module 42.M {
 
 
 
 }
 Command `sandbox view storage/0x00000000000000000000000000000043/modules/N.mv`:
-// Move bytecode v5
+// Move bytecode v6
 module 43.N {
 
 
@@ -23,14 +23,14 @@ Updating an existing module 00000000000000000000000000000042::M (wrote 56 bytes)
 Updating an existing module 00000000000000000000000000000043::N (wrote 56 bytes)
 Wrote 112 bytes of module ID's and code
 Command `sandbox view storage/0x00000000000000000000000000000042/modules/M.mv`:
-// Move bytecode v5
+// Move bytecode v6
 module 42.M {
 
 
 
 }
 Command `sandbox view storage/0x00000000000000000000000000000043/modules/N.mv`:
-// Move bytecode v5
+// Move bytecode v6
 module 43.N {
 
 
diff --git a/language/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/Move.toml b/language/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/Move.toml
new file mode 100644
index 0000000000..25d4f10fdf
--- /dev/null
+++ b/language/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "verify_native_functions_in_publish"
+version = "0.0.0"
diff --git a/language/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.exp b/language/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.exp
new file mode 100644
index 0000000000..71489b99ba
--- /dev/null
+++ b/language/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.exp
@@ -0,0 +1,8 @@
+Command `sandbox publish --bundle --override-ordering M --override-ordering N`:
+Invalid multi-module publishing: VMError with status MISSING_DEPENDENCY at location Module ModuleId { address: 00000000000000000000000000000042, name: Identifier("M") } at index 0 for function handle
+error[E02007]: invalid 'fun' declaration
+  ┌─ ./sources/example.move:3:16
+  │
+3 │     native fun create_nothing();
+  │                ^^^^^^^^^^^^^^ Missing implementation for the native function M::create_nothing
+
diff --git a/language/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.txt b/language/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.txt
new file mode 100644
index 0000000000..0a739f8bcc
--- /dev/null
+++ b/language/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/args.txt
@@ -0,0 +1 @@
+sandbox publish --bundle --override-ordering M --override-ordering N
diff --git a/language/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example.move b/language/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example.move
new file mode 100644
index 0000000000..916813c8af
--- /dev/null
+++ b/language/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example.move
@@ -0,0 +1,4 @@
+module 0x42::M {
+    native fun create_signer(addr: address): signer;
+    native fun create_nothing();
+}
diff --git a/language/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example_another.move b/language/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example_another.move
new file mode 100644
index 0000000000..62eccfb87e
--- /dev/null
+++ b/language/tools/move-cli/tests/sandbox_tests/verify_native_functions_in_multi_module_publish/sources/example_another.move
@@ -0,0 +1,4 @@
+module 0x42::N {
+    native fun create_signer(addr: address): signer;
+    native fun create_nothing();
+}
diff --git a/language/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/deps_only/C/Move.toml b/language/tools/move-cli/tests/upload_tests/no_git_remote_package/Move.toml
similarity index 57%
rename from language/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/deps_only/C/Move.toml
rename to language/tools/move-cli/tests/upload_tests/no_git_remote_package/Move.toml
index a5bcadbfb6..637d99d854 100644
--- a/language/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/deps_only/C/Move.toml
+++ b/language/tools/move-cli/tests/upload_tests/no_git_remote_package/Move.toml
@@ -1,6 +1,6 @@
 [package]
-name = "C"
+name = "Package1"
 version = "0.0.0"
 
 [addresses]
-A = "0x1"
+Std = "0x1"
diff --git a/language/tools/move-cli/tests/upload_tests/no_git_remote_package/sources/Dummy.move b/language/tools/move-cli/tests/upload_tests/no_git_remote_package/sources/Dummy.move
new file mode 100644
index 0000000000..45646f1b13
--- /dev/null
+++ b/language/tools/move-cli/tests/upload_tests/no_git_remote_package/sources/Dummy.move
@@ -0,0 +1 @@
+module 0x1::Dummy {}
diff --git a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.toml b/language/tools/move-cli/tests/upload_tests/valid_package1/Move.toml
similarity index 57%
rename from language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.toml
rename to language/tools/move-cli/tests/upload_tests/valid_package1/Move.toml
index f36925b4d4..637d99d854 100644
--- a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.toml
+++ b/language/tools/move-cli/tests/upload_tests/valid_package1/Move.toml
@@ -1,6 +1,6 @@
 [package]
-name = "test"
+name = "Package1"
 version = "0.0.0"
 
 [addresses]
-A = "0x0"
+Std = "0x1"
diff --git a/language/tools/move-cli/tests/upload_tests/valid_package1/sources/Dummy.move b/language/tools/move-cli/tests/upload_tests/valid_package1/sources/Dummy.move
new file mode 100644
index 0000000000..45646f1b13
--- /dev/null
+++ b/language/tools/move-cli/tests/upload_tests/valid_package1/sources/Dummy.move
@@ -0,0 +1 @@
+module 0x1::Dummy {}
diff --git a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/deps_only/C/Move.toml b/language/tools/move-cli/tests/upload_tests/valid_package2/Move.toml
similarity index 57%
rename from language/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/deps_only/C/Move.toml
rename to language/tools/move-cli/tests/upload_tests/valid_package2/Move.toml
index d7f129c716..637d99d854 100644
--- a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/deps_only/C/Move.toml
+++ b/language/tools/move-cli/tests/upload_tests/valid_package2/Move.toml
@@ -1,6 +1,6 @@
 [package]
-name = "C"
+name = "Package1"
 version = "0.0.0"
 
 [addresses]
-A = "_"
+Std = "0x1"
diff --git a/language/tools/move-cli/tests/upload_tests/valid_package2/sources/Dummy.move b/language/tools/move-cli/tests/upload_tests/valid_package2/sources/Dummy.move
new file mode 100644
index 0000000000..45646f1b13
--- /dev/null
+++ b/language/tools/move-cli/tests/upload_tests/valid_package2/sources/Dummy.move
@@ -0,0 +1 @@
+module 0x1::Dummy {}
diff --git a/language/tools/move-cli/tests/upload_tests/valid_package3/Move.toml b/language/tools/move-cli/tests/upload_tests/valid_package3/Move.toml
new file mode 100644
index 0000000000..637d99d854
--- /dev/null
+++ b/language/tools/move-cli/tests/upload_tests/valid_package3/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Package1"
+version = "0.0.0"
+
+[addresses]
+Std = "0x1"
diff --git a/language/tools/move-cli/tests/upload_tests/valid_package3/sources/Dummy.move b/language/tools/move-cli/tests/upload_tests/valid_package3/sources/Dummy.move
new file mode 100644
index 0000000000..45646f1b13
--- /dev/null
+++ b/language/tools/move-cli/tests/upload_tests/valid_package3/sources/Dummy.move
@@ -0,0 +1 @@
+module 0x1::Dummy {}
diff --git a/language/tools/move-coverage/Cargo.toml b/language/tools/move-coverage/Cargo.toml
index 89fcaaec5a..65698f2d96 100644
--- a/language/tools/move-coverage/Cargo.toml
+++ b/language/tools/move-coverage/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 once_cell = "1.7.2"
@@ -18,7 +18,8 @@ anyhow = "1.0.52"
 codespan = { version = "0.11.1", features = ["serialization"] }
 colored = "2.0.0"
 
-bcs = "0.1.2"
+bcs.workspace = true
+
 move-command-line-common = { path = "../../move-command-line-common" }
 move-core-types = { path = "../../move-core/types" }
 move-ir-types = { path = "../../move-ir/types" }
diff --git a/language/tools/move-coverage/src/bin/coverage-summaries.rs b/language/tools/move-coverage/src/bin/coverage-summaries.rs
index 03efa97625..a81b185abe 100644
--- a/language/tools/move-coverage/src/bin/coverage-summaries.rs
+++ b/language/tools/move-coverage/src/bin/coverage-summaries.rs
@@ -81,7 +81,7 @@ fn main() {
     let mut summary_writer: Box<dyn Write> = match &args.summary_path {
         Some(x) => {
             let path = Path::new(x);
-            Box::new(File::create(&path).unwrap())
+            Box::new(File::create(path).unwrap())
         }
         None => Box::new(io::stdout()),
     };
@@ -89,9 +89,9 @@ fn main() {
     let modules = get_modules(&args);
     if args.derive_path_coverage {
         let trace_map = if args.is_raw_trace_file {
-            TraceMap::from_trace_file(&input_trace_path)
+            TraceMap::from_trace_file(input_trace_path)
         } else {
-            TraceMap::from_binary_file(&input_trace_path)
+            TraceMap::from_binary_file(input_trace_path)
         };
         if !args.csv_output {
             format_human_summary(
@@ -111,9 +111,9 @@ fn main() {
         }
     } else {
         let coverage_map = if args.is_raw_trace_file {
-            CoverageMap::from_trace_file(&input_trace_path)
+            CoverageMap::from_trace_file(input_trace_path)
         } else {
-            CoverageMap::from_binary_file(&input_trace_path).unwrap()
+            CoverageMap::from_binary_file(input_trace_path).unwrap()
         };
         let unified_exec_map = coverage_map.to_unified_exec_map();
         if !args.csv_output {
diff --git a/language/tools/move-coverage/src/bin/move-trace-conversion.rs b/language/tools/move-coverage/src/bin/move-trace-conversion.rs
index 557b1610a0..a8a42cfa7d 100644
--- a/language/tools/move-coverage/src/bin/move-trace-conversion.rs
+++ b/language/tools/move-coverage/src/bin/move-trace-conversion.rs
@@ -38,24 +38,24 @@ fn main() {
     if !args.use_trace_map {
         let coverage_map = if let Some(old_coverage_path) = &args.update {
             let path = Path::new(&old_coverage_path);
-            let old_coverage_map = CoverageMap::from_binary_file(&path).unwrap();
-            old_coverage_map.update_coverage_from_trace_file(&input_path)
+            let old_coverage_map = CoverageMap::from_binary_file(path).unwrap();
+            old_coverage_map.update_coverage_from_trace_file(input_path)
         } else {
-            CoverageMap::from_trace_file(&input_path)
+            CoverageMap::from_trace_file(input_path)
         };
 
-        output_map_to_file(&output_path, &coverage_map)
+        output_map_to_file(output_path, &coverage_map)
             .expect("Unable to serialize coverage map to output file")
     } else {
         let trace_map = if let Some(old_trace_path) = &args.update {
             let path = Path::new(&old_trace_path);
-            let old_trace_map = TraceMap::from_binary_file(&path);
-            old_trace_map.update_from_trace_file(&input_path)
+            let old_trace_map = TraceMap::from_binary_file(path);
+            old_trace_map.update_from_trace_file(input_path)
         } else {
-            TraceMap::from_trace_file(&input_path)
+            TraceMap::from_trace_file(input_path)
         };
 
-        output_map_to_file(&output_path, &trace_map)
+        output_map_to_file(output_path, &trace_map)
             .expect("Unable to serialize trace map to output file")
     }
 }
diff --git a/language/tools/move-coverage/src/bin/source-coverage.rs b/language/tools/move-coverage/src/bin/source-coverage.rs
index 30be6d0534..280685d14e 100644
--- a/language/tools/move-coverage/src/bin/source-coverage.rs
+++ b/language/tools/move-coverage/src/bin/source-coverage.rs
@@ -64,7 +64,7 @@ fn main() {
     let mut coverage_writer: Box<dyn Write> = match &args.coverage_path {
         Some(x) => {
             let path = Path::new(x);
-            Box::new(File::create(&path).unwrap())
+            Box::new(File::create(path).unwrap())
         }
         None => Box::new(io::stdout()),
     };
diff --git a/language/tools/move-disassembler/Cargo.toml b/language/tools/move-disassembler/Cargo.toml
index ec4587992a..3553844ebd 100644
--- a/language/tools/move-disassembler/Cargo.toml
+++ b/language/tools/move-disassembler/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Diem Association <opensource@diem.com>"]
 description = "Print a human-readable version of Move bytecode (.mv files)"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
diff --git a/language/tools/move-disassembler/src/disassembler.rs b/language/tools/move-disassembler/src/disassembler.rs
index bd1296a8f6..d2d176fb5b 100644
--- a/language/tools/move-disassembler/src/disassembler.rs
+++ b/language/tools/move-disassembler/src/disassembler.rs
@@ -2,6 +2,8 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use std::collections::HashMap;
+
 use anyhow::{bail, format_err, Error, Result};
 use clap::Parser;
 use colored::*;
@@ -10,9 +12,9 @@ use move_binary_format::{
     control_flow_graph::{ControlFlowGraph, VMControlFlowGraph},
     file_format::{
         Ability, AbilitySet, Bytecode, CodeUnit, FieldHandleIndex, FunctionDefinition,
-        FunctionDefinitionIndex, FunctionHandle, Signature, SignatureIndex, SignatureToken,
-        StructDefinition, StructDefinitionIndex, StructFieldInformation, StructTypeParameter,
-        TableIndex, TypeSignature, Visibility,
+        FunctionDefinitionIndex, FunctionHandle, ModuleHandle, Signature, SignatureIndex,
+        SignatureToken, StructDefinition, StructDefinitionIndex, StructFieldInformation,
+        StructTypeParameter, TableIndex, TypeSignature, Visibility,
     },
 };
 use move_bytecode_source_map::{
@@ -20,7 +22,7 @@ use move_bytecode_source_map::{
     source_map::{FunctionSourceMap, SourceName},
 };
 use move_compiler::compiled_unit::{CompiledUnit, NamedCompiledModule, NamedCompiledScript};
-use move_core_types::identifier::IdentStr;
+use move_core_types::{identifier::IdentStr, language_storage::ModuleId};
 use move_coverage::coverage_map::{ExecCoverageMap, FunctionCoverage};
 use move_ir_types::location::Loc;
 
@@ -61,25 +63,51 @@ pub struct Disassembler<'a> {
     options: DisassemblerOptions,
     // Optional coverage map for use in displaying code coverage
     coverage_map: Option<ExecCoverageMap>,
+    /// If the code being disassembled imports multiple modules of the form (a, SameModuleName)
+    /// `module_alias` will contain an entry for each distinct a
+    /// e.g., for `use 0xA::M; use 0xB::M`, this will contain [(0xA, M) -> M, (0xB, M) -> 1M]
+    module_aliases: HashMap<ModuleId, String>,
 }
 
 impl<'a> Disassembler<'a> {
     pub fn new(source_mapper: SourceMapping<'a>, options: DisassemblerOptions) -> Self {
+        let mut module_names = HashMap::new();
+        let mut module_aliases = HashMap::new();
+        module_names.extend(
+            source_mapper
+                .bytecode
+                .self_id()
+                .map(|id| (id.name().to_string(), 0)),
+        );
+        for h in source_mapper.bytecode.module_handles() {
+            let id = source_mapper.bytecode.module_id_for_handle(h);
+            let module_name = id.name().to_string();
+            module_names
+                .entry(module_name.clone())
+                .and_modify(|name_count| {
+                    // This module imports >1 modules named `name`--add alias <count><module_name> for `id`.
+                    // Move identifiers cannot begin with an integer,
+                    // so this is guaranteed not to conflict with other module names.
+                    module_aliases.insert(id, format!("{}{}", name_count, module_name));
+                    *name_count += 1;
+                })
+                .or_insert(0);
+        }
         Self {
             source_mapper,
             options,
             coverage_map: None,
+            module_aliases,
         }
     }
 
     pub fn from_view(view: BinaryIndexedView<'a>, default_loc: Loc) -> Result<Self> {
         let mut options = DisassemblerOptions::new();
         options.print_code = true;
-        Ok(Self {
-            source_mapper: SourceMapping::new_from_view(view, default_loc)?,
+        Ok(Self::new(
+            SourceMapping::new_from_view(view, default_loc)?,
             options,
-            coverage_map: None,
-        })
+        ))
     }
 
     pub fn from_unit(unit: &'a CompiledUnit) -> Self {
@@ -106,6 +134,65 @@ impl<'a> Disassembler<'a> {
     // Helpers
     //***************************************************************************
 
+    fn get_function_string(
+        &self,
+        module_handle: &ModuleHandle,
+        function_handle: &FunctionHandle,
+    ) -> String {
+        let module_id = self
+            .source_mapper
+            .bytecode
+            .module_id_for_handle(module_handle);
+        let function_name = self
+            .source_mapper
+            .bytecode
+            .identifier_at(function_handle.name)
+            .to_string();
+        if self.is_self_id(&module_id) {
+            // this is the "self" module. Omit the "module_name::" prefix
+            function_name
+        } else {
+            let module_name = self
+                .module_aliases
+                .get(&module_id)
+                .cloned()
+                .unwrap_or_else(|| module_id.name().to_string());
+            format!("{}::{}", module_name, function_name)
+        }
+    }
+
+    fn get_import_string(&self, module_handle: &ModuleHandle) -> Option<String> {
+        let module_id = self
+            .source_mapper
+            .bytecode
+            .module_id_for_handle(module_handle);
+        if self.is_self_id(&module_id) {
+            // No need to import self handle
+            None
+        } else if let Some(alias) = self.module_aliases.get(&module_id) {
+            Some(format!(
+                "use {}::{} as {};",
+                module_id.address(),
+                module_id.name(),
+                alias
+            ))
+        } else {
+            Some(format!(
+                "use {}::{};",
+                module_id.address(),
+                module_id.name()
+            ))
+        }
+    }
+
+    fn is_self_id(&self, mid: &ModuleId) -> bool {
+        self.source_mapper
+            .bytecode
+            .self_id()
+            .map(|id| &id == mid)
+            .unwrap_or(false)
+    }
+
     fn get_function_def(
         &self,
         function_definition_index: FunctionDefinitionIndex,
@@ -387,8 +474,11 @@ impl<'a> Disassembler<'a> {
         Ok(match sig_tok {
             SignatureToken::Bool => "bool".to_string(),
             SignatureToken::U8 => "u8".to_string(),
+            SignatureToken::U16 => "u16".to_string(),
+            SignatureToken::U32 => "u32".to_string(),
             SignatureToken::U64 => "u64".to_string(),
             SignatureToken::U128 => "u128".to_string(),
+            SignatureToken::U256 => "u256".to_string(),
             SignatureToken::Address => "address".to_string(),
             SignatureToken::Signer => "signer".to_string(),
             SignatureToken::Struct(struct_handle_idx) => self
@@ -456,7 +546,7 @@ impl<'a> Disassembler<'a> {
             Bytecode::LdConst(idx) => {
                 let constant = self.source_mapper.bytecode.constant_at(*idx);
                 Ok(format!(
-                    "LdAddr[{}]({:?}: {:?})",
+                    "LdConst[{}]({:?}: {:?})",
                     idx, &constant.type_, &constant.data
                 ))
             }
@@ -746,11 +836,11 @@ impl<'a> Disassembler<'a> {
             }
             Bytecode::Call(method_idx) => {
                 let function_handle = self.source_mapper.bytecode.function_handle_at(*method_idx);
-                let fcall_name = self
+                let module_handle = self
                     .source_mapper
                     .bytecode
-                    .identifier_at(function_handle.name)
-                    .to_string();
+                    .module_handle_at(function_handle.module);
+                let fcall_name = self.get_function_string(module_handle, function_handle);
                 let type_arguments = self
                     .source_mapper
                     .bytecode
@@ -769,8 +859,7 @@ impl<'a> Disassembler<'a> {
                     .map(|sig_tok| self.disassemble_sig_tok(sig_tok.clone(), &[]))
                     .collect::<Result<Vec<String>>>()?;
                 Ok(format!(
-                    "Call[{}]({}({}){})",
-                    method_idx,
+                    "Call {}({}){}",
                     fcall_name,
                     type_arguments,
                     Self::format_ret_type(&type_rets)
@@ -785,11 +874,11 @@ impl<'a> Disassembler<'a> {
                     .source_mapper
                     .bytecode
                     .function_handle_at(func_inst.handle);
-                let fcall_name = self
+                let module_handle = self
                     .source_mapper
                     .bytecode
-                    .identifier_at(function_handle.name)
-                    .to_string();
+                    .module_handle_at(function_handle.module);
+                let fcall_name = self.get_function_string(module_handle, function_handle);
                 let ty_params = self
                     .source_mapper
                     .bytecode
@@ -824,8 +913,7 @@ impl<'a> Disassembler<'a> {
                     .map(|sig_tok| self.disassemble_sig_tok(sig_tok.clone(), &ty_params))
                     .collect::<Result<Vec<String>>>()?;
                 Ok(format!(
-                    "Call[{}]({}{}({}){})",
-                    method_idx,
+                    "Call {}{}({}){}",
                     fcall_name,
                     Self::format_type_params(
                         &ty_params.into_iter().map(|(s, _)| s).collect::<Vec<_>>()
@@ -1166,6 +1254,13 @@ impl<'a> Disassembler<'a> {
             None => "script".to_owned(),
         };
 
+        let imports = self
+            .source_mapper
+            .bytecode
+            .module_handles()
+            .iter()
+            .filter_map(|h| self.get_import_string(h))
+            .collect::<Vec<String>>();
         let struct_defs: Vec<String> = (0..self
             .source_mapper
             .bytecode
@@ -1210,11 +1305,16 @@ impl<'a> Disassembler<'a> {
                 })
                 .collect::<Result<Vec<String>>>()?,
         };
-
+        let imports_str = if imports.is_empty() {
+            "".to_string()
+        } else {
+            format!("\n{}\n\n", imports.join("\n"))
+        };
         Ok(format!(
-            "// Move bytecode v{version}\n{header} {{\n{struct_defs}\n\n{function_defs}\n}}",
+            "// Move bytecode v{version}\n{header} {{{imports}\n{struct_defs}\n\n{function_defs}\n}}",
             version = version,
             header = header,
+            imports = &imports_str,
             struct_defs = &struct_defs.join("\n"),
             function_defs = &function_defs.join("\n")
         ))
diff --git a/language/tools/move-explain/Cargo.toml b/language/tools/move-explain/Cargo.toml
index 8f9742396a..030f86c352 100644
--- a/language/tools/move-explain/Cargo.toml
+++ b/language/tools/move-explain/Cargo.toml
@@ -7,13 +7,14 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 clap = { version = "3.1.8", features = ["derive"] }
 move-command-line-common = { path = "../../move-command-line-common" }
 move-core-types = { path = "../../move-core/types" }
-bcs = "0.1.2"
+
+bcs.workspace = true
 
 [features]
 default = []
diff --git a/language/tools/move-package/Cargo.toml b/language/tools/move-package/Cargo.toml
index 3fbd69206d..9cfdfa525e 100644
--- a/language/tools/move-package/Cargo.toml
+++ b/language/tools/move-package/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Diem Association <opensource@diem.com>"]
 description = "Package and build system for Move code"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 toml = "0.5.8"
@@ -14,7 +14,6 @@ petgraph = "0.5.1"
 anyhow = "1.0.52"
 walkdir = "2.3.1"
 clap = { version = "3.1.8", features = ["derive"] }
-bcs = "0.1.2"
 colored = "2.0.0"
 serde_yaml = "0.8.17"
 tempfile = "3.2.0"
@@ -22,8 +21,11 @@ sha2 = "0.9.3"
 regex = "1.1.9"
 ptree = "0.4.0"
 once_cell = "1.7.2"
-named-lock = "0.1.1"
+named-lock = "0.2.0"
 dirs-next = "2.0.0"
+itertools = "0.10.0"
+
+bcs.workspace = true
 
 move-binary-format = { path = "../../move-binary-format" }
 move-compiler = { path = "../../move-compiler" }
@@ -40,6 +42,9 @@ move-to-yul = { path = "../../evm/move-to-yul", optional = true }
 evm-exec-utils = { path = "../../evm/exec-utils", optional = true }
 termcolor = { version = "1.1.2", optional = true }
 hex = { version = "0.4.3", optional = true }
+reqwest = { version = "0.11.1", features = ["blocking", "json"] }
+
+whoami = { version = "1.2.1" }
 
 [dev-dependencies]
 datatest-stable = "0.1.1"
diff --git a/language/tools/move-package/src/compilation/build_plan.rs b/language/tools/move-package/src/compilation/build_plan.rs
index 94fc299217..816c55fe0f 100644
--- a/language/tools/move-package/src/compilation/build_plan.rs
+++ b/language/tools/move-package/src/compilation/build_plan.rs
@@ -103,13 +103,23 @@ impl BuildPlan {
     }
 
     /// Compilation results in the process exit upon warning/failure
-    pub fn compile<W: Write>(&self, writer: &mut W) -> Result<CompiledPackage> {
-        self.compile_with_driver(writer, |compiler| compiler.build_and_report())
+    pub fn compile<W: Write>(
+        &self,
+        bytecode_version: Option<u32>,
+        writer: &mut W,
+    ) -> Result<CompiledPackage> {
+        self.compile_with_driver(writer, bytecode_version, |compiler| {
+            compiler.build_and_report()
+        })
     }
 
     /// Compilation process does not exit even if warnings/failures are encountered
-    pub fn compile_no_exit<W: Write>(&self, writer: &mut W) -> Result<CompiledPackage> {
-        self.compile_with_driver(writer, |compiler| {
+    pub fn compile_no_exit<W: Write>(
+        &self,
+        bytecode_version: Option<u32>,
+        writer: &mut W,
+    ) -> Result<CompiledPackage> {
+        self.compile_with_driver(writer, bytecode_version, |compiler| {
             let (files, units_res) = compiler.build()?;
             match units_res {
                 Ok((units, warning_diags)) => {
@@ -131,6 +141,7 @@ impl BuildPlan {
     pub fn compile_with_driver<W: Write>(
         &self,
         writer: &mut W,
+        bytecode_version: Option<u32>,
         mut compiler_driver: impl FnMut(
             Compiler,
         )
@@ -152,14 +163,21 @@ impl BuildPlan {
                     .package_table
                     .get(&package_name)
                     .unwrap();
-                let dep_source_paths = dep_package
+                let mut dep_source_paths = dep_package
                     .get_sources(&self.resolution_graph.build_options)
                     .unwrap();
+                let mut source_available = true;
+                // If source is empty, search bytecode(mv) files
+                if dep_source_paths.is_empty() {
+                    dep_source_paths = dep_package.get_bytecodes().unwrap();
+                    source_available = false;
+                }
                 (
                     package_name,
                     immediate_dependencies_names.contains(&package_name),
                     dep_source_paths,
                     &dep_package.resolution_table,
+                    source_available,
                 )
             })
             .collect();
@@ -169,6 +187,7 @@ impl BuildPlan {
             &project_root,
             root_package.clone(),
             transitive_dependencies,
+            bytecode_version,
             &self.resolution_graph,
             &mut compiler_driver,
         )?;
diff --git a/language/tools/move-package/src/compilation/compiled_package.rs b/language/tools/move-package/src/compilation/compiled_package.rs
index 982ac96a5a..72a9370b30 100644
--- a/language/tools/move-package/src/compilation/compiled_package.rs
+++ b/language/tools/move-package/src/compilation/compiled_package.rs
@@ -13,6 +13,7 @@ use crate::{
 };
 use anyhow::{ensure, Result};
 use colored::Colorize;
+use itertools::{Either, Itertools};
 use move_abigen::{Abigen, AbigenOptions};
 use move_binary_format::file_format::{CompiledModule, CompiledScript};
 use move_bytecode_source_map::utils::source_map_from_file;
@@ -211,7 +212,7 @@ impl OnDiskCompiledPackage {
         let package_name_opt = Some(package_name);
         let bytecode_path = Path::new(bytecode_path_str);
         let path_to_file = CompiledPackageLayout::path_to_file_after_category(bytecode_path);
-        let bytecode_bytes = std::fs::read(&bytecode_path)?;
+        let bytecode_bytes = std::fs::read(bytecode_path)?;
         let source_map = source_map_from_file(
             &self
                 .root_path
@@ -276,7 +277,7 @@ impl OnDiskCompiledPackage {
     pub(crate) fn save_under(&self, file: impl AsRef<Path>, bytes: &[u8]) -> Result<()> {
         let path_to_save = self.root_path.join(file);
         let parent = path_to_save.parent().unwrap();
-        std::fs::create_dir_all(&parent)?;
+        std::fs::create_dir_all(parent)?;
         std::fs::write(path_to_save, bytes).map_err(|err| err.into())
     }
 
@@ -323,6 +324,7 @@ impl OnDiskCompiledPackage {
         &self,
         package_name: Symbol,
         compiled_unit: &CompiledUnitWithSource,
+        bytecode_version: Option<u32>,
     ) -> Result<()> {
         let root_package = self.package.compiled_package_info.package_name;
         assert!(self.root_path.ends_with(root_package.as_str()));
@@ -348,7 +350,7 @@ impl OnDiskCompiledPackage {
                 .with_extension(MOVE_COMPILED_EXTENSION),
             compiled_unit
                 .unit
-                .serialize(get_bytecode_version_from_env())
+                .serialize(get_bytecode_version_from_env(bytecode_version))
                 .as_slice(),
         )?;
         self.save_under(
@@ -430,7 +432,9 @@ impl CompiledPackage {
 
         self.deps_compiled_units
             .iter()
-            .filter(|(dep_package, _)| dep_package.as_str() == package_name)
+            .filter(|(dep_package, unit)| {
+                dep_package.as_str() == package_name && matches!(unit.unit, CompiledUnit::Module(_))
+            })
             .map(|(_, unit)| unit)
             .find(|unit| unit.unit.name().as_str() == module_name)
             .ok_or_else(|| {
@@ -442,6 +446,31 @@ impl CompiledPackage {
             })
     }
 
+    pub fn get_script_by_name(
+        &self,
+        package_name: &str,
+        script_name: &str,
+    ) -> Result<&CompiledUnitWithSource> {
+        if self.compiled_package_info.package_name.as_str() == package_name {
+            return self.get_script_by_name_from_root(script_name);
+        }
+
+        self.deps_compiled_units
+            .iter()
+            .filter(|(dep_package, unit)| {
+                dep_package.as_str() == package_name && matches!(unit.unit, CompiledUnit::Script(_))
+            })
+            .map(|(_, unit)| unit)
+            .find(|unit| unit.unit.name().as_str() == script_name)
+            .ok_or_else(|| {
+                anyhow::format_err!(
+                    "Unable to find script with name '{}' in package {}",
+                    script_name,
+                    self.compiled_package_info.package_name
+                )
+            })
+    }
+
     pub fn get_module_by_name_from_root(
         &self,
         module_name: &str,
@@ -457,6 +486,21 @@ impl CompiledPackage {
             })
     }
 
+    pub fn get_script_by_name_from_root(
+        &self,
+        script_name: &str,
+    ) -> Result<&CompiledUnitWithSource> {
+        self.scripts()
+            .find(|unit| unit.unit.name().as_str() == script_name)
+            .ok_or_else(|| {
+                anyhow::format_err!(
+                    "Unable to find script with name '{}' in package {}",
+                    script_name,
+                    self.compiled_package_info.package_name
+                )
+            })
+    }
+
     pub fn scripts(&self) -> impl Iterator<Item = &CompiledUnitWithSource> {
         self.root_compiled_units
             .iter()
@@ -493,7 +537,9 @@ impl CompiledPackage {
             /* is immediate */ bool,
             /* source paths */ Vec<Symbol>,
             /* address mapping */ &ResolvedTable,
+            /* whether source is available */ bool,
         )>,
+        bytecode_version: Option<u32>,
         resolution_graph: &ResolvedGraph,
         mut compiler_driver: impl FnMut(
             Compiler,
@@ -502,16 +548,18 @@ impl CompiledPackage {
     ) -> Result<CompiledPackage> {
         let immediate_dependencies = transitive_dependencies
             .iter()
-            .filter(|(_, is_immediate, _, _)| *is_immediate)
-            .map(|(name, _, _, _)| *name)
+            .filter(|(_, is_immediate, _, _, _)| *is_immediate)
+            .map(|(name, _, _, _, _)| *name)
             .collect::<Vec<_>>();
         let transitive_dependencies = transitive_dependencies
             .into_iter()
-            .map(|(name, _is_immediate, source_paths, address_mapping)| {
-                (name, source_paths, address_mapping)
-            })
+            .map(
+                |(name, _is_immediate, source_paths, address_mapping, src_flag)| {
+                    (name, source_paths, address_mapping, src_flag)
+                },
+            )
             .collect::<Vec<_>>();
-        for (dep_package_name, _, _) in &transitive_dependencies {
+        for (dep_package_name, _, _, _) in &transitive_dependencies {
             writeln!(
                 w,
                 "{} {}",
@@ -521,7 +569,6 @@ impl CompiledPackage {
         }
         let root_package_name = resolved_package.source_package.package.name;
         writeln!(w, "{} {}", "BUILDING".bold().green(), root_package_name)?;
-
         // gather source/dep files with their address mappings
         let (sources_package_paths, deps_package_paths) = make_source_and_deps_for_compiler(
             resolution_graph,
@@ -533,16 +580,27 @@ impl CompiledPackage {
         } else {
             Flags::empty()
         };
-        // invoke the compiler
-        let paths = {
-            let mut v = deps_package_paths.clone();
-            // Skip project files in the compilation process. Used in external IDE integrations.
-            if !resolution_graph.build_options.only_deps {
-                v.push(sources_package_paths.clone());
+        // Partition deps_package according whether src is available
+        let (src_deps, bytecode_deps): (Vec<_>, Vec<_>) = deps_package_paths
+            .clone()
+            .into_iter()
+            .partition_map(|(p, b)| if b { Either::Left(p) } else { Either::Right(p) });
+        // If bytecode dependency is not empty, do not allow renaming
+        if !bytecode_deps.is_empty() {
+            if let Some(pkg_name) = resolution_graph.contains_renaming() {
+                anyhow::bail!(
+                    "Found address renaming in package '{}' when \
+                    building with bytecode dependencies -- this is currently not supported",
+                    pkg_name
+                )
             }
-            v
-        };
-        let compiler = Compiler::from_package_paths(paths, vec![]).set_flags(flags);
+        }
+
+        // invoke the compiler
+        let mut paths = src_deps;
+        paths.push(sources_package_paths.clone());
+
+        let compiler = Compiler::from_package_paths(paths, bytecode_deps).set_flags(flags);
         let (file_map, all_compiled_units) = compiler_driver(compiler)?;
         let mut root_compiled_units = vec![];
         let mut deps_compiled_units = vec![];
@@ -562,6 +620,7 @@ impl CompiledPackage {
                 deps_compiled_units.push((package_name, unit))
             }
         }
+        let bytecode_version = get_bytecode_version_from_env(bytecode_version);
 
         let mut compiled_docs = None;
         let mut compiled_abis = None;
@@ -570,7 +629,7 @@ impl CompiledPackage {
         {
             let model = run_model_builder_with_options(
                 vec![sources_package_paths],
-                deps_package_paths,
+                deps_package_paths.into_iter().map(|(p, _)| p).collect_vec(),
                 ModelBuilderOptions::default(),
             )?;
 
@@ -586,7 +645,7 @@ impl CompiledPackage {
 
             if resolution_graph.build_options.generate_abis {
                 compiled_abis = Some(Self::build_abis(
-                    get_bytecode_version_from_env(),
+                    bytecode_version,
                     &model,
                     &root_compiled_units,
                 ));
@@ -606,7 +665,10 @@ impl CompiledPackage {
             compiled_abis,
         };
 
-        compiled_package.save_to_disk(project_root.join(CompiledPackageLayout::Root.path()))?;
+        compiled_package.save_to_disk(
+            project_root.join(CompiledPackageLayout::Root.path()),
+            bytecode_version,
+        )?;
 
         Ok(compiled_package)
     }
@@ -666,7 +728,11 @@ impl CompiledPackage {
         Ok(())
     }
 
-    pub(crate) fn save_to_disk(&self, under_path: PathBuf) -> Result<OnDiskCompiledPackage> {
+    pub(crate) fn save_to_disk(
+        &self,
+        under_path: PathBuf,
+        bytecode_version: Option<u32>,
+    ) -> Result<OnDiskCompiledPackage> {
         self.check_filepaths_ok()?;
         assert!(under_path.ends_with(CompiledPackageLayout::Root.path()));
         let root_package = self.compiled_package_info.package_name;
@@ -693,10 +759,10 @@ impl CompiledPackage {
         std::fs::create_dir_all(&on_disk_package.root_path)?;
 
         for compiled_unit in &self.root_compiled_units {
-            on_disk_package.save_compiled_unit(root_package, compiled_unit)?;
+            on_disk_package.save_compiled_unit(root_package, compiled_unit, bytecode_version)?;
         }
         for (dep_name, compiled_unit) in &self.deps_compiled_units {
-            on_disk_package.save_compiled_unit(*dep_name, compiled_unit)?;
+            on_disk_package.save_compiled_unit(*dep_name, compiled_unit, bytecode_version)?;
         }
 
         if let Some(docs) = &self.compiled_docs {
@@ -704,7 +770,7 @@ impl CompiledPackage {
                 on_disk_package.save_under(
                     CompiledPackageLayout::CompiledDocs
                         .path()
-                        .join(&doc_filename)
+                        .join(doc_filename)
                         .with_extension("md"),
                     doc_contents.clone().as_bytes(),
                 )?;
@@ -858,25 +924,29 @@ pub(crate) fn make_source_and_deps_for_compiler(
         /* name */ Symbol,
         /* source paths */ Vec<Symbol>,
         /* address mapping */ &ResolvedTable,
+        /* whether src is available */ bool,
     )>,
 ) -> Result<(
     /* sources */ PackagePaths,
-    /* deps */ Vec<PackagePaths>,
+    /* deps */ Vec<(PackagePaths, bool)>,
 )> {
     let deps_package_paths = deps
         .into_iter()
-        .map(|(name, source_paths, resolved_table)| {
+        .map(|(name, source_paths, resolved_table, src_flag)| {
             let paths = source_paths
                 .into_iter()
                 .collect::<BTreeSet<_>>()
                 .into_iter()
                 .collect::<Vec<_>>();
             let named_address_map = named_address_mapping_for_compiler(resolved_table);
-            Ok(PackagePaths {
-                name: Some(name),
-                paths,
-                named_address_map,
-            })
+            Ok((
+                PackagePaths {
+                    name: Some(name),
+                    paths,
+                    named_address_map,
+                },
+                src_flag,
+            ))
         })
         .collect::<Result<Vec<_>>>()?;
     let root_named_addrs = apply_named_address_renaming(
diff --git a/language/tools/move-package/src/compilation/model_builder.rs b/language/tools/move-package/src/compilation/model_builder.rs
index b67fb4454d..9aa361d3da 100644
--- a/language/tools/move-package/src/compilation/model_builder.rs
+++ b/language/tools/move-package/src/compilation/model_builder.rs
@@ -7,6 +7,7 @@ use crate::{
     resolution::resolution_graph::ResolvedGraph, ModelConfig,
 };
 use anyhow::Result;
+use itertools::Itertools;
 use move_compiler::shared::PackagePaths;
 use move_model::{model::GlobalEnv, options::ModelBuilderOptions, run_model_builder_with_options};
 
@@ -31,14 +32,12 @@ impl ModelBuilder {
     // where we want to support building a Move model.
     pub fn build_model(&self) -> Result<GlobalEnv> {
         // Make sure no renamings have been performed
-        for (pkg_name, pkg) in self.resolution_graph.package_table.iter() {
-            if !pkg.renaming.is_empty() {
-                anyhow::bail!(
-                    "Found address renaming in package '{}' when \
+        if let Some(pkg_name) = self.resolution_graph.contains_renaming() {
+            anyhow::bail!(
+                "Found address renaming in package '{}' when \
                     building Move model -- this is currently not supported",
-                    pkg_name
-                )
-            }
+                pkg_name
+            )
         }
 
         // Targets are all files in the root package
@@ -52,13 +51,23 @@ impl ModelBuilder {
                 if nm == root_name {
                     return None;
                 }
-                let dep_source_paths = pkg
+                let mut dep_source_paths = pkg
                     .get_sources(&self.resolution_graph.build_options)
                     .unwrap();
-                Some(Ok((*nm, dep_source_paths, &pkg.resolution_table)))
+                let mut source_available = true;
+                // If source is empty, search bytecode
+                if dep_source_paths.is_empty() {
+                    dep_source_paths = pkg.get_bytecodes().unwrap();
+                    source_available = false;
+                }
+                Some(Ok((
+                    *nm,
+                    dep_source_paths,
+                    &pkg.resolution_table,
+                    source_available,
+                )))
             })
             .collect::<Result<Vec<_>>>()?;
-
         let (target, deps) = make_source_and_deps_for_compiler(
             &self.resolution_graph,
             &root_package,
@@ -66,7 +75,7 @@ impl ModelBuilder {
         )?;
         let (all_targets, all_deps) = if self.model_config.all_files_as_targets {
             let mut targets = vec![target];
-            targets.extend(deps.into_iter());
+            targets.extend(deps.into_iter().map(|(p, _)| p).collect_vec());
             (targets, vec![])
         } else {
             (vec![target], deps)
@@ -74,7 +83,7 @@ impl ModelBuilder {
         let (all_targets, all_deps) = match &self.model_config.target_filter {
             Some(filter) => {
                 let mut new_targets = vec![];
-                let mut new_deps = all_deps;
+                let mut new_deps = all_deps.into_iter().map(|(p, _)| p).collect_vec();
                 for PackagePaths {
                     name,
                     paths,
@@ -100,7 +109,10 @@ impl ModelBuilder {
                 }
                 (new_targets, new_deps)
             }
-            None => (all_targets, all_deps),
+            None => (
+                all_targets,
+                all_deps.into_iter().map(|(p, _)| p).collect_vec(),
+            ),
         };
 
         run_model_builder_with_options(all_targets, all_deps, ModelBuilderOptions::default())
diff --git a/language/tools/move-package/src/compilation/package_layout.rs b/language/tools/move-package/src/compilation/package_layout.rs
index fb6ef8a2bc..fc46ba2fb0 100644
--- a/language/tools/move-package/src/compilation/package_layout.rs
+++ b/language/tools/move-package/src/compilation/package_layout.rs
@@ -11,6 +11,7 @@ pub enum CompiledPackageLayout {
     Dependencies,
     Sources,
     SourceMaps,
+    LockFiles,
     CompiledModules,
     CompiledScripts,
     CompiledDocs,
@@ -25,6 +26,7 @@ impl CompiledPackageLayout {
             Self::Dependencies => "dependencies",
             Self::Sources => "sources",
             Self::SourceMaps => "source_maps",
+            Self::LockFiles => "locks",
             Self::CompiledModules => "bytecode_modules",
             Self::CompiledScripts => "bytecode_scripts",
             Self::CompiledDocs => "docs",
diff --git a/language/tools/move-package/src/lib.rs b/language/tools/move-package/src/lib.rs
index 92b7559766..b03c426484 100644
--- a/language/tools/move-package/src/lib.rs
+++ b/language/tools/move-package/src/lib.rs
@@ -5,6 +5,7 @@
 mod package_lock;
 
 pub mod compilation;
+pub mod package_hooks;
 pub mod resolution;
 pub mod source_package;
 
@@ -12,6 +13,7 @@ use anyhow::{bail, Result};
 use clap::*;
 use move_core_types::account_address::AccountAddress;
 use move_model::model::GlobalEnv;
+use resolution::{dependency_graph::DependencyGraph, lock_file::LockFile};
 use serde::{Deserialize, Serialize};
 use source_package::layout::SourcePackageLayout;
 use std::{
@@ -27,7 +29,7 @@ use crate::{
     },
     package_lock::PackageLock,
     resolution::resolution_graph::{ResolutionGraph, ResolvedGraph},
-    source_package::{layout, manifest_parser},
+    source_package::manifest_parser,
 };
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
@@ -89,7 +91,7 @@ impl Architecture {
     }
 }
 
-#[derive(Debug, Parser, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd)]
+#[derive(Debug, Parser, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Default)]
 #[clap(author, version, about)]
 pub struct BuildConfig {
     /// Compile in 'dev' mode. The 'dev-addresses' and 'dev-dependencies' fields will be used if
@@ -119,6 +121,10 @@ pub struct BuildConfig {
     #[clap(name = "force-recompilation", long = "force", global = true)]
     pub force_recompilation: bool,
 
+    /// Optional location to save the lock file to, if package resolution succeeds.
+    #[clap(skip)]
+    pub lock_file: Option<PathBuf>,
+
     /// Additional named address mapping. Useful for tools in rust
     #[clap(skip)]
     pub additional_named_addresses: BTreeMap<String, AccountAddress>,
@@ -126,25 +132,17 @@ pub struct BuildConfig {
     #[clap(long = "arch", global = true, parse(try_from_str = Architecture::try_parse_from_str))]
     pub architecture: Option<Architecture>,
 
-    /// Only compile dependencies
-    #[clap(long = "only-deps", global = true)]
-    pub only_deps: bool,
-}
+    /// Only fetch dependency repos to MOVE_HOME
+    #[clap(long = "fetch-deps-only", global = true)]
+    pub fetch_deps_only: bool,
 
-impl Default for BuildConfig {
-    fn default() -> Self {
-        Self {
-            dev_mode: false,
-            test_mode: false,
-            generate_docs: false,
-            generate_abis: false,
-            install_dir: None,
-            force_recompilation: false,
-            additional_named_addresses: BTreeMap::new(),
-            architecture: None,
-            only_deps: false,
-        }
-    }
+    /// Skip fetching latest git dependencies
+    #[clap(long = "skip-fetch-latest-git-deps", global = true)]
+    pub skip_fetch_latest_git_deps: bool,
+
+    /// Bytecode version to compile move code
+    #[clap(long = "bytecode-version", global = true)]
+    pub bytecode_version: Option<u32>,
 }
 
 #[derive(Debug, Clone, Eq, PartialEq, PartialOrd)]
@@ -160,9 +158,10 @@ impl BuildConfig {
     /// Compile the package at `path` or the containing Move package. Exit process on warning or
     /// failure.
     pub fn compile_package<W: Write>(self, path: &Path, writer: &mut W) -> Result<CompiledPackage> {
-        let resolved_graph = self.resolution_graph_for_package(path)?;
+        let bytecode_version = self.bytecode_version;
+        let resolved_graph = self.resolution_graph_for_package(path, writer)?;
         let mutx = PackageLock::lock();
-        let ret = BuildPlan::create(resolved_graph)?.compile(writer);
+        let ret = BuildPlan::create(resolved_graph)?.compile(bytecode_version, writer);
         mutx.unlock();
         ret
     }
@@ -174,16 +173,19 @@ impl BuildConfig {
         path: &Path,
         writer: &mut W,
     ) -> Result<CompiledPackage> {
-        let resolved_graph = self.resolution_graph_for_package(path)?;
+        let bytecode_version = self.bytecode_version;
+        let resolved_graph = self.resolution_graph_for_package(path, writer)?;
         let mutx = PackageLock::lock();
-        let ret = BuildPlan::create(resolved_graph)?.compile_no_exit(writer);
+        let ret = BuildPlan::create(resolved_graph)?.compile_no_exit(bytecode_version, writer);
         mutx.unlock();
         ret
     }
 
     #[cfg(feature = "evm-backend")]
     pub fn compile_package_evm<W: Write>(self, path: &Path, writer: &mut W) -> Result<()> {
-        let resolved_graph = self.resolution_graph_for_package(path)?;
+        // resolution graph diagnostics are only needed for CLI commands so ignore them by passing a
+        // vector as the writer
+        let resolved_graph = self.resolution_graph_for_package(path, &mut Vec::new())?;
         let mutx = PackageLock::lock();
         let ret = BuildPlan::create(resolved_graph)?.compile_evm(writer);
         mutx.unlock();
@@ -200,28 +202,67 @@ impl BuildConfig {
         path: &Path,
         model_config: ModelConfig,
     ) -> Result<GlobalEnv> {
-        let resolved_graph = self.resolution_graph_for_package(path)?;
+        // resolution graph diagnostics are only needed for CLI commands so ignore them by passing a
+        // vector as the writer
+        let resolved_graph = self.resolution_graph_for_package(path, &mut Vec::new())?;
         let mutx = PackageLock::lock();
         let ret = ModelBuilder::create(resolved_graph, model_config).build_model();
         mutx.unlock();
         ret
     }
 
-    pub fn resolution_graph_for_package(mut self, path: &Path) -> Result<ResolvedGraph> {
+    pub fn download_deps_for_package<W: Write>(&self, path: &Path, writer: &mut W) -> Result<()> {
+        let path = SourcePackageLayout::try_find_root(path)?;
+        let toml_manifest =
+            self.parse_toml_manifest(path.join(SourcePackageLayout::Manifest.path()))?;
+        let mutx = PackageLock::lock();
+        // This should be locked as it inspects the environment for `MOVE_HOME` which could
+        // possibly be set by a different process in parallel.
+        let manifest = manifest_parser::parse_source_manifest(toml_manifest)?;
+        resolution::download_dependency_repos(&manifest, self, &path, writer)?;
+        mutx.unlock();
+        Ok(())
+    }
+
+    pub fn resolution_graph_for_package<W: Write>(
+        mut self,
+        path: &Path,
+        writer: &mut W,
+    ) -> Result<ResolvedGraph> {
         if self.test_mode {
             self.dev_mode = true;
         }
         let path = SourcePackageLayout::try_find_root(path)?;
-        let manifest_string =
-            std::fs::read_to_string(path.join(layout::SourcePackageLayout::Manifest.path()))?;
-        let toml_manifest = manifest_parser::parse_move_manifest_string(manifest_string)?;
+        let toml_manifest =
+            self.parse_toml_manifest(path.join(SourcePackageLayout::Manifest.path()))?;
         let mutx = PackageLock::lock();
+
         // This should be locked as it inspects the environment for `MOVE_HOME` which could
         // possibly be set by a different process in parallel.
+        let mut lock = LockFile::new(&path)?;
         let manifest = manifest_parser::parse_source_manifest(toml_manifest)?;
-        let resolution_graph = ResolutionGraph::new(manifest, path, self)?;
-        let ret = resolution_graph.resolve();
+
+        let dependency_graph = DependencyGraph::new(
+            &manifest,
+            path.clone(),
+            self.skip_fetch_latest_git_deps,
+            writer,
+        )?;
+
+        dependency_graph.write_to_lock(&mut lock)?;
+        if let Some(lock_path) = &self.lock_file {
+            lock.commit(lock_path)?;
+        }
+
+        let resolution_graph = ResolutionGraph::new(manifest, path, self, writer)?;
+        let ret = resolution_graph.resolve()?;
+
         mutx.unlock();
-        ret
+        Ok(ret)
+    }
+
+    fn parse_toml_manifest(&self, path: PathBuf) -> Result<toml::Value> {
+        let manifest_string = std::fs::read_to_string(path)?;
+        manifest_parser::parse_move_manifest_string(manifest_string)
     }
 }
diff --git a/language/tools/move-package/src/package_hooks.rs b/language/tools/move-package/src/package_hooks.rs
new file mode 100644
index 0000000000..9d6f338926
--- /dev/null
+++ b/language/tools/move-package/src/package_hooks.rs
@@ -0,0 +1,66 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::source_package::parsed_manifest::CustomDepInfo;
+use anyhow::bail;
+use move_symbol_pool::Symbol;
+use once_cell::sync::Lazy;
+use std::sync::Mutex;
+
+// TODO: remove static hooks and refactor this crate for better customizability
+
+/// A trait providing hooks to customize the package system for a particular Move application.
+/// An instance of the trait can be registered globally.
+pub trait PackageHooks {
+    /// Returns custom fields allowed in `PackageInfo`.
+    fn custom_package_info_fields(&self) -> Vec<String>;
+
+    /// Returns a custom key for dependencies, if available. This is the string used
+    /// in dependencies `{ <key> = value, address = addr }.
+    fn custom_dependency_key(&self) -> Option<String>;
+
+    /// A resolver for custom dependencies in the manifest. This is called to download the
+    /// dependency from the dependency into the `info.local_path` location, similar as with git
+    /// dependencies.
+    fn resolve_custom_dependency(
+        &self,
+        dep_name: Symbol,
+        info: &CustomDepInfo,
+    ) -> anyhow::Result<()>;
+}
+static HOOKS: Lazy<Mutex<Option<Box<dyn PackageHooks + Send + Sync>>>> =
+    Lazy::new(|| Mutex::new(None));
+
+/// Registers package hooks for the process in which the package system is used.
+pub fn register_package_hooks(hooks: Box<dyn PackageHooks + Send + Sync>) {
+    *HOOKS.lock().unwrap() = Some(hooks)
+}
+
+/// Calls any registered hook to resolve a node dependency. Bails if none is registered.
+pub(crate) fn resolve_custom_dependency(
+    dep_name: Symbol,
+    info: &CustomDepInfo,
+) -> anyhow::Result<()> {
+    if let Some(hooks) = &*HOOKS.lock().unwrap() {
+        hooks.resolve_custom_dependency(dep_name, info)
+    } else {
+        bail!("use of unsupported custom dependency in package manifest")
+    }
+}
+
+pub(crate) fn custom_dependency_key() -> Option<String> {
+    if let Some(hooks) = &*HOOKS.lock().unwrap() {
+        hooks.custom_dependency_key()
+    } else {
+        None
+    }
+}
+
+/// Calls any registered hook to return custom package fields.
+pub(crate) fn custom_package_info_fields() -> Vec<String> {
+    if let Some(hooks) = &*HOOKS.lock().unwrap() {
+        hooks.custom_package_info_fields()
+    } else {
+        vec![]
+    }
+}
diff --git a/language/tools/move-package/src/package_lock.rs b/language/tools/move-package/src/package_lock.rs
index 010a9da382..b275bf792d 100644
--- a/language/tools/move-package/src/package_lock.rs
+++ b/language/tools/move-package/src/package_lock.rs
@@ -5,11 +5,14 @@
 use named_lock::{NamedLock, NamedLockGuard};
 use once_cell::sync::Lazy;
 use std::sync::{Mutex, MutexGuard};
+use whoami::username;
 
 const PACKAGE_LOCK_NAME: &str = "move_pkg_lock";
 static PACKAGE_THREAD_MUTEX: Lazy<Mutex<()>> = Lazy::new(|| Mutex::new(()));
-static PACKAGE_PROCESS_MUTEX: Lazy<NamedLock> =
-    Lazy::new(|| NamedLock::create(PACKAGE_LOCK_NAME).unwrap());
+static PACKAGE_PROCESS_MUTEX: Lazy<NamedLock> = Lazy::new(|| {
+    let user_lock_file = format!("{}_{}", PACKAGE_LOCK_NAME, username());
+    NamedLock::create(user_lock_file.as_str()).unwrap()
+});
 
 /// The package lock is a lock held across threads and processes. This lock is held to ensure that
 /// the Move package manager has a consistent (read: serial) view of the file system. Without this
diff --git a/language/tools/move-package/src/resolution/dependency_graph.rs b/language/tools/move-package/src/resolution/dependency_graph.rs
new file mode 100644
index 0000000000..555549e3cb
--- /dev/null
+++ b/language/tools/move-package/src/resolution/dependency_graph.rs
@@ -0,0 +1,517 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{bail, Context, Result};
+use move_symbol_pool::Symbol;
+use petgraph::{algo, prelude::DiGraphMap, Direction};
+use std::{
+    collections::{btree_map::Entry, BTreeMap, BTreeSet},
+    fmt,
+    io::{BufWriter, Read, Write},
+    path::{Path, PathBuf},
+};
+
+use crate::{
+    package_hooks,
+    source_package::{
+        manifest_parser::parse_dependency,
+        parsed_manifest::{
+            CustomDepInfo, Dependency, DependencyKind, GitInfo, NamedAddress, PackageName,
+            SourceManifest, SubstOrRename, Substitution,
+        },
+    },
+};
+
+use super::{
+    download_and_update_if_remote,
+    lock_file::{schema, LockFile},
+    parse_package_manifest,
+};
+
+/// A representation of the transitive dependency graph of a Move package.  If successfully created,
+/// the resulting graph:
+///
+/// - is directed, acyclic and `BuildConfig` agnostic,
+/// - mentions each package at most once (i.e. no duplicate packages), and
+/// - contains information about the source of every package (excluding the root package).
+///
+/// It can be built by recursively exploring a package's dependencies, fetching their sources if
+/// necessary, or by reading its serialized contents from a lock file.  Both these processes will
+/// fail if any of the criteria above cannot be met (e.g. if the graph contains a cycle, the same
+/// package is fetched multiple times from different sources, or information about a package's
+/// source is not available).
+///
+/// In order to be `BuildConfig` agnostic, it contains `dev-dependencies` as well as `dependencies`
+/// and labels edges in the graph accordingly, as `DevOnly`, or `Always` dependencies.
+#[derive(Debug)]
+pub struct DependencyGraph {
+    /// Path to the root package and its name (according to its manifest)
+    root_path: PathBuf,
+    root_package: PackageName,
+
+    /// Transitive dependency graph, with dependency edges `P -> Q` labelled according to whether Q
+    /// is always a dependency of P or only in dev-mode.
+    package_graph: DiGraphMap<PackageName, DependencyMode>,
+
+    /// The dependency that each package (keyed by name) originates from.  The root package is the
+    /// only node in `package_graph` that does not have an entry in `package_table`.
+    package_table: BTreeMap<PackageName, Dependency>,
+
+    /// Packages that are transitive dependencies regardless of mode (the transitive closure of
+    /// `DependencyMode::Always` edges in `package_graph`).
+    pub always_deps: BTreeSet<PackageName>,
+}
+
+/// Edge label indicating whether one package always depends on another, or only in dev-mode.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+enum DependencyMode {
+    Always,
+    DevOnly,
+}
+
+/// Wrapper struct to display a dependency as an inline table in the lock file (matching the
+/// convention in the source manifest).  This is necessary becase the `toml` crate does not
+/// currently support serializing types as inline tables.
+struct DependencyTOML<'a>(&'a Dependency);
+struct SubstTOML<'a>(&'a Substitution);
+
+impl DependencyGraph {
+    /// Build a graph from the transitive dependencies and dev-dependencies of `root_package`.
+    ///
+    /// `skip_fetch_latest_git_deps` controls whether package resolution will fetch the latest
+    /// versions of remote dependencies, even if a version already exists locally.
+    ///
+    /// `progress_output` is an output stream that is written to while generating the graph, to
+    /// provide human-readable progress updates.
+    pub fn new<Progress: Write>(
+        root_package: &SourceManifest,
+        root_path: PathBuf,
+        skip_fetch_latest_git_deps: bool,
+        progress_output: &mut Progress,
+    ) -> Result<DependencyGraph> {
+        let mut graph = DependencyGraph {
+            root_path,
+            root_package: root_package.package.name,
+            package_graph: DiGraphMap::new(),
+            package_table: BTreeMap::new(),
+            always_deps: BTreeSet::new(),
+        };
+
+        graph
+            .extend_graph(
+                DependencyKind::default(),
+                root_package,
+                skip_fetch_latest_git_deps,
+                progress_output,
+            )
+            .with_context(|| {
+                format!(
+                    "Failed to resolve dependencies for package '{}'",
+                    graph.root_package
+                )
+            })?;
+
+        graph.check_acyclic()?;
+        graph.discover_always_deps();
+
+        Ok(graph)
+    }
+
+    /// Create a dependency graph by reading a lock file.
+    ///
+    /// The lock file is expected to contain a complete picture of the package's transitive
+    /// dependency graph, which means it is not required to discover it through a recursive
+    /// traversal.
+    ///
+    /// Expects the lock file to conform to the schema expected by this version of the compiler (in
+    /// the `lock_file::schema` module).
+    pub fn read_from_lock(
+        root_path: PathBuf,
+        root_package: SourceManifest,
+        lock: &mut impl Read,
+    ) -> Result<DependencyGraph> {
+        let mut package_graph = DiGraphMap::new();
+        let mut package_table = BTreeMap::new();
+
+        // Seed graph with edges from the root package
+        let root = root_package.package.name;
+
+        for dep in root_package.dependencies.keys() {
+            package_graph.add_edge(root, *dep, DependencyMode::Always);
+        }
+
+        for dep in root_package.dev_dependencies.keys() {
+            package_graph.add_edge(root, *dep, DependencyMode::DevOnly);
+        }
+
+        // Fill in the remaining dependencies, and the package source information from the lock
+        // file.
+        for schema::Dependency {
+            name,
+            source,
+            dependencies,
+            dev_dependencies,
+        } in schema::Dependencies::read(lock)?
+        {
+            let package = PackageName::from(name.as_str());
+            let source = parse_dependency(package.as_str(), source)
+                .with_context(|| format!("Deserializing dependency {}", package))?;
+
+            match package_table.entry(package) {
+                Entry::Vacant(entry) => {
+                    entry.insert(source);
+                }
+                Entry::Occupied(entry) => {
+                    bail!(
+                        "Duplicate dependency in lock file:\n{0} = {1}\n{0} = {2}\n",
+                        package,
+                        DependencyTOML(entry.get()),
+                        DependencyTOML(&source),
+                    );
+                }
+            };
+
+            for dep in dependencies.iter().flatten() {
+                let dep = PackageName::from(dep.as_str());
+                package_graph.add_edge(package, dep, DependencyMode::Always);
+            }
+
+            for dep in dev_dependencies.iter().flatten() {
+                let dep = PackageName::from(dep.as_str());
+                package_graph.add_edge(package, dep, DependencyMode::DevOnly);
+            }
+        }
+
+        let mut graph = DependencyGraph {
+            root_path,
+            root_package: root,
+            package_graph,
+            package_table,
+            always_deps: BTreeSet::new(),
+        };
+
+        graph.check_consistency()?;
+        graph.check_acyclic()?;
+        graph.discover_always_deps();
+        Ok(graph)
+    }
+
+    /// Serialize this dependency graph into a lock file, consuming it in the process.
+    ///
+    /// This operation fails, writing nothing, if the graph contains a cycle, and can fail with an
+    /// undefined output if it cannot be represented in a TOML file.
+    pub fn write_to_lock(self, lock: &mut LockFile) -> Result<()> {
+        let mut writer = BufWriter::new(&**lock);
+        for (pkg, dep) in self.package_table {
+            writeln!(writer, "\n[[move.dependency]]")?;
+
+            writeln!(writer, "name = {}", str_escape(pkg.as_str())?)?;
+            writeln!(writer, "source = {}", DependencyTOML(&dep))?;
+
+            let mut deps: Vec<_> = self
+                .package_graph
+                .edges(pkg)
+                .map(|(_, dep, kind)| (*kind, dep))
+                .collect();
+
+            // Sort by kind ("always" dependencies go first), and by name, to keep the output
+            // stable.
+            deps.sort();
+
+            let mut deps = deps.into_iter().peekable();
+            if let Some((DependencyMode::Always, _)) = deps.peek() {
+                writeln!(writer, "dependencies = [")?;
+                while let Some((DependencyMode::Always, dep)) = deps.peek() {
+                    writeln!(writer, "  {},", str_escape(dep.as_str())?)?;
+                    deps.next();
+                }
+                writeln!(writer, "]")?;
+            }
+
+            if let Some((DependencyMode::DevOnly, _)) = deps.peek() {
+                writeln!(writer, "dev-dependencies = [")?;
+                while let Some((DependencyMode::DevOnly, dep)) = deps.peek() {
+                    writeln!(writer, "  {},", str_escape(dep.as_str())?)?;
+                    deps.next();
+                }
+                writeln!(writer, "]")?;
+            }
+        }
+
+        writer.flush()?;
+        Ok(())
+    }
+
+    /// Add the transitive dependencies and dev-dependencies from `package` to the dependency graph.
+    fn extend_graph<Progress: Write>(
+        &mut self,
+        parent: DependencyKind,
+        package: &SourceManifest,
+        skip_fetch_latest_git_deps: bool,
+        progress_output: &mut Progress,
+    ) -> Result<()> {
+        let from = package.package.name;
+        for (to, dep) in &package.dependencies {
+            let mut dep = dep.clone();
+            dep.kind.reroot(&parent)?;
+
+            self.process_dependency(dep, *to, skip_fetch_latest_git_deps, progress_output)?;
+
+            self.package_graph
+                .add_edge(from, *to, DependencyMode::Always);
+        }
+
+        for (to, dep) in &package.dev_dependencies {
+            let mut dep = dep.clone();
+            dep.kind.reroot(&parent)?;
+
+            self.process_dependency(dep, *to, skip_fetch_latest_git_deps, progress_output)?;
+
+            self.package_graph
+                .add_edge(from, *to, DependencyMode::DevOnly);
+        }
+
+        Ok(())
+    }
+
+    /// Ensures that package `dep_name` and all its transitive dependencies are present in the
+    /// graph, all sourced from their respective `dep`endencies.  Fails if any of the packages in
+    /// the dependency sub-graph rooted at `dep_name` are already present in `self` but sourced from
+    /// a different dependency.
+    fn process_dependency<Progress: Write>(
+        &mut self,
+        dep: Dependency,
+        dep_name: PackageName,
+        skip_fetch_latest_git_deps: bool,
+        progress_output: &mut Progress,
+    ) -> Result<()> {
+        let dep = match self.package_table.entry(dep_name) {
+            Entry::Vacant(entry) => entry.insert(dep),
+
+            // Seeing the same package again, pointing to the same dependency: OK, return early.
+            Entry::Occupied(entry) if entry.get().kind == dep.kind => {
+                return Ok(());
+            }
+
+            // Seeing the same package again, but pointing to a different dependency: Not OK.
+            Entry::Occupied(entry) => {
+                bail!(
+                    "Conflicting dependencies found:\n{0} = {1}\n{0} = {2}\n",
+                    dep_name,
+                    DependencyTOML(entry.get()),
+                    DependencyTOML(&dep),
+                );
+            }
+        };
+
+        download_and_update_if_remote(dep_name, dep, skip_fetch_latest_git_deps, progress_output)
+            .with_context(|| format!("Fetching '{}'", dep_name))?;
+
+        let (manifest, _) = parse_package_manifest(dep, &dep_name, self.root_path.clone())
+            .with_context(|| format!("Parsing manifest for '{}'", dep_name))?;
+
+        if dep_name != manifest.package.name {
+            bail!(
+                "Name of dependency declared in package '{}' \
+                 does not match dependency's package name '{}'",
+                dep_name,
+                manifest.package.name,
+            )
+        }
+
+        let kind = dep.kind.clone();
+        self.extend_graph(kind, &manifest, skip_fetch_latest_git_deps, progress_output)
+            .with_context(|| format!("Resolving dependencies for package '{}'", dep_name))
+    }
+
+    /// Check that every dependency in the graph, excluding the root package, is present in the
+    /// package table.
+    fn check_consistency(&self) -> Result<()> {
+        for package in self.package_graph.nodes() {
+            if package == self.root_package {
+                continue;
+            }
+
+            if self.package_table.contains_key(&package) {
+                continue;
+            }
+
+            let dependees: Vec<_> = self
+                .package_graph
+                .neighbors_directed(package, Direction::Incoming)
+                .map(|pkg| String::from(pkg.as_str()))
+                .collect();
+
+            bail!(
+                "No source found for package {}, depended on by: {}",
+                package,
+                dependees.join(", "),
+            );
+        }
+
+        Ok(())
+    }
+
+    /// Check that there isn't a cycle between packages in the dependency graph.  Returns `Ok(())`
+    /// if there is not, or an error describing the cycle if there is.
+    fn check_acyclic(&self) -> Result<()> {
+        let mut cyclic_components = algo::kosaraju_scc(&self.package_graph)
+            .into_iter()
+            .filter(|scc| scc.len() != 1 || self.package_graph.contains_edge(scc[0], scc[0]));
+
+        let Some(scc) = cyclic_components.next() else {
+            return Ok(())
+        };
+
+        // Duplicate start of the node at end for display
+        // SAFETY: Strongly connected components can't be empty
+        let mut cycle: Vec<_> = scc.iter().map(Symbol::as_str).collect();
+        cycle.push(cycle[0]);
+
+        bail!("Found cycle between packages: {}", cycle.join(" -> "));
+    }
+
+    /// Add the transitive closure of `DependencyMode::Always` edges reachable from the root package
+    /// to the `always_deps` set.  Assumes that if a package is already in the graph's `always_deps`
+    /// set, then the sub-graph reachable from it has already been explored.
+    fn discover_always_deps(&mut self) {
+        let mut frontier = vec![self.root_package];
+        while let Some(package) = frontier.pop() {
+            let new_frontier = self.always_deps.insert(package);
+            if !new_frontier {
+                continue;
+            }
+
+            frontier.extend(
+                self.package_graph
+                    .edges(package)
+                    .filter(|(_, _, mode)| **mode == DependencyMode::Always)
+                    .map(|(_, dep, _)| dep),
+            );
+        }
+    }
+}
+
+impl<'a> fmt::Display for DependencyTOML<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let Dependency {
+            kind,
+            subst,
+            version,
+            digest,
+        } = self.0;
+
+        f.write_str("{ ")?;
+
+        match kind {
+            DependencyKind::Local(local) => {
+                write!(f, "local = ")?;
+                f.write_str(&path_escape(local)?)?;
+            }
+
+            DependencyKind::Git(GitInfo {
+                git_url,
+                git_rev,
+                subdir,
+            }) => {
+                write!(f, "git = ")?;
+                f.write_str(&str_escape(git_url.as_str())?)?;
+
+                write!(f, ", rev = ")?;
+                f.write_str(&str_escape(git_rev.as_str())?)?;
+
+                write!(f, ", subdir = ")?;
+                f.write_str(&path_escape(subdir)?)?;
+            }
+
+            DependencyKind::Custom(CustomDepInfo {
+                node_url,
+                package_address,
+                subdir,
+                package_name: _,
+            }) => {
+                let custom_key = package_hooks::custom_dependency_key().ok_or(fmt::Error)?;
+
+                f.write_str(&custom_key)?;
+                write!(f, " = ")?;
+                f.write_str(&str_escape(node_url.as_str())?)?;
+
+                write!(f, ", address = ")?;
+                f.write_str(&str_escape(package_address.as_str())?)?;
+
+                write!(f, ", subdir = ")?;
+                f.write_str(&path_escape(subdir)?)?;
+            }
+        }
+
+        if let Some((major, minor, bugfix)) = version {
+            write!(f, ", version = \"{}.{}.{}\"", major, minor, bugfix)?;
+        }
+
+        if let Some(digest) = digest {
+            write!(f, ", digest = ")?;
+            f.write_str(&str_escape(digest.as_str())?)?;
+        }
+
+        if let Some(subst) = subst {
+            write!(f, ", addr_subst = {}", SubstTOML(subst))?;
+        }
+
+        f.write_str(" }")?;
+        Ok(())
+    }
+}
+
+impl<'a> fmt::Display for SubstTOML<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        /// Write an individual key value pair in the substitution.
+        fn write_subst(
+            f: &mut fmt::Formatter<'_>,
+            addr: &NamedAddress,
+            subst: &SubstOrRename,
+        ) -> fmt::Result {
+            f.write_str(&str_escape(addr.as_str())?)?;
+            write!(f, " = ")?;
+
+            match subst {
+                SubstOrRename::RenameFrom(named) => {
+                    f.write_str(&str_escape(named.as_str())?)?;
+                }
+
+                SubstOrRename::Assign(account) => {
+                    f.write_str(&str_escape(&account.to_canonical_string())?)?;
+                }
+            }
+
+            Ok(())
+        }
+
+        let mut substs = self.0.iter();
+
+        let Some((addr, subst)) = substs.next() else {
+            return f.write_str("{}")
+        };
+
+        f.write_str("{ ")?;
+
+        write_subst(f, addr, subst)?;
+        for (addr, subst) in substs {
+            write!(f, ", ")?;
+            write_subst(f, addr, subst)?;
+        }
+
+        f.write_str(" }")?;
+
+        Ok(())
+    }
+}
+
+/// Escape a string to output in a TOML file.
+fn str_escape(s: &str) -> Result<String, fmt::Error> {
+    toml::to_string(s).map_err(|_| fmt::Error)
+}
+
+/// Escape a path to output in a TOML file.
+fn path_escape(p: &Path) -> Result<String, fmt::Error> {
+    str_escape(p.to_str().ok_or(fmt::Error)?)
+}
diff --git a/language/tools/move-package/src/resolution/lock_file/mod.rs b/language/tools/move-package/src/resolution/lock_file/mod.rs
new file mode 100644
index 0000000000..e37e0f75d4
--- /dev/null
+++ b/language/tools/move-package/src/resolution/lock_file/mod.rs
@@ -0,0 +1,88 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{
+    fs::{self, File},
+    ops::{Deref, DerefMut},
+    path::Path,
+};
+
+use anyhow::{bail, Context, Result};
+use tempfile::NamedTempFile;
+
+pub mod schema;
+
+use crate::{
+    compilation::package_layout::CompiledPackageLayout, source_package::layout::SourcePackageLayout,
+};
+
+/// Representation of a machine-generated, human-readable text file that is generated as part of the
+/// build, with the following properties:
+///
+///  - It is only updated by tooling, during the build.
+///  - It will be re-generated on each build.
+///  - Its content is stable (running the same build multiple times should result in a lock file
+///    with the same content).
+///  - It will only be updated if the operation touching it succeeds.
+///
+/// To support this model, the contents of the lock file is stored in a temporary file in the
+/// compiled package output directory, and it must be explicitly committed to its place in the
+/// package root on success, consuming the lock file.
+///
+/// Lock files wrap a `File` which can be accessed by dereferencing it.
+#[derive(Debug)]
+pub struct LockFile {
+    file: NamedTempFile,
+}
+
+impl LockFile {
+    /// Creates a new lock file for a package rooted at `package_root`.  This path must be to a
+    /// directory, containing a Move manifest and a compiled output directory, or else this
+    /// operation will fail.
+    pub fn new(package_root: &Path) -> Result<LockFile> {
+        let toml_manifest = package_root.join(SourcePackageLayout::Manifest.path());
+        if !toml_manifest.is_file() {
+            bail!("Not a Move package: {}", package_root.to_string_lossy());
+        }
+
+        let mut locks_dir = package_root.to_path_buf();
+        locks_dir.extend([
+            CompiledPackageLayout::Root.path(),
+            CompiledPackageLayout::LockFiles.path(),
+        ]);
+
+        fs::create_dir_all(&locks_dir).context("Creating output directory")?;
+
+        let mut lock = tempfile::Builder::new()
+            .prefix("Move.lock")
+            .tempfile_in(locks_dir)
+            .context("Creating lock file")?;
+
+        schema::write_prologue(&mut lock).context("Initializing lock file")?;
+
+        Ok(LockFile { file: lock })
+    }
+
+    /// Consume the lock file, moving it to its final position at `lock_path`.  NOTE: If this
+    /// function is not called, the contents of the lock file will be discarded.
+    pub fn commit(self, lock_path: impl AsRef<Path>) -> Result<()> {
+        self.file
+            .persist(lock_path)
+            .context("Committing lock file")?;
+        Ok(())
+    }
+}
+
+impl Deref for LockFile {
+    type Target = File;
+
+    fn deref(&self) -> &Self::Target {
+        self.file.as_file()
+    }
+}
+
+impl DerefMut for LockFile {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        self.file.as_file_mut()
+    }
+}
diff --git a/language/tools/move-package/src/resolution/lock_file/schema.rs b/language/tools/move-package/src/resolution/lock_file/schema.rs
new file mode 100644
index 0000000000..810fb10c14
--- /dev/null
+++ b/language/tools/move-package/src/resolution/lock_file/schema.rs
@@ -0,0 +1,99 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Serde compatible types to deserialize the schematized parts of the lock file (everything in the
+//! [move] table).  This module does not support serialization because of limitations in the `toml`
+//! crate related to serializing types as inline tables.
+
+use std::io::{Read, Write};
+
+use anyhow::{bail, Context, Result};
+use serde::{Deserialize, Serialize};
+use tempfile::NamedTempFile;
+use toml::value::Value;
+
+/// Lock file version written by this version of the compiler.  Backwards compatibility is
+/// guaranteed (the compiler can read lock files with older versions), forward compatibility is not
+/// (the compiler will fail to read lock files at newer versions).
+///
+/// TODO(amnn): Set to version 1 when stabilised.
+pub const VERSION: u64 = 0;
+
+#[derive(Deserialize)]
+pub struct Dependencies {
+    #[serde(rename = "dependency")]
+    dependencies: Option<Vec<Dependency>>,
+}
+
+#[derive(Deserialize)]
+pub struct Dependency {
+    /// The name of the dependency (corresponds to the key for the dependency in the source
+    /// manifest).
+    pub name: String,
+
+    /// The description of the dependency from its source manifest.  Its schema is not described in
+    /// terms of serde-compatible structs, so it is deserialized into a generic data structure.
+    pub source: Value,
+
+    pub dependencies: Option<Vec<String>>,
+    #[serde(rename = "dev-dependencies")]
+    pub dev_dependencies: Option<Vec<String>>,
+}
+
+#[derive(Serialize, Deserialize)]
+struct Schema<T> {
+    #[serde(rename = "move")]
+    move_: T,
+}
+
+#[derive(Serialize, Deserialize)]
+struct Header {
+    version: u64,
+}
+
+impl Dependencies {
+    /// Read dependencies from the lock file, assuming the file's format matches the schema expected
+    /// by this lock file, and its version is not newer than the version supported by this library.
+    pub fn read(lock: &mut impl Read) -> Result<Vec<Dependency>> {
+        let contents = {
+            let mut buf = String::new();
+            lock.read_to_string(&mut buf).context("Reading lock file")?;
+            buf
+        };
+
+        let Schema {
+            move_: Header { version },
+        } = toml::de::from_str::<Schema<Header>>(&contents).context("Deserializing lock header")?;
+
+        if version > VERSION {
+            bail!(
+                "Lock file format is too new, expected version {} or below, found {}",
+                VERSION,
+                version
+            );
+        }
+
+        let Schema {
+            move_: Dependencies { dependencies },
+        } = toml::de::from_str::<Schema<Dependencies>>(&contents)
+            .context("Deserializing dependencies")?;
+
+        Ok(dependencies.unwrap_or_default())
+    }
+}
+
+/// Write the initial part of the lock file.
+pub(crate) fn write_prologue(file: &mut NamedTempFile) -> Result<()> {
+    writeln!(
+        file,
+        "# @generated by Move, please check-in and do not edit manually.\n"
+    )?;
+
+    let prologue = toml::ser::to_string(&Schema {
+        move_: Header { version: VERSION },
+    })?;
+
+    write!(file, "{}", prologue)?;
+
+    Ok(())
+}
diff --git a/language/tools/move-package/src/resolution/mod.rs b/language/tools/move-package/src/resolution/mod.rs
index a21506c6ee..e0ec41b21e 100644
--- a/language/tools/move-package/src/resolution/mod.rs
+++ b/language/tools/move-package/src/resolution/mod.rs
@@ -2,5 +2,316 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use anyhow::{Context, Result};
+use colored::Colorize;
+use move_command_line_common::env::MOVE_HOME;
+use std::{
+    ffi::OsStr,
+    fs,
+    io::Write,
+    path::{Path, PathBuf},
+    process::{Command, Stdio},
+};
+
+use crate::{
+    package_hooks,
+    source_package::{
+        layout::SourcePackageLayout,
+        manifest_parser::{parse_move_manifest_string, parse_source_manifest},
+        parsed_manifest::{
+            CustomDepInfo, Dependencies, Dependency, DependencyKind, GitInfo, PackageName,
+            SourceManifest,
+        },
+    },
+    BuildConfig,
+};
+
+pub mod dependency_graph;
 mod digest;
+pub mod lock_file;
 pub mod resolution_graph;
+
+pub fn download_dependency_repos<Progress: Write>(
+    manifest: &SourceManifest,
+    build_options: &BuildConfig,
+    root_path: &Path,
+    progress_output: &mut Progress,
+) -> Result<()> {
+    // include dev dependencies if in dev mode
+    let empty_deps;
+    let additional_deps = if build_options.dev_mode {
+        &manifest.dev_dependencies
+    } else {
+        empty_deps = Dependencies::new();
+        &empty_deps
+    };
+
+    for (dep_name, dep) in manifest.dependencies.iter().chain(additional_deps.iter()) {
+        download_and_update_if_remote(
+            *dep_name,
+            dep,
+            build_options.skip_fetch_latest_git_deps,
+            progress_output,
+        )?;
+
+        let (dep_manifest, _) = parse_package_manifest(dep, dep_name, root_path.to_path_buf())
+            .with_context(|| format!("While processing dependency '{}'", *dep_name))?;
+        // download dependencies of dependencies
+        download_dependency_repos(&dep_manifest, build_options, root_path, progress_output)?;
+    }
+    Ok(())
+}
+
+fn parse_package_manifest(
+    dep: &Dependency,
+    dep_name: &PackageName,
+    mut root_path: PathBuf,
+) -> Result<(SourceManifest, PathBuf)> {
+    root_path.push(local_path(&dep.kind));
+    let manifest_path = root_path.join(SourcePackageLayout::Manifest.path());
+
+    let contents = fs::read_to_string(&manifest_path).with_context(|| {
+        format!(
+            "Unable to find package manifest for '{}' at {:?}",
+            dep_name, manifest_path,
+        )
+    })?;
+
+    let manifest_toml = parse_move_manifest_string(contents)?;
+    let source_package = parse_source_manifest(manifest_toml)?;
+
+    Ok((source_package, root_path))
+}
+
+fn download_and_update_if_remote<Progress: Write>(
+    dep_name: PackageName,
+    dep: &Dependency,
+    skip_fetch_latest_git_deps: bool,
+    progress_output: &mut Progress,
+) -> Result<()> {
+    match &dep.kind {
+        DependencyKind::Local(_) => Ok(()),
+
+        DependencyKind::Custom(node_info) => {
+            package_hooks::resolve_custom_dependency(dep_name, node_info)
+        }
+
+        kind @ DependencyKind::Git(GitInfo {
+            git_url,
+            git_rev,
+            subdir: _,
+        }) => {
+            let git_path = repository_path(kind);
+            let os_git_url = OsStr::new(git_url.as_str());
+            let os_git_rev = OsStr::new(git_rev.as_str());
+
+            if !git_path.exists() {
+                writeln!(
+                    progress_output,
+                    "{} {}",
+                    "FETCHING GIT DEPENDENCY".bold().green(),
+                    git_url,
+                )?;
+
+                // If the cached folder does not exist, download and clone accordingly
+                Command::new("git")
+                    .args([OsStr::new("clone"), os_git_url, git_path.as_os_str()])
+                    .output()
+                    .map_err(|_| {
+                        anyhow::anyhow!("Failed to clone Git repository for package '{}'", dep_name)
+                    })?;
+
+                Command::new("git")
+                    .args([
+                        OsStr::new("-C"),
+                        git_path.as_os_str(),
+                        OsStr::new("checkout"),
+                        os_git_rev,
+                    ])
+                    .output()
+                    .map_err(|_| {
+                        anyhow::anyhow!(
+                            "Failed to checkout Git reference '{}' for package '{}'",
+                            git_rev,
+                            dep_name
+                        )
+                    })?;
+            } else if !skip_fetch_latest_git_deps {
+                // Update the git dependency
+                // Check first that it isn't a git rev (if it doesn't work, just continue with the
+                // fetch)
+                if let Ok(rev) = Command::new("git")
+                    .args([
+                        OsStr::new("-C"),
+                        git_path.as_os_str(),
+                        OsStr::new("rev-parse"),
+                        OsStr::new("--verify"),
+                        os_git_rev,
+                    ])
+                    .output()
+                {
+                    if let Ok(parsable_version) = String::from_utf8(rev.stdout) {
+                        // If it's exactly the same, then it's a git rev
+                        if parsable_version.trim().starts_with(git_rev.as_str()) {
+                            return Ok(());
+                        }
+                    }
+                }
+
+                let tag = Command::new("git")
+                    .args([
+                        OsStr::new("-C"),
+                        git_path.as_os_str(),
+                        OsStr::new("tag"),
+                        OsStr::new("--list"),
+                        os_git_rev,
+                    ])
+                    .output();
+
+                if let Ok(tag) = tag {
+                    if let Ok(parsable_version) = String::from_utf8(tag.stdout) {
+                        // If it's exactly the same, then it's a git tag, for now tags won't be updated
+                        // Tags don't easily update locally and you can't use reset --hard to cleanup
+                        // any extra files
+                        if parsable_version.trim().starts_with(git_rev.as_str()) {
+                            return Ok(());
+                        }
+                    }
+                }
+
+                writeln!(
+                    progress_output,
+                    "{} {}",
+                    "UPDATING GIT DEPENDENCY".bold().green(),
+                    git_url,
+                )?;
+
+                // If the current folder exists, do a fetch and reset to ensure that the branch
+                // is up to date.
+                //
+                // NOTE: this means that you must run the package system with a working network
+                // connection.
+                let status = Command::new("git")
+                    .args([
+                        OsStr::new("-C"),
+                        git_path.as_os_str(),
+                        OsStr::new("fetch"),
+                        OsStr::new("origin"),
+                    ])
+                    .stdout(Stdio::null())
+                    .stderr(Stdio::null())
+                    .status()
+                    .map_err(|_| {
+                        anyhow::anyhow!(
+                            "Failed to fetch latest Git state for package '{}', to skip set \
+                             --skip-fetch-latest-git-deps",
+                            dep_name
+                        )
+                    })?;
+
+                if !status.success() {
+                    return Err(anyhow::anyhow!(
+                        "Failed to fetch to latest Git state for package '{}', to skip set \
+                         --skip-fetch-latest-git-deps | Exit status: {}",
+                        dep_name,
+                        status
+                    ));
+                }
+
+                let status = Command::new("git")
+                    .args([
+                        OsStr::new("-C"),
+                        git_path.as_os_str(),
+                        OsStr::new("reset"),
+                        OsStr::new("--hard"),
+                        OsStr::new(&format!("origin/{}", git_rev)),
+                    ])
+                    .stdout(Stdio::null())
+                    .stderr(Stdio::null())
+                    .status()
+                    .map_err(|_| {
+                        anyhow::anyhow!(
+                            "Failed to reset to latest Git state '{}' for package '{}', to skip \
+                             set --skip-fetch-latest-git-deps",
+                            git_rev,
+                            dep_name
+                        )
+                    })?;
+
+                if !status.success() {
+                    return Err(anyhow::anyhow!(
+                        "Failed to reset to latest Git state '{}' for package '{}', to skip set \
+                         --skip-fetch-latest-git-deps | Exit status: {}",
+                        git_rev,
+                        dep_name,
+                        status
+                    ));
+                }
+            }
+
+            Ok(())
+        }
+    }
+}
+
+/// The local location of the repository containing the dependency of kind `kind` (and potentially
+/// other, related dependencies).
+fn repository_path(kind: &DependencyKind) -> PathBuf {
+    match kind {
+        DependencyKind::Local(path) => path.clone(),
+
+        // Downloaded packages are of the form <sanitized_git_url>_<rev_name>
+        DependencyKind::Git(GitInfo {
+            git_url,
+            git_rev,
+            subdir: _,
+        }) => [
+            &*MOVE_HOME,
+            &format!(
+                "{}_{}",
+                url_to_file_name(git_url.as_str()),
+                git_rev.replace('/', "__"),
+            ),
+        ]
+        .iter()
+        .collect(),
+
+        // Downloaded packages are of the form <sanitized_node_url>_<address>_<package>
+        DependencyKind::Custom(CustomDepInfo {
+            node_url,
+            package_address,
+            package_name,
+            subdir: _,
+        }) => [
+            &*MOVE_HOME,
+            &format!(
+                "{}_{}_{}",
+                url_to_file_name(node_url.as_str()),
+                package_address.as_str(),
+                package_name.as_str(),
+            ),
+        ]
+        .iter()
+        .collect(),
+    }
+}
+
+/// The path that the dependency of kind `kind` is found at locally, after it is fetched.
+fn local_path(kind: &DependencyKind) -> PathBuf {
+    let mut repo_path = repository_path(kind);
+
+    if let DependencyKind::Git(GitInfo { subdir, .. })
+    | DependencyKind::Custom(CustomDepInfo { subdir, .. }) = kind
+    {
+        repo_path.push(subdir);
+    }
+
+    repo_path
+}
+
+fn url_to_file_name(url: &str) -> String {
+    regex::Regex::new(r"/|:|\.|@")
+        .unwrap()
+        .replace_all(url, "_")
+        .to_string()
+}
diff --git a/language/tools/move-package/src/resolution/resolution_graph.rs b/language/tools/move-package/src/resolution/resolution_graph.rs
index d2d87ee116..e97f482c91 100644
--- a/language/tools/move-package/src/resolution/resolution_graph.rs
+++ b/language/tools/move-package/src/resolution/resolution_graph.rs
@@ -6,7 +6,6 @@ use crate::{
     resolution::digest::compute_digest,
     source_package::{
         layout::SourcePackageLayout,
-        manifest_parser::{parse_move_manifest_string, parse_source_manifest},
         parsed_manifest::{
             Dependency, FileName, NamedAddress, PackageDigest, PackageName, SourceManifest,
             SubstOrRename,
@@ -15,7 +14,10 @@ use crate::{
     BuildConfig,
 };
 use anyhow::{bail, Context, Result};
-use move_command_line_common::files::{find_move_filenames, FileHash};
+use move_command_line_common::files::{
+    extension_equals, find_filenames, find_move_filenames, FileHash, MOVE_COMPILED_EXTENSION,
+};
+use move_compiler::command_line::DEFAULT_OUTPUT_DIR;
 use move_core_types::account_address::AccountAddress;
 use move_symbol_pool::Symbol;
 use petgraph::{algo, graphmap::DiGraphMap, Outgoing};
@@ -24,11 +26,13 @@ use std::{
     cell::RefCell,
     collections::{BTreeMap, BTreeSet},
     fs,
+    io::Write,
     path::{Path, PathBuf},
-    process::Command,
     rc::Rc,
 };
 
+use super::{download_and_update_if_remote, parse_package_manifest};
+
 pub type ResolvedTable = ResolutionTable<AccountAddress>;
 pub type ResolvedPackage = ResolutionPackage<AccountAddress>;
 pub type ResolvedGraph = ResolutionGraph<AccountAddress>;
@@ -89,10 +93,11 @@ pub struct ResolutionPackage<T> {
 }
 
 impl ResolvingGraph {
-    pub fn new(
+    pub fn new<Progress: Write>(
         root_package: SourceManifest,
         root_package_path: PathBuf,
         mut build_options: BuildConfig,
+        progress_output: &mut Progress,
     ) -> Result<ResolvingGraph> {
         if build_options.architecture.is_none() {
             if let Some(info) = &root_package.build {
@@ -108,7 +113,12 @@ impl ResolvingGraph {
         };
 
         resolution_graph
-            .build_resolution_graph(root_package.clone(), root_package_path, true)
+            .build_resolution_graph(
+                root_package.clone(),
+                root_package_path,
+                true,
+                progress_output,
+            )
             .with_context(|| {
                 format!(
                     "Unable to resolve packages for package '{}'",
@@ -188,11 +198,12 @@ impl ResolvingGraph {
         })
     }
 
-    fn build_resolution_graph(
+    fn build_resolution_graph<Progress: Write>(
         &mut self,
         package: SourceManifest,
         package_path: PathBuf,
         is_root_package: bool,
+        progress_output: &mut Progress,
     ) -> Result<()> {
         let package_name = package.package.name;
         let package_node_id = match self.package_table.get(&package_name) {
@@ -245,7 +256,7 @@ impl ResolvingGraph {
             self.graph.add_edge(package_node_id, dep_node_id, ());
 
             let (dep_renaming, dep_resolution_table) = self
-                .process_dependency(dep_name, dep, package_path.clone())
+                .process_dependency(dep_name, dep, package_path.clone(), progress_output)
                 .with_context(|| {
                     format!(
                         "While resolving dependency '{}' in package '{}'",
@@ -300,18 +311,13 @@ impl ResolvingGraph {
         is_root_package: bool,
     ) -> Result<()> {
         let package_name = &package.package.name;
-        for (name, addr_opt) in package
-            .addresses
-            .clone()
-            .unwrap_or_else(BTreeMap::new)
-            .into_iter()
-        {
+        for (name, addr_opt) in package.addresses.clone().unwrap_or_default().into_iter() {
             match resolution_table.get(&name) {
                 Some(other) => {
                     other.unify(addr_opt).with_context(|| {
                         format!(
-                            "Unable to resolve named address '{}' in\
-                                package '{}' when resolving dependencies",
+                            "Unable to resolve named address '{}' in \
+                             package '{}' when resolving dependencies",
                             name, package_name
                         )
                     })?;
@@ -337,7 +343,7 @@ impl ResolvingGraph {
             for (name, addr) in package
                 .dev_address_assignments
                 .clone()
-                .unwrap_or_else(BTreeMap::new)
+                .unwrap_or_default()
                 .into_iter()
             {
                 match resolution_table.get(&name) {
@@ -386,17 +392,23 @@ impl ResolvingGraph {
     // Process a dependency. `dep_name_in_pkg` is the name assigned to the dependent package `dep`
     // in the source manifest, and we check that this name matches the name of the dependency it is
     // assigned to.
-    fn process_dependency(
+    fn process_dependency<Progress: Write>(
         &mut self,
         dep_name_in_pkg: PackageName,
         dep: Dependency,
         root_path: PathBuf,
+        progress_output: &mut Progress,
     ) -> Result<(Renaming, ResolvingTable)> {
-        Self::download_and_update_if_repo(dep_name_in_pkg, &dep)?;
+        download_and_update_if_remote(
+            dep_name_in_pkg,
+            &dep,
+            self.build_options.skip_fetch_latest_git_deps,
+            progress_output,
+        )?;
         let (dep_package, dep_package_dir) =
-            Self::parse_package_manifest(&dep, &dep_name_in_pkg, root_path)
+            parse_package_manifest(&dep, &dep_name_in_pkg, root_path)
                 .with_context(|| format!("While processing dependency '{}'", dep_name_in_pkg))?;
-        self.build_resolution_graph(dep_package.clone(), dep_package_dir, false)
+        self.build_resolution_graph(dep_package.clone(), dep_package_dir, false, progress_output)
             .with_context(|| {
                 format!("Unable to resolve package dependency '{}'", dep_name_in_pkg)
             })?;
@@ -494,59 +506,6 @@ impl ResolvingGraph {
             Ok(self.graph.add_node(package_name))
         }
     }
-
-    fn parse_package_manifest(
-        dep: &Dependency,
-        dep_name: &PackageName,
-        mut root_path: PathBuf,
-    ) -> Result<(SourceManifest, PathBuf)> {
-        root_path.push(&dep.local);
-        match fs::read_to_string(&root_path.join(SourcePackageLayout::Manifest.path())) {
-            Ok(contents) => {
-                let source_package: SourceManifest =
-                    parse_move_manifest_string(contents).and_then(parse_source_manifest)?;
-                Ok((source_package, root_path))
-            }
-            Err(_) => Err(anyhow::format_err!(
-                "Unable to find package manifest for '{}' at {:?}",
-                dep_name,
-                SourcePackageLayout::Manifest.path().join(root_path),
-            )),
-        }
-    }
-
-    fn download_and_update_if_repo(dep_name: PackageName, dep: &Dependency) -> Result<()> {
-        if let Some(git_info) = &dep.git_info {
-            if !git_info.download_to.exists() {
-                Command::new("git")
-                    .args([
-                        "clone",
-                        &git_info.git_url,
-                        &git_info.download_to.to_string_lossy(),
-                    ])
-                    .output()
-                    .map_err(|_| {
-                        anyhow::anyhow!("Failed to clone Git repository for package '{}'", dep_name)
-                    })?;
-                Command::new("git")
-                    .args([
-                        "-C",
-                        &git_info.download_to.to_string_lossy(),
-                        "checkout",
-                        &git_info.git_rev,
-                    ])
-                    .output()
-                    .map_err(|_| {
-                        anyhow::anyhow!(
-                            "Failed to checkout Git reference '{}' for package '{}'",
-                            &git_info.git_rev,
-                            dep_name
-                        )
-                    })?;
-            }
-        }
-        Ok(())
-    }
 }
 
 impl ResolvingPackage {
@@ -633,6 +592,15 @@ impl ResolvingPackage {
         Ok(places_to_look)
     }
 
+    fn get_build_paths(package_path: &Path) -> Result<Vec<PathBuf>> {
+        let mut places_to_look = Vec::new();
+        let path = package_path.join(Path::new(DEFAULT_OUTPUT_DIR));
+        if path.exists() {
+            places_to_look.push(path);
+        }
+        Ok(places_to_look)
+    }
+
     fn get_package_digest_for_config(
         package_path: &Path,
         config: &BuildConfig,
@@ -728,6 +696,16 @@ impl ResolvedGraph {
             })
             .collect()
     }
+
+    pub fn contains_renaming(&self) -> Option<PackageName> {
+        // Make sure no renamings have been performed
+        for (pkg_name, pkg) in self.package_table.iter() {
+            if !pkg.renaming.is_empty() {
+                return Some(*pkg_name);
+            }
+        }
+        None
+    }
 }
 
 impl ResolvedPackage {
@@ -743,6 +721,20 @@ impl ResolvedPackage {
             .collect())
     }
 
+    pub fn get_bytecodes(&self) -> Result<Vec<FileName>> {
+        let path = ResolvingPackage::get_build_paths(&self.package_path)?;
+        let places_to_look = path
+            .into_iter()
+            .map(|p| p.to_string_lossy().to_string())
+            .collect::<Vec<_>>();
+        Ok(find_filenames(&places_to_look, |path| {
+            extension_equals(path, MOVE_COMPILED_EXTENSION)
+        })?
+        .into_iter()
+        .map(Symbol::from)
+        .collect())
+    }
+
     /// Returns the transitive dependencies of this package in dependency order
     pub fn transitive_dependencies(&self, resolved_graph: &ResolvedGraph) -> BTreeSet<PackageName> {
         let mut seen = BTreeSet::new();
diff --git a/language/tools/move-package/src/source_package/manifest_parser.rs b/language/tools/move-package/src/source_package/manifest_parser.rs
index 69f17cce68..365c10c083 100644
--- a/language/tools/move-package/src/source_package/manifest_parser.rs
+++ b/language/tools/move-package/src/source_package/manifest_parser.rs
@@ -2,8 +2,8 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{source_package::parsed_manifest as PM, Architecture};
-use anyhow::{bail, format_err, Context, Result};
+use crate::{package_hooks, source_package::parsed_manifest as PM, Architecture};
+use anyhow::{anyhow, bail, format_err, Context, Result};
 use move_core_types::account_address::{AccountAddress, AccountAddressParseError};
 use move_symbol_pool::symbol::Symbol;
 use std::{
@@ -79,13 +79,13 @@ pub fn parse_source_manifest(tval: TV) -> Result<PM::SourceManifest> {
                 .map(parse_dependencies)
                 .transpose()
                 .context("Error parsing '[dependencies]' section of manifest")?
-                .unwrap_or_else(BTreeMap::new);
+                .unwrap_or_default();
             let dev_dependencies = table
                 .remove(DEV_DEPENDENCY_NAME)
                 .map(parse_dependencies)
                 .transpose()
                 .context("Error parsing '[dev-dependencies]' section of manifest")?
-                .unwrap_or_else(BTreeMap::new);
+                .unwrap_or_default();
             Ok(PM::SourceManifest {
                 package,
                 addresses,
@@ -109,7 +109,12 @@ pub fn parse_package_info(tval: TV) -> Result<PM::PackageInfo> {
     match tval {
         TV::Table(mut table) => {
             check_for_required_field_names(&table, &["name", "version"])?;
-            warn_if_unknown_field_names(&table, &["name", "version", "authors", "license"]);
+            let hook_names = package_hooks::custom_package_info_fields();
+            let known_names = ["name", "version", "authors", "license"]
+                .into_iter()
+                .chain(hook_names.iter().map(|s| s.as_str()))
+                .collect::<Vec<_>>();
+            warn_if_unknown_field_names(&table, known_names.as_slice());
             let name = table
                 .remove("name")
                 .ok_or_else(|| format_err!("'name' is a required field but was not found",))?;
@@ -144,12 +149,22 @@ pub fn parse_package_info(tval: TV) -> Result<PM::PackageInfo> {
                         .collect::<Result<_>>()?
                 }
             };
+            // Turn the remaining entries into custom properties. For those which are not
+            // supported (also in the presence of hooks) we have warned above.
+            let mut custom_properties: BTreeMap<Symbol, String> = Default::default();
+            for (name, val) in table {
+                let val_str = val
+                    .as_str()
+                    .ok_or_else(|| format_err!("Field `{}` value must be a string", name))?;
+                custom_properties.insert(Symbol::from(name), val_str.to_owned());
+            }
 
             Ok(PM::PackageInfo {
                 name,
                 version,
                 authors,
                 license,
+                custom_properties,
             })
         }
         x => bail!(
@@ -165,8 +180,8 @@ pub fn parse_dependencies(tval: TV) -> Result<PM::Dependencies> {
         TV::Table(table) => {
             let mut deps = BTreeMap::new();
             for (dep_name, dep) in table.into_iter() {
-                let dep_name_ident = PM::PackageName::from(dep_name);
-                let dep = parse_dependency(dep)?;
+                let dep_name_ident = PM::PackageName::from(dep_name.clone());
+                let dep = parse_dependency(&dep_name, dep)?;
                 deps.insert(dep_name_ident, dep);
             }
             Ok(deps)
@@ -290,105 +305,132 @@ fn parse_address_literal(address_str: &str) -> Result<AccountAddress, AccountAdd
     AccountAddress::from_hex_literal(address_str)
 }
 
-fn parse_dependency(tval: TV) -> Result<PM::Dependency> {
-    match tval {
-        TV::Table(mut table) => {
-            warn_if_unknown_field_names(
-                &table,
-                &[
-                    "addr_subst",
-                    "version",
-                    "local",
-                    "digest",
-                    "git",
-                    "rev",
-                    "subdir",
-                ],
-            );
-            let subst = table
-                .remove("addr_subst")
-                .map(parse_substitution)
-                .transpose()?;
-            let version = table.remove("version").map(parse_version).transpose()?;
-            let digest = table.remove("digest").map(parse_digest).transpose()?;
-            let mut git_info = None;
-            match (table.remove("local"), table.remove("git")) {
-                (Some(local), None) => {
-                    let local_str = local
-                        .as_str()
-                        .ok_or_else(|| format_err!("Local source path not a string"))?;
-                    let local_path = PathBuf::from(local_str);
-                    Ok(PM::Dependency {
-                        subst,
-                        version,
-                        digest,
-                        local: local_path,
-                        git_info,
-                    })
-                }
-                (None, Some(git)) => {
-                    // Look to see if a MOVE_HOME has been set. Otherwise default to $HOME
-                    let move_home = std::env::var("MOVE_HOME").unwrap_or_else(|_| {
-                        format!(
-                            "{}/.move",
-                            dirs_next::home_dir()
-                                .expect("user's home directory not found")
-                                .to_str()
-                                .unwrap()
-                        )
-                    });
-                    let rev_name = match table.remove("rev") {
-                        None => bail!("Git revision not supplied for dependency"),
-                        Some(r) => Symbol::from(
-                            r.as_str()
-                                .ok_or_else(|| format_err!("Git revision not a string"))?,
-                        ),
-                    };
-                    // Downloaded packages are of the form <sanitized_git_url>_<rev_name>
-                    let local_path = PathBuf::from(move_home).join(format!(
-                        "{}_{}",
-                        regex::Regex::new(r"/|:|\.|@").unwrap().replace_all(
-                            git.as_str()
-                                .ok_or_else(|| anyhow::anyhow!("Git URL not a string"))?,
-                            "_"
-                        ),
-                        rev_name.replace('/', "__")
-                    ));
-                    let subdir = PathBuf::from(match table.remove("subdir") {
-                        None => "".to_string(),
-                        Some(path) => path
-                            .as_str()
-                            .ok_or_else(|| format_err!("'subdir' not a string"))?
-                            .to_string(),
-                    });
-                    git_info = Some(PM::GitInfo {
-                        git_url: Symbol::from(
-                            git.as_str()
-                                .ok_or_else(|| format_err!("Git url not a string"))?,
-                        ),
-                        git_rev: rev_name,
-                        subdir: subdir.clone(),
-                        download_to: local_path.clone(),
-                    });
-
-                    Ok(PM::Dependency {
-                        subst,
-                        version,
-                        digest,
-                        local: local_path.join(subdir),
-                        git_info,
-                    })
-                }
-                (Some(_), Some(_)) => {
-                    bail!("both 'local' and 'git' paths specified for dependency.")
-                }
-                (None, None) => {
-                    bail!("both 'local' and 'git' paths not specified for dependency.")
-                }
+pub fn parse_dependency(dep_name: &str, mut tval: TV) -> Result<PM::Dependency> {
+    let Some(table) = tval.as_table_mut() else {
+        bail!("Malformed dependency {}", tval);
+    };
+
+    let mut known_fields = vec![
+        "addr_subst",
+        "version",
+        "local",
+        "digest",
+        "git",
+        "rev",
+        "subdir",
+        "address",
+    ];
+
+    let custom_key_opt = &package_hooks::custom_dependency_key();
+    if let Some(key) = custom_key_opt {
+        known_fields.push(key.as_ref())
+    }
+
+    warn_if_unknown_field_names(table, known_fields.as_slice());
+
+    let subst = table
+        .remove("addr_subst")
+        .map(parse_substitution)
+        .transpose()?;
+    let version = table.remove("version").map(parse_version).transpose()?;
+    let digest = table.remove("digest").map(parse_digest).transpose()?;
+
+    let kind = match (
+        table.remove("local"),
+        table.remove("subdir"),
+        table.remove("git"),
+        custom_key_opt.as_ref().and_then(|k| table.remove(k)),
+    ) {
+        (Some(local), subdir, None, None) => {
+            if subdir.is_some() {
+                bail!("'subdir' not supported for local dependencies");
             }
+
+            let Some(local) = local.as_str().map(PathBuf::from) else {
+                bail!("Local source path not a string")
+            };
+
+            PM::DependencyKind::Local(local)
         }
-        x => bail!("Malformed dependency {}", x),
-    }
+
+        (None, subdir, Some(git_url), None) => {
+            let Some(git_rev) = table.remove("rev") else {
+                bail!("Git revision not supplied for dependency")
+            };
+
+            let Some(git_rev) = git_rev.as_str().map(Symbol::from) else {
+                bail!("Git revision not a string")
+            };
+
+            let Some(git_url) = git_url.as_str().map(Symbol::from) else {
+                bail!("Git URL not a string")
+            };
+
+            let subdir = match subdir {
+                None => PathBuf::new(),
+                Some(path) => path
+                    .as_str()
+                    .map(PathBuf::from)
+                    .ok_or_else(|| anyhow!("'subdir' not a string"))?,
+            };
+
+            PM::DependencyKind::Git(PM::GitInfo {
+                git_url,
+                git_rev,
+                subdir,
+            })
+        }
+
+        (None, subdir, None, Some(custom_key)) => {
+            let Some(package_address) = table.remove("address") else {
+                bail!("Address not supplied for 'node' dependency");
+            };
+
+            let Some(package_address) = package_address.as_str().map(Symbol::from) else {
+                bail!("Node address not a string")
+            };
+
+            let Some(node_url) = custom_key.as_str().map(Symbol::from) else {
+                bail!("Git URL not a string")
+            };
+
+            let subdir = match subdir {
+                None => PathBuf::new(),
+                Some(path) => path
+                    .as_str()
+                    .map(PathBuf::from)
+                    .ok_or_else(|| anyhow!("'subdir' not a string"))?,
+            };
+
+            let package_name = Symbol::from(dep_name);
+
+            PM::DependencyKind::Custom(PM::CustomDepInfo {
+                node_url,
+                package_address,
+                package_name,
+                subdir,
+            })
+        }
+
+        _ => {
+            let mut keys = vec!["'local'", "'git'"];
+            let quoted_custom_key = custom_key_opt.as_ref().map(|k| format!("'{}'", k));
+            if let Some(k) = &quoted_custom_key {
+                keys.push(k.as_str())
+            }
+            bail!(
+                "must provide exactly one of {} for dependency.",
+                keys.join(" or ")
+            )
+        }
+    };
+
+    Ok(PM::Dependency {
+        kind,
+        subst,
+        version,
+        digest,
+    })
 }
 
 fn parse_substitution(tval: TV) -> Result<PM::Substitution> {
diff --git a/language/tools/move-package/src/source_package/parsed_manifest.rs b/language/tools/move-package/src/source_package/parsed_manifest.rs
index f491fa1dc8..65b6cff5ec 100644
--- a/language/tools/move-package/src/source_package/parsed_manifest.rs
+++ b/language/tools/move-package/src/source_package/parsed_manifest.rs
@@ -2,10 +2,15 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use anyhow::{bail, Result};
+
 use crate::Architecture;
 use move_core_types::account_address::AccountAddress;
 use move_symbol_pool::symbol::Symbol;
-use std::{collections::BTreeMap, path::PathBuf};
+use std::{
+    collections::BTreeMap,
+    path::{Component, Path, PathBuf},
+};
 
 pub type NamedAddress = Symbol;
 pub type PackageName = Symbol;
@@ -34,15 +39,22 @@ pub struct PackageInfo {
     pub version: Version,
     pub authors: Vec<Symbol>,
     pub license: Option<Symbol>,
+    pub custom_properties: BTreeMap<Symbol, String>,
 }
 
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct Dependency {
-    pub local: PathBuf,
+    pub kind: DependencyKind,
     pub subst: Option<Substitution>,
     pub version: Option<Version>,
     pub digest: Option<PackageDigest>,
-    pub git_info: Option<GitInfo>,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub enum DependencyKind {
+    Local(PathBuf),
+    Git(GitInfo),
+    Custom(CustomDepInfo),
 }
 
 #[derive(Debug, Clone, Eq, PartialEq)]
@@ -54,8 +66,19 @@ pub struct GitInfo {
     /// The path under this repo where the move package can be found -- e.g.,
     /// 'language/move-stdlib`
     pub subdir: PathBuf,
-    /// Where the git repo is downloaded to.
-    pub download_to: PathBuf,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct CustomDepInfo {
+    /// The url of the node to download from
+    pub node_url: Symbol,
+    /// The address where the package is published. The representation depends
+    /// on the registered node resolver.
+    pub package_address: Symbol,
+    /// The package's name (i.e. the dependency name).
+    pub package_name: Symbol,
+    /// The path under this repo where the move package can be found
+    pub subdir: PathBuf,
 }
 
 #[derive(Default, Debug, Clone, Eq, PartialEq)]
@@ -69,3 +92,102 @@ pub enum SubstOrRename {
     RenameFrom(NamedAddress),
     Assign(AccountAddress),
 }
+
+impl DependencyKind {
+    /// Given a dependency `self` assumed to be defined relative to a `parent` dependency which can
+    /// itself be defined in terms of some grandparent dependency (not provided), update `self` to
+    /// be defined relative to its grandparent.
+    ///
+    /// Fails if the resulting dependency cannot be described relative to the grandparent, because
+    /// its path is not valid (does not point to a valid location in the filesystem for local
+    /// dependencies, or within the repository for remote dependencies).
+    pub fn reroot(&mut self, parent: &DependencyKind) -> Result<()> {
+        let mut parent = parent.clone();
+
+        match (&mut parent, &self) {
+            // If `self` is a git or custom dependency kind, it does not need to be re-rooted
+            // because its URI is already absolute. (i.e. the location of an absolute URI does not
+            // change if referenced relative to some other URI).
+            (_, DependencyKind::Git(_) | DependencyKind::Custom(_)) => return Ok(()),
+
+            (DependencyKind::Local(parent), DependencyKind::Local(subdir)) => {
+                parent.push(subdir);
+                *parent = normalize_path(&parent, /* allow_cwd_parent */ true)?;
+            }
+
+            (DependencyKind::Git(git), DependencyKind::Local(subdir)) => {
+                git.subdir.push(subdir);
+                git.subdir = normalize_path(&git.subdir, /* allow_cwd_parent */ false)?;
+            }
+
+            (DependencyKind::Custom(custom), DependencyKind::Local(subdir)) => {
+                custom.subdir.push(subdir);
+                custom.subdir = normalize_path(&custom.subdir, /* allow_cwd_parent */ false)?;
+            }
+        };
+
+        *self = parent;
+        Ok(())
+    }
+}
+
+/// Default `DependencyKind` is the one that acts as the left and right identity to
+/// `DependencyKind::rerooted` (modulo path normalization).
+impl Default for DependencyKind {
+    fn default() -> Self {
+        DependencyKind::Local(PathBuf::new())
+    }
+}
+
+/// Normalize the representation of `path` by eliminating redundant `.` components and applying `..`
+/// component.  Does not access the filesystem (e.g. to resolve symlinks or test for file
+/// existence), unlike `std::fs::canonicalize`.
+///
+/// Fails if the normalized path attempts to access the parent of a root directory or volume prefix,
+/// or is prefixed by accesses to parent directories when `allow_cwd_parent` is false.
+///
+/// Returns the normalized path on success.
+fn normalize_path(path: impl AsRef<Path>, allow_cwd_parent: bool) -> Result<PathBuf> {
+    use Component::*;
+
+    let mut stack = Vec::new();
+    for component in path.as_ref().components() {
+        match component {
+            // Components that contribute to the path as-is.
+            verbatim @ (Prefix(_) | RootDir | Normal(_)) => stack.push(verbatim),
+
+            // Equivalent of a `.` path component -- can be ignored.
+            CurDir => { /* nop */ }
+
+            // Going up in the directory hierarchy, which may fail if that's not possible.
+            ParentDir => match stack.last() {
+                None | Some(ParentDir) => {
+                    stack.push(ParentDir);
+                }
+
+                Some(Normal(_)) => {
+                    stack.pop();
+                }
+
+                Some(CurDir) => {
+                    unreachable!("Component::CurDir never added to the stack");
+                }
+
+                Some(RootDir | Prefix(_)) => bail!(
+                    "Invalid path accessing parent of root directory: {}",
+                    path.as_ref().to_string_lossy(),
+                ),
+            },
+        }
+    }
+
+    let normalized: PathBuf = stack.iter().collect();
+    if !allow_cwd_parent && stack.first() == Some(&ParentDir) {
+        bail!(
+            "Path cannot access parent of current directory: {}",
+            normalized.to_string_lossy()
+        );
+    }
+
+    Ok(normalized)
+}
diff --git a/language/tools/move-package/tests/package_hash_skips_non_move_files.rs b/language/tools/move-package/tests/package_hash_skips_non_move_files.rs
index 18f4d52c88..fe96bc6bd9 100644
--- a/language/tools/move-package/tests/package_hash_skips_non_move_files.rs
+++ b/language/tools/move-package/tests/package_hash_skips_non_move_files.rs
@@ -8,13 +8,16 @@ use tempfile::tempdir;
 
 #[test]
 fn package_hash_skips_non_move_files() {
-    let path = Path::new("tests/test_sources/resolution/dep_good_digest");
+    let path = Path::new("tests/test_sources/dep_good_digest");
+
+    // resolution graph diagnostics are only needed for CLI commands so ignore them in both cases by
+    // passing a vector as the writer
 
     let pkg1 = BuildConfig {
         install_dir: Some(tempdir().unwrap().path().to_path_buf()),
         ..Default::default()
     }
-    .resolution_graph_for_package(path)
+    .resolution_graph_for_package(path, &mut Vec::new())
     .unwrap();
 
     let dummy_path = path.join("deps_only/other_dep/sources/dummy_text");
@@ -27,7 +30,7 @@ fn package_hash_skips_non_move_files() {
         install_dir: Some(tempdir().unwrap().path().to_path_buf()),
         ..Default::default()
     }
-    .resolution_graph_for_package(path)
+    .resolution_graph_for_package(path, &mut Vec::new())
     .unwrap();
 
     std::fs::remove_file(&dummy_path).unwrap();
diff --git a/language/tools/move-package/tests/test_additional_addresses.rs b/language/tools/move-package/tests/test_additional_addresses.rs
index d1818519e8..fdaf81715c 100644
--- a/language/tools/move-package/tests/test_additional_addresses.rs
+++ b/language/tools/move-package/tests/test_additional_addresses.rs
@@ -11,9 +11,8 @@ use tempfile::tempdir;
 
 #[test]
 fn test_additonal_addresses() {
-    let path = Path::new(
-        "tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment",
-    );
+    let path =
+        Path::new("tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment");
     let pm = MP::parse_move_manifest_from_file(path).unwrap();
 
     let mut additional_named_addresses = BTreeMap::new();
@@ -30,6 +29,7 @@ fn test_additonal_addresses() {
             additional_named_addresses,
             ..Default::default()
         },
+        &mut Vec::new() /* empty writer as no diags needed */
     )
     .unwrap()
     .resolve()
@@ -42,6 +42,7 @@ fn test_additonal_addresses() {
             install_dir: Some(tempdir().unwrap().path().to_path_buf()),
             ..Default::default()
         },
+        &mut Vec::new() /* empty writer as no diags needed */
     )
     .unwrap()
     .resolve()
@@ -50,7 +51,7 @@ fn test_additonal_addresses() {
 
 #[test]
 fn test_additonal_addresses_already_assigned_same_value() {
-    let path = Path::new("tests/test_sources/resolution/basic_no_deps_address_assigned");
+    let path = Path::new("tests/test_sources/basic_no_deps_address_assigned");
     let pm = MP::parse_move_manifest_from_file(path).unwrap();
 
     let mut additional_named_addresses = BTreeMap::new();
@@ -67,6 +68,7 @@ fn test_additonal_addresses_already_assigned_same_value() {
             additional_named_addresses,
             ..Default::default()
         },
+        &mut Vec::new() /* empty writer as no diags needed */
     )
     .unwrap()
     .resolve()
@@ -75,7 +77,7 @@ fn test_additonal_addresses_already_assigned_same_value() {
 
 #[test]
 fn test_additonal_addresses_already_assigned_different_value() {
-    let path = Path::new("tests/test_sources/resolution/basic_no_deps_address_assigned");
+    let path = Path::new("tests/test_sources/basic_no_deps_address_assigned");
     let pm = MP::parse_move_manifest_from_file(path).unwrap();
 
     let mut additional_named_addresses = BTreeMap::new();
@@ -92,6 +94,7 @@ fn test_additonal_addresses_already_assigned_different_value() {
             additional_named_addresses,
             ..Default::default()
         },
+        &mut Vec::new() /* empty writer as no diags needed */
     )
     .is_err());
 }
diff --git a/language/tools/move-package/tests/test_dependency_graph.rs b/language/tools/move-package/tests/test_dependency_graph.rs
new file mode 100644
index 0000000000..ab2757fc42
--- /dev/null
+++ b/language/tools/move-package/tests/test_dependency_graph.rs
@@ -0,0 +1,132 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{
+    collections::BTreeSet,
+    fs::{self, File},
+    path::PathBuf,
+};
+
+use move_package::{
+    resolution::{dependency_graph::DependencyGraph, lock_file::LockFile},
+    source_package::manifest_parser::parse_move_manifest_from_file,
+};
+use move_symbol_pool::Symbol;
+
+#[test]
+fn lock_file_roundtrip() {
+    let tmp = tempfile::tempdir().unwrap();
+    let pkg = one_dep_test_package();
+
+    let snapshot = pkg.join("Move.locked");
+    let commit = tmp.path().join("Move.lock");
+    let mut lock = LockFile::new(&pkg).expect("Creating new lock file");
+    let manifest = parse_move_manifest_from_file(&pkg).expect("Loading manifest");
+
+    let graph = DependencyGraph::read_from_lock(
+        pkg,
+        manifest,
+        &mut File::open(&snapshot).expect("Opening snapshot"),
+    )
+    .expect("Reading DependencyGraph");
+
+    graph
+        .write_to_lock(&mut lock)
+        .expect("Writing DependencyGraph");
+
+    lock.commit(&commit).expect("Committing lock file");
+
+    let expect = fs::read_to_string(&snapshot).expect("Reading snapshot");
+    let actual = fs::read_to_string(commit).expect("Reading committed lock");
+
+    assert_eq!(
+        expect, actual,
+        "LockFile -> DependencyGraph -> LockFile roundtrip"
+    );
+}
+
+#[test]
+fn lock_file_missing_dependency() {
+    let tmp = tempfile::tempdir().unwrap();
+    let pkg = one_dep_test_package();
+
+    let commit = tmp.path().join("Move.lock");
+    let lock = LockFile::new(&pkg).expect("Creating new lock file");
+    let manifest = parse_move_manifest_from_file(&pkg).expect("Loading manifest");
+
+    lock.commit(&commit).expect("Writing empty lock file");
+
+    let Err(err) = DependencyGraph::read_from_lock(
+        pkg,
+        manifest,
+        &mut File::open(&commit).expect("Opening empty lock file"),
+    ) else {
+        panic!("Expected reading dependencies to fail.");
+    };
+
+    let message = err.to_string();
+    assert!(
+        message.contains("No source found for package OtherDep, depended on by: Root"),
+        "{message}",
+    );
+}
+
+#[test]
+fn always_deps() {
+    let pkg = dev_dep_test_package();
+
+    let manifest = parse_move_manifest_from_file(&pkg).expect("Loading manifest");
+    let graph = DependencyGraph::new(
+        &manifest,
+        pkg,
+        /* skip_fetch_latest_git_deps */ true,
+        &mut std::io::sink(),
+    )
+    .expect("Creating DependencyGraph");
+
+    assert_eq!(
+        graph.always_deps,
+        BTreeSet::from([
+            Symbol::from("Root"),
+            Symbol::from("A"),
+            Symbol::from("B"),
+            Symbol::from("C"),
+        ]),
+    );
+}
+
+#[test]
+fn always_deps_from_lock() {
+    let pkg = dev_dep_test_package();
+    let snapshot = pkg.join("Move.locked");
+
+    let manifest = parse_move_manifest_from_file(&pkg).expect("Loading manifest");
+    let graph = DependencyGraph::read_from_lock(
+        pkg,
+        manifest,
+        &mut File::open(&snapshot).expect("Opening snapshot"),
+    )
+    .expect("Creating DependencyGraph");
+
+    assert_eq!(
+        graph.always_deps,
+        BTreeSet::from([
+            Symbol::from("Root"),
+            Symbol::from("A"),
+            Symbol::from("B"),
+            Symbol::from("C"),
+        ]),
+    );
+}
+
+fn one_dep_test_package() -> PathBuf {
+    [".", "tests", "test_sources", "one_dep"]
+        .into_iter()
+        .collect()
+}
+
+fn dev_dep_test_package() -> PathBuf {
+    [".", "tests", "test_sources", "dep_dev_dep_diamond"]
+        .into_iter()
+        .collect()
+}
diff --git a/language/tools/move-package/tests/test_lock_file.rs b/language/tools/move-package/tests/test_lock_file.rs
new file mode 100644
index 0000000000..ed4e208489
--- /dev/null
+++ b/language/tools/move-package/tests/test_lock_file.rs
@@ -0,0 +1,65 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{
+    fs::{self, File},
+    io::{self, Read, Write},
+    path::PathBuf,
+};
+use tempfile::TempDir;
+
+use move_package::resolution::lock_file::LockFile;
+
+#[test]
+fn commit() {
+    let pkg = create_test_package().unwrap();
+    let lock_path = pkg.path().join("Move.lock");
+
+    {
+        let mut lock = LockFile::new(pkg.path()).unwrap();
+        writeln!(lock, "# Write and commit").unwrap();
+        lock.commit(&lock_path).unwrap();
+    }
+
+    assert!(lock_path.is_file());
+
+    let lock_contents = {
+        let mut lock_file = File::open(lock_path).unwrap();
+        let mut buf = String::new();
+        lock_file.read_to_string(&mut buf).unwrap();
+        buf
+    };
+
+    // Check that the content written into the `LockFile` instance above can be found at the path
+    // that that lock file was committed to (indicating that the commit actually happened).
+    assert!(
+        lock_contents.ends_with("# Write and commit\n"),
+        "Lock file doesn't have expected content:\n{}",
+        lock_contents,
+    );
+}
+
+#[test]
+fn discard() {
+    let pkg = create_test_package().unwrap();
+
+    {
+        let mut lock = LockFile::new(pkg.path()).unwrap();
+        writeln!(lock, "# Write but don't commit").unwrap();
+    }
+
+    assert!(!pkg.path().join("Move.lock").is_file());
+}
+
+/// Create a simple Move package with no sources (just a manifest and an output directory) in a
+/// temporary directory, and return it.
+fn create_test_package() -> io::Result<TempDir> {
+    let dir = tempfile::tempdir()?;
+
+    let toml_path: PathBuf = [".", "tests", "test_sources", "basic_no_deps", "Move.toml"]
+        .into_iter()
+        .collect();
+
+    fs::copy(toml_path, dir.path().join("Move.toml"))?;
+    Ok(dir)
+}
diff --git a/language/tools/move-package/tests/test_removal_second_compilation.rs b/language/tools/move-package/tests/test_removal_second_compilation.rs
index 1868f56a97..5e64561510 100644
--- a/language/tools/move-package/tests/test_removal_second_compilation.rs
+++ b/language/tools/move-package/tests/test_removal_second_compilation.rs
@@ -8,7 +8,7 @@ use tempfile::tempdir;
 
 #[test]
 fn test_that_second_build_artifacts_removed() {
-    let path = Path::new("tests/test_sources/compilation/basic_no_deps_test_mode");
+    let path = Path::new("tests/test_sources/basic_no_deps_test_mode");
     let dir = tempdir().unwrap().path().to_path_buf();
 
     BuildConfig {
diff --git a/language/tools/move-package/tests/test_runner.rs b/language/tools/move-package/tests/test_runner.rs
index 18ee00e373..5c2f7fe782 100644
--- a/language/tools/move-package/tests/test_runner.rs
+++ b/language/tools/move-package/tests/test_runner.rs
@@ -2,126 +2,212 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+use anyhow::{anyhow, bail};
 use move_command_line_common::testing::{
-    add_update_baseline_fix, format_diff, read_env_update_baseline, EXP_EXT,
+    add_update_baseline_fix, format_diff, read_env_update_baseline,
 };
 use move_package::{
-    compilation::{build_plan::BuildPlan, model_builder::ModelBuilder},
-    resolution::resolution_graph as RG,
-    source_package::{manifest_parser as MP, parsed_manifest::PackageDigest},
+    compilation::{
+        build_plan::BuildPlan, compiled_package::CompiledPackageInfo, model_builder::ModelBuilder,
+    },
+    package_hooks,
+    package_hooks::PackageHooks,
+    resolution::resolution_graph::ResolvedPackage,
+    source_package::parsed_manifest::{CustomDepInfo, PackageDigest},
     BuildConfig, ModelConfig,
 };
+use move_symbol_pool::Symbol;
 use std::{
     ffi::OsStr,
     fs,
-    path::{Component, Path, PathBuf},
+    path::{Path, PathBuf},
 };
-use tempfile::tempdir;
+use tempfile::{tempdir, TempDir};
 
-const COMPILE_EXT: &str = "compile";
-const MODEL_EXT: &str = "model";
+const EXTENSIONS: &[&str] = &["resolved", "locked", "notlocked", "compiled", "modeled"];
 
 pub fn run_test(path: &Path) -> datatest_stable::Result<()> {
-    let update_baseline = read_env_update_baseline();
-    if path
-        .components()
-        .any(|component| component == Component::Normal(OsStr::new("deps_only")))
-    {
+    if path.iter().any(|part| part == "deps_only") {
         return Ok(());
     }
-    let exp_path = path.with_extension(EXP_EXT);
-    let should_compile = path.with_extension(COMPILE_EXT).is_file();
-    let should_model = path.with_extension(MODEL_EXT).is_file();
-
-    let exp_exists = exp_path.is_file();
-
-    let contents = fs::read_to_string(path)?;
-    let output = match MP::parse_move_manifest_string(contents)
-        .and_then(MP::parse_source_manifest)
-        .and_then(|parsed_manifest| {
-            RG::ResolutionGraph::new(
-                parsed_manifest,
-                path.parent().unwrap().to_path_buf(),
-                BuildConfig {
-                    dev_mode: true,
-                    test_mode: false,
-                    generate_docs: false,
-                    generate_abis: false,
-                    install_dir: Some(tempdir().unwrap().path().to_path_buf()),
-                    force_recompilation: false,
-                    ..Default::default()
-                },
-            )
-        })
-        .and_then(|rg| rg.resolve())
-    {
-        Ok(mut resolved_package) => match (should_compile, should_model) {
-            (true, true) => {
-                return Err(anyhow::format_err!(
-                    "Cannot have compile and model flags set for same package"
+
+    let mut tests = EXTENSIONS
+        .iter()
+        .filter_map(|kind| Test::from_path_with_kind(path, kind).transpose())
+        .peekable();
+
+    if tests.peek().is_none() {
+        return Err(anyhow!(
+            "No snapshot file found for {:?}, please add a file with the same basename and one \
+             of the following extensions: {:#?}\n\n\
+             You probably want to re-run with `env UPDATE_BASELINE=1` after adding this file.",
+            path,
+            EXTENSIONS,
+        )
+        .into());
+    }
+
+    for test in tests {
+        test?.run()?
+    }
+
+    Ok(())
+}
+
+struct Test<'a> {
+    toml_path: &'a Path,
+    expected: PathBuf,
+    output_dir: TempDir,
+}
+
+impl Test<'_> {
+    fn from_path_with_kind<'p>(
+        toml_path: &'p Path,
+        kind: &str,
+    ) -> datatest_stable::Result<Option<Test<'p>>> {
+        let expected = toml_path.with_extension(kind);
+        if !expected.is_file() {
+            Ok(None)
+        } else {
+            Ok(Some(Test {
+                toml_path,
+                expected,
+                output_dir: tempdir()?,
+            }))
+        }
+    }
+
+    fn run(&self) -> datatest_stable::Result<()> {
+        package_hooks::register_package_hooks(Box::new(TestHooks()));
+        let update_baseline = read_env_update_baseline();
+
+        let output = self.output().unwrap_or_else(|err| format!("{:#}\n", err));
+
+        if update_baseline {
+            fs::write(&self.expected, &output)?;
+            return Ok(());
+        }
+
+        let expected = fs::read_to_string(&self.expected)?;
+        if expected != output {
+            return Err(anyhow!(add_update_baseline_fix(format!(
+                "Expected outputs differ for {:?}:\n{}",
+                self.expected,
+                format_diff(expected, output),
+            )))
+            .into());
+        }
+
+        Ok(())
+    }
+
+    fn output(&self) -> anyhow::Result<String> {
+        let Some(ext) = self.expected.extension().and_then(OsStr::to_str) else {
+            bail!("Unexpected snapshot file extension: {:?}", self.expected.extension());
+        };
+
+        let out_path = self.output_dir.path().to_path_buf();
+        let lock_path = out_path.join("Move.lock");
+
+        let config = BuildConfig {
+            dev_mode: true,
+            test_mode: false,
+            generate_docs: false,
+            generate_abis: false,
+            install_dir: Some(out_path),
+            force_recompilation: false,
+            lock_file: ["locked", "notlocked"]
+                .contains(&ext)
+                .then(|| lock_path.clone()),
+            ..Default::default()
+        };
+
+        let mut sink = std::io::sink();
+        let resolved_package = config.resolution_graph_for_package(self.toml_path, &mut sink);
+
+        Ok(match ext {
+            "locked" => fs::read_to_string(&lock_path)?,
+
+            "notlocked" if lock_path.is_file() => {
+                bail!("Unexpected lock file");
+            }
+
+            "notlocked" => "Lock file uncommitted\n".to_string(),
+
+            "compiled" => {
+                let mut pkg = BuildPlan::create(resolved_package?)?.compile(None, &mut sink)?;
+                scrub_compiled_package(&mut pkg.compiled_package_info);
+                format!("{:#?}\n", pkg.compiled_package_info)
+            }
+
+            "modeled" => {
+                ModelBuilder::create(
+                    resolved_package?,
+                    ModelConfig {
+                        all_files_as_targets: false,
+                        target_filter: None,
+                    },
                 )
-                .into())
+                .build_model()?;
+                "Built model\n".to_string()
             }
-            (true, _) => match BuildPlan::create(resolved_package)
-                .and_then(|bp| bp.compile(&mut Vec::new()))
-            {
-                Ok(mut pkg) => {
-                    pkg.compiled_package_info.source_digest =
-                        Some(PackageDigest::from("ELIDED_FOR_TEST"));
-                    pkg.compiled_package_info.build_flags.install_dir =
-                        Some(PathBuf::from("ELIDED_FOR_TEST"));
-                    format!("{:#?}\n", pkg.compiled_package_info)
-                }
-                Err(error) => format!("{:#}\n", error),
-            },
-            (_, true) => match ModelBuilder::create(
-                resolved_package,
-                ModelConfig {
-                    all_files_as_targets: false,
-                    target_filter: None,
-                },
-            )
-            .build_model()
-            {
-                Ok(_) => "Built model".to_string(),
-                Err(error) => format!("{:#}\n", error),
-            },
-            (_, _) => {
-                for (_, package) in resolved_package.package_table.iter_mut() {
-                    package.package_path = PathBuf::from("ELIDED_FOR_TEST");
-                    package.source_digest = PackageDigest::from("ELIDED_FOR_TEST");
+
+            "resolved" => {
+                let mut resolved_package = resolved_package?;
+                for package in resolved_package.package_table.values_mut() {
+                    scrub_resolved_package(package)
                 }
-                resolved_package.build_options.install_dir = Some(PathBuf::from("ELIDED_FOR_TEST"));
+
+                scrub_build_config(&mut resolved_package.build_options);
                 format!("{:#?}\n", resolved_package)
             }
-        },
-        Err(error) => format!("{:#}\n", error),
-    };
 
-    if update_baseline {
-        fs::write(&exp_path, &output)?;
-        return Ok(());
+            ext => bail!("Unrecognised snapshot type: '{ext}'"),
+        })
     }
+}
 
-    if exp_exists {
-        let expected = fs::read_to_string(&exp_path)?;
-        if expected != output {
-            let msg = format!(
-                "Expected outputs differ for {:?}:\n{}",
-                exp_path,
-                format_diff(expected, output)
-            );
-            return Err(anyhow::format_err!(add_update_baseline_fix(msg)).into());
-        }
-    } else {
-        return Err(anyhow::format_err!(
-            "No expected output found for {:?}.\
-                    You probably want to rerun with `env UPDATE_BASELINE=1`",
-            path
+fn scrub_build_config(config: &mut BuildConfig) {
+    config.install_dir = Some(PathBuf::from("ELIDED_FOR_TEST"));
+    config.lock_file = Some(PathBuf::from("ELIDED_FOR_TEST"));
+}
+
+fn scrub_compiled_package(pkg: &mut CompiledPackageInfo) {
+    pkg.source_digest = Some(PackageDigest::from("ELIDED_FOR_TEST"));
+    scrub_build_config(&mut pkg.build_flags);
+}
+
+fn scrub_resolved_package(pkg: &mut ResolvedPackage) {
+    pkg.package_path = PathBuf::from("ELIDED_FOR_TEST");
+    pkg.source_digest = PackageDigest::from("ELIDED_FOR_TEST");
+}
+
+/// Some dummy hooks for testing the hook mechanism
+struct TestHooks();
+
+impl PackageHooks for TestHooks {
+    fn custom_package_info_fields(&self) -> Vec<String> {
+        vec!["test_hooks_field".to_owned()]
+    }
+
+    fn custom_dependency_key(&self) -> Option<String> {
+        Some("custom".to_owned())
+    }
+
+    fn resolve_custom_dependency(
+        &self,
+        dep_name: Symbol,
+        info: &CustomDepInfo,
+    ) -> anyhow::Result<()> {
+        bail!(
+            "TestHooks resolve dep {:?} = {:?} {:?} {:?} {:?}",
+            dep_name,
+            info.node_url,
+            info.package_name,
+            info.package_address,
+            info.subdir.to_string_lossy(),
         )
-        .into());
     }
-    Ok(())
 }
 
 datatest_stable::harness!(run_test, "tests/test_sources", r".*\.toml$");
diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.exp b/language/tools/move-package/tests/test_sources/basic_no_deps/Move.compiled
similarity index 72%
rename from language/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.exp
rename to language/tools/move-package/tests/test_sources/basic_no_deps/Move.compiled
index df40b9cabf..d564004321 100644
--- a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.exp
+++ b/language/tools/move-package/tests/test_sources/basic_no_deps/Move.compiled
@@ -13,8 +13,13 @@ CompiledPackageInfo {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
 }
diff --git a/language/tools/move-package/tests/test_sources/basic_no_deps/Move.locked b/language/tools/move-package/tests/test_sources/basic_no_deps/Move.locked
new file mode 100644
index 0000000000..1a1e0d80c5
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/basic_no_deps/Move.locked
@@ -0,0 +1,4 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
diff --git a/language/tools/move-package/tests/test_sources/basic_no_deps/Move.modeled b/language/tools/move-package/tests/test_sources/basic_no_deps/Move.modeled
new file mode 100644
index 0000000000..e3452a497f
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/basic_no_deps/Move.modeled
@@ -0,0 +1 @@
+Built model
diff --git a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.exp b/language/tools/move-package/tests/test_sources/basic_no_deps/Move.resolved
similarity index 83%
rename from language/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.exp
rename to language/tools/move-package/tests/test_sources/basic_no_deps/Move.resolved
index eb6c6bcaac..6c75b451c3 100644
--- a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.exp
+++ b/language/tools/move-package/tests/test_sources/basic_no_deps/Move.resolved
@@ -1,5 +1,5 @@
 ResolutionGraph {
-    root_package_path: "tests/test_sources/resolution/basic_no_deps",
+    root_package_path: "tests/test_sources/basic_no_deps",
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
@@ -9,9 +9,14 @@ ResolutionGraph {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
     root_package: SourceManifest {
         package: PackageInfo {
@@ -23,6 +28,7 @@ ResolutionGraph {
             ),
             authors: [],
             license: None,
+            custom_properties: {},
         },
         addresses: None,
         dev_address_assignments: None,
@@ -46,6 +52,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: None,
                 dev_address_assignments: None,
diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.toml b/language/tools/move-package/tests/test_sources/basic_no_deps/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.toml
rename to language/tools/move-package/tests/test_sources/basic_no_deps/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps/sources/A.move b/language/tools/move-package/tests/test_sources/basic_no_deps/sources/A.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/basic_no_deps/sources/A.move
rename to language/tools/move-package/tests/test_sources/basic_no_deps/sources/A.move
diff --git a/language/tools/move-package/tests/test_sources/model/basic_no_deps/sources/a_script.move b/language/tools/move-package/tests/test_sources/basic_no_deps/sources/a_script.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/model/basic_no_deps/sources/a_script.move
rename to language/tools/move-package/tests/test_sources/basic_no_deps/sources/a_script.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.exp b/language/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.compiled
similarity index 74%
rename from language/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.exp
rename to language/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.compiled
index 05b1b11d35..050a9e85a1 100644
--- a/language/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.exp
+++ b/language/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.compiled
@@ -15,8 +15,13 @@ CompiledPackageInfo {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
 }
diff --git a/language/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.locked b/language/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.locked
new file mode 100644
index 0000000000..1a1e0d80c5
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.locked
@@ -0,0 +1,4 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
diff --git a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.exp b/language/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.resolved
similarity index 85%
rename from language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.exp
rename to language/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.resolved
index 139d8095d8..b2e514d16b 100644
--- a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.exp
+++ b/language/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.resolved
@@ -1,5 +1,5 @@
 ResolutionGraph {
-    root_package_path: "tests/test_sources/resolution/basic_no_deps_address_assigned",
+    root_package_path: "tests/test_sources/basic_no_deps_address_assigned",
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
@@ -9,9 +9,14 @@ ResolutionGraph {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
     root_package: SourceManifest {
         package: PackageInfo {
@@ -23,6 +28,7 @@ ResolutionGraph {
             ),
             authors: [],
             license: None,
+            custom_properties: {},
         },
         addresses: Some(
             {
@@ -52,6 +58,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: Some(
                     {
diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.toml b/language/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.toml
rename to language/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/sources/M.move b/language/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/sources/M.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/sources/M.move
rename to language/tools/move-package/tests/test_sources/basic_no_deps_address_assigned/sources/M.move
diff --git a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned/Move.exp b/language/tools/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move.resolved
similarity index 69%
rename from language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned/Move.exp
rename to language/tools/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move.resolved
index 3b4833fd93..800db8c337 100644
--- a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned/Move.exp
+++ b/language/tools/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move.resolved
@@ -1,7 +1,7 @@
 Unresolved addresses found: [
 Named address 'A' in package 'test'
 ]
-To fix this, add an entry for each unresolved address to the [addresses] section of tests/test_sources/resolution/basic_no_deps_address_not_assigned/Move.toml: e.g.,
+To fix this, add an entry for each unresolved address to the [addresses] section of tests/test_sources/basic_no_deps_address_not_assigned/Move.toml: e.g.,
 [addresses]
 Std = "0x1"
 Alternatively, you can also define [dev-addresses] and call with the -d flag
diff --git a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned/Move.toml b/language/tools/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned/Move.toml
rename to language/tools/move-package/tests/test_sources/basic_no_deps_address_not_assigned/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp b/language/tools/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.compiled
similarity index 74%
rename from language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
rename to language/tools/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.compiled
index 83bfb60965..d3929eca2b 100644
--- a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
+++ b/language/tools/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.compiled
@@ -15,8 +15,13 @@ CompiledPackageInfo {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
 }
diff --git a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp b/language/tools/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.resolved
similarity index 85%
rename from language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
rename to language/tools/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.resolved
index 265588a028..8560dc1deb 100644
--- a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp
+++ b/language/tools/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.resolved
@@ -1,5 +1,5 @@
 ResolutionGraph {
-    root_package_path: "tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment",
+    root_package_path: "tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment",
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
@@ -9,9 +9,14 @@ ResolutionGraph {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
     root_package: SourceManifest {
         package: PackageInfo {
@@ -23,6 +28,7 @@ ResolutionGraph {
             ),
             authors: [],
             license: None,
+            custom_properties: {},
         },
         addresses: Some(
             {
@@ -54,6 +60,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: Some(
                     {
diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.toml b/language/tools/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.toml
rename to language/tools/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/sources/M.move b/language/tools/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/sources/M.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/sources/M.move
rename to language/tools/move-package/tests/test_sources/basic_no_deps_address_not_assigned_with_dev_assignment/sources/M.move
diff --git a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_invalid_dev_address_assignment/Move.exp b/language/tools/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/basic_no_deps_invalid_dev_address_assignment/Move.exp
rename to language/tools/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_invalid_dev_address_assignment/Move.toml b/language/tools/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/basic_no_deps_invalid_dev_address_assignment/Move.toml
rename to language/tools/move-package/tests/test_sources/basic_no_deps_invalid_dev_address_assignment/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.exp b/language/tools/move-package/tests/test_sources/basic_no_deps_test_mode/Move.compiled
similarity index 74%
rename from language/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.exp
rename to language/tools/move-package/tests/test_sources/basic_no_deps_test_mode/Move.compiled
index a771f58af3..bf2820bd55 100644
--- a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.exp
+++ b/language/tools/move-package/tests/test_sources/basic_no_deps_test_mode/Move.compiled
@@ -15,8 +15,13 @@ CompiledPackageInfo {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
 }
diff --git a/language/tools/move-package/tests/test_sources/basic_no_deps_test_mode/Move.toml b/language/tools/move-package/tests/test_sources/basic_no_deps_test_mode/Move.toml
new file mode 100644
index 0000000000..fed1c178a1
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/basic_no_deps_test_mode/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[dev-dependencies]
+MoveStdlib = { local = "../../../../../move-stdlib", addr_subst = { "std" = "0x1" } }
diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/sources/A.move b/language/tools/move-package/tests/test_sources/basic_no_deps_test_mode/sources/A.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/sources/A.move
rename to language/tools/move-package/tests/test_sources/basic_no_deps_test_mode/sources/A.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/sources/ATest.move b/language/tools/move-package/tests/test_sources/basic_no_deps_test_mode/sources/ATest.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/sources/ATest.move
rename to language/tools/move-package/tests/test_sources/basic_no_deps_test_mode/sources/ATest.move
diff --git a/language/tools/move-package/tests/test_sources/case_insensitive_check/Move.compiled b/language/tools/move-package/tests/test_sources/case_insensitive_check/Move.compiled
new file mode 100644
index 0000000000..83ad867678
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/case_insensitive_check/Move.compiled
@@ -0,0 +1,10 @@
+Module and/or script names found that would cause failures on case insensitive file systems when compiling package 'case_insensitive_check':
+The following modules and/or scripts would collide as 'a' on the file system:
+	Module 'A' at path 'tests/test_sources/case_insensitive_check/sources/a.move'
+	Script 'a' at path 'tests/test_sources/case_insensitive_check/sources/a_script.move'
+The following modules and/or scripts would collide as 'set' on the file system:
+	Module 'Set' at path 'tests/test_sources/case_insensitive_check/sources/Set.move'
+	Module 'set' at path 'tests/test_sources/case_insensitive_check/sources/foo.move'
+	Module 'seT' at path 'tests/test_sources/case_insensitive_check/sources/otherModule.move'
+	Script 'sEt' at path 'tests/test_sources/case_insensitive_check/sources/script.move'
+Please rename these scripts and/or modules to resolve these conflicts.
diff --git a/language/tools/move-package/tests/test_sources/compilation/case_insensitive_check/Move.toml b/language/tools/move-package/tests/test_sources/case_insensitive_check/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/case_insensitive_check/Move.toml
rename to language/tools/move-package/tests/test_sources/case_insensitive_check/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/Set.move b/language/tools/move-package/tests/test_sources/case_insensitive_check/sources/Set.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/Set.move
rename to language/tools/move-package/tests/test_sources/case_insensitive_check/sources/Set.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/a.move b/language/tools/move-package/tests/test_sources/case_insensitive_check/sources/a.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/a.move
rename to language/tools/move-package/tests/test_sources/case_insensitive_check/sources/a.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/a_script.move b/language/tools/move-package/tests/test_sources/case_insensitive_check/sources/a_script.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/a_script.move
rename to language/tools/move-package/tests/test_sources/case_insensitive_check/sources/a_script.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/foo.move b/language/tools/move-package/tests/test_sources/case_insensitive_check/sources/foo.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/foo.move
rename to language/tools/move-package/tests/test_sources/case_insensitive_check/sources/foo.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/otherModule.move b/language/tools/move-package/tests/test_sources/case_insensitive_check/sources/otherModule.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/otherModule.move
rename to language/tools/move-package/tests/test_sources/case_insensitive_check/sources/otherModule.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/script.move b/language/tools/move-package/tests/test_sources/case_insensitive_check/sources/script.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/case_insensitive_check/sources/script.move
rename to language/tools/move-package/tests/test_sources/case_insensitive_check/sources/script.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.toml b/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.toml
deleted file mode 100644
index eed632d198..0000000000
--- a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[package]
-name = "test"
-version = "0.0.0"
-
-[dev-dependencies]
-MoveStdlib = { local = "../../../../../../move-stdlib", addr_subst = { "std" = "0x1" } }
diff --git a/language/tools/move-package/tests/test_sources/compilation/case_insensitive_check/Move.exp b/language/tools/move-package/tests/test_sources/compilation/case_insensitive_check/Move.exp
deleted file mode 100644
index 029b5e26a7..0000000000
--- a/language/tools/move-package/tests/test_sources/compilation/case_insensitive_check/Move.exp
+++ /dev/null
@@ -1,10 +0,0 @@
-Module and/or script names found that would cause failures on case insensitive file systems when compiling package 'case_insensitive_check':
-The following modules and/or scripts would collide as 'a' on the file system:
-	Module 'A' at path 'tests/test_sources/compilation/case_insensitive_check/sources/a.move'
-	Script 'a' at path 'tests/test_sources/compilation/case_insensitive_check/sources/a_script.move'
-The following modules and/or scripts would collide as 'set' on the file system:
-	Module 'Set' at path 'tests/test_sources/compilation/case_insensitive_check/sources/Set.move'
-	Module 'set' at path 'tests/test_sources/compilation/case_insensitive_check/sources/foo.move'
-	Module 'seT' at path 'tests/test_sources/compilation/case_insensitive_check/sources/otherModule.move'
-	Script 'sEt' at path 'tests/test_sources/compilation/case_insensitive_check/sources/script.move'
-Please rename these scripts and/or modules to resolve these conflicts.
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.toml b/language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.toml
deleted file mode 100644
index 57c10cbb2f..0000000000
--- a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Tests that resolved addresses can backflow in the resolution graph and that we compile this correctly
-#                    +---- 0x1  -----+
-#                    |               |
-#                    v               |
-#                 +----+            0x1
-#           +---->| A  |----+        |
-#           |     +----+    |        |
-#           ?               ?        |
-# +----+    |               |     +----+
-# |Root|----+               +---->| C  |
-# +----+    |               |     +----+
-#          0x1             0x1
-#           |     +----+    |
-#           +---->| B  +----+
-#                 +----+
-
-[package]
-name = "Root"
-version = "0.0.0"
-
-[dependencies]
-# This should be resolved to 0x1 by backflow from the BA instantiation
-A = { local = "./deps_only/A" }
-B = { local = "./deps_only/B", addr_subst = { "BA" = "0x1" } }
diff --git a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.exp b/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.exp
deleted file mode 100644
index dcec293872..0000000000
--- a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.exp
+++ /dev/null
@@ -1,24 +0,0 @@
-CompiledPackageInfo {
-    package_name: "test",
-    address_alias_instantiation: {
-        "A": 00000000000000000000000000000003,
-        "CA": 00000000000000000000000000000001,
-        "DA": 00000000000000000000000000000002,
-    },
-    source_digest: Some(
-        "ELIDED_FOR_TEST",
-    ),
-    build_flags: BuildConfig {
-        dev_mode: true,
-        test_mode: false,
-        generate_docs: false,
-        generate_abis: false,
-        install_dir: Some(
-            "ELIDED_FOR_TEST",
-        ),
-        force_recompilation: false,
-        additional_named_addresses: {},
-        architecture: None,
-        only_deps: false,
-    },
-}
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.exp b/language/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.exp
deleted file mode 100644
index f7cf9a57a2..0000000000
--- a/language/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.exp
+++ /dev/null
@@ -1,22 +0,0 @@
-CompiledPackageInfo {
-    package_name: "Root",
-    address_alias_instantiation: {
-        "A": 00000000000000000000000000000002,
-    },
-    source_digest: Some(
-        "ELIDED_FOR_TEST",
-    ),
-    build_flags: BuildConfig {
-        dev_mode: true,
-        test_mode: false,
-        generate_docs: false,
-        generate_abis: false,
-        install_dir: Some(
-            "ELIDED_FOR_TEST",
-        ),
-        force_recompilation: false,
-        additional_named_addresses: {},
-        architecture: None,
-        only_deps: false,
-    },
-}
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.toml b/language/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.toml
deleted file mode 100644
index 0b4c3a8098..0000000000
--- a/language/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Tests that renamed addresses are picked up and can be used at one level deep
-# of dependencies.
-
-[package]
-name = "Root"
-version = "0.0.0"
-
-[dependencies]
-OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.compile b/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.compile
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.toml b/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.toml
deleted file mode 100644
index a3d12e5cdb..0000000000
--- a/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Tests that renamed addresses are resolved at only one level
-[package]
-name = "Root"
-version = "0.0.0"
-
-[addresses]
-A = "0x1"
-
-[dependencies]
-OtherDep = { local = "./deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/language/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.compile b/language/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.compile
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/language/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/Move.exp b/language/tools/move-package/tests/test_sources/conflicting_dependencies/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/Move.exp
rename to language/tools/move-package/tests/test_sources/conflicting_dependencies/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/Move.toml b/language/tools/move-package/tests/test_sources/conflicting_dependencies/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/Move.toml
rename to language/tools/move-package/tests/test_sources/conflicting_dependencies/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/deps_only/different_dep/Move.toml b/language/tools/move-package/tests/test_sources/conflicting_dependencies/deps_only/different_dep/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/deps_only/different_dep/Move.toml
rename to language/tools/move-package/tests/test_sources/conflicting_dependencies/deps_only/different_dep/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/deps_only/other_dep/Move.toml b/language/tools/move-package/tests/test_sources/conflicting_dependencies/deps_only/other_dep/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/conflicting_dependencies/deps_only/other_dep/Move.toml
rename to language/tools/move-package/tests/test_sources/conflicting_dependencies/deps_only/other_dep/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dep/Move.exp b/language/tools/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dep/Move.exp
rename to language/tools/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dep/Move.toml b/language/tools/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dep/Move.toml
rename to language/tools/move-package/tests/test_sources/conflicting_dev_address_with_dep/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dep/deps_only/A/Move.toml b/language/tools/move-package/tests/test_sources/conflicting_dev_address_with_dep/deps_only/A/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dep/deps_only/A/Move.toml
rename to language/tools/move-package/tests/test_sources/conflicting_dev_address_with_dep/deps_only/A/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dev_dep/Move.exp b/language/tools/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dev_dep/Move.exp
rename to language/tools/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dev_dep/Move.toml b/language/tools/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dev_dep/Move.toml
rename to language/tools/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dev_dep/deps_only/A/Move.toml b/language/tools/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/deps_only/A/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/conflicting_dev_address_with_dev_dep/deps_only/A/Move.toml
rename to language/tools/move-package/tests/test_sources/conflicting_dev_address_with_dev_dep/deps_only/A/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/conflicting_dev_addresses/Move.exp b/language/tools/move-package/tests/test_sources/conflicting_dev_addresses/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/conflicting_dev_addresses/Move.exp
rename to language/tools/move-package/tests/test_sources/conflicting_dev_addresses/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/resolution/conflicting_dev_addresses/Move.toml b/language/tools/move-package/tests/test_sources/conflicting_dev_addresses/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/conflicting_dev_addresses/Move.toml
rename to language/tools/move-package/tests/test_sources/conflicting_dev_addresses/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.locked b/language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.locked
new file mode 100644
index 0000000000..71dba8a72f
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.locked
@@ -0,0 +1,29 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+
+[[move.dependency]]
+name = "A"
+source = { local = "deps_only/A" }
+dependencies = [
+  "B",
+]
+dev-dependencies = [
+  "D",
+]
+
+[[move.dependency]]
+name = "B"
+source = { local = "deps_only/B" }
+dev-dependencies = [
+  "C",
+]
+
+[[move.dependency]]
+name = "C"
+source = { local = "deps_only/C" }
+
+[[move.dependency]]
+name = "D"
+source = { local = "deps_only/D" }
diff --git a/language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.resolved b/language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.resolved
new file mode 100644
index 0000000000..a03f88d78e
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.resolved
@@ -0,0 +1,305 @@
+ResolutionGraph {
+    root_package_path: "tests/test_sources/dep_dev_dep_diamond",
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+    root_package: SourceManifest {
+        package: PackageInfo {
+            name: "Root",
+            version: (
+                0,
+                0,
+                0,
+            ),
+            authors: [],
+            license: None,
+            custom_properties: {},
+        },
+        addresses: None,
+        dev_address_assignments: None,
+        build: None,
+        dependencies: {
+            "A": Dependency {
+                kind: Local(
+                    "./deps_only/A",
+                ),
+                subst: None,
+                version: None,
+                digest: None,
+            },
+            "C": Dependency {
+                kind: Local(
+                    "./deps_only/C",
+                ),
+                subst: None,
+                version: None,
+                digest: None,
+            },
+        },
+        dev_dependencies: {
+            "B": Dependency {
+                kind: Local(
+                    "./deps_only/B",
+                ),
+                subst: None,
+                version: None,
+                digest: None,
+            },
+        },
+    },
+    graph: {
+        "Root": [
+            (
+                "A",
+                Outgoing,
+            ),
+            (
+                "C",
+                Outgoing,
+            ),
+            (
+                "B",
+                Outgoing,
+            ),
+        ],
+        "A": [
+            (
+                "Root",
+                Incoming,
+            ),
+            (
+                "B",
+                Outgoing,
+            ),
+            (
+                "D",
+                Outgoing,
+            ),
+        ],
+        "B": [
+            (
+                "A",
+                Incoming,
+            ),
+            (
+                "C",
+                Outgoing,
+            ),
+            (
+                "Root",
+                Incoming,
+            ),
+        ],
+        "C": [
+            (
+                "B",
+                Incoming,
+            ),
+            (
+                "Root",
+                Incoming,
+            ),
+        ],
+        "D": [
+            (
+                "A",
+                Incoming,
+            ),
+        ],
+    },
+    package_table: {
+        "A": ResolutionPackage {
+            resolution_graph_index: "A",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "A",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "B": Dependency {
+                        kind: Local(
+                            "../B",
+                        ),
+                        subst: None,
+                        version: None,
+                        digest: None,
+                    },
+                },
+                dev_dependencies: {
+                    "D": Dependency {
+                        kind: Local(
+                            "../D",
+                        ),
+                        subst: None,
+                        version: None,
+                        digest: None,
+                    },
+                },
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "B": ResolutionPackage {
+            resolution_graph_index: "B",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "B",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {
+                    "C": Dependency {
+                        kind: Local(
+                            "../C",
+                        ),
+                        subst: None,
+                        version: None,
+                        digest: None,
+                    },
+                },
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "C": ResolutionPackage {
+            resolution_graph_index: "C",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "C",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "D": ResolutionPackage {
+            resolution_graph_index: "D",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "D",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "Root": ResolutionPackage {
+            resolution_graph_index: "Root",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "Root",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "A": Dependency {
+                        kind: Local(
+                            "./deps_only/A",
+                        ),
+                        subst: None,
+                        version: None,
+                        digest: None,
+                    },
+                    "C": Dependency {
+                        kind: Local(
+                            "./deps_only/C",
+                        ),
+                        subst: None,
+                        version: None,
+                        digest: None,
+                    },
+                },
+                dev_dependencies: {
+                    "B": Dependency {
+                        kind: Local(
+                            "./deps_only/B",
+                        ),
+                        subst: None,
+                        version: None,
+                        digest: None,
+                    },
+                },
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {},
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.toml b/language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.toml
new file mode 100644
index 0000000000..91407dfeb9
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/Move.toml
@@ -0,0 +1,10 @@
+[package]
+name = "Root"
+version = "0.0.0"
+
+[dependencies]
+A = { local = "./deps_only/A" }
+C = { local = "./deps_only/C" }
+
+[dev-dependencies]
+B = { local = "./deps_only/B" }
diff --git a/language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/A/Move.toml b/language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/A/Move.toml
new file mode 100644
index 0000000000..d88b3096d0
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/A/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "A"
+version = "0.0.0"
+
+[dependencies]
+B = { local = "../B" }
+
+[dev-dependencies]
+D = { local = "../D" }
diff --git a/language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/B/Move.toml b/language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/B/Move.toml
new file mode 100644
index 0000000000..c55df1b1c2
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/B/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "B"
+version = "0.0.0"
+
+[dev-dependencies]
+C = { local = "../C" }
diff --git a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.toml b/language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/C/Move.toml
similarity index 66%
rename from language/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.toml
rename to language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/C/Move.toml
index b5b93588f8..73ed836961 100644
--- a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.toml
+++ b/language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/C/Move.toml
@@ -1,3 +1,3 @@
 [package]
-name = "test"
+name = "C"
 version = "0.0.0"
diff --git a/language/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/deps_only/D/Move.toml b/language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/D/Move.toml
similarity index 62%
rename from language/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/deps_only/D/Move.toml
rename to language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/D/Move.toml
index f12fed32cb..c9cc629460 100644
--- a/language/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/deps_only/D/Move.toml
+++ b/language/tools/move-package/tests/test_sources/dep_dev_dep_diamond/deps_only/D/Move.toml
@@ -1,6 +1,3 @@
 [package]
 name = "D"
 version = "0.0.0"
-
-[addresses]
-A = "0x2"
diff --git a/language/tools/move-package/tests/test_sources/dep_good_digest/Move.locked b/language/tools/move-package/tests/test_sources/dep_good_digest/Move.locked
new file mode 100644
index 0000000000..6ae4a9cbdf
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/dep_good_digest/Move.locked
@@ -0,0 +1,8 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+
+[[move.dependency]]
+name = "OtherDep"
+source = { local = "deps_only/other_dep", digest = "6A88B7888D6049EB0121900E22B6FA2C0E702F042C8C8D4FD62AD5C990B9F9A8", addr_subst = { "A" = "B" } }
diff --git a/language/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.exp b/language/tools/move-package/tests/test_sources/dep_good_digest/Move.resolved
similarity index 88%
rename from language/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.exp
rename to language/tools/move-package/tests/test_sources/dep_good_digest/Move.resolved
index cdda96ef47..4430dc3ed0 100644
--- a/language/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.exp
+++ b/language/tools/move-package/tests/test_sources/dep_good_digest/Move.resolved
@@ -1,5 +1,5 @@
 ResolutionGraph {
-    root_package_path: "tests/test_sources/resolution/dep_good_digest",
+    root_package_path: "tests/test_sources/dep_good_digest",
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
@@ -9,9 +9,14 @@ ResolutionGraph {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
     root_package: SourceManifest {
         package: PackageInfo {
@@ -23,6 +28,7 @@ ResolutionGraph {
             ),
             authors: [],
             license: None,
+            custom_properties: {},
         },
         addresses: Some(
             {
@@ -35,7 +41,9 @@ ResolutionGraph {
         build: None,
         dependencies: {
             "OtherDep": Dependency {
-                local: "./deps_only/other_dep",
+                kind: Local(
+                    "./deps_only/other_dep",
+                ),
                 subst: Some(
                     {
                         "A": RenameFrom(
@@ -47,7 +55,6 @@ ResolutionGraph {
                 digest: Some(
                     "6A88B7888D6049EB0121900E22B6FA2C0E702F042C8C8D4FD62AD5C990B9F9A8",
                 ),
-                git_info: None,
             },
         },
         dev_dependencies: {},
@@ -79,6 +86,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: Some(
                     {
@@ -109,6 +117,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: Some(
                     {
@@ -121,7 +130,9 @@ ResolutionGraph {
                 build: None,
                 dependencies: {
                     "OtherDep": Dependency {
-                        local: "./deps_only/other_dep",
+                        kind: Local(
+                            "./deps_only/other_dep",
+                        ),
                         subst: Some(
                             {
                                 "A": RenameFrom(
@@ -133,7 +144,6 @@ ResolutionGraph {
                         digest: Some(
                             "6A88B7888D6049EB0121900E22B6FA2C0E702F042C8C8D4FD62AD5C990B9F9A8",
                         ),
-                        git_info: None,
                     },
                 },
                 dev_dependencies: {},
diff --git a/language/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.toml b/language/tools/move-package/tests/test_sources/dep_good_digest/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.toml
rename to language/tools/move-package/tests/test_sources/dep_good_digest/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep/deps_only/other_dep/Move.toml b/language/tools/move-package/tests/test_sources/dep_good_digest/deps_only/other_dep/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep/deps_only/other_dep/Move.toml
rename to language/tools/move-package/tests/test_sources/dep_good_digest/deps_only/other_dep/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/dep_good_digest/deps_only/other_dep/sources/A.move b/language/tools/move-package/tests/test_sources/dep_good_digest/deps_only/other_dep/sources/A.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/dep_good_digest/deps_only/other_dep/sources/A.move
rename to language/tools/move-package/tests/test_sources/dep_good_digest/deps_only/other_dep/sources/A.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.exp b/language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.compiled
similarity index 76%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.exp
rename to language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.compiled
index 166ee79bdd..5af2682e90 100644
--- a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.exp
+++ b/language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.compiled
@@ -16,8 +16,13 @@ CompiledPackageInfo {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
 }
diff --git a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.exp b/language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.resolved
similarity index 87%
rename from language/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.exp
rename to language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.resolved
index 9f61222a61..387bcefe70 100644
--- a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.exp
+++ b/language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.resolved
@@ -1,5 +1,5 @@
 ResolutionGraph {
-    root_package_path: "tests/test_sources/resolution/diamond_problem_backflow_resolution",
+    root_package_path: "tests/test_sources/diamond_problem_backflow_resolution",
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
@@ -9,9 +9,14 @@ ResolutionGraph {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
     root_package: SourceManifest {
         package: PackageInfo {
@@ -23,20 +28,24 @@ ResolutionGraph {
             ),
             authors: [],
             license: None,
+            custom_properties: {},
         },
         addresses: None,
         dev_address_assignments: None,
         build: None,
         dependencies: {
             "A": Dependency {
-                local: "./deps_only/A",
+                kind: Local(
+                    "./deps_only/A",
+                ),
                 subst: None,
                 version: None,
                 digest: None,
-                git_info: None,
             },
             "B": Dependency {
-                local: "./deps_only/B",
+                kind: Local(
+                    "./deps_only/B",
+                ),
                 subst: Some(
                     {
                         "BA": Assign(
@@ -46,7 +55,6 @@ ResolutionGraph {
                 ),
                 version: None,
                 digest: None,
-                git_info: None,
             },
         },
         dev_dependencies: {},
@@ -106,13 +114,16 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: None,
                 dev_address_assignments: None,
                 build: None,
                 dependencies: {
                     "C": Dependency {
-                        local: "../C",
+                        kind: Local(
+                            "../C",
+                        ),
                         subst: Some(
                             {
                                 "AA": RenameFrom(
@@ -122,7 +133,6 @@ ResolutionGraph {
                         ),
                         version: None,
                         digest: None,
-                        git_info: None,
                     },
                 },
                 dev_dependencies: {},
@@ -151,13 +161,16 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: None,
                 dev_address_assignments: None,
                 build: None,
                 dependencies: {
                     "C": Dependency {
-                        local: "../C",
+                        kind: Local(
+                            "../C",
+                        ),
                         subst: Some(
                             {
                                 "BA": RenameFrom(
@@ -167,7 +180,6 @@ ResolutionGraph {
                         ),
                         version: None,
                         digest: None,
-                        git_info: None,
                     },
                 },
                 dev_dependencies: {},
@@ -196,6 +208,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: Some(
                     {
@@ -226,20 +239,24 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: None,
                 dev_address_assignments: None,
                 build: None,
                 dependencies: {
                     "A": Dependency {
-                        local: "./deps_only/A",
+                        kind: Local(
+                            "./deps_only/A",
+                        ),
                         subst: None,
                         version: None,
                         digest: None,
-                        git_info: None,
                     },
                     "B": Dependency {
-                        local: "./deps_only/B",
+                        kind: Local(
+                            "./deps_only/B",
+                        ),
                         subst: Some(
                             {
                                 "BA": Assign(
@@ -249,7 +266,6 @@ ResolutionGraph {
                         ),
                         version: None,
                         digest: None,
-                        git_info: None,
                     },
                 },
                 dev_dependencies: {},
diff --git a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.toml b/language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.toml
rename to language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/A/Move.toml b/language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/A/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/A/Move.toml
rename to language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/A/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/A/sources/A.move b/language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/A/sources/A.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/A/sources/A.move
rename to language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/A/sources/A.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/B/Move.toml b/language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/B/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/B/Move.toml
rename to language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/B/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/B/sources/AA.move b/language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/B/sources/AA.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/B/sources/AA.move
rename to language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/B/sources/AA.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/B/sources/B.move b/language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/B/sources/B.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/B/sources/B.move
rename to language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/B/sources/B.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/C/Move.toml b/language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/C/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/C/Move.toml
rename to language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/C/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/C/sources/C.move b/language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/C/sources/C.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/deps_only/C/sources/C.move
rename to language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/deps_only/C/sources/C.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/sources/Root.move b/language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/sources/Root.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/sources/Root.move
rename to language/tools/move-package/tests/test_sources/diamond_problem_backflow_resolution/sources/Root.move
diff --git a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/Move.exp b/language/tools/move-package/tests/test_sources/diamond_problem_conflict/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/Move.exp
rename to language/tools/move-package/tests/test_sources/diamond_problem_conflict/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/Move.toml b/language/tools/move-package/tests/test_sources/diamond_problem_conflict/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/Move.toml
rename to language/tools/move-package/tests/test_sources/diamond_problem_conflict/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/A/Move.toml b/language/tools/move-package/tests/test_sources/diamond_problem_conflict/deps_only/A/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/A/Move.toml
rename to language/tools/move-package/tests/test_sources/diamond_problem_conflict/deps_only/A/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/B/Move.toml b/language/tools/move-package/tests/test_sources/diamond_problem_conflict/deps_only/B/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/B/Move.toml
rename to language/tools/move-package/tests/test_sources/diamond_problem_conflict/deps_only/B/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/C/Move.toml b/language/tools/move-package/tests/test_sources/diamond_problem_conflict/deps_only/C/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/C/Move.toml
rename to language/tools/move-package/tests/test_sources/diamond_problem_conflict/deps_only/C/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.exp b/language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/Move.compiled
similarity index 76%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.exp
rename to language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/Move.compiled
index 166ee79bdd..5af2682e90 100644
--- a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.exp
+++ b/language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/Move.compiled
@@ -16,8 +16,13 @@ CompiledPackageInfo {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
 }
diff --git a/language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/Move.locked b/language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/Move.locked
new file mode 100644
index 0000000000..502e5fcff4
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/Move.locked
@@ -0,0 +1,22 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+
+[[move.dependency]]
+name = "A"
+source = { local = "deps_only/A", addr_subst = { "AA" = "00000000000000000000000000000001" } }
+dependencies = [
+  "C",
+]
+
+[[move.dependency]]
+name = "B"
+source = { local = "deps_only/B", addr_subst = { "BA" = "00000000000000000000000000000001" } }
+dependencies = [
+  "C",
+]
+
+[[move.dependency]]
+name = "C"
+source = { local = "deps_only/C", addr_subst = { "AA" = "A" } }
diff --git a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.exp b/language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/Move.resolved
similarity index 87%
rename from language/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.exp
rename to language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/Move.resolved
index 97fd27b6fd..bf92f3a68e 100644
--- a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.exp
+++ b/language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/Move.resolved
@@ -1,5 +1,5 @@
 ResolutionGraph {
-    root_package_path: "tests/test_sources/resolution/diamond_problem_no_conflict",
+    root_package_path: "tests/test_sources/diamond_problem_no_conflict",
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
@@ -9,9 +9,14 @@ ResolutionGraph {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
     root_package: SourceManifest {
         package: PackageInfo {
@@ -23,13 +28,16 @@ ResolutionGraph {
             ),
             authors: [],
             license: None,
+            custom_properties: {},
         },
         addresses: None,
         dev_address_assignments: None,
         build: None,
         dependencies: {
             "A": Dependency {
-                local: "./deps_only/A",
+                kind: Local(
+                    "./deps_only/A",
+                ),
                 subst: Some(
                     {
                         "AA": Assign(
@@ -39,10 +47,11 @@ ResolutionGraph {
                 ),
                 version: None,
                 digest: None,
-                git_info: None,
             },
             "B": Dependency {
-                local: "./deps_only/B",
+                kind: Local(
+                    "./deps_only/B",
+                ),
                 subst: Some(
                     {
                         "BA": Assign(
@@ -52,7 +61,6 @@ ResolutionGraph {
                 ),
                 version: None,
                 digest: None,
-                git_info: None,
             },
         },
         dev_dependencies: {},
@@ -112,13 +120,16 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: None,
                 dev_address_assignments: None,
                 build: None,
                 dependencies: {
                     "C": Dependency {
-                        local: "../C",
+                        kind: Local(
+                            "../C",
+                        ),
                         subst: Some(
                             {
                                 "AA": RenameFrom(
@@ -128,7 +139,6 @@ ResolutionGraph {
                         ),
                         version: None,
                         digest: None,
-                        git_info: None,
                     },
                 },
                 dev_dependencies: {},
@@ -157,13 +167,16 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: None,
                 dev_address_assignments: None,
                 build: None,
                 dependencies: {
                     "C": Dependency {
-                        local: "../C",
+                        kind: Local(
+                            "../C",
+                        ),
                         subst: Some(
                             {
                                 "BA": RenameFrom(
@@ -173,7 +186,6 @@ ResolutionGraph {
                         ),
                         version: None,
                         digest: None,
-                        git_info: None,
                     },
                 },
                 dev_dependencies: {},
@@ -202,6 +214,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: Some(
                     {
@@ -232,13 +245,16 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: None,
                 dev_address_assignments: None,
                 build: None,
                 dependencies: {
                     "A": Dependency {
-                        local: "./deps_only/A",
+                        kind: Local(
+                            "./deps_only/A",
+                        ),
                         subst: Some(
                             {
                                 "AA": Assign(
@@ -248,10 +264,11 @@ ResolutionGraph {
                         ),
                         version: None,
                         digest: None,
-                        git_info: None,
                     },
                     "B": Dependency {
-                        local: "./deps_only/B",
+                        kind: Local(
+                            "./deps_only/B",
+                        ),
                         subst: Some(
                             {
                                 "BA": Assign(
@@ -261,7 +278,6 @@ ResolutionGraph {
                         ),
                         version: None,
                         digest: None,
-                        git_info: None,
                     },
                 },
                 dev_dependencies: {},
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.toml b/language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.toml
rename to language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/deps_only/A/Move.toml b/language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/A/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/deps_only/A/Move.toml
rename to language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/A/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/A/sources/A.move b/language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/A/sources/A.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/A/sources/A.move
rename to language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/A/sources/A.move
diff --git a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/deps_only/B/Move.toml b/language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/B/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/deps_only/B/Move.toml
rename to language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/B/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/B/sources/AA.move b/language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/B/sources/AA.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/B/sources/AA.move
rename to language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/B/sources/AA.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/B/sources/B.move b/language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/B/sources/B.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/B/sources/B.move
rename to language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/B/sources/B.move
diff --git a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/deps_only/C/Move.toml b/language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/C/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/deps_only/C/Move.toml
rename to language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/C/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/C/sources/C.move b/language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/C/sources/C.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/deps_only/C/sources/C.move
rename to language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/deps_only/C/sources/C.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/sources/Root.move b/language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/sources/Root.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/sources/Root.move
rename to language/tools/move-package/tests/test_sources/diamond_problem_no_conflict/sources/Root.move
diff --git a/language/tools/move-package/tests/test_sources/direct_cyclic_dep/Move.notlocked b/language/tools/move-package/tests/test_sources/direct_cyclic_dep/Move.notlocked
new file mode 100644
index 0000000000..66b14c1743
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/direct_cyclic_dep/Move.notlocked
@@ -0,0 +1 @@
+Lock file uncommitted
diff --git a/language/tools/move-package/tests/test_sources/direct_cyclic_dep/Move.resolved b/language/tools/move-package/tests/test_sources/direct_cyclic_dep/Move.resolved
new file mode 100644
index 0000000000..8b25fca23d
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/direct_cyclic_dep/Move.resolved
@@ -0,0 +1 @@
+Found cycle between packages: Root -> Other -> Root
diff --git a/language/tools/move-package/tests/test_sources/resolution/direct_cyclic_dep/Move.toml b/language/tools/move-package/tests/test_sources/direct_cyclic_dep/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/direct_cyclic_dep/Move.toml
rename to language/tools/move-package/tests/test_sources/direct_cyclic_dep/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/direct_cyclic_dep/deps_only/other/Move.toml b/language/tools/move-package/tests/test_sources/direct_cyclic_dep/deps_only/other/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/direct_cyclic_dep/deps_only/other/Move.toml
rename to language/tools/move-package/tests/test_sources/direct_cyclic_dep/deps_only/other/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/longer_cyclic_dep/Move.notlocked b/language/tools/move-package/tests/test_sources/longer_cyclic_dep/Move.notlocked
new file mode 100644
index 0000000000..66b14c1743
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/longer_cyclic_dep/Move.notlocked
@@ -0,0 +1 @@
+Lock file uncommitted
diff --git a/language/tools/move-package/tests/test_sources/longer_cyclic_dep/Move.resolved b/language/tools/move-package/tests/test_sources/longer_cyclic_dep/Move.resolved
new file mode 100644
index 0000000000..1932a3ff04
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/longer_cyclic_dep/Move.resolved
@@ -0,0 +1 @@
+Found cycle between packages: Root -> A -> B -> Root
diff --git a/language/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/Move.toml b/language/tools/move-package/tests/test_sources/longer_cyclic_dep/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/Move.toml
rename to language/tools/move-package/tests/test_sources/longer_cyclic_dep/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/deps_only/A/Move.toml b/language/tools/move-package/tests/test_sources/longer_cyclic_dep/deps_only/A/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/deps_only/A/Move.toml
rename to language/tools/move-package/tests/test_sources/longer_cyclic_dep/deps_only/A/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/deps_only/B/Move.toml b/language/tools/move-package/tests/test_sources/longer_cyclic_dep/deps_only/B/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/deps_only/B/Move.toml
rename to language/tools/move-package/tests/test_sources/longer_cyclic_dep/deps_only/B/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/model/basic_no_deps/Move.exp b/language/tools/move-package/tests/test_sources/model/basic_no_deps/Move.exp
deleted file mode 100644
index b076a40c36..0000000000
--- a/language/tools/move-package/tests/test_sources/model/basic_no_deps/Move.exp
+++ /dev/null
@@ -1 +0,0 @@
-Built model
\ No newline at end of file
diff --git a/language/tools/move-package/tests/test_sources/model/basic_no_deps/Move.model b/language/tools/move-package/tests/test_sources/model/basic_no_deps/Move.model
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/language/tools/move-package/tests/test_sources/model/basic_no_deps/sources/A.move b/language/tools/move-package/tests/test_sources/model/basic_no_deps/sources/A.move
deleted file mode 100644
index 925cbe1fef..0000000000
--- a/language/tools/move-package/tests/test_sources/model/basic_no_deps/sources/A.move
+++ /dev/null
@@ -1,3 +0,0 @@
-module 0x1::M {
-    public fun foo() { }
-}
diff --git a/language/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/Move.exp b/language/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/Move.exp
deleted file mode 100644
index b076a40c36..0000000000
--- a/language/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/Move.exp
+++ /dev/null
@@ -1 +0,0 @@
-Built model
\ No newline at end of file
diff --git a/language/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/Move.model b/language/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/Move.model
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/language/tools/move-package/tests/test_sources/model/multiple_deps_rename/Move.model b/language/tools/move-package/tests/test_sources/model/multiple_deps_rename/Move.model
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/language/tools/move-package/tests/test_sources/model/multiple_deps_rename/Move.toml b/language/tools/move-package/tests/test_sources/model/multiple_deps_rename/Move.toml
deleted file mode 100644
index a13ae9d9e4..0000000000
--- a/language/tools/move-package/tests/test_sources/model/multiple_deps_rename/Move.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[package]
-name = "test"
-version = "0.0.0"
-
-[addresses]
-A = "0x3"
-
-[dependencies]
-C = { local = "./deps_only/C", addr_subst = {"CA" = "A" } }
-D = { local = "./deps_only/D" , addr_subst = {"DA" = "A" } }
diff --git a/language/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/C/sources/A.move b/language/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/C/sources/A.move
deleted file mode 100644
index 9d42ff170f..0000000000
--- a/language/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/C/sources/A.move
+++ /dev/null
@@ -1,3 +0,0 @@
-module A::A {
-    public fun foo() { }
-}
diff --git a/language/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/D/sources/A.move b/language/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/D/sources/A.move
deleted file mode 100644
index 9d42ff170f..0000000000
--- a/language/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/D/sources/A.move
+++ /dev/null
@@ -1,3 +0,0 @@
-module A::A {
-    public fun foo() { }
-}
diff --git a/language/tools/move-package/tests/test_sources/model/multiple_deps_rename/sources/Root.move b/language/tools/move-package/tests/test_sources/model/multiple_deps_rename/sources/Root.move
deleted file mode 100644
index 93f1c1cdd3..0000000000
--- a/language/tools/move-package/tests/test_sources/model/multiple_deps_rename/sources/Root.move
+++ /dev/null
@@ -1,9 +0,0 @@
-module A::A {
-    use DA::A as DAA;
-    use CA::A as CAA;
-
-    public fun foo() {
-        DAA::foo();
-        CAA::foo()
-    }
-}
diff --git a/language/tools/move-package/tests/test_sources/multiple_deps_no_rename/Move.locked b/language/tools/move-package/tests/test_sources/multiple_deps_no_rename/Move.locked
new file mode 100644
index 0000000000..feec9fe410
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/multiple_deps_no_rename/Move.locked
@@ -0,0 +1,12 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+
+[[move.dependency]]
+name = "C"
+source = { local = "deps_only/C" }
+
+[[move.dependency]]
+name = "D"
+source = { local = "deps_only/D" }
diff --git a/language/tools/move-package/tests/test_sources/multiple_deps_no_rename/Move.modeled b/language/tools/move-package/tests/test_sources/multiple_deps_no_rename/Move.modeled
new file mode 100644
index 0000000000..e3452a497f
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/multiple_deps_no_rename/Move.modeled
@@ -0,0 +1 @@
+Built model
diff --git a/language/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/Move.toml b/language/tools/move-package/tests/test_sources/multiple_deps_no_rename/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/Move.toml
rename to language/tools/move-package/tests/test_sources/multiple_deps_no_rename/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/C/Move.toml b/language/tools/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/C/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/C/Move.toml
rename to language/tools/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/C/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/C/sources/A.move b/language/tools/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/C/sources/A.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/C/sources/A.move
rename to language/tools/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/C/sources/A.move
diff --git a/language/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/D/Move.toml b/language/tools/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/D/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/D/Move.toml
rename to language/tools/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/D/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/D/sources/A.move b/language/tools/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/D/sources/A.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/deps_only/D/sources/A.move
rename to language/tools/move-package/tests/test_sources/multiple_deps_no_rename/deps_only/D/sources/A.move
diff --git a/language/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/sources/A.move b/language/tools/move-package/tests/test_sources/multiple_deps_no_rename/sources/A.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/model/multiple_deps_no_rename/sources/A.move
rename to language/tools/move-package/tests/test_sources/multiple_deps_no_rename/sources/A.move
diff --git a/language/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/Move.exp b/language/tools/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/Move.exp
rename to language/tools/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/Move.toml b/language/tools/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/multiple_deps_no_rename/Move.toml
rename to language/tools/move-package/tests/test_sources/multiple_deps_no_rename_conflict/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/C/Move.toml b/language/tools/move-package/tests/test_sources/multiple_deps_no_rename_conflict/deps_only/C/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/C/Move.toml
rename to language/tools/move-package/tests/test_sources/multiple_deps_no_rename_conflict/deps_only/C/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/D/Move.toml b/language/tools/move-package/tests/test_sources/multiple_deps_no_rename_conflict/deps_only/D/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/D/Move.toml
rename to language/tools/move-package/tests/test_sources/multiple_deps_no_rename_conflict/deps_only/D/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/model/multiple_deps_rename/Move.exp b/language/tools/move-package/tests/test_sources/multiple_deps_rename/Move.modeled
similarity index 100%
rename from language/tools/move-package/tests/test_sources/model/multiple_deps_rename/Move.exp
rename to language/tools/move-package/tests/test_sources/multiple_deps_rename/Move.modeled
diff --git a/language/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.exp b/language/tools/move-package/tests/test_sources/multiple_deps_rename/Move.resolved
similarity index 82%
rename from language/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.exp
rename to language/tools/move-package/tests/test_sources/multiple_deps_rename/Move.resolved
index 0399ab2a44..10dfd080fd 100644
--- a/language/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.exp
+++ b/language/tools/move-package/tests/test_sources/multiple_deps_rename/Move.resolved
@@ -1,5 +1,5 @@
 ResolutionGraph {
-    root_package_path: "tests/test_sources/resolution/multiple_deps_rename",
+    root_package_path: "tests/test_sources/multiple_deps_rename",
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
@@ -9,9 +9,14 @@ ResolutionGraph {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
     root_package: SourceManifest {
         package: PackageInfo {
@@ -23,13 +28,22 @@ ResolutionGraph {
             ),
             authors: [],
             license: None,
+            custom_properties: {},
         },
-        addresses: None,
+        addresses: Some(
+            {
+                "A": Some(
+                    00000000000000000000000000000003,
+                ),
+            },
+        ),
         dev_address_assignments: None,
         build: None,
         dependencies: {
             "C": Dependency {
-                local: "./deps_only/C",
+                kind: Local(
+                    "./deps_only/C",
+                ),
                 subst: Some(
                     {
                         "CA": RenameFrom(
@@ -39,10 +53,11 @@ ResolutionGraph {
                 ),
                 version: None,
                 digest: None,
-                git_info: None,
             },
             "D": Dependency {
-                local: "./deps_only/D",
+                kind: Local(
+                    "./deps_only/D",
+                ),
                 subst: Some(
                     {
                         "DA": RenameFrom(
@@ -52,7 +67,6 @@ ResolutionGraph {
                 ),
                 version: None,
                 digest: None,
-                git_info: None,
             },
         },
         dev_dependencies: {},
@@ -94,6 +108,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: Some(
                     {
@@ -126,6 +141,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: Some(
                     {
@@ -158,13 +174,22 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
-                addresses: None,
+                addresses: Some(
+                    {
+                        "A": Some(
+                            00000000000000000000000000000003,
+                        ),
+                    },
+                ),
                 dev_address_assignments: None,
                 build: None,
                 dependencies: {
                     "C": Dependency {
-                        local: "./deps_only/C",
+                        kind: Local(
+                            "./deps_only/C",
+                        ),
                         subst: Some(
                             {
                                 "CA": RenameFrom(
@@ -174,10 +199,11 @@ ResolutionGraph {
                         ),
                         version: None,
                         digest: None,
-                        git_info: None,
                     },
                     "D": Dependency {
-                        local: "./deps_only/D",
+                        kind: Local(
+                            "./deps_only/D",
+                        ),
                         subst: Some(
                             {
                                 "DA": RenameFrom(
@@ -187,7 +213,6 @@ ResolutionGraph {
                         ),
                         version: None,
                         digest: None,
-                        git_info: None,
                     },
                 },
                 dev_dependencies: {},
@@ -204,6 +229,7 @@ ResolutionGraph {
                 ),
             },
             resolution_table: {
+                "A": 00000000000000000000000000000003,
                 "CA": 00000000000000000000000000000001,
                 "DA": 00000000000000000000000000000002,
             },
diff --git a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.toml b/language/tools/move-package/tests/test_sources/multiple_deps_rename/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.toml
rename to language/tools/move-package/tests/test_sources/multiple_deps_rename/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/C/Move.toml b/language/tools/move-package/tests/test_sources/multiple_deps_rename/deps_only/C/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/C/Move.toml
rename to language/tools/move-package/tests/test_sources/multiple_deps_rename/deps_only/C/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/C/sources/A.move b/language/tools/move-package/tests/test_sources/multiple_deps_rename/deps_only/C/sources/A.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/C/sources/A.move
rename to language/tools/move-package/tests/test_sources/multiple_deps_rename/deps_only/C/sources/A.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/D/Move.toml b/language/tools/move-package/tests/test_sources/multiple_deps_rename/deps_only/D/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/D/Move.toml
rename to language/tools/move-package/tests/test_sources/multiple_deps_rename/deps_only/D/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/D/sources/A.move b/language/tools/move-package/tests/test_sources/multiple_deps_rename/deps_only/D/sources/A.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/deps_only/D/sources/A.move
rename to language/tools/move-package/tests/test_sources/multiple_deps_rename/deps_only/D/sources/A.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/sources/Root.move b/language/tools/move-package/tests/test_sources/multiple_deps_rename/sources/Root.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/sources/Root.move
rename to language/tools/move-package/tests/test_sources/multiple_deps_rename/sources/Root.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.exp b/language/tools/move-package/tests/test_sources/multiple_deps_rename_one/Move.compiled
similarity index 77%
rename from language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.exp
rename to language/tools/move-package/tests/test_sources/multiple_deps_rename_one/Move.compiled
index bcd7830539..aeb203fd09 100644
--- a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.exp
+++ b/language/tools/move-package/tests/test_sources/multiple_deps_rename_one/Move.compiled
@@ -17,8 +17,13 @@ CompiledPackageInfo {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
 }
diff --git a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.toml b/language/tools/move-package/tests/test_sources/multiple_deps_rename_one/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.toml
rename to language/tools/move-package/tests/test_sources/multiple_deps_rename_one/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/C/Move.toml b/language/tools/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/C/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/C/Move.toml
rename to language/tools/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/C/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/C/sources/A.move b/language/tools/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/C/sources/A.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/C/sources/A.move
rename to language/tools/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/C/sources/A.move
diff --git a/language/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/D/Move.toml b/language/tools/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/D/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/model/multiple_deps_rename/deps_only/D/Move.toml
rename to language/tools/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/D/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/D/sources/A.move b/language/tools/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/D/sources/A.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/deps_only/D/sources/A.move
rename to language/tools/move-package/tests/test_sources/multiple_deps_rename_one/deps_only/D/sources/A.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/sources/Root.move b/language/tools/move-package/tests/test_sources/multiple_deps_rename_one/sources/Root.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/sources/Root.move
rename to language/tools/move-package/tests/test_sources/multiple_deps_rename_one/sources/Root.move
diff --git a/language/tools/move-package/tests/test_sources/nested_deps_bad_parent/Move.notlocked b/language/tools/move-package/tests/test_sources/nested_deps_bad_parent/Move.notlocked
new file mode 100644
index 0000000000..66b14c1743
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/nested_deps_bad_parent/Move.notlocked
@@ -0,0 +1 @@
+Lock file uncommitted
diff --git a/language/tools/move-package/tests/test_sources/nested_deps_bad_parent/Move.resolved b/language/tools/move-package/tests/test_sources/nested_deps_bad_parent/Move.resolved
new file mode 100644
index 0000000000..8d0b2c0e86
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/nested_deps_bad_parent/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'NestedDeps': Resolving dependencies for package 'Nested': Path cannot access parent of current directory: ../out_of_repo
diff --git a/language/tools/move-package/tests/test_sources/nested_deps_bad_parent/Move.toml b/language/tools/move-package/tests/test_sources/nested_deps_bad_parent/Move.toml
new file mode 100644
index 0000000000..d22379e2fb
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/nested_deps_bad_parent/Move.toml
@@ -0,0 +1,8 @@
+[package]
+name = "NestedDeps"
+version = "0.0.0"
+
+[dependencies.Nested]
+git = "../../.."
+rev = "ed613ee8e"
+subdir = "language/tools/move-package/tests/test_sources/nested_deps_bad_parent/deps_only/nested"
diff --git a/language/tools/move-package/tests/test_sources/nested_deps_bad_parent/deps_only/nested/Move.toml b/language/tools/move-package/tests/test_sources/nested_deps_bad_parent/deps_only/nested/Move.toml
new file mode 100644
index 0000000000..2b714a0d83
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/nested_deps_bad_parent/deps_only/nested/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Nested"
+version = "0.0.0"
+
+[dependencies]
+More = { local = "../../../../../../../../../out_of_repo" }
diff --git a/language/tools/move-package/tests/test_sources/nested_deps_git_local/Move.locked b/language/tools/move-package/tests/test_sources/nested_deps_git_local/Move.locked
new file mode 100644
index 0000000000..45f339d8cf
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/nested_deps_git_local/Move.locked
@@ -0,0 +1,15 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+
+[[move.dependency]]
+name = "MoveNursery"
+source = { git = "https://github.com/move-language/move", rev = "781c844", subdir = "language/move-stdlib/nursery" }
+dependencies = [
+  "MoveStdlib",
+]
+
+[[move.dependency]]
+name = "MoveStdlib"
+source = { git = "https://github.com/move-language/move", rev = "781c844", subdir = "language/move-stdlib" }
diff --git a/language/tools/move-package/tests/test_sources/nested_deps_git_local/Move.resolved b/language/tools/move-package/tests/test_sources/nested_deps_git_local/Move.resolved
new file mode 100644
index 0000000000..f3650404d0
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/nested_deps_git_local/Move.resolved
@@ -0,0 +1,205 @@
+ResolutionGraph {
+    root_package_path: "tests/test_sources/nested_deps_git_local",
+    build_options: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+    root_package: SourceManifest {
+        package: PackageInfo {
+            name: "NestedDeps",
+            version: (
+                0,
+                0,
+                0,
+            ),
+            authors: [],
+            license: None,
+            custom_properties: {},
+        },
+        addresses: Some(
+            {
+                "std": Some(
+                    00000000000000000000000000000001,
+                ),
+            },
+        ),
+        dev_address_assignments: None,
+        build: None,
+        dependencies: {
+            "MoveNursery": Dependency {
+                kind: Git(
+                    GitInfo {
+                        git_url: "https://github.com/move-language/move",
+                        git_rev: "781c844",
+                        subdir: "language/move-stdlib/nursery",
+                    },
+                ),
+                subst: None,
+                version: None,
+                digest: None,
+            },
+        },
+        dev_dependencies: {},
+    },
+    graph: {
+        "NestedDeps": [
+            (
+                "MoveNursery",
+                Outgoing,
+            ),
+        ],
+        "MoveNursery": [
+            (
+                "NestedDeps",
+                Incoming,
+            ),
+            (
+                "MoveStdlib",
+                Outgoing,
+            ),
+        ],
+        "MoveStdlib": [
+            (
+                "MoveNursery",
+                Incoming,
+            ),
+        ],
+    },
+    package_table: {
+        "MoveNursery": ResolutionPackage {
+            resolution_graph_index: "MoveNursery",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "MoveNursery",
+                    version: (
+                        1,
+                        5,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: None,
+                dev_address_assignments: Some(
+                    {
+                        "std": 00000000000000000000000000000001,
+                    },
+                ),
+                build: None,
+                dependencies: {
+                    "MoveStdlib": Dependency {
+                        kind: Local(
+                            "..",
+                        ),
+                        subst: None,
+                        version: None,
+                        digest: None,
+                    },
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "std": 00000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "MoveStdlib": ResolutionPackage {
+            resolution_graph_index: "MoveStdlib",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "MoveStdlib",
+                    version: (
+                        1,
+                        5,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "std": None,
+                    },
+                ),
+                dev_address_assignments: Some(
+                    {
+                        "std": 00000000000000000000000000000001,
+                    },
+                ),
+                build: None,
+                dependencies: {},
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "std": 00000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+        "NestedDeps": ResolutionPackage {
+            resolution_graph_index: "NestedDeps",
+            source_package: SourceManifest {
+                package: PackageInfo {
+                    name: "NestedDeps",
+                    version: (
+                        0,
+                        0,
+                        0,
+                    ),
+                    authors: [],
+                    license: None,
+                    custom_properties: {},
+                },
+                addresses: Some(
+                    {
+                        "std": Some(
+                            00000000000000000000000000000001,
+                        ),
+                    },
+                ),
+                dev_address_assignments: None,
+                build: None,
+                dependencies: {
+                    "MoveNursery": Dependency {
+                        kind: Git(
+                            GitInfo {
+                                git_url: "https://github.com/move-language/move",
+                                git_rev: "781c844",
+                                subdir: "language/move-stdlib/nursery",
+                            },
+                        ),
+                        subst: None,
+                        version: None,
+                        digest: None,
+                    },
+                },
+                dev_dependencies: {},
+            },
+            package_path: "ELIDED_FOR_TEST",
+            renaming: {},
+            resolution_table: {
+                "std": 00000000000000000000000000000001,
+            },
+            source_digest: "ELIDED_FOR_TEST",
+        },
+    },
+}
diff --git a/language/tools/move-package/tests/test_sources/nested_deps_git_local/Move.toml b/language/tools/move-package/tests/test_sources/nested_deps_git_local/Move.toml
new file mode 100644
index 0000000000..219fcae286
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/nested_deps_git_local/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "NestedDeps"
+version = "0.0.0"
+
+[dependencies]
+MoveNursery = { git = "https://github.com/move-language/move", rev = "781c844", subdir = "language/move-stdlib/nursery" }
+
+[addresses]
+std = "0x1"
diff --git a/language/tools/move-package/tests/test_sources/nested_deps_local_local/Move.locked b/language/tools/move-package/tests/test_sources/nested_deps_local_local/Move.locked
new file mode 100644
index 0000000000..55e58f0cbd
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/nested_deps_local_local/Move.locked
@@ -0,0 +1,15 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+
+[[move.dependency]]
+name = "More"
+source = { local = "deps_only/nested/more" }
+
+[[move.dependency]]
+name = "Nested"
+source = { local = "deps_only/nested" }
+dependencies = [
+  "More",
+]
diff --git a/language/tools/move-package/tests/test_sources/nested_deps_local_local/Move.toml b/language/tools/move-package/tests/test_sources/nested_deps_local_local/Move.toml
new file mode 100644
index 0000000000..1cae9ebd2f
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/nested_deps_local_local/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "NestedDeps"
+version = "0.0.0"
+
+[dependencies]
+Nested = { local = "./deps_only/nested" }
diff --git a/language/tools/move-package/tests/test_sources/nested_deps_local_local/deps_only/nested/Move.toml b/language/tools/move-package/tests/test_sources/nested_deps_local_local/deps_only/nested/Move.toml
new file mode 100644
index 0000000000..1e6b342098
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/nested_deps_local_local/deps_only/nested/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "Nested"
+version = "0.0.0"
+
+[dependencies]
+More = { local = "./more" }
diff --git a/language/tools/move-package/tests/test_sources/nested_deps_local_local/deps_only/nested/more/Move.toml b/language/tools/move-package/tests/test_sources/nested_deps_local_local/deps_only/nested/more/Move.toml
new file mode 100644
index 0000000000..83a2b21fa6
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/nested_deps_local_local/deps_only/nested/more/Move.toml
@@ -0,0 +1,3 @@
+[package]
+name = "More"
+version = "0.0.0"
diff --git a/language/tools/move-package/tests/test_sources/resolution/no_git_rev_on_git_dependency/Move.exp b/language/tools/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/no_git_rev_on_git_dependency/Move.exp
rename to language/tools/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/resolution/no_git_rev_on_git_dependency/Move.toml b/language/tools/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/no_git_rev_on_git_dependency/Move.toml
rename to language/tools/move-package/tests/test_sources/no_git_rev_on_git_dependency/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.exp b/language/tools/move-package/tests/test_sources/one_dep/Move.compiled
similarity index 74%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.exp
rename to language/tools/move-package/tests/test_sources/one_dep/Move.compiled
index 22183bfa02..18a1fa4ec5 100644
--- a/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.exp
+++ b/language/tools/move-package/tests/test_sources/one_dep/Move.compiled
@@ -15,8 +15,13 @@ CompiledPackageInfo {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
 }
diff --git a/language/tools/move-package/tests/test_sources/one_dep/Move.locked b/language/tools/move-package/tests/test_sources/one_dep/Move.locked
new file mode 100644
index 0000000000..8f849179fe
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/one_dep/Move.locked
@@ -0,0 +1,8 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+
+[[move.dependency]]
+name = "OtherDep"
+source = { local = "deps_only/other_dep", addr_subst = { "A" = "B" } }
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.exp b/language/tools/move-package/tests/test_sources/one_dep/Move.resolved
similarity index 87%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.exp
rename to language/tools/move-package/tests/test_sources/one_dep/Move.resolved
index 7162e8be2e..82c75e0565 100644
--- a/language/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.exp
+++ b/language/tools/move-package/tests/test_sources/one_dep/Move.resolved
@@ -1,5 +1,5 @@
 ResolutionGraph {
-    root_package_path: "tests/test_sources/resolution/one_dep_multiple_of_same_name",
+    root_package_path: "tests/test_sources/one_dep",
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
@@ -9,9 +9,14 @@ ResolutionGraph {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
     root_package: SourceManifest {
         package: PackageInfo {
@@ -23,6 +28,7 @@ ResolutionGraph {
             ),
             authors: [],
             license: None,
+            custom_properties: {},
         },
         addresses: Some(
             {
@@ -35,7 +41,9 @@ ResolutionGraph {
         build: None,
         dependencies: {
             "OtherDep": Dependency {
-                local: "./deps_only/other_dep",
+                kind: Local(
+                    "./deps_only/other_dep",
+                ),
                 subst: Some(
                     {
                         "A": RenameFrom(
@@ -45,7 +53,6 @@ ResolutionGraph {
                 ),
                 version: None,
                 digest: None,
-                git_info: None,
             },
         },
         dev_dependencies: {},
@@ -77,6 +84,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: Some(
                     {
@@ -107,6 +115,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: Some(
                     {
@@ -119,7 +128,9 @@ ResolutionGraph {
                 build: None,
                 dependencies: {
                     "OtherDep": Dependency {
-                        local: "./deps_only/other_dep",
+                        kind: Local(
+                            "./deps_only/other_dep",
+                        ),
                         subst: Some(
                             {
                                 "A": RenameFrom(
@@ -129,7 +140,6 @@ ResolutionGraph {
                         ),
                         version: None,
                         digest: None,
-                        git_info: None,
                     },
                 },
                 dev_dependencies: {},
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.toml b/language/tools/move-package/tests/test_sources/one_dep/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_renamed/deps_only/other_dep/Move.toml b/language/tools/move-package/tests/test_sources/one_dep/deps_only/other_dep/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_renamed/deps_only/other_dep/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep/deps_only/other_dep/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep/deps_only/other_dep/sources/B.move b/language/tools/move-package/tests/test_sources/one_dep/deps_only/other_dep/sources/B.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep/deps_only/other_dep/sources/B.move
rename to language/tools/move-package/tests/test_sources/one_dep/deps_only/other_dep/sources/B.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep/sources/OneDep.move b/language/tools/move-package/tests/test_sources/one_dep/sources/OneDep.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep/sources/OneDep.move
rename to language/tools/move-package/tests/test_sources/one_dep/sources/OneDep.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep/Move.exp b/language/tools/move-package/tests/test_sources/one_dep_assigned_address/Move.compiled
similarity index 74%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep/Move.exp
rename to language/tools/move-package/tests/test_sources/one_dep_assigned_address/Move.compiled
index 22183bfa02..18a1fa4ec5 100644
--- a/language/tools/move-package/tests/test_sources/compilation/one_dep/Move.exp
+++ b/language/tools/move-package/tests/test_sources/one_dep_assigned_address/Move.compiled
@@ -15,8 +15,13 @@ CompiledPackageInfo {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
 }
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.exp b/language/tools/move-package/tests/test_sources/one_dep_assigned_address/Move.resolved
similarity index 86%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.exp
rename to language/tools/move-package/tests/test_sources/one_dep_assigned_address/Move.resolved
index 4b41c279b0..5d9b4c6b78 100644
--- a/language/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.exp
+++ b/language/tools/move-package/tests/test_sources/one_dep_assigned_address/Move.resolved
@@ -1,5 +1,5 @@
 ResolutionGraph {
-    root_package_path: "tests/test_sources/resolution/one_dep_assigned_address",
+    root_package_path: "tests/test_sources/one_dep_assigned_address",
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
@@ -9,9 +9,14 @@ ResolutionGraph {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
     root_package: SourceManifest {
         package: PackageInfo {
@@ -23,13 +28,16 @@ ResolutionGraph {
             ),
             authors: [],
             license: None,
+            custom_properties: {},
         },
         addresses: None,
         dev_address_assignments: None,
         build: None,
         dependencies: {
             "OtherDep": Dependency {
-                local: "./deps_only/other_dep",
+                kind: Local(
+                    "./deps_only/other_dep",
+                ),
                 subst: Some(
                     {
                         "A": RenameFrom(
@@ -39,7 +47,6 @@ ResolutionGraph {
                 ),
                 version: None,
                 digest: None,
-                git_info: None,
             },
         },
         dev_dependencies: {},
@@ -71,6 +78,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: Some(
                     {
@@ -103,13 +111,16 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: None,
                 dev_address_assignments: None,
                 build: None,
                 dependencies: {
                     "OtherDep": Dependency {
-                        local: "./deps_only/other_dep",
+                        kind: Local(
+                            "./deps_only/other_dep",
+                        ),
                         subst: Some(
                             {
                                 "A": RenameFrom(
@@ -119,7 +130,6 @@ ResolutionGraph {
                         ),
                         version: None,
                         digest: None,
-                        git_info: None,
                     },
                 },
                 dev_dependencies: {},
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.toml b/language/tools/move-package/tests/test_sources/one_dep_assigned_address/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep_assigned_address/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/deps_only/other_dep/Move.toml b/language/tools/move-package/tests/test_sources/one_dep_assigned_address/deps_only/other_dep/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/deps_only/other_dep/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep_assigned_address/deps_only/other_dep/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/deps_only/other_dep/sources/B.move b/language/tools/move-package/tests/test_sources/one_dep_assigned_address/deps_only/other_dep/sources/B.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/deps_only/other_dep/sources/B.move
rename to language/tools/move-package/tests/test_sources/one_dep_assigned_address/deps_only/other_dep/sources/B.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/sources/OneDep.move b/language/tools/move-package/tests/test_sources/one_dep_assigned_address/sources/OneDep.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/sources/OneDep.move
rename to language/tools/move-package/tests/test_sources/one_dep_assigned_address/sources/OneDep.move
diff --git a/language/tools/move-package/tests/test_sources/one_dep_bad_digest/Move.locked b/language/tools/move-package/tests/test_sources/one_dep_bad_digest/Move.locked
new file mode 100644
index 0000000000..97060fc306
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/one_dep_bad_digest/Move.locked
@@ -0,0 +1,8 @@
+# @generated by Move, please check-in and do not edit manually.
+
+[move]
+version = 0
+
+[[move.dependency]]
+name = "OtherDep"
+source = { local = "deps_only/other_dep", digest = "BAD_DIGEST", addr_subst = { "A" = "B" } }
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_bad_digest/Move.exp b/language/tools/move-package/tests/test_sources/one_dep_bad_digest/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep_bad_digest/Move.exp
rename to language/tools/move-package/tests/test_sources/one_dep_bad_digest/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_bad_digest/Move.toml b/language/tools/move-package/tests/test_sources/one_dep_bad_digest/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep_bad_digest/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep_bad_digest/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/Move.toml b/language/tools/move-package/tests/test_sources/one_dep_bad_digest/deps_only/other_dep/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep_bad_digest/deps_only/other_dep/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep/Move.exp b/language/tools/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.resolved
similarity index 87%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep/Move.exp
rename to language/tools/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.resolved
index b31d461580..976e714af8 100644
--- a/language/tools/move-package/tests/test_sources/resolution/one_dep/Move.exp
+++ b/language/tools/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.resolved
@@ -1,5 +1,5 @@
 ResolutionGraph {
-    root_package_path: "tests/test_sources/resolution/one_dep",
+    root_package_path: "tests/test_sources/one_dep_multiple_of_same_name",
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
@@ -9,9 +9,14 @@ ResolutionGraph {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
     root_package: SourceManifest {
         package: PackageInfo {
@@ -23,6 +28,7 @@ ResolutionGraph {
             ),
             authors: [],
             license: None,
+            custom_properties: {},
         },
         addresses: Some(
             {
@@ -35,7 +41,9 @@ ResolutionGraph {
         build: None,
         dependencies: {
             "OtherDep": Dependency {
-                local: "./deps_only/other_dep",
+                kind: Local(
+                    "./deps_only/other_dep",
+                ),
                 subst: Some(
                     {
                         "A": RenameFrom(
@@ -45,7 +53,6 @@ ResolutionGraph {
                 ),
                 version: None,
                 digest: None,
-                git_info: None,
             },
         },
         dev_dependencies: {},
@@ -77,6 +84,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: Some(
                     {
@@ -107,6 +115,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: Some(
                     {
@@ -119,7 +128,9 @@ ResolutionGraph {
                 build: None,
                 dependencies: {
                     "OtherDep": Dependency {
-                        local: "./deps_only/other_dep",
+                        kind: Local(
+                            "./deps_only/other_dep",
+                        ),
                         subst: Some(
                             {
                                 "A": RenameFrom(
@@ -129,7 +140,6 @@ ResolutionGraph {
                         ),
                         version: None,
                         digest: None,
-                        git_info: None,
                     },
                 },
                 dev_dependencies: {},
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep/Move.toml b/language/tools/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep_multiple_of_same_name/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/dep_good_digest/deps_only/other_dep/Move.toml b/language/tools/move-package/tests/test_sources/one_dep_multiple_of_same_name/deps_only/other_dep/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/dep_good_digest/deps_only/other_dep/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep_multiple_of_same_name/deps_only/other_dep/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.exp b/language/tools/move-package/tests/test_sources/one_dep_reassigned_address/Move.resolved
similarity index 87%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.exp
rename to language/tools/move-package/tests/test_sources/one_dep_reassigned_address/Move.resolved
index 28a4ce5a7f..230705d377 100644
--- a/language/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.exp
+++ b/language/tools/move-package/tests/test_sources/one_dep_reassigned_address/Move.resolved
@@ -1,5 +1,5 @@
 ResolutionGraph {
-    root_package_path: "tests/test_sources/resolution/one_dep_reassigned_address",
+    root_package_path: "tests/test_sources/one_dep_reassigned_address",
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
@@ -9,9 +9,14 @@ ResolutionGraph {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
     root_package: SourceManifest {
         package: PackageInfo {
@@ -23,6 +28,7 @@ ResolutionGraph {
             ),
             authors: [],
             license: None,
+            custom_properties: {},
         },
         addresses: Some(
             {
@@ -35,7 +41,9 @@ ResolutionGraph {
         build: None,
         dependencies: {
             "OtherDep": Dependency {
-                local: "./deps_only/other_dep",
+                kind: Local(
+                    "./deps_only/other_dep",
+                ),
                 subst: Some(
                     {
                         "A": RenameFrom(
@@ -45,7 +53,6 @@ ResolutionGraph {
                 ),
                 version: None,
                 digest: None,
-                git_info: None,
             },
         },
         dev_dependencies: {},
@@ -77,6 +84,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: Some(
                     {
@@ -109,6 +117,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: Some(
                     {
@@ -121,7 +130,9 @@ ResolutionGraph {
                 build: None,
                 dependencies: {
                     "OtherDep": Dependency {
-                        local: "./deps_only/other_dep",
+                        kind: Local(
+                            "./deps_only/other_dep",
+                        ),
                         subst: Some(
                             {
                                 "A": RenameFrom(
@@ -131,7 +142,6 @@ ResolutionGraph {
                         ),
                         version: None,
                         digest: None,
-                        git_info: None,
                     },
                 },
                 dev_dependencies: {},
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.toml b/language/tools/move-package/tests/test_sources/one_dep_reassigned_address/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep_reassigned_address/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/deps_only/other_dep/Move.toml b/language/tools/move-package/tests/test_sources/one_dep_reassigned_address/deps_only/other_dep/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/deps_only/other_dep/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep_reassigned_address/deps_only/other_dep/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.exp b/language/tools/move-package/tests/test_sources/one_dep_renamed/Move.compiled
similarity index 74%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.exp
rename to language/tools/move-package/tests/test_sources/one_dep_renamed/Move.compiled
index 22183bfa02..18a1fa4ec5 100644
--- a/language/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.exp
+++ b/language/tools/move-package/tests/test_sources/one_dep_renamed/Move.compiled
@@ -15,8 +15,13 @@ CompiledPackageInfo {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
 }
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.toml b/language/tools/move-package/tests/test_sources/one_dep_renamed/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep_renamed/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep/deps_only/other_dep/Move.toml b/language/tools/move-package/tests/test_sources/one_dep_renamed/deps_only/other_dep/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep/deps_only/other_dep/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep_renamed/deps_only/other_dep/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_renamed/deps_only/other_dep/sources/T.move b/language/tools/move-package/tests/test_sources/one_dep_renamed/deps_only/other_dep/sources/T.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_renamed/deps_only/other_dep/sources/T.move
rename to language/tools/move-package/tests/test_sources/one_dep_renamed/deps_only/other_dep/sources/T.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_renamed/sources/M.move b/language/tools/move-package/tests/test_sources/one_dep_renamed/sources/M.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_renamed/sources/M.move
rename to language/tools/move-package/tests/test_sources/one_dep_renamed/sources/M.move
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.exp b/language/tools/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.resolved
similarity index 87%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.exp
rename to language/tools/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.resolved
index c589b3e8ff..21829cbabf 100644
--- a/language/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.exp
+++ b/language/tools/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.resolved
@@ -1,5 +1,5 @@
 ResolutionGraph {
-    root_package_path: "tests/test_sources/resolution/one_dep_unification_across_local_renamings",
+    root_package_path: "tests/test_sources/one_dep_unification_across_local_renamings",
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
@@ -9,9 +9,14 @@ ResolutionGraph {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
     root_package: SourceManifest {
         package: PackageInfo {
@@ -23,6 +28,7 @@ ResolutionGraph {
             ),
             authors: [],
             license: None,
+            custom_properties: {},
         },
         addresses: Some(
             {
@@ -35,7 +41,9 @@ ResolutionGraph {
         build: None,
         dependencies: {
             "OtherDep": Dependency {
-                local: "./deps_only/other_dep",
+                kind: Local(
+                    "./deps_only/other_dep",
+                ),
                 subst: Some(
                     {
                         "A": RenameFrom(
@@ -45,7 +53,6 @@ ResolutionGraph {
                 ),
                 version: None,
                 digest: None,
-                git_info: None,
             },
         },
         dev_dependencies: {},
@@ -77,6 +84,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: Some(
                     {
@@ -107,6 +115,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: Some(
                     {
@@ -119,7 +128,9 @@ ResolutionGraph {
                 build: None,
                 dependencies: {
                     "OtherDep": Dependency {
-                        local: "./deps_only/other_dep",
+                        kind: Local(
+                            "./deps_only/other_dep",
+                        ),
                         subst: Some(
                             {
                                 "A": RenameFrom(
@@ -129,7 +140,6 @@ ResolutionGraph {
                         ),
                         version: None,
                         digest: None,
-                        git_info: None,
                     },
                 },
                 dev_dependencies: {},
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.toml b/language/tools/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep_unification_across_local_renamings/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_bad_digest/deps_only/other_dep/Move.toml b/language/tools/move-package/tests/test_sources/one_dep_unification_across_local_renamings/deps_only/other_dep/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep_bad_digest/deps_only/other_dep/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep_unification_across_local_renamings/deps_only/other_dep/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move.resolved b/language/tools/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move.resolved
new file mode 100644
index 0000000000..fbde59a906
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move.resolved
@@ -0,0 +1 @@
+Unable to resolve packages for package 'Root': Unable to resolve named address 'A' in package 'Root' when resolving dependencies: Attempted to assign a different value '0x1' to an a already-assigned named address '0x2'
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings_with_resolution/Move.toml b/language/tools/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings_with_resolution/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/deps_only/other_dep/Move.toml b/language/tools/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/deps_only/other_dep/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/deps_only/other_dep/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep_unification_across_local_renamings_with_resolution/deps_only/other_dep/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/one_dep_with_scripts/Move.compiled b/language/tools/move-package/tests/test_sources/one_dep_with_scripts/Move.compiled
new file mode 100644
index 0000000000..18a1fa4ec5
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/one_dep_with_scripts/Move.compiled
@@ -0,0 +1,27 @@
+CompiledPackageInfo {
+    package_name: "Root",
+    address_alias_instantiation: {
+        "A": 00000000000000000000000000000001,
+    },
+    source_digest: Some(
+        "ELIDED_FOR_TEST",
+    ),
+    build_flags: BuildConfig {
+        dev_mode: true,
+        test_mode: false,
+        generate_docs: false,
+        generate_abis: false,
+        install_dir: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
+        additional_named_addresses: {},
+        architecture: None,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
+    },
+}
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep/Move.toml b/language/tools/move-package/tests/test_sources/one_dep_with_scripts/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep_with_scripts/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/deps_only/other_dep/Move.toml b/language/tools/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/deps_only/other_dep/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/scripts/b_script.move b/language/tools/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/scripts/b_script.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/scripts/b_script.move
rename to language/tools/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/scripts/b_script.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/sources/B.move b/language/tools/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/sources/B.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/sources/B.move
rename to language/tools/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/sources/B.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/sources/a_script.move b/language/tools/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/sources/a_script.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/deps_only/other_dep/sources/a_script.move
rename to language/tools/move-package/tests/test_sources/one_dep_with_scripts/deps_only/other_dep/sources/a_script.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/doc_templates/script_template.md b/language/tools/move-package/tests/test_sources/one_dep_with_scripts/doc_templates/script_template.md
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/doc_templates/script_template.md
rename to language/tools/move-package/tests/test_sources/one_dep_with_scripts/doc_templates/script_template.md
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/examples/Example.move b/language/tools/move-package/tests/test_sources/one_dep_with_scripts/examples/Example.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/examples/Example.move
rename to language/tools/move-package/tests/test_sources/one_dep_with_scripts/examples/Example.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/sources/OneDep.move b/language/tools/move-package/tests/test_sources/one_dep_with_scripts/sources/OneDep.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/sources/OneDep.move
rename to language/tools/move-package/tests/test_sources/one_dep_with_scripts/sources/OneDep.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/sources/a_script.move b/language/tools/move-package/tests/test_sources/one_dep_with_scripts/sources/a_script.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/sources/a_script.move
rename to language/tools/move-package/tests/test_sources/one_dep_with_scripts/sources/a_script.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/sources/b_script.move b/language/tools/move-package/tests/test_sources/one_dep_with_scripts/sources/b_script.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/sources/b_script.move
rename to language/tools/move-package/tests/test_sources/one_dep_with_scripts/sources/b_script.move
diff --git a/language/tools/move-package/tests/test_sources/one_dep_wrong_name/Move.resolved b/language/tools/move-package/tests/test_sources/one_dep_wrong_name/Move.resolved
new file mode 100644
index 0000000000..a687a2e642
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/one_dep_wrong_name/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'Root': Name of dependency declared in package 'WrongNameForDep' does not match dependency's package name 'OtherDep'
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_wrong_name/Move.toml b/language/tools/move-package/tests/test_sources/one_dep_wrong_name/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep_wrong_name/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep_wrong_name/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/deps_only/other_dep/Move.toml b/language/tools/move-package/tests/test_sources/one_dep_wrong_name/deps_only/other_dep/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/deps_only/other_dep/Move.toml
rename to language/tools/move-package/tests/test_sources/one_dep_wrong_name/deps_only/other_dep/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/package_hooks/Move.resolved b/language/tools/move-package/tests/test_sources/package_hooks/Move.resolved
new file mode 100644
index 0000000000..c942874984
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/package_hooks/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'test': Fetching 'Pkg': TestHooks resolve dep "Pkg" = "localhost:8080" "Pkg" "0x1" ""
diff --git a/language/tools/move-package/tests/test_sources/package_hooks/Move.toml b/language/tools/move-package/tests/test_sources/package_hooks/Move.toml
new file mode 100644
index 0000000000..589f8adcfa
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/package_hooks/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[dependencies]
+Pkg = { custom = "localhost:8080", address = "0x1" }
diff --git a/language/tools/move-package/tests/test_sources/package_hooks_subdir/Move.resolved b/language/tools/move-package/tests/test_sources/package_hooks_subdir/Move.resolved
new file mode 100644
index 0000000000..f855ef689a
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/package_hooks_subdir/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'test': Fetching 'Pkg': TestHooks resolve dep "Pkg" = "localhost:8080" "Pkg" "0x1" "foo/bar"
diff --git a/language/tools/move-package/tests/test_sources/package_hooks_subdir/Move.toml b/language/tools/move-package/tests/test_sources/package_hooks_subdir/Move.toml
new file mode 100644
index 0000000000..5529e018be
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/package_hooks_subdir/Move.toml
@@ -0,0 +1,6 @@
+[package]
+name = "test"
+version = "0.0.0"
+
+[dependencies]
+Pkg = { custom = "localhost:8080", address = "0x1", subdir = "foo/bar" }
diff --git a/language/tools/move-package/tests/test_sources/parsing/full_manifest/Move.exp b/language/tools/move-package/tests/test_sources/parsing/full_manifest/Move.exp
deleted file mode 100644
index c60acf56d9..0000000000
--- a/language/tools/move-package/tests/test_sources/parsing/full_manifest/Move.exp
+++ /dev/null
@@ -1 +0,0 @@
-Unable to resolve packages for package 'name': While resolving dependency 'A' in package 'name': While processing dependency 'A': Unable to find package manifest for 'A' at "Move.toml/tests/test_sources/parsing/full_manifest/../a"
diff --git a/language/tools/move-package/tests/test_sources/parsing/full_manifest_with_extra_field/Move.exp b/language/tools/move-package/tests/test_sources/parsing/full_manifest_with_extra_field/Move.exp
deleted file mode 100644
index 6f6b481e8b..0000000000
--- a/language/tools/move-package/tests/test_sources/parsing/full_manifest_with_extra_field/Move.exp
+++ /dev/null
@@ -1 +0,0 @@
-Unable to resolve packages for package 'name': While resolving dependency 'A' in package 'name': While processing dependency 'A': Unable to find package manifest for 'A' at "Move.toml/tests/test_sources/parsing/full_manifest_with_extra_field/../a"
diff --git a/language/tools/move-package/tests/test_sources/parsing/invalid_hex_address_in_subst/Move.exp b/language/tools/move-package/tests/test_sources/parsing/invalid_hex_address_in_subst/Move.exp
deleted file mode 100644
index 472e2ca856..0000000000
--- a/language/tools/move-package/tests/test_sources/parsing/invalid_hex_address_in_subst/Move.exp
+++ /dev/null
@@ -1 +0,0 @@
-Unable to resolve packages for package 'name': While resolving dependency 'A' in package 'name': While processing dependency 'A': Unable to find package manifest for 'A' at "Move.toml/tests/test_sources/parsing/invalid_hex_address_in_subst/a"
diff --git a/language/tools/move-package/tests/test_sources/parsing/no_path_set_for_dependency/Move.exp b/language/tools/move-package/tests/test_sources/parsing/no_path_set_for_dependency/Move.exp
deleted file mode 100644
index 53e2632f8f..0000000000
--- a/language/tools/move-package/tests/test_sources/parsing/no_path_set_for_dependency/Move.exp
+++ /dev/null
@@ -1 +0,0 @@
-Error parsing '[dependencies]' section of manifest: both 'local' and 'git' paths not specified for dependency.
diff --git a/language/tools/move-package/tests/test_sources/parsing/non_identifier_address_name_in_subst/Move.exp b/language/tools/move-package/tests/test_sources/parsing/non_identifier_address_name_in_subst/Move.exp
deleted file mode 100644
index fd881cca31..0000000000
--- a/language/tools/move-package/tests/test_sources/parsing/non_identifier_address_name_in_subst/Move.exp
+++ /dev/null
@@ -1 +0,0 @@
-Unable to resolve packages for package 'name': While resolving dependency 'A' in package 'name': While processing dependency 'A': Unable to find package manifest for 'A' at "Move.toml/tests/test_sources/parsing/non_identifier_address_name_in_subst/a"
diff --git a/language/tools/move-package/tests/test_sources/parsing/unknown_toplevel_field/Move.exp b/language/tools/move-package/tests/test_sources/parsing/unknown_toplevel_field/Move.exp
deleted file mode 100644
index 973224a2b4..0000000000
--- a/language/tools/move-package/tests/test_sources/parsing/unknown_toplevel_field/Move.exp
+++ /dev/null
@@ -1 +0,0 @@
-Unable to resolve packages for package 'name': While resolving dependency 'A' in package 'name': While processing dependency 'A': Unable to find package manifest for 'A' at "Move.toml/tests/test_sources/parsing/unknown_toplevel_field/../a"
diff --git a/language/tools/move-package/tests/test_sources/parsing/duplicate_address_names/Move.exp b/language/tools/move-package/tests/test_sources/parsing_duplicate_address_names/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/duplicate_address_names/Move.exp
rename to language/tools/move-package/tests/test_sources/parsing_duplicate_address_names/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/parsing/duplicate_address_names/Move.toml b/language/tools/move-package/tests/test_sources/parsing_duplicate_address_names/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/duplicate_address_names/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_duplicate_address_names/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing/duplicate_top_level_field/Move.exp b/language/tools/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/duplicate_top_level_field/Move.exp
rename to language/tools/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/parsing/duplicate_top_level_field/Move.toml b/language/tools/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/duplicate_top_level_field/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_duplicate_top_level_field/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing_full_manifest/Move.resolved b/language/tools/move-package/tests/test_sources/parsing_full_manifest/Move.resolved
new file mode 100644
index 0000000000..e8a8e57d5d
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/parsing_full_manifest/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'name': Parsing manifest for 'A': Unable to find package manifest for 'A' at "tests/test_sources/parsing_full_manifest/../a/Move.toml": No such file or directory (os error 2)
diff --git a/language/tools/move-package/tests/test_sources/parsing/full_manifest/Move.toml b/language/tools/move-package/tests/test_sources/parsing_full_manifest/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/full_manifest/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_full_manifest/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move.resolved b/language/tools/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move.resolved
new file mode 100644
index 0000000000..3095528361
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'name': Parsing manifest for 'A': Unable to find package manifest for 'A' at "tests/test_sources/parsing_full_manifest_with_extra_field/../a/Move.toml": No such file or directory (os error 2)
diff --git a/language/tools/move-package/tests/test_sources/parsing/full_manifest_with_extra_field/Move.toml b/language/tools/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/full_manifest_with_extra_field/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_full_manifest_with_extra_field/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing/integer_subst_in_dependency/Move.exp b/language/tools/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/integer_subst_in_dependency/Move.exp
rename to language/tools/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/parsing/integer_subst_in_dependency/Move.toml b/language/tools/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/integer_subst_in_dependency/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_integer_subst_in_dependency/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing/invalid_author/Move.exp b/language/tools/move-package/tests/test_sources/parsing_invalid_author/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/invalid_author/Move.exp
rename to language/tools/move-package/tests/test_sources/parsing_invalid_author/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/parsing/invalid_author/Move.toml b/language/tools/move-package/tests/test_sources/parsing_invalid_author/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/invalid_author/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_invalid_author/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing/invalid_authors/Move.exp b/language/tools/move-package/tests/test_sources/parsing_invalid_authors/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/invalid_authors/Move.exp
rename to language/tools/move-package/tests/test_sources/parsing_invalid_authors/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/parsing/invalid_authors/Move.toml b/language/tools/move-package/tests/test_sources/parsing_invalid_authors/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/invalid_authors/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_invalid_authors/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move.resolved b/language/tools/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move.resolved
new file mode 100644
index 0000000000..0a875f9c96
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'name': Parsing manifest for 'A': Unable to find package manifest for 'A' at "tests/test_sources/parsing_invalid_hex_address_in_subst/a/Move.toml": No such file or directory (os error 2)
diff --git a/language/tools/move-package/tests/test_sources/parsing/invalid_hex_address_in_subst/Move.toml b/language/tools/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/invalid_hex_address_in_subst/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_invalid_hex_address_in_subst/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.exp b/language/tools/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.resolved
similarity index 83%
rename from language/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.exp
rename to language/tools/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.resolved
index d23ee43c4f..18e215c758 100644
--- a/language/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.exp
+++ b/language/tools/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.resolved
@@ -1,5 +1,5 @@
 ResolutionGraph {
-    root_package_path: "tests/test_sources/parsing/invalid_identifier_package_name",
+    root_package_path: "tests/test_sources/parsing_invalid_identifier_package_name",
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
@@ -9,9 +9,14 @@ ResolutionGraph {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
     root_package: SourceManifest {
         package: PackageInfo {
@@ -23,6 +28,7 @@ ResolutionGraph {
             ),
             authors: [],
             license: None,
+            custom_properties: {},
         },
         addresses: None,
         dev_address_assignments: None,
@@ -46,6 +52,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: None,
                 dev_address_assignments: None,
diff --git a/language/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.toml b/language/tools/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_invalid_identifier_package_name/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.exp b/language/tools/move-package/tests/test_sources/parsing_minimal_manifest/Move.resolved
similarity index 83%
rename from language/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.exp
rename to language/tools/move-package/tests/test_sources/parsing_minimal_manifest/Move.resolved
index b09f78d7dd..9c54dfe415 100644
--- a/language/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.exp
+++ b/language/tools/move-package/tests/test_sources/parsing_minimal_manifest/Move.resolved
@@ -1,5 +1,5 @@
 ResolutionGraph {
-    root_package_path: "tests/test_sources/parsing/minimal_manifest",
+    root_package_path: "tests/test_sources/parsing_minimal_manifest",
     build_options: BuildConfig {
         dev_mode: true,
         test_mode: false,
@@ -9,9 +9,14 @@ ResolutionGraph {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
     root_package: SourceManifest {
         package: PackageInfo {
@@ -23,6 +28,7 @@ ResolutionGraph {
             ),
             authors: [],
             license: None,
+            custom_properties: {},
         },
         addresses: None,
         dev_address_assignments: None,
@@ -46,6 +52,7 @@ ResolutionGraph {
                     ),
                     authors: [],
                     license: None,
+                    custom_properties: {},
                 },
                 addresses: None,
                 dev_address_assignments: None,
diff --git a/language/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.toml b/language/tools/move-package/tests/test_sources/parsing_minimal_manifest/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_minimal_manifest/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_name/Move.exp b/language/tools/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_name/Move.exp
rename to language/tools/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_name/Move.toml b/language/tools/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_name/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_missing_minimal_required_field_name/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_version/Move.exp b/language/tools/move-package/tests/test_sources/parsing_missing_minimal_required_field_version/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_version/Move.exp
rename to language/tools/move-package/tests/test_sources/parsing_missing_minimal_required_field_version/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_version/Move.toml b/language/tools/move-package/tests/test_sources/parsing_missing_minimal_required_field_version/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/missing_minimal_required_field_version/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_missing_minimal_required_field_version/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing/missing_required_package_segment/Move.exp b/language/tools/move-package/tests/test_sources/parsing_missing_required_package_segment/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/missing_required_package_segment/Move.exp
rename to language/tools/move-package/tests/test_sources/parsing_missing_required_package_segment/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/parsing/missing_required_package_segment/Move.toml b/language/tools/move-package/tests/test_sources/parsing_missing_required_package_segment/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/missing_required_package_segment/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_missing_required_package_segment/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move.resolved b/language/tools/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move.resolved
new file mode 100644
index 0000000000..8c3567f859
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move.resolved
@@ -0,0 +1 @@
+Error parsing '[dependencies]' section of manifest: must provide exactly one of 'local' or 'git' or 'custom' for dependency.
diff --git a/language/tools/move-package/tests/test_sources/parsing/no_path_set_for_dependency/Move.toml b/language/tools/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/no_path_set_for_dependency/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_no_path_set_for_dependency/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move.resolved b/language/tools/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move.resolved
new file mode 100644
index 0000000000..71f9626b9e
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'name': Parsing manifest for 'A': Unable to find package manifest for 'A' at "tests/test_sources/parsing_non_identifier_address_name_in_subst/a/Move.toml": No such file or directory (os error 2)
diff --git a/language/tools/move-package/tests/test_sources/parsing/non_identifier_address_name_in_subst/Move.toml b/language/tools/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/non_identifier_address_name_in_subst/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_non_identifier_address_name_in_subst/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing/non_string_address_name/Move.exp b/language/tools/move-package/tests/test_sources/parsing_non_string_address_name/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/non_string_address_name/Move.exp
rename to language/tools/move-package/tests/test_sources/parsing_non_string_address_name/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/parsing/non_string_address_name/Move.toml b/language/tools/move-package/tests/test_sources/parsing_non_string_address_name/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/non_string_address_name/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_non_string_address_name/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing/non_string_address_value/Move.exp b/language/tools/move-package/tests/test_sources/parsing_non_string_address_value/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/non_string_address_value/Move.exp
rename to language/tools/move-package/tests/test_sources/parsing_non_string_address_value/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/parsing/non_string_address_value/Move.toml b/language/tools/move-package/tests/test_sources/parsing_non_string_address_value/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/non_string_address_value/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_non_string_address_value/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing/non_string_local_dep_path/Move.exp b/language/tools/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/non_string_local_dep_path/Move.exp
rename to language/tools/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/parsing/non_string_local_dep_path/Move.toml b/language/tools/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/non_string_local_dep_path/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_non_string_local_dep_path/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing/non_string_package_name/Move.exp b/language/tools/move-package/tests/test_sources/parsing_non_string_package_name/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/non_string_package_name/Move.exp
rename to language/tools/move-package/tests/test_sources/parsing_non_string_package_name/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/parsing/non_string_package_name/Move.toml b/language/tools/move-package/tests/test_sources/parsing_non_string_package_name/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/non_string_package_name/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_non_string_package_name/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing/too_many_entries_renaming_instantiation/Move.exp b/language/tools/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/too_many_entries_renaming_instantiation/Move.exp
rename to language/tools/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/parsing/too_many_entries_renaming_instantiation/Move.toml b/language/tools/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/too_many_entries_renaming_instantiation/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_too_many_entries_renaming_instantiation/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing/uninstantiated_dev_address/Move.exp b/language/tools/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/uninstantiated_dev_address/Move.exp
rename to language/tools/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/parsing/uninstantiated_dev_address/Move.toml b/language/tools/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/uninstantiated_dev_address/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_uninstantiated_dev_address/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move.resolved b/language/tools/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move.resolved
new file mode 100644
index 0000000000..c66954f998
--- /dev/null
+++ b/language/tools/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move.resolved
@@ -0,0 +1 @@
+Failed to resolve dependencies for package 'name': Parsing manifest for 'A': Unable to find package manifest for 'A' at "tests/test_sources/parsing_unknown_toplevel_field/../a/Move.toml": No such file or directory (os error 2)
diff --git a/language/tools/move-package/tests/test_sources/parsing/unknown_toplevel_field/Move.toml b/language/tools/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/unknown_toplevel_field/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_unknown_toplevel_field/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing/version_not_a_string/Move.exp b/language/tools/move-package/tests/test_sources/parsing_version_not_a_string/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/version_not_a_string/Move.exp
rename to language/tools/move-package/tests/test_sources/parsing_version_not_a_string/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/parsing/version_not_a_string/Move.toml b/language/tools/move-package/tests/test_sources/parsing_version_not_a_string/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/version_not_a_string/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_version_not_a_string/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version/Move.exp b/language/tools/move-package/tests/test_sources/parsing_version_not_a_valid_version/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version/Move.exp
rename to language/tools/move-package/tests/test_sources/parsing_version_not_a_valid_version/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version/Move.toml b/language/tools/move-package/tests/test_sources/parsing_version_not_a_valid_version/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_version_not_a_valid_version/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version_not_numbers/Move.exp b/language/tools/move-package/tests/test_sources/parsing_version_not_a_valid_version_not_numbers/Move.resolved
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version_not_numbers/Move.exp
rename to language/tools/move-package/tests/test_sources/parsing_version_not_a_valid_version_not_numbers/Move.resolved
diff --git a/language/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version_not_numbers/Move.toml b/language/tools/move-package/tests/test_sources/parsing_version_not_a_valid_version_not_numbers/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/parsing/version_not_a_valid_version_not_numbers/Move.toml
rename to language/tools/move-package/tests/test_sources/parsing_version_not_a_valid_version_not_numbers/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.toml b/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.toml
deleted file mode 100644
index 982d4b55aa..0000000000
--- a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-name = "test"
-version = "0.0.0"
-
-[addresses]
-A = "_"
-
-[dev-addresses]
-A = "0x1"
diff --git a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/deps_only/A/Move.toml b/language/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/deps_only/A/Move.toml
deleted file mode 100644
index 888b3327ae..0000000000
--- a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/deps_only/A/Move.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[package]
-name = "A"
-version = "0.0.0"
-
-[dependencies]
-C = { local = "../C", addr_subst = { "AA" = "A" } }
diff --git a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/deps_only/B/Move.toml b/language/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/deps_only/B/Move.toml
deleted file mode 100644
index 371dcbcd31..0000000000
--- a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_conflict/deps_only/B/Move.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[package]
-name = "B"
-version = "0.0.0"
-
-[dependencies]
-C = { local = "../C", addr_subst = { "BA" = "A" } }
diff --git a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.toml b/language/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.toml
deleted file mode 100644
index 1b9714b180..0000000000
--- a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[package]
-name = "Root"
-version = "0.0.0"
-
-[dependencies]
-A = { local = "./deps_only/A", addr_subst = { "AA" = "0x1" } }
-B = { local = "./deps_only/B", addr_subst = { "BA" = "0x1" } }
diff --git a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/deps_only/A/Move.toml b/language/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/deps_only/A/Move.toml
deleted file mode 100644
index 888b3327ae..0000000000
--- a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/deps_only/A/Move.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[package]
-name = "A"
-version = "0.0.0"
-
-[dependencies]
-C = { local = "../C", addr_subst = { "AA" = "A" } }
diff --git a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/deps_only/B/Move.toml b/language/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/deps_only/B/Move.toml
deleted file mode 100644
index 371dcbcd31..0000000000
--- a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/deps_only/B/Move.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[package]
-name = "B"
-version = "0.0.0"
-
-[dependencies]
-C = { local = "../C", addr_subst = { "BA" = "A" } }
diff --git a/language/tools/move-package/tests/test_sources/resolution/direct_cyclic_dep/Move.exp b/language/tools/move-package/tests/test_sources/resolution/direct_cyclic_dep/Move.exp
deleted file mode 100644
index 9fb19a1e1a..0000000000
--- a/language/tools/move-package/tests/test_sources/resolution/direct_cyclic_dep/Move.exp
+++ /dev/null
@@ -1 +0,0 @@
-Unable to resolve packages for package 'Root': While resolving dependency 'Other' in package 'Root': Unable to resolve package dependency 'Other': While resolving dependency 'Root' in package 'Other': Unable to resolve package dependency 'Root': Found cycle between packages: Root -> Other -> Root
diff --git a/language/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/Move.exp b/language/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/Move.exp
deleted file mode 100644
index 2cb6025bd6..0000000000
--- a/language/tools/move-package/tests/test_sources/resolution/longer_cyclic_dep/Move.exp
+++ /dev/null
@@ -1 +0,0 @@
-Unable to resolve packages for package 'Root': While resolving dependency 'A' in package 'Root': Unable to resolve package dependency 'A': While resolving dependency 'B' in package 'A': Unable to resolve package dependency 'B': While resolving dependency 'Root' in package 'B': Unable to resolve package dependency 'Root': Found cycle between packages: Root -> A -> B -> Root
diff --git a/language/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.toml b/language/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.toml
deleted file mode 100644
index 6bac3c7efc..0000000000
--- a/language/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[package]
-name = "test"
-version = "0.0.0"
-
-[dependencies]
-C = { local = "./deps_only/C", addr_subst = {"CA" = "A" } }
-D = { local = "./deps_only/D" , addr_subst = {"DA" = "A" } }
diff --git a/language/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/deps_only/C/Move.toml b/language/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/deps_only/C/Move.toml
deleted file mode 100644
index a5bcadbfb6..0000000000
--- a/language/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/deps_only/C/Move.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[package]
-name = "C"
-version = "0.0.0"
-
-[addresses]
-A = "0x1"
diff --git a/language/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/deps_only/D/Move.toml b/language/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/deps_only/D/Move.toml
deleted file mode 100644
index f12fed32cb..0000000000
--- a/language/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/deps_only/D/Move.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[package]
-name = "D"
-version = "0.0.0"
-
-[addresses]
-A = "0x2"
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings_with_resolution/Move.exp b/language/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings_with_resolution/Move.exp
deleted file mode 100644
index 32b51249fe..0000000000
--- a/language/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings_with_resolution/Move.exp
+++ /dev/null
@@ -1 +0,0 @@
-Unable to resolve packages for package 'Root': Unable to resolve named address 'A' inpackage 'Root' when resolving dependencies: Attempted to assign a different value '0x1' to an a already-assigned named address '0x2'
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings_with_resolution/deps_only/other_dep/Move.toml b/language/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings_with_resolution/deps_only/other_dep/Move.toml
deleted file mode 100644
index 1cf4e4c222..0000000000
--- a/language/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings_with_resolution/deps_only/other_dep/Move.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[package]
-name = "OtherDep"
-version = "0.0.0"
-
-[addresses]
-B = "0x2"
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_wrong_name/Move.exp b/language/tools/move-package/tests/test_sources/resolution/one_dep_wrong_name/Move.exp
deleted file mode 100644
index 99b2c1ac45..0000000000
--- a/language/tools/move-package/tests/test_sources/resolution/one_dep_wrong_name/Move.exp
+++ /dev/null
@@ -1 +0,0 @@
-Unable to resolve packages for package 'Root': While resolving dependency 'WrongNameForDep' in package 'Root': Name of dependency declared in package 'WrongNameForDep' does not match dependency's package name 'OtherDep'
diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_wrong_name/deps_only/other_dep/Move.toml b/language/tools/move-package/tests/test_sources/resolution/one_dep_wrong_name/deps_only/other_dep/Move.toml
deleted file mode 100644
index e0af1caa59..0000000000
--- a/language/tools/move-package/tests/test_sources/resolution/one_dep_wrong_name/deps_only/other_dep/Move.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[package]
-name = "OtherDep"
-version = "0.0.0"
-
-[addresses]
-B = "_"
diff --git a/language/tools/move-package/tests/test_sources/resolution/sources/B.move b/language/tools/move-package/tests/test_sources/sources/B.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/resolution/sources/B.move
rename to language/tools/move-package/tests/test_sources/sources/B.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.exp b/language/tools/move-package/tests/test_sources/test_symlinks/Move.compiled
similarity index 74%
rename from language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.exp
rename to language/tools/move-package/tests/test_sources/test_symlinks/Move.compiled
index 05b1b11d35..050a9e85a1 100644
--- a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.exp
+++ b/language/tools/move-package/tests/test_sources/test_symlinks/Move.compiled
@@ -15,8 +15,13 @@ CompiledPackageInfo {
             "ELIDED_FOR_TEST",
         ),
         force_recompilation: false,
+        lock_file: Some(
+            "ELIDED_FOR_TEST",
+        ),
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
+        skip_fetch_latest_git_deps: false,
+        bytecode_version: None,
     },
 }
diff --git a/language/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.toml b/language/tools/move-package/tests/test_sources/test_symlinks/Move.toml
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.toml
rename to language/tools/move-package/tests/test_sources/test_symlinks/Move.toml
diff --git a/language/tools/move-package/tests/test_sources/compilation/test_symlinks/sources/A.move b/language/tools/move-package/tests/test_sources/test_symlinks/sources/A.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/test_symlinks/sources/A.move
rename to language/tools/move-package/tests/test_sources/test_symlinks/sources/A.move
diff --git a/language/tools/move-package/tests/test_sources/compilation/test_symlinks/sources/M.move b/language/tools/move-package/tests/test_sources/test_symlinks/sources/M.move
similarity index 100%
rename from language/tools/move-package/tests/test_sources/compilation/test_symlinks/sources/M.move
rename to language/tools/move-package/tests/test_sources/test_symlinks/sources/M.move
diff --git a/language/tools/move-resource-viewer/Cargo.toml b/language/tools/move-resource-viewer/Cargo.toml
index c4dcb2bb15..d860d9ac7f 100644
--- a/language/tools/move-resource-viewer/Cargo.toml
+++ b/language/tools/move-resource-viewer/Cargo.toml
@@ -7,15 +7,16 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-bcs = "0.1.2"
 move-core-types = { path = "../../move-core/types" }
 move-binary-format = { path = "../../move-binary-format" }
 move-bytecode-utils = { path = "../move-bytecode-utils" }
 serde = { version = "1.0.124", features = ["derive", "rc"] }
 
+bcs.workspace = true
+
 anyhow = "1.0.52"
 once_cell = "1.7.2"
 hex = "0.4.3"
diff --git a/language/tools/move-resource-viewer/src/fat_type.rs b/language/tools/move-resource-viewer/src/fat_type.rs
index 3325608da9..3c0e5b3924 100644
--- a/language/tools/move-resource-viewer/src/fat_type.rs
+++ b/language/tools/move-resource-viewer/src/fat_type.rs
@@ -65,6 +65,10 @@ pub(crate) enum FatType {
     Reference(Box<FatType>),
     MutableReference(Box<FatType>),
     TyParam(usize),
+    // NOTE: Added in bytecode version v6, do not reorder!
+    U16,
+    U32,
+    U256,
 }
 
 impl FatStructType {
@@ -123,8 +127,11 @@ impl FatType {
 
             Bool => Bool,
             U8 => U8,
+            U16 => U16,
+            U32 => U32,
             U64 => U64,
             U128 => U128,
+            U256 => U256,
             Address => Address,
             Signer => Signer,
             Vector(ty) => Vector(Box::new(ty.subst(ty_args)?)),
@@ -143,12 +150,15 @@ impl FatType {
         let res = match self {
             Bool => TypeTag::Bool,
             U8 => TypeTag::U8,
+            U16 => TypeTag::U16,
+            U32 => TypeTag::U32,
             U64 => TypeTag::U64,
             U128 => TypeTag::U128,
+            U256 => TypeTag::U256,
             Address => TypeTag::Address,
             Signer => TypeTag::Signer,
             Vector(ty) => TypeTag::Vector(Box::new(ty.type_tag()?)),
-            Struct(struct_ty) => TypeTag::Struct(struct_ty.struct_tag()?),
+            Struct(struct_ty) => TypeTag::Struct(Box::new(struct_ty.struct_tag()?)),
 
             Reference(_) | MutableReference(_) | TyParam(_) => {
                 return Err(
@@ -182,8 +192,11 @@ impl TryInto<MoveTypeLayout> for &FatType {
         Ok(match self {
             FatType::Address => MoveTypeLayout::Address,
             FatType::U8 => MoveTypeLayout::U8,
+            FatType::U16 => MoveTypeLayout::U16,
+            FatType::U32 => MoveTypeLayout::U32,
             FatType::U64 => MoveTypeLayout::U64,
             FatType::U128 => MoveTypeLayout::U128,
+            FatType::U256 => MoveTypeLayout::U256,
             FatType::Bool => MoveTypeLayout::Bool,
             FatType::Vector(v) => MoveTypeLayout::Vector(Box::new(v.as_ref().try_into()?)),
             FatType::Struct(s) => MoveTypeLayout::Struct(MoveStructLayout::new(
@@ -193,8 +206,9 @@ impl TryInto<MoveTypeLayout> for &FatType {
                     .collect::<PartialVMResult<Vec<_>>>()?,
             )),
             FatType::Signer => MoveTypeLayout::Signer,
-
-            _ => return Err(PartialVMError::new(StatusCode::ABORT_TYPE_MISMATCH_ERROR)),
+            FatType::Reference(_) | FatType::MutableReference(_) | FatType::TyParam(_) => {
+                return Err(PartialVMError::new(StatusCode::ABORT_TYPE_MISMATCH_ERROR))
+            }
         })
     }
 }
diff --git a/language/tools/move-resource-viewer/src/lib.rs b/language/tools/move-resource-viewer/src/lib.rs
index 37f261a7f2..56a974e85d 100644
--- a/language/tools/move-resource-viewer/src/lib.rs
+++ b/language/tools/move-resource-viewer/src/lib.rs
@@ -18,6 +18,7 @@ use move_core_types::{
     identifier::{IdentStr, Identifier},
     language_storage::{ModuleId, StructTag, TypeTag},
     resolver::MoveResolver,
+    u256,
     value::{MoveStruct, MoveTypeLayout, MoveValue},
     vm_status::VMStatus,
 };
@@ -53,6 +54,10 @@ pub enum AnnotatedMoveValue {
     Vector(TypeTag, Vec<AnnotatedMoveValue>),
     Bytes(Vec<u8>),
     Struct(AnnotatedMoveStruct),
+    // NOTE: Added in bytecode version v6, do not reorder!
+    U16(u16),
+    U32(u32),
+    U256(u256::U256),
 }
 
 impl AnnotatedMoveValue {
@@ -60,13 +65,16 @@ impl AnnotatedMoveValue {
         use AnnotatedMoveValue::*;
         match self {
             U8(_) => TypeTag::U8,
+            U16(_) => TypeTag::U16,
+            U32(_) => TypeTag::U32,
             U64(_) => TypeTag::U64,
             U128(_) => TypeTag::U128,
+            U256(_) => TypeTag::U256,
             Bool(_) => TypeTag::Bool,
             Address(_) => TypeTag::Address,
             Vector(t, _) => t.clone(),
             Bytes(_) => TypeTag::Vector(Box::new(TypeTag::U8)),
-            Struct(s) => TypeTag::Struct(s.type_.clone()),
+            Struct(s) => TypeTag::Struct(Box::new(s.type_.clone())),
         }
     }
 }
@@ -115,7 +123,18 @@ impl<'a, T: MoveResolver + ?Sized> MoveValueAnnotator<'a, T> {
             .filter(|t| match t {
                 FatType::Signer => false,
                 FatType::Reference(inner) => !matches!(&**inner, FatType::Signer),
-                _ => true,
+                FatType::Bool
+                | FatType::U8
+                | FatType::U64
+                | FatType::U128
+                | FatType::Address
+                | FatType::Vector(_)
+                | FatType::Struct(_)
+                | FatType::MutableReference(_)
+                | FatType::TyParam(_)
+                | FatType::U16
+                | FatType::U32
+                | FatType::U256 => true,
             })
             .collect();
         anyhow::ensure!(
@@ -194,8 +213,11 @@ impl<'a, T: MoveResolver + ?Sized> MoveValueAnnotator<'a, T> {
         Ok(match (value, ty) {
             (MoveValue::Bool(b), FatType::Bool) => AnnotatedMoveValue::Bool(*b),
             (MoveValue::U8(i), FatType::U8) => AnnotatedMoveValue::U8(*i),
+            (MoveValue::U16(i), FatType::U16) => AnnotatedMoveValue::U16(*i),
+            (MoveValue::U32(i), FatType::U32) => AnnotatedMoveValue::U32(*i),
             (MoveValue::U64(i), FatType::U64) => AnnotatedMoveValue::U64(*i),
             (MoveValue::U128(i), FatType::U128) => AnnotatedMoveValue::U128(*i),
+            (MoveValue::U256(i), FatType::U256) => AnnotatedMoveValue::U256(*i),
             (MoveValue::Address(a), FatType::Address) => AnnotatedMoveValue::Address(*a),
             (MoveValue::Vector(a), FatType::Vector(ty)) => match ty.as_ref() {
                 FatType::U8 => AnnotatedMoveValue::Bytes(
@@ -216,7 +238,17 @@ impl<'a, T: MoveResolver + ?Sized> MoveValueAnnotator<'a, T> {
             (MoveValue::Struct(s), FatType::Struct(ty)) => {
                 AnnotatedMoveValue::Struct(self.annotate_struct(s, ty.as_ref())?)
             }
-            _ => {
+            (MoveValue::U8(_), _)
+            | (MoveValue::U64(_), _)
+            | (MoveValue::U128(_), _)
+            | (MoveValue::Bool(_), _)
+            | (MoveValue::Address(_), _)
+            | (MoveValue::Vector(_), _)
+            | (MoveValue::Struct(_), _)
+            | (MoveValue::Signer(_), _)
+            | (MoveValue::U16(_), _)
+            | (MoveValue::U32(_), _)
+            | (MoveValue::U256(_), _) => {
                 return Err(anyhow!(
                     "Cannot annotate value {:?} with type {:?}",
                     value,
@@ -246,8 +278,11 @@ fn pretty_print_value(
     match value {
         AnnotatedMoveValue::Bool(b) => write!(f, "{}", b),
         AnnotatedMoveValue::U8(v) => write!(f, "{}u8", v),
+        AnnotatedMoveValue::U16(v) => write!(f, "{}u16", v),
+        AnnotatedMoveValue::U32(v) => write!(f, "{}u32", v),
         AnnotatedMoveValue::U64(v) => write!(f, "{}", v),
         AnnotatedMoveValue::U128(v) => write!(f, "{}u128", v),
+        AnnotatedMoveValue::U256(v) => write!(f, "{}u256", v),
         AnnotatedMoveValue::Address(a) => write!(f, "{}", a.short_str_lossless()),
         AnnotatedMoveValue::Vector(_, v) => {
             writeln!(f, "[")?;
@@ -259,7 +294,7 @@ fn pretty_print_value(
             write_indent(f, indent)?;
             write!(f, "]")
         }
-        AnnotatedMoveValue::Bytes(v) => write!(f, "{}", hex::encode(&v)),
+        AnnotatedMoveValue::Bytes(v) => write!(f, "{}", hex::encode(v)),
         AnnotatedMoveValue::Struct(s) => pretty_print_struct(f, s, indent),
     }
 }
@@ -308,6 +343,8 @@ impl serde::Serialize for AnnotatedMoveValue {
         use AnnotatedMoveValue::*;
         match self {
             U8(n) => serializer.serialize_u8(*n),
+            U16(n) => serializer.serialize_u16(*n),
+            U32(n) => serializer.serialize_u32(*n),
             U64(n) => serializer.serialize_u64(*n),
             U128(n) => {
                 // TODO: we could use serializer.serialize_u128 here, but it requires the serde_json
@@ -319,6 +356,14 @@ impl serde::Serialize for AnnotatedMoveValue {
                     serializer.serialize_bytes(&n.to_le_bytes())
                 }
             }
+            U256(n) => {
+                // Copying logic & reasoning from above because if u128 is needs arb precision, u256 should too
+                if let Ok(i) = u64::try_from(*n) {
+                    serializer.serialize_u64(i)
+                } else {
+                    serializer.serialize_bytes(&n.to_le_bytes())
+                }
+            }
             Bool(b) => serializer.serialize_bool(*b),
             Address(a) => a.short_str_lossless().serialize(serializer),
             Vector(t, vals) => {
diff --git a/language/tools/move-resource-viewer/src/resolver.rs b/language/tools/move-resource-viewer/src/resolver.rs
index 18c523e90a..6550abbcb2 100644
--- a/language/tools/move-resource-viewer/src/resolver.rs
+++ b/language/tools/move-resource-viewer/src/resolver.rs
@@ -100,7 +100,10 @@ impl<'a, T: MoveResolver + ?Sized> Resolver<'a, T> {
             TypeTag::Bool => FatType::Bool,
             TypeTag::Struct(st) => FatType::Struct(Box::new(self.resolve_struct(st)?)),
             TypeTag::U8 => FatType::U8,
+            TypeTag::U16 => FatType::U16,
+            TypeTag::U32 => FatType::U32,
             TypeTag::U64 => FatType::U64,
+            TypeTag::U256 => FatType::U256,
             TypeTag::U128 => FatType::U128,
             TypeTag::Vector(ty) => FatType::Vector(Box::new(self.resolve_type(ty)?)),
         })
@@ -142,8 +145,11 @@ impl<'a, T: MoveResolver + ?Sized> Resolver<'a, T> {
         Ok(match sig {
             SignatureToken::Bool => FatType::Bool,
             SignatureToken::U8 => FatType::U8,
+            SignatureToken::U16 => FatType::U16,
+            SignatureToken::U32 => FatType::U32,
             SignatureToken::U64 => FatType::U64,
             SignatureToken::U128 => FatType::U128,
+            SignatureToken::U256 => FatType::U256,
             SignatureToken::Address => FatType::Address,
             SignatureToken::Signer => FatType::Signer,
             SignatureToken::Vector(ty) => {
diff --git a/language/tools/move-unit-test/Cargo.toml b/language/tools/move-unit-test/Cargo.toml
index 093d107057..bf1bed8167 100644
--- a/language/tools/move-unit-test/Cargo.toml
+++ b/language/tools/move-unit-test/Cargo.toml
@@ -7,15 +7,16 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
+better_any = "0.1.1"
 clap = { version = "3.1.8", features = ["derive"] }
 codespan-reporting = "0.11.1"
 colored = "2.0.0"
 rayon = "1.5.0"
-regex = "1.1.9"
+regex = "1.5.5"
 once_cell = "1.7.2"
 itertools = "0.10.1"
 
diff --git a/language/tools/move-unit-test/src/cargo_runner.rs b/language/tools/move-unit-test/src/cargo_runner.rs
index c17428d39d..0784e5ebad 100644
--- a/language/tools/move-unit-test/src/cargo_runner.rs
+++ b/language/tools/move-unit-test/src/cargo_runner.rs
@@ -4,6 +4,7 @@
 
 use move_command_line_common::files::find_filenames;
 use move_vm_runtime::native_functions::NativeFunctionTable;
+use move_vm_test_utils::gas_schedule::CostTable;
 
 use crate::UnitTestingConfig;
 
@@ -13,6 +14,7 @@ pub fn run_tests_with_config_and_filter(
     source_pattern: &str,
     dep_root: Option<&str>,
     native_function_table: Option<NativeFunctionTable>,
+    cost_table: Option<CostTable>,
 ) {
     let get_files = |root_path, pat| {
         let source_re = regex::Regex::new(pat)
@@ -26,14 +28,19 @@ pub fn run_tests_with_config_and_filter(
     let sources = get_files(root_path, source_pattern);
     let deps = dep_root
         .map(|root| get_files(root, r".*\.move$"))
-        .unwrap_or_else(Vec::new);
+        .unwrap_or_default();
 
     config.source_files = sources;
     config.dep_files = deps;
     let test_plan = config.build_test_plan().expect("Unable to build test plan");
 
     let (_, all_tests_passed) = config
-        .run_and_report_unit_tests(test_plan, native_function_table, std::io::stdout())
+        .run_and_report_unit_tests(
+            test_plan,
+            native_function_table,
+            cost_table,
+            std::io::stdout(),
+        )
         .expect("Failed to execute tests");
 
     // If all tests passed, exit with 0 otherwise with a non-zero exit code.
diff --git a/language/tools/move-unit-test/src/extensions.rs b/language/tools/move-unit-test/src/extensions.rs
index 4aeba125c2..afadd25898 100644
--- a/language/tools/move-unit-test/src/extensions.rs
+++ b/language/tools/move-unit-test/src/extensions.rs
@@ -7,7 +7,8 @@
 //! to be usable.
 
 use move_vm_runtime::native_extensions::NativeContextExtensions;
-use std::fmt::Write;
+use once_cell::sync::Lazy;
+use std::{fmt::Write, sync::Mutex};
 
 #[cfg(feature = "table-extension")]
 use itertools::Itertools;
@@ -15,13 +16,34 @@ use itertools::Itertools;
 use move_table_extension::NativeTableContext;
 #[cfg(feature = "table-extension")]
 use move_vm_test_utils::BlankStorage;
-#[cfg(feature = "table-extension")]
-use once_cell::sync::Lazy;
+
+static EXTENSION_HOOK: Lazy<
+    Mutex<Option<Box<dyn Fn(&mut NativeContextExtensions<'_>) + Send + Sync>>>,
+> = Lazy::new(|| Mutex::new(None));
+
+/// Sets a hook which is called to populate additional native extensions. This can be used to
+/// get extensions living outside of the Move repo into the unit testing environment.
+///
+/// This need to be called with the extensions of the custom Move environment at two places:
+///
+/// (a) At start of a custom Move CLI, to enable unit testing with the additional
+/// extensions;
+/// (b) Before `cli::run_move_unit_tests` if unit tests are called programmatically from Rust.
+/// You may want to define a new function `my_cli::run_move_unit_tests` which does this.
+///
+/// Note that the table extension is handled already internally, and does not need to added via
+/// this hook.
+pub fn set_extension_hook(p: Box<dyn Fn(&mut NativeContextExtensions<'_>) + Send + Sync>) {
+    *EXTENSION_HOOK.lock().unwrap() = Some(p)
+}
 
 /// Create all available native context extensions.
 #[allow(unused_mut, clippy::let_and_return)]
 pub(crate) fn new_extensions<'a>() -> NativeContextExtensions<'a> {
     let mut e = NativeContextExtensions::default();
+    if let Some(h) = &*EXTENSION_HOOK.lock().unwrap() {
+        (*h)(&mut e)
+    }
     #[cfg(feature = "table-extension")]
     create_table_extension(&mut e);
     e
@@ -39,7 +61,7 @@ pub(crate) fn print_change_sets<W: Write>(_w: &mut W, mut extensions: NativeCont
 
 #[cfg(feature = "table-extension")]
 fn create_table_extension(extensions: &mut NativeContextExtensions) {
-    extensions.add(NativeTableContext::new(0, &*DUMMY_RESOLVER));
+    extensions.add(NativeTableContext::new([0u8; 32], &*DUMMY_RESOLVER));
 }
 
 #[cfg(feature = "table-extension")]
@@ -50,7 +72,10 @@ fn print_table_extension<W: Write>(w: &mut W, extensions: &mut NativeContextExte
             writeln!(
                 w,
                 "new tables {}",
-                cs.new_tables.iter().map(|h| h.to_string()).join(", ")
+                cs.new_tables
+                    .iter()
+                    .map(|(k, v)| format!("{}<{},{}>", k, v.key_type, v.value_type))
+                    .join(", ")
             )
             .unwrap();
         }
@@ -73,3 +98,25 @@ fn print_table_extension<W: Write>(w: &mut W, extensions: &mut NativeContextExte
 
 #[cfg(feature = "table-extension")]
 static DUMMY_RESOLVER: Lazy<BlankStorage> = Lazy::new(|| BlankStorage);
+
+#[cfg(test)]
+mod tests {
+    use crate::extensions::{new_extensions, set_extension_hook};
+    use better_any::{Tid, TidAble};
+    use move_vm_runtime::native_extensions::NativeContextExtensions;
+
+    /// A test that extension hooks work as expected.
+    #[test]
+    fn test_extension_hook() {
+        set_extension_hook(Box::new(my_hook));
+        let ext = new_extensions();
+        let _e = ext.get::<TestExtension>();
+    }
+
+    #[derive(Tid)]
+    struct TestExtension();
+
+    fn my_hook(ext: &mut NativeContextExtensions) {
+        ext.add(TestExtension())
+    }
+}
diff --git a/language/tools/move-unit-test/src/lib.rs b/language/tools/move-unit-test/src/lib.rs
index 90fd3b8b60..c0a76d98e0 100644
--- a/language/tools/move-unit-test/src/lib.rs
+++ b/language/tools/move-unit-test/src/lib.rs
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 pub mod cargo_runner;
-mod extensions;
+pub mod extensions;
 pub mod test_reporter;
 pub mod test_runner;
 
@@ -19,6 +19,7 @@ use move_compiler::{
 };
 use move_core_types::language_storage::ModuleId;
 use move_vm_runtime::native_functions::NativeFunctionTable;
+use move_vm_test_utils::gas_schedule::CostTable;
 use std::{
     collections::BTreeMap,
     io::{Result, Write},
@@ -26,17 +27,15 @@ use std::{
     sync::Mutex,
 };
 
+/// The default value bounding the amount of gas consumed in a test.
+const DEFAULT_EXECUTION_BOUND: u64 = 1_000_000;
+
 #[derive(Debug, Parser, Clone)]
 #[clap(author, version, about)]
 pub struct UnitTestingConfig {
-    /// Bound the number of instructions that can be executed by any one test.
-    #[clap(
-        name = "instructions",
-        default_value = "5000",
-        short = 'i',
-        long = "instructions"
-    )]
-    pub instruction_execution_bound: u64,
+    /// Bound the gas limit for any one test. If using custom gas table, this is the max number of instructions.
+    #[clap(name = "gas_limit", short = 'i', long = "gas_limit")]
+    pub gas_limit: Option<u64>,
 
     /// A filter string to determine which unit tests to run
     #[clap(name = "filter", short = 'f', long = "filter")]
@@ -81,6 +80,10 @@ pub struct UnitTestingConfig {
     )]
     pub report_stacktrace_on_abort: bool,
 
+    /// Ignore compiler's warning, and continue run tests
+    #[clap(name = "ignore_compile_warnings", long = "ignore_compile_warnings")]
+    pub ignore_compile_warnings: bool,
+
     /// Named address mapping
     #[clap(
         name = "NAMED_ADDRESSES",
@@ -108,6 +111,10 @@ pub struct UnitTestingConfig {
     #[clap(short = 'v', long = "verbose")]
     pub verbose: bool,
 
+    /// Whether the test output need to be printed out.
+    #[clap(short = 'v', long = "verbose")]
+    pub report_writeset: bool,
+
     /// Use the EVM-based execution backend.
     /// Does not work with --stackless.
     #[cfg(feature = "evm-backend")]
@@ -127,18 +134,20 @@ impl UnitTestingConfig {
     /// Create a unit testing config for use with `register_move_unit_tests`
     pub fn default_with_bound(bound: Option<u64>) -> Self {
         Self {
-            instruction_execution_bound: bound.unwrap_or(5000),
+            gas_limit: bound.or(Some(DEFAULT_EXECUTION_BOUND)),
             filter: None,
             num_threads: 8,
             report_statistics: false,
             report_storage_on_error: false,
             report_stacktrace_on_abort: false,
+            ignore_compile_warnings: false,
             source_files: vec![],
             dep_files: vec![],
             check_stackless_vm: false,
             verbose: false,
             list: false,
             named_address_values: vec![],
+            report_writeset: false,
 
             #[cfg(feature = "evm-backend")]
             evm: false,
@@ -173,7 +182,13 @@ impl UnitTestingConfig {
         let compilation_env = compiler.compilation_env();
         let test_plan = unit_test::plan_builder::construct_test_plan(compilation_env, None, &cfgir);
 
-        if let Err(diags) = compilation_env.check_diags_at_or_above_severity(Severity::Warning) {
+        if let Err(diags) =
+            compilation_env.check_diags_at_or_above_severity(if self.ignore_compile_warnings {
+                Severity::NonblockingError
+            } else {
+                Severity::Warning
+            })
+        {
             diagnostics::report_diagnostics(&files, diags);
         }
 
@@ -205,6 +220,7 @@ impl UnitTestingConfig {
         &self,
         test_plan: TestPlan,
         native_function_table: Option<NativeFunctionTable>,
+        cost_table: Option<CostTable>,
         writer: W,
     ) -> Result<(W, bool)> {
         let shared_writer = Mutex::new(writer);
@@ -225,7 +241,7 @@ impl UnitTestingConfig {
 
         writeln!(shared_writer.lock().unwrap(), "Running Move unit tests")?;
         let mut test_runner = TestRunner::new(
-            self.instruction_execution_bound,
+            self.gas_limit.unwrap_or(DEFAULT_EXECUTION_BOUND),
             self.num_threads,
             self.check_stackless_vm,
             self.verbose,
@@ -233,7 +249,9 @@ impl UnitTestingConfig {
             self.report_stacktrace_on_abort,
             test_plan,
             native_function_table,
+            cost_table,
             verify_and_create_named_address_mapping(self.named_address_values.clone()).unwrap(),
+            self.report_writeset,
             #[cfg(feature = "evm-backend")]
             self.evm,
         )
@@ -248,9 +266,13 @@ impl UnitTestingConfig {
             test_results.report_statistics(&shared_writer)?;
         }
 
-        let all_tests_passed = test_results.summarize(&shared_writer)?;
+        if self.report_writeset {
+            test_results.report_goldens(&shared_writer)?;
+        }
+
+        let ok = test_results.summarize(&shared_writer)?;
 
         let writer = shared_writer.into_inner().unwrap();
-        Ok((writer, all_tests_passed))
+        Ok((writer, ok))
     }
 }
diff --git a/language/tools/move-unit-test/src/main.rs b/language/tools/move-unit-test/src/main.rs
index 004fbe706f..f3521bcc2c 100644
--- a/language/tools/move-unit-test/src/main.rs
+++ b/language/tools/move-unit-test/src/main.rs
@@ -10,7 +10,7 @@ pub fn main() {
 
     let test_plan = args.build_test_plan();
     if let Some(test_plan) = test_plan {
-        args.run_and_report_unit_tests(test_plan, None, std::io::stdout())
+        args.run_and_report_unit_tests(test_plan, None, None, std::io::stdout())
             .unwrap();
     }
 }
diff --git a/language/tools/move-unit-test/src/test_reporter.rs b/language/tools/move-unit-test/src/test_reporter.rs
index 348222d658..a5175c77aa 100644
--- a/language/tools/move-unit-test/src/test_reporter.rs
+++ b/language/tools/move-unit-test/src/test_reporter.rs
@@ -11,10 +11,10 @@ use move_binary_format::{
 };
 use move_command_line_common::files::FileHash;
 use move_compiler::{
-    diagnostics::{self, Diagnostic},
-    unit_test::{ModuleTestPlan, TestPlan},
+    diagnostics::{self, Diagnostic, Diagnostics},
+    unit_test::{ModuleTestPlan, TestName, TestPlan},
 };
-use move_core_types::{effects::ChangeSet, language_storage::ModuleId};
+use move_core_types::{effects::ChangeSet, language_storage::ModuleId, vm_status::StatusType};
 use move_ir_types::location::Loc;
 use move_symbol_pool::Symbol;
 use std::{
@@ -24,14 +24,18 @@ use std::{
     time::Duration,
 };
 
+pub use move_compiler::unit_test::ExpectedMoveError as MoveError;
+
 #[derive(Debug, Clone, Ord, PartialOrd, PartialEq, Eq)]
 pub enum FailureReason {
-    // Expected to abort, but it didn't
-    NoAbort(String),
+    // Expected to error, but it didn't
+    NoError(String),
     // Aborted with the wrong code
-    WrongAbort(String, u64, u64),
-    // Abort wasn't expected, but it did
-    Aborted(String, u64),
+    WrongError(String, MoveError, MoveError),
+    // Aborted with the wrong code, without location specified
+    WrongAbortDEPRECATED(String, u64, MoveError),
+    // Error wasn't expected, but it did
+    UnexpectedError(String, MoveError),
     // Test timed out
     Timeout(String),
     // The execution results of the Move VM and stackless VM does not match
@@ -43,8 +47,6 @@ pub enum FailureReason {
     },
     // Property checking failed
     Property(String),
-    // The test failed for some unknown reason. This shouldn't be encountered
-    Unknown(String),
 
     // Failed to compile Move code into EVM bytecode.
     #[cfg(feature = "evm-backend")]
@@ -70,6 +72,7 @@ pub struct TestRunInfo {
 pub struct TestStatistics {
     passed: BTreeMap<ModuleId, BTreeSet<TestRunInfo>>,
     failed: BTreeMap<ModuleId, BTreeSet<TestFailure>>,
+    output: BTreeMap<ModuleId, BTreeMap<TestName, String>>,
 }
 
 #[derive(Debug, Clone)]
@@ -89,20 +92,28 @@ impl TestRunInfo {
 }
 
 impl FailureReason {
-    pub fn no_abort() -> Self {
-        FailureReason::NoAbort("Test did not abort as expected".to_string())
+    pub fn no_error() -> Self {
+        FailureReason::NoError("Test did not error as expected".to_string())
+    }
+
+    pub fn wrong_error(expected: MoveError, actual: MoveError) -> Self {
+        FailureReason::WrongError(
+            "Test did not error as expected".to_string(),
+            expected,
+            actual,
+        )
     }
 
-    pub fn wrong_abort(expected: u64, received: u64) -> Self {
-        FailureReason::WrongAbort(
+    pub fn wrong_abort_deprecated(expected: u64, actual: MoveError) -> Self {
+        FailureReason::WrongAbortDEPRECATED(
             "Test did not abort with expected code".to_string(),
             expected,
-            received,
+            actual,
         )
     }
 
-    pub fn aborted(abort_code: u64) -> Self {
-        FailureReason::Aborted("Test was not expected to abort".to_string(), abort_code)
+    pub fn unexpected_error(error: MoveError) -> Self {
+        FailureReason::UnexpectedError("Test was not expected to error".to_string(), error)
     }
 
     pub fn timeout() -> Self {
@@ -131,10 +142,6 @@ impl FailureReason {
     pub fn move_to_evm_error(diagnostics: String) -> Self {
         FailureReason::MoveToEVMError(diagnostics)
     }
-
-    pub fn unknown() -> Self {
-        FailureReason::Unknown("ITE: An unknown error was reported.".to_string())
-    }
 }
 
 impl TestFailure {
@@ -154,17 +161,48 @@ impl TestFailure {
 
     pub fn render_error(&self, test_plan: &TestPlan) -> String {
         let error_string = match &self.failure_reason {
-            FailureReason::NoAbort(message) => message.to_string(),
+            FailureReason::NoError(message) => message.to_string(),
             FailureReason::Timeout(message) => message.to_string(),
-            FailureReason::WrongAbort(message, expected_code, other_code) => {
+            FailureReason::WrongError(message, expected, actual) => {
                 let base_message = format!(
-                    "{}. Expected test to abort with {} but instead it aborted with {} here",
-                    message, expected_code, other_code,
+                    "{message}. Expected test {} but instead it {} rooted here",
+                    expected.verbiage(/* is_past_tense */ false),
+                    actual.verbiage(/* is_past_tense */ true),
                 );
                 Self::report_error_with_location(test_plan, base_message, &self.vm_error)
             }
-            FailureReason::Aborted(message, code) => {
-                let base_message = format!("{} but it aborted with {} here", message, code);
+            FailureReason::WrongAbortDEPRECATED(message, expected_code, actual) => {
+                let base_message = format!(
+                    "{}. \
+                    Expected test to abort with code {}, but instead it {} rooted here",
+                    message,
+                    expected_code,
+                    actual.verbiage(/* is_past_tense */ true),
+                );
+                Self::report_error_with_location(test_plan, base_message, &self.vm_error)
+            }
+            FailureReason::UnexpectedError(message, error) => {
+                let prefix = match error.0.status_type() {
+                    StatusType::Validation => "INTERNAL TEST ERROR: Unexpected Validation Error\n",
+                    StatusType::Verification => {
+                        "INTERNAL TEST ERROR: Unexpected Verification Error\n"
+                    }
+                    StatusType::InvariantViolation => {
+                        "INTERNAL TEST ERROR: INTERNAL VM INVARIANT VIOLATION.\n"
+                    }
+                    StatusType::Deserialization => {
+                        "INTERNAL TEST ERROR: Unexpected Deserialization Error\n"
+                    }
+                    StatusType::Unknown => "INTERNAL TEST ERROR: UNKNOWN ERROR.\n",
+                    // execution errors are expected, so no message
+                    StatusType::Execution => "",
+                };
+                let base_message = format!(
+                    "{}{}, but it {} rooted here",
+                    prefix,
+                    message,
+                    error.verbiage(/* is_past_tense */ true)
+                );
                 Self::report_error_with_location(test_plan, base_message, &self.vm_error)
             }
             FailureReason::Mismatch {
@@ -187,21 +225,6 @@ impl TestFailure {
                 )
             }
             FailureReason::Property(message) => message.clone(),
-            FailureReason::Unknown(message) => {
-                format!(
-                    "{} Location: {}\nVMError (if there is one): {}",
-                    message,
-                    TestFailure::report_error_with_location(
-                        test_plan,
-                        "".to_string(),
-                        &self.vm_error
-                    ),
-                    self.vm_error
-                        .as_ref()
-                        .map(|err| format!("{:#?}", err))
-                        .unwrap_or_else(|| "".to_string()),
-                )
-            }
 
             #[cfg(feature = "evm-backend")]
             FailureReason::MoveToEVMError(diagnostics) => {
@@ -324,32 +347,35 @@ impl TestFailure {
 
         let diags = match vm_error.location() {
             Location::Module(module_id) => {
-                let diags = vm_error
-                    .offsets()
-                    .iter()
-                    .filter_map(|(fdef_idx, offset)| {
-                        let function_source_map = test_plan
-                            .module_info
-                            .get(module_id)?
-                            .source_map
-                            .get_function_source_map(*fdef_idx)
-                            .ok()?;
-                        let loc = function_source_map.get_code_location(*offset).unwrap();
-                        let msg = format!("In this function in {}", format_module_id(module_id));
-                        // TODO(tzakian) maybe migrate off of move-langs diagnostics?
-                        Some(Diagnostic::new(
-                            diagnostics::codes::Tests::TestFailed,
-                            (loc, base_message.clone()),
-                            vec![(function_source_map.definition_location, msg)],
-                            std::iter::empty::<String>(),
-                        ))
-                    })
-                    .collect();
-
-                String::from_utf8(report_diagnostics(&test_plan.files, diags)).unwrap()
+                let diag_opt = vm_error.offsets().first().and_then(|(fdef_idx, offset)| {
+                    let function_source_map = test_plan
+                        .module_info
+                        .get(module_id)?
+                        .source_map
+                        .get_function_source_map(*fdef_idx)
+                        .ok()?;
+                    let loc = function_source_map.get_code_location(*offset).unwrap();
+                    let msg = format!("In this function in {}", format_module_id(module_id));
+                    // TODO(tzakian) maybe migrate off of move-langs diagnostics?
+                    Some(Diagnostic::new(
+                        diagnostics::codes::Tests::TestFailed,
+                        (loc, base_message.clone()),
+                        vec![(function_source_map.definition_location, msg)],
+                        std::iter::empty::<String>(),
+                    ))
+                });
+                match diag_opt {
+                    None => base_message,
+                    Some(diag) => String::from_utf8(report_diagnostics(
+                        &test_plan.files,
+                        Diagnostics::from(vec![diag]),
+                    ))
+                    .unwrap(),
+                }
             }
             _ => base_message,
         };
+
         match vm_error.exec_state() {
             None => diags,
             Some(exec_state) => {
@@ -369,6 +395,7 @@ impl TestStatistics {
         Self {
             passed: BTreeMap::new(),
             failed: BTreeMap::new(),
+            output: BTreeMap::new(),
         }
     }
 
@@ -386,6 +413,13 @@ impl TestStatistics {
             .insert(test_info);
     }
 
+    pub fn test_output(&mut self, test_name: TestName, test_plan: &ModuleTestPlan, output: String) {
+        self.output
+            .entry(test_plan.module_id.clone())
+            .or_insert_with(BTreeMap::new)
+            .insert(test_name, output);
+    }
+
     pub fn combine(mut self, other: Self) -> Self {
         for (module_id, test_result) in other.passed {
             let entry = self.passed.entry(module_id).or_default();
@@ -395,6 +429,10 @@ impl TestStatistics {
             let entry = self.failed.entry(module_id).or_default();
             entry.extend(test_result.into_iter());
         }
+        for (module_id, test_output) in other.output {
+            let entry = self.output.entry(module_id).or_default();
+            entry.extend(test_output.into_iter());
+        }
         self
     }
 }
@@ -407,6 +445,21 @@ impl TestResults {
         }
     }
 
+    pub fn report_goldens<W: Write>(&self, writer: &Mutex<W>) -> Result<()> {
+        for (module_name, test_outputs) in self.final_statistics.output.iter() {
+            for (test_name, write_set) in test_outputs.iter() {
+                writeln!(
+                    writer.lock().unwrap(),
+                    "{}::{}",
+                    format_module_id(module_name),
+                    test_name
+                )?;
+                writeln!(writer.lock().unwrap(), "Output: {}", write_set)?;
+            }
+        }
+        Ok(())
+    }
+
     pub fn report_statistics<W: Write>(&self, writer: &Mutex<W>) -> Result<()> {
         writeln!(writer.lock().unwrap(), "\nTest Statistics:\n")?;
 
@@ -462,7 +515,7 @@ impl TestResults {
                 width = max_function_name_size,
                 name = "Test Name",
                 time = "Time",
-                instructions = "Instructions Executed"
+                instructions = "Gas Used"
             )?;
 
             for (qualified_function_name, time, instructions) in stats {
@@ -528,7 +581,7 @@ impl TestResults {
                         "│ {}",
                         test_failure
                             .render_error(&self.test_plan)
-                            .replace("\n", "\n│ ")
+                            .replace('\n', "\n│ ")
                     )?;
                     writeln!(writer.lock().unwrap(), "└──────────────────\n")?;
                 }
diff --git a/language/tools/move-unit-test/src/test_runner.rs b/language/tools/move-unit-test/src/test_runner.rs
index dd2e6635f4..bd8edc8fb9 100644
--- a/language/tools/move-unit-test/src/test_runner.rs
+++ b/language/tools/move-unit-test/src/test_runner.rs
@@ -4,9 +4,15 @@
 
 use crate::{
     extensions, format_module_id,
-    test_reporter::{FailureReason, TestFailure, TestResults, TestRunInfo, TestStatistics},
+    test_reporter::{
+        FailureReason, MoveError, TestFailure, TestResults, TestRunInfo, TestStatistics,
+    },
 };
 use anyhow::Result;
+use codespan_reporting::{
+    diagnostic::Severity,
+    term::termcolor::{ColorChoice, StandardStream},
+};
 use colored::*;
 
 use move_binary_format::{errors::VMResult, file_format::CompiledModule};
@@ -17,8 +23,7 @@ use move_compiler::{
 };
 use move_core_types::{
     account_address::AccountAddress,
-    effects::ChangeSet,
-    gas_schedule::{CostTable, GasAlgebra, GasCost, GasUnits},
+    effects::{ChangeSet, Op},
     identifier::IdentStr,
     value::serialize_values,
     vm_status::StatusCode,
@@ -34,8 +39,10 @@ use move_stackless_bytecode_interpreter::{
     StacklessBytecodeInterpreter,
 };
 use move_vm_runtime::{move_vm::MoveVM, native_functions::NativeFunctionTable};
-use move_vm_test_utils::InMemoryStorage;
-use move_vm_types::gas_schedule::{zero_cost_schedule, GasStatus};
+use move_vm_test_utils::{
+    gas_schedule::{zero_cost_schedule, CostTable, Gas, GasCost, GasStatus},
+    InMemoryStorage,
+};
 use rayon::prelude::*;
 use std::{collections::BTreeMap, io::Write, marker::Send, sync::Mutex, time::Instant};
 
@@ -62,6 +69,7 @@ pub struct SharedTestingConfig {
     named_address_values: BTreeMap<String, NumericalAddress>,
     check_stackless_vm: bool,
     verbose: bool,
+    record_writeset: bool,
 
     #[cfg(feature = "evm-backend")]
     evm: bool,
@@ -75,14 +83,11 @@ pub struct TestRunner {
 
 /// A gas schedule where every instruction has a cost of "1". This is used to bound execution of a
 /// test to a certain number of ticks.
-fn unit_cost_table(num_of_native_funcs: usize) -> CostTable {
-    let mut cost_schedule = zero_cost_schedule(num_of_native_funcs);
+fn unit_cost_table() -> CostTable {
+    let mut cost_schedule = zero_cost_schedule();
     cost_schedule.instruction_table.iter_mut().for_each(|cost| {
         *cost = GasCost::new(1, 1);
     });
-    cost_schedule.native_table.iter_mut().for_each(|cost| {
-        *cost = GasCost::new(1, 1);
-    });
     cost_schedule
 }
 
@@ -118,12 +123,12 @@ fn print_resources_and_extensions(
     for (account_addr, account_state) in cs.accounts() {
         writeln!(&mut buf, "0x{}:", account_addr.short_str_lossless())?;
 
-        for (tag, resource_opt) in account_state.resources() {
-            if let Some(resource) = resource_opt {
+        for (tag, resource_op) in account_state.resources() {
+            if let Op::New(resource) | Op::Modify(resource) = resource_op {
                 writeln!(
                     &mut buf,
                     "\t{}",
-                    format!("=> {}", annotator.view_resource(tag, resource)?).replace("\n", "\n\t")
+                    format!("=> {}", annotator.view_resource(tag, resource)?).replace('\n', "\n\t")
                 )?;
             }
         }
@@ -142,8 +147,12 @@ impl TestRunner {
         save_storage_state_on_failure: bool,
         report_stacktrace_on_abort: bool,
         tests: TestPlan,
+        // TODO: maybe we should require the clients to always pass in a list of native functions so
+        // we don't have to make assumptions about their gas parameters.
         native_function_table: Option<NativeFunctionTable>,
+        cost_table: Option<CostTable>,
         named_address_values: BTreeMap<String, NumericalAddress>,
+        record_writeset: bool,
         #[cfg(feature = "evm-backend")] evm: bool,
     ) -> Result<Self> {
         let source_files = tests
@@ -154,9 +163,11 @@ impl TestRunner {
         let modules = tests.module_info.values().map(|info| &info.module);
         let starting_storage_state = setup_test_storage(modules)?;
         let native_function_table = native_function_table.unwrap_or_else(|| {
-            move_stdlib::natives::all_natives(AccountAddress::from_hex_literal("0x1").unwrap())
+            move_stdlib::natives::all_natives(
+                AccountAddress::from_hex_literal("0x1").unwrap(),
+                move_stdlib::natives::GasParameters::zeros(),
+            )
         });
-        let num_of_native_funcs = native_function_table.len();
         Ok(Self {
             testing_config: SharedTestingConfig {
                 save_storage_state_on_failure,
@@ -164,11 +175,17 @@ impl TestRunner {
                 starting_storage_state,
                 execution_bound,
                 native_function_table,
-                cost_table: unit_cost_table(num_of_native_funcs),
+                // TODO: our current implementation uses a unit cost table to prevent programs from
+                // running indefinitely. This should probably be done in a different way, like halting
+                // after executing a certain number of instructions or setting a timer.
+                //
+                // From the API standpoint, we should let the client specify the cost table.
+                cost_table: cost_table.unwrap_or_else(unit_cost_table),
                 source_files,
                 check_stackless_vm,
                 verbose,
                 named_address_values,
+                record_writeset,
                 #[cfg(feature = "evm-backend")]
                 evm,
             },
@@ -202,7 +219,11 @@ impl TestRunner {
                 let tests = std::mem::take(&mut module_test.tests);
                 module_test.tests = tests
                     .into_iter()
-                    .filter(|(test_name, _)| test_name.as_str().contains(test_name_slice))
+                    .filter(|(test_name, _)| {
+                        let full_name =
+                            format!("{}::{}", module_id.name().as_str(), test_name.as_str());
+                        full_name.contains(test_name_slice)
+                    })
                     .collect();
             }
         }
@@ -266,7 +287,7 @@ impl SharedTestingConfig {
         let extensions = extensions::new_extensions();
         let mut session =
             move_vm.new_session_with_extensions(&self.starting_storage_state, extensions);
-        let mut gas_meter = GasStatus::new(&self.cost_table, GasUnits::new(self.execution_bound));
+        let mut gas_meter = GasStatus::new(&self.cost_table, Gas::new(self.execution_bound));
         // TODO: collect VM logs if the verbose flag (i.e, `self.verbose`) is set
 
         let now = Instant::now();
@@ -291,7 +312,12 @@ impl SharedTestingConfig {
         let test_run_info = TestRunInfo::new(
             function_name.to_string(),
             now.elapsed(),
-            self.execution_bound - gas_meter.remaining_gas().get(),
+            // TODO(Gas): This doesn't look quite right...
+            //            We're not computing the number of instructions executed even with a unit gas schedule.
+            Gas::new(self.execution_bound)
+                .checked_sub(gas_meter.remaining_gas())
+                .unwrap()
+                .into(),
         );
         match session.finish_with_extensions() {
             Ok((cs, _, extensions)) => (Ok(cs), Ok(extensions), return_result, test_run_info),
@@ -377,6 +403,8 @@ impl SharedTestingConfig {
             .unwrap_or_else(|e| panic!("Unable to build stackless bytecode: {}", e));
 
             if model.has_errors() {
+                let mut stderr = StandardStream::stderr(ColorChoice::Always);
+                model.report_diag(&mut stderr, Severity::Error);
                 panic!("Move model has errors");
             }
 
@@ -390,6 +418,15 @@ impl SharedTestingConfig {
         for (function_name, test_info) in &test_plan.tests {
             let (cs_result, ext_result, exec_result, test_run_info) =
                 self.execute_via_move_vm(test_plan, function_name, test_info);
+
+            if self.record_writeset {
+                stats.test_output(
+                    function_name.to_string(),
+                    test_plan,
+                    format!("{:?}", cs_result),
+                );
+            }
+
             if self.check_stackless_vm {
                 let (stackless_vm_change_set, stackless_vm_result, _, prop_check_result) = self
                     .execute_via_stackless_vm(
@@ -453,91 +490,91 @@ impl SharedTestingConfig {
                 }
             };
             match exec_result {
-                Err(err) => match (test_info.expected_failure.as_ref(), err.sub_status()) {
-                    // Ran out of ticks, report a test timeout and log a test failure
-                    _ if err.major_status() == StatusCode::OUT_OF_GAS => {
-                        output.timeout(function_name);
-                        stats.test_failure(
-                            TestFailure::new(
-                                FailureReason::timeout(),
-                                test_run_info,
-                                Some(err),
-                                save_session_state(),
-                            ),
-                            test_plan,
-                        )
-                    }
-                    // Expected the test to not abort, but it aborted with `code`
-                    (None, Some(code)) => {
-                        output.fail(function_name);
-                        stats.test_failure(
-                            TestFailure::new(
-                                FailureReason::aborted(code),
-                                test_run_info,
-                                Some(err),
-                                save_session_state(),
-                            ),
-                            test_plan,
-                        )
-                    }
-                    // Expected the test the abort with a specific `code`, and it did abort with
-                    // that abort code
-                    (Some(ExpectedFailure::ExpectedWithCode(code)), Some(other_code))
-                        if matches!(
-                            err.major_status(),
-                            StatusCode::ABORTED | StatusCode::VECTOR_OPERATION_ERROR
-                        ) && *code == other_code =>
-                    {
-                        output.pass(function_name);
-                        stats.test_success(test_run_info, test_plan);
-                    }
-                    // Expected the test to abort with a specific `code` but it aborted with a
-                    // different `other_code`
-                    (Some(ExpectedFailure::ExpectedWithCode(code)), Some(other_code)) => {
-                        output.fail(function_name);
-                        stats.test_failure(
-                            TestFailure::new(
-                                FailureReason::wrong_abort(*code, other_code),
-                                test_run_info,
-                                Some(err),
-                                save_session_state(),
-                            ),
-                            test_plan,
-                        )
-                    }
-                    // Expected the test to abort and it aborted, but we don't need to check the code
-                    (Some(ExpectedFailure::Expected), Some(_)) => {
-                        output.pass(function_name);
-                        stats.test_success(test_run_info, test_plan);
-                    }
-                    // Expected the test to abort and it aborted with internal error
-                    (Some(ExpectedFailure::Expected), None)
-                        if err.major_status() != StatusCode::EXECUTED =>
-                    {
-                        output.pass(function_name);
-                        stats.test_success(test_run_info, test_plan);
-                    }
-                    // Unexpected return status from the VM, signal that we hit an unknown error.
-                    (_, None) => {
-                        output.fail(function_name);
-                        stats.test_failure(
-                            TestFailure::new(
-                                FailureReason::unknown(),
-                                test_run_info,
-                                Some(err),
-                                save_session_state(),
-                            ),
-                            test_plan,
-                        )
+                Err(err) => {
+                    let actual_err =
+                        MoveError(err.major_status(), err.sub_status(), err.location().clone());
+                    assert!(err.major_status() != StatusCode::EXECUTED);
+                    match test_info.expected_failure.as_ref() {
+                        Some(ExpectedFailure::Expected) => {
+                            output.pass(function_name);
+                            stats.test_success(test_run_info, test_plan);
+                        }
+                        Some(ExpectedFailure::ExpectedWithError(expected_err))
+                            if expected_err == &actual_err =>
+                        {
+                            output.pass(function_name);
+                            stats.test_success(test_run_info, test_plan);
+                        }
+                        Some(ExpectedFailure::ExpectedWithCodeDEPRECATED(code))
+                            if actual_err.0 == StatusCode::ABORTED
+                                && actual_err.1.is_some()
+                                && actual_err.1.unwrap() == *code =>
+                        {
+                            output.pass(function_name);
+                            stats.test_success(test_run_info, test_plan);
+                        }
+                        // incorrect cases
+                        Some(ExpectedFailure::ExpectedWithError(expected_err)) => {
+                            output.fail(function_name);
+                            stats.test_failure(
+                                TestFailure::new(
+                                    FailureReason::wrong_error(expected_err.clone(), actual_err),
+                                    test_run_info,
+                                    Some(err),
+                                    save_session_state(),
+                                ),
+                                test_plan,
+                            )
+                        }
+                        Some(ExpectedFailure::ExpectedWithCodeDEPRECATED(expected_code)) => {
+                            output.fail(function_name);
+                            stats.test_failure(
+                                TestFailure::new(
+                                    FailureReason::wrong_abort_deprecated(
+                                        *expected_code,
+                                        actual_err,
+                                    ),
+                                    test_run_info,
+                                    Some(err),
+                                    save_session_state(),
+                                ),
+                                test_plan,
+                            )
+                        }
+                        None if err.major_status() == StatusCode::OUT_OF_GAS => {
+                            // Ran out of ticks, report a test timeout and log a test failure
+                            output.timeout(function_name);
+                            stats.test_failure(
+                                TestFailure::new(
+                                    FailureReason::timeout(),
+                                    test_run_info,
+                                    Some(err),
+                                    save_session_state(),
+                                ),
+                                test_plan,
+                            )
+                        }
+                        None => {
+                            output.fail(function_name);
+                            stats.test_failure(
+                                TestFailure::new(
+                                    FailureReason::unexpected_error(actual_err),
+                                    test_run_info,
+                                    Some(err),
+                                    save_session_state(),
+                                ),
+                                test_plan,
+                            )
+                        }
                     }
-                },
+                }
                 Ok(_) => {
                     // Expected the test to fail, but it executed
                     if test_info.expected_failure.is_some() {
                         output.fail(function_name);
                         stats.test_failure(
                             TestFailure::new(
-                                FailureReason::no_abort(),
+                                FailureReason::no_error(),
                                 test_run_info,
                                 None,
                                 save_session_state(),
@@ -590,6 +627,8 @@ impl SharedTestingConfig {
         test_plan: &ModuleTestPlan,
         output: &TestOutput<impl Write>,
     ) -> TestStatistics {
+        use move_binary_format::errors::Location;
+
         let mut stats = TestStatistics::new();
 
         // TODO: Somehow, paths of some temporary Move interface files are being passed in after those files
@@ -662,12 +701,26 @@ impl SharedTestingConfig {
 
             match (test_info.expected_failure.as_ref(), &res.exit_reason) {
                 // Test expected to succeed or abort with a specific abort code, but ran into an internal error.
-                (None | Some(ExpectedFailure::ExpectedWithCode(_)), ExitReason::Revert(_))
-                    if abort_code() == u64::MAX =>
-                {
+                (
+                    None
+                    | Some(
+                        ExpectedFailure::ExpectedWithCodeDEPRECATED(_)
+                        | ExpectedFailure::ExpectedWithError(_),
+                    ),
+                    ExitReason::Revert(_),
+                ) if abort_code() == u64::MAX => {
                     output.fail(function_name);
                     stats.test_failure(
-                        TestFailure::new(FailureReason::unknown(), test_run_info(), None, None),
+                        TestFailure::new(
+                            FailureReason::unexpected_error(MoveError(
+                                StatusCode::UNKNOWN_STATUS,
+                                None,
+                                Location::Undefined,
+                            )),
+                            test_run_info(),
+                            None,
+                            None,
+                        ),
                         test_plan,
                     );
                 }
@@ -677,7 +730,11 @@ impl SharedTestingConfig {
                     output.fail(function_name);
                     stats.test_failure(
                         TestFailure::new(
-                            FailureReason::aborted(abort_code()),
+                            FailureReason::unexpected_error(MoveError(
+                                StatusCode::ABORTED,
+                                Some(abort_code()),
+                                Location::Undefined,
+                            )),
                             test_run_info(),
                             None,
                             None,
@@ -688,7 +745,10 @@ impl SharedTestingConfig {
 
                 // Expect the test to abort with a specific code.
                 (
-                    Some(ExpectedFailure::ExpectedWithCode(exp_abort_code)),
+                    Some(
+                        ExpectedFailure::ExpectedWithError(MoveError(_, Some(exp_abort_code), _))
+                        | ExpectedFailure::ExpectedWithCodeDEPRECATED(exp_abort_code),
+                    ),
                     ExitReason::Revert(_),
                 ) => {
                     let abort_code = abort_code();
@@ -699,7 +759,14 @@ impl SharedTestingConfig {
                         output.fail(function_name);
                         stats.test_failure(
                             TestFailure::new(
-                                FailureReason::wrong_abort(*exp_abort_code, abort_code),
+                                FailureReason::wrong_abort_deprecated(
+                                    *exp_abort_code,
+                                    MoveError(
+                                        StatusCode::ABORTED,
+                                        Some(abort_code),
+                                        Location::Undefined,
+                                    ),
+                                ),
                                 test_run_info(),
                                 None,
                                 None,
@@ -711,12 +778,16 @@ impl SharedTestingConfig {
 
                 // Test expected to abort but succeeded.
                 (
-                    Some(ExpectedFailure::Expected | ExpectedFailure::ExpectedWithCode(_)),
+                    Some(
+                        ExpectedFailure::Expected
+                        | ExpectedFailure::ExpectedWithCodeDEPRECATED(_)
+                        | ExpectedFailure::ExpectedWithError(_),
+                    ),
                     ExitReason::Succeed(_),
                 ) => {
                     output.fail(function_name);
                     stats.test_failure(
-                        TestFailure::new(FailureReason::no_abort(), test_run_info(), None, None),
+                        TestFailure::new(FailureReason::no_error(), test_run_info(), None, None),
                         test_plan,
                     )
                 }
diff --git a/language/tools/move-unit-test/tests/move_unit_test_testsuite.rs b/language/tools/move-unit-test/tests/move_unit_test_testsuite.rs
index 43c68624c9..1d8da1e9d0 100644
--- a/language/tools/move-unit-test/tests/move_unit_test_testsuite.rs
+++ b/language/tools/move-unit-test/tests/move_unit_test_testsuite.rs
@@ -54,7 +54,7 @@ fn run_test_with_modifiers(
             }
 
             results.push((
-                test_config.run_and_report_unit_tests(test_plan.unwrap(), None, buffer)?,
+                test_config.run_and_report_unit_tests(test_plan.unwrap(), None, None, buffer)?,
                 modified_exp_path,
             ))
         }
@@ -68,7 +68,7 @@ fn run_test_with_modifiers(
     }
 
     results.push((
-        unit_test_config.run_and_report_unit_tests(test_plan.unwrap(), None, buffer)?,
+        unit_test_config.run_and_report_unit_tests(test_plan.unwrap(), None, None, buffer)?,
         path.with_extension(EXP_EXT),
     ));
 
@@ -82,12 +82,14 @@ fn run_test_impl(path: &Path) -> anyhow::Result<()> {
     let source_files = vec![path.to_str().unwrap().to_owned()];
     let unit_test_config = UnitTestingConfig {
         num_threads: 1,
-        instruction_execution_bound: 1000,
+        gas_limit: Some(1000),
         source_files,
         dep_files: move_stdlib::move_stdlib_files(),
         named_address_values: move_stdlib::move_stdlib_named_addresses()
             .into_iter()
             .collect(),
+        report_writeset: true,
+        report_stacktrace_on_abort: true,
 
         ..UnitTestingConfig::default_with_bound(None)
     };
diff --git a/language/tools/move-unit-test/tests/sources/B.move b/language/tools/move-unit-test/tests/sources/B.move
index 8cab888088..8e37c3b608 100644
--- a/language/tools/move-unit-test/tests/sources/B.move
+++ b/language/tools/move-unit-test/tests/sources/B.move
@@ -11,13 +11,13 @@ module 0x1::B {
     }
 
     #[test]
-    #[expected_failure(abort_code = 0)]
+    #[expected_failure(abort_code = 0, location=0x1::A)]
     public fun b_other0() {
         A::a_call()
     }
 
     #[test]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(abort_code = 1, location=0x1::A)]
     public fun b_other1() {
         A::a_call()
     }
diff --git a/language/tools/move-unit-test/tests/test_sources/address_args.exp b/language/tools/move-unit-test/tests/test_sources/address_args.exp
index f259c8e260..88ad6f1f21 100644
--- a/language/tools/move-unit-test/tests/test_sources/address_args.exp
+++ b/language/tools/move-unit-test/tests/test_sources/address_args.exp
@@ -2,4 +2,10 @@ Running Move unit tests
 [ PASS    ] 0x1::M::correct_address
 [ PASS    ] 0x1::M::correct_addresses
 [ PASS    ] 0x1::M::wrong_address
+0x1::M::correct_address
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::correct_addresses
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::wrong_address
+Output: Ok(ChangeSet { accounts: {} })
 Test result: OK. Total tests: 3; passed: 3; failed: 0
diff --git a/language/tools/move-unit-test/tests/test_sources/address_args.move b/language/tools/move-unit-test/tests/test_sources/address_args.move
index 3709e0afdc..4faabd02d0 100644
--- a/language/tools/move-unit-test/tests/test_sources/address_args.move
+++ b/language/tools/move-unit-test/tests/test_sources/address_args.move
@@ -1,5 +1,7 @@
 address 0x1 {
 module M {
+    const ErrorCode: u64 = 100;
+
     #[test(a = @0x42)]
     fun correct_address(a: address) {
         assert!(a == @0x42, 100);
@@ -12,7 +14,7 @@ module M {
     }
 
     #[test(a = @0x42)]
-    #[expected_failure(abort_code = 100)]
+    #[expected_failure(abort_code = ErrorCode)]
     fun wrong_address(a: address) {
         assert!(a == @0x43, 100);
     }
diff --git a/language/tools/move-unit-test/tests/test_sources/arithmetic_errors.exp b/language/tools/move-unit-test/tests/test_sources/arithmetic_errors.exp
index bdcc00dec3..9c7dd55395 100644
--- a/language/tools/move-unit-test/tests/test_sources/arithmetic_errors.exp
+++ b/language/tools/move-unit-test/tests/test_sources/arithmetic_errors.exp
@@ -3,4 +3,12 @@ Running Move unit tests
 [ PASS    ] 0x1::M::u64_div_by_zero
 [ PASS    ] 0x1::M::u64_mul_overflow
 [ PASS    ] 0x1::M::u64_sub_underflow
+0x1::M::u64_add_overflow
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::u64_div_by_zero
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::u64_mul_overflow
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::u64_sub_underflow
+Output: Ok(ChangeSet { accounts: {} })
 Test result: OK. Total tests: 4; passed: 4; failed: 0
diff --git a/language/tools/move-unit-test/tests/test_sources/construct_data.exp b/language/tools/move-unit-test/tests/test_sources/construct_data.exp
index 06604b2134..5f250ba28f 100644
--- a/language/tools/move-unit-test/tests/test_sources/construct_data.exp
+++ b/language/tools/move-unit-test/tests/test_sources/construct_data.exp
@@ -1,4 +1,8 @@
 Running Move unit tests
 [ PASS    ] 0x1::M::make_sure_not_other_number
 [ PASS    ] 0x1::M::make_sure_number_matches
+0x1::M::make_sure_not_other_number
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::make_sure_number_matches
+Output: Ok(ChangeSet { accounts: {} })
 Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/language/tools/move-unit-test/tests/test_sources/cross_module_aborts.evm.exp b/language/tools/move-unit-test/tests/test_sources/cross_module_aborts.evm.exp
index 01ca04f3cb..aa52b3fdf2 100644
--- a/language/tools/move-unit-test/tests/test_sources/cross_module_aborts.evm.exp
+++ b/language/tools/move-unit-test/tests/test_sources/cross_module_aborts.evm.exp
@@ -7,7 +7,7 @@ Test failures:
 Failures in 0x1::B:
 
 ┌── failing_test ──────
-│ Test was not expected to abort but it aborted with 0 here
+│ Test was not expected to error, but it aborted with code 0 originating in an unknown location rooted here
 └──────────────────
 
 Test result: FAILED. Total tests: 2; passed: 1; failed: 1
diff --git a/language/tools/move-unit-test/tests/test_sources/cross_module_aborts.exp b/language/tools/move-unit-test/tests/test_sources/cross_module_aborts.exp
index 0ee0586aff..dc92fc89b7 100644
--- a/language/tools/move-unit-test/tests/test_sources/cross_module_aborts.exp
+++ b/language/tools/move-unit-test/tests/test_sources/cross_module_aborts.exp
@@ -1,6 +1,10 @@
 Running Move unit tests
 [ FAIL    ] 0x1::B::failing_test
 [ PASS    ] 0x1::M::dummy_test
+0x1::B::failing_test
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::dummy_test
+Output: Ok(ChangeSet { accounts: {} })
 
 Test failures:
 
@@ -13,9 +17,12 @@ Failures in 0x1::B:
 │ 4 │     public fun this_aborts() {
 │   │                ----------- In this function in 0x1::M
 │ 5 │         abort 0
-│   │         ^^^^^^^ Test was not expected to abort but it aborted with 0 here
+│   │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 00000000000000000000000000000001::M rooted here
 │ 
 │ 
+│ stack trace
+│ 	B::failing_test(tests/test_sources/cross_module_aborts.move:19)
+│ 
 └──────────────────
 
 Test result: FAILED. Total tests: 2; passed: 1; failed: 1
diff --git a/language/tools/move-unit-test/tests/test_sources/do_nothing.exp b/language/tools/move-unit-test/tests/test_sources/do_nothing.exp
index 3a1e8fabff..dbeabdb66d 100644
--- a/language/tools/move-unit-test/tests/test_sources/do_nothing.exp
+++ b/language/tools/move-unit-test/tests/test_sources/do_nothing.exp
@@ -1,3 +1,5 @@
 Running Move unit tests
 [ PASS    ] 0x1::M::do_nothing
+0x1::M::do_nothing
+Output: Ok(ChangeSet { accounts: {} })
 Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/language/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.evm.exp b/language/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.evm.exp
index 01394de8cc..feefbb1733 100644
--- a/language/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.evm.exp
+++ b/language/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.evm.exp
@@ -7,12 +7,12 @@ Test failures:
 Failures in 0x1::M:
 
 ┌── fail ──────
-│ Test did not abort as expected
+│ Test did not error as expected
 └──────────────────
 
 
 ┌── fail_with_code ──────
-│ Test did not abort as expected
+│ Test did not error as expected
 └──────────────────
 
 Test result: FAILED. Total tests: 2; passed: 0; failed: 2
diff --git a/language/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.exp b/language/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.exp
index 01394de8cc..f3ad7bc7d9 100644
--- a/language/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.exp
+++ b/language/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.exp
@@ -1,18 +1,22 @@
 Running Move unit tests
 [ FAIL    ] 0x1::M::fail
 [ FAIL    ] 0x1::M::fail_with_code
+0x1::M::fail
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::fail_with_code
+Output: Ok(ChangeSet { accounts: {} })
 
 Test failures:
 
 Failures in 0x1::M:
 
 ┌── fail ──────
-│ Test did not abort as expected
+│ Test did not error as expected
 └──────────────────
 
 
 ┌── fail_with_code ──────
-│ Test did not abort as expected
+│ Test did not error as expected
 └──────────────────
 
 Test result: FAILED. Total tests: 2; passed: 0; failed: 2
diff --git a/language/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.move b/language/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.move
index d57b4137c6..e7c022e836 100644
--- a/language/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.move
+++ b/language/tools/move-unit-test/tests/test_sources/expected_abort_no_abort.move
@@ -3,7 +3,7 @@ module M {
     #[test, expected_failure]
     fun fail() { }
 
-    #[test, expected_failure(abort_code=0)]
+    #[test, expected_failure(abort_code=0, location=0x1::M)]
     fun fail_with_code() { }
 }
 }
diff --git a/language/tools/move-unit-test/tests/test_sources/missing_data.evm.exp b/language/tools/move-unit-test/tests/test_sources/missing_data.evm.exp
index dbb8eead2a..6085cf6a89 100644
--- a/language/tools/move-unit-test/tests/test_sources/missing_data.evm.exp
+++ b/language/tools/move-unit-test/tests/test_sources/missing_data.evm.exp
@@ -1,13 +1,28 @@
 Running Move unit tests
 [ FAIL    ] 0x1::MissingData::missing_data
+[ PASS    ] 0x1::MissingData::missing_data_captured
+[ FAIL    ] 0x1::MissingData::missing_data_exact
+[ FAIL    ] 0x1::MissingData::missing_data_from_other_function
 
 Test failures:
 
 Failures in 0x1::MissingData:
 
 ┌── missing_data ──────
-│ ITE: An unknown error was reported. Location: 
-│ VMError (if there is one): 
+│ INTERNAL TEST ERROR: UNKNOWN ERROR.
+│ Test was not expected to error, but it gave a UNKNOWN_STATUS (code 18446744073709551615) error originating in an unknown location rooted here
 └──────────────────
 
-Test result: FAILED. Total tests: 1; passed: 0; failed: 1
+
+┌── missing_data_exact ──────
+│ INTERNAL TEST ERROR: UNKNOWN ERROR.
+│ Test was not expected to error, but it gave a UNKNOWN_STATUS (code 18446744073709551615) error originating in an unknown location rooted here
+└──────────────────
+
+
+┌── missing_data_from_other_function ──────
+│ INTERNAL TEST ERROR: UNKNOWN ERROR.
+│ Test was not expected to error, but it gave a UNKNOWN_STATUS (code 18446744073709551615) error originating in an unknown location rooted here
+└──────────────────
+
+Test result: FAILED. Total tests: 4; passed: 1; failed: 3
diff --git a/language/tools/move-unit-test/tests/test_sources/missing_data.exp b/language/tools/move-unit-test/tests/test_sources/missing_data.exp
index 7e56b41765..f718fa4c60 100644
--- a/language/tools/move-unit-test/tests/test_sources/missing_data.exp
+++ b/language/tools/move-unit-test/tests/test_sources/missing_data.exp
@@ -1,41 +1,47 @@
 Running Move unit tests
 [ FAIL    ] 0x1::MissingData::missing_data
+[ PASS    ] 0x1::MissingData::missing_data_captured
+[ PASS    ] 0x1::MissingData::missing_data_exact
+[ FAIL    ] 0x1::MissingData::missing_data_from_other_function
+0x1::MissingData::missing_data
+Output: Ok(ChangeSet { accounts: {} })
+0x1::MissingData::missing_data_captured
+Output: Ok(ChangeSet { accounts: {} })
+0x1::MissingData::missing_data_exact
+Output: Ok(ChangeSet { accounts: {} })
+0x1::MissingData::missing_data_from_other_function
+Output: Ok(ChangeSet { accounts: {} })
 
 Test failures:
 
 Failures in 0x1::MissingData:
 
 ┌── missing_data ──────
-│ ITE: An unknown error was reported. Location: error[E11001]: test failure
+│ error[E11001]: test failure
 │   ┌─ missing_data.move:6:9
 │   │
 │ 5 │     fun missing_data() acquires Missing {
 │   │         ------------ In this function in 0x1::MissingData
 │ 6 │         borrow_global<Missing>(@0x0);
-│   │         ^^^^^^^^^^^^^
+│   │         ^^^^^^^^^^^^^ Test was not expected to error, but it gave a MISSING_DATA (code 4008) error originating in the module 00000000000000000000000000000001::MissingData rooted here
 │ 
 │ 
-│ VMError (if there is one): VMError {
-│     major_status: MISSING_DATA,
-│     sub_status: None,
-│     message: None,
-│     exec_state: None,
-│     location: Module(
-│         ModuleId {
-│             address: 00000000000000000000000000000001,
-│             name: Identifier(
-│                 "MissingData",
-│             ),
-│         },
-│     ),
-│     indices: [],
-│     offsets: [
-│         (
-│             FunctionDefinitionIndex(0),
-│             1,
-│         ),
-│     ],
-│ }
 └──────────────────
 
-Test result: FAILED. Total tests: 1; passed: 0; failed: 1
+
+┌── missing_data_from_other_function ──────
+│ error[E11001]: test failure
+│   ┌─ missing_data.move:6:9
+│   │
+│ 5 │     fun missing_data() acquires Missing {
+│   │         ------------ In this function in 0x1::MissingData
+│ 6 │         borrow_global<Missing>(@0x0);
+│   │         ^^^^^^^^^^^^^ Test was not expected to error, but it gave a MISSING_DATA (code 4008) error originating in the module 00000000000000000000000000000001::MissingData rooted here
+│ 
+│ 
+│ stack trace
+│ 	MissingData::missing_data_from_other_function(tests/test_sources/missing_data.move:12)
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 4; passed: 2; failed: 2
diff --git a/language/tools/move-unit-test/tests/test_sources/missing_data.move b/language/tools/move-unit-test/tests/test_sources/missing_data.move
index a47a607943..f44c7a5ff1 100644
--- a/language/tools/move-unit-test/tests/test_sources/missing_data.move
+++ b/language/tools/move-unit-test/tests/test_sources/missing_data.move
@@ -5,4 +5,22 @@ module 0x1::MissingData {
     fun missing_data() acquires Missing {
         borrow_global<Missing>(@0x0);
     }
+
+    #[test]
+    fun missing_data_from_other_function() acquires Missing {
+        // This call should create a stack trace entry
+        missing_data()
+    }
+
+    #[test]
+    #[expected_failure]
+    fun missing_data_captured() acquires Missing {
+        borrow_global<Missing>(@0x0);
+    }
+
+    #[test]
+    #[expected_failure(major_status=4008, location=Self)]
+    fun missing_data_exact() acquires Missing {
+        borrow_global<Missing>(@0x0);
+    }
 }
diff --git a/language/tools/move-unit-test/tests/test_sources/native_abort.exp b/language/tools/move-unit-test/tests/test_sources/native_abort.exp
index e11aa80a9a..e7c9d1a49f 100644
--- a/language/tools/move-unit-test/tests/test_sources/native_abort.exp
+++ b/language/tools/move-unit-test/tests/test_sources/native_abort.exp
@@ -2,6 +2,12 @@ Running Move unit tests
 [ PASS    ] 0x1::A::native_abort_good_right_code
 [ FAIL    ] 0x1::A::native_abort_good_wrong_code
 [ FAIL    ] 0x1::A::native_abort_unexpected_abort
+0x1::A::native_abort_good_right_code
+Output: Ok(ChangeSet { accounts: {} })
+0x1::A::native_abort_good_wrong_code
+Output: Ok(ChangeSet { accounts: {} })
+0x1::A::native_abort_unexpected_abort
+Output: Ok(ChangeSet { accounts: {} })
 
 Test failures:
 
@@ -14,7 +20,7 @@ Failures in 0x1::A:
 │ 11 │     fun native_abort_good_wrong_code() {
 │    │         ---------------------------- In this function in 0x1::A
 │ 12 │         vector::borrow(&vector::empty<u64>(), 1);
-│    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test did not abort with expected code. Expected test to abort with 0 but instead it aborted with 1 here
+│    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test did not error as expected. Expected test to give a vector operation error with sub-status 0 originating in the module 00000000000000000000000000000001::A but instead it gave a vector operation error with sub-status 1 originating in the module 00000000000000000000000000000001::A rooted here
 │ 
 │ 
 └──────────────────
@@ -27,7 +33,7 @@ Failures in 0x1::A:
 │ 5 │     fun native_abort_unexpected_abort() {
 │   │         ----------------------------- In this function in 0x1::A
 │ 6 │         vector::borrow(&vector::empty<u64>(), 1);
-│   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to abort but it aborted with 1 here
+│   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to error, but it gave a vector operation error with sub-status 1 originating in the module 00000000000000000000000000000001::A rooted here
 │ 
 │ 
 └──────────────────
diff --git a/language/tools/move-unit-test/tests/test_sources/native_abort.move b/language/tools/move-unit-test/tests/test_sources/native_abort.move
index 64bcfc8d61..ca5ec24c18 100644
--- a/language/tools/move-unit-test/tests/test_sources/native_abort.move
+++ b/language/tools/move-unit-test/tests/test_sources/native_abort.move
@@ -7,13 +7,13 @@ module 0x1::A {
     }
 
     #[test]
-    #[expected_failure(abort_code = 0)]
+    #[expected_failure(vector_error, minor_status=0, location=0x1::A)]
     fun native_abort_good_wrong_code() {
         vector::borrow(&vector::empty<u64>(), 1);
     }
 
     #[test]
-    #[expected_failure(abort_code = 1)]
+    #[expected_failure(vector_error, minor_status=1, location=0x1::A)]
     fun native_abort_good_right_code() {
         vector::borrow(&vector::empty<u64>(), 1);
     }
diff --git a/language/tools/move-unit-test/tests/test_sources/native_signer_creation.exp b/language/tools/move-unit-test/tests/test_sources/native_signer_creation.exp
index 62d2830dea..a78a7e0ebc 100644
--- a/language/tools/move-unit-test/tests/test_sources/native_signer_creation.exp
+++ b/language/tools/move-unit-test/tests/test_sources/native_signer_creation.exp
@@ -2,6 +2,12 @@ Running Move unit tests
 [ PASS    ] 0x1::M::test_determinisim
 [ FAIL    ] 0x1::M::test_doesnt_exist
 [ PASS    ] 0x1::M::test_exists
+0x1::M::test_determinisim
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::test_doesnt_exist
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 01000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 02000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 03000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 04000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 05000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 06000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 07000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 08000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 09000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }} })
+0x1::M::test_exists
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 01000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 02000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 03000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 04000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 05000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 06000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 07000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 08000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 09000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }} })
 
 Test failures:
 
@@ -15,7 +21,7 @@ Failures in 0x1::M:
 │    │         ----------------- In this function in 0x1::M
 │    ·
 │ 47 │         abort 0
-│    │         ^^^^^^^ Test was not expected to abort but it aborted with 0 here
+│    │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 00000000000000000000000000000001::M rooted here
 │ 
 │ 
 └──────────────────
diff --git a/language/tools/move-unit-test/tests/test_sources/native_signer_creation.storage.exp b/language/tools/move-unit-test/tests/test_sources/native_signer_creation.storage.exp
index 48e5b317a1..e4c5a3f5fc 100644
--- a/language/tools/move-unit-test/tests/test_sources/native_signer_creation.storage.exp
+++ b/language/tools/move-unit-test/tests/test_sources/native_signer_creation.storage.exp
@@ -2,6 +2,12 @@ Running Move unit tests
 [ PASS    ] 0x1::M::test_determinisim
 [ FAIL    ] 0x1::M::test_doesnt_exist
 [ PASS    ] 0x1::M::test_exists
+0x1::M::test_determinisim
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::test_doesnt_exist
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 01000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 02000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 03000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 04000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 05000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 06000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 07000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 08000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 09000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }} })
+0x1::M::test_exists
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 01000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 02000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 03000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 04000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 05000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 06000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 07000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 08000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }, 09000000000000000000000000000000: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("M"), name: Identifier("A"), type_params: [] }: New([0])} }} })
 
 Test failures:
 
@@ -15,7 +21,7 @@ Failures in 0x1::M:
 │    │         ----------------- In this function in 0x1::M
 │    ·
 │ 47 │         abort 0
-│    │         ^^^^^^^ Test was not expected to abort but it aborted with 0 here
+│    │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 00000000000000000000000000000001::M rooted here
 │ 
 │ 
 │ ────── Storage state at point of failure ──────
diff --git a/language/tools/move-unit-test/tests/test_sources/non_exsistent_native.exp b/language/tools/move-unit-test/tests/test_sources/non_exsistent_native.exp
index 06031139e8..c5705c87d0 100644
--- a/language/tools/move-unit-test/tests/test_sources/non_exsistent_native.exp
+++ b/language/tools/move-unit-test/tests/test_sources/non_exsistent_native.exp
@@ -1,35 +1,15 @@
 Running Move unit tests
 [ FAIL    ] 0x1::M::non_existent_native
+0x1::M::non_existent_native
+Output: Ok(ChangeSet { accounts: {} })
 
 Test failures:
 
 Failures in 0x1::M:
 
 ┌── non_existent_native ──────
-│ ITE: An unknown error was reported. Location: 
-│ VMError (if there is one): VMError {
-│     major_status: UNEXPECTED_VERIFIER_ERROR,
-│     sub_status: None,
-│     message: Some(
-│         "Unexpected verifier/deserialization error! This likely means there is code stored on chain that is unverifiable!\nError: VMError { major_status: MISSING_DEPENDENCY, sub_status: None, message: None, exec_state: None, location: Module(ModuleId { address: 00000000000000000000000000000001, name: Identifier(\"M\") }), indices: [(FunctionHandle, 0)], offsets: [] }",
-│     ),
-│     exec_state: None,
-│     location: Module(
-│         ModuleId {
-│             address: 00000000000000000000000000000001,
-│             name: Identifier(
-│                 "M",
-│             ),
-│         },
-│     ),
-│     indices: [
-│         (
-│             FunctionHandle,
-│             0,
-│         ),
-│     ],
-│     offsets: [],
-│ }
+│ INTERNAL TEST ERROR: INTERNAL VM INVARIANT VIOLATION.
+│ Test was not expected to error, but it gave a UNEXPECTED_VERIFIER_ERROR (code 2017) error originating in the module 00000000000000000000000000000001::M rooted here
 └──────────────────
 
 Test result: FAILED. Total tests: 1; passed: 0; failed: 1
diff --git a/language/tools/move-unit-test/tests/test_sources/other_expected_failures.exp b/language/tools/move-unit-test/tests/test_sources/other_expected_failures.exp
new file mode 100644
index 0000000000..989b7ac73d
--- /dev/null
+++ b/language/tools/move-unit-test/tests/test_sources/other_expected_failures.exp
@@ -0,0 +1,20 @@
+Running Move unit tests
+[ PASS    ] 0x42::m::t0
+[ PASS    ] 0x42::m::t1
+[ PASS    ] 0x42::m::t2
+[ PASS    ] 0x42::m::t3
+[ PASS    ] 0x42::m::t4
+[ PASS    ] 0x42::m::t5
+0x42::m::t0
+Output: Ok(ChangeSet { accounts: {} })
+0x42::m::t1
+Output: Ok(ChangeSet { accounts: {} })
+0x42::m::t2
+Output: Ok(ChangeSet { accounts: {} })
+0x42::m::t3
+Output: Ok(ChangeSet { accounts: {} })
+0x42::m::t4
+Output: Ok(ChangeSet { accounts: {} })
+0x42::m::t5
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000042, module: Identifier("m"), name: Identifier("R"), type_params: [] }: New([0])} }} })
+Test result: OK. Total tests: 6; passed: 6; failed: 0
diff --git a/language/tools/move-unit-test/tests/test_sources/other_expected_failures.move b/language/tools/move-unit-test/tests/test_sources/other_expected_failures.move
new file mode 100644
index 0000000000..d661c84356
--- /dev/null
+++ b/language/tools/move-unit-test/tests/test_sources/other_expected_failures.move
@@ -0,0 +1,41 @@
+module 0x42::m {
+    #[test]
+    #[expected_failure(vector_error, minor_status=1, location=Self)]
+    fun t0() {
+        std::vector::borrow(&vector[0], 2);
+    }
+
+    #[test]
+    #[expected_failure(arithmetic_error, location=Self)]
+    fun t1() {
+        1 / 0;
+    }
+
+    #[test]
+    #[expected_failure(arithmetic_error, location=Self)]
+    fun t2() {
+        0 - 1;
+    }
+
+    #[test]
+    #[expected_failure(arithmetic_error, location=Self)]
+    fun t3() {
+        1 % 0;
+    }
+
+    #[test]
+    #[expected_failure(out_of_gas, location=Self)]
+    fun t4() {
+        loop {}
+    }
+
+    struct R has key { }
+
+    #[test(a=@1)]
+    #[expected_failure(major_status=4004, location=Self)]
+    fun t5(a: signer) {
+        move_to(&a, R {});
+        move_to(&a, R {});
+    }
+
+}
diff --git a/language/tools/move-unit-test/tests/test_sources/out_of_gas.exp b/language/tools/move-unit-test/tests/test_sources/out_of_gas.exp
new file mode 100644
index 0000000000..3b9657d710
--- /dev/null
+++ b/language/tools/move-unit-test/tests/test_sources/out_of_gas.exp
@@ -0,0 +1,46 @@
+Running Move unit tests
+[ FAIL    ] 0x42::m::t0
+[ FAIL    ] 0x42::m::t1
+[ FAIL    ] 0x42::m::t2
+0x42::m::t0
+Output: Ok(ChangeSet { accounts: {} })
+0x42::m::t1
+Output: Ok(ChangeSet { accounts: {} })
+0x42::m::t2
+Output: Ok(ChangeSet { accounts: {} })
+
+Test failures:
+
+Failures in 0x42::m:
+
+┌── t0 ──────
+│ Test did not error as expected
+└──────────────────
+
+
+┌── t1 ──────
+│ error[E11001]: test failure
+│    ┌─ out_of_gas.move:10:10
+│    │
+│  9 │ fun t1() {
+│    │     -- In this function in 0x42::m
+│ 10 │     loop {}
+│    │          ^^ Test did not error as expected. Expected test to give an arithmetic error originating in the module 00000000000000000000000000000042::m but instead it ran out of gas in the module 00000000000000000000000000000042::m rooted here
+│ 
+│ 
+└──────────────────
+
+
+┌── t2 ──────
+│ error[E11001]: test failure
+│    ┌─ out_of_gas.move:16:7
+│    │
+│ 15 │ fun t2() {
+│    │     -- In this function in 0x42::m
+│ 16 │     0 - 1;
+│    │       ^ Test did not error as expected. Expected test to run out of gas in the module 00000000000000000000000000000042::m but instead it gave an arithmetic error originating in the module 00000000000000000000000000000042::m rooted here
+│ 
+│ 
+└──────────────────
+
+Test result: FAILED. Total tests: 3; passed: 0; failed: 3
diff --git a/language/tools/move-unit-test/tests/test_sources/out_of_gas.move b/language/tools/move-unit-test/tests/test_sources/out_of_gas.move
new file mode 100644
index 0000000000..78e171ae36
--- /dev/null
+++ b/language/tools/move-unit-test/tests/test_sources/out_of_gas.move
@@ -0,0 +1,19 @@
+module 0x42::m {
+
+#[test]
+#[expected_failure(out_of_gas, location=Self)]
+fun t0() {}
+
+#[test]
+#[expected_failure(arithmetic_error, location=Self)]
+fun t1() {
+    loop {}
+}
+
+#[test]
+#[expected_failure(out_of_gas, location=Self)]
+fun t2() {
+    0 - 1;
+}
+
+}
diff --git a/language/tools/move-unit-test/tests/test_sources/proposal_test.evm.exp b/language/tools/move-unit-test/tests/test_sources/proposal_test.evm.exp
index 19533852ca..b933523184 100644
--- a/language/tools/move-unit-test/tests/test_sources/proposal_test.evm.exp
+++ b/language/tools/move-unit-test/tests/test_sources/proposal_test.evm.exp
@@ -11,7 +11,7 @@ Test failures:
 Failures in 0x1::Module:
 
 ┌── tests_d ──────
-│ Test was not expected to abort but it aborted with 3 here
+│ Test was not expected to error, but it aborted with code 3 originating in an unknown location rooted here
 └──────────────────
 
 Test result: FAILED. Total tests: 6; passed: 5; failed: 1
diff --git a/language/tools/move-unit-test/tests/test_sources/proposal_test.exp b/language/tools/move-unit-test/tests/test_sources/proposal_test.exp
index 4027a55905..55554e0b13 100644
--- a/language/tools/move-unit-test/tests/test_sources/proposal_test.exp
+++ b/language/tools/move-unit-test/tests/test_sources/proposal_test.exp
@@ -5,6 +5,18 @@ Running Move unit tests
 [ PASS    ] 0x1::Module::tests_b
 [ PASS    ] 0x1::Module::tests_c
 [ FAIL    ] 0x1::Module::tests_d
+0x1::Module::other_module_aborts
+Output: Ok(ChangeSet { accounts: {} })
+0x1::Module::tests_a
+Output: Ok(ChangeSet { accounts: {} })
+0x1::Module::tests_aborts
+Output: Ok(ChangeSet { accounts: {} })
+0x1::Module::tests_b
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_params: [] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 00000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_params: [] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }} })
+0x1::Module::tests_c
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_params: [] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 00000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_params: [] }: New([6, 0, 0, 0, 0, 0, 0, 0])} }} })
+0x1::Module::tests_d
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_params: [U64] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 00000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_params: [Bool] }: New([6, 0, 0, 0, 0, 0, 0, 0]), StructTag { address: 00000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_params: [U64] }: New([5, 0, 0, 0, 0, 0, 0, 0]), StructTag { address: 00000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_params: [Struct(StructTag { address: 00000000000000000000000000000001, module: Identifier("Module"), name: Identifier("C"), type_params: [U64] })] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }} })
 
 Test failures:
 
@@ -18,7 +30,7 @@ Failures in 0x1::Module:
 │     │         ------- In this function in 0x1::Module
 │     ·
 │ 102 │         assert!(d<u64>(@0x2, 6), 3);
-│     │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to abort but it aborted with 3 here
+│     │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to error, but it aborted with code 3 originating in the module 00000000000000000000000000000001::Module rooted here
 │ 
 │ 
 └──────────────────
diff --git a/language/tools/move-unit-test/tests/test_sources/proposal_test.move b/language/tools/move-unit-test/tests/test_sources/proposal_test.move
index a944a01e5d..48babea2c1 100644
--- a/language/tools/move-unit-test/tests/test_sources/proposal_test.move
+++ b/language/tools/move-unit-test/tests/test_sources/proposal_test.move
@@ -102,14 +102,15 @@ module Module {
         assert!(d<u64>(@0x2, 6), 3);
     }
 
+    // check that this test aborts with the expected error code
     #[test]
-    #[expected_failure(abort_code=10)] // check that this test aborts with the expected error code
+    #[expected_failure(abort_code=10, location=Self)]
     fun tests_aborts() {
        aborts()
     }
 
     #[test]
-    #[expected_failure(abort_code=42)]
+    #[expected_failure(abort_code=42, location=0x1::TestonlyModule)]
     fun other_module_aborts() {
        TestonlyModule::aborts()
     }
diff --git a/language/tools/move-unit-test/tests/test_sources/proposal_test.storage.exp b/language/tools/move-unit-test/tests/test_sources/proposal_test.storage.exp
index 3b5df580d8..c3546cabdb 100644
--- a/language/tools/move-unit-test/tests/test_sources/proposal_test.storage.exp
+++ b/language/tools/move-unit-test/tests/test_sources/proposal_test.storage.exp
@@ -5,6 +5,18 @@ Running Move unit tests
 [ PASS    ] 0x1::Module::tests_b
 [ PASS    ] 0x1::Module::tests_c
 [ FAIL    ] 0x1::Module::tests_d
+0x1::Module::other_module_aborts
+Output: Ok(ChangeSet { accounts: {} })
+0x1::Module::tests_a
+Output: Ok(ChangeSet { accounts: {} })
+0x1::Module::tests_aborts
+Output: Ok(ChangeSet { accounts: {} })
+0x1::Module::tests_b
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_params: [] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 00000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_params: [] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }} })
+0x1::Module::tests_c
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_params: [] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 00000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("Module"), name: Identifier("A"), type_params: [] }: New([6, 0, 0, 0, 0, 0, 0, 0])} }} })
+0x1::Module::tests_d
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_params: [U64] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 00000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_params: [Bool] }: New([6, 0, 0, 0, 0, 0, 0, 0]), StructTag { address: 00000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_params: [U64] }: New([5, 0, 0, 0, 0, 0, 0, 0]), StructTag { address: 00000000000000000000000000000001, module: Identifier("Module"), name: Identifier("B"), type_params: [Struct(StructTag { address: 00000000000000000000000000000001, module: Identifier("Module"), name: Identifier("C"), type_params: [U64] })] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }} })
 
 Test failures:
 
@@ -18,7 +30,7 @@ Failures in 0x1::Module:
 │     │         ------- In this function in 0x1::Module
 │     ·
 │ 102 │         assert!(d<u64>(@0x2, 6), 3);
-│     │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to abort but it aborted with 3 here
+│     │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Test was not expected to error, but it aborted with code 3 originating in the module 00000000000000000000000000000001::Module rooted here
 │ 
 │ 
 │ ────── Storage state at point of failure ──────
diff --git a/language/tools/move-unit-test/tests/test_sources/signer_args.evm.exp b/language/tools/move-unit-test/tests/test_sources/signer_args.evm.exp
index 9b9dd3a0de..b60641dacf 100644
--- a/language/tools/move-unit-test/tests/test_sources/signer_args.evm.exp
+++ b/language/tools/move-unit-test/tests/test_sources/signer_args.evm.exp
@@ -11,12 +11,12 @@ Test failures:
 Failures in 0x1::M:
 
 ┌── multi_signer_fail ──────
-│ Test did not abort as expected
+│ Test did not error as expected
 └──────────────────
 
 
 ┌── single_signer_fail ──────
-│ Test was not expected to abort but it aborted with 0 here
+│ Test was not expected to error, but it aborted with code 0 originating in an unknown location rooted here
 └──────────────────
 
 Test result: FAILED. Total tests: 6; passed: 4; failed: 2
diff --git a/language/tools/move-unit-test/tests/test_sources/signer_args.exp b/language/tools/move-unit-test/tests/test_sources/signer_args.exp
index 7c57f92e44..fd644e5bbe 100644
--- a/language/tools/move-unit-test/tests/test_sources/signer_args.exp
+++ b/language/tools/move-unit-test/tests/test_sources/signer_args.exp
@@ -5,13 +5,25 @@ Running Move unit tests
 [ FAIL    ] 0x1::M::single_signer_fail
 [ PASS    ] 0x1::M::single_signer_pass
 [ PASS    ] 0x1::M::test_correct_signer_arg_addrs
+0x1::M::multi_signer_fail
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::multi_signer_pass
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::multi_signer_pass_expected_failure
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::single_signer_fail
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::single_signer_pass
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::test_correct_signer_arg_addrs
+Output: Ok(ChangeSet { accounts: {} })
 
 Test failures:
 
 Failures in 0x1::M:
 
 ┌── multi_signer_fail ──────
-│ Test did not abort as expected
+│ Test did not error as expected
 └──────────────────
 
 
@@ -22,7 +34,7 @@ Failures in 0x1::M:
 │ 8 │     fun single_signer_fail(_a: signer) {
 │   │         ------------------ In this function in 0x1::M
 │ 9 │         abort 0
-│   │         ^^^^^^^ Test was not expected to abort but it aborted with 0 here
+│   │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 00000000000000000000000000000001::M rooted here
 │ 
 │ 
 └──────────────────
diff --git a/language/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.exp b/language/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.exp
index 6e7d05a3df..7defc002e1 100644
--- a/language/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.exp
+++ b/language/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.exp
@@ -4,6 +4,16 @@ Running Move unit tests
 [ PASS    ] 0x1::A::c
 [ FAIL    ] 0x1::A::x
 [ FAIL    ] 0x1::A::y
+0x1::A::a
+Output: Ok(ChangeSet { accounts: {} })
+0x1::A::b
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("A"), name: Identifier("A"), type_params: [] }: New([0])} }} })
+0x1::A::c
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("A"), name: Identifier("A"), type_params: [] }: New([0])} }} })
+0x1::A::x
+Output: Ok(ChangeSet { accounts: {} })
+0x1::A::y
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("A"), name: Identifier("A"), type_params: [] }: New([0])} }} })
 
 Test failures:
 
@@ -16,7 +26,7 @@ Failures in 0x1::A:
 │ 5 │     fun x() {
 │   │         - In this function in 0x1::A
 │ 6 │         abort 0
-│   │         ^^^^^^^ Test was not expected to abort but it aborted with 0 here
+│   │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 00000000000000000000000000000001::A rooted here
 │ 
 │ 
 └──────────────────
@@ -30,7 +40,7 @@ Failures in 0x1::A:
 │    │         - In this function in 0x1::A
 │ 11 │         move_to(&a, A {});
 │ 12 │         abort 0
-│    │         ^^^^^^^ Test was not expected to abort but it aborted with 0 here
+│    │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 00000000000000000000000000000001::A rooted here
 │ 
 │ 
 └──────────────────
diff --git a/language/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.move b/language/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.move
index 1dc399cc04..135473901f 100644
--- a/language/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.move
+++ b/language/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.move
@@ -15,13 +15,13 @@ module 0x1::A {
     // make sure that we only show storage state for failed tests
 
     #[test]
-    #[expected_failure(abort_code = 0)]
+    #[expected_failure(abort_code = 0, location = 0x1::A)]
     fun a() {
         abort 0
     }
 
     #[test(a=@0x1)]
-    #[expected_failure(abort_code = 0)]
+    #[expected_failure(abort_code = 0, location = 0x1::A)]
     fun b(a: signer) {
         move_to(&a, A {});
         abort 0
diff --git a/language/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.storage.exp b/language/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.storage.exp
index 3f1b3bc5bd..099a01ac65 100644
--- a/language/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.storage.exp
+++ b/language/tools/move-unit-test/tests/test_sources/storage_on_error_empty_and_non_empty.storage.exp
@@ -4,6 +4,16 @@ Running Move unit tests
 [ PASS    ] 0x1::A::c
 [ FAIL    ] 0x1::A::x
 [ FAIL    ] 0x1::A::y
+0x1::A::a
+Output: Ok(ChangeSet { accounts: {} })
+0x1::A::b
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("A"), name: Identifier("A"), type_params: [] }: New([0])} }} })
+0x1::A::c
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("A"), name: Identifier("A"), type_params: [] }: New([0])} }} })
+0x1::A::x
+Output: Ok(ChangeSet { accounts: {} })
+0x1::A::y
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("A"), name: Identifier("A"), type_params: [] }: New([0])} }} })
 
 Test failures:
 
@@ -16,7 +26,7 @@ Failures in 0x1::A:
 │ 5 │     fun x() {
 │   │         - In this function in 0x1::A
 │ 6 │         abort 0
-│   │         ^^^^^^^ Test was not expected to abort but it aborted with 0 here
+│   │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 00000000000000000000000000000001::A rooted here
 │ 
 │ 
 │ ────── Storage state at point of failure ──────
@@ -32,7 +42,7 @@ Failures in 0x1::A:
 │    │         - In this function in 0x1::A
 │ 11 │         move_to(&a, A {});
 │ 12 │         abort 0
-│    │         ^^^^^^^ Test was not expected to abort but it aborted with 0 here
+│    │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 00000000000000000000000000000001::A rooted here
 │ 
 │ 
 │ ────── Storage state at point of failure ──────
diff --git a/language/tools/move-unit-test/tests/test_sources/storage_test.exp b/language/tools/move-unit-test/tests/test_sources/storage_test.exp
index b17c243ad4..96f7bb05b2 100644
--- a/language/tools/move-unit-test/tests/test_sources/storage_test.exp
+++ b/language/tools/move-unit-test/tests/test_sources/storage_test.exp
@@ -1,4 +1,8 @@
 Running Move unit tests
 [ PASS    ] 0x1::B::tests_a
 [ PASS    ] 0x1::B::tests_b
+0x1::B::tests_a
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_params: [U64] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 00000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_params: [Bool] }: New([0])} }} })
+0x1::B::tests_b
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_params: [U64] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 00000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_params: [U64] }: New([6, 0, 0, 0, 0, 0, 0, 0])} }} })
 Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/language/tools/move-unit-test/tests/test_sources/storage_test.storage.exp b/language/tools/move-unit-test/tests/test_sources/storage_test.storage.exp
index b17c243ad4..96f7bb05b2 100644
--- a/language/tools/move-unit-test/tests/test_sources/storage_test.storage.exp
+++ b/language/tools/move-unit-test/tests/test_sources/storage_test.storage.exp
@@ -1,4 +1,8 @@
 Running Move unit tests
 [ PASS    ] 0x1::B::tests_a
 [ PASS    ] 0x1::B::tests_b
+0x1::B::tests_a
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_params: [U64] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 00000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_params: [Bool] }: New([0])} }} })
+0x1::B::tests_b
+Output: Ok(ChangeSet { accounts: {00000000000000000000000000000001: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_params: [U64] }: New([5, 0, 0, 0, 0, 0, 0, 0])} }, 00000000000000000000000000000002: AccountChangeSet { modules: {}, resources: {StructTag { address: 00000000000000000000000000000001, module: Identifier("B"), name: Identifier("A"), type_params: [U64] }: New([6, 0, 0, 0, 0, 0, 0, 0])} }} })
 Test result: OK. Total tests: 2; passed: 2; failed: 0
diff --git a/language/tools/move-unit-test/tests/test_sources/timeout.exp b/language/tools/move-unit-test/tests/test_sources/timeout.exp
index 6a5fd52a2e..3e33f2afff 100644
--- a/language/tools/move-unit-test/tests/test_sources/timeout.exp
+++ b/language/tools/move-unit-test/tests/test_sources/timeout.exp
@@ -3,7 +3,17 @@ Running Move unit tests
 [ FAIL    ] 0x1::M::no_timeout_fail
 [ PASS    ] 0x1::M::no_timeout_while_loop
 [ TIMEOUT ] 0x1::M::timeout_fail
-[ TIMEOUT ] 0x1::M::timeout_fail_with_expected_failure
+[ PASS    ] 0x1::M::timeout_fail_with_expected_failure
+0x1::M::no_timeout
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::no_timeout_fail
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::no_timeout_while_loop
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::timeout_fail
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::timeout_fail_with_expected_failure
+Output: Ok(ChangeSet { accounts: {} })
 
 Test failures:
 
@@ -14,7 +24,7 @@ Failures in 0x1::M:
 │    ┌─ timeout.move:18:29
 │    │
 │ 18 │     fun no_timeout_fail() { abort 0 }
-│    │         ---------------     ^^^^^^^ Test was not expected to abort but it aborted with 0 here
+│    │         ---------------     ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 00000000000000000000000000000001::M rooted here
 │    │         │                    
 │    │         In this function in 0x1::M
 │ 
@@ -26,9 +36,4 @@ Failures in 0x1::M:
 │ Test timed out
 └──────────────────
 
-
-┌── timeout_fail_with_expected_failure ──────
-│ Test timed out
-└──────────────────
-
-Test result: FAILED. Total tests: 5; passed: 2; failed: 3
+Test result: FAILED. Total tests: 5; passed: 3; failed: 2
diff --git a/language/tools/move-unit-test/tests/test_sources/unexpected_abort.evm.exp b/language/tools/move-unit-test/tests/test_sources/unexpected_abort.evm.exp
index 328770cfc7..ed0acd3e9c 100644
--- a/language/tools/move-unit-test/tests/test_sources/unexpected_abort.evm.exp
+++ b/language/tools/move-unit-test/tests/test_sources/unexpected_abort.evm.exp
@@ -10,17 +10,17 @@ Test failures:
 Failures in 0x1::M:
 
 ┌── unexpected_abort ──────
-│ Test was not expected to abort but it aborted with 0 here
+│ Test was not expected to error, but it aborted with code 0 originating in an unknown location rooted here
 └──────────────────
 
 
 ┌── unexpected_abort_in_other_function ──────
-│ Test was not expected to abort but it aborted with 1 here
+│ Test was not expected to error, but it aborted with code 1 originating in an unknown location rooted here
 └──────────────────
 
 
 ┌── wrong_abort_code ──────
-│ Test did not abort with expected code. Expected test to abort with 1 but instead it aborted with 0 here
+│ Test did not abort with expected code. Expected test to abort with code 1, but instead it aborted with code 0 originating in an unknown location rooted here
 └──────────────────
 
 Test result: FAILED. Total tests: 5; passed: 2; failed: 3
diff --git a/language/tools/move-unit-test/tests/test_sources/unexpected_abort.exp b/language/tools/move-unit-test/tests/test_sources/unexpected_abort.exp
index 8082e4139f..78d4adc3b5 100644
--- a/language/tools/move-unit-test/tests/test_sources/unexpected_abort.exp
+++ b/language/tools/move-unit-test/tests/test_sources/unexpected_abort.exp
@@ -4,6 +4,16 @@ Running Move unit tests
 [ FAIL    ] 0x1::M::unexpected_abort
 [ FAIL    ] 0x1::M::unexpected_abort_in_other_function
 [ FAIL    ] 0x1::M::wrong_abort_code
+0x1::M::correct_abort_code
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::just_test_failure
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::unexpected_abort
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::unexpected_abort_in_other_function
+Output: Ok(ChangeSet { accounts: {} })
+0x1::M::wrong_abort_code
+Output: Ok(ChangeSet { accounts: {} })
 
 Test failures:
 
@@ -16,7 +26,7 @@ Failures in 0x1::M:
 │ 4 │     public fun unexpected_abort() {
 │   │                ---------------- In this function in 0x1::M
 │ 5 │         abort 0
-│   │         ^^^^^^^ Test was not expected to abort but it aborted with 0 here
+│   │         ^^^^^^^ Test was not expected to error, but it aborted with code 0 originating in the module 00000000000000000000000000000001::M rooted here
 │ 
 │ 
 └──────────────────
@@ -29,9 +39,12 @@ Failures in 0x1::M:
 │ 27 │     fun abort_in_other_function() {
 │    │         ----------------------- In this function in 0x1::M
 │ 28 │         abort 1
-│    │         ^^^^^^^ Test was not expected to abort but it aborted with 1 here
+│    │         ^^^^^^^ Test was not expected to error, but it aborted with code 1 originating in the module 00000000000000000000000000000001::M rooted here
 │ 
 │ 
+│ stack trace
+│ 	M::unexpected_abort_in_other_function(tests/test_sources/unexpected_abort.move:33)
+│ 
 └──────────────────
 
 
@@ -42,7 +55,7 @@ Failures in 0x1::M:
 │ 10 │     public fun wrong_abort_code() {
 │    │                ---------------- In this function in 0x1::M
 │ 11 │         abort 0
-│    │         ^^^^^^^ Test did not abort with expected code. Expected test to abort with 1 but instead it aborted with 0 here
+│    │         ^^^^^^^ Test did not error as expected. Expected test to abort with code 1 originating in the module 00000000000000000000000000000001::M but instead it aborted with code 0 originating in the module 00000000000000000000000000000001::M rooted here
 │ 
 │ 
 └──────────────────
diff --git a/language/tools/move-unit-test/tests/test_sources/unexpected_abort.move b/language/tools/move-unit-test/tests/test_sources/unexpected_abort.move
index 2ce938b56d..ede7bba808 100644
--- a/language/tools/move-unit-test/tests/test_sources/unexpected_abort.move
+++ b/language/tools/move-unit-test/tests/test_sources/unexpected_abort.move
@@ -6,13 +6,13 @@ module M {
     }
 
     #[test]
-    #[expected_failure(abort_code=1)]
+    #[expected_failure(abort_code=1, location=0x1::M)]
     public fun wrong_abort_code() {
         abort 0
     }
 
     #[test]
-    #[expected_failure(abort_code=0)]
+    #[expected_failure(abort_code=0, location=0x1::M)]
     public fun correct_abort_code() {
         abort 0
     }
diff --git a/language/tools/move-unit-test/tests/test_sources/use_unit_test_module.exp b/language/tools/move-unit-test/tests/test_sources/use_unit_test_module.exp
index fd927d6fda..f148ff28d1 100644
--- a/language/tools/move-unit-test/tests/test_sources/use_unit_test_module.exp
+++ b/language/tools/move-unit-test/tests/test_sources/use_unit_test_module.exp
@@ -1,3 +1,5 @@
 Running Move unit tests
 [ PASS    ] 0x1::M::poison_call
+0x1::M::poison_call
+Output: Ok(ChangeSet { accounts: {} })
 Test result: OK. Total tests: 1; passed: 1; failed: 0
diff --git a/language/tools/read-write-set/Cargo.toml b/language/tools/read-write-set/Cargo.toml
index fda28ac073..790f684e0a 100644
--- a/language/tools/read-write-set/Cargo.toml
+++ b/language/tools/read-write-set/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
diff --git a/language/tools/read-write-set/dynamic/Cargo.toml b/language/tools/read-write-set/dynamic/Cargo.toml
index 1ff84db9dd..206ca47818 100644
--- a/language/tools/read-write-set/dynamic/Cargo.toml
+++ b/language/tools/read-write-set/dynamic/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
diff --git a/language/tools/read-write-set/dynamic/src/dynamic_analysis.rs b/language/tools/read-write-set/dynamic/src/dynamic_analysis.rs
index 01c85ef635..81f038289c 100644
--- a/language/tools/read-write-set/dynamic/src/dynamic_analysis.rs
+++ b/language/tools/read-write-set/dynamic/src/dynamic_analysis.rs
@@ -219,8 +219,11 @@ impl ConcretizedFormals {
                 .get_resource(g, &tag)
                 .map_err(|_| anyhow!("Failed to get resource for {:?}::{:?}", g, tag))?
             {
-                let layout = TypeLayoutBuilder::build_runtime(&TypeTag::Struct(tag), module_cache)
-                    .map_err(|_| anyhow!("Failed to resolve type: {:?}", access_path.root.type_))?;
+                let layout =
+                    TypeLayoutBuilder::build_runtime(&TypeTag::Struct(Box::new(tag)), module_cache)
+                        .map_err(|_| {
+                            anyhow!("Failed to resolve type: {:?}", access_path.root.type_)
+                        })?;
 
                 let resource =
                     MoveValue::simple_deserialize(&resource_bytes, &layout).map_err(|_| {
diff --git a/language/tools/read-write-set/src/lib.rs b/language/tools/read-write-set/src/lib.rs
index c33608c778..f0bc4c30a9 100644
--- a/language/tools/read-write-set/src/lib.rs
+++ b/language/tools/read-write-set/src/lib.rs
@@ -59,14 +59,11 @@ impl ReadWriteSetAnalysis {
     /// Return an overapproximation access paths read/written by `module`::`fun`.
     /// Returns `None` if the function or module does not exist.
     pub fn get_summary(&self, module: &ModuleId, fun: &IdentStr) -> Option<&ReadWriteSetState> {
-        self.get_function_env(module, fun)
-            .map(|fenv| {
-                self.targets
-                    .get_data(&fenv.get_qualified_id(), &FunctionVariant::Baseline)
-                    .map(|data| data.annotations.get::<ReadWriteSetState>())
-                    .flatten()
-            })
-            .flatten()
+        self.get_function_env(module, fun).and_then(|fenv| {
+            self.targets
+                .get_data(&fenv.get_qualified_id(), &FunctionVariant::Baseline)
+                .and_then(|data| data.annotations.get::<ReadWriteSetState>())
+        })
     }
 
     /// Returns the FunctionEnv for `module`::`fun`
@@ -95,8 +92,7 @@ impl ReadWriteSetAnalysis {
                         func.get_identifier(),
                         self.targets
                             .get_data(&func.get_qualified_id(), &FunctionVariant::Baseline)
-                            .map(|data| data.annotations.get::<ReadWriteSetState>())
-                            .flatten()
+                            .and_then(|data| data.annotations.get::<ReadWriteSetState>())
                             .unwrap()
                             .normalize(&self.env),
                     );
diff --git a/language/tools/read-write-set/types/Cargo.toml b/language/tools/read-write-set/types/Cargo.toml
index 4ed24a5322..fd2e99385d 100644
--- a/language/tools/read-write-set/types/Cargo.toml
+++ b/language/tools/read-write-set/types/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = ["crates-io"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
diff --git a/rust-toolchain b/rust-toolchain
index 4d5fde5bd1..902c74186f 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-1.60.0
+1.65.0
diff --git a/rustfmt.toml b/rustfmt.toml
index 80eeb4054d..55797efb6b 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,2 +1,2 @@
-edition = "2018"
+edition = "2021"
 use_field_init_shorthand = true
diff --git a/scripts/dev_setup.sh b/scripts/dev_setup.sh
index b4c225e5ff..b721d95789 100755
--- a/scripts/dev_setup.sh
+++ b/scripts/dev_setup.sh
@@ -15,10 +15,10 @@
 # fast fail.
 set -eo pipefail
 
-Z3_VERSION=4.8.13
+Z3_VERSION=4.11.2
 CVC5_VERSION=0.0.3
-DOTNET_VERSION=5.0
-BOOGIE_VERSION=2.9.6
+DOTNET_VERSION=6.0
+BOOGIE_VERSION=2.15.8
 SOLC_VERSION="v0.8.11+commit.d7f03943"
 
 SCRIPT_PATH="$(cd "$(dirname "$0")" >/dev/null 2>&1 && pwd)"
@@ -218,6 +218,13 @@ function install_gcc_powerpc_linux_gnu {
   #fi
 }
 
+function install_lld {
+  # Right now, only install lld for linux
+  if [[ "$(uname)" == "Linux" ]]; then
+    install_pkg lld "$PACKAGE_MANAGER"
+  fi
+}
+
 function install_toolchain {
   version=$1
   FOUND=$(rustup show | grep -c "$version" || true)
@@ -279,6 +286,12 @@ function install_boogie {
     echo "Boogie $BOOGIE_VERSION already installed"
   else
     "${DOTNET_INSTALL_DIR}dotnet" tool update --tool-path "${DOTNET_INSTALL_DIR}tools/" Boogie --version $BOOGIE_VERSION
+    # If a higher version of boogie is installed, we can not install required version with `dotnet tool update` command above
+    # Print a tip here, since incompatible version of boogie might cause move-prover stuck forever
+    if [[ $? != 0 ]]; then
+      echo "failed to install boogie ${BOOGIE_VERSION}, if there is a more updated boogie installed, please consider uninstall it with"
+      echo "${DOTNET_INSTALL_DIR}dotnet tool uninstall --tool-path ${DOTNET_INSTALL_DIR}/tools Boogie"
+    fi
   fi
 }
 
@@ -294,7 +307,7 @@ function install_z3 {
     return
   fi
   if [[ "$(uname)" == "Linux" ]]; then
-    Z3_PKG="z3-$Z3_VERSION-x64-glibc-2.28"
+    Z3_PKG="z3-$Z3_VERSION-x64-glibc-2.31"
   elif [[ "$(uname)" == "Darwin" ]]; then
     Z3_PKG="z3-$Z3_VERSION-x64-osx-10.16"
   else
@@ -306,7 +319,7 @@ function install_z3 {
   mkdir -p "$TMPFILE"/
   (
     cd "$TMPFILE" || exit
-    curl -LOs "https://github.com/junkil-park/z3/releases/download/z3-$Z3_VERSION/$Z3_PKG.zip"
+    curl -LOs "https://github.com/Z3Prover/z3/releases/download/z3-$Z3_VERSION/$Z3_PKG.zip"
     unzip -q "$Z3_PKG.zip"
     cp "$Z3_PKG/bin/z3" "${INSTALL_DIR}"
     chmod +x "${INSTALL_DIR}z3"
@@ -589,6 +602,8 @@ if [[ "$INSTALL_BUILD_TOOLS" == "true" ]]; then
   install_pkg clang "$PACKAGE_MANAGER"
   install_pkg llvm "$PACKAGE_MANAGER"
 
+  install_lld
+
   install_gcc_powerpc_linux_gnu "$PACKAGE_MANAGER"
   install_openssl_dev "$PACKAGE_MANAGER"
   install_pkg_config "$PACKAGE_MANAGER"
diff --git a/x.toml b/x.toml
index 00744f3ff9..18f127d5b1 100644
--- a/x.toml
+++ b/x.toml
@@ -3,6 +3,7 @@ version = "0.8.2"
 
 [system-tests]
 
+
 [cargo.sccache]
 bucket = "ci-artifacts.diem.com"
 prefix = "sccache/diem/"
@@ -23,14 +24,13 @@ git = "https://github.com/diem/sccache.git"
 git-rev = "ef50d87a58260c30767520045e242ccdbdb965af"
 features = [ "s3" ]
 
-
 [fix]
 
 [clippy]
 allowed = [
     # Deriving Arbitrary often causes this warning to show up.
     "clippy::unit_arg",
-    "clippy::eval-order-dependence",
+    "clippy::mixed_read_write_in_expression",
     "clippy::new-without-default",
     "clippy::rc_buffer",
     "clippy::upper_case_acronyms",
@@ -41,13 +41,6 @@ allowed = [
     "clippy::needless-collect",
     "clippy::enum-variant-names",
     "clippy::self-named-constructors",
-    # TODO: those below should probably be fixed and removed
-    "clippy::derivable-impls",
-    "clippy::single-char-pattern",
-    "clippy::map-flatten",
-    "clippy::unwrap_or_else_default",
-    "clippy::needless_borrow",
-    "clippy::needless_late_init",
 ]
 warn = [
     "clippy::wildcard_dependencies",
@@ -120,6 +113,7 @@ members = [
     # Please keep this list in alphabetical order!
 
     "bytecode-interpreter-testsuite",
+    "bytecode-verifier-libfuzzer",
     "bytecode-verifier-tests",
     "bytecode-verifier-transactional-tests",
     "df-cli",
@@ -136,6 +130,7 @@ members = [
     "move-compiler-transactional-tests",
     "move-explain",
     "move-ir-compiler-transactional-tests",
+    "move-vm-paranoid-tests",
     "move-prover-test-utils",
     "move-transactional-test-runner",
     "move-vm-integration-tests",
@@ -150,34 +145,10 @@ members = [
     # Please keep this list in alphabetical order!
 ]
 
-[workspace.move-to-diem-deps]
-# By default, all crates in the language directory are considered Move crates
-# and are forbidden from depending on any Diem crates.
-#
-# Adding a crate's name to this list will mark it as a Diem crate so that the
-# linter will not impose said restriction on it.
-#
-# Note: if your crate is indeed a Move crate and you are getting the linter
-# yelling at you, you should redesign your crate and properly remove that
-# dependency, instead of adding the crate to this list and silencing the lint.
-diem_crates_in_language = [
-]
-# A special set of diem crates Move crates are allowed to depend on.
-#
-# You should not add new entries to this list unless you have a rare justifiable
-# reason. (read: Just don't.)
-#
-# Particularly, please do not abuse this to silence the lint when it complains
-# about Move crates depending on Diem ones. Again, you should instead fix
-# the design of your crate so it doesn't have to depend on Diem.
-exclude = [
-]
-
 # Interesting subsets of the workspace, These are used for generating and
 # checking dependency summaries.
 
 [subsets.release]
-# The Diem release binaries
 root-members = [
 ]
 
@@ -196,13 +167,8 @@ globs = [".config/nextest.toml", "scripts/dev_setup.sh", "x.toml"]
 mark-changed = "all"
 
 [[determinator.path-rule]]
-# Ignore website and other ancillary files, and scripts not listed above.
-globs = ["developers.diem.com/**/*", "documentation/**/*", "docker/**/*", "helm/**/*", "language/documentation/**/*", "specifications/**/*", "scripts/**/*", "terraform/**/*",]
-mark-changed = []
-
-[[determinator.path-rule]]
-# A bunch of images that should be ignored, I guess.
-globs = ["diem.png", ".assets/diem.png", "storage/data.png"]
+# Ignore non-code dirs
+globs = ["assets/**/*", "docker/**/*", "language/documentation/**/*", "scripts/**/*"]
 mark-changed = []
 
 [[determinator.path-rule]]